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

[M] Change in osmo-upf[master]: tunmap: always set GTP-U source port to 2152 when forwarding

by neels

Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/36753?usp=email ) Change subject: tunmap: always set GTP-U source port to 2152 when forwarding ...................................................................... Patch Set 3: Code-Review+1 (1 comment) Patchset: PS3: re-add vote by pespin after make update_exp -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/36753?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Idaf43f1c2b915846b50a8b97305f0229e34ad539 Gerrit-Change-Number: 36753 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 May 2024 15:20:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: rsl.adoc: document RSL_IE_OSMO_RTP_EXTENSIONS

by pespin

Attention is currently required from: falconia. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36706?usp=email ) Change subject: rsl.adoc: document RSL_IE_OSMO_RTP_EXTENSIONS ...................................................................... Patch Set 2: (1 comment) File doc/manuals/abis/rsl.adoc: https://gerrit.osmocom.org/c/osmo-bts/+/36706/comment/5c28aad3_60477c1a PS1, Line 1110: This information element requests the use of non-standard enhanced RTP > About TLV: I am open to changing this IE to TV. For context, please read TW-TS-003: […] @falcon@freecalypso.org can you create a ticket somewhere in osmocom redmine so we can all have the discussion there with links to all TW-TS and links to all the related gerrit patches? It may take a few days to have a look at this, and having it there will help in tracking the whole thing now and in the future. Then also provide the link to the ticket here in each patch as "Related: OS#ABCD". If such a ticket already exist, maybe simply provide the reference here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36706?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6117049b17ced5fb6635ac70d9238169033af4de Gerrit-Change-Number: 36706 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Wed, 08 May 2024 15:16:33 +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 year, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: rsl.adoc: mention currently undocumented IEs

by pespin

