<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10461">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Drop gprs_msgb_copy with libosmocore replacement<br><br>gprs_msgb_copy was introduced in libosmocore 0.94<br>(f78ec5ce0d0f6038147d9b9e14d81094309ba5d5) as bssgp_msgb_copy. Let's use<br>that one to avoid code duplication.<br><br>Change-Id: I42a65fd8e4045fafadf5694f2d8d0c5e7ab350a0<br>---<br>M include/osmocom/sgsn/gprs_utils.h<br>M src/gprs/gb_proxy.c<br>M src/gprs/gprs_gmm.c<br>M src/gprs/gprs_utils.c<br>M tests/gbproxy/gbproxy_test.c<br>5 files changed, 6 insertions(+), 56 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/61/10461/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sgsn/gprs_utils.h b/include/osmocom/sgsn/gprs_utils.h</span><br><span>index e06364d..8e47e90 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_utils.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_utils.h</span><br><span>@@ -29,7 +29,6 @@</span><br><span> struct msgb;</span><br><span> struct gprs_ra_id;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *gprs_msgb_copy(const struct msgb *msg, const char *name);</span><br><span> int gprs_msgb_resize_area(struct msgb *msg, uint8_t *area,</span><br><span> size_t old_size, size_t new_size);</span><br><span> int gprs_str_to_apn(uint8_t *apn_enc, size_t max_len, const char *str);</span><br><span>diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c</span><br><span>index 447772f..dc3c810 100644</span><br><span>--- a/src/gprs/gb_proxy.c</span><br><span>+++ b/src/gprs/gb_proxy.c</span><br><span>@@ -499,7 +499,7 @@</span><br><span> msgb_nsei(msg),</span><br><span> parse_ctx->llc_msg_name ? parse_ctx->llc_msg_name : "BSSGP");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- stored_msg = gprs_msgb_copy(msg, "process_bssgp_ul");</span><br><span style="color: hsl(120, 100%, 40%);">+ stored_msg = bssgp_msgb_copy(msg, "process_bssgp_ul");</span><br><span> msgb_enqueue(&link_info->stored_msgs, stored_msg);</span><br><span> </span><br><span> if (!link_info->imsi_acq_pending) {</span><br><span>@@ -763,7 +763,7 @@</span><br><span> {</span><br><span> /* create a copy of the message so the old one can</span><br><span> * be free()d safely when we return from gbprox_rcvmsg() */</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = gprs_msgb_copy(old_msg, "msgb_relay2sgsn");</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = bssgp_msgb_copy(old_msg, "msgb_relay2sgsn");</span><br><span> int rc;</span><br><span> </span><br><span> DEBUGP(DGPRS, "NSEI=%u proxying BTS->SGSN (NS_BVCI=%u, NSEI=%u)\n",</span><br><span>@@ -787,7 +787,7 @@</span><br><span> {</span><br><span> /* create a copy of the message so the old one can</span><br><span> * be free()d safely when we return from gbprox_rcvmsg() */</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = gprs_msgb_copy(old_msg, "msgb_relay2peer");</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = bssgp_msgb_copy(old_msg, "msgb_relay2peer");</span><br><span> int rc;</span><br><span> </span><br><span> DEBUGP(DGPRS, "NSEI=%u proxying SGSN->BSS (NS_BVCI=%u, NSEI=%u)\n",</span><br><span>@@ -1179,7 +1179,7 @@</span><br><span> return bssgp_tx_status(BSSGP_CAUSE_PROTO_ERR_UNSPEC, NULL, orig_msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg = gprs_msgb_copy(orig_msg, "rx_sig_from_sgsn");</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = bssgp_msgb_copy(orig_msg, "rx_sig_from_sgsn");</span><br><span> gbprox_process_bssgp_dl(cfg, msg, NULL);</span><br><span> /* Update message info */</span><br><span> bgph = (struct bssgp_normal_hdr *) msgb_bssgph(msg);</span><br><span>diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c</span><br><span>index 91f769d..bea63dc 100644</span><br><span>--- a/src/gprs/gprs_gmm.c</span><br><span>+++ b/src/gprs/gprs_gmm.c</span><br><span>@@ -2648,7 +2648,7 @@</span><br><span> * and the dynamic resolution will be the right thing</span><br><span> * in the long run.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- msg = gprs_msgb_copy(_msg, __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = bssgp_msgb_copy(_msg, __func__);</span><br><span> if (!msg) {</span><br><span> struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(_msg);</span><br><span> uint8_t transaction_id = gsm48_hdr_trans_id(gh);</span><br><span>diff --git a/src/gprs/gprs_utils.c b/src/gprs/gprs_utils.c</span><br><span>index d7cef1c..c4b66d6 100644</span><br><span>--- a/src/gprs/gprs_utils.c</span><br><span>+++ b/src/gprs/gprs_utils.c</span><br><span>@@ -30,55 +30,6 @@</span><br><span> </span><br><span> #include <string.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* FIXME: this needs to go to libosmocore/msgb.c */</span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *gprs_msgb_copy(const struct msgb *msg, const char *name)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct libgb_msgb_cb *old_cb, *new_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *new_msg;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- new_msg = msgb_alloc(msg->data_len, name);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!new_msg)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* copy data */</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(new_msg->_data, msg->_data, new_msg->data_len);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* copy header */</span><br><span style="color: hsl(0, 100%, 40%);">- new_msg->len = msg->len;</span><br><span style="color: hsl(0, 100%, 40%);">- new_msg->data += msg->data - msg->_data;</span><br><span style="color: hsl(0, 100%, 40%);">- new_msg->head += msg->head - msg->_data;</span><br><span style="color: hsl(0, 100%, 40%);">- new_msg->tail += msg->tail - msg->_data;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (msg->l1h)</span><br><span style="color: hsl(0, 100%, 40%);">- new_msg->l1h = new_msg->_data + (msg->l1h - msg->_data);</span><br><span style="color: hsl(0, 100%, 40%);">- if (msg->l2h)</span><br><span style="color: hsl(0, 100%, 40%);">- new_msg->l2h = new_msg->_data + (msg->l2h - msg->_data);</span><br><span style="color: hsl(0, 100%, 40%);">- if (msg->l3h)</span><br><span style="color: hsl(0, 100%, 40%);">- new_msg->l3h = new_msg->_data + (msg->l3h - msg->_data);</span><br><span style="color: hsl(0, 100%, 40%);">- if (msg->l4h)</span><br><span style="color: hsl(0, 100%, 40%);">- new_msg->l4h = new_msg->_data + (msg->l4h - msg->_data);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* copy GB specific data */</span><br><span style="color: hsl(0, 100%, 40%);">- old_cb = LIBGB_MSGB_CB(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- new_cb = LIBGB_MSGB_CB(new_msg);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (old_cb->bssgph)</span><br><span style="color: hsl(0, 100%, 40%);">- new_cb->bssgph = new_msg->_data + (old_cb->bssgph - msg->_data);</span><br><span style="color: hsl(0, 100%, 40%);">- if (old_cb->llch)</span><br><span style="color: hsl(0, 100%, 40%);">- new_cb->llch = new_msg->_data + (old_cb->llch - msg->_data);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* bssgp_cell_id is a pointer into the old msgb, so we need to make</span><br><span style="color: hsl(0, 100%, 40%);">- * it a pointer into the new msgb */</span><br><span style="color: hsl(0, 100%, 40%);">- if (old_cb->bssgp_cell_id)</span><br><span style="color: hsl(0, 100%, 40%);">- new_cb->bssgp_cell_id = new_msg->_data +</span><br><span style="color: hsl(0, 100%, 40%);">- (old_cb->bssgp_cell_id - msg->_data);</span><br><span style="color: hsl(0, 100%, 40%);">- new_cb->nsei = old_cb->nsei;</span><br><span style="color: hsl(0, 100%, 40%);">- new_cb->bvci = old_cb->bvci;</span><br><span style="color: hsl(0, 100%, 40%);">- new_cb->tlli = old_cb->tlli;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return new_msg;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* TODO: Move this to libosmocore/msgb.c */</span><br><span> int gprs_msgb_resize_area(struct msgb *msg, uint8_t *area,</span><br><span> size_t old_size, size_t new_size)</span><br><span>diff --git a/tests/gbproxy/gbproxy_test.c b/tests/gbproxy/gbproxy_test.c</span><br><span>index 157da8b..a183320 100644</span><br><span>--- a/tests/gbproxy/gbproxy_test.c</span><br><span>+++ b/tests/gbproxy/gbproxy_test.c</span><br><span>@@ -1061,7 +1061,7 @@</span><br><span> </span><br><span> if (received_messages) {</span><br><span> struct msgb *msg_copy;</span><br><span style="color: hsl(0, 100%, 40%);">- msg_copy = gprs_msgb_copy(msg, "received_messages");</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_copy = bssgp_msgb_copy(msg, "received_messages");</span><br><span> llist_add_tail(&msg_copy->list, received_messages);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10461">change 10461</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/10461"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I42a65fd8e4045fafadf5694f2d8d0c5e7ab350a0 </div>
<div style="display:none"> Gerrit-Change-Number: 10461 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>