From 396eb76fcd64b3e801005a1d8ec32ac53b725d7b Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Fri, 4 Dec 2020 14:22:48 +0100 Subject: [PATCH] Fix typo in function nanobts_attr_nsvc_get Change-Id: I50235ba7b045ab7fba2112e61191d2756a67dfdc --- include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h | 2 +- src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c | 2 +- src/osmo-bsc/nm_gprs_nsvc_fsm.c | 2 +- tests/nanobts_omlattr/nanobts_omlattr_test.c | 14 +++++++------- tests/nanobts_omlattr/nanobts_omlattr_test.ok | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h b/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h index 22a8c34cb..687f16a23 100644 --- a/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h +++ b/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h @@ -31,6 +31,6 @@ struct gsm_bts_trx; struct msgb *nanobts_attr_bts_get(struct gsm_bts *bts); struct msgb *nanobts_attr_nse_get(struct gsm_bts_sm *bts_sm); struct msgb *nanobts_attr_cell_get(struct gsm_bts *bts); -struct msgb *nanobts_attr_nscv_get(struct gsm_bts *bts); +struct msgb *nanobts_attr_nsvc_get(struct gsm_bts *bts); struct msgb *nanobts_attr_radio_get(struct gsm_bts *bts, struct gsm_bts_trx *trx); diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c index e23a688e3..885f4cc21 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c @@ -199,7 +199,7 @@ struct msgb *nanobts_attr_cell_get(struct gsm_bts *bts) return msgb; } -struct msgb *nanobts_attr_nscv_get(struct gsm_bts *bts) +struct msgb *nanobts_attr_nsvc_get(struct gsm_bts *bts) { struct msgb *msgb; uint8_t buf[256]; diff --git a/src/osmo-bsc/nm_gprs_nsvc_fsm.c b/src/osmo-bsc/nm_gprs_nsvc_fsm.c index d28dfd364..ffc565944 100644 --- a/src/osmo-bsc/nm_gprs_nsvc_fsm.c +++ b/src/osmo-bsc/nm_gprs_nsvc_fsm.c @@ -103,7 +103,7 @@ static void configure_loop(struct gsm_gprs_nsvc *nsvc, struct gsm_nm_state *stat return; } nsvc->mo.set_attr_sent = true; - msgb = nanobts_attr_nscv_get(nsvc->bts); + msgb = nanobts_attr_nsvc_get(nsvc->bts); OSMO_ASSERT(msgb); abis_nm_ipaccess_set_attr(nsvc->bts, NM_OC_GPRS_NSVC, nsvc->bts->bts_nr, nsvc->id, 0xff, msgb->data, msgb->len); diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c index 6e851380f..73ba86950 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -151,13 +151,13 @@ static void test_nanobts_attr_cell_get(struct gsm_bts *bts, uint8_t *expected) printf("\n"); } -static void test_nanobts_attr_nscv_get(struct gsm_bts *bts, uint8_t *expected) +static void test_nanobts_attr_nsvc_get(struct gsm_bts *bts, uint8_t *expected) { struct msgb *msgb; - printf("Testing nanobts_attr_nscv_get()...\n"); + printf("Testing nanobts_attr_nsvc_get()...\n"); - msgb = nanobts_attr_nscv_get(bts); + msgb = nanobts_attr_nsvc_get(bts); printf("result= %s\n", osmo_hexdump_nospc(msgb->data, msgb->len)); printf("expected=%s\n", osmo_hexdump_nospc(expected, msgb->len)); OSMO_ASSERT(memcmp(msgb->data, expected, msgb->len) == 0); @@ -173,7 +173,7 @@ static void test_nanobts_attr_radio_get(struct gsm_bts *bts, { struct msgb *msgb; - printf("Testing nanobts_attr_nscv_get()...\n"); + printf("Testing nanobts_attr_nsvc_get()...\n"); msgb = nanobts_attr_radio_get(bts, trx); printf("result= %s\n", osmo_hexdump_nospc(msgb->data, msgb->len)); @@ -263,7 +263,7 @@ int main(int argc, char **argv) 0xfa, 0x00, 0xfa, 0x02 }; - /* Parameters needed to test nanobts_attr_nscv_get() */ + /* Parameters needed to test nanobts_attr_nsvc_get() */ struct osmo_sockaddr_str addr; osmo_sockaddr_str_from_str(&addr, "10.9.1.101", 23000); osmo_sockaddr_str_to_sockaddr(&addr, &bts->site_mgr->gprs.nsvc[0].remote.u.sas); @@ -285,7 +285,7 @@ int main(int argc, char **argv) test_nanobts_attr_bts_get(bts, attr_bts_expected); test_nanobts_attr_nse_get(bts, attr_nse_expected); test_nanobts_attr_cell_get(bts, attr_cell_expected); - test_nanobts_attr_nscv_get(bts, attr_nscv_expected); + test_nanobts_attr_nsvc_get(bts, attr_nscv_expected); test_nanobts_attr_radio_get(bts, trx, attr_radio_expected); /* NSVC IPv6 test */ @@ -303,7 +303,7 @@ int main(int argc, char **argv) 0xfd, 0x00, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12, }; - test_nanobts_attr_nscv_get(bts, attr_nscv6_expected); + test_nanobts_attr_nsvc_get(bts, attr_nscv6_expected); printf("Done\n"); diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.ok b/tests/nanobts_omlattr/nanobts_omlattr_test.ok index abdb95e99..2f3ff771e 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.ok +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.ok @@ -13,17 +13,17 @@ result= 9a0001009c000205039e00020002a30009140505a0050a04080fa800020f00a9000500f expected=9a0001009c000205039e00020002a30009140505a0050a04080fa800020f00a9000500fa00fa02 ok. -Testing nanobts_attr_nscv_get()... +Testing nanobts_attr_nsvc_get()... result= 9f00020065a2000859d80a0901655a3c expected=9f00020065a2000859d80a0901655a3c ok. -Testing nanobts_attr_nscv_get()... +Testing nanobts_attr_nsvc_get()... result= 2d0b0500020362 expected=2d0b0500020362 ok. -Testing nanobts_attr_nscv_get()... +Testing nanobts_attr_nsvc_get()... result= 9f00020065fd001629005a3c59e2fd005678901234567890123456789012 expected=9f00020065fd001629005a3c59e2fd005678901234567890123456789012 ok.