Attention is currently required from: falconia, fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36712?usp=email ) Change subject: rsl.adoc: mention currently undocumented IEs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36712?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I55d7eef946c24cd0e224157d95fdac3243a374ef Gerrit-Change-Number: 36712 Gerrit-PatchSet: 1 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-Reviewer: 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: Wed, 08 May 2024 15:12:38 +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]: asterisk/AMI_Functions: improvements to implement PJSIPRegister

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36652?usp=email ) Change subject: asterisk/AMI_Functions: improvements to implement PJSIPRegister ...................................................................... Patch Set 3: Code-Review+2 -- 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: 3 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-Comment-Date: Wed, 08 May 2024 15:11:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Misc_Helpers.ttcn: Add some more string handling API helpers

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36754?usp=email ) Change subject: Misc_Helpers.ttcn: Add some more string handling API helpers ...................................................................... Misc_Helpers.ttcn: Add some more string handling API helpers These are currently used by code in AMI_Functions doing some workaround for TEXT decoder limitations. They can be merged independently now since anyway they are totally generic and may be useful for future users. Change-Id: I3d6da125a10807b7a2f3ecad8145a046a322c7d6 --- M library/Misc_Helpers.ttcn 1 file changed, 40 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/54/36754/1 diff --git a/library/Misc_Helpers.ttcn b/library/Misc_Helpers.ttcn index 805254a..a742b0b 100644 --- a/library/Misc_Helpers.ttcn +++ b/library/Misc_Helpers.ttcn @@ -79,6 +79,31 @@ return count; } +/* Return true if str ends exactly with token: */ +function f_str_endswith(charstring str, charstring token) return boolean +{ + if (lengthof(str) < lengthof(token)) { + return false; + } + var charstring str_end := substr(str, lengthof(str) - lengthof(token), lengthof(token)); + return str_end == token; +} + +/* Replace all matches of token "find" with "repl" in "str" */ +function f_str_replace(charstring str, charstring find, charstring repl) return charstring +{ + var integer pos := f_strstr(str, find, 0); + if (pos < 0) { + return str; + } + var charstring prefix := substr(str, 0, pos); + var integer suffix_pos := pos + lengthof(find); + var charstring suffix := substr(str, suffix_pos, lengthof(str) - suffix_pos); + + var charstring new_str := prefix & repl & f_str_replace(suffix, find, repl); + return new_str; +} + type record of charstring ro_charstring; function f_str_split(charstring str, charstring delim := "\n") return ro_charstring { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36754?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: I3d6da125a10807b7a2f3ecad8145a046a322c7d6 Gerrit-Change-Number: 36754 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?usp=email ) Change subject: asterisk: Implement AMI_Adapter using IPL4 instead of TELNET ...................................................................... asterisk: Implement AMI_Adapter using IPL4 instead of TELNET Change Telnet_PT to a regular TCP socket for the AMI interface. I started using Telnet_PT port since initial use of the interface was done through telnet, but it's not really a telnet interface and stuff starts becoming difficult to maintain properly when events (generated by Asterisk at any time) arrive. The current TEXT decoder/encoder from Titan seems to be struggling in 2 scenarios, so for now we are adding some workarounds in dec_AMI_Msg_ext() before calling it in order to be able to go forward and avoid errors: 1- Fields of format "MyFieldName: \r\n" (empty value). I tried changing the "value" field in record AMI_Field to "optional", but then apparently the TEXT decoder fails to decode values consisting of several words. Ideally, I'd expect the TEXT decoder to put an empty "" string in the "value" field in that case if "optional" is not flagged in the record. 2- Fields of format "MyFieldName: foobar: hey there \r\n" containing a ": " token in the value. I'd expect TEXT decoder to put all subsequent strings in the last field "value" if no more fields are described in the record. Change-Id: Icaf2860c1dd4befa4498f0d176cfadf26cfa8d1d --- M asterisk/AMI_Functions.ttcn M asterisk/Asterisk_Tests.cfg M asterisk/Asterisk_Tests.default M asterisk/Asterisk_Tests.ttcn 4 files changed, 210 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/55/36755/1 diff --git a/asterisk/AMI_Functions.ttcn b/asterisk/AMI_Functions.ttcn index 6e0b8d0..cf6492f 100644 --- a/asterisk/AMI_Functions.ttcn +++ b/asterisk/AMI_Functions.ttcn @@ -15,10 +15,11 @@ module AMI_Functions { import from Misc_Helpers all; -import from TELNETasp_PortType all; import from Osmocom_Types all; -import from TCCConversion_Functions all; +import from IPL4asp_Types all; +import from IPL4asp_PortType all; import from Socket_API_Definitions all; +import from TCCConversion_Functions all; modulepar { float mp_ami_prompt_timeout := 10.0; @@ -172,47 +173,164 @@ * Adapter: ***********************/ +type record AMI_Adapter_Parameters { + charstring remote_host, + IPL4asp_Types.PortNumber remote_port, + charstring local_host, + IPL4asp_Types.PortNumber local_port, + charstring welcome_str +} + +const AMI_Adapter_Parameters c_default_AMI_Adapter_pars := { + remote_host := "127.0.0.1", + remote_port := 5038, + local_host := "0.0.0.0", + local_port := 0, + welcome_str := "Asterisk Call Manager/9.0.0\r\n" +}; + type port AMI_Msg_PT message { inout AMI_Msg; } with { extension "internal" }; type component AMI_Adapter_CT { - port TELNETasp_PT AMI; + port IPL4asp_PT IPL4; port AMI_Msg_PT CLIENT; + var AMI_Adapter_Parameters g_pars; + + /* Connection identifier of the client itself */ + var IPL4asp_Types.ConnectionId g_self_conn_id := -1; } -function f_AMI_Adapter_main() runs on AMI_Adapter_CT { - var AMI_Msg msg; +/* Function to use to connect as client to a remote IPA Server */ +private function f_AMI_Adapter_connect() runs on AMI_Adapter_CT { + var IPL4asp_Types.Result res; + map(self:IPL4, system:IPL4); + res := IPL4asp_PortType.f_IPL4_connect(IPL4, g_pars.remote_host, g_pars.remote_port, + g_pars.local_host, g_pars.local_port, 0, { tcp:={} }); + if (not ispresent(res.connId)) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Could not connect AMI socket from ", g_pars.local_host, " port ", + g_pars.local_port, " to ", g_pars.remote_host, " port ", g_pars.remote_port, + "; check your configuration")); + } + g_self_conn_id := res.connId; + log("AMI connected, ConnId=", g_self_conn_id) +} +private function f_ASP_RecvFrom_msg_to_charstring(ASP_RecvFrom rx_rf) return charstring { + return oct2char(rx_rf.msg); +} + +/* Function to use to connect as client to a remote IPA Server */ +private function f_AMI_Adapter_wait_rx_welcome_str() runs on AMI_Adapter_CT { + var ASP_RecvFrom rx_rf; + var charstring rx_str; + timer Twelcome := 3.0; + + Twelcome.start; + alt { + [] IPL4.receive(ASP_RecvFrom:?) -> value rx_rf { + rx_str := f_ASP_RecvFrom_msg_to_charstring(rx_rf); + if (g_pars.welcome_str != rx_str) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("AMI Welcome message mismatch: '", rx_str, + "' vs exp '", g_pars.welcome_str, "'")); + } + } + [] Twelcome.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("AMI Welcome timeout")); + } + } + Twelcome.stop; + log("AMI Welcome message received: '", rx_str, "'"); +} + +private function dec_AMI_Msg_ext(charstring txt) return AMI_Msg { + log("AMI dec: '", txt, "'"); + /* TEXT Enc/dec is not happy with empty values, workaround it: */ + var charstring patched_txt := f_str_replace(txt, "Challenge: \r\n", ""); + patched_txt := f_str_replace(patched_txt, "AccountCode: \r\n", ""); + patched_txt := f_str_replace(patched_txt, "Value: \r\n", ""); + 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", ""); + + /* TEXT Enc/dec is not happy with values containing "; ", get rid of them: + * "AppData: 5,0502: Call pjsip endpoint from 0501\r\n" */ + var integer pos := f_strstr(patched_txt, "AppData: ", 0); + if (pos >= 0) { + var integer pos_end := f_strstr(patched_txt, "\r\n", pos) + lengthof("\r\n"); + var charstring to_remove := substr(patched_txt, pos, pos_end - pos); + patched_txt := f_str_replace(patched_txt, to_remove, ""); + } + + log("AMI patched dec: '", patched_txt, "'"); + return dec_AMI_Msg(patched_txt); +} + +function f_AMI_Adapter_main(AMI_Adapter_Parameters pars := c_default_AMI_Adapter_pars) + runs on AMI_Adapter_CT { + var AMI_Msg msg; var charstring rx, buf := ""; var integer fd; + var ASP_RecvFrom rx_rf; + var ASP_Event rx_ev; - map(self:AMI, system:AMI); + g_pars := pars; + + f_AMI_Adapter_connect(); + + f_AMI_Adapter_wait_rx_welcome_str(); while (true) { alt { - [] AMI.receive(pattern "\n") { - buf := buf & "\n"; - msg := dec_AMI_Msg(buf); - buf := ""; - CLIENT.send(msg); - }; - [] AMI.receive(charstring:?) -> value rx { - buf := buf & rx; - }; - [] AMI.receive(integer:?) -> value fd { - if (fd == -1) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - "AMI Telnet Connection Failure: " & int2str(fd)); - } else { - /* telnet connection succeeded */ + [] IPL4.receive(ASP_RecvFrom:?) -> value rx_rf { + var charstring rx_str := f_ASP_RecvFrom_msg_to_charstring(rx_rf); + log("AMI rx: '", rx_str, "'"); + buf := buf & rx_str; + log("AMI buf: '", buf, "'"); + + /* If several messages come together */ + var boolean last_is_complete := f_str_endswith(buf, "\r\n\r\n"); + var Misc_Helpers.ro_charstring msgs := f_str_split(buf, "\r\n\r\n"); + log("AMI split: ", msgs); + if (lengthof(msgs) > 0) { + for (var integer i := 0; i < lengthof(msgs) - 1; i := i + 1) { + var charstring txt := msgs[i] & "\r\n"; + msg := dec_AMI_Msg_ext(txt); + CLIENT.send(msg); + } + if (last_is_complete) { + var charstring txt := msgs[lengthof(msgs) - 1] & "\r\n"; + msg := dec_AMI_Msg_ext(txt); + CLIENT.send(msg); + } else { + buf := msgs[lengthof(msgs) - 1]; + } } + log("AMI remain buf: '", buf, "'"); + } + [] IPL4.receive(ASP_ConnId_ReadyToRelease:?) { + } + + [] IPL4.receive(ASP_Event:?) -> value rx_ev { + log("Rx AMI ASP_Event: ", rx_ev); } [] CLIENT.receive(AMI_Msg:?) -> value msg { /* TODO: in the future, queue Action if there's already one Action in transit, to fullfill AMI requirements. */ - var charstring tx_txt := enc_AMI_Msg(msg); - AMI.send(tx_txt); + var charstring tx_txt := enc_AMI_Msg(msg) & "\r\n"; + + var ASP_SendTo tx := { + connId := g_self_conn_id, + remName := g_pars.remote_host, + remPort := g_pars.remote_port, + proto := { tcp := {} }, + msg := char2oct(tx_txt) + }; + IPL4.send(tx); } } } @@ -355,4 +473,14 @@ f_ami_transceive_match_response_success(pt, ts_AMI_Action_PJSIPRegister(register, reg_action_id)); } +private function f_ami_selftest_decode(charstring txt) { + log("Text to decode: '", txt, "'"); + var AMI_Msg msg := dec_AMI_Msg(txt); + log("AMI_Msg decoded: ", msg); +} + +function f_ami_selftest() { + f_ami_selftest_decode("AppData: 5,0502: Call pjsip endpoint from 0501\r\n"); +} + } diff --git a/asterisk/Asterisk_Tests.cfg b/asterisk/Asterisk_Tests.cfg index a3669f9..bcc8a30 100644 --- a/asterisk/Asterisk_Tests.cfg +++ b/asterisk/Asterisk_Tests.cfg @@ -15,4 +15,5 @@ [MAIN_CONTROLLER] [EXECUTE] -Asterisk_Tests.control +#Asterisk_Tests.control +Asterisk_Tests.TC_selftest \ No newline at end of file diff --git a/asterisk/Asterisk_Tests.default b/asterisk/Asterisk_Tests.default index 622a5a9..ed4ec44 100644 --- a/asterisk/Asterisk_Tests.default +++ b/asterisk/Asterisk_Tests.default @@ -6,17 +6,6 @@ [TESTPORT_PARAMETERS] #*.*.DEBUG := "yes" #*.*.debug := "enabled" -*.AMI.PROMPT1 := "Asterisk Call Manager/9.0.0\n" -*.AMI.PROMPT2 := "\n" -#*.AMI.REGEX_PROMPT1 := "^Asterisk Call Manager.*$" -*.AMI.CTRL_MODE := "client" -*.AMI.CTRL_HOSTNAME := "127.0.0.1" -*.AMI.CTRL_PORTNUM := "5038" -*.AMI.CTRL_LOGIN_SKIPPED := "yes" -*.AMI.CTRL_DETECT_SERVER_DISCONNECTED := "yes" -*.AMI.CTRL_READMODE := "buffered" -*.AMI.CTRL_CLIENT_CLEANUP_LINEFEED := "yes" -*.AMI.CTRL_CRLF := "yes" # Local SIP UAs: Asterisk_Tests_LOCAL_SIP_EMU.SIP.default_sip_protocol := "UDP"; Asterisk_Tests_LOCAL_SIP_EMU.SIP.local_sip_port := "5060" diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index d2fc0d5..08a5f65 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -39,6 +39,10 @@ integer mp_local_ims_port := 5060; /* Asterisk AMI: */ + charstring mp_ami_remote_host := "127.0.0.1"; + integer mp_ami_remote_port := 5038; + charstring mp_ami_local_host := "0.0.0.0"; + integer mp_ami_local_port := 0; charstring mp_ami_user := "test_user"; charstring mp_ami_secret := "1234"; } @@ -73,9 +77,17 @@ /* Initialize connection towards Asterisk AMI */ private function f_init_ami() runs on test_CT { var charstring id := "Asterisk_Tests_AMI_EMU"; - vc_AMI := AMI_Adapter_CT.create(id); + vc_AMI := AMI_Adapter_CT.create(id) alive; connect(self:AMI_CLIENT, vc_AMI:CLIENT); - vc_AMI.start(f_AMI_Adapter_main()); + + var AMI_Adapter_Parameters ami_pars := { + remote_host := mp_ami_remote_host, + remote_port := mp_ami_remote_port, + local_host := mp_ami_local_host, + local_port := mp_ami_local_port, + welcome_str := c_default_AMI_Adapter_pars.welcome_str + }; + vc_AMI.start(f_AMI_Adapter_main(ami_pars)); f_ami_action_login(AMI_CLIENT, mp_ami_user, mp_ami_secret); @@ -102,6 +114,15 @@ log("end of f_init"); } +function f_shutdown() runs on test_CT { + /* Tear down AMI Adapter to avoid it keep receiving data from Asterisk + * and sending it to us after we stopped, causing error (Broken Pipe): */ + vc_AMI.stop; + vc_AMI.done; + log("end of ", testcasename()); + setverdict(pass); +} + function f_start_handler(void_fn fn, SIPConnHdlrPars pars) runs on test_CT return SIPConnHdlr { var SIPConnHdlr vc_conn; @@ -132,6 +153,7 @@ pars := f_init_ConnHdlrPars(); vc_conn := f_start_handler(refers(f_TC_internal_registration), pars); vc_conn.done; + f_shutdown(); } /* Successful SIP MO-MT Call between local clients: */ @@ -210,6 +232,7 @@ vc_conn[0].done; vc_conn[1].done; + f_shutdown(); } /* One of the users calls (INVITE) shared extension, which makes all other user @@ -281,6 +304,7 @@ for (var integer i := 0; i < num_conns; i := i + 1) { vc_conn_list[i].done; } + f_shutdown(); } testcase TC_internal_call_all_2registered() runs on test_CT { TC_internal_call_all_Nregistered(2); @@ -293,6 +317,7 @@ } testcase TC_selftest() runs on test_CT { + f_ami_selftest(); f_sip_digest_selftest(); setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36755?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: Icaf2860c1dd4befa4498f0d176cfadf26cfa8d1d Gerrit-Change-Number: 36755 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[M] Change in osmo-upf[master]: tunmap: always set GTP-U source port to 2152 when forwarding

