- gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: hnbgw: fix id string s/HBGW/HNBGW
by neels 08 Jun '22

08 Jun '22

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28236 ) Change subject: hnbgw: fix id string s/HBGW/HNBGW ...................................................................... hnbgw: fix id string s/HBGW/HNBGW Change-Id: I5935208843851fdac3536269617b56e8459b578d --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index fd868b0..81d9f1a 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -288,7 +288,7 @@ } /* global initialization function */ -function f_init(charstring id := "HBGW", float guard_timeout := 30.0) runs on test_CT { +function f_init(charstring id := "HNBGW", float guard_timeout := 30.0) runs on test_CT { g_hnb_cfg[0] := { lai := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28236 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: I5935208843851fdac3536269617b56e8459b578d Gerrit-Change-Number: 28236 Gerrit-PatchSet: 2 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-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: hnbgw: drop unused hexstrings
by neels 08 Jun '22

08 Jun '22

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28235 ) Change subject: hnbgw: drop unused hexstrings ...................................................................... hnbgw: drop unused hexstrings Change-Id: Ic589f2f48da79302f88724a708b43a4cfa865890 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 0 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 1b1d709..fd868b0 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -197,13 +197,6 @@ const integer NUM_HNB := 1; -const hexstring ranap_cm_service_req := '001340400000060003400100000f40060000f11028b6003a40080000f110ffffffff0010400e0d052411035758a605f44e9d4aef004f400300001c0056400500f1100017'H; -const hexstring ranap_auth_req := '00144032000002001040262505120217dc146aeac56cb5ff6d5fb51f47f19220108ca5a6d0c8110000b9e9272498872764003b400100'H; -const hexstring ranap_auth_resp := '001440140000010010400d0c0554ccbdd0302104002f3ae4'H; -const hexstring ranap_paging := '000e401e0000030003400100001740095000010100000000f10040400500b6cf4773'H; -const hexstring ranap_rab_ass_req := '0000005900000100364052000001003500487824cd80102fa7201a2c0000f44c080a028000514000272028140067400000222814003c40000000503d02000227c03500010a0901a200000000000000000000000000401f4a0000400100'H; -const hexstring iu_release_compl := '20010003000000'H; - type record HnbConfig { LocationAreaIdentification lai, integer sac -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28235 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: Ic589f2f48da79302f88724a708b43a4cfa865890 Gerrit-Change-Number: 28235 Gerrit-PatchSet: 2 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-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: bsc: add config files for sccplite BSC tests
by neels 08 Jun '22

08 Jun '22

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28234 ) Change subject: bsc: add config files for sccplite BSC tests ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: hmm, not aware of that at all -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28234 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: Ia92b4a7fda2195ce6e6aaf0bccd808df40057896 Gerrit-Change-Number: 28234 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 08 Jun 2022 12:08:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: hnbgw: test SCCP CR without payload
by neels 08 Jun '22

08 Jun '22

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28231 ) Change subject: hnbgw: test SCCP CR without payload ...................................................................... hnbgw: test SCCP CR without payload Various tweaks are required to allow RAN_Emulation to handle, and also to expect, an SCCP CR that has no payload data. Related: SYS#5968 Related: If0c5c0a76e5230bf22871f527dcb2dbdf34d7328 (osmo-hnbgw) Change-Id: I827e081eaacfb8e76684ed1560603e6c8f896c38 --- M hnbgw/HNBGW_Tests.ttcn M library/RAN_Emulation.ttcnpp 2 files changed, 108 insertions(+), 19 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved pespin: 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 b2c491e..1b1d709 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -167,7 +167,8 @@ hexstring imsi, boolean ps_domain, MgcpParameters mgcp_pars optional, - HnbConfig hnb optional + HnbConfig hnb optional, + boolean separate_sccp_cr } /* We extend: @@ -498,12 +499,21 @@ } /* create an expect on the Iu side for the random NAS portion */ - var template (omit) octetstring nas := f_ranap_extract_l3(valueof(tx)); - f_ran_register_exp(valueof(nas)); + if (g_pars.separate_sccp_cr) { + f_ran_register_sccp_cr_without_payload(); + } else { + var template (omit) octetstring nas := f_ranap_extract_l3(valueof(tx)); + f_ran_register_exp(valueof(nas)); + } /* send it via Iuh (creating a RUA connection) */ RUA.send(RUA_Conn_Req:{g_pars.ps_domain, tx}); + if (g_pars.separate_sccp_cr) { + /* Acknowledge the empty SCCP CR. RAN_Emulation does the confirmation, no need to respond. */ + BSSAP.receive(tr_RANAP_Conn_Req()); + } + /* expect to receive it on the Iu side */ T.start; alt { @@ -634,11 +644,13 @@ ***********************************************************************/ private template (value) TestHdlrParams -t_pars(integer imsi_suffix, boolean ps_domain := false,integer hnb_idx := 0) := { +t_pars(integer imsi_suffix, boolean ps_domain := false, integer hnb_idx := 0, + boolean separate_sccp_cr := false) := { hnb_idx := hnb_idx, imsi := f_gen_imsi(imsi_suffix), ps_domain := ps_domain, - hnb := omit /* filled in later */ + hnb := omit, /* filled in later */ + separate_sccp_cr := separate_sccp_cr } /* Create an Iuh connection; send InitialUE; expect it to appear on new SCCP conenction */ @@ -666,6 +678,43 @@ vc_conn.done; } +private function f_vty_set_sccp_cr_max_payload_len(TELNETasp_PT pt, integer val := 999999) +{ + f_vty_enter_config(pt); + f_vty_transceive(pt, "hnbgw"); + f_vty_transceive(pt, "sccp cr max-payload-len " & int2str(val)); + f_vty_transceive(pt, "end"); +} + +testcase TC_ranap_cs_initial_ue_empty_cr() runs on test_CT { + var ConnHdlr vc_conn; + + f_init(); + f_start_hnbs(); + + f_vty_set_sccp_cr_max_payload_len(HNBGWVTY, 0); + + vc_conn := f_start_handler_with_pars(refers(f_tc_initial_ue), t_pars(1, separate_sccp_cr := true)); + vc_conn.done; + + /* reset */ + f_vty_set_sccp_cr_max_payload_len(HNBGWVTY); +} +testcase TC_ranap_ps_initial_ue_empty_cr() runs on test_CT { + var ConnHdlr vc_conn; + + f_init(); + f_start_hnbs(); + + f_vty_set_sccp_cr_max_payload_len(HNBGWVTY, 0); + + vc_conn := f_start_handler_with_pars(refers(f_tc_initial_ue), t_pars(2, true, separate_sccp_cr := true)); + vc_conn.done; + + /* reset */ + f_vty_set_sccp_cr_max_payload_len(HNBGWVTY); +} + /* Reply to a received CRCX with an OK (or the reply configured in cpars), using the given parameters. * Return true when an OK reply was sent, false otherwise. * Count occurrence of Osmux, include Osmux parameters in the reply if necessary. */ @@ -1104,6 +1153,8 @@ execute(TC_hnb_register()); execute(TC_ranap_cs_initial_ue()); execute(TC_ranap_ps_initial_ue()); + execute(TC_ranap_cs_initial_ue_empty_cr()); + execute(TC_ranap_ps_initial_ue_empty_cr()); execute(TC_ranap_cs_bidir()); execute(TC_ranap_ps_bidir()); execute(TC_rab_assignment()); diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 3198ee1..543df2b 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -555,9 +555,18 @@ type record RANAP_Conn_Req { SCCP_PAR_Address addr_peer, SCCP_PAR_Address addr_own, - RANAP_PDU ranap + RANAP_PDU ranap optional } -template (value) RANAP_Conn_Req ts_RANAP_Conn_Req(SCCP_PAR_Address peer, SCCP_PAR_Address own, RANAP_PDU ranap) := { +template (value) RANAP_Conn_Req ts_RANAP_Conn_Req(SCCP_PAR_Address peer, SCCP_PAR_Address own, + template (omit) RANAP_PDU ranap) := { + addr_peer := peer, + addr_own := own, + ranap := ranap +}; + +template RANAP_Conn_Req tr_RANAP_Conn_Req(template SCCP_PAR_Address peer := ?, + template SCCP_PAR_Address own := ?, + template (omit) RANAP_PDU ranap := omit) := { addr_peer := peer, addr_own := own, ranap := ranap @@ -973,7 +982,12 @@ /* store mapping between client components and SCCP connectionId */ f_conn_table_add(vc_conn, rconn_ind.connectionId); /* handle user payload */ - f_handle_userData_RANAP(vc_conn, rconn_ind.userData); + if (ispresent(rconn_ind.userData)) { + f_handle_userData_RANAP(vc_conn, rconn_ind.userData); + } else { + /* Notify client that we received an SCCP CR without user data */ + CLIENT.send(ts_RANAP_Conn_Req(rconn_ind.callingAddress, rconn_ind.calledAddress, omit)); + } /* confirm connection establishment */ RANAP.send(ts_RANAP_CONNECT_res(rconn_ind.connectionId, omit)); } @@ -1250,6 +1264,11 @@ PROC.reply(RAN_register_handoverRequest:{targetPointCode, vc_hdlr}) to vc_hdlr; } + [] PROC.getcall(RAN_register_sccp_cr_without_payload:{?}) -> param(vc_hdlr) { + f_create_expect(omit, vc_hdlr); + PROC.reply(RAN_register_sccp_cr_without_payload:{vc_hdlr}) to vc_hdlr; + } + [] PROC.getcall(RAN_register_imsi:{?,?,?}) -> param(imsi, tmsi, vc_hdlr) { f_create_imsi(imsi, tmsi, vc_hdlr); PROC.reply(RAN_register_imsi:{imsi, tmsi, vc_hdlr}) to vc_hdlr; @@ -1280,6 +1299,7 @@ /* L3 payload based on which we can match it */ octetstring l3_payload optional, integer handoverRequestPointCode optional, + boolean sccp_cr_without_payload, /* component reference for this connection */ RAN_ConnHdlr vc_conn } @@ -1287,6 +1307,7 @@ /* procedure based port to register for incoming connections */ signature RAN_register(in octetstring l3, in RAN_ConnHdlr hdlr); signature RAN_register_handoverRequest(in integer targetPointCode, in RAN_ConnHdlr hdlr); +signature RAN_register_sccp_cr_without_payload(in RAN_ConnHdlr hdlr); /* procedure based port to register for incoming IMSI/TMSI */ signature RAN_register_imsi(in hexstring imsi, in OCT4 tmsi, in RAN_ConnHdlr hdlr); @@ -1299,7 +1320,8 @@ signature RAN_continue_after_n_sd(N_Sd_Array last_n_sd, in RAN_ConnHdlr hdlr); type port RAN_PROC_PT procedure { - inout RAN_register, RAN_register_imsi, RAN_unregister_imsi, RAN_register_handoverRequest, RAN_last_n_sd, RAN_continue_after_n_sd; + inout RAN_register, RAN_register_imsi, RAN_unregister_imsi, RAN_register_handoverRequest, + RAN_register_sccp_cr_without_payload, RAN_last_n_sd, RAN_continue_after_n_sd; } with { extension "internal" }; #ifdef RAN_EMULATION_BSSAP @@ -1360,25 +1382,31 @@ runs on RAN_Emulation_CT return RAN_ConnHdlr { var RAN_ConnHdlr ret := null; var template (omit) octetstring l3_info; + var boolean rx_sccp_cr_without_payload; var integer i; - l3_info := f_ranap_extract_l3(conn_ind.userData); - if (istemplatekind(l3_info, "omit")) { - setverdict(fail, "N-CONNECT.ind without NAS payload"); - mtc.stop; - return ret; + if (ispresent(conn_ind.userData)) { + l3_info := f_ranap_extract_l3(conn_ind.userData); + rx_sccp_cr_without_payload := false; + if (istemplatekind(l3_info, "omit") and not rx_sccp_cr_without_payload) { + setverdict(fail, "N-CONNECT.ind without NAS payload"); + mtc.stop; + return ret; + } + } else { + l3_info := omit; + rx_sccp_cr_without_payload := true; } for (i := 0; i < sizeof(ExpectTable); i:= i+1) { - if (not ispresent(ExpectTable[i].l3_payload)) { - continue; - } - if (valueof(l3_info) == ExpectTable[i].l3_payload) { + if ((rx_sccp_cr_without_payload and ExpectTable[i].sccp_cr_without_payload) + or (ispresent(ExpectTable[i].l3_payload) and valueof(l3_info) == ExpectTable[i].l3_payload)) { ret := ExpectTable[i].vc_conn; /* release this entry to be used again */ + ExpectTable[i].sccp_cr_without_payload := false; ExpectTable[i].l3_payload := omit; ExpectTable[i].vc_conn := null; - log("Found Expect[", i, "] for ", l3_info, " handled at ", ret); + log("Found Expect[", i, "] for l3=", l3_info, " handled at ", ret); /* return the component reference */ return ret; } @@ -1396,9 +1424,12 @@ log("f_create_expect(l3 := ", l3, ", handoverRequest := ", handoverRequestPointCode); for (i := 0; i < sizeof(ExpectTable); i := i+1) { if (not ispresent(ExpectTable[i].l3_payload) + and not ExpectTable[i].sccp_cr_without_payload and not ispresent(ExpectTable[i].handoverRequestPointCode)) { if (ispresent(l3)) { ExpectTable[i].l3_payload := valueof(l3); + } else { + ExpectTable[i].sccp_cr_without_payload := true; } if (ispresent(handoverRequestPointCode)) { ExpectTable[i].handoverRequestPointCode := valueof(handoverRequestPointCode); @@ -1448,6 +1479,7 @@ for (var integer i := 0; i < sizeof(ExpectTable); i := i+1) { ExpectTable[i].l3_payload := omit; ExpectTable[i].handoverRequestPointCode := omit; + ExpectTable[i].sccp_cr_without_payload := false; } } @@ -1484,6 +1516,12 @@ } } +function f_ran_register_sccp_cr_without_payload() runs on RAN_ConnHdlr { + BSSAP_PROC.call(RAN_register_sccp_cr_without_payload:{self}) { + [] BSSAP_PROC.getreply(RAN_register_sccp_cr_without_payload:{?}) {}; + } +} + #ifdef RAN_EMULATION_RANAP /* expect a IuReleaseCommand; Confirm that; expect SCCP-level N-DISCONNET.ind */ altstep as_iu_release_compl_disc(float t := 5.0) runs on RAN_ConnHdlr { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28231 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: I827e081eaacfb8e76684ed1560603e6c8f896c38 Gerrit-Change-Number: 28231 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-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: hnbgw: test SCCP CR without payload
by neels 08 Jun '22

08 Jun '22

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28231 ) Change subject: hnbgw: test SCCP CR without payload ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: combine votes -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28231 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: I827e081eaacfb8e76684ed1560603e6c8f896c38 Gerrit-Change-Number: 28231 Gerrit-PatchSet: 2 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-Comment-Date: Wed, 08 Jun 2022 12:07:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-upf[master]: implement OSMO_LOG_PFCP_MSG_SRC as va function
by neels 08 Jun '22

