<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10296">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;">Migrate from osmo_ipa_idtag_parse() to ipa_ccm_id_resp_parse()<br><br>In libosmocore Change-ID I1834d90fbcdbfcb05f5b8cfe39bfe9543737ef8f<br>we have introduced ipa_ccm_id_resp_parse() as a bugfixed replacement<br>of ipa_ccm_idtag_parse().<br><br>The main difference is that the returned "value" parts now have<br>a correct reported "length", whereas before this commit they all<br>reported a one-byte too-long "length" for each IE.<br><br>Let's use this opportunity to remove the copy+pasted<br>osmo_ipa_idtag_parse() function from the libosmo-netif codebase.<br><br>Change-Id: I4626d247626543e032593bf226b6c233f6678562<br>---<br>M examples/Makefile.am<br>M include/osmocom/netif/ipa.h<br>M src/ipa.c<br>M tests/Makefile.am<br>4 files changed, 7 insertions(+), 37 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/examples/Makefile.am b/examples/Makefile.am</span><br><span>index 52f4c83..4125243 100644</span><br><span>--- a/examples/Makefile.am</span><br><span>+++ b/examples/Makefile.am</span><br><span>@@ -46,10 +46,10 @@</span><br><span> $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)</span><br><span> </span><br><span> rs232_read_SOURCES = rs232-read.c</span><br><span style="color: hsl(0, 100%, 40%);">-rs232_read_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS)</span><br><span style="color: hsl(120, 100%, 40%);">+rs232_read_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)</span><br><span> </span><br><span> rs232_write_SOURCES = rs232-write.c</span><br><span style="color: hsl(0, 100%, 40%);">-rs232_write_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS)</span><br><span style="color: hsl(120, 100%, 40%);">+rs232_write_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)</span><br><span> </span><br><span> rtp_udp_test_client_SOURCES = rtp-udp-test-client.c</span><br><span> rtp_udp_test_client_LDADD = $(top_builddir)/src/libosmonetif.la \</span><br><span>diff --git a/include/osmocom/netif/ipa.h b/include/osmocom/netif/ipa.h</span><br><span>index 0a29f01..0d1085f 100644</span><br><span>--- a/include/osmocom/netif/ipa.h</span><br><span>+++ b/include/osmocom/netif/ipa.h</span><br><span>@@ -27,7 +27,6 @@</span><br><span> struct tlv_parsed;</span><br><span> </span><br><span> int osmo_ipa_rcvmsg_base(struct msgb *msg, struct osmo_fd *bfd, int server);</span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_ipa_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len);</span><br><span> int osmo_ipa_parse_unitid(const char *str, struct ipaccess_unit *unit_data);</span><br><span> </span><br><span> int ipaccess_send_pong(int fd);</span><br><span>diff --git a/src/ipa.c b/src/ipa.c</span><br><span>index 3888457..197a47f 100644</span><br><span>--- a/src/ipa.c</span><br><span>+++ b/src/ipa.c</span><br><span>@@ -130,35 +130,6 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int osmo_ipa_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t t_len;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t t_tag;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *cur = buf;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- memset(dec, 0, sizeof(*dec));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- while (len >= 2) {</span><br><span style="color: hsl(0, 100%, 40%);">- len -= 2;</span><br><span style="color: hsl(0, 100%, 40%);">- t_len = *cur++;</span><br><span style="color: hsl(0, 100%, 40%);">- t_tag = *cur++;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (t_len > len + 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMI, LOGL_ERROR, "The tag does not fit: %d\n", t_len);</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</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%);">- DEBUGPC(DLMI, "%s='%s' ", ipaccess_idtag_name(t_tag), cur);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- dec->lv[t_tag].len = t_len;</span><br><span style="color: hsl(0, 100%, 40%);">- dec->lv[t_tag].val = cur;</span><br><span style="color: hsl(0, 100%, 40%);">-</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(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 osmo_ipa_parse_unitid(const char *str, struct ipaccess_unit *unit_data)</span><br><span> {</span><br><span> unsigned long ul;</span><br><span>@@ -368,8 +339,7 @@</span><br><span> </span><br><span> DEBUGP(DLINP, "ID_RESP\n");</span><br><span> /* parse tags, search for Unit ID */</span><br><span style="color: hsl(0, 100%, 40%);">- ret = osmo_ipa_idtag_parse(&tlvp, (uint8_t *)msg->l2h + 2,</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_l2len(msg)-2);</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = ipa_ccm_id_resp_parse(&tlvp, (const uint8_t *)msg->l2h + 1, msgb_l2len(msg)-1);</span><br><span> if (ret < 0) {</span><br><span> LOGP(DLINP, LOGL_ERROR, "IPA response message "</span><br><span> "with malformed TLVs\n");</span><br><span>diff --git a/tests/Makefile.am b/tests/Makefile.am</span><br><span>index 7c06b13..03a7a3c 100644</span><br><span>--- a/tests/Makefile.am</span><br><span>+++ b/tests/Makefile.am</span><br><span>@@ -5,13 +5,13 @@</span><br><span> check_HEADERS =</span><br><span> </span><br><span> osmux_osmux_test_SOURCES = osmux/osmux_test.c</span><br><span style="color: hsl(0, 100%, 40%);">-osmux_osmux_test_LDADD = $(LIBOSMOCORE_LIBS) $(top_builddir)/src/libosmonetif.la</span><br><span style="color: hsl(120, 100%, 40%);">+osmux_osmux_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la</span><br><span> </span><br><span> osmux_osmux_test2_SOURCES = osmux/osmux_test2.c</span><br><span style="color: hsl(0, 100%, 40%);">-osmux_osmux_test2_LDADD = $(LIBOSMOCORE_LIBS) $(top_builddir)/src/libosmonetif.la</span><br><span style="color: hsl(120, 100%, 40%);">+osmux_osmux_test2_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la</span><br><span> </span><br><span> jibuf_jibuf_test_SOURCES = jibuf/jibuf_test.c</span><br><span style="color: hsl(0, 100%, 40%);">-jibuf_jibuf_test_LDADD = $(LIBOSMOCORE_LIBS) $(top_builddir)/src/libosmonetif.la</span><br><span style="color: hsl(120, 100%, 40%);">+jibuf_jibuf_test_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(top_builddir)/src/libosmonetif.la</span><br><span> </span><br><span> if HAVE_PCAP</span><br><span> check_PROGRAMS += jibuf/jibuf_tool</span><br><span>@@ -31,6 +31,7 @@</span><br><span> </span><br><span> jibuf_jibuf_tool_LDADD = \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOGSM_LIBS) \</span><br><span> $(top_builddir)/src/libosmonetif.la \</span><br><span> -lpcap</span><br><span> endif</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10296">change 10296</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/10296"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-netif </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I4626d247626543e032593bf226b6c233f6678562 </div>
<div style="display:none"> Gerrit-Change-Number: 10296 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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>