by neels

Attention is currently required from: laforge, neels, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-upf/+/36753?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: tunmap: always set GTP-U source port to 2152 when forwarding ...................................................................... tunmap: always set GTP-U source port to 2152 when forwarding We see GTP-U originating from ports other than 2152 in the field. When osmo-upf forwards these, we want to forward from our GTP-U port 2152, since that is the only port osmo-upf has bound for GTP-U (for echo). According to 3GPP TS 29.060, the *destination* port for GTP-U shall be 2152 -- but the source port is apparently allowed to be different. Before this patch, we would forward GTP-U like this: 3.3.3.3:33333 -> (3.3.3.4:2152 UPF 2.2.2.2:33333) -> 1.1.1.1:2152 ^^^^^ Instead we want to always send from UDP source port 2152: 3.3.3.3:33333 -> (3.3.3.4:2152 UPF 2.2.2.2:2152) -> 1.1.1.1:2152 ^^^^ This hasn't shown up before because so far all GTP-U peers we saw consistently used source port 2152. Related: SYS#6773 Change-Id: Idaf43f1c2b915846b50a8b97305f0229e34ad539 --- M src/osmo-upf/upf_nft.c M tests/nft-rule.vty M tests/unique_ids/unique_ids_test.err 3 files changed, 46 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/53/36753/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/36753?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Idaf43f1c2b915846b50a8b97305f0229e34ad539 Gerrit-Change-Number: 36753 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 1 month