08 Jun '22

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28239 ) Change subject: implement OSMO_LOG_PFCP_MSG_SRC as va function ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I don't like this patch, submitting this only because of code review that i disagree with. -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I1713868ebb9583c67f0a4ecc9558263f6888a24d Gerrit-Change-Number: 28239 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 08 Jun 2022 12:04:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-upf[master]: libosmo-pfcp: implement PFCP header and msg handling
by neels 08 Jun '22

08 Jun '22

Attention is currently required from: laforge, pespin, fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/27631 ) Change subject: libosmo-pfcp: implement PFCP header and msg handling ...................................................................... Patch Set 7: (1 comment) File include/osmocom/pfcp/pfcp_msg.h: https://gerrit.osmocom.org/c/osmo-upf/+/27631/comment/3415207e_6f0c529f PS3, Line 44: #define OSMO_LOG_PFCP_MSG_SRC(M, LEVEL, file, line, FMT, ARGS...) do { \ > Because in general it doesn't make sense to force the compiler to generate all that code duplicated […] on the contrary, if it is a function implemented in an .o, then the compiler has less optimization flexibility, IIUC. I've submitted a separate patch to change it to a va function, but I still disagree completely with this review, and I hate that patch, it makes everything worse. https://gerrit.osmocom.org/c/osmo-upf/+/28239 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I3f85ea052a6b7c064244a8093777e53a47c8c61e Gerrit-Change-Number: 27631 Gerrit-PatchSet: 7 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 Jun 2022 12:03:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-upf[master]: implement OSMO_LOG_PFCP_MSG_SRC as va function
by neels 08 Jun '22

