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

[XS] Change in osmo-sip-connector[master]: sip.c: permit early media with both 183 and 180

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/38039?usp=email ) Change subject: sip.c: permit early media with both 183 and 180 ...................................................................... sip.c: permit early media with both 183 and 180 So far we only attempted to extract SDP (and hence enable early media) when receiving a status code 183. However, SDP can also be provided with 180, see for example https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/Codecs-and… Change-Id: Ia0072080c2e0bfb8b2bf751a248d3410a7723e79 Closes: OS#6559 --- M src/sip.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/39/38039/1 diff --git a/src/sip.c b/src/sip.c index 99bab9f..374c3ed 100644 --- a/src/sip.c +++ b/src/sip.c @@ -82,7 +82,7 @@ return; /* Extract SDP for session in progress with matching codec */ - if (status == 183) + if (status == 183 || status == 180) sdp_extract_sdp(leg, sip, false); LOGP(DSIP, LOGL_INFO, "leg(%p) is now progressing.\n", leg); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/38039?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ia0072080c2e0bfb8b2bf751a248d3410a7723e79 Gerrit-Change-Number: 38039 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

11 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library/PFCP_Emulation: add (optional) COMMON port

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38034?usp=email ) Change subject: library/PFCP_Emulation: add (optional) COMMON port ...................................................................... library/PFCP_Emulation: add (optional) COMMON port Change-Id: Id8e8564cd92aaf6c8f640fd94d7626db400c1e1d --- M library/PFCP_Emulation.ttcn 1 file changed, 30 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/38034/1 diff --git a/library/PFCP_Emulation.ttcn b/library/PFCP_Emulation.ttcn index c671095..98dad59 100644 --- a/library/PFCP_Emulation.ttcn +++ b/library/PFCP_Emulation.ttcn @@ -46,6 +46,9 @@ port PFCPEM_PT CLIENT; port PFCPEM_PROC_PT CLIENT_PROC; + /* Common port for Node Related Procedures */ + port PFCPEM_PT COMMON; + /* Configuration by the user */ var PFCP_Emulation_Cfg g_pfcp_cfg; @@ -123,6 +126,23 @@ g_conns := g_conns & { conn }; } +private function f_send_pdu(inout PDU_PFCP pdu) runs on PFCP_Emulation_CT { + if (pdu.sequence_number == 0) { + pdu.sequence_number := f_PFCPEM_next_sequence_nr(); + } + + var PFCP_Unitdata ud := { + peer := { + conn_id := g_pfcp_conn_id, + remote_name := g_pfcp_cfg.pfcp_remote_ip, + remote_port := g_pfcp_cfg.pfcp_remote_port + }, + pdu := pdu + }; + + PFCP.send(ud); +} + private function f_init(PFCP_Emulation_Cfg cfg) runs on PFCP_Emulation_CT { var Result res; @@ -161,31 +181,26 @@ if (vc_conn != null) { log("found destination ", vc_conn); CLIENT.send(ud.pdu) to vc_conn; - } else { + } else if (ispresent(ud.pdu.seid)) { log("sending to all conns: ", g_conns); for (var integer i := 0; i < lengthof(g_conns); i := i + 1) { CLIENT.send(ud.pdu) to g_conns[i].vc_conn; } + } else if (COMMON.checkstate("Connected")) { + log("sending via COMMON port"); + COMMON.send(ud.pdu); } } + [] COMMON.receive(PDU_PFCP:?) -> value pdu { + log("PFCP_Emulation main() COMMON.receive: ", pdu); + f_send_pdu(pdu); + } + [] CLIENT.receive(PDU_PFCP:?) -> value pdu sender vc_conn { log("PFCP_Emulation main() CLIENT.receive from ", vc_conn, ": ", pdu); - if (pdu.sequence_number == 0) { - pdu.sequence_number := f_PFCPEM_next_sequence_nr(); - } - ud := { - peer := { - conn_id := g_pfcp_conn_id, - remote_name := g_pfcp_cfg.pfcp_remote_ip, - remote_port := g_pfcp_cfg.pfcp_remote_port - }, - pdu := pdu - }; - + f_send_pdu(pdu); /* may update pdu.sequence_number */ f_PFCPEM_conn_add_or_update({vc_conn, pdu.seid, pdu.sequence_number}); - - PFCP.send(ud); } [] CLIENT_PROC.getcall(PFCPEM_register:{}) -> sender vc_conn { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38034?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id8e8564cd92aaf6c8f640fd94d7626db400c1e1d Gerrit-Change-Number: 38034 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

11 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: rework f_pfcp_wait_assoc_setup() into f_ConnHdlr_pfcp_expect()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38036?usp=email ) Change subject: s1gw: rework f_pfcp_wait_assoc_setup() into f_ConnHdlr_pfcp_expect() ...................................................................... s1gw: rework f_pfcp_wait_assoc_setup() into f_ConnHdlr_pfcp_expect() Generalize this function, so that it can be used to expect any PFCP PDUs, not just the Association Setup. Change-Id: If691cb9df72672eddfbafdd8e03ae09c81b1ce71 --- M s1gw/S1GW_ConnHdlr.ttcn 1 file changed, 12 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/36/38036/1 diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index bb2a309..61c2290 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -240,24 +240,27 @@ } } -private function f_pfcp_wait_assoc_setup(template (present) PDU_PFCP exp_rx := tr_PFCP_Assoc_Setup_Req(), - float wait_time := 10.0) -runs on ConnHdlr +function f_ConnHdlr_pfcp_expect(template (present) PDU_PFCP exp_rx := ?, + float Tval := 2.0) +runs on ConnHdlr return PDU_PFCP { - timer T := wait_time; - T.start; + var PDU_PFCP pdu; + timer T; + + T.start(Tval); alt { - [] as_pfcp_handle_assoc_setup_req(exp_rx); - [] PFCP.receive(PDU_PFCP:?) { + [] PFCP.receive(exp_rx) -> value pdu { T.stop; } + [] PFCP.receive(PDU_PFCP:?) -> value pdu { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Got an unexpected PFCP message, was waiting for ", exp_rx)); + log2str("Got an unexpected PFCP PDU: ", pdu)); } [] T.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Timeout waiting for PFCP ", exp_rx)); } } - T.stop; + + return pdu; } function f_ConnHdlr_register_pfcp() runs on ConnHdlr -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38036?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If691cb9df72672eddfbafdd8e03ae09c81b1ce71 Gerrit-Change-Number: 38036 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

