<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/19414">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Gb/BSSGP: replace hardcoded Tx into NS library by a callback<br><br>Add bssgp_ns_send callback() to set the transmission path into the<br>NS library. This allows to use the Gb implementation with<br>the old NS and the new upcoming NS implementation.<br>Users of the old NS implementation don't have to set the callback as<br>the default is the old NS implementation.<br><br>Only users of the new NS implementation need to set the callback and<br>the callback data.<br><br>Change-Id: I3a498e6a0d68b87fed80c64199b22395796761b4<br>---<br>M include/osmocom/gprs/gprs_bssgp.h<br>M src/gb/gprs_bssgp.c<br>M src/gb/gprs_bssgp_bss.c<br>A src/gb/gprs_bssgp_internal.h<br>M src/gb/gprs_bssgp_util.c<br>M src/gb/libosmogb.map<br>6 files changed, 53 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/19414/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gprs/gprs_bssgp.h b/include/osmocom/gprs/gprs_bssgp.h</span><br><span>index 0f87333..d64a6f5 100644</span><br><span>--- a/include/osmocom/gprs/gprs_bssgp.h</span><br><span>+++ b/include/osmocom/gprs/gprs_bssgp.h</span><br><span>@@ -12,7 +12,10 @@</span><br><span> #include <osmocom/gprs/protocol/gsm_08_18.h></span><br><span> </span><br><span> /* gprs_bssgp_util.c */</span><br><span style="color: hsl(120, 100%, 40%);">+typedef int bssgp_bvc_send(void *ctx, struct msgb *msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> extern struct gprs_ns_inst *bssgp_nsi;</span><br><span style="color: hsl(120, 100%, 40%);">+void bssgp_set_bssgp_callback(bssgp_bvc_send *ns_send, void *data);</span><br><span> struct msgb *bssgp_msgb_alloc(void);</span><br><span> struct msgb *bssgp_msgb_copy(const struct msgb *msg, const char *name);</span><br><span> const char *bssgp_cause_str(enum gprs_bssgp_cause cause);</span><br><span>diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c</span><br><span>index 38794c2..4ac54e3 100644</span><br><span>--- a/src/gb/gprs_bssgp.c</span><br><span>+++ b/src/gb/gprs_bssgp.c</span><br><span>@@ -44,6 +44,11 @@</span><br><span> </span><br><span> void *bssgp_tall_ctx = NULL;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int _gprs_ns_sendmsg(void *ctx, struct msgb *msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bssgp_bvc_send *bssgp_ns_send = _gprs_ns_sendmsg;</span><br><span style="color: hsl(120, 100%, 40%);">+void *bssgp_ns_send_data = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static const struct rate_ctr_desc bssgp_ctr_description[] = {</span><br><span> { "packets:in", "Packets at BSSGP Level ( In)" },</span><br><span> { "packets:out","Packets at BSSGP Level (Out)" },</span><br><span>@@ -67,6 +72,13 @@</span><br><span> static int _bssgp_tx_dl_ud(struct bssgp_flow_control *fc, struct msgb *msg,</span><br><span> uint32_t llc_pdu_len, void *priv);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* callback to be compatible with users which do not set the bssgp_ns_send function */</span><br><span style="color: hsl(120, 100%, 40%);">+static int _gprs_ns_sendmsg(void *ctx, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Find a BTS Context based on parsed RA ID and Cell ID */</span><br><span> struct bssgp_bvc_ctx *btsctx_by_raid_cid(const struct gprs_ra_id *raid, uint16_t cid)</span><br><span> {</span><br><span>@@ -117,6 +129,12 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void bssgp_set_bssgp_callback(bssgp_bvc_send *ns_send, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ bssgp_ns_send = ns_send;</span><br><span style="color: hsl(120, 100%, 40%);">+ bssgp_ns_send_data = data;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct bssgp_bvc_ctx *btsctx_alloc(uint16_t bvci, uint16_t nsei)</span><br><span> {</span><br><span> struct bssgp_bvc_ctx *ctx;</span><br><span>@@ -163,7 +181,7 @@</span><br><span> bgph->pdu_type = BSSGP_PDUT_FLOW_CONTROL_BVC_ACK;</span><br><span> msgb_tvlv_put(msg, BSSGP_IE_TAG, 1, &tag);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> /* 10.3.7 SUSPEND-ACK PDU */</span><br><span>@@ -182,7 +200,7 @@</span><br><span> bssgp_msgb_ra_put(msg, ra_id);</span><br><span> msgb_tvlv_put(msg, BSSGP_IE_SUSPEND_REF_NR, 1, &suspend_ref);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> /* 10.3.8 SUSPEND-NACK PDU */</span><br><span>@@ -204,7 +222,7 @@</span><br><span> if (cause)</span><br><span> msgb_tvlv_put(msg, BSSGP_IE_CAUSE, 1, cause);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> /* 10.3.10 RESUME-ACK PDU */</span><br><span>@@ -222,7 +240,7 @@</span><br><span> bssgp_msgb_tlli_put(msg, tlli);</span><br><span> bssgp_msgb_ra_put(msg, ra_id);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> /* 10.3.11 RESUME-NACK PDU */</span><br><span>@@ -243,7 +261,7 @@</span><br><span> if (cause)</span><br><span> msgb_tvlv_put(msg, BSSGP_IE_CAUSE, 1, cause);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> uint16_t bssgp_parse_cell_id(struct gprs_ra_id *raid, const uint8_t *buf)</span><br><span>@@ -266,7 +284,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Chapter 8.4 BVC-Reset Procedure */</span><br><span style="color: hsl(0, 100%, 40%);">-static int bssgp_rx_bvc_reset(struct msgb *msg, struct tlv_parsed *tp, </span><br><span style="color: hsl(120, 100%, 40%);">+static int bssgp_rx_bvc_reset(struct msgb *msg, struct tlv_parsed *tp,</span><br><span> uint16_t ns_bvci)</span><br><span> {</span><br><span> struct osmo_bssgp_prim nmp;</span><br><span>@@ -744,7 +762,7 @@</span><br><span> static int _bssgp_tx_dl_ud(struct bssgp_flow_control *fc, struct msgb *msg,</span><br><span> uint32_t llc_pdu_len, void *priv)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> /* input function of the flow control implementation, called first</span><br><span>@@ -1286,7 +1304,7 @@</span><br><span> msgb_tvlv_put(msg, BSSGP_IE_TMSI, 4, (uint8_t *) &ptmsi);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> void bssgp_set_log_ss(int ss)</span><br><span>diff --git a/src/gb/gprs_bssgp_bss.c b/src/gb/gprs_bssgp_bss.c</span><br><span>index 5a1ffb9..94b1812 100644</span><br><span>--- a/src/gb/gprs_bssgp_bss.c</span><br><span>+++ b/src/gb/gprs_bssgp_bss.c</span><br><span>@@ -34,6 +34,7 @@</span><br><span> #include <osmocom/gprs/gprs_bssgp_bss.h></span><br><span> #include <osmocom/gprs/gprs_ns.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include "gprs_bssgp_internal.h"</span><br><span> #include "common_vty.h"</span><br><span> </span><br><span> #define GSM_IMSI_LENGTH 17</span><br><span>@@ -69,7 +70,7 @@</span><br><span> bssgp_msgb_tlli_put(msg, tlli);</span><br><span> bssgp_msgb_ra_put(msg, ra_id);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> /*! GMM-RESUME.req (Chapter 10.3.9) */</span><br><span>@@ -91,7 +92,7 @@</span><br><span> </span><br><span> msgb_tvlv_put(msg, BSSGP_IE_SUSPEND_REF_NR, 1, &suspend_ref);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> /*! Transmit RA-CAPABILITY-UPDATE (10.3.3) */</span><br><span>@@ -113,7 +114,7 @@</span><br><span> </span><br><span> msgb_tvlv_put(msg, BSSGP_IE_TAG, 1, &tag);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> /* first common part of RADIO-STATUS */</span><br><span>@@ -141,7 +142,7 @@</span><br><span> msgb_tvlv_put(msg, BSSGP_IE_CAUSE, 1, &cause);</span><br><span> LOGPC(DBSSGP, LOGL_NOTICE, "CAUSE=%s\n", bssgp_cause_str(cause));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> /*! Transmit RADIO-STATUS for TLLI (10.3.5) */</span><br><span>@@ -220,7 +221,7 @@</span><br><span> msgb_tvlv_put(msg, BSSGP_IE_BVCI, 2, (uint8_t *) &_bvci_new);</span><br><span> msgb_tvlv_put(msg, BSSGP_IE_NUM_OCT_AFF, 3, (uint8_t *) &_oct_aff);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> /*! Transmit LLC-DISCARDED (Chapter 10.4.3) */</span><br><span>@@ -246,7 +247,7 @@</span><br><span> msgb_tvlv_put(msg, BSSGP_IE_BVCI, 2, (uint8_t *) &_bvci);</span><br><span> msgb_tvlv_put(msg, BSSGP_IE_NUM_OCT_AFF, 3, ((uint8_t *) &_oct_aff) + 1);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> /*! Transmit a BVC-BLOCK message (Chapter 10.4.8) */</span><br><span>@@ -267,7 +268,7 @@</span><br><span> msgb_tvlv_put(msg, BSSGP_IE_BVCI, 2, (uint8_t *) &_bvci);</span><br><span> msgb_tvlv_put(msg, BSSGP_IE_CAUSE, 1, &cause);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> /*! Transmit a BVC-UNBLOCK message (Chapter 10.4.10) */</span><br><span>@@ -286,7 +287,7 @@</span><br><span> </span><br><span> msgb_tvlv_put(msg, BSSGP_IE_BVCI, 2, (uint8_t *) &_bvci);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> /*! Transmit a BVC-RESET message (Chapter 10.4.12) */</span><br><span>@@ -313,7 +314,7 @@</span><br><span> }</span><br><span> /* Optional: Feature Bitmap */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> int bssgp_tx_bvc_reset(struct bssgp_bvc_ctx *bctx, uint16_t bvci, uint8_t cause)</span><br><span> {</span><br><span>@@ -389,7 +390,7 @@</span><br><span> sizeof(e_queue_delay),</span><br><span> (uint8_t *) &e_queue_delay);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> /*! Transmit a FLOW_CONTROL-MS (Chapter 10.4.6)</span><br><span>@@ -432,7 +433,7 @@</span><br><span> msgb_tvlv_put(msg, BSSGP_IE_BUCKET_FULL_RATIO,</span><br><span> 1, bucket_full_ratio);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> /*! RL-UL-UNITDATA.req (Chapter 10.2.2)</span><br><span>@@ -478,7 +479,7 @@</span><br><span> rate_ctr_inc(&bctx->ctrg->ctr[BSSGP_CTR_PKTS_OUT]);</span><br><span> rate_ctr_add(&bctx->ctrg->ctr[BSSGP_CTR_BYTES_OUT], msg->len);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> /* Parse a single GMM-PAGING.req to a given NSEI/NS-BVCI */</span><br><span>diff --git a/src/gb/gprs_bssgp_internal.h b/src/gb/gprs_bssgp_internal.h</span><br><span>new file mode 100644</span><br><span>index 0000000..872d35e</span><br><span>--- /dev/null</span><br><span>+++ b/src/gb/gprs_bssgp_internal.h</span><br><span>@@ -0,0 +1,7 @@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gprs/gprs_bssgp.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern bssgp_bvc_send *bssgp_ns_send;</span><br><span style="color: hsl(120, 100%, 40%);">+extern void *bssgp_ns_send_data;</span><br><span>diff --git a/src/gb/gprs_bssgp_util.c b/src/gb/gprs_bssgp_util.c</span><br><span>index 7708949..917f1f3 100644</span><br><span>--- a/src/gb/gprs_bssgp_util.c</span><br><span>+++ b/src/gb/gprs_bssgp_util.c</span><br><span>@@ -32,6 +32,7 @@</span><br><span> #include <osmocom/gprs/gprs_bssgp.h></span><br><span> #include <osmocom/gprs/gprs_ns.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include "gprs_bssgp_internal.h"</span><br><span> #include "common_vty.h"</span><br><span> </span><br><span> struct gprs_ns_inst *bssgp_nsi;</span><br><span>@@ -210,7 +211,7 @@</span><br><span> _bvci = osmo_htons(bvci);</span><br><span> msgb_tvlv_put(msg, BSSGP_IE_BVCI, 2, (uint8_t *) &_bvci);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span> </span><br><span> /* Chapter 10.4.14: Status */</span><br><span>@@ -248,5 +249,5 @@</span><br><span> msgb_tvlv_put(msg, BSSGP_IE_PDU_IN_ERROR,</span><br><span> msgb_bssgp_len(orig_msg), msgb_bssgph(orig_msg));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gprs_ns_sendmsg(bssgp_nsi, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return bssgp_ns_send(bssgp_ns_send_data, msg);</span><br><span> }</span><br><span>diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map</span><br><span>index 7a231db..0c0c5c4 100644</span><br><span>--- a/src/gb/libosmogb.map</span><br><span>+++ b/src/gb/libosmogb.map</span><br><span>@@ -13,6 +13,7 @@</span><br><span> bssgp_msgb_tlli_put;</span><br><span> bssgp_msgb_ra_put;</span><br><span> bssgp_parse_cell_id;</span><br><span style="color: hsl(120, 100%, 40%);">+bssgp_set_bssgp_callback;</span><br><span> bssgp_tx_bvc_block;</span><br><span> bssgp_tx_bvc_reset;</span><br><span> bssgp_tx_bvc_reset2;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/19414">change 19414</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/+/19414"/><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: I3a498e6a0d68b87fed80c64199b22395796761b4 </div>
<div style="display:none"> Gerrit-Change-Number: 19414 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>