08 Jun '22

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/28239 ) Change subject: implement OSMO_LOG_PFCP_MSG_SRC as va function ...................................................................... implement OSMO_LOG_PFCP_MSG_SRC as va function This was requested by code review. Change-Id: I1713868ebb9583c67f0a4ecc9558263f6888a24d --- M include/osmocom/pfcp/pfcp_msg.h M src/libosmo-pfcp/pfcp_msg.c 2 files changed, 45 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/39/28239/1 diff --git a/include/osmocom/pfcp/pfcp_msg.h b/include/osmocom/pfcp/pfcp_msg.h index 949800e..7db6f3f 100644 --- a/include/osmocom/pfcp/pfcp_msg.h +++ b/include/osmocom/pfcp/pfcp_msg.h @@ -42,26 +42,8 @@ #define OSMO_PFCP_MSGB_ALLOC_SIZE 2048 -#define OSMO_LOG_PFCP_MSG_SRC(M, LEVEL, file, line, FMT, ARGS...) do { \ - struct osmo_fsm_inst *_fi = (M) ? ((M)->ctx.session_fi ?: (M)->ctx.peer_fi) : NULL; \ - enum osmo_pfcp_cause *cause = osmo_pfcp_msg_cause(M); \ - if ((M)->h.seid_present) { \ - LOGPFSMSLSRC(_fi, DLPFCP, LEVEL, file, line, \ - "%s%s PFCP seq-%u SEID-0x%"PRIx64" %s%s%s: " FMT, \ - _fi ? "" : osmo_sockaddr_to_str_c(OTC_SELECT, &(M)->remote_addr), \ - (M)->rx ? "-rx->" : "<-tx-", (M)->h.sequence_nr, \ - (M)->h.seid, \ - osmo_pfcp_message_type_str((M)->h.message_type), cause ? ": " : "", \ - cause ? osmo_pfcp_cause_str(*cause) : "", ##ARGS); \ - } else { \ - LOGPFSMSLSRC(_fi, DLPFCP, LEVEL, file, line, \ - "%s%s PFCP seq-%u %s%s%s: " FMT, \ - _fi ? "" : osmo_sockaddr_to_str_c(OTC_SELECT, &(M)->remote_addr), \ - (M)->rx ? "-rx->" : "<-tx-", (M)->h.sequence_nr, \ - osmo_pfcp_message_type_str((M)->h.message_type), cause ? ": " : "", \ - cause ? osmo_pfcp_cause_str(*cause) : "", ##ARGS); \ - } \ - } while (0) +#define OSMO_LOG_PFCP_MSG_SRC(M, LEVEL, file, line, FMT, ARGS...) \ + osmo_log_pfcp_msg_src(M, LEVEL, file, line, FMT, ##ARGS) #define OSMO_LOG_PFCP_MSG(M, LEVEL, FMT, ARGS...) \ OSMO_LOG_PFCP_MSG_SRC(M, LEVEL, __FILE__, __LINE__, FMT, ##ARGS) @@ -195,3 +177,6 @@ int osmo_pfcp_msg_to_str_buf(char *buf, size_t buflen, const struct osmo_pfcp_msg *m); char *osmo_pfcp_msg_to_str_c(void *ctx, const struct osmo_pfcp_msg *m); + +void osmo_log_pfcp_msg_src(const struct osmo_pfcp_msg *m, unsigned int level, const char *file, int line, + const char *fmt, ...); diff --git a/src/libosmo-pfcp/pfcp_msg.c b/src/libosmo-pfcp/pfcp_msg.c index 9d65efc..60038f7 100644 --- a/src/libosmo-pfcp/pfcp_msg.c +++ b/src/libosmo-pfcp/pfcp_msg.c @@ -538,3 +538,43 @@ { OSMO_NAME_C_IMPL(ctx, 256, "ERROR", osmo_pfcp_msg_to_str_buf, m) } + +void osmo_log_pfcp_msg_src(const struct osmo_pfcp_msg *m, unsigned int level, const char *file, int line, + const char *fmt, ...) +{ + va_list ap; + struct osmo_fsm_inst *fi; + enum osmo_pfcp_cause *cause; + char *msg; + + if (!log_check_level(DLPFCP, level)) + return; + + fi = m ? (m->ctx.session_fi ?: m->ctx.peer_fi) : NULL; + cause = osmo_pfcp_msg_cause(m); + + va_start(ap, fmt); + msg = talloc_vasprintf(m, fmt, ap); + va_end(ap); + + if (m->h.seid_present) { + LOGPFSMSLSRC(fi, DLPFCP, level, file, line, + "%s%s PFCP seq-%u SEID-0x%"PRIx64" %s%s%s: %s", + fi ? "" : osmo_sockaddr_to_str_c(OTC_SELECT, &m->remote_addr), + m->rx ? "-rx->" : "<-tx-", m->h.sequence_nr, + m->h.seid, + osmo_pfcp_message_type_str(m->h.message_type), cause ? ": " : "", + cause ? osmo_pfcp_cause_str(*cause) : "", + msg); + } else { + LOGPFSMSLSRC(fi, DLPFCP, level, file, line, + "%s%s PFCP seq-%u %s%s%s: %s", + fi ? "" : osmo_sockaddr_to_str_c(OTC_SELECT, &m->remote_addr), + m->rx ? "-rx->" : "<-tx-", m->h.sequence_nr, + osmo_pfcp_message_type_str(m->h.message_type), cause ? ": " : "", + cause ? osmo_pfcp_cause_str(*cause) : "", + msg); + } + + talloc_free(msg); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28239 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I1713868ebb9583c67f0a4ecc9558263f6888a24d Gerrit-Change-Number: 28239 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in docker-playground[master]: open5gs: Enable libmetrics prometheus implementation
by pespin 08 Jun '22