11 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library/PFCP_Emulation: allow retrieving the Recovery Time Stamp

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38035?usp=email ) Change subject: library/PFCP_Emulation: allow retrieving the Recovery Time Stamp ...................................................................... library/PFCP_Emulation: allow retrieving the Recovery Time Stamp The Recovery Time Stamp is a mandatory IE for some PDUs, such as: * Heartbeat Request/Response * PFCP Association Setup Request/Response Allow the PFCP_ConnHdlr components to retrieve its value, so that they can include it in outgoing (and expect in incoming) PDUs. Change-Id: I23eb2b4e309460f93183df83cdd35e46a93fbb94 --- M library/PFCP_Emulation.ttcn 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/38035/1 diff --git a/library/PFCP_Emulation.ttcn b/library/PFCP_Emulation.ttcn index 98dad59..280435e 100644 --- a/library/PFCP_Emulation.ttcn +++ b/library/PFCP_Emulation.ttcn @@ -208,6 +208,11 @@ f_PFCPEM_conn_add_or_update({vc_conn, omit, omit}); CLIENT_PROC.reply(PFCPEM_register:{}) to vc_conn; } + + [] CLIENT_PROC.getcall(PFCPEM_get_recovery_timestamp:{?}) -> sender vc_conn { + log("PFCP_Emulation main() CLIENT_PROC.getcall(PFCPEM_get_recovery_timestamp)"); + CLIENT_PROC.reply(PFCPEM_get_recovery_timestamp:{g_recovery_timestamp}) to vc_conn; + } } } } @@ -221,9 +226,11 @@ } with { extension "internal" }; signature PFCPEM_register(); +signature PFCPEM_get_recovery_timestamp(out integer rts); type port PFCPEM_PROC_PT procedure { inout PFCPEM_register; + inout PFCPEM_get_recovery_timestamp; } with { extension "internal" }; /*********************************************************************** @@ -241,6 +248,17 @@ } } +function f_pfcp_get_recovery_timestamp() +runs on PFCP_ConnHdlr return integer { + var integer rts; + + PFCP_PROC.call(PFCPEM_get_recovery_timestamp:{-}) { + [] PFCP_PROC.getreply(PFCPEM_get_recovery_timestamp:{?}) -> param(rts) {}; + } + + return rts; +} + altstep as_pfcp_ignore(PFCPEM_PT pt, template PDU_PFCP pfcp_expect := ?) { [] pt.receive(pfcp_expect) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38035?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I23eb2b4e309460f93183df83cdd35e46a93fbb94 Gerrit-Change-Number: 38035 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

11 months, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: s1gw: use the COMMON PFCP port

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38038?usp=email ) Change subject: s1gw: use the COMMON PFCP port ...................................................................... s1gw: use the COMMON PFCP port Change-Id: Ib12fd5e8f6aea9a94ec99a2c20f56057f7ac8905 --- M s1gw/S1GW_Tests.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/38038/1 diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 3c8dfb4..1d925be 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -50,6 +50,7 @@ timer g_Tguard; var S1AP_Server_CT vc_S1APSRV; var PFCP_Emulation_CT vc_PFCP; + port PFCPEM_PT PFCP; }; private altstep as_Tguard() runs on test_CT { @@ -92,6 +93,7 @@ }; vc_PFCP := PFCP_Emulation_CT.create("PFCP-" & testcasename()) alive; + connect(vc_PFCP:COMMON, self:PFCP); vc_PFCP.start(PFCP_Emulation.main(pfcp_cfg)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38038?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib12fd5e8f6aea9a94ec99a2c20f56057f7ac8905 Gerrit-Change-Number: 38038 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

11 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_pfcp_heartbeat

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38037?usp=email ) Change subject: s1gw: add TC_pfcp_heartbeat ...................................................................... s1gw: add TC_pfcp_heartbeat Change-Id: Iadb24c2c346a62aa8b59d24475e71f683fc3dfe6 --- M s1gw/S1GW_Tests.ttcn M s1gw/expected-results.xml 2 files changed, 28 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/38037/1 diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 00b83e8..3c8dfb4 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -272,12 +272,38 @@ vc_conn.done; } +function f_TC_pfcp_heartbeat(charstring id) runs on ConnHdlr { + var integer rts; + + f_ConnHdlr_register_pfcp(); + + /* Tx Heartbeat Request */ + rts := f_pfcp_get_recovery_timestamp(); + PFCP.send(ts_PFCP_Heartbeat_Req(rts)); + + /* Expect Heartbeat Response + * TODO: validate the indicated Recovery Time Stamp against + * the one that we received in the PFCP Association Setup. */ + f_ConnHdlr_pfcp_expect(tr_PFCP_Heartbeat_Resp); + setverdict(pass); +} +testcase TC_pfcp_heartbeat() runs on test_CT { + var ConnHdlrPars pars := valueof(t_ConnHdlrPars); + var ConnHdlr vc_conn; + + f_init(); + + vc_conn := f_ConnHdlr_spawn(refers(f_TC_pfcp_heartbeat), pars); + vc_conn.done; +} + control { execute( TC_setup() ); execute( TC_setup_multi() ); execute( TC_conn_term_by_mme() ); execute( TC_conn_term_mme_unavail() ); execute( TC_e_rab_setup() ); + execute( TC_pfcp_heartbeat() ); } } diff --git a/s1gw/expected-results.xml b/s1gw/expected-results.xml index ed75300..87cd893 100644 --- a/s1gw/expected-results.xml +++ b/s1gw/expected-results.xml @@ -1,8 +1,9 @@ <?xml version="1.0"?> -<testsuite name='S1GW_Tests' tests='5' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='S1GW_Tests' tests='6' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='S1GW_Tests' name='TC_setup' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_setup_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_conn_term_by_mme' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_conn_term_mme_unavail' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_e_rab_setup' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_pfcp_heartbeat' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38037?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iadb24c2c346a62aa8b59d24475e71f683fc3dfe6 Gerrit-Change-Number: 38037 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

