- gerrit-log - lists.osmocom.org

[S] Change in osmo-sgsn[master]: VTY: move default settings to sgsn_instance_alloc()
by fixeria 09 May '24

09 May '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36701?usp=email ) Change subject: VTY: move default settings to sgsn_instance_alloc() ...................................................................... VTY: move default settings to sgsn_instance_alloc() It's cleaner to have all configuration defaults in one place. Change-Id: I1a439dcc76272a181986b6ec9368ef16441dc098 Related: OS#6442 --- M src/sgsn/sgsn.c M src/sgsn/sgsn_vty.c 2 files changed, 17 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/sgsn/sgsn.c b/src/sgsn/sgsn.c index 6619bf2..c3b7fda 100644 --- a/src/sgsn/sgsn.c +++ b/src/sgsn/sgsn.c @@ -36,6 +36,9 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/gsup.h> +#include <osmocom/crypt/gprs_cipher.h> +#include <osmocom/crypt/utran_cipher.h> + #include <osmocom/sgsn/gprs_subscriber.h> #include <osmocom/sgsn/debug.h> #include <osmocom/sgsn/sgsn.h> @@ -162,6 +165,8 @@ inst->cfg.gtp_statedir = talloc_strdup(inst, "./"); inst->cfg.auth_policy = SGSN_AUTH_POLICY_CLOSED; + inst->cfg.gea_encryption_mask = (1 << GPRS_ALGO_GEA0); /* no encryption */ + inst->cfg.uea_encryption_mask = (1 << OSMO_UTRAN_UEA0); /* no encryption */ inst->cfg.require_authentication = true; /* only applies if auth_policy is REMOTE */ inst->cfg.gsup_server_port = OSMO_GSUP_PORT; diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index 29f9cd6..6837e71 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -1868,9 +1868,6 @@ /* make sure sgsn_vty_init() was called before this */ OSMO_ASSERT(g_cfg); - g_cfg->gea_encryption_mask = 0x1; /* support GEA0 by default unless specific encryption config exists */ - g_cfg->uea_encryption_mask = (1 << OSMO_UTRAN_UEA0); /* support UEA0 by default unless specific encryption config exists */ - rc = vty_read_config_file(config_file, NULL); if (rc < 0) { fprintf(stderr, "Failed to parse the config file: '%s'\n", config_file); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36701?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I1a439dcc76272a181986b6ec9368ef16441dc098 Gerrit-Change-Number: 36701 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-sgsn[master]: VTY: sync default UMTS UEA config with osmo-msc
by fixeria 09 May '24

09 May '24

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36702?usp=email ) Change subject: VTY: sync default UMTS UEA config with osmo-msc ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > I meant disabling UEA0 sorry. Ah, yes. The UMTS encryption becomes mandatory by default with this change. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36702?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4eb9451b4267fc1436ed90a55ff200cf36f16bf6 Gerrit-Change-Number: 36702 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 May 2024 16:12:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Introduce AMI_Adapter_CT
by pespin 09 May '24

09 May '24

Attention is currently required from: fixeria, jolly. Hello Jenkins Builder, fixeria, jolly, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36711?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: asterisk: Introduce AMI_Adapter_CT ...................................................................... asterisk: Introduce AMI_Adapter_CT This allows to keep string handling totally internal to the AMI_Adapter component, which also means now the CLIENT port acts asynchronously on full AMI messages. This allows for instance using activated altsteps to ignore events or answer to them. Change-Id: Ibf230d2302fecf443f34e1c4d4acfd4802f4cc79 --- M asterisk/AMI_Functions.ttcn M asterisk/Asterisk_Tests.ttcn 2 files changed, 126 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/11/36711/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36711?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibf230d2302fecf443f34e1c4d4acfd4802f4cc79 Gerrit-Change-Number: 36711 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-sgsn[master]: VTY: move default settings to sgsn_instance_alloc()
by pespin 09 May '24

09 May '24

Attention is currently required from: fixeria, laforge, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36701?usp=email ) Change subject: VTY: move default settings to sgsn_instance_alloc() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36701?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I1a439dcc76272a181986b6ec9368ef16441dc098 Gerrit-Change-Number: 36701 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 May 2024 16:09:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: gsm0808: add knowledge of TW-TS-003 BSSMAP IE
by pespin 09 May '24

09 May '24