08 Jun '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/28238 ) Change subject: open5gs: Enable libmetrics prometheus implementation ...................................................................... open5gs: Enable libmetrics prometheus implementation metrics support using Prometheus has been recently added to open5gs (28e40a0f1b9048768958344e213c69994be671f5). However, it is still not enabled by default. Let's enable it and update open5gs config files to make use of it. Change-Id: I6ec827d66241e20d631f3a851457921718c168a0 --- M open5gs-master/Dockerfile M ttcn3-ggsn-test/ogs/open5gs-smf.yaml M ttcn3-pgw-test/open5gs-smf.yaml 3 files changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/38/28238/1 diff --git a/open5gs-master/Dockerfile b/open5gs-master/Dockerfile index 1aea492..54c7fd1 100644 --- a/open5gs-master/Dockerfile +++ b/open5gs-master/Dockerfile @@ -7,6 +7,7 @@ apt-get upgrade -y && \ DEBIAN_FRONTEND=noninteractive \ apt-get install -y --no-install-recommends \ + cmake \ vim \ sudo \ iproute2 \ @@ -53,4 +54,5 @@ --localstatedir=/var \ --libdir=lib/x86_64-linux-gnu \ --libexecdir=lib/x86_64-linux-gnu && \ + meson configure -Dmetrics_impl=prometheus build && \ ninja -C build install diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml index 3ee3b04..9d47250 100644 --- a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml +++ b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml @@ -533,3 +533,17 @@ # handover: # duration: 500 time: + +# +# metrics: +# +# <Metrics Server> +# +# o Metrics Server(http://<any address>:9090) +# metrics: +# addr: 0.0.0.0 +# port: 9090 +# +metrics: + addr: 172.18.3.201 + port: 9090 diff --git a/ttcn3-pgw-test/open5gs-smf.yaml b/ttcn3-pgw-test/open5gs-smf.yaml index 5e8cf1b..b637aee 100644 --- a/ttcn3-pgw-test/open5gs-smf.yaml +++ b/ttcn3-pgw-test/open5gs-smf.yaml @@ -521,3 +521,17 @@ # handover: # duration: 500 time: + +# +# metrics: +# +# <Metrics Server> +# +# o Metrics Server(http://<any address>:9090) +# metrics: +# addr: 0.0.0.0 +# port: 9090 +# +metrics: + addr: 172.18.18.4 + port: 9090 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28238 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6ec827d66241e20d631f3a851457921718c168a0 Gerrit-Change-Number: 28238 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: GTP: Send more QoS IE fields by default
by pespin 08 Jun '22

