<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20234">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">oml: encode IPv6 NSVC using the new OML attribute NM_ATT_OSMO_NS_LINK_CFG<br><br>The old IE NM_ATT_IPACC_NS_LINK_CFG didn't support IPv6 NSVC.<br><br>Depends: Ic261bc43a07fa741b97a9c6ec5a9ed6f5ecae588 (libosmocore)<br>Depends: I9e279bb20940c66eea5196f281184cb4f8a5cc5f (libosmocore)<br>Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/bts_ipaccess_nanobts.c<br>M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c<br>M src/osmo-bsc/bts_sysmobts.c<br>M src/osmo-bsc/pcu_sock.c<br>M tests/nanobts_omlattr/nanobts_omlattr_test.c<br>M tests/nanobts_omlattr/nanobts_omlattr_test.ok<br>8 files changed, 115 insertions(+), 26 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 90ab8ea..8d07fb1 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -8,6 +8,7 @@</span><br><span> #include <osmocom/core/timer.h></span><br><span> #include <osmocom/core/rate_ctr.h></span><br><span> #include <osmocom/core/select.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/socket.h></span><br><span> #include <osmocom/core/stats.h></span><br><span> #include <osmocom/core/stat_item.h></span><br><span> #include <osmocom/gsm/bts_features.h></span><br><span>@@ -745,9 +746,7 @@</span><br><span> int id;</span><br><span> uint16_t nsvci;</span><br><span> uint16_t local_port; /* on the BTS */</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t remote_port; /* on the SGSN */</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t remote_ip; /* on the SGSN */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr remote;</span><br><span> struct gsm_abis_mo mo;</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 8808c20..f58b272 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -36,9 +36,11 @@</span><br><span> #include <osmocom/gsm/gsm48.h></span><br><span> #include <osmocom/gsm/gsm0808.h></span><br><span> #include <osmocom/gsm/gsm23236.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/sockaddr_str.h></span><br><span> </span><br><span> #include <arpa/inet.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/byteswap.h></span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> #include <osmocom/core/socket.h></span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span>@@ -762,17 +764,27 @@</span><br><span> for (i = 0; i < ARRAY_SIZE(bts->gprs.nsvc); i++) {</span><br><span> struct gsm_bts_gprs_nsvc *nsvc =</span><br><span> &bts->gprs.nsvc[i];</span><br><span style="color: hsl(0, 100%, 40%);">- struct in_addr ia;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr_str remote = {};</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t port;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ia.s_addr = htonl(nsvc->remote_ip);</span><br><span> vty_out(vty, " gprs nsvc %u nsvci %u%s", i,</span><br><span> nsvc->nsvci, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> vty_out(vty, " gprs nsvc %u local udp port %u%s", i,</span><br><span> nsvc->local_port, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " gprs nsvc %u remote udp port %u%s", i,</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc->remote_port, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " gprs nsvc %u remote ip %s%s", i,</span><br><span style="color: hsl(0, 100%, 40%);">- inet_ntoa(ia), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_from_sockaddr(&remote, &nsvc->remote.u.sas);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (remote.af != AF_UNSPEC) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " gprs nsvc %u remote ip %s%s", i,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote.ip, VTY_NEWLINE);</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%);">+ /* Can't use remote.port because it's only valid when family != AF_UNSPEC, but the</span><br><span style="color: hsl(120, 100%, 40%);">+ * port can be even configured when the IP isn't */</span><br><span style="color: hsl(120, 100%, 40%);">+ port = osmo_htons(nsvc->remote.u.sin.sin_port);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (port)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " gprs nsvc %u remote udp port %u%s", i,</span><br><span style="color: hsl(120, 100%, 40%);">+ port, VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span> /* EGPRS specific parameters */</span><br><span>@@ -3010,26 +3022,41 @@</span><br><span> </span><br><span> GPRS_CHECK_ENABLED(bts);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->gprs.nsvc[idx].remote_port = atoi(argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* sockaddr_in and sockaddr_in6 have the port at the same position */</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gprs.nsvc[idx].remote.u.sin.sin_port = htons(atoi(argv[1]));</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_bts_gprs_nsvc_rip, cfg_bts_gprs_nsvc_rip_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "gprs nsvc <0-1> remote ip A.B.C.D",</span><br><span style="color: hsl(120, 100%, 40%);">+ "gprs nsvc <0-1> remote ip " VTY_IPV46_CMD,</span><br><span> GPRS_TEXT NSVC_TEXT</span><br><span> "GPRS NS Remote IP Address\n"</span><br><span> "GPRS NS Remote IP Address\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "GPRS NS Remote IP Address\n")</span><br><span style="color: hsl(120, 100%, 40%);">+ "GPRS NS Remote IPv4 Address\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "GPRS NS Remote IPv6 Address\n")</span><br><span> {</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr_str remote;</span><br><span> int idx = atoi(argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">- struct in_addr ia;</span><br><span style="color: hsl(120, 100%, 40%);">+ int ret;</span><br><span> </span><br><span> GPRS_CHECK_ENABLED(bts);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- inet_aton(argv[1], &ia);</span><br><span style="color: hsl(0, 100%, 40%);">- bts->gprs.nsvc[idx].remote_ip = ntohl(ia.s_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = osmo_sockaddr_str_from_str2(&remote, argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Invalid IP address %s%s", argv[1], VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</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%);">+ /* Can't use osmo_sockaddr_str_to_sockaddr() because the port would be overriden */</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gprs.nsvc[idx].remote.u.sas.ss_family = remote.af;</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (remote.af) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET:</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_in_addr(&remote, &bts->gprs.nsvc[idx].remote.u.sin.sin_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET6:</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_in6_addr(&remote, &bts->gprs.nsvc[idx].remote.u.sin6.sin6_addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>index e02eabc..4c95196 100644</span><br><span>--- a/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>@@ -227,6 +227,12 @@</span><br><span> /* We skip NSVC1 since we only use NSVC0 */</span><br><span> if (nsvc->id == 1)</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_bts_has_feature(&bts->features, BTS_FEAT_IPV6_NSVC) &&</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc->remote.u.sa.sa_family == AF_INET6) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLINP, LOGL_ERROR, "BTS %d does not support IPv6 but an IPv6 address was configured!\n", bts->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if ((new_state->availability == NM_AVSTATE_OFF_LINE) ||</span><br><span> (new_state->availability == NM_AVSTATE_DEPENDENCY)) {</span><br><span> msgb = nanobts_attr_nscv_get(bts);</span><br><span>diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c</span><br><span>index b979cc7..b723932 100644</span><br><span>--- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c</span><br><span>+++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c</span><br><span>@@ -24,6 +24,7 @@</span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span> #include <osmocom/bsc/abis_nm.h></span><br><span> #include <osmocom/bsc/bts.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/bts_features.h></span><br><span> </span><br><span> struct msgb *nanobts_attr_bts_get(struct gsm_bts *bts)</span><br><span> {</span><br><span>@@ -202,13 +203,33 @@</span><br><span> buf[1] = bts->gprs.nsvc[0].nsvci & 0xff;</span><br><span> msgb_tl16v_put(msgb, NM_ATT_IPACC_NSVCI, 2, buf);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* remote udp port */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_store16be(bts->gprs.nsvc[0].remote_port, &buf[0]);</span><br><span style="color: hsl(0, 100%, 40%);">- /* remote ip address */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_store32be(bts->gprs.nsvc[0].remote_ip, &buf[2]);</span><br><span style="color: hsl(0, 100%, 40%);">- /* local udp port */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_store16be(bts->gprs.nsvc[0].local_port, &buf[6]);</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_tl16v_put(msgb, NM_ATT_IPACC_NS_LINK_CFG, 8, buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (bts->gprs.nsvc->remote.u.sa.sa_family) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET6:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* all fields are encoded in network byte order */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* protocol family */</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[0] = OSMO_NSVC_ADDR_IPV6;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* padding */</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[1] = 0x00;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* local udp port */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_store16be(bts->gprs.nsvc[0].local_port, &buf[2]);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* remote udp port */</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&buf[4], &bts->gprs.nsvc[0].remote.u.sin6.sin6_port, sizeof(uint16_t));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* remote ip address */</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&buf[6], &bts->gprs.nsvc[0].remote.u.sin6.sin6_addr, sizeof(struct in6_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tl16v_put(msgb, NM_ATT_OSMO_NS_LINK_CFG, 6 + sizeof(struct in6_addr), buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case AF_INET:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* remote udp port */</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&buf[0], &bts->gprs.nsvc[0].remote.u.sin.sin_port, sizeof(uint16_t));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* remote ip address */</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&buf[2], &bts->gprs.nsvc[0].remote.u.sin.sin_addr, sizeof(struct in_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* local udp port */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_store16be(bts->gprs.nsvc[0].local_port, &buf[6]);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tl16v_put(msgb, NM_ATT_IPACC_NS_LINK_CFG, 8, buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return msgb;</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/bts_sysmobts.c b/src/osmo-bsc/bts_sysmobts.c</span><br><span>index df43d76..d7d15eb 100644</span><br><span>--- a/src/osmo-bsc/bts_sysmobts.c</span><br><span>+++ b/src/osmo-bsc/bts_sysmobts.c</span><br><span>@@ -61,5 +61,7 @@</span><br><span> osmo_bts_set_feature(&model_sysmobts.features, BTS_FEAT_EGPRS);</span><br><span> osmo_bts_set_feature(&model_sysmobts.features, BTS_FEAT_PAGING_COORDINATION);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ model_sysmobts.nm_att_tlvdef.def[NM_ATT_OSMO_NS_LINK_CFG].type = TLV_TYPE_TL16V;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return gsm_bts_model_register(&model_sysmobts);</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c</span><br><span>index c2df7c4..4897502 100644</span><br><span>--- a/src/osmo-bsc/pcu_sock.c</span><br><span>+++ b/src/osmo-bsc/pcu_sock.c</span><br><span>@@ -30,6 +30,7 @@</span><br><span> #include <sys/socket.h></span><br><span> #include <sys/un.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/byteswap.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/core/select.h></span><br><span> #include <osmocom/core/socket.h></span><br><span>@@ -190,10 +191,18 @@</span><br><span> /* NSVC */</span><br><span> for (i = 0; i < ARRAY_SIZE(info_ind->nsvci); i++) {</span><br><span> nsvc = &bts->gprs.nsvc[i];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc->remote.u.sa.sa_family == AF_INET6) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DPCU, LOGL_ERROR, "PCU does not support IPv6 NSVC but an IPv6 NSVC was configured!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (nsvc->remote.u.sa.sa_family != AF_INET)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> info_ind->nsvci[i] = nsvc->nsvci;</span><br><span> info_ind->local_port[i] = nsvc->local_port;</span><br><span style="color: hsl(0, 100%, 40%);">- info_ind->remote_port[i] = nsvc->remote_port;</span><br><span style="color: hsl(0, 100%, 40%);">- info_ind->remote_ip[i] = nsvc->remote_ip;</span><br><span style="color: hsl(120, 100%, 40%);">+ info_ind->remote_port[i] = osmo_ntohs(nsvc->remote.u.sin.sin_port);</span><br><span style="color: hsl(120, 100%, 40%);">+ info_ind->remote_ip[i] = osmo_ntohl(nsvc->remote.u.sin.sin_addr.s_addr);</span><br><span> }</span><br><span> </span><br><span> for (i = 0; i < ARRAY_SIZE(info_ind->trx); i++) {</span><br><span>diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c</span><br><span>index ea98409..da220c1 100644</span><br><span>--- a/tests/nanobts_omlattr/nanobts_omlattr_test.c</span><br><span>+++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c</span><br><span>@@ -27,6 +27,7 @@</span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/core/utils.h></span><br><span> #include <osmocom/core/application.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/sockaddr_str.h></span><br><span> </span><br><span> #include <stdio.h></span><br><span> #include <string.h></span><br><span>@@ -263,9 +264,10 @@</span><br><span> };</span><br><span> </span><br><span> /* Parameters needed to test nanobts_attr_nscv_get() */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr_str addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_from_str(&addr, "10.9.1.101", 23000);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_sockaddr(&addr, &bts->gprs.nsvc[0].remote.u.sas);</span><br><span> bts->gprs.nsvc[0].nsvci = 0x65;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->gprs.nsvc[0].remote_port = 0x59d8;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->gprs.nsvc[0].remote_ip = 0x0a090165;</span><br><span> bts->gprs.nsvc[0].local_port = 0x5a3c;</span><br><span> uint8_t attr_nscv_expected[] =</span><br><span> { 0x9f, 0x00, 0x02, 0x00, 0x65, 0xa2, 0x00, 0x08, 0x59, 0xd8, 0x0a,</span><br><span>@@ -286,6 +288,24 @@</span><br><span> test_nanobts_attr_nscv_get(bts, attr_nscv_expected);</span><br><span> test_nanobts_attr_radio_get(bts, trx, attr_radio_expected);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* NSVC IPv6 test */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_sockaddr_str addr6;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_from_str(&addr6, "fd00:5678:9012:3456:7890:1234:5678:9012", 23010);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_sockaddr_str_to_sockaddr(&addr6, &bts->gprs.nsvc[0].remote.u.sas);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gprs.nsvc[0].nsvci = 0x65;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->gprs.nsvc[0].local_port = 0x5a3c;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t attr_nscv6_expected[] =</span><br><span style="color: hsl(120, 100%, 40%);">+ /* |- oml attr |-16bit length */</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0x9f, 0x00, 0x02, 0x00, 0x65, 0xfd, 0x00, 0x16,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 1b type, 1b padding, 2b local port, 2b remote port */</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x29, 0x00, 0x5a, 0x3c, 0x59, 0xe2,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 128bit / 16b ipv6 address */</span><br><span style="color: hsl(120, 100%, 40%);">+ 0xfd, 0x00, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ test_nanobts_attr_nscv_get(bts, attr_nscv6_expected);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> printf("Done\n");</span><br><span> talloc_free(bts);</span><br><span> talloc_free(net);</span><br><span>diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.ok b/tests/nanobts_omlattr/nanobts_omlattr_test.ok</span><br><span>index ef46cf9..abdb95e 100644</span><br><span>--- a/tests/nanobts_omlattr/nanobts_omlattr_test.ok</span><br><span>+++ b/tests/nanobts_omlattr/nanobts_omlattr_test.ok</span><br><span>@@ -23,4 +23,9 @@</span><br><span> expected=2d0b0500020362</span><br><span> ok.</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+Testing nanobts_attr_nscv_get()...</span><br><span style="color: hsl(120, 100%, 40%);">+result= 9f00020065fd001629005a3c59e2fd005678901234567890123456789012</span><br><span style="color: hsl(120, 100%, 40%);">+expected=9f00020065fd001629005a3c59e2fd005678901234567890123456789012</span><br><span style="color: hsl(120, 100%, 40%);">+ok.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> Done</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20234">change 20234</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/osmo-bsc/+/20234"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I6529876a3c1116a79dd624312243d8ae48a41fe2 </div>
<div style="display:none"> Gerrit-Change-Number: 20234 </div>
<div style="display:none"> Gerrit-PatchSet: 13 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>