aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Sperling <ssperling@sysmocom.de>2018-12-06 12:06:59 +0100
committerStefan Sperling <stsp@stsp.name>2018-12-11 13:08:00 +0000
commitafa030d6f912d0ff39063128e470e71fbdf758e3 (patch)
treec2cda51502037c2861f3704648af5af10540d114
parentaa14bac370c625855ffce483aa337287340cfd71 (diff)
make gsup ipa name configurable in osmo-msc.cfg
Add a 'ipa-name' VTY command which overrides the default IPA name used by the MSC. This is a prerequisite for inter-MSC handover. Related: OS#3355 Change-Id: I317d6c59f77e92fbb2b875a83dc0ec2fa5cb6006
-rw-r--r--include/osmocom/msc/gsm_data.h6
-rw-r--r--include/osmocom/msc/vlr.h3
-rw-r--r--src/libmsc/gsm_04_08.c10
-rw-r--r--src/libmsc/msc_vty.c16
-rw-r--r--src/libvlr/vlr.c11
-rw-r--r--tests/msc_vlr/Makefile.am2
-rw-r--r--tests/msc_vlr/msc_vlr_test_authen_reuse.err16
-rw-r--r--tests/msc_vlr/msc_vlr_test_call.err14
-rw-r--r--tests/msc_vlr/msc_vlr_test_gsm_authen.err16
-rw-r--r--tests/msc_vlr/msc_vlr_test_gsm_ciph.err20
-rw-r--r--tests/msc_vlr/msc_vlr_test_hlr_reject.err20
-rw-r--r--tests/msc_vlr/msc_vlr_test_hlr_timeout.err8
-rw-r--r--tests/msc_vlr/msc_vlr_test_ms_timeout.err12
-rw-r--r--tests/msc_vlr/msc_vlr_test_no_authen.err22
-rw-r--r--tests/msc_vlr/msc_vlr_test_reject_concurrency.err24
-rw-r--r--tests/msc_vlr/msc_vlr_test_rest.err12
-rw-r--r--tests/msc_vlr/msc_vlr_test_ss.err8
-rw-r--r--tests/msc_vlr/msc_vlr_test_umts_authen.err24
-rw-r--r--tests/msc_vlr/msc_vlr_tests.c44
-rw-r--r--tests/test_nodes.vty1
20 files changed, 160 insertions, 129 deletions
diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index 63af3e736..d2511cb7b 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -212,6 +212,12 @@ struct gsm_network {
/* MSISDN to which to route MO emergency calls */
char *route_to_msisdn;
} emergency;
+
+ /* This is transmitted as IPA Serial Number tag, which is used for GSUP routing (e.g. in OsmoHLR).
+ * For inter-MSC handover, the remote MSC's neighbor configuration requires to match this name.
+ * If no name is set, the IPA Serial Number will be the same as the Unit Name,
+ * and will be of the form 'MSC-00-00-00-00-00-00' */
+ char *msc_ipa_name;
};
struct osmo_esme;
diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h
index c0e486416..68e0759d6 100644
--- a/include/osmocom/msc/vlr.h
+++ b/include/osmocom/msc/vlr.h
@@ -9,6 +9,7 @@
#include <osmocom/gsm/gsm23003.h>
#include <osmocom/gsm/gsm0808.h>
#include <osmocom/gsm/gsup.h>
+#include <osmocom/gsm/ipa.h>
#include <osmocom/msc/ran_conn.h>
#include <osmocom/msc/msc_common.h>
#include <osmocom/gsupclient/gsup_client.h>
@@ -312,7 +313,7 @@ int vlr_subscr_rx_tmsi_reall_compl(struct vlr_subscr *vsub);
int vlr_subscr_rx_imsi_detach(struct vlr_subscr *vsub);
struct vlr_instance *vlr_alloc(void *ctx, const struct vlr_ops *ops);
-int vlr_start(const char *gsup_unit_name, struct vlr_instance *vlr,
+int vlr_start(struct ipaccess_unit *ipa_dev, struct vlr_instance *vlr,
const char *gsup_server_addr_str, uint16_t gsup_server_port);
/* internal use only */
diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c
index 95c31831c..7fe2c5037 100644
--- a/src/libmsc/gsm_04_08.c
+++ b/src/libmsc/gsm_04_08.c
@@ -1828,9 +1828,15 @@ int msc_vlr_alloc(struct gsm_network *net)
/* Launch the VLR, i.e. its GSUP connection */
int msc_vlr_start(struct gsm_network *net)
{
+ struct ipaccess_unit *ipa_dev;
+
OSMO_ASSERT(net->vlr);
- return vlr_start("MSC", net->vlr, net->gsup_server_addr_str,
- net->gsup_server_port);
+
+ ipa_dev = talloc_zero(net->vlr, struct ipaccess_unit);
+ ipa_dev->unit_name = "MSC";
+ ipa_dev->serno = net->msc_ipa_name; /* NULL unless configured via VTY */
+
+ return vlr_start(ipa_dev, net->vlr, net->gsup_server_addr_str, net->gsup_server_port);
}
struct msgb *gsm48_create_mm_serv_rej(enum gsm48_reject_value value)
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index e1d1b4020..06e11394a 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -458,6 +458,18 @@ DEFUN(cfg_msc_emergency_msisdn, cfg_msc_emergency_msisdn_cmd,
return CMD_SUCCESS;
}
+DEFUN(cfg_msc_ipa_name,
+ cfg_msc_ipa_name_cmd,
+ "ipa-name NAME",
+ "Set the IPA name of this MSC\n"
+ "A unique name for this MSC. For example: PLMN + redundancy server number: MSC-901-70-0. "
+ "This name is used for GSUP routing and must be set if more than one MSC is connected to the HLR. "
+ "The default is 'MSC-00-00-00-00-00-00'.\n")
+{
+ gsmnet->msc_ipa_name = talloc_strdup(gsmnet, argv[0]);
+ return CMD_SUCCESS;
+}
+
static int config_write_msc(struct vty *vty)
{
vty_out(vty, "msc%s", VTY_NEWLINE);
@@ -491,6 +503,9 @@ static int config_write_msc(struct vty *vty)
gsmnet->emergency.route_to_msisdn, VTY_NEWLINE);
}
+ if (gsmnet->msc_ipa_name)
+ vty_out(vty, " ipa-name %s%s", gsmnet->msc_ipa_name, VTY_NEWLINE);
+
mgcp_client_config_write(vty, " ");
#ifdef BUILD_IU
ranap_iu_vty_config_write(vty, " ");
@@ -1483,6 +1498,7 @@ void msc_vty_init(struct gsm_network *msc_network)
install_element(MSC_NODE, &cfg_msc_cs7_instance_iu_cmd);
install_element(MSC_NODE, &cfg_msc_paging_response_timer_cmd);
install_element(MSC_NODE, &cfg_msc_emergency_msisdn_cmd);
+ install_element(MSC_NODE, &cfg_msc_ipa_name_cmd);
mgcp_client_vty_init(msc_network, MSC_NODE, &msc_network->mgw.conf);
#ifdef BUILD_IU
diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c
index 336991482..975b240ec 100644
--- a/src/libvlr/vlr.c
+++ b/src/libvlr/vlr.c
@@ -27,6 +27,7 @@
#include <osmocom/gsm/gsup.h>
#include <osmocom/gsm/apn.h>
#include <osmocom/gsm/gsm48.h>
+#include <osmocom/gsm/ipa.h>
#include <osmocom/msc/gsm_subscriber.h>
#include <osmocom/gsupclient/gsup_client.h>
#include <osmocom/msc/vlr.h>
@@ -1212,15 +1213,15 @@ struct vlr_instance *vlr_alloc(void *ctx, const struct vlr_ops *ops)
return vlr;
}
-int vlr_start(const char *gsup_unit_name, struct vlr_instance *vlr,
+int vlr_start(struct ipaccess_unit *ipa_dev, struct vlr_instance *vlr,
const char *gsup_server_addr_str, uint16_t gsup_server_port)
{
OSMO_ASSERT(vlr);
- vlr->gsup_client = osmo_gsup_client_create(vlr, gsup_unit_name,
- gsup_server_addr_str,
- gsup_server_port,
- &vlr_gsupc_read_cb, NULL);
+ vlr->gsup_client = osmo_gsup_client_create2(vlr, ipa_dev,
+ gsup_server_addr_str,
+ gsup_server_port,
+ &vlr_gsupc_read_cb, NULL);
if (!vlr->gsup_client)
return -ENOMEM;
vlr->gsup_client->data = vlr;
diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am
index 1d1956a15..bdb8f44a8 100644
--- a/tests/msc_vlr/Makefile.am
+++ b/tests/msc_vlr/Makefile.am
@@ -19,7 +19,7 @@ AM_CFLAGS = \
$(NULL)
AM_LDFLAGS = \
- -Wl,--wrap=osmo_gsup_client_create \
+ -Wl,--wrap=osmo_gsup_client_create2 \
-Wl,--wrap=osmo_gsup_client_send \
-Wl,--wrap=a_iface_tx_dtap \
-Wl,--wrap=a_iface_tx_clear_cmd \
diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err
index ca035bf5e..8948421c0 100644
--- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err
+++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err
@@ -1,5 +1,5 @@
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_auth_use_twice_geran
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -410,7 +410,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_auth_use_twice_geran: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_auth_use_twice_utran
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -859,7 +859,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_auth_use_twice_utran: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_auth_use_infinitely_geran
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1350,7 +1350,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_auth_use_infinitely_geran: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_auth_use_infinitely_utran
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1892,7 +1892,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_auth_use_infinitely_utran: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_no_auth_reuse_geran
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -2209,7 +2209,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_no_auth_reuse_geran: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_no_auth_reuse_utran
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -2551,8 +2551,8 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_no_auth_reuse_utran: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err
index f2a46f5cc..481a2db21 100644
--- a/tests/msc_vlr/msc_vlr_test_call.err
+++ b/tests/msc_vlr/msc_vlr_test_call.err
@@ -1,5 +1,5 @@
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_call_mo
- Total time passed: 0.000000 s
@@ -379,7 +379,7 @@ DREF freeing VLR subscr MSISDN:42342
===== test_call_mo: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_call_mt
- Total time passed: 0.000000 s
@@ -758,7 +758,7 @@ DREF freeing VLR subscr MSISDN:42342
===== test_call_mt: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_call_mt2
- Total time passed: 0.000000 s
@@ -1103,7 +1103,7 @@ DREF freeing VLR subscr MSISDN:42342
===== test_call_mt2: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_call_mo_to_unknown
- Total time passed: 0.000000 s
@@ -1445,7 +1445,7 @@ DREF freeing VLR subscr MSISDN:42342
===== test_call_mo_to_unknown: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_call_mo_to_unknown_timeout
- Total time passed: 0.000000 s
@@ -1784,8 +1784,8 @@ DREF freeing VLR subscr MSISDN:42342
===== test_call_mo_to_unknown_timeout: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err
index 8121e8e2e..b40544e8f 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err
@@ -1,5 +1,5 @@
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_gsm_authen
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -442,7 +442,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_gsm_authen: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_gsm_authen_tmsi
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1086,7 +1086,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_gsm_authen_tmsi: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_gsm_authen_imei
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1315,7 +1315,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_gsm_authen_imei: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_gsm_authen_tmsi_imei
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1576,7 +1576,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_gsm_authen_tmsi_imei: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_gsm_milenage_authen
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -2000,7 +2000,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_gsm_milenage_authen: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_wrong_sres_length
- Total time passed: 0.000000 s
@@ -2118,8 +2118,8 @@ DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASED}: Deallocated
===== test_wrong_sres_length: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
index 58dc7ec4b..6e35b072a 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
@@ -1,5 +1,5 @@
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_ciph
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -494,7 +494,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_ciph: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_ciph_tmsi
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1026,7 +1026,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_ciph_tmsi: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_ciph_imei
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1259,7 +1259,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_ciph_imei: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_ciph_imeisv
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1481,7 +1481,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_ciph_imeisv: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_ciph_tmsi_imei
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1746,7 +1746,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_ciph_tmsi_imei: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_gsm_ciph_in_umts_env
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -2210,7 +2210,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_gsm_ciph_in_umts_env: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_a5_3_supported
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -2702,7 +2702,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_a5_3_supported: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_cm_service_needs_classmark_update
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -3185,8 +3185,8 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_cm_service_needs_classmark_update: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err
index efc3a8d1b..1b85a2dc4 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err
+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err
@@ -1,5 +1,5 @@
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_hlr_rej_auth_info_unknown_imsi
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -79,7 +79,7 @@ DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASED}: Deallocated
===== 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) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_hlr_rej_auth_info_net_fail
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -159,7 +159,7 @@ DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASED}: Deallocated
===== 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) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_hlr_rej_auth_info_net_fail_reuse_tuples
---
@@ -456,7 +456,7 @@ DREF freeing VLR subscr MSISDN:46071
===== 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) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_hlr_rej_auth_info_net_fail_no_reuse_tuples
---
@@ -685,7 +685,7 @@ DREF freeing VLR subscr MSISDN:46071
===== 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) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples
---
@@ -915,7 +915,7 @@ DREF freeing VLR subscr MSISDN:46071
===== 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) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_hlr_acc_but_no_auth_tuples
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -994,7 +994,7 @@ DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASED}: Deallocated
===== 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) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_hlr_rej_lu
- Location Update request causes a GSUP LU request to HLR
@@ -1076,7 +1076,7 @@ DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASED}: Deallocated
===== test_hlr_rej_lu: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_hlr_no_insert_data
- Location Update request causes a GSUP LU request to HLR
@@ -1173,8 +1173,8 @@ DREF freeing VLR subscr IMSI:901700000004620
===== test_hlr_no_insert_data: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
index 60bb8cb4c..2fa071955 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
+++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
@@ -1,5 +1,5 @@
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_hlr_timeout_lu_auth_info
- Total time passed: 0.000000 s
@@ -87,7 +87,7 @@ DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASED}: Deallocated
===== test_hlr_timeout_lu_auth_info: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_hlr_timeout_lu_upd_loc_result
- Total time passed: 0.000000 s
@@ -194,8 +194,8 @@ DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASED}: Deallocated
===== 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) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err
index 78218ac31..c91f6a23e 100644
--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err
+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err
@@ -1,5 +1,5 @@
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_ms_timeout_lu_auth_resp
- Total time passed: 0.000000 s
@@ -107,7 +107,7 @@ DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASED}: Deallocated
===== test_ms_timeout_lu_auth_resp: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_ms_timeout_cm_auth_resp
- Total time passed: 0.000000 s
@@ -345,7 +345,7 @@ DREF freeing VLR subscr MSISDN:46071
===== test_ms_timeout_cm_auth_resp: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_ms_timeout_paging
- Total time passed: 0.000000 s
@@ -545,7 +545,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_ms_timeout_paging: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_classmark_update_timeout
- Total time passed: 0.000000 s
@@ -675,8 +675,8 @@ DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASED}: Deallocated
===== test_classmark_update_timeout: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err
index 189c68047..ba82fc9d8 100644
--- a/tests/msc_vlr/msc_vlr_test_no_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_no_authen.err
@@ -1,5 +1,5 @@
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_no_authen
- Location Update request causes a GSUP LU request to HLR
@@ -314,7 +314,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_no_authen: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_no_authen_tmsi
- Location Update request causes a GSUP LU request to HLR
@@ -813,7 +813,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_no_authen_tmsi: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_no_authen_imei
- Location Update request causes a GSUP LU request to HLR
@@ -994,7 +994,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_no_authen_imei: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_no_authen_tmsi_imei
- Location Update request causes a GSUP LU request to HLR
@@ -1201,7 +1201,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_no_authen_tmsi_imei: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_no_authen_imeisv
- Location Update request causes an IMEISV ID request back to the MS
@@ -1368,7 +1368,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_no_authen_imeisv: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_no_authen_imeisv_imei
- Location Update request causes an IMEISV ID request back to the MS
@@ -1567,7 +1567,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_no_authen_imeisv_imei: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_no_authen_imeisv_tmsi
- Location Update request causes an IMEISV ID request back to the MS
@@ -1929,7 +1929,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_no_authen_imeisv_tmsi: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_no_authen_imeisv_tmsi_imei
- Location Update request causes an IMEISV ID request back to the MS
@@ -2155,7 +2155,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_no_authen_imeisv_tmsi_imei: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_no_authen_subscr_expire
- Total time passed: 0.000000 s
@@ -2273,8 +2273,8 @@ DREF freeing VLR subscr MSISDN:46071
===== test_no_authen_subscr_expire: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
index 03f99e16a..85dd25428 100644
--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
@@ -1,5 +1,5 @@
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_reject_2nd_conn
- Location Update Request on one connection
@@ -150,7 +150,7 @@ DREF freeing VLR subscr MSISDN:46071
===== test_reject_2nd_conn: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_reject_lu_during_lu
- Location Update Request
@@ -272,7 +272,7 @@ DREF freeing VLR subscr MSISDN:46071
===== test_reject_lu_during_lu: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_reject_cm_during_lu
- Location Update Request
@@ -401,7 +401,7 @@ DREF freeing VLR subscr MSISDN:46071
===== test_reject_cm_during_lu: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_reject_paging_resp_during_lu
- Location Update Request
@@ -523,7 +523,7 @@ DREF freeing VLR subscr MSISDN:46071
===== test_reject_paging_resp_during_lu: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_reject_lu_during_cm
---
@@ -712,7 +712,7 @@ DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_RELEASED}: Deallocated
===== test_reject_lu_during_cm: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_reject_cm_during_cm
---
@@ -904,7 +904,7 @@ DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_RELEASED}: Deallocated
===== test_reject_cm_during_cm: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_reject_paging_resp_during_cm
---
@@ -1084,7 +1084,7 @@ DREF freeing VLR subscr MSISDN:46071
===== test_reject_paging_resp_during_cm: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_reject_lu_during_paging_resp
---
@@ -1303,7 +1303,7 @@ DREF freeing VLR subscr MSISDN:46071
===== test_reject_lu_during_paging_resp: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_accept_cm_during_paging_resp
---
@@ -1542,7 +1542,7 @@ DMM RAN_conn(PAGING_RESP:901700000004620){RAN_CONN_S_RELEASED}: Deallocated
===== test_accept_cm_during_paging_resp: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_reject_paging_resp_during_paging_resp
---
@@ -1759,8 +1759,8 @@ DREF freeing VLR subscr MSISDN:46071
===== 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) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err
index 90905c823..1f0f509e7 100644
--- a/tests/msc_vlr/msc_vlr_test_rest.err
+++ b/tests/msc_vlr/msc_vlr_test_rest.err
@@ -1,5 +1,5 @@
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_early_stage
- NULL conn
@@ -48,7 +48,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_early_stage: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_cm_service_without_lu
- CM Service Request without a prior Location Updating
@@ -91,7 +91,7 @@ DMM RAN_conn(CM_SERVICE_REQ:901700000004620){RAN_CONN_S_RELEASED}: Deallocated
===== test_cm_service_without_lu: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_two_lu
- Location Update request causes a GSUP LU request to HLR
@@ -352,7 +352,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_two_lu: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_lu_unknown_tmsi
- Location Update request with unknown TMSI sends ID Request for IMSI
@@ -498,8 +498,8 @@ DREF freeing VLR subscr MSISDN:46071
===== test_lu_unknown_tmsi: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err
index e0f57aa4a..fe869ad0a 100644
--- a/tests/msc_vlr/msc_vlr_test_ss.err
+++ b/tests/msc_vlr/msc_vlr_test_ss.err
@@ -1,5 +1,5 @@
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_ss_ussd_mo_geran
- Location Update request causes a GSUP LU request to HLR
@@ -195,7 +195,7 @@ DREF freeing VLR subscr MSISDN:46071
===== test_ss_ussd_mo_geran: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_ss_ussd_no_geran
- Location Update request causes a GSUP LU request to HLR
@@ -420,8 +420,8 @@ DREF freeing VLR subscr MSISDN:46071
===== test_ss_ussd_no_geran: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err
index 3e8fe2eff..d3c54bc4b 100644
--- a/tests/msc_vlr/msc_vlr_test_umts_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err
@@ -1,5 +1,5 @@
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_umts_authen_geran
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -456,7 +456,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_umts_authen_geran: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_umts_authen_utran
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -951,7 +951,7 @@ DMM RAN_conn{RAN_CONN_S_RELEASED}: Deallocated
===== test_umts_authen_utran: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_umts_authen_resync_geran
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1162,7 +1162,7 @@ DREF freeing VLR subscr MSISDN:42342
===== test_umts_authen_resync_geran: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_umts_authen_resync_utran
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1385,7 +1385,7 @@ DREF freeing VLR subscr MSISDN:42342
===== test_umts_authen_resync_utran: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_umts_authen_too_short_res_geran
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1483,7 +1483,7 @@ DMM RAN_conn(LU:901700000010650){RAN_CONN_S_RELEASED}: Deallocated
===== 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) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_umts_authen_too_short_res_utran
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1581,7 +1581,7 @@ DMM RAN_conn(LU:901700000010650){RAN_CONN_S_RELEASED}: Deallocated
===== 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) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_umts_authen_too_long_res_geran
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1679,7 +1679,7 @@ DMM RAN_conn(LU:901700000010650){RAN_CONN_S_RELEASED}: Deallocated
===== 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) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_umts_authen_too_long_res_utran
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1777,7 +1777,7 @@ DMM RAN_conn(LU:901700000010650){RAN_CONN_S_RELEASED}: Deallocated
===== 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) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_umts_authen_only_sres_geran
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1875,7 +1875,7 @@ DMM RAN_conn(LU:901700000010650){RAN_CONN_S_RELEASED}: Deallocated
===== test_umts_authen_only_sres_geran: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
===== test_umts_authen_only_sres_utran
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1973,8 +1973,8 @@ DMM RAN_conn(LU:901700000010650){RAN_CONN_S_RELEASED}: Deallocated
===== test_umts_authen_only_sres_utran: SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 12
+talloc_total_blocks(tall_bsc_ctx) == 13
diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c
index 29ffdbfd7..8ae559e83 100644
--- a/tests/msc_vlr/msc_vlr_tests.c
+++ b/tests/msc_vlr/msc_vlr_tests.c
@@ -546,15 +546,14 @@ int mncc_recv(struct gsm_network *net, struct msgb *msg)
return 0;
}
-/* override, requires '-Wl,--wrap=gsup_client_create' */
struct osmo_gsup_client *
-__real_osmo_gsup_client_create(const char *ip_addr, unsigned int tcp_port,
- osmo_gsup_client_read_cb_t read_cb,
- struct osmo_oap_client_config *oap_config);
+__real_osmo_gsup_client_create2(struct ipaccess_unit *ipa_dev, const char *ip_addr,
+ unsigned int tcp_port, osmo_gsup_client_read_cb_t read_cb,
+ struct osmo_oap_client_config *oap_config);
struct osmo_gsup_client *
-__wrap_osmo_gsup_client_create(const char *ip_addr, unsigned int tcp_port,
- osmo_gsup_client_read_cb_t read_cb,
- struct osmo_oap_client_config *oap_config)
+__wrap_osmo_gsup_client_create2(struct ipaccess_unit *ipa_dev, const char *ip_addr,
+ unsigned int tcp_port, osmo_gsup_client_read_cb_t read_cb,
+ struct osmo_oap_client_config *oap_config)
{
struct osmo_gsup_client *gsupc;
gsupc = talloc_zero(msc_vlr_tests_ctx, struct osmo_gsup_client);
@@ -882,24 +881,25 @@ static void check_talloc(void *msgb_ctx, void *msc_vlr_tests_ctx)
/* Verifying that the msgb context is empty */
talloc_report_full(msgb_ctx, stderr);
/* Expecting these to stick around in msc_vlr_tests_ctx:
- * talloc_total_blocks(tall_bsc_ctx) == 12
- * full talloc report on 'msc_vlr_tests_ctx' (total 3636 bytes in 12 blocks)
- * struct osmo_gsup_client contains 248 bytes in 1 blocks (ref 0) 0x563a489c05f0
- * struct gsm_network contains 2031 bytes in 4 blocks (ref 0) 0x563a489bfbb0
- * struct vlr_instance contains 168 bytes in 1 blocks (ref 0) 0x563a489c04e0
- * no_gsup_server contains 15 bytes in 1 blocks (ref 0) 0x563a489c0460
- * ../../../src/libosmocore/src/rate_ctr.c:228 contains 1552 bytes in 1 blocks (ref 0) 0x563a489bfd40
- * logging contains 1357 bytes in 5 blocks (ref 0) 0x563a489bf440
- * struct log_target contains 228 bytes in 2 blocks (ref 0) 0x563a489bf9f0
- * struct log_category contains 68 bytes in 1 blocks (ref 0) 0x563a489bfb00
- * struct log_info contains 1128 bytes in 2 blocks (ref 0) 0x563a489bf4b0
- * struct log_info_cat contains 1088 bytes in 1 blocks (ref 0) 0x563a489bf540
- * msgb contains 0 bytes in 1 blocks (ref 0) 0x563a489bf3d0
- * (That's 12 counting the root ctx)
+ * talloc_total_blocks(tall_bsc_ctx) == 13
+ * full talloc report on 'msc_vlr_tests_ctx' (total 4638 bytes in 13 blocks)
+ * struct osmo_gsup_client contains 256 bytes in 1 blocks (ref 0) 0x61300000dd20
+ * struct gsm_network contains 2983 bytes in 5 blocks (ref 0) 0x61400000fea0
+ * struct vlr_instance contains 320 bytes in 2 blocks (ref 0) 0x61300000dee0
+ * struct ipaccess_unit contains 64 bytes in 1 blocks (ref 0) 0x60e0000244c0
+ * no_gsup_server contains 15 bytes in 1 blocks (ref 0) 0x60b00000af40
+ * rate_ctr.c:234 contains 2352 bytes in 1 blocks (ref 0) 0x61e00000f0e0
+ * logging contains 1399 bytes in 5 blocks (ref 0) 0x60b00000aff0
+ * struct log_target contains 238 bytes in 2 blocks (ref 0) 0x61200000bf20
+ * struct log_category contains 70 bytes in 1 blocks (ref 0) 0x60f00000efb0
+ * struct log_info contains 1160 bytes in 2 blocks (ref 0) 0x60d00000cfd0
+ * struct log_info_cat contains 1120 bytes in 1 blocks (ref 0) 0x61a00001f2e0
+ * msgb contains 0 bytes in 1 blocks (ref 0) 0x60800000bf80
+ * (That's 13 counting the root ctx)
*/
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) != 12)
+ if (talloc_total_blocks(msc_vlr_tests_ctx) != 13)
talloc_report_full(msc_vlr_tests_ctx, stderr);
fprintf(stderr, "\n");
}
diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty
index c4ab38791..dcbf580ed 100644
--- a/tests/test_nodes.vty
+++ b/tests/test_nodes.vty
@@ -40,6 +40,7 @@ OsmoMSC(config-msc)# list
cs7-instance-iu <0-15>
paging response-timer (default|<1-65535>)
emergency-call route-to-msisdn MSISDN
+ ipa-name NAME
mgw local-ip A.B.C.D
mgw local-port <0-65535>
mgw remote-ip A.B.C.D