1
0
0 0

[S] Change in osmo-upf[master]: tunmap: always set GTP-U source port to 2152 when forwarding

by neels

Attention is currently required from: laforge, neels, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-upf/+/36753?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified-1 by Jenkins Builder Change subject: tunmap: always set GTP-U source port to 2152 when forwarding ...................................................................... tunmap: always set GTP-U source port to 2152 when forwarding We see GTP-U originating from ports other than 2152 in the field. When osmo-upf forwards these, we want to forward from our GTP-U port 2152, since that is the only port osmo-upf has bound for GTP-U (for echo). According to 3GPP TS 29.060, the *destination* port for GTP-U shall be 2152 -- but the source port is apparently allowed to be different. Before this patch, we would forward GTP-U like this: 3.3.3.3:33333 -> (3.3.3.4:2152 UPF 2.2.2.2:33333) -> 1.1.1.1:2152 ^^^^^ Instead we want to always send from UDP source port 2152: 3.3.3.3:33333 -> (3.3.3.4:2152 UPF 2.2.2.2:2152) -> 1.1.1.1:2152 ^^^^ This hasn't shown up before because so far all GTP-U peers we saw consistently used source port 2152. Related: SYS#6773 Change-Id: Idaf43f1c2b915846b50a8b97305f0229e34ad539 --- M src/osmo-upf/upf_nft.c M tests/nft-rule.vty 2 files changed, 34 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/53/36753/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/36753?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Idaf43f1c2b915846b50a8b97305f0229e34ad539 Gerrit-Change-Number: 36753 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 1 month

