Harald Welte has submitted this change and it was merged.
Change subject: remove unused "authorized-regexp" VTY command
......................................................................
remove unused "authorized-regexp" VTY command
This is another left-over VTY command from the OsmoNITB days.
If such functionality is desired, it must be implemented in OsmoHLR,
but not here.
Related: OS#2528
Change-Id: Icf0897c47388e49ba7886b55acc728a6f7d213fe
---
M include/osmocom/msc/gsm_data.h
M src/libcommon-cs/common_cs.c
M src/libcommon-cs/common_cs_vty.c
M tests/msc_vlr/msc_vlr_test_authen_reuse.err
M tests/msc_vlr/msc_vlr_test_call.err
M tests/msc_vlr/msc_vlr_test_gsm_authen.err
M tests/msc_vlr/msc_vlr_test_gsm_ciph.err
M tests/msc_vlr/msc_vlr_test_hlr_reject.err
M tests/msc_vlr/msc_vlr_test_hlr_timeout.err
M tests/msc_vlr/msc_vlr_test_ms_timeout.err
M tests/msc_vlr/msc_vlr_test_no_authen.err
M tests/msc_vlr/msc_vlr_test_reject_concurrency.err
M tests/msc_vlr/msc_vlr_test_rest.err
M tests/msc_vlr/msc_vlr_test_umts_authen.err
M tests/msc_vlr/msc_vlr_tests.c
M tests/vty_test_runner.py
16 files changed, 72 insertions(+), 101 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index 0548b80..9701288 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -236,8 +236,6 @@
char *name_long;
char *name_short;
enum gsm_auth_policy auth_policy;
- regex_t authorized_regexp;
- char *authorized_reg_str;
/* bit-mask of permitted encryption algorithms. LSB=A5/0, MSB=A5/7 */
uint8_t a5_encryption_mask;
bool authentication_required;
diff --git a/src/libcommon-cs/common_cs.c b/src/libcommon-cs/common_cs.c
index cebaf39..a2f5cb3 100644
--- a/src/libcommon-cs/common_cs.c
+++ b/src/libcommon-cs/common_cs.c
@@ -44,14 +44,8 @@
{
struct gsm_network *net;
- const char *default_regexp = ".*";
-
net = talloc_zero(ctx, struct gsm_network);
if (!net)
- return NULL;
-
- if (gsm_parse_reg(net, &net->authorized_regexp,
&net->authorized_reg_str, 1,
- &default_regexp) != 0)
return NULL;
net->country_code = country_code;
diff --git a/src/libcommon-cs/common_cs_vty.c b/src/libcommon-cs/common_cs_vty.c
index e5972f1..2fbe09c 100644
--- a/src/libcommon-cs/common_cs_vty.c
+++ b/src/libcommon-cs/common_cs_vty.c
@@ -121,22 +121,6 @@
return CMD_SUCCESS;
}
-DEFUN(cfg_net_authorize_regexp, cfg_net_authorize_regexp_cmd,
- "authorized-regexp REGEXP",
- "Set regexp for IMSI which will be used for authorization decision\n"
- "Regular expression, IMSIs matching it are allowed to use the network\n")
-{
- struct gsm_network *gsmnet = gsmnet_from_vty(vty);
- if (gsm_parse_reg(gsmnet, &gsmnet->authorized_regexp,
- &gsmnet->authorized_reg_str, argc, argv) != 0) {
- vty_out(vty, "%%Failed to parse the authorized-regexp: '%s'%s",
- argv[0], VTY_NEWLINE);
- return CMD_WARNING;
- }
-
- return CMD_SUCCESS;
-}
-
DEFUN(cfg_net_encryption,
cfg_net_encryption_cmd,
"encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>]",
@@ -307,7 +291,6 @@
install_element(GSMNET_NODE, &cfg_net_name_short_cmd);
install_element(GSMNET_NODE, &cfg_net_name_long_cmd);
install_element(GSMNET_NODE, &cfg_net_auth_policy_cmd);
- install_element(GSMNET_NODE, &cfg_net_authorize_regexp_cmd);
install_element(GSMNET_NODE, &cfg_net_encryption_cmd);
install_element(GSMNET_NODE, &cfg_net_authentication_cmd);
install_element(GSMNET_NODE, &cfg_net_rrlp_mode_cmd);
diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err
b/tests/msc_vlr/msc_vlr_test_authen_reuse.err
index 010f594..c676f51 100644
--- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err
+++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err
@@ -424,7 +424,7 @@
===== [1] test_auth_use_twice_geran(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [2] test_auth_use_twice_utran(901700000004620)...
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -878,7 +878,7 @@
===== [2] test_auth_use_twice_utran(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [3] test_auth_use_infinitely_geran(901700000004620)...
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1399,7 +1399,7 @@
===== [3] test_auth_use_infinitely_geran(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [4] test_auth_use_infinitely_utran(901700000004620)...
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1954,7 +1954,7 @@
===== [4] test_auth_use_infinitely_utran(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [5] test_no_auth_reuse_geran(901700000004620)...
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -2275,7 +2275,7 @@
===== [5] test_no_auth_reuse_geran(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [6] test_no_auth_reuse_utran(901700000004620)...
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -2614,8 +2614,8 @@
===== [6] test_no_auth_reuse_utran(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_call.err
b/tests/msc_vlr/msc_vlr_test_call.err
index 77df72f..7e3896b 100644
--- a/tests/msc_vlr/msc_vlr_test_call.err
+++ b/tests/msc_vlr/msc_vlr_test_call.err
@@ -345,7 +345,7 @@
===== [1] test_call_mo(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [2] test_call_mt(901700000004620)...
- Total time passed: 0.000000 s
@@ -699,8 +699,8 @@
===== [2] test_call_mt(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err
b/tests/msc_vlr/msc_vlr_test_gsm_authen.err
index 3926569..5c17593 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err
@@ -444,7 +444,7 @@
===== [1] test_gsm_authen(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [2] test_gsm_authen_tmsi(901700000004620)...
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1096,7 +1096,7 @@
===== [2] test_gsm_authen_tmsi(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [3] test_gsm_authen_imei(901700000004620)...
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1316,7 +1316,7 @@
===== [3] test_gsm_authen_imei(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [4] test_gsm_authen_tmsi_imei(901700000004620)...
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1567,7 +1567,7 @@
===== [4] test_gsm_authen_tmsi_imei(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [5] test_gsm_milenage_authen(901700000010650)...
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1996,8 +1996,8 @@
===== [5] test_gsm_milenage_authen(901700000010650): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
index 6fca9ba..6284866 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
@@ -481,7 +481,7 @@
===== [1] test_ciph(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [2] test_ciph_tmsi(901700000004620)...
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1003,7 +1003,7 @@
===== [2] test_ciph_tmsi(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [3] test_ciph_imei(901700000004620)...
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1224,7 +1224,7 @@
===== [3] test_ciph_imei(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [4] test_ciph_imeisv(901700000004620)...
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1434,7 +1434,7 @@
===== [4] test_ciph_imeisv(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [5] test_ciph_tmsi_imei(901700000004620)...
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1686,8 +1686,8 @@
===== [5] test_ciph_tmsi_imei(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err
b/tests/msc_vlr/msc_vlr_test_hlr_reject.err
index 56ab7be..a89e52d 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err
+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err
@@ -72,7 +72,7 @@
===== [1] test_hlr_rej_auth_info_unknown_imsi(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [2] test_hlr_rej_auth_info_net_fail(901700000004620)...
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -148,7 +148,7 @@
===== [2] test_hlr_rej_auth_info_net_fail(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [3] test_hlr_rej_auth_info_net_fail_reuse_tuples(901700000004620)...
---
@@ -451,7 +451,7 @@
===== [3] test_hlr_rej_auth_info_net_fail_reuse_tuples(901700000004620):
SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [4] test_hlr_rej_auth_info_net_fail_no_reuse_tuples(901700000004620)...
---
@@ -679,7 +679,7 @@
===== [4] test_hlr_rej_auth_info_net_fail_no_reuse_tuples(901700000004620):
SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [5]
test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples(901700000004620)...
---
@@ -908,7 +908,7 @@
===== [5] test_hlr_rej_auth_info_unkown_imsi_no_reuse_tuples(901700000004620):
SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [6] test_hlr_acc_but_no_auth_tuples(901700000004620)...
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -983,7 +983,7 @@
===== [6] test_hlr_acc_but_no_auth_tuples(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [7] test_hlr_rej_lu(901700000004620)...
- Location Update request causes a GSUP LU request to HLR
@@ -1061,7 +1061,7 @@
===== [7] test_hlr_rej_lu(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [8] test_hlr_no_insert_data(901700000004620)...
- Location Update request causes a GSUP LU request to HLR
@@ -1162,8 +1162,8 @@
===== [8] test_hlr_no_insert_data(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
index 1a5edd8..94cf2e6 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
+++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
@@ -80,7 +80,7 @@
===== [1] test_hlr_timeout_lu_auth_info(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [2] test_hlr_timeout_lu_upd_loc_result(901700000004620)...
- Total time passed: 0.000000 s
@@ -183,8 +183,8 @@
===== [2] test_hlr_timeout_lu_upd_loc_result(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err
b/tests/msc_vlr/msc_vlr_test_ms_timeout.err
index cdf9be0..5a54c72 100644
--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err
+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err
@@ -100,7 +100,7 @@
===== [1] test_ms_timeout_lu_auth_resp(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [2] test_ms_timeout_cm_auth_resp(901700000004620)...
- Total time passed: 0.000000 s
@@ -336,7 +336,7 @@
===== [2] test_ms_timeout_cm_auth_resp(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [3] test_ms_timeout_paging(901700000004620)...
- Total time passed: 0.000000 s
@@ -519,8 +519,8 @@
===== [3] test_ms_timeout_paging(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err
b/tests/msc_vlr/msc_vlr_test_no_authen.err
index 92d6884..d68fc24 100644
--- a/tests/msc_vlr/msc_vlr_test_no_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_no_authen.err
@@ -320,7 +320,7 @@
===== [1] test_no_authen(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [2] test_no_authen_tmsi(901700000004620)...
- Location Update request causes a GSUP LU request to HLR
@@ -831,7 +831,7 @@
===== [2] test_no_authen_tmsi(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [3] test_no_authen_imei(901700000004620)...
- Location Update request causes a GSUP LU request to HLR
@@ -1004,7 +1004,7 @@
===== [3] test_no_authen_imei(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [4] test_no_authen_tmsi_imei(901700000004620)...
- Location Update request causes a GSUP LU request to HLR
@@ -1202,7 +1202,7 @@
===== [4] test_no_authen_tmsi_imei(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [5] test_no_authen_imeisv(901700000004620)...
- Location Update request causes an IMEISV ID request back to the MS
@@ -1360,7 +1360,7 @@
===== [5] test_no_authen_imeisv(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [6] test_no_authen_imeisv_imei(901700000004620)...
- Location Update request causes an IMEISV ID request back to the MS
@@ -1550,7 +1550,7 @@
===== [6] test_no_authen_imeisv_imei(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [7] test_no_authen_imeisv_tmsi(901700000004620)...
- Location Update request causes an IMEISV ID request back to the MS
@@ -1906,7 +1906,7 @@
===== [7] test_no_authen_imeisv_tmsi(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [8] test_no_authen_imeisv_tmsi_imei(901700000004620)...
- Location Update request causes an IMEISV ID request back to the MS
@@ -2122,8 +2122,8 @@
===== [8] test_no_authen_imeisv_tmsi_imei(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
index 477d928..6a7a83c 100644
--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
@@ -152,7 +152,7 @@
===== [1] test_reject_2nd_conn(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [2] test_reject_lu_during_lu(901700000004620)...
- Location Update Request
@@ -277,7 +277,7 @@
===== [2] test_reject_lu_during_lu(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [3] test_reject_cm_during_lu(901700000004620)...
- Location Update Request
@@ -408,7 +408,7 @@
===== [3] test_reject_cm_during_lu(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [4] test_reject_paging_resp_during_lu(901700000004620)...
- Location Update Request
@@ -534,7 +534,7 @@
===== [4] test_reject_paging_resp_during_lu(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [5] test_reject_lu_during_cm(901700000004620)...
---
@@ -727,7 +727,7 @@
===== [5] test_reject_lu_during_cm(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [6] test_reject_cm_during_cm(901700000004620)...
---
@@ -922,7 +922,7 @@
===== [6] test_reject_cm_during_cm(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [7] test_reject_paging_resp_during_cm(901700000004620)...
---
@@ -1123,7 +1123,7 @@
===== [7] test_reject_paging_resp_during_cm(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [8] test_reject_lu_during_paging_resp(901700000004620)...
---
@@ -1350,7 +1350,7 @@
===== [8] test_reject_lu_during_paging_resp(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [9] test_accept_cm_during_paging_resp(901700000004620)...
---
@@ -1594,7 +1594,7 @@
===== [9] test_accept_cm_during_paging_resp(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [10] test_reject_paging_resp_during_paging_resp(901700000004620)...
---
@@ -1820,8 +1820,8 @@
===== [10] test_reject_paging_resp_during_paging_resp(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_rest.err
b/tests/msc_vlr/msc_vlr_test_rest.err
index 90deb3b..fbfb3d7 100644
--- a/tests/msc_vlr/msc_vlr_test_rest.err
+++ b/tests/msc_vlr/msc_vlr_test_rest.err
@@ -40,7 +40,7 @@
===== [1] test_early_stage(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [2] test_cm_service_without_lu(901700000004620)...
- CM Service Request without a prior Location Updating
@@ -83,7 +83,7 @@
===== [2] test_cm_service_without_lu(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [3] test_two_lu(901700000004620)...
- Location Update request causes a GSUP LU request to HLR
@@ -340,7 +340,7 @@
===== [3] test_two_lu(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [4] test_lu_unknown_tmsi(901700000004620)...
- Location Update request with unknown TMSI sends ID Request for IMSI
@@ -489,8 +489,8 @@
===== [4] test_lu_unknown_tmsi(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err
b/tests/msc_vlr/msc_vlr_test_umts_authen.err
index 6a2c6c5..78d4925 100644
--- a/tests/msc_vlr/msc_vlr_test_umts_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err
@@ -458,7 +458,7 @@
===== [1] test_umts_authen_geran(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [2] test_umts_authen_utran(901700000004620)...
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -946,7 +946,7 @@
===== [2] test_umts_authen_utran(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [3] test_umts_authen_resync_geran(901700000004620)...
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1159,7 +1159,7 @@
===== [3] test_umts_authen_resync_geran(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
===== [4] test_umts_authen_resync_utran(901700000004620)...
- Location Update request causes a GSUP Send Auth Info request to HLR
@@ -1382,8 +1382,8 @@
===== [4] test_umts_authen_resync_utran(901700000004620): SUCCESS
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c
index 1079c9f..f514286 100644
--- a/tests/msc_vlr/msc_vlr_tests.c
+++ b/tests/msc_vlr/msc_vlr_tests.c
@@ -757,14 +757,13 @@
talloc_report_full(msgb_ctx, stderr);
/* Expecting these to stick around in tall_bsc_ctx:
full talloc report on 'msgb' (total 0 bytes in 1 blocks)
-talloc_total_blocks(tall_bsc_ctx) == 8
+talloc_total_blocks(tall_bsc_ctx) == 7
full talloc report on 'subscr_conn_test_ctx' (total 2642 bytes in 8 blocks)
struct gsup_client contains 248 bytes in 1 blocks (ref 0)
0x61300000dee0
- struct gsm_network contains 2410 bytes in 6 blocks (ref 0)
0x61700000fce0
+ struct gsm_network contains 2023 bytes in 6 blocks (ref 0)
0x61700000fce0
struct vlr_instance contains 160 bytes in 1 blocks
(ref 0) 0x611000009a60
no_gsup_server contains 15 bytes in 1 blocks
(ref 0) 0x60b00000ade0
../../../src/libosmocore/src/rate_ctr.c:199 contains 1552 bytes in
1 blocks (ref 0) 0x61b00001eae0
- .* contains 3 bytes in 1 blocks
(ref 0) 0x60b00000af40
msgb contains 0 bytes in 1 blocks (ref 0)
0x60800000bf80
*/
fprintf(stderr, "talloc_total_blocks(tall_bsc_ctx) == %zu\n",
@@ -840,7 +839,7 @@
msc_vlr_tests[test_nr](test_nr + 1, imsi);
- check_talloc(msgb_ctx, tall_bsc_ctx, 8);
+ check_talloc(msgb_ctx, tall_bsc_ctx, 7);
}
}
@@ -914,6 +913,6 @@
printf("Done\n");
- check_talloc(msgb_ctx, tall_bsc_ctx, 8);
+ check_talloc(msgb_ctx, tall_bsc_ctx, 7);
return 0;
}
diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py
index 707fc5c..19d2c60 100644
--- a/tests/vty_test_runner.py
+++ b/tests/vty_test_runner.py
@@ -156,9 +156,6 @@
self.vty.command("network")
self.assertTrue(self.vty.verify("auth policy closed", ['']))
self.assertTrue(self.vty.verify("auth policy regexp", ['']))
- self.assertTrue(self.vty.verify("authorized-regexp ^001", ['']))
- self.assertTrue(self.vty.verify("authorized-regexp 02$", ['']))
- self.assertTrue(self.vty.verify("authorized-regexp *123.*", ['']))
self.vty.command("end")
def testSi2Q(self):
--
To view, visit https://gerrit.osmocom.org/6416
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf0897c47388e49ba7886b55acc728a6f7d213fe
Gerrit-PatchSet: 4
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