Attention is currently required from: falconia, fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36669?usp=email ) Change subject: gsm0808: add knowledge of TW-TS-003 BSSMAP IE ...................................................................... Patch Set 2: (1 comment) File src/gsm/gsm0808.c: https://gerrit.osmocom.org/c/libosmocore/+/36669/comment/8b8d0a0b_650f55b8 PS1, Line 2316: [GSM0808_IE_THEMWI_RTP_EXTENSIONS] = { TLV_TYPE_TV }, > The A interface can't be changed as easily as Abis here: while Abis-IP is essentially a private inte […] @falcon@freecalypso.org do you mean that you already have it deployed & working with a TV instead of TLV somewhere? Unless this is deployed in tons of places in production, I'd say let's change this to TLV. I think others also agreed TLV is a better solution here. I'd say let's better see the whole patchset using this new IE before merging stuff in steps. So let's not split this patch in even more patches but keep the 2 definitions together. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36669?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idd6f1838bdc0cd71a2f6357e9b6d8b8fa4f7c46c Gerrit-Change-Number: 36669 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 May 2024 16:04:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: gsm0808: add knowledge of TW-TS-003 BSSMAP IE
by falconia 09 May '24

09 May '24

Attention is currently required from: fixeria, laforge, pespin. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36669?usp=email ) Change subject: gsm0808: add knowledge of TW-TS-003 BSSMAP IE ...................................................................... Patch Set 2: (1 comment) File src/gsm/gsm0808.c: https://gerrit.osmocom.org/c/libosmocore/+/36669/comment/4c1ecbfa_4969098e PS1, Line 2316: [GSM0808_IE_THEMWI_RTP_EXTENSIONS] = { TLV_TYPE_TV }, > You may want to keep this as TLV to match the Abis IE. The A interface can't be changed as easily as Abis here: while Abis-IP is essentially a private interface fully inside Osmocom kingdom, the AoIP interface (3GPP specs plus TW-TS-003 extension) connects two different fiefdoms: Osmocom kingdom on BSS side and W. R. of Themyscira on CN side. TW-TS-003 is thus an external ICD, unlike Osmocom-internal definitions like the Abis IE, and TW-TS-003 section 5.2 defines this IE as having TV format. It is true that TW-TS-003 is still a very new spec and can be revised, but revising TW-TS is a more formal/involved process than Gerrit here. However, to make it easier to merge the most essential part (reserving IEI code point 0xF2 for Themyscira and identifying it by the same symbolic name as in TW=TS-003 spec), I'll resubmit this patch with just protocol/gsm_08_08.h part kept, and drop this TLV decoder addition for now. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36669?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idd6f1838bdc0cd71a2f6357e9b6d8b8fa4f7c46c Gerrit-Change-Number: 36669 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 May 2024 15:58:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: ttcn3-asterisk: Configure new IMS ConnHdlr
by pespin 09 May '24

09 May '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36643?usp=email ) Change subject: ttcn3-asterisk: Configure new IMS ConnHdlr ...................................................................... ttcn3-asterisk: Configure new IMS ConnHdlr Configure new component added to Asterisk_Tests to emulate an IMS Core. Depends: osmo-ttcn3-hacks.git Change-Id Ibbbadd54b7facf4ef7384499704e742f482a1252 Change-Id: I0ee6cb8955fc4f7dec3db97c768430905374f115 --- M ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg 1 file changed, 22 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg index a734c22..e8e5058 100644 --- a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg +++ b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg @@ -6,15 +6,20 @@ [TESTPORT_PARAMETERS] *.AMI.CTRL_HOSTNAME := "172.18.11.10" -*.SIP.default_local_address := "172.18.11.103" -*.SIP.local_sip_port := "5060" -*.SIP.default_dest_address := "172.18.11.10" -*.SIP.default_dest_port := "5094" +Asterisk_Tests_LOCAL_SIP_EMU.SIP.default_local_address := "172.18.11.103" +Asterisk_Tests_LOCAL_SIP_EMU.SIP.local_sip_port := "5061" +Asterisk_Tests_LOCAL_SIP_EMU.SIP.default_dest_address := "172.18.11.10" +Asterisk_Tests_LOCAL_SIP_EMU.SIP.default_dest_port := "5094" +Asterisk_Tests_IMS_SIP_EMU.SIP.default_local_address := "172.18.11.103" +Asterisk_Tests_IMS_SIP_EMU.SIP.local_sip_port := "5060" +# Disabled for Server mode: +#Asterisk_Tests_IMS_SIP_EMU.SIP.default_dest_address := "172.18.11.10" +#Asterisk_Tests_IMS_SIP_EMU.SIP.default_dest_port := "5094" [MODULE_PARAMETERS] Asterisk_Tests.mp_local_sip_host := "172.18.11.103" Asterisk_Tests.mp_remote_sip_host := "172.18.11.10" -Asterisk_Tests.mp_local_sip_port := 5060 +Asterisk_Tests.mp_local_sip_port := 5061 Asterisk_Tests.mp_remote_sip_port := 5094 [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36643?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0ee6cb8955fc4f7dec3db97c768430905374f115 Gerrit-Change-Number: 36643 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: ttcn3-asterisk: Configure new IMS ConnHdlr
by pespin 09 May '24

