<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10299">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">re-introduce ipa_ccm_idtag_parse_off()<br><br>In the previous commit we deprecated ipa_ccm_idtag_parse() but<br>also removed ipa_ccm_idtag_parse_off(), for which I couldn't find<br>any users. However, legacy openbsc.git still uses this function,<br>so let's re-introiduce it in its original form.<br><br>Change-Id: Ibfe53b04340eb355c8bfb8453a2af1522a4b6baf<br>---<br>M include/osmocom/gsm/ipa.h<br>M src/gsm/ipa.c<br>M src/gsm/libosmogsm.map<br>3 files changed, 16 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/ipa.h b/include/osmocom/gsm/ipa.h</span><br><span>index ec143d0..93cb1bf 100644</span><br><span>--- a/include/osmocom/gsm/ipa.h</span><br><span>+++ b/include/osmocom/gsm/ipa.h</span><br><span>@@ -28,6 +28,8 @@</span><br><span> </span><br><span> int ipa_ccm_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len)</span><br><span> OSMO_DEPRECATED("Use ipa_ccm_id_{get,resp}_parse instead");</span><br><span style="color: hsl(120, 100%, 40%);">+int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset)</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_DEPRECATED("Use ipa_ccm_id_{get,resp}_parse instead");</span><br><span> </span><br><span> /* parse payload of IPA CCM ID GET into a osmocom TLV style representation */</span><br><span> int ipa_ccm_id_get_parse(struct tlv_parsed *dec, const uint8_t *buf, unsigned int len);</span><br><span>@@ -35,9 +37,6 @@</span><br><span> /* parse payload of IPA CCM ID RESP into a osmocom TLV style representation */</span><br><span> int ipa_ccm_id_resp_parse(struct tlv_parsed *dec, const uint8_t *buf, unsigned int len);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Is the TAG included in the length field? */</span><br><span style="color: hsl(0, 100%, 40%);">-int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* parse an Unit ID in string format into the 'ipaccess_unit' data structure */</span><br><span> int ipa_parse_unitid(const char *str, struct ipaccess_unit *unit_data);</span><br><span> </span><br><span>diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c</span><br><span>index 3c7c300..508cc13 100644</span><br><span>--- a/src/gsm/ipa.c</span><br><span>+++ b/src/gsm/ipa.c</span><br><span>@@ -100,6 +100,11 @@</span><br><span> </span><br><span> int ipa_ccm_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ return ipa_ccm_idtag_parse_off(dec, buf, len, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> uint8_t t_len;</span><br><span> uint8_t t_tag;</span><br><span> uint8_t *cur = buf;</span><br><span>@@ -111,6 +116,11 @@</span><br><span> t_len = *cur++;</span><br><span> t_tag = *cur++;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (t_len < len_offset) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMI, LOGL_ERROR, "minimal offset not included: %d < %d\n", t_len, len_offset);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (t_len > len + 1) {</span><br><span> LOGP(DLMI, LOGL_ERROR, "The tag does not fit: %d > %d\n", t_len, len + 1);</span><br><span> return -EINVAL;</span><br><span>@@ -118,11 +128,11 @@</span><br><span> </span><br><span> DEBUGPC(DLMI, "%s='%s' ", ipa_ccm_idtag_name(t_tag), cur);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- dec->lv[t_tag].len = t_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ dec->lv[t_tag].len = t_len - len_offset;</span><br><span> dec->lv[t_tag].val = cur;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cur += t_len;</span><br><span style="color: hsl(0, 100%, 40%);">- len -= t_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ cur += t_len - len_offset;</span><br><span style="color: hsl(120, 100%, 40%);">+ len -= t_len - len_offset;</span><br><span> }</span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map</span><br><span>index a1d342a..2bb9d97 100644</span><br><span>--- a/src/gsm/libosmogsm.map</span><br><span>+++ b/src/gsm/libosmogsm.map</span><br><span>@@ -461,6 +461,7 @@</span><br><span> ipa_ccm_tlv_to_unitdata;</span><br><span> ipa_ccm_idtag_name;</span><br><span> ipa_ccm_idtag_parse;</span><br><span style="color: hsl(120, 100%, 40%);">+ipa_ccm_idtag_parse_off;</span><br><span> ipa_ccm_id_get_parse;</span><br><span> ipa_ccm_id_resp_parse;</span><br><span> ipa_ccm_make_id_resp;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10299">change 10299</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/10299"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ibfe53b04340eb355c8bfb8453a2af1522a4b6baf </div>
<div style="display:none"> Gerrit-Change-Number: 10299 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>