- gerrit-log - lists.osmocom.org

[XS] Change in osmo-ttcn3-hacks[master]: library: as_pfcp_ignore(): log SeqNr of received PDUs
by laforge 26 Sep '24

26 Sep '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38208?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: library: as_pfcp_ignore(): log SeqNr of received PDUs ...................................................................... library: as_pfcp_ignore(): log SeqNr of received PDUs Printing the PFCP PDU template ('?' by default) is not very informative when reading logs. Printing the message type of the received PDU is not informative either, because message types are defined as numbers in PFCP_Types.ttcn. Printing the whole PDU is way too verbose, and would be redundant given that the PFCPEM component already does print all received PDUs. Let's print the sequence number. Change-Id: I803ff46def4ae0182310bc01e753fe0c05112836 --- M library/PFCP_Emulation.ttcn 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/library/PFCP_Emulation.ttcn b/library/PFCP_Emulation.ttcn index edb1f9c..892670c 100644 --- a/library/PFCP_Emulation.ttcn +++ b/library/PFCP_Emulation.ttcn @@ -392,8 +392,10 @@ altstep as_pfcp_ignore(PFCPEM_PT pt, template PDU_PFCP pfcp_expect := ?) { - [] pt.receive(pfcp_expect) { - log("Ignoring ", pfcp_expect); + var PDU_PFCP pdu; + + [] pt.receive(pfcp_expect) -> value pdu { + log("Ignoring PFCP PDU (SeqNr := ", pdu.sequence_number, ")"); repeat; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38208?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I803ff46def4ae0182310bc01e753fe0c05112836 Gerrit-Change-Number: 38208 Gerrit-PatchSet: 5 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>

1 0

[L] Change in osmo-ttcn3-hacks[master]: library/PFCP_Emulation: a better PDU routing concept
by laforge 26 Sep '24

26 Sep '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38207?usp=email ) Change subject: library/PFCP_Emulation: a better PDU routing concept ...................................................................... library/PFCP_Emulation: a better PDU routing concept In recently merged 2962d170 I wrongly assumed, that SEID of outgoing PFCP PDUs can be used to correlate and route the incoming PDUs. In fact, the PFCP peers use two different SEID values, negotiating them using the F-SEID IE. We could have implemented a logic to look for F-SEID in the outgoing PDUs, store and then use it for routing. However, a more flexible approach is to allow the the PFCP_ConnHdlr components to subscribe and unsubscribe to/from specific SEID values explicitly. In this spirit, let's allow the PFCP_ConnHdlr components to subscribe and unsubscribe to/from broadcast PDUs (i.e. those, for which the PFCPEM component could not find a single recipient) explicitly. Implicit routing using the SeqNr remains unchanged and will be performed by the PFCPEM component automatically like before. Change-Id: I25802471519fa297ad4cb2b056adaa6748b00af2 Related: 2962d170 "library/PFCP_Emulation: fix routing of incoming PDUs" --- M hnbgw/HNBGW_Tests.ttcn M library/PFCP_Emulation.ttcn M s1gw/S1GW_ConnHdlr.ttcn 3 files changed, 215 insertions(+), 38 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 86a4f3f..203b11e 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -1942,12 +1942,15 @@ } friend function f_tc_ps_rab_assignment_with_pfcp(charstring id, TestHdlrParams pars) runs on ConnHdlr { + const OCT8 c_SEID0 := '0000000000000000'O; + const OCT8 c_SEID1 := '1111111111111111'O; var RANAP_PDU tx; var RANAP_PDU rx; f_init_handler(pars); - f_pfcp_register(); + /* ask PFCPEM to route all PDUs to us */ + f_PFCPEM_subscribe_bcast(); var PDU_PFCP m; var Node_ID upf_node_id := valueof(ts_PFCP_Node_ID_fqdn("\07osmocom\03org")); @@ -1956,6 +1959,13 @@ PFCP.send(ts_PFCP_Assoc_Setup_Resp(m.sequence_number, upf_node_id, ts_PFCP_Cause(REQUEST_ACCEPTED), 1234)); + /* Subscribe for PFCP Session Establishment Request PDU(s), which are + * expected to have SEID set to 0, as per 3GPP TS 29.244, section 7.2.2.4.2. */ + f_PFCPEM_subscribe_seid(c_SEID0); + + /* ask PFCPEM to *not* route all PDUs to us anymore */ + f_PFCPEM_unsubscribe_bcast(); + tx := f_build_initial_ue(g_pars); f_iuh2iu_connect(tx); @@ -1969,12 +1979,17 @@ /* Expect PFCP Session Establishment Request. */ m := f_pfcp_expect(tr_PFCP_Session_Est_Req()); + /* Ask PFCPEM to route PDUs with to be indicated F-SEID to us. */ + f_PFCPEM_subscribe_seid(c_SEID1); + /* We no longer expect to receive PFCP Session Establishment Request PDU(s). */ + f_PFCPEM_unsubscribe_seid(c_SEID0); + var PFCP_Session_Establishment_Request serq := m.message_body.pfcp_session_establishment_request; var F_SEID hnbgw_f_seid := serq.CP_F_SEID; /* Acting as UPF, invent a new PFCP SEID to send to HNBGW. Respond to the Session Establishment. * The PFCP response must have the same sequence_number as the request. */ - var template F_SEID up_f_seid := ts_PFCP_F_SEID_ipv4(f_inet_addr("127.0.0.1"), '1111111111111111'O); + var template F_SEID up_f_seid := ts_PFCP_F_SEID_ipv4(f_inet_addr("127.0.0.1"), c_SEID1); var template F_TEID f_teid1 := ts_PFCP_F_TEID_ipv4(gtp_pars.core.local.teid, f_inet_addr(gtp_pars.core.local.addr)); var template F_TEID f_teid2 := ts_PFCP_F_TEID_ipv4(gtp_pars.access.local.teid, @@ -2020,6 +2035,9 @@ m := f_pfcp_expect(tr_PFCP_Session_Del_Req(up_f_seid.seid)); PFCP.send(ts_PFCP_Session_Del_Resp(m.sequence_number, hnbgw_f_seid.seid)); + /* ask PFCPEM to *not* route PDUs with this specific SEID to us */ + f_PFCPEM_unsubscribe_seid(c_SEID1); + f_sleep(2.0); } @@ -2050,7 +2068,8 @@ f_init_handler(pars); - f_pfcp_register(); + /* ask PFCPEM to route all PDUs to us */ + f_PFCPEM_subscribe_bcast(); activate(as_disallow_pfcp()); tx := f_build_initial_ue(g_pars); diff --git a/library/PFCP_Emulation.ttcn b/library/PFCP_Emulation.ttcn index c917157..edb1f9c 100644 --- a/library/PFCP_Emulation.ttcn +++ b/library/PFCP_Emulation.ttcn @@ -1,6 +1,6 @@ /* PFCP Emulation in TTCN-3 * - * (C) 2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * (C) 2022-2024 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * All rights reserved. * * Released under the terms of GNU General Public License, Version 2 or @@ -14,6 +14,8 @@ import from IPL4asp_Types all; import from General_Types all; import from Osmocom_Types all; +import from Misc_Helpers all; + import from PFCP_Types all; import from PFCP_Templates all; import from PFCP_CodecPort all; @@ -53,7 +55,12 @@ var integer g_pfcp_conn_id; var integer g_recovery_timestamp; - var PFCPEM_conns g_conns; + /* List of PFCP_ConnHdlr subscribed for broadcast */ + var PFCPEM_conns g_conns_bcast; + /* List of PFCP_ConnHdlr subscribed for SEID */ + var PFCPEM_conns g_conns_seqnr; + /* List of PFCP_ConnHdlr subscribed for SeqNr */ + var PFCPEM_conns g_conns_seid; var integer g_next_sequence_nr_state; }; @@ -69,16 +76,16 @@ type record PFCPEM_conn { PFCP_ConnHdlr vc_conn, OCT8 seid optional, - LIN3_BO_LAST pfcp_msg_sequence_number optional + LIN3_BO_LAST seqnr optional }; type record of PFCPEM_conn PFCPEM_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 (seqnr == g_conns[i].pfcp_msg_sequence_number) { - return g_conns[i].vc_conn; + for (var integer i := 0; i < lengthof(g_conns_seqnr); i := i + 1) { + if (seqnr == g_conns_seqnr[i].seqnr) { + return g_conns_seqnr[i].vc_conn; } } return null; @@ -86,9 +93,9 @@ 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 (seid == g_conns[i].seid) { - return g_conns[i].vc_conn; + for (var integer i := 0; i < lengthof(g_conns_seid); i := i + 1) { + if (seid == g_conns_seid[i].seid) { + return g_conns_seid[i].vc_conn; } } return null; @@ -100,6 +107,7 @@ vc_conn := f_PFCPEM_conn_by_seqnr(pdu.sequence_number); if (vc_conn != null) { + f_PFCPEM_conns_seqnr_del(pdu.sequence_number); return vc_conn; } @@ -111,16 +119,97 @@ return vc_conn; }; -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 == conn.vc_conn) { - g_conns[i] := conn; /* update */ - return; +/* subscribe/unsubscribe for/from broadcast PDUs */ +private function f_PFCPEM_conns_bcast_add(PFCP_ConnHdlr vc_conn) +runs on PFCP_Emulation_CT return boolean { + for (var integer i := 0; i < lengthof(g_conns_bcast); i := i + 1) { + if (g_conns_bcast[i].vc_conn == vc_conn) { + log(__SCOPE__, "(): vc_conn ", vc_conn, " is already in the list"); + return false; } } - /* Not in the list yet, add. */ - g_conns := g_conns & { conn }; + g_conns_bcast := g_conns_bcast & {{vc_conn, omit, omit}}; + log(__SCOPE__, "(): vc_conn ", vc_conn, " subscribed for broadcast"); + return true; +} +private function f_PFCPEM_conns_bcast_del(PFCP_ConnHdlr vc_conn) +runs on PFCP_Emulation_CT return boolean { + var PFCPEM_conns conns := { }; + + for (var integer i := 0; i < lengthof(g_conns_bcast); i := i + 1) { + if (g_conns_bcast[i].vc_conn != vc_conn) { + conns := conns & { g_conns_bcast[i] }; + } + } + if (lengthof(conns) == lengthof(g_conns_bcast)) { + log(__SCOPE__, "(): vc_conn ", vc_conn, " was not in the list"); + return false; + } + log(__SCOPE__, "(): vc_conn ", vc_conn, " unsubscribed from broadcast"); + g_conns_bcast := conns; + return true; +} + +/* subscribe/unsubscribe for/from PDUs with the given SeqNr value */ +private function f_PFCPEM_conns_seqnr_add(PFCP_ConnHdlr vc_conn, + LIN3_BO_LAST seqnr) +runs on PFCP_Emulation_CT return boolean { + for (var integer i := 0; i < lengthof(g_conns_seqnr); i := i + 1) { + if (g_conns_seqnr[i].seqnr == seqnr) { + log(__SCOPE__, "(): SeqNr ", seqnr, " is already claimed", + " by vc_conn ", g_conns_seqnr[i].vc_conn); + return false; + } + } + g_conns_seqnr := g_conns_seqnr & { {vc_conn, omit, seqnr} }; + return true; +} +private function f_PFCPEM_conns_seqnr_del(LIN3_BO_LAST seqnr) +runs on PFCP_Emulation_CT return boolean { + var PFCPEM_conns conns := { }; + + for (var integer i := 0; i < lengthof(g_conns_seqnr); i := i + 1) { + if (g_conns_seqnr[i].seqnr != seqnr) { + conns := conns & { g_conns_seqnr[i] }; + } + } + if (lengthof(conns) == lengthof(g_conns_seqnr)) { + log(__SCOPE__, "(): SeqNr ", seqnr, " was not in the list"); + return false; + } + g_conns_seqnr := conns; + return true; +} + +/* subscribe/unsubscribe for/from PDUs with the given SEID value */ +private function f_PFCPEM_conns_seid_add(PFCP_ConnHdlr vc_conn, + OCT8 seid) +runs on PFCP_Emulation_CT return boolean { + for (var integer i := 0; i < lengthof(g_conns_seid); i := i + 1) { + if (g_conns_seid[i].seid == seid) { + log(__SCOPE__, "(): SEID ", seid, " is already claimed", + " by vc_conn ", g_conns_seid[i].vc_conn); + return false; + } + } + g_conns_seid := g_conns_seid & { {vc_conn, seid, omit} }; + return true; +} +private function f_PFCPEM_conns_seid_del(OCT8 seid) +runs on PFCP_Emulation_CT return boolean { + var PFCPEM_conns conns := { }; + + for (var integer i := 0; i < lengthof(g_conns_seid); i := i + 1) { + if (g_conns_seid[i].seid != seid) { + conns := conns & { g_conns_seid[i] }; + } + } + if (lengthof(conns) == lengthof(g_conns_seid)) { + log(__SCOPE__, "(): SEID ", seid, " was not in the list"); + return false; + } + g_conns_seid := conns; + return true; } private function f_init(PFCP_Emulation_Cfg cfg) runs on PFCP_Emulation_CT { @@ -133,7 +222,9 @@ g_recovery_timestamp := f_rnd_int(4294967296); g_pfcp_cfg := cfg; - g_conns := {}; + g_conns_bcast := { }; + g_conns_seqnr := { }; + g_conns_seid := { }; g_next_sequence_nr_state := (1 + f_rnd_int(1000)) * 10000; } @@ -142,6 +233,7 @@ var PFCP_ConnHdlr vc_conn; var PFCP_Unitdata ud; var PDU_PFCP pdu; + var OCT8 seid; f_init(cfg); @@ -162,9 +254,9 @@ log("found destination ", vc_conn); CLIENT.send(ud.pdu) to vc_conn; } else { - 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; + for (var integer i := 0; i < lengthof(g_conns_bcast); i := i + 1) { + log("broadcasting to ", g_conns_bcast[i].vc_conn); + CLIENT.send(ud.pdu) to g_conns_bcast[i].vc_conn; } } } @@ -183,19 +275,33 @@ pdu := pdu }; - f_PFCPEM_conn_add_or_update({vc_conn, pdu.seid, pdu.sequence_number}); + /* route the response back to this vc_conn */ + f_PFCPEM_conns_seqnr_add(vc_conn, 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_conn_add_or_update({vc_conn, omit, omit}); - CLIENT_PROC.reply(PFCPEM_register:{}) to vc_conn; + /* subscribe/unsubscribe for/from broadcast PDUs */ + [] CLIENT_PROC.getcall(PFCPEM_subscribe_bcast:{?}) -> sender vc_conn { + var boolean res := f_PFCPEM_conns_bcast_add(vc_conn); + CLIENT_PROC.reply(PFCPEM_subscribe_bcast:{res}) to vc_conn; + } + [] CLIENT_PROC.getcall(PFCPEM_unsubscribe_bcast:{?}) -> sender vc_conn { + var boolean res := f_PFCPEM_conns_bcast_del(vc_conn); + CLIENT_PROC.reply(PFCPEM_unsubscribe_bcast:{res}) to vc_conn; + } + + /* subscribe/unsubscribe for/from PDUs with the given SEID value */ + [] CLIENT_PROC.getcall(PFCPEM_subscribe_seid:{?, ?}) -> param(seid := seid) sender vc_conn { + var boolean res := f_PFCPEM_conns_seid_add(vc_conn, seid); + CLIENT_PROC.reply(PFCPEM_subscribe_seid:{seid, res}) to vc_conn; + } + [] CLIENT_PROC.getcall(PFCPEM_unsubscribe_seid:{?, ?}) -> param(seid := seid) sender vc_conn { + var boolean res := f_PFCPEM_conns_seid_del(seid); + CLIENT_PROC.reply(PFCPEM_unsubscribe_seid:{seid, res}) 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; } } @@ -210,11 +316,17 @@ inout PDU_PFCP; } with { extension "internal" }; -signature PFCPEM_register(); +signature PFCPEM_subscribe_bcast(out boolean success); +signature PFCPEM_unsubscribe_bcast(out boolean success); +signature PFCPEM_subscribe_seid(in OCT8 seid, out boolean success); +signature PFCPEM_unsubscribe_seid(in OCT8 seid, out boolean success); signature PFCPEM_get_recovery_timestamp(out integer rts); type port PFCPEM_PROC_PT procedure { - inout PFCPEM_register; + inout PFCPEM_subscribe_bcast; + inout PFCPEM_unsubscribe_bcast; + inout PFCPEM_subscribe_seid; + inout PFCPEM_unsubscribe_seid; inout PFCPEM_get_recovery_timestamp; } with { extension "internal" }; @@ -227,13 +339,47 @@ port PFCPEM_PROC_PT PFCP_PROC; }; -function f_pfcp_register() runs on PFCP_ConnHdlr { - PFCP_PROC.call(PFCPEM_register:{}) { - [] PFCP_PROC.getreply(PFCPEM_register:{}); +/* subscribe/unsubscribe for/from broadcast PDUs */ +function f_PFCPEM_subscribe_bcast() runs on PFCP_ConnHdlr { + PFCP_PROC.call(PFCPEM_subscribe_bcast:{-}) { + [] PFCP_PROC.getreply(PFCPEM_subscribe_bcast:{true}); + [] PFCP_PROC.getreply(PFCPEM_subscribe_bcast:{false}) { + setverdict(fail, __SCOPE__, "() failed"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } + } +} +function f_PFCPEM_unsubscribe_bcast() runs on PFCP_ConnHdlr { + PFCP_PROC.call(PFCPEM_unsubscribe_bcast:{-}) { + [] PFCP_PROC.getreply(PFCPEM_unsubscribe_bcast:{true}); + [] PFCP_PROC.getreply(PFCPEM_unsubscribe_bcast:{false}) { + setverdict(fail, __SCOPE__, "() failed"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } } } -function f_pfcp_get_recovery_timestamp() +/* subscribe/unsubscribe for/from PDUs with the given SEID value */ +function f_PFCPEM_subscribe_seid(in OCT8 seid) runs on PFCP_ConnHdlr { + PFCP_PROC.call(PFCPEM_subscribe_seid:{seid, -}) { + [] PFCP_PROC.getreply(PFCPEM_subscribe_seid:{seid, true}); + [] PFCP_PROC.getreply(PFCPEM_subscribe_seid:{seid, false}) { + setverdict(fail, __SCOPE__, "() failed"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } + } +} +function f_PFCPEM_unsubscribe_seid(in OCT8 seid) runs on PFCP_ConnHdlr { + PFCP_PROC.call(PFCPEM_unsubscribe_seid:{seid, -}) { + [] PFCP_PROC.getreply(PFCPEM_unsubscribe_seid:{seid, true}); + [] PFCP_PROC.getreply(PFCPEM_unsubscribe_seid:{seid, false}) { + setverdict(fail, __SCOPE__, "() failed"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } + } +} + +function f_PFCPEM_get_recovery_timestamp() runs on PFCP_ConnHdlr return integer { var integer rts; diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 5b2e7bb..8d1a2b2 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -232,7 +232,9 @@ { var PDU_PFCP rx; + f_PFCPEM_subscribe_bcast(); /* ask PFCPEM to route all PDUs to us */ rx := f_ConnHdlr_pfcp_expect(tr_PFCP_Assoc_Setup_Req, Tval := 10.0); + f_PFCPEM_unsubscribe_bcast(); /* ask PFCPEM to *not* route all PDUs to us */ PFCP.send(ts_PFCP_Assoc_Setup_Resp(rx.sequence_number, ts_PFCP_Node_ID_fqdn("\07osmocom\03org"), ts_PFCP_Cause(REQUEST_ACCEPTED), @@ -264,8 +266,7 @@ function f_ConnHdlr_register_pfcp() runs on ConnHdlr { - f_pfcp_register(); - g_pfcp_recovery_timestamp := f_pfcp_get_recovery_timestamp(); + g_pfcp_recovery_timestamp := f_PFCPEM_get_recovery_timestamp(); /* First ConnHdlr answers the AssocSetup: */ if (g_pars.idx != 0) { @@ -561,6 +562,11 @@ function f_ConnHdlr_erab_setup_req(inout ERabList erabs) runs on ConnHdlr { + const OCT8 c_SEID0 := '0000000000000000'O; + + /* Subscribe for PFCP Session Establishment Request PDU(s), which are + * expected to have SEID set to 0, as per 3GPP TS 29.244, section 7.2.2.4.2. */ + f_PFCPEM_subscribe_seid(c_SEID0); log("eNB <- [S1GW <- MME]: E-RAB SETUP REQUEST"); f_ConnHdlr_tx_erab_setup_req(erabs); for (var integer i := 0; i < lengthof(erabs); i := i + 1) { @@ -568,9 +574,13 @@ var PDU_PFCP pdu := f_ConnHdlr_rx_session_establish_req(erabs[i]); /* store peer's SEID, so that it can be used in outgoing PDUs later */ erabs[i].pfcp_rem_seid := pdu.message_body.pfcp_session_establishment_request.CP_F_SEID.seid; + /* ask PFCPEM to route PDUs with the local SEID to us */ + f_PFCPEM_subscribe_seid(erabs[i].pfcp_loc_seid); log("UPF -> S1GW: PFCP Session Establishment Response for E-RAB ID ", erabs[i].erab_id); f_ConnHdlr_tx_session_establish_resp(erabs[i], pdu); } + /* We no longer expect to receive PFCP Session Establishment Request PDU(s). */ + f_PFCPEM_unsubscribe_seid(c_SEID0); log("[eNB <- S1GW] <- MME: E-RAB SETUP REQUEST"); f_ConnHdlr_rx_erab_setup_req(erabs); } @@ -598,6 +608,8 @@ var PDU_PFCP pdu := f_ConnHdlr_rx_session_delete_req(erabs[i]); log("UPF -> S1GW: PFCP Session Deletion Response for E-RAB ID ", erabs[i].erab_id); f_ConnHdlr_tx_session_delete_resp(erabs[i], pdu); + /* ask PFCPEM to *not* route PDUs with this SEID to us */ + f_PFCPEM_unsubscribe_seid(erabs[i].pfcp_loc_seid); } f_ConnHdlr_rx_erab_release_cmd(erabs, cause); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38207?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I25802471519fa297ad4cb2b056adaa6748b00af2 Gerrit-Change-Number: 38207 Gerrit-PatchSet: 5 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>

1 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add multi-eNB variants of TC_e_rab_setup
by laforge 26 Sep '24

26 Sep '24

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38213?usp=email ) Change subject: s1gw: add multi-eNB variants of TC_e_rab_setup ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38213?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9e2eb25a7ae78ff623b94802d881af4894d0cacd Gerrit-Change-Number: 38213 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Sep 2024 21:25:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: make number of eNBs configurable via module params
by laforge 26 Sep '24

26 Sep '24

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38210?usp=email ) Change subject: s1gw: make number of eNBs configurable via module params ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38210?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia80b9118e66a5d6721b89d3ba068227d30dcc01f Gerrit-Change-Number: 38210 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Sep 2024 21:25:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: library: add generic Mutex API for parallel components
by laforge 26 Sep '24

26 Sep '24

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38206?usp=email ) Change subject: library: add generic Mutex API for parallel components ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38206?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id71f43bd5fc78d4bb4417d6c01fcff8112ea6032 Gerrit-Change-Number: 38206 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Sep 2024 21:24:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy: clarify a logging statement, reduce verbosity
by laforge 26 Sep '24

26 Sep '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38294?usp=email ) Change subject: s1ap_proxy: clarify a logging statement, reduce verbosity ...................................................................... s1ap_proxy: clarify a logging statement, reduce verbosity Logging all S1AP PDUs at INFO is way to verbose, use DEBUG. Clarify that this is the Rx (receive) direction. Change-Id: I325758c7fb632dc67d0d9cf1f2e58ca337e7a744 --- M src/s1ap_proxy.erl 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 1df1518..c985601 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -82,7 +82,7 @@ handle_pdu(Data, S) when is_binary(Data) -> case decode_pdu(Data) of {ok, Pdu} -> - ?LOG_INFO("S1AP PDU: ~p", [Pdu]), + ?LOG_DEBUG("Rx S1AP PDU: ~p", [Pdu]), handle_pdu(Data, Pdu, S); {error, {asn1, Error}} -> ?LOG_ERROR("S1AP PDU decoding failed: ~p", [Error]), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38294?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I325758c7fb632dc67d0d9cf1f2e58ca337e7a744 Gerrit-Change-Number: 38294 Gerrit-PatchSet: 1 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>

1 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: add types for S1AP PDU and IE tuples
by laforge 26 Sep '24

26 Sep '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38295?usp=email ) Change subject: s1ap_proxy: add types for S1AP PDU and IE tuples ...................................................................... s1ap_proxy: add types for S1AP PDU and IE tuples Change-Id: I39e0a12aade5e31c414cb639dbf333af2a5b7be4 --- M src/s1ap_proxy.erl 1 file changed, 13 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index c985601..c386f29 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -50,6 +50,12 @@ -include("S1AP-IEs.hrl"). +-type s1ap_pdu() :: {initiatingMessage, #'InitiatingMessage'{}} | + {successfulOutcome, #'SuccessfulOutcome'{}} | + {unsuccessfulOutcome, #'UnsuccessfulOutcome'{}}. +-type s1ap_ie() :: #'ProtocolIE-Field'{}. +-type s1ap_ie_val() :: tuple(). + -type mme_ue_id() :: 0..16#ffffffff. -type enb_ue_id() :: 0..16#ffffff. -type erab_id() :: 0..16#ff. @@ -102,14 +108,14 @@ %% ------------------------------------------------------------------ %% Encode an S1AP PDU --spec encode_pdu(tuple()) -> {ok, binary()} | - {error, {asn1, tuple()}}. +-spec encode_pdu(s1ap_pdu()) -> {ok, binary()} | + {error, {asn1, tuple()}}. encode_pdu(Pdu) -> 'S1AP-PDU-Descriptions':encode('S1AP-PDU', Pdu). %% Decode an S1AP PDU --spec decode_pdu(binary()) -> {ok, tuple()} | +-spec decode_pdu(binary()) -> {ok, s1ap_pdu()} | {error, {asn1, tuple()}}. decode_pdu(Data) -> 'S1AP-PDU-Descriptions':decode('S1AP-PDU', Data). @@ -118,6 +124,7 @@ %% Helper function for handle_pdu/3. %% Attempt to encode a new (modified) S1AP PDU, %% return a new binary() on success or Data on error. +-spec handle_pdu_new(binary(), s1ap_pdu(), proxy_state()) -> {binary(), proxy_state()}. handle_pdu_new(Data, NewPdu, S) -> case encode_pdu(NewPdu) of {ok, NewData} -> @@ -128,6 +135,8 @@ end. +-spec handle_pdu(binary(), s1ap_pdu(), proxy_state()) -> {binary(), proxy_state()}. + %% 9.1.3.1 E-RAB SETUP REQUEST handle_pdu(Data, {Outcome = initiatingMessage, #'InitiatingMessage'{procedureCode = ?'id-E-RABSetup', @@ -216,7 +225,7 @@ %% Handle a single IE (Information Element) --spec handle_ie(tuple(), proxy_state()) -> {tuple(), proxy_state()}. +-spec handle_ie(s1ap_ie(), proxy_state()) -> {s1ap_ie_val(), proxy_state()}. %% E-RAB SETUP REQUEST related IEs handle_ie(#'ProtocolIE-Field'{id = ?'id-E-RABToBeSetupListBearerSUReq', -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38295?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I39e0a12aade5e31c414cb639dbf333af2a5b7be4 Gerrit-Change-Number: 38295 Gerrit-PatchSet: 1 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>

1 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: print unique E-RAB ID in error messages
by laforge 26 Sep '24

26 Sep '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38239?usp=email ) Change subject: s1ap_proxy: print unique E-RAB ID in error messages ...................................................................... s1ap_proxy: print unique E-RAB ID in error messages Include the {MME,ENB}-UE-S1AP-ID when printing error messages. Printing E-RAB-ID may be misleading. Change-Id: I7327e25ea407b3a21706e8b5e4487135675d91d5 --- M src/s1ap_proxy.erl 1 file changed, 14 insertions(+), 11 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index c386f29..a98514c 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -59,6 +59,7 @@ -type mme_ue_id() :: 0..16#ffffffff. -type enb_ue_id() :: 0..16#ffffff. -type erab_id() :: 0..16#ff. +-type erab_uid() :: {mme_ue_id(), enb_ue_id(), erab_id()}. -record(proxy_state, {erabs :: dict:dict(), mme_ue_id :: undefined | mme_ue_id(), @@ -107,6 +108,12 @@ %% private API %% ------------------------------------------------------------------ +-spec erab_uid(erab_id(), proxy_state()) -> erab_uid(). +erab_uid(ERABId, #proxy_state{mme_ue_id = MmeUeId, + enb_ue_id = EnbUeId}) -> + {MmeUeId, EnbUeId, ERABId}. + + %% Encode an S1AP PDU -spec encode_pdu(s1ap_pdu()) -> {ok, binary()} | {error, {asn1, tuple()}}. @@ -282,7 +289,7 @@ {ok, Pid} -> ok = erab_fsm:erab_release_req(Pid); error -> - ?LOG_ERROR("E-RAB-ID ~p is not registered", [ERABId]) + ?LOG_ERROR("E-RAB ~p is not registered", [erab_uid(ERABId, S)]) end, {Content, S}; @@ -300,7 +307,7 @@ {ok, Pid} -> ok = erab_fsm:erab_release_rsp(Pid); error -> - ?LOG_ERROR("E-RAB-ID ~p is not registered", [ERABId]) + ?LOG_ERROR("E-RAB ~p is not registered", [erab_uid(ERABId, S)]) end, {Content, S}; @@ -361,7 +368,7 @@ C0#'E-RABSetupItemCtxtSURes'{'transportLayerAddress' = TLA_Out, 'gTP-TEID' = << TEID_Out:32/big >>}; error -> - ?LOG_ERROR("E-RAB-ID ~p is not registered", [ERABId]), + ?LOG_ERROR("E-RAB ~p is not registered", [erab_uid(ERABId, S)]), C0 %% XXX: proxy as-is or drop? end, {C1, S}; @@ -400,19 +407,15 @@ -spec erab_fsm_start_reg(erab_id(), proxy_state()) -> {pid(), proxy_state()}. -erab_fsm_start_reg(RABId, #proxy_state{erabs = ERABs, - mme_ue_id = MmeUeId, - enb_ue_id = EnbUeId} = S) -> - UID = {MmeUeId, EnbUeId, RABId}, +erab_fsm_start_reg(RABId, #proxy_state{erabs = ERABs} = S) -> + UID = erab_uid(RABId, S), {ok, Pid} = erab_fsm:start_link(UID), {Pid, S#proxy_state{erabs = dict:store(UID, Pid, ERABs)}}. -spec erab_fsm_find(erab_id(), proxy_state()) -> {ok, pid()} | error. -erab_fsm_find(RABId, #proxy_state{erabs = ERABs, - mme_ue_id = MmeUeId, - enb_ue_id = EnbUeId}) -> - UID = {MmeUeId, EnbUeId, RABId}, +erab_fsm_find(RABId, #proxy_state{erabs = ERABs} = S) -> + UID = erab_uid(RABId, S), dict:find(UID, ERABs). %% vim:set ts=4 sw=4 et: -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38239?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I7327e25ea407b3a21706e8b5e4487135675d91d5 Gerrit-Change-Number: 38239 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>

1 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy_test: re-generate E-RAB RELEASE.{cmd,rsp} PDU blobs
by laforge 26 Sep '24

26 Sep '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38240?usp=email ) Change subject: s1ap_proxy_test: re-generate E-RAB RELEASE.{cmd,rsp} PDU blobs ...................................................................... s1ap_proxy_test: re-generate E-RAB RELEASE.{cmd,rsp} PDU blobs These PDU blobs contained the right E-RAB-ID=6, but different and unexpected {MME,ENB}-UE-S1AP-ID values. As a result of this, the E-RAB {7,9,6} that we establish in test_e_rab_setup/1 is never released properly, and this is why we're seeing these two errors: E-RAB {1,0,6} is not registered (s1ap_proxy:handle_ie/2) E-RAB {2,1,6} is not registered (s1ap_proxy:handle_ie/2) The new S1AP PDU blobs were re-generated using ttcn3-s1gw-test. Change-Id: I229c47148fd7408e44f1339ae2a2909f570c73ec --- M test/s1ap_proxy_test.erl 1 file changed, 6 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 9534980..5f6167d 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -168,14 +168,10 @@ %% [eNB <- MME] E-RAB RELEASE COMMAND %% TODO: make E-RAB IDs configurable e_rab_release_cmd_pdu() -> - << 16#00, 16#07, 16#00, 16#37, 16#00, 16#00, 16#05, 16#00, - 16#00, 16#00, 16#02, 16#00, 16#01, 16#00, 16#08, 16#00, - 16#02, 16#00, 16#00, 16#00, 16#42, 16#00, 16#0a, 16#18, - 16#3e, 16#80, 16#00, 16#00, 16#60, 16#3e, 16#80, 16#00, - 16#00, 16#00, 16#21, 16#40, 16#07, 16#00, 16#00, 16#23, - 16#40, 16#02, 16#0c, 16#40, 16#00, 16#1a, 16#40, 16#0b, - 16#0a, 16#27, 16#d3, 16#76, 16#43, 16#e7, 16#07, 16#72, - 16#47, 16#cd, 16#24 + << 16#00, 16#07, 16#00, 16#1a, 16#00, 16#00, 16#03, 16#00, + 16#00, 16#00, 16#02, 16#00, 16#07, 16#00, 16#08, 16#00, + 16#02, 16#00, 16#09, 16#00, 16#21, 16#40, 16#07, 16#00, + 16#00, 16#23, 16#40, 16#02, 16#0c, 16#40 >>. @@ -183,8 +179,8 @@ %% TODO: make E-RAB IDs configurable e_rab_release_rsp_pdu() -> << 16#20, 16#07, 16#00, 16#19, 16#00, 16#00, 16#03, 16#00, - 16#00, 16#40, 16#02, 16#00, 16#02, 16#00, 16#08, 16#40, - 16#02, 16#00, 16#01, 16#00, 16#45, 16#40, 16#06, 16#00, + 16#00, 16#00, 16#02, 16#00, 16#07, 16#00, 16#08, 16#00, + 16#02, 16#00, 16#09, 16#00, 16#45, 16#40, 16#06, 16#00, 16#00, 16#0f, 16#40, 16#01, 16#0c >>. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38240?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I229c47148fd7408e44f1339ae2a2909f570c73ec Gerrit-Change-Number: 38240 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>

1 0

[L] Change in ...osmo-s1gw[master]: Introduce initial metrics support
by laforge 26 Sep '24

26 Sep '24

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37955?usp=email ) Change subject: Introduce initial metrics support ...................................................................... Patch Set 5: Code-Review+1 (1 comment) File src/sctp_proxy.erl: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37955/comment/d33fa3bc_a6b9… : PS4, Line 109: S1GW_CTR_S1AP_PROXY_UPLINK_PACKETS_QUEUED > The fact that is not special doesn't really mean to me that we should not be counting it. […] Acknowledged -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/37955?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I952e198238384dca4be94f91a01d7cfff0a1471f Gerrit-Change-Number: 37955 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 26 Sep 2024 21:23:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log