09 May '24

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36643?usp=email ) Change subject: ttcn3-asterisk: Configure new IMS ConnHdlr ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36643?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0ee6cb8955fc4f7dec3db97c768430905374f115 Gerrit-Change-Number: 36643 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 May 2024 15:26:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: Misc_Helpers: f_str_split(): Fix parse with len(delimiter) > 1
by pespin 09 May '24

09 May '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36719?usp=email ) Change subject: Misc_Helpers: f_str_split(): Fix parse with len(delimiter) > 1 ...................................................................... Misc_Helpers: f_str_split(): Fix parse with len(delimiter) > 1 Change-Id: I1ac53635deea82a501f2a8c7a94faf501ddf7afd --- M library/Misc_Helpers.ttcn 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/library/Misc_Helpers.ttcn b/library/Misc_Helpers.ttcn index fd2e7bb..805254a 100644 --- a/library/Misc_Helpers.ttcn +++ b/library/Misc_Helpers.ttcn @@ -94,7 +94,7 @@ if (delim_pos > pos) { parts := parts & { substr(str, pos, delim_pos - pos) }; } - pos := delim_pos + 1; + pos := delim_pos + lengthof(delim); } return parts; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36719?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1ac53635deea82a501f2a8c7a94faf501ddf7afd Gerrit-Change-Number: 36719 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk/AMI_Functions: improvements to implement PJSIPRegister
by pespin 09 May '24