08 Jun '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28228 ) Change subject: GTP: Send more QoS IE fields by default ...................................................................... GTP: Send more QoS IE fields by default This way we trigger more code paths in the GGSN_Tests IUT, like parsing the QoS IE. This is interesting because the QoS IE has quite a complex encoding, specially the MBR/GBR part. Those fields in turn are also modified during the answer based on AVPs received during Gx set up of that session. Related: SYS#5984 Change-Id: Id195eedf530e2eff753d057ce2302dfb5275bfcd --- M library/GTP_Templates.ttcn 1 file changed, 20 insertions(+), 20 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 493da8f..c7d7824 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -360,7 +360,7 @@ template QualityOfServiceProfile ts_QosDefault := { type_gtpc := '87'O, - lengthf := 4, + lengthf := 17, allocRetensionPrio := '00'O, qos_ProfileValue := { reliabilityClass := '011'B, @@ -371,25 +371,25 @@ peakThroughput := '1001'B, meanThroughput := '11111'B, spare3 := '000'B, - deliverErroneusSDU := omit, - deliveryOrder := omit, - trafficClass := omit, - maxSDUSize := omit, - maxBitrateUplink := omit, - maxBitrateDownlink := omit, - sduErrorRatio := omit, - residualBER := omit, - trafficHandlingPriority := omit, - transferDelay := omit, - guaranteedBitRateUplink := omit, - guaranteedBitRateDownlink := omit, - sourceStatisticsDescriptor := omit, - signallingIndication := omit, - spare4 := omit, - maxBitrateDownlinkExt := omit, - guaranteedBitRateDownlinkExt := omit, - maxBitrateUplinkExt := omit, - guaranteedBitRateUplinkExt := omit + deliverErroneusSDU := '010'B, /* Erroneus SDU are delivered */ + deliveryOrder := '10'B, /* Without delivery order */ + trafficClass := '100'B, /* Background */ + maxSDUSize := '96'O, /* 1500 octets */ + maxBitrateUplink := 'FE'O, /* 8640, continues in extended octet */ + maxBitrateDownlink := 'FE'O, /* 8640, continues in extended octet */ + sduErrorRatio := '0100'B, /* 1x10^-4 */ + residualBER := '0101'B, /* 1x10^-3 */ + trafficHandlingPriority := '01'B, /* prio 1 */ + transferDelay := '000001'B, /* 10 ms */ + guaranteedBitRateUplink := 'FE'O, /* 8640, continues in extended octet */ + guaranteedBitRateDownlink := 'FE'O, /* 8640, continues in extended octet */ + sourceStatisticsDescriptor := '0000'B, /* unknown */ + signallingIndication := '0'B, /* Not optimized */ + spare4 := '000'B, + maxBitrateDownlinkExt := '5B'O, /* 33 mbps */ + guaranteedBitRateDownlinkExt := '5B'O, /* 33 mbps */ + maxBitrateUplinkExt := '6e'O, /* 52 mbps */ + guaranteedBitRateUplinkExt := '6e'O /* 52 mbps */ } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28228 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: Id195eedf530e2eff753d057ce2302dfb5275bfcd Gerrit-Change-Number: 28228 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2025

2024

2023

2022

gerrit-log