<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10462">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Drop gprs_msgb_resize_area with libosmocore replacement<br><br>gprs_msgb_resize_area was introduced in libosmocore 0.94<br>(f78ec5ce0d0f6038147d9b9e14d81094309ba5d5) as msgb_resize_area. Let's use<br>that one to avoid code duplication.<br><br>Change-Id: Ib80f7b2b186d87f21d63d9b0bec58175170c905c<br>---<br>M include/osmocom/sgsn/gprs_utils.h<br>M src/gprs/gb_proxy_patch.c<br>M src/gprs/gprs_utils.c<br>3 files changed, 2 insertions(+), 40 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/62/10462/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 8e47e90..eacaec7 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,8 +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%);">-int gprs_msgb_resize_area(struct msgb *msg, uint8_t *area,</span><br><span style="color: hsl(0, 100%, 40%);">- 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> </span><br><span> /* GSM 04.08, 10.5.7.3 GPRS Timer */</span><br><span>diff --git a/src/gprs/gb_proxy_patch.c b/src/gprs/gb_proxy_patch.c</span><br><span>index 496f605..9cca9a8 100644</span><br><span>--- a/src/gprs/gb_proxy_patch.c</span><br><span>+++ b/src/gprs/gb_proxy_patch.c</span><br><span>@@ -112,7 +112,7 @@</span><br><span> osmo_apn_to_str(str1, apn, apn_len));</span><br><span> </span><br><span> *new_apn_ie_len = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_msgb_resize_area(msg, apn_ie, apn_ie_len, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_resize_area(msg, apn_ie, apn_ie_len, 0);</span><br><span> } else {</span><br><span> /* Resize the IE */</span><br><span> char str1[110];</span><br><span>@@ -129,7 +129,7 @@</span><br><span> peer->cfg->core_apn_size));</span><br><span> </span><br><span> *new_apn_ie_len = peer->cfg->core_apn_size + 2;</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_msgb_resize_area(msg, apn, apn_len, peer->cfg->core_apn_size);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_resize_area(msg, apn, apn_len, peer->cfg->core_apn_size);</span><br><span> memcpy(apn, peer->cfg->core_apn, peer->cfg->core_apn_size);</span><br><span> hdr->apn_len = peer->cfg->core_apn_size;</span><br><span> }</span><br><span>@@ -463,4 +463,3 @@</span><br><span> </span><br><span> return 1;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/src/gprs/gprs_utils.c b/src/gprs/gprs_utils.c</span><br><span>index c4b66d6..13641c1 100644</span><br><span>--- a/src/gprs/gprs_utils.c</span><br><span>+++ b/src/gprs/gprs_utils.c</span><br><span>@@ -30,41 +30,6 @@</span><br><span> </span><br><span> #include <string.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* TODO: Move this to libosmocore/msgb.c */</span><br><span style="color: hsl(0, 100%, 40%);">-int gprs_msgb_resize_area(struct msgb *msg, uint8_t *area,</span><br><span style="color: hsl(0, 100%, 40%);">- size_t old_size, size_t new_size)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *rest = area + old_size;</span><br><span style="color: hsl(0, 100%, 40%);">- int rest_len = msg->len - old_size - (area - msg->data);</span><br><span style="color: hsl(0, 100%, 40%);">- int delta_size = (int)new_size - (int)old_size;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (delta_size == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (delta_size > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc = msgb_trim(msg, msg->len + delta_size);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- memmove(area + new_size, area + old_size, rest_len);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (msg->l1h >= rest)</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l1h += delta_size;</span><br><span style="color: hsl(0, 100%, 40%);">- if (msg->l2h >= rest)</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l2h += delta_size;</span><br><span style="color: hsl(0, 100%, 40%);">- if (msg->l3h >= rest)</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l3h += delta_size;</span><br><span style="color: hsl(0, 100%, 40%);">- if (msg->l4h >= rest)</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l4h += delta_size;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (delta_size < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_trim(msg, msg->len + delta_size);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int gprs_str_to_apn(uint8_t *apn_enc, size_t max_len, const char *str)</span><br><span> {</span><br><span> uint8_t *last_len_field;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10462">change 10462</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/10462"/><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: Ib80f7b2b186d87f21d63d9b0bec58175170c905c </div>
<div style="display:none"> Gerrit-Change-Number: 10462 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>