diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 6050113ef..e926b3f87 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -96,6 +97,11 @@ static const struct rate_ctr_desc msc_ctr_description[] = { [MSC_CTR_BSSMAP_CIPHER_MODE_COMPLETE] = {"bssmap:cipher_mode_complete", "Number of CIPHER MODE COMPLETE messages processed by BSSMAP layer"}, }; +enum { + MSC_STAT_ACTIVE_CALLS, + MSC_STAT_ACTIVE_NC_SS, +}; + static const struct rate_ctr_group_desc msc_ctrg_desc = { "msc", "mobile switching center", @@ -104,6 +110,19 @@ static const struct rate_ctr_group_desc msc_ctrg_desc = { msc_ctr_description, }; +static const struct osmo_stat_item_desc msc_stat_item_description[] = { + [MSC_STAT_ACTIVE_CALLS] = { "msc.active_calls", "Currently active calls " , OSMO_STAT_ITEM_NO_UNIT, 4, 0}, + [MSC_STAT_ACTIVE_NC_SS] = { "msc.active_nc_ss", "Currently active SS/USSD sessions", OSMO_STAT_ITEM_NO_UNIT, 4, 0}, +}; + +static const struct osmo_stat_item_group_desc msc_statg_desc = { + "net", + "network statistics", + OSMO_STATS_CLASS_GLOBAL, + ARRAY_SIZE(msc_stat_item_description), + msc_stat_item_description, +}; + #define MSC_PAGING_RESPONSE_TIMER_DEFAULT 10 struct gsm_tz { @@ -131,8 +150,7 @@ struct gsm_network { int send_mm_info; struct rate_ctr_group *msc_ctrs; - struct osmo_counter *active_calls; - struct osmo_counter *active_nc_ss; + struct osmo_stat_item_group *statg; /* layer 4 */ char *mncc_sock_path; diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 2869bba12..03830de63 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -161,7 +161,7 @@ static void count_statistics(struct gsm_trans *trans, int new_state) /* state incoming */ switch (new_state) { case GSM_CSTATE_ACTIVE: - osmo_counter_inc(trans->net->active_calls); + osmo_stat_item_inc(trans->net->statg->items[MSC_STAT_ACTIVE_CALLS], 1); rate_ctr_inc(&msc->ctr[MSC_CTR_CALL_ACTIVE]); break; } @@ -169,7 +169,7 @@ static void count_statistics(struct gsm_trans *trans, int new_state) /* state outgoing */ switch (old_state) { case GSM_CSTATE_ACTIVE: - osmo_counter_dec(trans->net->active_calls); + osmo_stat_item_dec(trans->net->statg->items[MSC_STAT_ACTIVE_CALLS], 1); if (new_state == GSM_CSTATE_DISCONNECT_REQ || new_state == GSM_CSTATE_DISCONNECT_IND) rate_ctr_inc(&msc->ctr[MSC_CTR_CALL_COMPLETE]); diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index 79fcb5a97..8a13cdad6 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -32,6 +32,7 @@ #include #include +#include #include #include @@ -158,7 +159,7 @@ int gsm0911_rcv_nc_ss(struct msc_a *msc_a, struct msgb *msg) ncss_session_timeout_handler, trans); /* Count active NC SS/USSD sessions */ - osmo_counter_inc(net->active_nc_ss); + osmo_stat_item_inc(net->statg->items[MSC_STAT_ACTIVE_NC_SS], 1); trans->dlci = OMSC_LINKID_CB(msg); trans->msc_a = msc_a; @@ -362,7 +363,7 @@ static struct gsm_trans *establish_nc_ss_trans(struct gsm_network *net, } /* Count active NC SS/USSD sessions */ - osmo_counter_inc(net->active_nc_ss); + osmo_stat_item_inc(net->statg->items[MSC_STAT_ACTIVE_NC_SS], 1); /* Init inactivity timer */ osmo_timer_setup(&trans->ss.timer_guard, @@ -414,7 +415,7 @@ void _gsm911_nc_ss_trans_free(struct gsm_trans *trans) osmo_timer_del(&trans->ss.timer_guard); /* One session less */ - osmo_counter_dec(trans->net->active_nc_ss); + osmo_stat_item_dec(trans->net->statg->items[MSC_STAT_ACTIVE_NC_SS], 1); } int gsm0911_gsup_rx(struct gsup_client_mux *gcm, void *data, const struct osmo_gsup_message *gsup_msg) diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c index 4a752bf76..11920f377 100644 --- a/src/libmsc/msc_net_init.c +++ b/src/libmsc/msc_net_init.c @@ -35,6 +35,8 @@ struct osmo_tdef mncc_tdefs[] = { {} }; +#include + struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv) { struct gsm_network *net; @@ -66,8 +68,13 @@ struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv) talloc_free(net); return NULL; } - net->active_calls = osmo_counter_alloc("msc.active_calls"); - net->active_nc_ss = osmo_counter_alloc("msc.active_nc_ss"); + + net->statg = osmo_stat_item_group_alloc(net, &msc_statg_desc, 0); + if (!net->statg) { + rate_ctr_group_free(net->msc_ctrs); + talloc_free(net); + return NULL; + } net->mncc_tdefs = mncc_tdefs; net->mncc_recv = mncc_recv; diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err index ea156de99..aa78cdb76 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err @@ -1,6 +1,6 @@ DLMGCP MGCP client: using endpoint domain '@mgw' full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_auth_use_twice_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -502,7 +502,7 @@ DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:NONE){MSC_A ===== test_auth_use_twice_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_auth_use_twice_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1034,7 +1034,7 @@ DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_ ===== test_auth_use_twice_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_auth_use_infinitely_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1639,7 +1639,7 @@ DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:NONE){MSC_A ===== test_auth_use_infinitely_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_auth_use_infinitely_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2283,7 +2283,7 @@ DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_ ===== test_auth_use_infinitely_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_no_auth_reuse_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2670,7 +2670,7 @@ DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:NONE){MSC_A ===== test_no_auth_reuse_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_no_auth_reuse_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -3078,8 +3078,8 @@ DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_ ===== test_no_auth_reuse_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err index 0eaa2f304..d5fd893d8 100644 --- a/tests/msc_vlr/msc_vlr_test_call.err +++ b/tests/msc_vlr/msc_vlr_test_call.err @@ -1,6 +1,6 @@ DLMGCP MGCP client: using endpoint domain '@mgw' full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_call_mo - Total time passed: 0.000000 s @@ -426,7 +426,7 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max t ===== test_call_mo: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_call_mt - Total time passed: 0.000000 s @@ -850,7 +850,7 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max t ===== test_call_mt: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_call_mt2 - Total time passed: 0.000000 s @@ -1233,7 +1233,7 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max t ===== test_call_mt2: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_call_mo_to_unknown - Total time passed: 0.000000 s @@ -1618,7 +1618,7 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max t ===== test_call_mo_to_unknown: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_call_mo_to_unknown_timeout - Total time passed: 0.000000 s @@ -1999,8 +1999,8 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max t ===== test_call_mo_to_unknown_timeout: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err index 45b047d86..0a183022a 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err @@ -1,6 +1,6 @@ DLMGCP MGCP client: using endpoint domain '@mgw' full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_gsm_authen - Location Update request causes a GSUP Send Auth Info request to HLR @@ -581,7 +581,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:NONE){MSC_A_ST_RELEASED}: D ===== test_gsm_authen: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_gsm_authen_tmsi - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1401,7 +1401,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x07060504:GERAN-A:NONE){MSC_A ===== test_gsm_authen_tmsi: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_gsm_authen_imei - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1712,7 +1712,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:NONE){MSC_A_ST_RELEASED}: D ===== test_gsm_authen_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_gsm_authen_imei_nack - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1978,7 +1978,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_RELEASED}: Dea ===== test_gsm_authen_imei_nack: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_gsm_authen_imei_err - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2245,7 +2245,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_RELEASED}: Dea ===== test_gsm_authen_imei_err: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_gsm_authen_tmsi_imei - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2597,7 +2597,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A:NONE){MSC_A ===== test_gsm_authen_tmsi_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_gsm_milenage_authen - Location Update request causes a GSUP Send Auth Info request to HLR @@ -3152,7 +3152,7 @@ DMSC msc_a(IMSI-901700000010650:MSISDN-42342:GERAN-A:NONE){MSC_A_ST_RELEASED}: D ===== test_gsm_milenage_authen: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_wrong_sres_length - Total time passed: 0.000000 s @@ -3297,8 +3297,8 @@ DMSC msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_RELEASED}: Deallocated, inc ===== test_wrong_sres_length: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err index b527f05af..893203e63 100644 --- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err +++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err @@ -1,6 +1,6 @@ DLMGCP MGCP client: using endpoint domain '@mgw' full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_ciph - Location Update request causes a GSUP Send Auth Info request to HLR @@ -650,7 +650,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:NONE){MSC_A_ST_RELEASED}: D ===== test_ciph: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_ciph_tmsi - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1348,7 +1348,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A:NONE){MSC_A ===== test_ciph_tmsi: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_ciph_imei - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1666,7 +1666,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:NONE){MSC_A_ST_RELEASED}: D ===== test_ciph_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_ciph_imeisv - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1951,7 +1951,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:NONE){MSC_A_ST_RELEASED}: D ===== test_ciph_imeisv: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_ciph_tmsi_imei - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2310,7 +2310,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A:NONE){MSC_A ===== test_ciph_tmsi_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_gsm_ciph_in_umts_env - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2905,7 +2905,7 @@ DMSC msc_a(IMSI-901700000010650:MSISDN-42342:GERAN-A:NONE){MSC_A_ST_RELEASED}: D ===== test_gsm_ciph_in_umts_env: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_a5_3_supported - Location Update request causes a GSUP Send Auth Info request to HLR @@ -3547,7 +3547,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-42342:GERAN-A:NONE){MSC_A_ST_RELEASED}: D ===== test_a5_3_supported: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_cm_service_needs_classmark_update - Location Update request causes a GSUP Send Auth Info request to HLR @@ -4167,8 +4167,8 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-42342:GERAN-A:NONE){MSC_A_ST_RELEASED}: D ===== test_cm_service_needs_classmark_update: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err index 2dd6a52e6..9d0737a02 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err @@ -1,6 +1,6 @@ DLMGCP MGCP client: using endpoint domain '@mgw' full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_hlr_rej_auth_info_unknown_imsi - Location Update request causes a GSUP Send Auth Info request to HLR @@ -102,7 +102,7 @@ DMSC msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_RELEASED}: Deallocated, inc ===== test_hlr_rej_auth_info_unknown_imsi: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_hlr_rej_auth_info_net_fail - Location Update request causes a GSUP Send Auth Info request to HLR @@ -204,7 +204,7 @@ DMSC msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_RELEASED}: Deallocated, inc ===== test_hlr_rej_auth_info_net_fail: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_hlr_rej_auth_info_net_fail_reuse_tuples @@ -530,7 +530,7 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count w ===== test_hlr_rej_auth_info_net_fail_reuse_tuples: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_hlr_rej_auth_info_net_fail_no_reuse_tuples @@ -797,7 +797,7 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count w ===== test_hlr_rej_auth_info_net_fail_no_reuse_tuples: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples @@ -1065,7 +1065,7 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count w ===== test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_hlr_acc_but_no_auth_tuples - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1166,7 +1166,7 @@ DMSC msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_RELEASED}: Deallocated, inc ===== test_hlr_acc_but_no_auth_tuples: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_hlr_rej_lu - Location Update request causes a GSUP LU request to HLR @@ -1270,7 +1270,7 @@ DMSC msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_RELEASED}: Deallocated, inc ===== test_hlr_rej_lu: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_hlr_no_insert_data - Location Update request causes a GSUP LU request to HLR @@ -1386,8 +1386,8 @@ DVLR freeing VLR subscr IMSI-901700000004620 (max total use count was 5) ===== test_hlr_no_insert_data: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err index 60b240da6..68368c079 100644 --- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err @@ -1,6 +1,6 @@ DLMGCP MGCP client: using endpoint domain '@mgw' full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_hlr_timeout_lu_auth_info - Total time passed: 0.000000 s @@ -111,7 +111,7 @@ DMSC msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_RELEASED}: Deallocated, inc ===== test_hlr_timeout_lu_auth_info: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_hlr_timeout_lu_upd_loc_result - Total time passed: 0.000000 s @@ -239,8 +239,8 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:LU){MSC_A_ST_RELEASED}: Dea ===== test_hlr_timeout_lu_upd_loc_result: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err index 07f2b5b40..201852852 100644 --- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err +++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err @@ -1,6 +1,6 @@ DLMGCP MGCP client: using endpoint domain '@mgw' full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_ms_timeout_lu_auth_resp - Total time passed: 0.000000 s @@ -130,7 +130,7 @@ DMSC msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_RELEASED}: Deallocated, inc ===== test_ms_timeout_lu_auth_resp: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_ms_timeout_cm_auth_resp - Total time passed: 0.000000 s @@ -403,7 +403,7 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count w ===== test_ms_timeout_cm_auth_resp: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_ms_timeout_paging - Total time passed: 0.000000 s @@ -711,7 +711,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:NONE){MSC_A_ST_RELEASED}: D ===== test_ms_timeout_paging: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_classmark_update_timeout - Total time passed: 0.000000 s @@ -864,8 +864,8 @@ DMSC msc_a(IMSI-901700000004620:GERAN-A:LU){MSC_A_ST_RELEASED}: Deallocated, inc ===== test_classmark_update_timeout: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err index b6c069854..d53397621 100644 --- a/tests/msc_vlr/msc_vlr_test_no_authen.err +++ b/tests/msc_vlr/msc_vlr_test_no_authen.err @@ -1,6 +1,6 @@ DLMGCP MGCP client: using endpoint domain '@mgw' full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_no_authen - Location Update request causes a GSUP LU request to HLR @@ -448,7 +448,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:NONE){MSC_A_ST_RELEASED}: D ===== test_no_authen: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_no_authen_tmsi - Location Update request causes a GSUP LU request to HLR @@ -1128,7 +1128,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x07060504:GERAN-A:NONE){MSC_A ===== test_no_authen_tmsi: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_no_authen_imei - Location Update request causes a GSUP LU request to HLR @@ -1378,7 +1378,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:NONE){MSC_A_ST_RELEASED}: D ===== test_no_authen_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_no_authen_tmsi_imei - Location Update request causes a GSUP LU request to HLR @@ -1663,7 +1663,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A:NONE){MSC_A ===== test_no_authen_tmsi_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_no_authen_imeisv - Location Update request causes an IMEISV ID request back to the MS @@ -1883,7 +1883,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:NONE){MSC_A_ST_RELEASED}: D ===== test_no_authen_imeisv: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_no_authen_imeisv_imei - Location Update request causes an IMEISV ID request back to the MS @@ -2114,7 +2114,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:NONE){MSC_A_ST_RELEASED}: D ===== test_no_authen_imeisv_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_no_authen_imeisv_tmsi - Location Update request causes an IMEISV ID request back to the MS @@ -2578,7 +2578,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x07060504:GERAN-A:NONE){MSC_A ===== test_no_authen_imeisv_tmsi: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_no_authen_imeisv_tmsi_imei - Location Update request causes an IMEISV ID request back to the MS @@ -2846,7 +2846,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x03020100:GERAN-A:NONE){MSC_A ===== test_no_authen_imeisv_tmsi_imei: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_no_authen_subscr_expire - Total time passed: 0.000000 s @@ -2981,8 +2981,8 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count w ===== test_no_authen_subscr_expire: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err index e1df2db14..5101b0684 100644 --- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err +++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err @@ -1,6 +1,6 @@ DLMGCP MGCP client: using endpoint domain '@mgw' full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_reject_2nd_conn - Location Update Request on one connection @@ -190,7 +190,7 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count w ===== test_reject_2nd_conn: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_reject_lu_during_lu - Location Update Request @@ -331,7 +331,7 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count w ===== test_reject_lu_during_lu: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_reject_cm_during_lu - Location Update Request @@ -476,7 +476,7 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count w ===== test_reject_cm_during_lu: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_reject_paging_resp_during_lu - Location Update Request @@ -616,7 +616,7 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count w ===== test_reject_paging_resp_during_lu: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_reject_lu_during_cm @@ -851,7 +851,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_RE ===== test_reject_lu_during_cm: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_reject_cm_during_cm @@ -1090,7 +1090,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_RE ===== test_reject_cm_during_cm: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_reject_paging_resp_during_cm @@ -1314,7 +1314,7 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count w ===== test_reject_paging_resp_during_cm: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_reject_lu_during_paging_resp @@ -1612,7 +1612,7 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count w ===== test_reject_lu_during_paging_resp: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_accept_cm_during_paging_resp @@ -1933,7 +1933,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_RE ===== test_accept_cm_during_paging_resp: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_reject_paging_resp_during_paging_resp @@ -2228,8 +2228,8 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count w ===== test_reject_paging_resp_during_paging_resp: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index 3990d109a..fb10e6af5 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -1,6 +1,6 @@ DLMGCP MGCP client: using endpoint domain '@mgw' full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_cm_service_without_lu - CM Service Request without a prior Location Updating @@ -65,7 +65,7 @@ DMSC msc_a(IMSI-901700000004620:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_RELEASED}: Deal ===== test_cm_service_without_lu: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_two_lu - Location Update request causes a GSUP LU request to HLR @@ -404,7 +404,7 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:GERAN-A:NONE){MSC_A_ST_RELEASED}: D ===== test_two_lu: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_lu_unknown_tmsi - Location Update request with unknown TMSI sends ID Request for IMSI @@ -583,8 +583,8 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 (max t ===== test_lu_unknown_tmsi: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err index 9f47dba8a..243f7e0d5 100644 --- a/tests/msc_vlr/msc_vlr_test_ss.err +++ b/tests/msc_vlr/msc_vlr_test_ss.err @@ -1,6 +1,6 @@ DLMGCP MGCP client: using endpoint domain '@mgw' full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_ss_ussd_mo_geran - Location Update request causes a GSUP LU request to HLR @@ -235,7 +235,7 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count w ===== test_ss_ussd_mo_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_ss_ussd_no_geran - Location Update request causes a GSUP LU request to HLR @@ -495,8 +495,8 @@ DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count w ===== test_ss_ussd_no_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err index b11f077d4..63f1bbad2 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.err +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err @@ -1,6 +1,6 @@ DLMGCP MGCP client: using endpoint domain '@mgw' full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_umts_authen_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -599,7 +599,7 @@ DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:GERAN-A:NONE){MSC_A ===== test_umts_authen_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_umts_authen_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1229,7 +1229,7 @@ DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:NONE){MSC_ ===== test_umts_authen_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_umts_authen_resync_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1461,7 +1461,7 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max t ===== test_umts_authen_resync_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_umts_authen_resync_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1705,7 +1705,7 @@ DVLR freeing VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 (max t ===== test_umts_authen_resync_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_umts_authen_too_short_res_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1823,7 +1823,7 @@ DMSC msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_RELEASED}: Deallocated, inc ===== test_umts_authen_too_short_res_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_umts_authen_too_short_res_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -1941,7 +1941,7 @@ DMSC msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Deallocated, in ===== test_umts_authen_too_short_res_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_umts_authen_too_long_res_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2059,7 +2059,7 @@ DMSC msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_RELEASED}: Deallocated, inc ===== test_umts_authen_too_long_res_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_umts_authen_too_long_res_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2177,7 +2177,7 @@ DMSC msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Deallocated, in ===== test_umts_authen_too_long_res_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_umts_authen_only_sres_geran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2295,7 +2295,7 @@ DMSC msc_a(IMSI-901700000010650:GERAN-A:LU){MSC_A_ST_RELEASED}: Deallocated, inc ===== test_umts_authen_only_sres_geran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 ===== test_umts_authen_only_sres_utran - Location Update request causes a GSUP Send Auth Info request to HLR @@ -2413,8 +2413,8 @@ DMSC msc_a(IMSI-901700000010650:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Deallocated, in ===== test_umts_authen_only_sres_utran: SUCCESS full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 full talloc report on 'msgb' (total 0 bytes in 1 blocks) -talloc_total_blocks(tall_bsc_ctx) == 17 +talloc_total_blocks(tall_bsc_ctx) == 19 diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 35401ba16..4ccaee9b1 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -922,28 +922,30 @@ static void check_talloc(void *msgb_ctx, void *msc_vlr_tests_ctx) talloc_report_full(msgb_ctx, stderr); /* Expecting these to stick around in msc_vlr_tests_ctx: * full talloc report on 'msgb' (total 0 bytes in 1 blocks) - * talloc_total_blocks(tall_bsc_ctx) == 17 - * full talloc report on 'msc_vlr_tests_ctx' (total 6336 bytes in 17 blocks) - * struct osmo_gsup_client contains 256 bytes in 1 blocks (ref 0) 0x613000000260 - * struct gsm_network contains 4647 bytes in 9 blocks (ref 0) 0x6190000000e0 - * struct mgcp_client contains 688 bytes in 1 blocks (ref 0) 0x6180000000e0 - * struct sccp_ran_inst contains 152 bytes in 1 blocks (ref 0) 0x611000000460 - * struct sccp_ran_inst contains 152 bytes in 1 blocks (ref 0) 0x611000000320 - * struct gsup_client_mux contains 200 bytes in 2 blocks (ref 0) 0x6110000001e0 - * struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e000023180 - * struct vlr_instance contains 248 bytes in 1 blocks (ref 0) 0x6130000000a0 - * no_gsup_server contains 15 bytes in 1 blocks (ref 0) 0x60b000000150 - * ../../../src/libosmocore/src/rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e0000000e0 - * logging contains 1433 bytes in 5 blocks (ref 0) 0x60b0000000a0 - * struct log_target contains 240 bytes in 2 blocks (ref 0) 0x6120000000a0 - * struct log_category contains 72 bytes in 1 blocks (ref 0) 0x60f0000000a0 - * struct log_info contains 1192 bytes in 2 blocks (ref 0) 0x60d0000000a0 - * struct log_info_cat contains 1152 bytes in 1 blocks (ref 0) 0x61a0000000e0 - * msgb contains 0 bytes in 1 blocks (ref 0) 0x608000000100 + * talloc_total_blocks(tall_bsc_ctx) == 19 + * full talloc report on 'msc_vlr_tests_ctx' (total 6532 bytes in 19 blocks) + * struct osmo_gsup_client contains 256 bytes in 1 blocks (ref 0) 0x56143306aa10 + * struct gsm_network contains 4775 bytes in 11 blocks (ref 0) 0x5614330697e0 + * struct mgcp_client contains 688 bytes in 1 blocks (ref 0) 0x56143306ad80 + * struct sccp_ran_inst contains 152 bytes in 1 blocks (ref 0) 0x56143306ac80 + * struct sccp_ran_inst contains 152 bytes in 1 blocks (ref 0) 0x56143306ab80 + * struct gsup_client_mux contains 152 bytes in 2 blocks (ref 0) 0x56143306a8a0 + * struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x56143306a960 + * struct vlr_instance contains 248 bytes in 1 blocks (ref 0) 0x56143306a740 + * no_gsup_server contains 15 bytes in 1 blocks (ref 0) 0x56143306a6c0 + * stat_item.c:96 contains 144 bytes in 2 blocks (ref 0) 0x56143306a550 + * stat_item.c:118 contains 96 bytes in 1 blocks (ref 0) 0x56143306a5f0 + * rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x561433069bb0 + * logging contains 1501 bytes in 5 blocks (ref 0) 0x561433068fe0 + * struct log_target contains 244 bytes in 2 blocks (ref 0) 0x561433069610 + * struct log_category contains 76 bytes in 1 blocks (ref 0) 0x561433069720 + * struct log_info contains 1256 bytes in 2 blocks (ref 0) 0x561433069050 + * struct log_info_cat contains 1216 bytes in 1 blocks (ref 0) 0x5614330690e0 + * msgb contains 0 bytes in 1 blocks (ref 0) 0x561433068f70 */ fprintf(stderr, "talloc_total_blocks(tall_bsc_ctx) == %zu\n", talloc_total_blocks(msc_vlr_tests_ctx)); - if (talloc_total_blocks(msc_vlr_tests_ctx) != 17) + if (talloc_total_blocks(msc_vlr_tests_ctx) != 19) talloc_report_full(msc_vlr_tests_ctx, stderr); fprintf(stderr, "\n"); }