11 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library/PFCP_Emulation: look up by SeqNr and SEID separately

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38032?usp=email ) Change subject: library/PFCP_Emulation: look up by SeqNr and SEID separately ...................................................................... library/PFCP_Emulation: look up by SeqNr and SEID separately This allows routing of PFCP PDUs without SEID by SeqNr. An example of such a PDU is the Heartbeat Request. Change-Id: Ic7912d944e94852a587993708d51439ec90f08cd --- M library/PFCP_Emulation.ttcn 1 file changed, 27 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/38032/1 diff --git a/library/PFCP_Emulation.ttcn b/library/PFCP_Emulation.ttcn index 9cd9a86..74f4cdd 100644 --- a/library/PFCP_Emulation.ttcn +++ b/library/PFCP_Emulation.ttcn @@ -74,13 +74,20 @@ type record of PFCPEM_conn PFCPEM_conns; -private function f_PFCPEM_conn_by_seid_or_seqnr(OCT8 seid, LIN3_BO_LAST seqnr) runs on PFCP_Emulation_CT return PFCP_ConnHdlr { - log("looking for seid ", seid, " seqnr ", seqnr, " in conns ", g_conns); +private function f_PFCPEM_conn_by_seqnr(LIN3_BO_LAST seqnr) +runs on PFCP_Emulation_CT return PFCP_ConnHdlr { for (var integer i := 0; i < lengthof(g_conns); i := i + 1) { if (isbound(g_conns[i].pfcp_msg_sequence_number) and seqnr == g_conns[i].pfcp_msg_sequence_number) { return g_conns[i].vc_conn; } + } + return null; +}; + +private function f_PFCPEM_conn_by_seid(OCT8 seid) +runs on PFCP_Emulation_CT return PFCP_ConnHdlr { + for (var integer i := 0; i < lengthof(g_conns); i := i + 1) { if (isbound(g_conns[i].seid) and seid == g_conns[i].seid) { return g_conns[i].vc_conn; @@ -89,6 +96,23 @@ return null; }; +private function f_PFCPEM_conn_for_pdu(in PDU_PFCP pdu) +runs on PFCP_Emulation_CT return PFCP_ConnHdlr { + var PFCP_ConnHdlr vc_conn := null; + + vc_conn := f_PFCPEM_conn_by_seqnr(pdu.sequence_number); + if (vc_conn != null) { + return vc_conn; + } + + /* If there is a SEID, we can look it up */ + if (pdu.s_flag == '1'B) { + vc_conn := f_PFCPEM_conn_by_seid(pdu.seid); + } + + return vc_conn; +}; + private function f_PFCPEM_add_conn(PFCP_ConnHdlr vc_conn) runs on PFCP_Emulation_CT { for (var integer i := 0; i < lengthof(g_conns); i := i + 1) { if (g_conns[i].vc_conn == vc_conn) { @@ -134,11 +158,7 @@ [] PFCP.receive(tr_PFCP_UD(?)) -> value ud { log("PFCP_Emulation main() PFCP.receive: ", ud); - vc_conn := null; - if (ud.pdu.s_flag == '1'B) { - /* There is a SEID */ - vc_conn := f_PFCPEM_conn_by_seid_or_seqnr(ud.pdu.seid, ud.pdu.sequence_number); - } + vc_conn := f_PFCPEM_conn_for_pdu(ud.pdu); if (vc_conn != null) { log("found destination ", vc_conn); CLIENT.send(ud.pdu) to vc_conn; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38032?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic7912d944e94852a587993708d51439ec90f08cd Gerrit-Change-Number: 38032 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

11 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: move vc_PFCP from ConnHdlr to test_CT

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38031?usp=email ) Change subject: hnbgw: move vc_PFCP from ConnHdlr to test_CT ...................................................................... hnbgw: move vc_PFCP from ConnHdlr to test_CT Change-Id: Iaf7a54c674f2dc549572d918beb6f355f48ee700 --- M hnbgw/HNBGW_Tests.ttcn M library/PFCP_Emulation.ttcn 2 files changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/38031/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 3765411..5204f38 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -350,6 +350,7 @@ var MGCP_Emulation_CT vc_MGCP; port TELNETasp_PT HNBGWVTY; var StatsD_Checker_CT vc_STATSD; + var PFCP_Emulation_CT vc_PFCP; /* global test case guard timer (actual timeout value is set in f_init()) */ timer T_guard := 30.0; @@ -397,7 +398,7 @@ vc_MGCP.start(MGCP_Emulation.main(ops, pars, id)); } -function f_init_pfcp(charstring id) runs on ConnHdlr { +function f_init_pfcp(charstring id) runs on test_CT { id := id & "-PFCP"; var PFCP_Emulation_Cfg pfcp_cfg := { @@ -409,8 +410,6 @@ }; vc_PFCP := PFCP_Emulation_CT.create(id) alive; - connect(self:PFCP, vc_PFCP:CLIENT); - connect(self:PFCP_PROC, vc_PFCP:CLIENT_PROC); vc_PFCP.start(PFCP_Emulation.main(pfcp_cfg)); } @@ -622,6 +621,11 @@ connect(vc_conn:STATSD_PROC, vc_STATSD:STATSD_PROC); + if (isbound(vc_PFCP)) { + connect(vc_conn:PFCP, vc_PFCP:CLIENT); + connect(vc_conn:PFCP_PROC, vc_PFCP:CLIENT_PROC); + } + return vc_conn; } @@ -651,8 +655,6 @@ /* make parameters available via component variable */ g_pars := pars; - f_init_pfcp(testcasename()); - /* start guard timer and activate it as default */ g_Tguard.start(t_guard); activate(as_Tguard_ConnHdlr()); @@ -2030,6 +2032,7 @@ var ConnHdlr vc_conn; g_num_hnbs := 1; f_init(); + f_init_pfcp(testcasename()); f_sleep(1.0); vc_conn := f_start_handler_with_pars(refers(f_tc_ps_rab_assignment_with_pfcp), t_pars(7, ps_domain := true)); @@ -2093,6 +2096,7 @@ testcase TC_ps_rab_assignment_without_pfcp() runs on test_CT { var ConnHdlr vc_conn; f_init(); + f_init_pfcp(testcasename()); f_sleep(1.0); vc_conn := f_start_handler_with_pars(refers(f_tc_ps_rab_assignment_without_pfcp), t_pars(7, ps_domain := true)); diff --git a/library/PFCP_Emulation.ttcn b/library/PFCP_Emulation.ttcn index 2fb3a8a..9cd9a86 100644 --- a/library/PFCP_Emulation.ttcn +++ b/library/PFCP_Emulation.ttcn @@ -199,7 +199,6 @@ type component PFCP_ConnHdlr { port PFCPEM_PT PFCP; port PFCPEM_PROC_PT PFCP_PROC; - var PFCP_Emulation_CT vc_PFCP; }; function f_pfcp_register() runs on PFCP_ConnHdlr { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38031?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iaf7a54c674f2dc549572d918beb6f355f48ee700 Gerrit-Change-Number: 38031 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

11 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library/PFCP_Emulation: fix routing of incoming PDUs

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38033?usp=email ) Change subject: library/PFCP_Emulation: fix routing of incoming PDUs ...................................................................... library/PFCP_Emulation: fix routing of incoming PDUs Before this patch, the PFCP_Emulation component was unable to route incoming PDUs properly. The problem is that the SeqNr and SEID were neither stored nor updated whem sending outgoing PDUs, and thus remained unbound all the time. Change-Id: I8e62471915ab9a917ac960d3078e89669b5ac0ea --- M library/PFCP_Emulation.ttcn 1 file changed, 8 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/38033/1 diff --git a/library/PFCP_Emulation.ttcn b/library/PFCP_Emulation.ttcn index 74f4cdd..c671095 100644 --- a/library/PFCP_Emulation.ttcn +++ b/library/PFCP_Emulation.ttcn @@ -77,8 +77,7 @@ private function f_PFCPEM_conn_by_seqnr(LIN3_BO_LAST seqnr) runs on PFCP_Emulation_CT return PFCP_ConnHdlr { for (var integer i := 0; i < lengthof(g_conns); i := i + 1) { - if (isbound(g_conns[i].pfcp_msg_sequence_number) - and seqnr == g_conns[i].pfcp_msg_sequence_number) { + if (seqnr == g_conns[i].pfcp_msg_sequence_number) { return g_conns[i].vc_conn; } } @@ -88,8 +87,7 @@ private function f_PFCPEM_conn_by_seid(OCT8 seid) runs on PFCP_Emulation_CT return PFCP_ConnHdlr { for (var integer i := 0; i < lengthof(g_conns); i := i + 1) { - if (isbound(g_conns[i].seid) - and seid == g_conns[i].seid) { + if (seid == g_conns[i].seid) { return g_conns[i].vc_conn; } } @@ -113,14 +111,15 @@ return vc_conn; }; -private function f_PFCPEM_add_conn(PFCP_ConnHdlr vc_conn) runs on PFCP_Emulation_CT { +private function f_PFCPEM_conn_add_or_update(in PFCPEM_conn conn) +runs on PFCP_Emulation_CT { for (var integer i := 0; i < lengthof(g_conns); i := i + 1) { - if (g_conns[i].vc_conn == vc_conn) { + if (g_conns[i].vc_conn == conn.vc_conn) { + g_conns[i] := conn; /* update */ return; } } /* Not in the list yet, add. */ - var PFCPEM_conn conn := { vc_conn := vc_conn }; g_conns := g_conns & { conn }; } @@ -184,14 +183,14 @@ pdu := pdu }; - f_PFCPEM_add_conn(vc_conn); + f_PFCPEM_conn_add_or_update({vc_conn, pdu.seid, pdu.sequence_number}); PFCP.send(ud); } [] CLIENT_PROC.getcall(PFCPEM_register:{}) -> sender vc_conn { log("PFCP_Emulation main() CLIENT_PROC.getcall(PFCPEM_register)"); - f_PFCPEM_add_conn(vc_conn); + f_PFCPEM_conn_add_or_update({vc_conn, omit, omit}); CLIENT_PROC.reply(PFCPEM_register:{}) to vc_conn; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38033?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8e62471915ab9a917ac960d3078e89669b5ac0ea Gerrit-Change-Number: 38033 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

11 months, 2 weeks

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: pfcp_peer: fix incorrect order of logging arguments

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38030?usp=email ) Change subject: pfcp_peer: fix incorrect order of logging arguments ...................................................................... pfcp_peer: fix incorrect order of logging arguments Change-Id: I4c2326d7143e8d4035d75cc60b53fc8cf33611cb --- M src/pfcp_peer.erl 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/30/38030/1 diff --git a/src/pfcp_peer.erl b/src/pfcp_peer.erl index 8c29a9f..c97304b 100644 --- a/src/pfcp_peer.erl +++ b/src/pfcp_peer.erl @@ -303,10 +303,10 @@ -spec decode_pdu(binary(), tuple(), peer_state()) -> pfcp_pdu(). decode_pdu(Data, {FromIp, FromPort}, _S) -> ?LOG_DEBUG("Rx encoded PFCP PDU from ~p:~p: ~p", - [Data, FromIp, FromPort]), + [FromIp, FromPort, Data]), PDU = pfcp_packet:decode(Data), ?LOG_DEBUG("Rx PFCP PDU from ~p:~p: ~p", - [PDU, FromIp, FromPort]), + [FromIp, FromPort, PDU]), %% TODO: check PDU#pfcp.seq_no %% TODO: there can be batched PDUs PDU. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38030?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I4c2326d7143e8d4035d75cc60b53fc8cf33611cb Gerrit-Change-Number: 38030 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>

11 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2024