<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21538">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix typo in function nanobts_attr_nsvc_get<br><br>Change-Id: I50235ba7b045ab7fba2112e61191d2756a67dfdc<br>---<br>M include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h<br>M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c<br>M src/osmo-bsc/nm_gprs_nsvc_fsm.c<br>M tests/nanobts_omlattr/nanobts_omlattr_test.c<br>M tests/nanobts_omlattr/nanobts_omlattr_test.ok<br>5 files changed, 13 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h b/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h</span><br><span>index 22a8c34..687f16a 100644</span><br><span>--- a/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h</span><br><span>+++ b/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h</span><br><span>@@ -31,6 +31,6 @@</span><br><span> struct msgb *nanobts_attr_bts_get(struct gsm_bts *bts);</span><br><span> struct msgb *nanobts_attr_nse_get(struct gsm_bts_sm *bts_sm);</span><br><span> struct msgb *nanobts_attr_cell_get(struct gsm_bts *bts);</span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *nanobts_attr_nscv_get(struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *nanobts_attr_nsvc_get(struct gsm_bts *bts);</span><br><span> struct msgb *nanobts_attr_radio_get(struct gsm_bts *bts,</span><br><span>                                     struct gsm_bts_trx *trx);</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 e23a688..885f4cc 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>@@ -199,7 +199,7 @@</span><br><span>         return msgb;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *nanobts_attr_nscv_get(struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *nanobts_attr_nsvc_get(struct gsm_bts *bts)</span><br><span> {</span><br><span>   struct msgb *msgb;</span><br><span>   uint8_t buf[256];</span><br><span>diff --git a/src/osmo-bsc/nm_gprs_nsvc_fsm.c b/src/osmo-bsc/nm_gprs_nsvc_fsm.c</span><br><span>index d28dfd3..ffc5659 100644</span><br><span>--- a/src/osmo-bsc/nm_gprs_nsvc_fsm.c</span><br><span>+++ b/src/osmo-bsc/nm_gprs_nsvc_fsm.c</span><br><span>@@ -103,7 +103,7 @@</span><br><span>                     return;</span><br><span>              }</span><br><span>            nsvc->mo.set_attr_sent = true;</span><br><span style="color: hsl(0, 100%, 40%);">-               msgb = nanobts_attr_nscv_get(nsvc->bts);</span><br><span style="color: hsl(120, 100%, 40%);">+           msgb = nanobts_attr_nsvc_get(nsvc->bts);</span><br><span>          OSMO_ASSERT(msgb);</span><br><span>           abis_nm_ipaccess_set_attr(nsvc->bts, NM_OC_GPRS_NSVC, nsvc->bts->bts_nr,</span><br><span>                                      nsvc->id, 0xff, msgb->data, msgb->len);</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 6e85138..73ba869 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>@@ -151,13 +151,13 @@</span><br><span>      printf("\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void test_nanobts_attr_nscv_get(struct gsm_bts *bts, uint8_t *expected)</span><br><span style="color: hsl(120, 100%, 40%);">+static void test_nanobts_attr_nsvc_get(struct gsm_bts *bts, uint8_t *expected)</span><br><span> {</span><br><span>  struct msgb *msgb;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  printf("Testing nanobts_attr_nscv_get()...\n");</span><br><span style="color: hsl(120, 100%, 40%);">+     printf("Testing nanobts_attr_nsvc_get()...\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   msgb = nanobts_attr_nscv_get(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+    msgb = nanobts_attr_nsvc_get(bts);</span><br><span>   printf("result=  %s\n", osmo_hexdump_nospc(msgb->data, msgb->len));</span><br><span>  printf("expected=%s\n", osmo_hexdump_nospc(expected, msgb->len));</span><br><span>       OSMO_ASSERT(memcmp(msgb->data, expected, msgb->len) == 0);</span><br><span>@@ -173,7 +173,7 @@</span><br><span> {</span><br><span>  struct msgb *msgb;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  printf("Testing nanobts_attr_nscv_get()...\n");</span><br><span style="color: hsl(120, 100%, 40%);">+     printf("Testing nanobts_attr_nsvc_get()...\n");</span><br><span> </span><br><span>        msgb = nanobts_attr_radio_get(bts, trx);</span><br><span>     printf("result=  %s\n", osmo_hexdump_nospc(msgb->data, msgb->len));</span><br><span>@@ -263,7 +263,7 @@</span><br><span>            0xfa, 0x00, 0xfa, 0x02</span><br><span>       };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  /* Parameters needed to test nanobts_attr_nscv_get() */</span><br><span style="color: hsl(120, 100%, 40%);">+       /* Parameters needed to test nanobts_attr_nsvc_get() */</span><br><span>      struct osmo_sockaddr_str addr;</span><br><span>       osmo_sockaddr_str_from_str(&addr, "10.9.1.101", 23000);</span><br><span>        osmo_sockaddr_str_to_sockaddr(&addr, &bts->site_mgr->gprs.nsvc[0].remote.u.sas);</span><br><span>@@ -285,7 +285,7 @@</span><br><span>         test_nanobts_attr_bts_get(bts, attr_bts_expected);</span><br><span>   test_nanobts_attr_nse_get(bts, attr_nse_expected);</span><br><span>   test_nanobts_attr_cell_get(bts, attr_cell_expected);</span><br><span style="color: hsl(0, 100%, 40%);">-    test_nanobts_attr_nscv_get(bts, attr_nscv_expected);</span><br><span style="color: hsl(120, 100%, 40%);">+  test_nanobts_attr_nsvc_get(bts, attr_nscv_expected);</span><br><span>         test_nanobts_attr_radio_get(bts, trx, attr_radio_expected);</span><br><span> </span><br><span>      /* NSVC IPv6 test */</span><br><span>@@ -303,7 +303,7 @@</span><br><span>         0xfd, 0x00, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56,</span><br><span>              0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12,</span><br><span>            };</span><br><span style="color: hsl(0, 100%, 40%);">-  test_nanobts_attr_nscv_get(bts, attr_nscv6_expected);</span><br><span style="color: hsl(120, 100%, 40%);">+ test_nanobts_attr_nsvc_get(bts, attr_nscv6_expected);</span><br><span> </span><br><span> </span><br><span>        printf("Done\n");</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 abdb95e..2f3ff77 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>@@ -13,17 +13,17 @@</span><br><span> expected=9a0001009c000205039e00020002a30009140505a0050a04080fa800020f00a9000500fa00fa02</span><br><span> ok.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-Testing nanobts_attr_nscv_get()...</span><br><span style="color: hsl(120, 100%, 40%);">+Testing nanobts_attr_nsvc_get()...</span><br><span> result=  9f00020065a2000859d80a0901655a3c</span><br><span> expected=9f00020065a2000859d80a0901655a3c</span><br><span> ok.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-Testing nanobts_attr_nscv_get()...</span><br><span style="color: hsl(120, 100%, 40%);">+Testing nanobts_attr_nsvc_get()...</span><br><span> result=  2d0b0500020362</span><br><span> expected=2d0b0500020362</span><br><span> ok.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-Testing nanobts_attr_nscv_get()...</span><br><span style="color: hsl(120, 100%, 40%);">+Testing nanobts_attr_nsvc_get()...</span><br><span> result=  9f00020065fd001629005a3c59e2fd005678901234567890123456789012</span><br><span> expected=9f00020065fd001629005a3c59e2fd005678901234567890123456789012</span><br><span> ok.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21538">change 21538</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/+/21538"/><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: I50235ba7b045ab7fba2112e61191d2756a67dfdc </div>
<div style="display:none"> Gerrit-Change-Number: 21538 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </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-MessageType: merged </div>