09 May '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36652?usp=email ) Change subject: asterisk/AMI_Functions: improvements to implement PJSIPRegister ...................................................................... asterisk/AMI_Functions: improvements to implement PJSIPRegister Change-Id: Ibc4ff6eaad84f67d33c1211dc5e39294ce1c8fac --- M asterisk/AMI_Functions.ttcn 1 file changed, 131 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index d5139f5..72420e1 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -25,10 +25,14 @@ } const charstring AMI_FIELD_ACTION := "Action"; +const charstring AMI_FIELD_ACTION_ID := "ActionId"; const charstring AMI_FIELD_USERNAME := "Username"; const charstring AMI_FIELD_SECRET := "Secret"; const charstring AMI_FIELD_RESPONSE := "Response"; +/* Extensions: */ +const charstring AMI_FIELD_REGISTRATION := "Registration"; + type record AMI_Field { charstring key, charstring val @@ -69,28 +73,46 @@ template (value) AMI_Field ts_AMI_Field_Action(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_ACTION, val); template (value) AMI_Field +ts_AMI_Field_ActionId(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_ACTION_ID, val); +template (value) AMI_Field ts_AMI_Field_Username(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_USERNAME, val); template (value) AMI_Field ts_AMI_Field_Secret(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_SECRET, val); +/* Extensions: */ +template (value) AMI_Field +ts_AMI_Field_Registration(template (value) charstring val) := ts_AMI_Field(AMI_FIELD_REGISTRATION, val); template (present) AMI_Field tr_AMI_Field_Action(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_ACTION, val); template (present) AMI_Field +tr_AMI_Field_ActionId(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_ACTION_ID, val); +template (present) AMI_Field tr_AMI_Field_Username(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_USERNAME, val); template (present) AMI_Field tr_AMI_Field_Secret(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_SECRET, val); template (present) AMI_Field tr_AMI_Field_Response(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_RESPONSE, val); +/* Extensions: */ +template (present) AMI_Field +tr_AMI_Field_Registration(template (present) charstring val := ?) := tr_AMI_Field(AMI_FIELD_REGISTRATION, val); template (present) AMI_Field tr_AMI_Field_ResponseSuccess := tr_AMI_Field(AMI_FIELD_RESPONSE, "Success"); -/* +/*********************** * Message Templates: + ***********************/ + +/* + * ACTIONS */ +/* Action: Login + * Username: <value> + * Secret: <value> + */ template (value) AMI_Msg ts_AMI_Action_Login(charstring username, charstring secret) := { ts_AMI_Field_Action("Login"), @@ -106,15 +128,101 @@ tr_AMI_Field_Secret(secret) ); +/* Action: PJSIPRegister + * ActionID: <value> + * Registration: volte_ims + */ +template (value) AMI_Msg +ts_AMI_Action_PJSIPRegister(template (value) charstring registration := "volte_ims", + template (value) charstring action_id := "0001") := { + ts_AMI_Field_Action("PJSIPRegister"), + ts_AMI_Field_ActionId(action_id), + ts_AMI_Field_Registration(registration) +}; +template (present) AMI_Msg +tr_AMI_Action_PJSIPRegister(template (present) charstring registration := ?, + template (present) charstring action_id := ?) := { + tr_AMI_Field_Action("PJSIPRegister"), + tr_AMI_Field_ActionId(action_id), + tr_AMI_Field_Registration(registration) +}; + +/* + * RESPONSES + */ + +/* Response: Success + */ template (present) AMI_Msg tr_AMI_Response_Success := superset( tr_AMI_Field_ResponseSuccess ); +/* Response: Success + * ActionId: <value> + */ +template (present) AMI_Msg +tr_AMI_Response_Success_ActionId(template (present) charstring action_id := ?) := superset( + tr_AMI_Field_ResponseSuccess, + tr_AMI_Field_ActionId(action_id) +); + /* * Functions: */ +/* Generate a random "ActionId" value: */ +function f_gen_action_id() return charstring { + return hex2str(f_rnd_hexstring(16)); +} + +function f_ami_msg_find(AMI_Msg msg, + template (present) charstring key := ?) +return template (omit) AMI_Field { + var integer i; + + for (i := 0; i < lengthof(msg); i := i + 1) { + if (not ispresent(msg[i])) { + continue; + } + if (match(msg[i].key, key)) { + return msg[i]; + } + } + return omit; +} + +function f_ami_msg_find_or_fail(AMI_Msg msg, + template (present) charstring key := ?) +return AMI_Field { + var template (omit) AMI_Field field; + field := f_ami_msg_find(msg, key); + if (istemplatekind(field, "omit")) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Key ", key, " not found in ", msg)); + } + return valueof(field); +} + +function f_ami_msg_get_value(AMI_Msg msg, + template (present) charstring key := ?) +return template (omit) charstring { + var template (omit) AMI_Field field; + field := f_ami_msg_find(msg, key); + if (istemplatekind(field, "omit")) { + return omit; + } + return field.val; +} + +function f_ami_msg_get_value_or_fail(AMI_Msg msg, + template (present) charstring key := ?) +return template charstring { + var AMI_Field field; + field := f_ami_msg_find_or_fail(msg, key); + return field.val; +} + private function f_ami_wait_for_prompt_str(TELNETasp_PT pt, charstring log_label := "(?)") return charstring { var charstring rx, buf := ""; @@ -172,11 +280,23 @@ function f_ami_transceive_match_response_success(TELNETasp_PT pt, template (value) AMI_Msg tx_msg) { - f_ami_transceive_match(pt, tx_msg, tr_AMI_Response_Success); + var template (present) AMI_Msg exp_resp; + var template (omit) charstring action_id := f_ami_msg_get_value(valueof(tx_msg), AMI_FIELD_ACTION_ID); + if (isvalue(action_id)) { + exp_resp := tr_AMI_Response_Success_ActionId(action_id); + } else { + exp_resp := tr_AMI_Response_Success; + } + f_ami_transceive_match(pt, tx_msg, exp_resp); } function f_ami_action_login(TELNETasp_PT pt, charstring username, charstring secret) { f_ami_transceive_match_response_success(pt, ts_AMI_Action_Login(username, secret)); } +function f_ami_action_PJSIPRegister(TELNETasp_PT pt, charstring register) { + var charstring reg_action_id := f_gen_action_id(); + f_ami_transceive_match_response_success(pt, ts_AMI_Action_PJSIPRegister(register, reg_action_id)); +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36652?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibc4ff6eaad84f67d33c1211dc5e39294ce1c8fac Gerrit-Change-Number: 36652 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log