vlr_subscr: use osmo_use_count
Depends: Ife31e6798b4e728a23913179e346552a7dd338c0 (libosmocore)
Change-Id: Ib06d030e8464abe415ff597d462ed40eeddef475
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
index 8dca655..0153609 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
@@ -126,7 +126,7 @@
BTW("an SMS is sent, MS is paged");
paging_expect_imsi(imsi);
paging_sent = false;
- vsub = vlr_subscr_find_by_imsi(net->vlr, imsi);
+ vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);
OSMO_ASSERT(vsub);
VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 0, "%d");
@@ -135,16 +135,16 @@
" marketing option.");
VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 1, "%d");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
vsub = NULL;
VERBOSE_ASSERT(paging_sent, == true, "%d");
VERBOSE_ASSERT(paging_stopped, == false, "%d");
btw("the subscriber and its pending request should remain");
- vsub = vlr_subscr_find_by_imsi(net->vlr, imsi);
+ vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);
OSMO_ASSERT(vsub);
VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 1, "%d");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
btw("MS replies with Paging Response, and VLR sends Auth Request with third key");
auth_request_sent = false;
@@ -183,10 +183,10 @@
VERBOSE_ASSERT(paging_stopped, == true, "%d");
btw("SMS was delivered, no requests pending for subscr");
- vsub = vlr_subscr_find_by_imsi(net->vlr, imsi);
+ vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);
OSMO_ASSERT(vsub);
VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 0, "%d");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
btw("conn is still open to wait for SMS ack dance");
EXPECT_CONN_COUNT(1);
@@ -289,12 +289,12 @@
thwart_rx_non_initial_requests();
btw("even though the TMSI is not acked, we can already find the subscr with it");
- vsub = vlr_subscr_find_by_tmsi(net->vlr, 0x03020100);
+ vsub = vlr_subscr_find_by_tmsi(net->vlr, 0x03020100, __func__);
VERBOSE_ASSERT(vsub != NULL, == true, "%d");
VERBOSE_ASSERT(strcmp(vsub->imsi, imsi), == 0, "%d");
VERBOSE_ASSERT(vsub->tmsi_new, == 0x03020100, "0x%08x");
VERBOSE_ASSERT(vsub->tmsi, == GSM_RESERVED_TMSI, "0x%08x");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
btw("MS sends TMSI Realloc Complete");
expect_bssap_clear();
@@ -306,12 +306,12 @@
EXPECT_CONN_COUNT(0);
btw("Subscriber has the new TMSI");
- vsub = vlr_subscr_find_by_imsi(net->vlr, imsi);
+ vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);
VERBOSE_ASSERT(vsub != NULL, == true, "%d");
VERBOSE_ASSERT(strcmp(vsub->imsi, imsi), == 0, "%d");
VERBOSE_ASSERT(vsub->tmsi_new, == GSM_RESERVED_TMSI, "0x%08x");
VERBOSE_ASSERT(vsub->tmsi, == 0x03020100, "0x%08x");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
BTW("after a while, a new conn sends a CM Service Request using above TMSI. VLR responds with Auth Req, 2nd auth vector");
auth_request_sent = false;
@@ -344,7 +344,7 @@
BTW("an SMS is sent, MS is paged");
paging_expect_tmsi(0x03020100);
paging_sent = false;
- vsub = vlr_subscr_find_by_tmsi(net->vlr, 0x03020100);
+ vsub = vlr_subscr_find_by_tmsi(net->vlr, 0x03020100, __func__);
OSMO_ASSERT(vsub);
VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 0, "%d");
@@ -353,16 +353,16 @@
" marketing option.");
VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 1, "%d");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
vsub = NULL;
VERBOSE_ASSERT(paging_sent, == true, "%d");
VERBOSE_ASSERT(paging_stopped, == false, "%d");
btw("the subscriber and its pending request should remain");
- vsub = vlr_subscr_find_by_imsi(net->vlr, imsi);
+ vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);
OSMO_ASSERT(vsub);
VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 1, "%d");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
btw("MS replies with Paging Response using TMSI, and VLR sends Auth Request with third key");
auth_request_sent = false;
@@ -401,10 +401,10 @@
VERBOSE_ASSERT(paging_stopped, == true, "%d");
btw("SMS was delivered, no requests pending for subscr");
- vsub = vlr_subscr_find_by_imsi(net->vlr, imsi);
+ vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);
OSMO_ASSERT(vsub);
VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 0, "%d");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
btw("conn is still open to wait for SMS ack dance");
EXPECT_CONN_COUNT(1);
@@ -466,12 +466,12 @@
thwart_rx_non_initial_requests();
btw("even though the TMSI is not acked, we can already find the subscr with it");
- vsub = vlr_subscr_find_by_tmsi(net->vlr, 0x07060504);
+ vsub = vlr_subscr_find_by_tmsi(net->vlr, 0x07060504, __func__);
VERBOSE_ASSERT(vsub != NULL, == true, "%d");
VERBOSE_ASSERT(strcmp(vsub->imsi, imsi), == 0, "%d");
VERBOSE_ASSERT(vsub->tmsi_new, == 0x07060504, "0x%08x");
VERBOSE_ASSERT(vsub->tmsi, == 0x03020100, "0x%08x");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
btw("MS sends TMSI Realloc Complete");
expect_bssap_clear();
@@ -483,12 +483,12 @@
EXPECT_CONN_COUNT(0);
btw("subscriber has the new TMSI");
- vsub = vlr_subscr_find_by_tmsi(net->vlr, 0x07060504);
+ vsub = vlr_subscr_find_by_tmsi(net->vlr, 0x07060504, __func__);
VERBOSE_ASSERT(vsub != NULL, == true, "%d");
VERBOSE_ASSERT(strcmp(vsub->imsi, imsi), == 0, "%d");
VERBOSE_ASSERT(vsub->tmsi_new, == GSM_RESERVED_TMSI, "0x%08x");
VERBOSE_ASSERT(vsub->tmsi, == 0x07060504, "0x%08x");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
BTW("subscriber detaches, using new TMSI");
expect_bssap_clear();
@@ -567,10 +567,10 @@
btw("We will only do business when the IMEI is known");
EXPECT_CONN_COUNT(1);
- vsub = vlr_subscr_find_by_imsi(net->vlr, imsi);
+ vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);
OSMO_ASSERT(vsub);
VERBOSE_ASSERT(vsub->imei[0], == 0, "%d");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
EXPECT_ACCEPTED(false);
thwart_rx_non_initial_requests();
@@ -591,10 +591,10 @@
EXPECT_CONN_COUNT(0);
btw("Subscriber has the IMEI");
- vsub = vlr_subscr_find_by_imsi(net->vlr, imsi);
+ vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);
OSMO_ASSERT(vsub);
VERBOSE_ASSERT(strcmp(vsub->imei, "423423423423420"), == 0, "%d");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
BTW("subscriber detaches");
expect_bssap_clear();
@@ -675,10 +675,10 @@
btw("We will only do business when the IMEI is known");
EXPECT_CONN_COUNT(1);
- vsub = vlr_subscr_find_by_imsi(net->vlr, imsi);
+ vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);
OSMO_ASSERT(vsub);
VERBOSE_ASSERT(vsub->imei[0], == 0, "%d");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
EXPECT_ACCEPTED(false);
thwart_rx_non_initial_requests();
@@ -768,10 +768,10 @@
btw("We will only do business when the IMEI is known");
EXPECT_CONN_COUNT(1);
- vsub = vlr_subscr_find_by_imsi(net->vlr, imsi);
+ vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);
OSMO_ASSERT(vsub);
VERBOSE_ASSERT(vsub->imei[0], == 0, "%d");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
EXPECT_ACCEPTED(false);
thwart_rx_non_initial_requests();
@@ -862,10 +862,10 @@
btw("We will only do business when the IMEI is known");
EXPECT_CONN_COUNT(1);
- vsub = vlr_subscr_find_by_imsi(net->vlr, imsi);
+ vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);
OSMO_ASSERT(vsub);
VERBOSE_ASSERT(vsub->imei[0], == 0, "%d");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
EXPECT_ACCEPTED(false);
thwart_rx_non_initial_requests();
@@ -885,12 +885,12 @@
thwart_rx_non_initial_requests();
btw("even though the TMSI is not acked, we can already find the subscr with it");
- vsub = vlr_subscr_find_by_tmsi(net->vlr, 0x03020100);
+ vsub = vlr_subscr_find_by_tmsi(net->vlr, 0x03020100, __func__);
VERBOSE_ASSERT(vsub != NULL, == true, "%d");
VERBOSE_ASSERT(strcmp(vsub->imsi, imsi), == 0, "%d");
VERBOSE_ASSERT(vsub->tmsi_new, == 0x03020100, "0x%08x");
VERBOSE_ASSERT(vsub->tmsi, == GSM_RESERVED_TMSI, "0x%08x");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
btw("MS sends TMSI Realloc Complete");
expect_bssap_clear();
@@ -902,11 +902,11 @@
EXPECT_CONN_COUNT(0);
btw("Subscriber has the IMEI and TMSI");
- vsub = vlr_subscr_find_by_imsi(net->vlr, imsi);
+ vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);
OSMO_ASSERT(vsub);
VERBOSE_ASSERT(strcmp(vsub->imei, "423423423423420"), == 0, "%d");
VERBOSE_ASSERT(vsub->tmsi, == 0x03020100, "0x%08x");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
BTW("subscriber detaches, using TMSI");
expect_bssap_clear();
@@ -1037,7 +1037,7 @@
BTW("an SMS is sent, MS is paged");
paging_expect_imsi(imsi);
paging_sent = false;
- vsub = vlr_subscr_find_by_imsi(net->vlr, imsi);
+ vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);
OSMO_ASSERT(vsub);
VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 0, "%d");
@@ -1046,16 +1046,16 @@
" marketing option.");
VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 1, "%d");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
vsub = NULL;
VERBOSE_ASSERT(paging_sent, == true, "%d");
VERBOSE_ASSERT(paging_stopped, == false, "%d");
btw("the subscriber and its pending request should remain");
- vsub = vlr_subscr_find_by_imsi(net->vlr, imsi);
+ vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);
OSMO_ASSERT(vsub);
VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 1, "%d");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
btw("MS replies with Paging Response, and VLR sends Auth Request with third key");
auth_request_sent = false;
@@ -1097,10 +1097,10 @@
VERBOSE_ASSERT(paging_stopped, == true, "%d");
btw("SMS was delivered, no requests pending for subscr");
- vsub = vlr_subscr_find_by_imsi(net->vlr, imsi);
+ vsub = vlr_subscr_find_by_imsi(net->vlr, imsi, __func__);
OSMO_ASSERT(vsub);
VERBOSE_ASSERT(llist_count(&vsub->cs.requests), == 0, "%d");
- vlr_subscr_put(vsub);
+ vlr_subscr_put(vsub, __func__);
btw("conn is still open to wait for SMS ack dance");
EXPECT_CONN_COUNT(1);