<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22575">View Change</a></p><div style="white-space:pre-wrap">Approvals:
daniel: Looks good to me, but someone else must approve
lynxis lazus: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">frame_relay: Add status call-backs for link + DLC status changes<br><br>Change-Id: Iec19db4e48642c3fcb0aa11fa7787b8323fd0e5a<br>Related: Os#4999<br>---<br>M include/osmocom/gprs/frame_relay.h<br>M src/gb/frame_relay.c<br>M src/gb/gprs_ns2_fr.c<br>3 files changed, 40 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gprs/frame_relay.h b/include/osmocom/gprs/frame_relay.h</span><br><span>index 2860c6b..1be37ee 100644</span><br><span>--- a/include/osmocom/gprs/frame_relay.h</span><br><span>+++ b/include/osmocom/gprs/frame_relay.h</span><br><span>@@ -87,11 +87,15 @@</span><br><span> /* list of data link connections at this link */</span><br><span> struct llist_head dlc_list;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* optional call-back to be called for each PDU received on an unknown DLC */</span><br><span> int (*unknown_dlc_rx_cb)(void *cb_data, struct msgb *msg);</span><br><span> void *unknown_dlc_rx_cb_data;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* call-back to be called for transmitting on the underlying hardware */</span><br><span> int (*tx_cb)(void *data, struct msgb *msg);</span><br><span style="color: hsl(0, 100%, 40%);">- void *tx_cb_data;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* optional call-back to be called each time the status changes active/inactive */</span><br><span style="color: hsl(120, 100%, 40%);">+ void (*status_cb)(struct osmo_fr_link *link, void *cb_data, bool active);</span><br><span style="color: hsl(120, 100%, 40%);">+ void *cb_data;</span><br><span> };</span><br><span> </span><br><span> /* Frame Relay Data Link Connection */</span><br><span>@@ -113,8 +117,11 @@</span><br><span> * NET must wait until USER confirms it implicitly by a seq number check */</span><br><span> bool state_send;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* call-back to be called for each PDU received on this DLC */</span><br><span> int (*rx_cb)(void *cb_data, struct msgb *msg);</span><br><span style="color: hsl(0, 100%, 40%);">- void *rx_cb_data;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* optional call-back to be called each time the status changes active/inactive */</span><br><span style="color: hsl(120, 100%, 40%);">+ void (*status_cb)(struct osmo_fr_dlc *dlc, void *cb_data, bool active);</span><br><span style="color: hsl(120, 100%, 40%);">+ void *cb_data;</span><br><span> };</span><br><span> </span><br><span> /* allocate a frame relay network */</span><br><span>diff --git a/src/gb/frame_relay.c b/src/gb/frame_relay.c</span><br><span>index 03b847a..a7e1da8 100644</span><br><span>--- a/src/gb/frame_relay.c</span><br><span>+++ b/src/gb/frame_relay.c</span><br><span>@@ -189,6 +189,18 @@</span><br><span> hdr[1] = ((dlci << 4) & 0xF0) | 0x01;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void dlc_set_active(struct osmo_fr_dlc *dlc, bool active)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (active == dlc->active)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ dlc->active = active;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFRL(dlc->link, LOGL_NOTICE, "DLCI %u became %s\n", dlc->dlci, active ? "active" : "inactive");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dlc->status_cb)</span><br><span style="color: hsl(120, 100%, 40%);">+ dlc->status_cb(dlc, dlc->cb_data, active);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* allocate a message buffer and put Q.933 Annex A headers (L2 + L3) */</span><br><span> static struct msgb *q933_msgb_alloc(uint16_t dlci, uint8_t prot_disc, uint8_t msg_type)</span><br><span> {</span><br><span>@@ -285,7 +297,7 @@</span><br><span> msgb_tlv_put(resp, Q933_IEI_REPORT_TYPE, 1, &rep_type);</span><br><span> msgb_put_link_int_verif(resp, link);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return link->tx_cb(link->tx_cb_data, resp);</span><br><span style="color: hsl(120, 100%, 40%);">+ return link->tx_cb(link->cb_data, resp);</span><br><span> }</span><br><span> </span><br><span> /* Send a Q.933 STATUS of given type over given link */</span><br><span>@@ -327,7 +339,7 @@</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return link->tx_cb(link->tx_cb_data, resp);</span><br><span style="color: hsl(120, 100%, 40%);">+ return link->tx_cb(link->cb_data, resp);</span><br><span> }</span><br><span> </span><br><span> </span><br><span>@@ -369,7 +381,7 @@</span><br><span> continue;</span><br><span> </span><br><span> if (dlc->add) {</span><br><span style="color: hsl(0, 100%, 40%);">- dlc->active = link->state;</span><br><span style="color: hsl(120, 100%, 40%);">+ dlc_set_active(dlc, link->state);</span><br><span> dlc->add = false;</span><br><span> }</span><br><span> </span><br><span>@@ -417,11 +429,11 @@</span><br><span> </span><br><span> LOGPFRL(link, LOGL_NOTICE, "Link failed\n");</span><br><span> link->state = false;</span><br><span style="color: hsl(0, 100%, 40%);">- if (link->role == FR_ROLE_USER_EQUIPMENT)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (link->status_cb)</span><br><span style="color: hsl(120, 100%, 40%);">+ link->status_cb(link, link->cb_data, link->state);</span><br><span> </span><br><span> llist_for_each_entry(dlc, &link->dlc_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- dlc->active = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ dlc_set_active(dlc, false);</span><br><span> }</span><br><span> } else {</span><br><span> /* good link */</span><br><span>@@ -430,16 +442,21 @@</span><br><span> </span><br><span> LOGPFRL(link, LOGL_NOTICE, "Link recovered\n");</span><br><span> link->state = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (link->status_cb)</span><br><span style="color: hsl(120, 100%, 40%);">+ link->status_cb(link, link->cb_data, link->state);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (link->role == FR_ROLE_USER_EQUIPMENT) {</span><br><span> /* make sure the next STATUS ENQUIRY is for a full</span><br><span> * status report to get the configred DLCs ASAP */</span><br><span> link->polling_count = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* we must not proceed further below if we're in user role,</span><br><span style="color: hsl(120, 100%, 40%);">+ * as otherwise link recovery would set all DLCs as active */</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span> llist_for_each_entry(dlc, &link->dlc_list, list) {</span><br><span> if (!dlc->add && !dlc->del)</span><br><span style="color: hsl(0, 100%, 40%);">- dlc->active = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ dlc_set_active(dlc, true);</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>@@ -508,7 +525,7 @@</span><br><span> * using the optional single PVC asynchronous status report.</span><br><span> * Ignoring the delete. */</span><br><span> dlc->add = pvc->new;</span><br><span style="color: hsl(0, 100%, 40%);">- dlc->active = pvc->active;</span><br><span style="color: hsl(120, 100%, 40%);">+ dlc_set_active(dlc, pvc->active);</span><br><span> dlc->del = 0;</span><br><span> }</span><br><span> </span><br><span>@@ -523,7 +540,7 @@</span><br><span> }</span><br><span> </span><br><span> if (!found) {</span><br><span style="color: hsl(0, 100%, 40%);">- dlc->active = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ dlc_set_active(dlc, false);</span><br><span> dlc->del = true;</span><br><span> }</span><br><span> }</span><br><span>@@ -575,7 +592,7 @@</span><br><span> dlc->del = 1;</span><br><span> } else {</span><br><span> dlc->add = pvc->new;</span><br><span style="color: hsl(0, 100%, 40%);">- dlc->active = pvc->active;</span><br><span style="color: hsl(120, 100%, 40%);">+ dlc_set_active(dlc, pvc->active);</span><br><span> dlc->del = 0;</span><br><span> }</span><br><span> }</span><br><span>@@ -771,7 +788,7 @@</span><br><span> if (dlc->dlci == dlci) {</span><br><span> /* dispatch to handler of respective DLC */</span><br><span> msg->dst = dlc;</span><br><span style="color: hsl(0, 100%, 40%);">- return dlc->rx_cb(dlc->rx_cb_data, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return dlc->rx_cb(dlc->cb_data, msg);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -816,7 +833,7 @@</span><br><span> dlci_to_q922(frh, dlc->dlci);</span><br><span> </span><br><span> msg->dst = link;</span><br><span style="color: hsl(0, 100%, 40%);">- return link->tx_cb(link->tx_cb_data, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return link->tx_cb(link->cb_data, msg);</span><br><span> }</span><br><span> </span><br><span> /* Every T391 seconds, the user equipment sends a STATUS ENQUIRY</span><br><span>diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c</span><br><span>index 49e92ae..b5ddf7e 100644</span><br><span>--- a/src/gb/gprs_ns2_fr.c</span><br><span>+++ b/src/gb/gprs_ns2_fr.c</span><br><span>@@ -198,7 +198,7 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- priv->dlc->rx_cb_data = nsvc;</span><br><span style="color: hsl(120, 100%, 40%);">+ priv->dlc->cb_data = nsvc;</span><br><span> priv->dlc->rx_cb = fr_dlci_rx_cb;</span><br><span> </span><br><span> return priv;</span><br><span>@@ -756,7 +756,7 @@</span><br><span> }</span><br><span> </span><br><span> fr_link->tx_cb = fr_tx_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- fr_link->tx_cb_data = bind;</span><br><span style="color: hsl(120, 100%, 40%);">+ fr_link->cb_data = bind;</span><br><span> priv->link = fr_link;</span><br><span> </span><br><span> priv->ifindex = rc = devname2ifindex(netif);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22575">change 22575</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmocore/+/22575"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iec19db4e48642c3fcb0aa11fa7787b8323fd0e5a </div>
<div style="display:none"> Gerrit-Change-Number: 22575 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>