1
0
0 0

[S] Change in osmo-upf[master]: tunmap: always set GTP-U source port to 2152 when forwarding

by pespin

Attention is currently required from: laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/36753?usp=email ) Change subject: tunmap: always set GTP-U source port to 2152 when forwarding ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/36753?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Idaf43f1c2b915846b50a8b97305f0229e34ad539 Gerrit-Change-Number: 36753 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 08 May 2024 14:51:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-upf[master]: tunmap: always set GTP-U source port to 2152 when forwarding

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/36753?usp=email ) Change subject: tunmap: always set GTP-U source port to 2152 when forwarding ...................................................................... tunmap: always set GTP-U source port to 2152 when forwarding We see GTP-U originating from ports other than 2152 in the field. When osmo-upf forwards these, we want to forward from our GTP-U port 2152, since that is the only port osmo-upf has bound for GTP-U (for echo). According to 3GPP TS 29.060, the *destination* port for GTP-U shall be 2152 -- but the source port is apparently allowed to be different. Before this patch, we would forward GTP-U like this: 3.3.3.3:33333 -> (3.3.3.4:2152 UPF 2.2.2.2:33333) -> 1.1.1.1:2152 ^^^^^ Instead we want to always send from UDP source port 2152: 3.3.3.3:33333 -> (3.3.3.4:2152 UPF 2.2.2.2:2152) -> 1.1.1.1:2152 ^^^^ This hasn't shown up before because so far all GTP-U peers we saw consistently used source port 2152. Related: SYS#6773 Change-Id: Idaf43f1c2b915846b50a8b97305f0229e34ad539 --- M src/osmo-upf/upf_nft.c 1 file changed, 32 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/53/36753/1 diff --git a/src/osmo-upf/upf_nft.c b/src/osmo-upf/upf_nft.c index 4401f1e..c14dbf7 100644 --- a/src/osmo-upf/upf_nft.c +++ b/src/osmo-upf/upf_nft.c @@ -177,7 +177,7 @@ * # add chain for verdict map in postrouting * add chain inet osmo-upf tunmap-post-123 * # mangle source address and GTP TID at postrouting - * add rule inet osmo-upf tunmap-post-123 ip saddr set 2.2.2.1 @ih,32,32 set 0x00000102 counter accept + * add rule inet osmo-upf tunmap-post-123 ip saddr set 2.2.2.1 udp sport set 2152 @ih,32,32 set 0x00000102 counter accept * * # add elements to verdict map, jump to chain * add element inet osmo-upf tunmap-pre { 2.2.2.3 . 0x00000203 : jump tunmap-pre-123 } @@ -200,6 +200,7 @@ args->table_name, from_peer->chain_id); OSMO_STRBUF_PRINTF(sb, " ip saddr set "); OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, to_peer->addr_local); + OSMO_STRBUF_PRINTF(sb, " udp sport set 2152"); OSMO_STRBUF_PRINTF(sb, " @ih,32,32 set 0x%x", to_peer->teid_remote); OSMO_STRBUF_PRINTF(sb, " counter accept;\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/36753?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Idaf43f1c2b915846b50a8b97305f0229e34ad539 Gerrit-Change-Number: 36753 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2024