May 2024 - gerrit-log - lists.osmocom.org

[S] Change in docker-playground[master]: ttcn3-asterisk: Configure docker testsuite to be able to set up ipsec...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36857?usp=email ) Change subject: ttcn3-asterisk: Configure docker testsuite to be able to set up ipsec tunnels ...................................................................... ttcn3-asterisk: Configure docker testsuite to be able to set up ipsec tunnels Depends: osmo-ttcn3-hacks.git Change-Id Ic042422788ee406f5b71ca3878bc5617e5455579 Change-Id: I3379e4991a5c705b5b0a14e5fee2eb165cc8a1e3 --- M debian-bookworm-titan-master/Dockerfile M debian-bookworm-titan/Dockerfile M ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg M ttcn3-asterisk-ims-ue-test/jenkins.sh 4 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/57/36857/1 diff --git a/debian-bookworm-titan-master/Dockerfile b/debian-bookworm-titan-master/Dockerfile index 2b0644a..161c933 100644 --- a/debian-bookworm-titan-master/Dockerfile +++ b/debian-bookworm-titan-master/Dockerfile @@ -20,6 +20,7 @@ build-essential \ ca-certificates \ git \ + iproute2 \ iputils-ping \ netcat-openbsd \ procps \ diff --git a/debian-bookworm-titan/Dockerfile b/debian-bookworm-titan/Dockerfile index fcc00ba..c4af2ef 100644 --- a/debian-bookworm-titan/Dockerfile +++ b/debian-bookworm-titan/Dockerfile @@ -21,6 +21,7 @@ ca-certificates \ ccache \ git \ + iproute2 \ iputils-ping \ netcat-openbsd \ procps \ diff --git a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg index 40bc86e..d183cad 100644 --- a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg +++ b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg @@ -24,6 +24,7 @@ Asterisk_Tests.mp_local_ims_port := 5060 Asterisk_Tests.mp_ims_imsi := "238010000090828" Asterisk_Tests.mp_ami_remote_host := "172.18.11.10" +IMS_ConnectionHandler.mp_ipsec_setup_script_path := "/osmo-ttcn3-hacks/asterisk/IMS_ipsec_setup.sh" [MAIN_CONTROLLER] diff --git a/ttcn3-asterisk-ims-ue-test/jenkins.sh b/ttcn3-asterisk-ims-ue-test/jenkins.sh index aa5749d..98d27b8 100755 --- a/ttcn3-asterisk-ims-ue-test/jenkins.sh +++ b/ttcn3-asterisk-ims-ue-test/jenkins.sh @@ -37,6 +37,8 @@ echo Starting container with Asterisk testsuite docker run --rm \ + --cap-add=NET_ADMIN \ + --cap-add=SYS_RESOURCE \ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36857?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: I3379e4991a5c705b5b0a14e5fee2eb165cc8a1e3 Gerrit-Change-Number: 36857 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: asterisk: Implement support to handle 2nd REGISTER through ipsec

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36856?usp=email ) Change subject: asterisk: Implement support to handle 2nd REGISTER through ipsec ...................................................................... Patch Set 1: (1 comment) File asterisk/regen_makefile.sh: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-16174): https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36856/comment/7d1b72d0_de99… PS1, Line 26: sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile adding a line without newline at end of file -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36856?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: Ic042422788ee406f5b71ca3878bc5617e5455579 Gerrit-Change-Number: 36856 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 16 May 2024 19:02:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Fix missing ':' between URI scheme and host

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36855?usp=email ) Change subject: SIP_Templates: Fix missing ':' between URI scheme and host ...................................................................... SIP_Templates: Fix missing ':' between URI scheme and host Change-Id: I5369db54901d50cf08d7ffc3e0d1cf3f5091e77b --- M library/SIP_Templates.ttcn 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/55/36855/1 diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index ffd6f2b..37dee4b 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -1388,7 +1388,7 @@ } function f_sip_SipUrl_to_str(SipUrl uri) return charstring { - var charstring str := uri.scheme & f_sip_HostPort_to_str(uri.hostPort); + var charstring str := uri.scheme & ":" & f_sip_HostPort_to_str(uri.hostPort); return str; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36855?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: I5369db54901d50cf08d7ffc3e0d1cf3f5091e77b Gerrit-Change-Number: 36855 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk/AMI_Functions: Add workaround for empty 'Hint: ' field

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36854?usp=email ) Change subject: asterisk/AMI_Functions: Add workaround for empty 'Hint: ' field ...................................................................... asterisk/AMI_Functions: Add workaround for empty 'Hint: ' field It sometimes shows up empty, let's skip it to avoid breaking the decoder for now, similar to what we do with other fields. Change-Id: I50fb51fab3755e4d63f3a0bc06d90b42814231d2 --- M asterisk/AMI_Functions.ttcn 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/54/36854/1 diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index 1f3dc5e..c05403e 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -261,6 +261,7 @@ patched_txt := f_str_replace(patched_txt, "DestExten: \r\n", ""); patched_txt := f_str_replace(patched_txt, "Exten: \r\n", ""); patched_txt := f_str_replace(patched_txt, "Extension: \r\n", ""); + patched_txt := f_str_replace(patched_txt, "Hint: \r\n", ""); /* "AppData" field sometimes has a value containing separator ": ", which makes * TEXT dec not happy. Workaround it for now by removing the whole field line: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36854?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: I50fb51fab3755e4d63f3a0bc06d90b42814231d2 Gerrit-Change-Number: 36854 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: asterisk: Implement support to handle 2nd REGISTER through ipsec

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36856?usp=email ) Change subject: asterisk: Implement support to handle 2nd REGISTER through ipsec ...................................................................... asterisk: Implement support to handle 2nd REGISTER through ipsec This patch implements the necessary infra to set up ipsec tunnel towards the asterisk IMS client, and receive the 2nd REGISTER through the ipsec tun plus answer it acking the registration successfully. Change-Id: Ic042422788ee406f5b71ca3878bc5617e5455579 --- M asterisk/Asterisk_Tests.cfg M asterisk/IMS_ConnectionHandler.ttcn A asterisk/IMS_ipsec_setup.sh M asterisk/gen_links.sh M asterisk/regen_makefile.sh M library/PIPEasp_Templates.ttcn M library/SIP_Templates.ttcn 7 files changed, 284 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/36856/1 diff --git a/asterisk/Asterisk_Tests.cfg b/asterisk/Asterisk_Tests.cfg index bcc8a30..3286aed 100644 --- a/asterisk/Asterisk_Tests.cfg +++ b/asterisk/Asterisk_Tests.cfg @@ -11,6 +11,7 @@ [TESTPORT_PARAMETERS] [MODULE_PARAMETERS] +IMS_ConnectionHandler.mp_ipsec_setup_script_path := "./IMS_ipsec_setup.sh" [MAIN_CONTROLLER] diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 18404f1..7aac8bb 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -16,6 +16,11 @@ import from Native_Functions all; import from Misc_Helpers all; +/* the PIPE asp port allows us to interact with ip xfrm via stdin/stdout */ +import from PIPEasp_PortType all; +import from PIPEasp_Types all; +import from PIPEasp_Templates all; + import from SDP_Types all; import from SDP_Templates all; @@ -23,6 +28,11 @@ import from SIPmsg_Types all; import from SIP_Templates all; + +modulepar { + charstring mp_ipsec_setup_script_path := "./IMS_ipsec_setup.sh"; +} + const char c_sip_server_name := "osmo-ttcn3-hacks/0.23"; @@ -41,6 +51,7 @@ var PDU_SIP_Response g_rx_sip_resp; port IMSCoord_PT COORD; + port PIPEasp_PT PIPE; } type record of IMS_ConnHdlr IMS_ConnHdlrList; @@ -54,10 +65,14 @@ charstring user, charstring display_name, charstring password, + charstring nonce, + charstring ipsec_auth_key, integer ipsec_local_spi_c, integer ipsec_local_spi_s, integer ipsec_remote_spi_c optional, integer ipsec_remote_spi_s optional, + uint16_t ipsec_remote_port_c optional, + uint16_t ipsec_remote_port_s optional, SipUrl registrar_sip_req_uri, SipAddr registrar_sip_record, CallidString registrar_sip_call_id, @@ -131,10 +146,15 @@ user := user, display_name := f_sip_str_quote(display_name), password := password, + /* The Nonce field is the Base64 encoded version of the RAND value and concatenated with the AUTN: */ + nonce := "FJh2MfZfjjeIoHmLbrzQjvbhmnzLAoAAoGsZyVRFFuU=", + ipsec_auth_key := "0x5238297dfcca759bd05d48ff49bc63fa00000000", ipsec_local_spi_c := 4142, ipsec_local_spi_s := 4143, ipsec_remote_spi_c := omit, ipsec_remote_spi_s := omit, + ipsec_remote_port_c := omit, + ipsec_remote_port_s := omit, registrar_sip_req_uri := valueof(ts_SipUrlHost(local_sip_host)), registrar_sip_record := ts_SipAddr(ts_HostPort(local_sip_host), ts_UserInfo(user), @@ -194,6 +214,39 @@ } } +/* HTTP Digest Authentication Using AKA (AKAv1-MD5): RFC 3310 */ +function f_tr_Authorization_AKAv1MD5(WwwAuthenticate www_authenticate, + charstring username, + charstring uri, + integer nc_int := 1) +return template (present) Authorization { + var CommaParam_List digestCln; + var template (present) Authorization authorization; + var template (present) Credentials cred; + var template (omit) GenericParam rx_param; + + digestCln := www_authenticate.challenge[0].digestCln; + + var charstring algorithm := f_sip_param_get_value_present_or_fail(digestCln, "algorithm"); + var charstring realm := f_sip_param_get_value_present_or_fail(digestCln, "realm"); + var charstring nonce := f_sip_param_get_value_present_or_fail(digestCln, "nonce"); + + var template (present) CommaParam_List digestResponse := superset( + tr_Param("username", f_sip_str_quote(username)), + tr_Param("realm", f_sip_str_quote(realm)), + tr_Param("nonce", f_sip_str_quote(nonce)), + tr_Param("uri", f_sip_str_quote(uri)), + tr_Param("response", ?), + tr_Param("algorithm", algorithm), + tr_Param("qop", "auth"), + tr_Param("cnonce", ?), + tr_Param("nc", ?) + ); + cred := tr_Credentials_DigestResponse(digestResponse); + authorization := tr_Authorization(cred); + return authorization; +} + private function f_ims_validate_register_contact(Contact rx_contact) { /* IMS contact shows up like this: @@ -229,6 +282,10 @@ g_pars.ipsec_remote_spi_c := str2int(par_val); par_val := f_sip_param_get_value_present_or_fail(sec_pars, "spi-s"); g_pars.ipsec_remote_spi_s := str2int(par_val); + par_val := f_sip_param_get_value_present_or_fail(sec_pars, "port-c"); + g_pars.ipsec_remote_port_c := str2int(par_val); + par_val := f_sip_param_get_value_present_or_fail(sec_pars, "port-s"); + g_pars.ipsec_remote_port_s := str2int(par_val); found := true; break; } @@ -242,10 +299,40 @@ "local_spi_c=", g_pars.ipsec_local_spi_c, " local_spi_s=", g_pars.ipsec_local_spi_s); } -private function f_ims_setup_ipsec(PDU_SIP_Request req_req) runs on IMS_ConnHdlr +private function f_IMS_exec_sync(charstring cmdline, template (present) integer rc := 0) + runs on IMS_ConnHdlr return ASP_PResult { + var ASP_PResult res; + + map(self:PIPE, system:PIPE); + res := f_PIPEasp_exec_sync_PResult(PIPE, cmdline, tr_PResult(?, ?, rc)); + unmap(self:PIPE, system:PIPE); + + return res; +} + +private function f_ims_setup_ipsec() runs on IMS_ConnHdlr { - var Security_client security_client := req_req.msgHeader.security_client; - f_ims_parse_security_client(security_client); + var ASP_PResult res; + + var charstring cmd := mp_ipsec_setup_script_path & " " & + g_pars.local_sip_host & " " & + int2str(g_pars.local_sip_port) & " " & int2str(g_pars.ipsec_local_spi_c) & " " & + int2str(g_pars.local_sip_port) & " " & int2str(g_pars.ipsec_local_spi_s) & " " & + g_pars.remote_sip_host & " " & + int2str(g_pars.ipsec_remote_port_c) & " " & int2str(g_pars.ipsec_remote_spi_c) & " " & + int2str(g_pars.ipsec_remote_port_s) & " " & int2str(g_pars.ipsec_remote_spi_s) & " " & + g_pars.ipsec_auth_key; + + res := f_IMS_exec_sync(cmd); + + /* Debug applied rules: */ + /* + res := f_IMS_exec_sync("ip xfrm state"); + log("ip-xfrm-state Result-Stdout: " & res.stdout); + + res := f_IMS_exec_sync("ip xfrm policy"); + log("ip-xfrm-policy Result-Stdout: " & res.stdout); + */ } /* Peer is calling us, accept it: */ @@ -275,8 +362,9 @@ var template (value) WwwAuthenticate wwwAuthenticate; var template (value) Security_server security_server; var template (value) Server server_name := ts_Server({c_sip_server_name}); + var template (value) Require require := ts_Require({"sec-agree"}); var template (value) Supported supported := ts_Supported({"sec-agree"}); - var Authorization authorization; + var template (present) Authorization authorization; var integer sip_seq_nr; var charstring tx_sdp; @@ -293,9 +381,6 @@ f_ims_validate_register_contact(contact); /* TODO: Validate "Expires" is 600000 */ - /* TODO: validate presence of: - * Security-Client: ipsec-3gpp; alg=hmac-md5-96; ealg=des-ede3-cbc; spi-c=431842084; spi-s=650017092; port-c=41271; port-s=41718,ipsec-3gpp; alg=hmac-md5-96; ealg=aes-cbc; spi-c=431842084; spi-s=650017092; port-c=41271; port-s=41718,ipsec-3gpp; alg=hmac-md5-96; ealg=null; spi-c=431842084; spi-s=650017092; port-c=41271; port-s=41718,ipsec-3gpp; alg=hmac-sha-1-96; ealg=des-ede3-cbc; spi-c=431842084; spi-s=650017092; port-c=41271; port-s=41718,ipsec-3gpp; alg=hmac-sha-1-96; ealg=aes-cbc; spi-c=431842084; spi-s=650017092; port-c=41271; port-s=41718,ipsec-3gpp; alg=hmac-sha-1-96; ealg=null; spi-c=431842084; spi-s=650017092; port-c=41271; port-s=41718 - */ /* Tx 100 Tyring */ tx_resp := ts_SIP_Response_Trying(sip_call_id, @@ -309,7 +394,9 @@ userAgent := omit); SIP.send(tx_resp); - f_ims_setup_ipsec(g_rx_sip_req); + g_pars.remote_sip_host := valueof(contact.contactBody.contactAddresses[0].addressField.nameAddr.addrSpec.hostPort.host); + f_ims_parse_security_client(g_rx_sip_req.msgHeader.security_client); + f_ims_setup_ipsec(); to_addr.params := f_sip_param_set(to_addr.params, "tag", f_sip_rand_tag()); @@ -317,7 +404,7 @@ ts_Param("realm", f_sip_str_quote(g_pars.realm)), ts_Param("qop", f_sip_str_quote("auth")), ts_Param("algorithm", "AKAv1-MD5"), - ts_Param("nonce", f_sip_str_quote("FJh2MfZfjjeIoHmLbrzQjvbhmnzLAoAAoGsZyVRFFuU=")) + ts_Param("nonce", f_sip_str_quote(g_pars.nonce)) /* "opaque not needed in IMS "*/ }; wwwAuthenticate := ts_WwwAuthenticate( { ts_Challenge_digestCln(digestCln) } ) @@ -337,8 +424,8 @@ security_server := ts_Security_server({ ts_Security_mechanism("ipsec-3gpp", sec_params) }); - /* Tx 401 Unauthorized - * TODO: with IMS params */ + + /* Tx 401 Unauthorized */ tx_resp := ts_SIP_Response_Unauthorized(sip_call_id, from_addr, to_addr, @@ -352,19 +439,25 @@ userAgent := omit); SIP.send(tx_resp); + /* Now we should receive a new REGISTER over ipsec: */ + /* TODO: Generate expected Authoritzation based on AKAv1-MD5: */ /*authorization := f_sip_digest_gen_Authorization(valueof(wwwAuthenticate), g_pars.user, g_pars.password, "REGISTER", f_sip_SipUrl_to_str(g_pars.registrar_sip_record.addr.nameAddr.addrSpec)) */ + authorization := f_tr_Authorization_AKAv1MD5(valueof(wwwAuthenticate), + g_pars.user & "@" & g_pars.realm, + f_sip_SipUrl_to_str(g_pars.registrar_sip_record.addr.nameAddr.addrSpec)); /* TODO: match Authorization from above: */ exp_req := tr_SIP_REGISTER(g_pars.registrar_sip_req_uri, ?, tr_SipAddr(), tr_SipAddr(), - tr_Via_from(?)); + tr_Via_from(?), + authorization := authorization); SIP.receive(exp_req) -> value g_rx_sip_req; sip_call_id := g_rx_sip_req.msgHeader.callId.callid; @@ -373,21 +466,33 @@ g_rx_sip_req.msgHeader.fromField.fromParams); to_addr := ts_SipAddr_from_Addr_Union(g_rx_sip_req.msgHeader.toField.addressField, g_rx_sip_req.msgHeader.toField.toParams); - to_addr.params := f_sip_param_set(to_addr.params, "tag", f_sip_rand_tag()); sip_seq_nr := g_rx_sip_req.msgHeader.cSeq.seqNumber; - /* TODO: Add following fields: - * Supported: sec-agree - * Security-Server: ipsec-3gpp;q=0.1;prot=esp;mod=trans;spi-c=4096;spi-s=4097;port-c=5104;port-s=6104;alg=hmac-sha-1-96;ealg=null - * */ + /* Tx 100 Tyring */ + tx_resp := ts_SIP_Response_Trying(sip_call_id, + from_addr, + to_addr, + via, + sip_seq_nr, + "REGISTER", + allow := omit, + server := server_name, + userAgent := omit); + SIP.send(tx_resp); + /* Tx 200 OK */ + to_addr.params := f_sip_param_set(to_addr.params, "tag", f_sip_rand_tag()); tx_resp := ts_SIP_Response(sip_call_id, from_addr, to_addr, "REGISTER", 200, sip_seq_nr, "OK", - via); + via, + require := require, + server := server_name, + supported := supported, + userAgent := omit); SIP.send(tx_resp); } [fail_others] as_SIP_fail_resp(sip_expect_str); diff --git a/asterisk/IMS_ipsec_setup.sh b/asterisk/IMS_ipsec_setup.sh new file mode 100755 index 0000000..640675f --- /dev/null +++ b/asterisk/IMS_ipsec_setup.sh @@ -0,0 +1,70 @@ +#!/bin/sh + +# use: ipset_setup.sh \ +# $LOC_IP $LOC_PORT_C $LOC_SPI_C $LOC_PORT_S $LOC_SPI_S \ +# $REM_IP $REM_PORT_C $REM_SPI_C $REM_PORT_S $REM_SPI_S \ +# $AUTH_KEY + +LOC_IP="${1}" +LOC_PORT_C="${2}" +LOC_SPI_C="${3}" +LOC_PORT_S="${4}" +LOC_SPI_S="${5}" +REM_IP="${6}" +REM_PORT_C="${7}" +REM_SPI_C="${8}" +REM_PORT_S="${9}" +REM_SPI_S="${10}" +AUTH_KEY="${11}" + +set -x + +# Clean up state from previous tests: +ip xfrm policy flush +ip xfrm state flush + +# use: ip_xfrm <src_ip> <src_port> <dst_ip> <dst_port> <spi> +ip_xfrm_state() { + ip xfrm state add \ + src "${1}" dst "${3}" proto esp spi "${5}" reqid "${5}" mode transport \ + replay-window 32 \ + auth-trunc sha1 "${AUTH_KEY}" 96 \ + enc cipher_null "" \ + sel src "${1}/32" dst "${3}/32" sport "${2}" dport "${4}" +} + +# TTCN3(Srv) -> Asterisk(Cli): REM_SPI_C +ip_xfrm_state "${LOC_IP}" "${LOC_PORT_S}" "${REM_IP}" "${REM_PORT_C}" "${REM_SPI_C}" + +# TTCN3(Cli) -> Asterisk(Srv): REM_SPI_S +ip_xfrm_state "${LOC_IP}" "${LOC_PORT_C}" "${REM_IP}" "${REM_PORT_S}" "${REM_SPI_S}" + +# Asterisk(Cli) -> TTCN3(Srv): LOC_SPI_S +ip_xfrm_state "${REM_IP}" "${REM_PORT_C}" "${LOC_IP}" "${LOC_PORT_S}" "${LOC_SPI_S}" + +# Asterisk(Srv) -> TTCN3(Cli): LOC_SPI_C +ip_xfrm_state "${REM_IP}" "${REM_PORT_S}" "${LOC_IP}" "${LOC_PORT_C}" "${LOC_SPI_C}" + +# use: ip_xfrm <src_ip> <src_port> <dst_ip> <dst_port> <req_id> <dir> +ip_xfrm_policy() { + ip xfrm policy add \ + src "${1}/32" dst "${3}/32" sport "${2}" dport "${4}" \ + dir "${6}" \ + tmpl src "${1}" dst "${3}" \ + proto esp reqid "${5}" mode transport +} + +# TTCN3(Srv) -> Asterisk(Cli): REM_SPI_C out +ip_xfrm_policy "${LOC_IP}" "${LOC_PORT_S}" "${REM_IP}" "${REM_PORT_C}" "${REM_SPI_C}" "out" + +# TTCN3(Cli) -> Asterisk(Srv): REM_SPI_S out +ip_xfrm_policy "${LOC_IP}" "${LOC_PORT_C}" "${REM_IP}" "${REM_PORT_S}" "${REM_SPI_S}" "out" + +# Asterisk(Cli) -> TTCN3(Srv): LOC_SPI_S in +ip_xfrm_policy "${REM_IP}" "${REM_PORT_C}" "${LOC_IP}" "${LOC_PORT_S}" "${LOC_SPI_S}" "in" + +# Asterisk(Srv) -> TTCN3(Cli): LOC_SPI_C in +ip_xfrm_policy "${REM_IP}" "${REM_PORT_S}" "${LOC_IP}" "${LOC_PORT_C}" "${LOC_SPI_C}" "in" + +#ip xfrm state +#ip xfrm policy diff --git a/asterisk/gen_links.sh b/asterisk/gen_links.sh index c342e51..3c4495f 100755 --- a/asterisk/gen_links.sh +++ b/asterisk/gen_links.sh @@ -14,7 +14,10 @@ FILES="Socket_API_Definitions.ttcn" gen_links $DIR $FILES -# Required by MGCP and IPA +DIR=$BASEDIR/titan.TestPorts.PIPEasp/src +FILES="PIPEasp_PT.cc PIPEasp_PT.hh PIPEasp_Types.ttcn PIPEasp_PortType.ttcn PIPEasp_Templates.ttcn " +gen_links $DIR $FILES + DIR=$BASEDIR/titan.TestPorts.IPL4asp/src FILES="IPL4asp_Functions.ttcn IPL4asp_PT.cc IPL4asp_PT.hh IPL4asp_PortType.ttcn IPL4asp_Types.ttcn IPL4asp_discovery.cc IPL4asp_protocol_L234.hh" gen_links $DIR $FILES @@ -38,6 +41,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " +FILES+="PIPEasp_Templates.ttcn " FILES+="RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunctDef.cc " FILES+="SDP_Templates.ttcn " FILES+="SIP_Emulation.ttcn SIP_Templates.ttcn " diff --git a/asterisk/regen_makefile.sh b/asterisk/regen_makefile.sh index 5d5538e..8bf4b94 100755 --- a/asterisk/regen_makefile.sh +++ b/asterisk/regen_makefile.sh @@ -5,6 +5,7 @@ FILES=" *.c *.ttcn + PIPEasp_PT.cc IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc @@ -20,3 +21,6 @@ " ../regen-makefile.sh -e $NAME $FILES + +# required for forkpty(3) used by PIPEasp +sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile \ No newline at end of file diff --git a/library/PIPEasp_Templates.ttcn b/library/PIPEasp_Templates.ttcn index af4e434..0775a5e 100644 --- a/library/PIPEasp_Templates.ttcn +++ b/library/PIPEasp_Templates.ttcn @@ -3,6 +3,20 @@ import from PIPEasp_PortType all; import from PIPEasp_Types all; +template (value) ASP_PExecute ts_PExecute(template (value) charstring command, + template (value) charstring stdin) := { + command := command, + stdin := stdin +} + +template (present) ASP_PResult tr_PResult(template (present) charstring stdout, + template (present) charstring stderr, + template (present) integer code) := { + stdout := stdout, + stderr := stderr, + code := code +} + template (value) ASP_PExecuteBackground ts_ExecBg(charstring cmd) := { command := cmd } @@ -24,4 +38,36 @@ [] pt.receive(tr_Stderr(?)) { repeat; } } +/* User should map(component_name:PIPE, system:PIPE) before using this function. */ +function f_PIPEasp_exec_sync_PResult(PIPEasp_PT pt, + charstring cmdline, + template (present) ASP_PResult res_exp := tr_PResult(?,?,0), + float time_out := 10.0) return ASP_PResult { + var ASP_PResult res; + timer t; + + if (time_out > 0.0) { + t.start(time_out); + } + + log ("Executing: ", cmdline); + pt.send(ts_PExecute(cmdline, "")); + + alt { + [] pt.receive(res_exp) -> value res; + [time_out > 0.0] t.timeout { + setverdict(fail, "Timeout: ", cmdline); + mtc.stop; + } + } + log ("Result: ", res); + return res; +} + +function f_PIPEasp_exec_sync(PIPEasp_PT pt, + charstring cmdline, + template (present) integer rc := 0) return ASP_PResult { + return f_PIPEasp_exec_sync_PResult(pt, cmdline, tr_PResult(?, ?, rc)); +} + } diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index 37dee4b..7ef49cf 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -76,6 +76,9 @@ methods := methods } +template (present) Credentials tr_Credentials_DigestResponse(template (present) CommaParam_List digestResponse) := { + digestResponse := digestResponse +} template (value) Credentials ts_Credentials_DigestResponse(template (value) CommaParam_List digestResponse) := { digestResponse := digestResponse } @@ -114,6 +117,10 @@ otherResponse := otherResponse } +template (present) Authorization tr_Authorization(template (present) Credentials body) := { + fieldName := AUTHORIZATION_E, + body := body +} template (value) Authorization ts_Authorization(template (value) Credentials body) := { fieldName := AUTHORIZATION_E, body := body @@ -618,6 +625,7 @@ template ContentLength content_length := *, template ContentType content_type := *, template Allow allow := *, + template Authorization authorization := *, template Expires expires := *, template Require require := *, template Security_client security_client := *, @@ -628,6 +636,7 @@ template WwwAuthenticate wwwAuthenticate := * ) modifies t_SIP_msgHeader_any := { allow := allow, + authorization := authorization, callId := { fieldName := CALL_ID_E, callid := call_id @@ -696,6 +705,7 @@ template (present) SipAddr to_addr := ?, template (present) Via via := tr_Via_from(f_tr_HostPort_opt_defport(?)), template integer seq_nr := *, + template Authorization authorization := *, template Contact contact := *, template Expires expires := *, template Require require := *, @@ -705,6 +715,7 @@ requestLine := tr_SIP_ReqLine(REGISTER_E, sip_url_host_port), msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, contact, via, "REGISTER", seq_nr, + authorization := authorization, expires := expires, require := require, security_client := security_client, @@ -835,12 +846,22 @@ integer seq_nr, charstring reason, Via via, + template (omit) Allow allow := omit, + template (omit) Require require := omit, + template (omit) Server server := omit, + template (omit) Supported supported := omit, + template (omit) UserAgent userAgent := omit, template (omit) charstring body := omit) := { statusLine := ts_SIP_StatusLine(status_code, reason), msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, omit, method, seq_nr, via, content_length := f_ContentLength(body), - content_type := f_ContentTypeOrOmit(ts_CT_SDP, body)), + content_type := f_ContentTypeOrOmit(ts_CT_SDP, body), + allow := allow, + require := require, + server := server, + supported := supported, + userAgent := userAgent), messageBody := body, payload := omit } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36856?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: Ic042422788ee406f5b71ca3878bc5617e5455579 Gerrit-Change-Number: 36856 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ttcn3-tcpdump-start.sh: Log issue with packet dumper not properly sta...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36853?usp=email ) Change subject: ttcn3-tcpdump-start.sh: Log issue with packet dumper not properly started ...................................................................... ttcn3-tcpdump-start.sh: Log issue with packet dumper not properly started Change-Id: I50af5eb16a000c4f3585a3458f9130a349eff097 --- M ttcn3-tcpdump-start.sh 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/36853/1 diff --git a/ttcn3-tcpdump-start.sh b/ttcn3-tcpdump-start.sh index 36aa320..8564cd5 100755 --- a/ttcn3-tcpdump-start.sh +++ b/ttcn3-tcpdump-start.sh @@ -109,6 +109,7 @@ sleep 1 i=$((i+1)) if [ $i -eq 10 ]; then + echo "Packet dumper didn't start filling pcap file after $i seconds!!!" break fi done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36853?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: I50af5eb16a000c4f3585a3458f9130a349eff097 Gerrit-Change-Number: 36853 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk/expected-results.xml: Add missing TC_ims_registration

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36852?usp=email ) Change subject: asterisk/expected-results.xml: Add missing TC_ims_registration ...................................................................... asterisk/expected-results.xml: Add missing TC_ims_registration Change-Id: Ie4f589a398f93b429a8b4a93da1b80784b4013ea --- M asterisk/expected-results.xml 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/52/36852/1 diff --git a/asterisk/expected-results.xml b/asterisk/expected-results.xml index 745a4d7..49f92bf 100644 --- a/asterisk/expected-results.xml +++ b/asterisk/expected-results.xml @@ -5,4 +5,5 @@ <testcase classname='Asterisk_Tests' name='TC_internal_call_all_2registered' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_internal_call_all_3registered' time='MASKED'/> <testcase classname='Asterisk_Tests' name='TC_internal_call_all_4registered' time='MASKED'/> + <testcase classname='Asterisk_Tests' name='TC_ims_registration' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36852?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: Ie4f589a398f93b429a8b4a93da1b80784b4013ea Gerrit-Change-Number: 36852 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: IPA_Tests: fix matching of tr_provideEimPackageResult_ePRAndNotif

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36851?usp=email ) Change subject: IPA_Tests: fix matching of tr_provideEimPackageResult_ePRAndNotif ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36851?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: I1e8c83a317619673cd091da585e44af1a6d8c866 Gerrit-Change-Number: 36851 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 16 May 2024 15:03:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: improve tr/ts_provideEimPackageResult_ePR...

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36850?usp=email ) Change subject: SGP32Definitions_Templates: improve tr/ts_provideEimPackageResult_ePRAndNotif ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36850?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: If04be6407eb41274b378571147ab469d449eac4a Gerrit-Change-Number: 36850 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 16 May 2024 15:02:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: SGP32Definitions_Templates: improve tr/ts_getEimPackageResponse_euicc...

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36849?usp=email ) Change subject: SGP32Definitions_Templates: improve tr/ts_getEimPackageResponse_euiccPkgReq ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36849?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: Ibcea9063f25cc8ba90b53c34218c766fa5cab895 Gerrit-Change-Number: 36849 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 16 May 2024 15:02:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2024