diff options
| author | Max <msuraev@sysmocom.de> | 2018-10-25 17:58:43 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-11-18 20:12:41 +0000 |
| commit | ba8a007a2dc95cb14671f3200148efdf76e5bd1d (patch) | |
| tree | b118f7275feca73b67fa63445649276b89d5a936 /tests | |
| parent | 6038ad4cf9b3e1a138a15ae30d9e7e98027cac65 (diff) | |
msc_vlr_tests: tweak conn_exists()
* constify function parameter
* internalize parameter check
Change-Id: Icf507d094319123c6667ba963db1d385df4d4f92
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/msc_vlr/msc_vlr_tests.c | 13 | ||||
| -rw-r--r-- | tests/msc_vlr/msc_vlr_tests.h | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 1192cf210..fd196c871 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -161,13 +161,18 @@ void gsup_rx(const char *rx_hex, const char *expect_tx_hex) OSMO_ASSERT(gsup_tx_confirmed); } -bool conn_exists(struct gsm_subscriber_connection *conn) +bool conn_exists(const struct gsm_subscriber_connection *conn) { struct gsm_subscriber_connection *c; + + if (!conn) + return false; + llist_for_each_entry(c, &net->subscr_conns, entry) { if (c == conn) return true; } + return false; } @@ -212,7 +217,7 @@ void rx_from_ms(struct msgb *msg) ran_type_name(rx_from_ran), gh_type_name(gh)); - if (g_conn && !conn_exists(g_conn)) + if (!conn_exists(g_conn)) g_conn = NULL; if (!g_conn) { @@ -230,7 +235,7 @@ void rx_from_ms(struct msgb *msg) msc_dtap(g_conn, 23, msg); } - if (g_conn && !conn_exists(g_conn)) + if (!conn_exists(g_conn)) g_conn = NULL; } @@ -258,7 +263,7 @@ void bss_sends_bssap_mgmt(const char *hex) bh->type = BSSAP_MSG_BSS_MANAGEMENT; bh->length = msgb_l3len(msg); - if (g_conn && !conn_exists(g_conn)) + if (!conn_exists(g_conn)) g_conn = NULL; OSMO_ASSERT(g_conn); diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index cc200bdff..40377c14c 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -152,7 +152,7 @@ extern msc_vlr_test_func_t msc_vlr_tests[]; struct msgb *msgb_from_hex(const char *label, uint16_t size, const char *hex); void clear_vlr(); -bool conn_exists(struct gsm_subscriber_connection *conn); +bool conn_exists(const struct gsm_subscriber_connection *conn); void conn_conclude_cm_service_req(struct gsm_subscriber_connection *conn, enum ran_type via_ran); |