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

[M] Change in osmo-ttcn3-hacks[master]: library/M3UA: support TCP transport, implement desegmentation

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36098?usp=email ) Change subject: library/M3UA: support TCP transport, implement desegmentation ...................................................................... library/M3UA: support TCP transport, implement desegmentation Change-Id: If1dcdb185d08a08dc5a06c37d9d6ffe7d6da9325 Related: libosmo-sccp.git I8c76d271472befacbeb998a93bbdc9e8660d9b5d Related: SYS#5424 --- M library/M3UA_CodecPort.ttcn M library/M3UA_CodecPort_CtrlFunct.ttcn M library/M3UA_CodecPort_CtrlFunctDef.cc 3 files changed, 48 insertions(+), 9 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/M3UA_CodecPort.ttcn b/library/M3UA_CodecPort.ttcn index 94d16d6..e88b6a0 100644 --- a/library/M3UA_CodecPort.ttcn +++ b/library/M3UA_CodecPort.ttcn @@ -15,6 +15,7 @@ import from IPL4asp_PortType all; import from IPL4asp_Types all; + import from M3UA_CodecPort_CtrlFunct all; import from M3UA_Types all; type record M3UA_RecvFrom { @@ -37,7 +38,7 @@ type record M3UA_Send { ConnectionId connId, - integer stream, + integer stream optional, PDU_M3UA msg } @@ -59,14 +60,18 @@ private function M3UA_to_IPL4_Send(in M3UA_Send pin, out ASP_Send pout) { pout.connId := pin.connId; - pout.proto := { - sctp := { - sinfo_stream := pin.stream, - sinfo_ppid := 3, - remSocks := omit, - assocId := omit - } - }; + if (ispresent(pin.stream)) { + pout.proto := { + sctp := { + sinfo_stream := pin.stream, + sinfo_ppid := 3, + remSocks := omit, + assocId := omit + } + }; + } else { + pout.proto := { tcp := { } }; + } pout.msg := enc_PDU_M3UA(pin.msg); } with { extension "prototype(fast)" }; @@ -80,5 +85,12 @@ in(ASP_RecvFrom -> M3UA_RecvFrom: function(IPL4_to_M3UA_RecvFrom); ASP_ConnId_ReadyToRelease -> ASP_ConnId_ReadyToRelease: simple; ASP_Event -> ASP_Event: simple)" + }; + + function f_set_tcp_segmentation(M3UA_CODEC_PT pt, ConnectionId connId) { + /* Set function for dissecting the binary stream into packets */ + var f_IPL4_getMsgLen vl_f := refers(f_IPL4_fixedMsgLen); + /* Offset: 4, size of length: 4, delta: 0, multiplier: 1, big-endian */ + M3UA_CodecPort_CtrlFunct.f_IPL4_setGetMsgLen(pt, connId, vl_f, {4, 4, 0, 1, 0}); } } diff --git a/library/M3UA_CodecPort_CtrlFunct.ttcn b/library/M3UA_CodecPort_CtrlFunct.ttcn index fc38e43..6f06e2c 100644 --- a/library/M3UA_CodecPort_CtrlFunct.ttcn +++ b/library/M3UA_CodecPort_CtrlFunct.ttcn @@ -40,5 +40,12 @@ out UserData userData ) return Result; + external function f_IPL4_setGetMsgLen( + inout M3UA_CODEC_PT portRef, + in ConnectionId id, + inout f_IPL4_getMsgLen f, + in ro_integer msgLenArgs + ) + } diff --git a/library/M3UA_CodecPort_CtrlFunctDef.cc b/library/M3UA_CodecPort_CtrlFunctDef.cc index 62533de..7ddacdc 100644 --- a/library/M3UA_CodecPort_CtrlFunctDef.cc +++ b/library/M3UA_CodecPort_CtrlFunctDef.cc @@ -51,6 +51,15 @@ { return f__IPL4__PROVIDER__getUserData(portRef, connId, userData); } + + void f__IPL4__setGetMsgLen( + M3UA__CodecPort::M3UA__CODEC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, + Socket__API__Definitions::f__getMsgLen& f, + const Socket__API__Definitions::ro__integer& msgLenArgs) + { + return f__IPL4__PROVIDER__setGetMsgLen(portRef, connId, f, msgLenArgs); + } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36098?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If1dcdb185d08a08dc5a06c37d9d6ffe7d6da9325 Gerrit-Change-Number: 36098 Gerrit-PatchSet: 2 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> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library/M3UA: support TCP transport, implement desegmentation

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36098?usp=email ) Change subject: library/M3UA: support TCP transport, implement desegmentation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36098?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If1dcdb185d08a08dc5a06c37d9d6ffe7d6da9325 Gerrit-Change-Number: 36098 Gerrit-PatchSet: 1 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> Gerrit-Comment-Date: Fri, 01 Mar 2024 11:56:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Add tests to validate concurrent connections

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36093?usp=email ) Change subject: epdg: Add tests to validate concurrent connections ...................................................................... epdg: Add tests to validate concurrent connections Change-Id: I842dacda56abe47afb19e951eaae746b5e8d9fe7 --- M epdg/EPDG_Tests.ttcn 1 file changed, 91 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 6358d96..8f97634 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -55,6 +55,14 @@ integer mp_diam_watchdog_initial_wait_sec := 6*3; } +type port Coord_PT message +{ + inout charstring; +} with { extension "internal" }; +private const charstring COORD_CMD_READY := "COORD_CMD_READY"; +private const charstring COORD_CMD_START := "COORD_CMD_START"; +private const charstring COORD_CMD_ATTACHED := "COORD_CMD_ATTACHED"; +private const charstring COORD_CMD_STOP := "COORD_CMD_STOP"; type component MTC_CT { var DIAMETER_Emulation_CT vc_SWx; @@ -72,6 +80,8 @@ var GTPv2_Emulation_CT vc_GTP2; port GTP2EM_PT TEID0; + port Coord_PT COORD; + timer g_Tguard; }; @@ -118,8 +128,9 @@ port DIAMETEREM_PROC_PT SWx_PROC; port DIAMETER_Conn_PT S6b; port DIAMETEREM_PROC_PT S6b_PROC; + port Coord_PT COORD; }; - +type record of EPDG_ConnHdlr EPDG_ConnHdlrList; type record BearerConfig { /* EPS Bearer ID */ @@ -156,12 +167,22 @@ } } -private function f_init_pars(integer imsi_suffix := 1) +private function f_gen_addr_in_pool(integer idx := 0) return charstring +{ + /* Skip first 2 addresses reserved for TUN */ + var integer internal_idx := idx + 2; + var integer suffix := internal_idx rem (256*256); + var integer C := suffix / 256; + var integer D := suffix rem 256; + return "192.168." & int2str(C) & "." & int2str(D); +} + +private function f_init_pars(integer idx := 0) runs on MTC_CT return EPDG_ConnHdlrPars { var EPDG_ConnHdlrPars pars := { - imsi := f_gen_imsi(imsi_suffix), + imsi := f_rnd_imsi('26242'H), apn := "internet", - ue_ip := "192.168.123.50", + ue_ip := f_gen_addr_in_pool(idx), teic_local := '00000000'O, teic_remote := omit, bearer := { @@ -334,6 +355,9 @@ connect(vc_conn:S6b_PROC, vc_conn_s6b:DIAMETER_PROC_CLIENT); vc_conn_s6b.start(f_diam_connhldr_ct_main(pars.imsi)); + /* COORD */ + connect(vc_conn:COORD, self:COORD); + vc_conn.start(f_init_handler(fn, id, pars)); return vc_conn; } @@ -750,10 +774,64 @@ setverdict(pass); } +private function f_TC_concurrent_ues(charstring id) runs on EPDG_ConnHdlr { + COORD.send(COORD_CMD_READY); + COORD.receive(COORD_CMD_START); + f_initial_attach(); + COORD.send(COORD_CMD_ATTACHED); + COORD.receive(COORD_CMD_STOP); + f_GSUP_PurgeMS_success(); +} +private function f_TC_concurrent_ues_MTC(integer num_ues) runs on MTC_CT { + var EPDG_ConnHdlrList vc_conn_list := {}; + var EPDG_ConnHdlr vc_conn; + f_init(t_guard := 100.0); + + for (var integer i := 0; i < num_ues; i := i + 1) { + var EPDG_ConnHdlrPars pars := f_init_pars(i); + vc_conn := f_start_handler(refers(f_TC_concurrent_ues), pars); + vc_conn_list := vc_conn_list & { vc_conn }; + } + + for (var integer i := 0; i < num_ues; i := i + 1) { + COORD.receive(COORD_CMD_READY) from vc_conn_list[i]; + } + + for (var integer i := 0; i < num_ues; i := i + 1) { + COORD.send(COORD_CMD_START) to vc_conn_list[i]; + f_sleep(0.1); + } + + for (var integer i := 0; i < num_ues; i := i + 1) { + COORD.receive(COORD_CMD_ATTACHED) from vc_conn_list[i]; + } + + log("All attached!"); + f_sleep(1.0); + + for (var integer i := 0; i < num_ues; i := i + 1) { + COORD.send(COORD_CMD_STOP) to vc_conn_list[i]; + } + + for (var integer i := 0; i < num_ues; i := i + 1) { + vc_conn_list[i].done; + } + + setverdict(pass); +} +testcase TC_concurrent_ues2() runs on MTC_CT { + f_TC_concurrent_ues_MTC(2) +} +testcase TC_concurrent_ues100() runs on MTC_CT { + f_TC_concurrent_ues_MTC(100) +} + control { execute ( TC_authinfo_normal() ); execute ( TC_ho_lte_to_wifi() ); execute ( TC_ho_wifi_to_lte() ); + execute ( TC_concurrent_ues2() ); + execute ( TC_concurrent_ues100() ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36093?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I842dacda56abe47afb19e951eaae746b5e8d9fe7 Gerrit-Change-Number: 36093 Gerrit-PatchSet: 6 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Introduce test TC_s2b_CreateSession_rejected

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36108?usp=email ) Change subject: epdg: Introduce test TC_s2b_CreateSession_rejected ...................................................................... epdg: Introduce test TC_s2b_CreateSession_rejected Related: OS#6371 Change-Id: Ide1df9e359b12094f82e54a7824c83f515aedcc3 --- M epdg/EPDG_Tests.ttcn M library/GTPv2_Templates.ttcn M mme/MME_Tests.ttcn 3 files changed, 91 insertions(+), 15 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 8f97634..6263828 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -499,24 +499,29 @@ return ts_GTP2C_APCO(apco_req.instance, proto_list_resp); } +private function f_EPDG_ConnHdlr_parse_CreateSessionReq(PDU_GTPCv2 rx_msg) runs on EPDG_ConnHdlr { + var BearerContextIEs rx_bctx_ies; + + /* Parse TEIC and Bearer EBI and TEID and store it in g_pars */ + g_pars.teic_remote := rx_msg.gtpcv2_pdu.createSessionRequest.fullyQualifiedTEID[0].tEID_GRE_Key; + rx_bctx_ies := rx_msg.gtpcv2_pdu.createSessionRequest.bearerContextGrouped[0].bearerContextIEs; + g_pars.bearer.ebi := rx_bctx_ies.ePS_Bearer_ID.ePS_Bearer_ID_Value; + g_pars.bearer.teid_remote := rx_bctx_ies.fullyQualifiedTEID[0].tEID_GRE_Key; + + /* allocate + register TEID-C on local side */ + g_pars.teic_local := f_gtp2_allocate_teid(); + g_pars.bearer.teid_local := g_pars.teic_local; +} + /* ePDG Creates session at the PGW. PGW sends Diameter s6b AAR + AAA. */ private altstep as_GTP2C_CreateSession_success() runs on EPDG_ConnHdlr { var PDU_GTPCv2 rx_msg; - var BearerContextIEs rx_bctx_ies; var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie; var template (value) PDN_AddressAllocation paa; var template (value) BearerContextIEs bctx_ies; [] GTP2.receive(tr_GTP2C_CreateSessionReq(g_pars.imsi, apco := f_exp_tr_GTP2C_APCO_in_CreateSessionReq())) -> value rx_msg { - /* Parse TEIC and Bearer EBI and TEID and store it in g_pars */ - g_pars.teic_remote := rx_msg.gtpcv2_pdu.createSessionRequest.fullyQualifiedTEID[0].tEID_GRE_Key; - rx_bctx_ies := rx_msg.gtpcv2_pdu.createSessionRequest.bearerContextGrouped[0].bearerContextIEs; - g_pars.bearer.ebi := rx_bctx_ies.ePS_Bearer_ID.ePS_Bearer_ID_Value; - g_pars.bearer.teid_remote := rx_bctx_ies.fullyQualifiedTEID[0].tEID_GRE_Key; - - /* allocate + register TEID-C on local side */ - g_pars.teic_local := f_gtp2_allocate_teid(); - g_pars.bearer.teid_local := g_pars.teic_local; + f_EPDG_ConnHdlr_parse_CreateSessionReq(rx_msg); /* Upon rx of CreateSession, emulate PGW asking the AAA server. */ f_S6b_AA_success(); @@ -531,6 +536,7 @@ qos := ts_GTP2C_BearerQos('09'O, 0,0,0,0), charging_id := ts_GTP2C_ChargingID(g_pars.teic_local)); GTP2.send(ts_GTP2C_CreateSessionResp(g_pars.teic_remote, rx_msg.sequenceNumber, + Request_accepted, { fteid_c_ie }, paa, { ts_GTP2C_BcGrouped(bctx_ies) }, f_GTPv2C_gen_APCO_response(rx_msg.gtpcv2_pdu.createSessionRequest.aPCO) )); @@ -541,6 +547,34 @@ } } +/* ePDG Creates session at the PGW. PGW sends Diameter s6b AAR + AAA. */ +private altstep as_GTP2C_CreateSession_error(GTP2C_Cause resp_cause, boolean do_s6b_aar := false) runs on EPDG_ConnHdlr { + var PDU_GTPCv2 rx_msg; + var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie; + var template (value) PDN_AddressAllocation paa; + var template (value) BearerContextIEs bctx_ies; + + [] GTP2.receive(tr_GTP2C_CreateSessionReq(g_pars.imsi, apco := f_exp_tr_GTP2C_APCO_in_CreateSessionReq())) -> value rx_msg { + f_EPDG_ConnHdlr_parse_CreateSessionReq(rx_msg); + + /* Upon rx of CreateSession, emulate PGW asking the AAA server. */ + if (do_s6b_aar) { + f_S6b_AA_success(); + } + + fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S2b_PGW_GTPC, g_pars.teic_local, 1, + f_inet_addr(mp_s2b_local_ip), omit); + fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S2bU_PGW_GTPU, g_pars.bearer.teid_local, 4, + f_inet_addr(mp_s2b_local_ip), omit); + GTP2.send(ts_GTP2C_CreateSessionResp(g_pars.teic_remote, rx_msg.sequenceNumber, + resp_cause)); + setverdict(pass); + } + [] GTP2.receive(PDU_GTPCv2:?) -> value rx_msg { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected GTP2C msg rx: ", rx_msg)); + } +} + /* ePDG Deletes session at the PGW. PGW sends Diameter s6b AAR + AAA. */ private altstep as_GTP2C_DeleteSession_success() runs on EPDG_ConnHdlr { var PDU_GTPCv2 rx_msg; @@ -693,6 +727,21 @@ setverdict(pass); } +/* GSUP TunnelEPDG Tunnel Req + Resp, triggers S2b CreateSession Req + Response (rejected). */ +private function f_GSUP_EPDGTunnel_error() runs on EPDG_ConnHdlr { + var GSUP_PDU rx_gsup; + var template (value) PCO_DATA pco := ts_PCO({ ts_PCO_P_DNS_IPv4, ts_PCO_P_PCSCF_IPv4 }); + GSUP.send(ts_GSUP_EPDGTunnel_REQ(g_pars.imsi, pco)); + as_GTP2C_CreateSession_error(APN_access_denied__no_subscription); + alt { + [] GSUP.receive(tr_GSUP_EPDGTunnel_ERR(g_pars.imsi)); + [] GSUP.receive(GSUP_PDU:?) -> value rx_gsup { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected GSUP msg rx: ", rx_gsup)); + } + } + setverdict(pass); +} + /* GSUP Purge MS Req + Resp, triggers S2b DeleteSession Req + Response. */ private function f_GSUP_PurgeMS_success() runs on EPDG_ConnHdlr { var GSUP_PDU rx_gsup; @@ -774,6 +823,20 @@ setverdict(pass); } +private function f_TC_s2b_CreateSession_rejected(charstring id) runs on EPDG_ConnHdlr { + f_GSUP_AI_success(); + f_GSUP_LU_success(); + f_GSUP_EPDGTunnel_error(); +} +testcase TC_s2b_CreateSession_rejected() runs on MTC_CT { + var EPDG_ConnHdlrPars pars := f_init_pars(); + var EPDG_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_s2b_CreateSession_rejected), pars); + vc_conn.done; + setverdict(pass); +} + private function f_TC_concurrent_ues(charstring id) runs on EPDG_ConnHdlr { COORD.send(COORD_CMD_READY); COORD.receive(COORD_CMD_START); @@ -830,6 +893,7 @@ execute ( TC_authinfo_normal() ); execute ( TC_ho_lte_to_wifi() ); execute ( TC_ho_wifi_to_lte() ); + execute ( TC_s2b_CreateSession_rejected() ); execute ( TC_concurrent_ues2() ); execute ( TC_concurrent_ues100() ); } diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn index a86145d..752e85c 100644 --- a/library/GTPv2_Templates.ttcn +++ b/library/GTPv2_Templates.ttcn @@ -145,7 +145,6 @@ } } - /* 8.4-1 */ type enumerated GTP2C_Cause { Local_Detach (2), @@ -167,7 +166,8 @@ New_PDN_type_due_to_network_preference (18), New_PDN_type_due_to_single_address_bearer_only (19), /* ... */ - Context_Not_Found (64) + Context_Not_Found (64), + APN_access_denied__no_subscription (93) } with { variant "FIELDLENGTH(8)" encode "RAW" }; /* 8.4 */ @@ -1021,13 +1021,14 @@ template (value) PDU_GTPCv2 ts_GTP2C_CreateSessionResp(template (value) OCT4 d_teid, template (value) OCT3 seq, - template (value) FullyQualifiedTEID_List fteids, - template (value) PDN_AddressAllocation addr, + template (value) GTP2C_Cause cause := Request_accepted, + template (omit) FullyQualifiedTEID_List fteids := omit, + template (omit) PDN_AddressAllocation addr := omit, template (omit) BearerContextGrouped_List bearerContextGrouped := omit, template (omit) APCO apco := omit) := ts_PDU_GTP2C(d_teid, seq, '21'O, { createSessionResponse := { - cause := ts_GTP2C_Cause(Request_accepted, '0'B), + cause := ts_GTP2C_Cause(cause, '0'B), changeReportingAction := omit, cSG_InformationReportingAction := omit, heNBInformationReporting := omit, diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index aa23a84..1cacbd9 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -831,6 +831,7 @@ GTP2.send(ts_GTP2C_CreateSessionResp(g_pars.ue_pars.s11_teic_remote, rx_msg.sequenceNumber, + Request_accepted, { s11_fteid_c_ie, s5c_fteid_c_ie }, paa, { ts_GTP2C_BcGrouped(bctx_ies) } )); setverdict(pass); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36108?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ide1df9e359b12094f82e54a7824c83f515aedcc3 Gerrit-Change-Number: 36108 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Split GTP_CodecPort/GTP_Templates into C and U variants

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36126?usp=email ) Change subject: Split GTP_CodecPort/GTP_Templates into C and U variants ...................................................................... Split GTP_CodecPort/GTP_Templates into C and U variants The Types are already split in the dependent modules in GTPC_Types and GTPU_Types. There's no point in keeping them together in the same file since those 2 protocols are mostly independent. Furthermore, testsuites using GTPv2C + GTPv1U don't need GTPv1C. Change-Id: Ic15c9a2e92828cbafb4dda7355ee534107051e2d --- M gbproxy/gen_links.sh M gbproxy/regen_makefile.sh M ggsn_tests/GGSN_Tests.default M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/gen_links.sh M ggsn_tests/regen_makefile.sh M hnodeb/HNBGW_ConnectionHandler.ttcn M hnodeb/HNB_Tests.ttcn M hnodeb/gen_links.sh M hnodeb/regen_makefile.sh M library/GTP_Emulation.ttcn R library/GTPv1C_CodecPort.ttcn R library/GTPv1C_CodecPort_CtrlFunct.ttcn R library/GTPv1C_CodecPort_CtrlFunctDef.cc R library/GTPv1C_Templates.ttcn A library/GTPv1U_CodecPort.ttcn A library/GTPv1U_CodecPort_CtrlFunct.ttcn A library/GTPv1U_CodecPort_CtrlFunctDef.cc A library/GTPv1U_Templates.ttcn M library/GTPv2_CodecPort.ttcn M library/GTPv2_Emulation.ttcn M mme/MME_Tests.ttcn M mme/gen_links.sh M mme/regen_makefile.sh M pgw/gen_links.sh M pgw/regen_makefile.sh M sgsn/SGSN_Tests.ttcn M sgsn/gen_links.sh M sgsn/regen_makefile.sh 29 files changed, 375 insertions(+), 294 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/gbproxy/gen_links.sh b/gbproxy/gen_links.sh index 17328f7..c7756ec 100755 --- a/gbproxy/gen_links.sh +++ b/gbproxy/gen_links.sh @@ -91,8 +91,8 @@ FILES+="LLC_Templates.ttcn L3_Templates.ttcn L3_Common.ttcn " # IPA_Emulation + dependencies FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc Native_Functions.ttcn Native_FunctionDefs.cc " -FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn -GTP_Templates.ttcn IPCP_Types.ttcn " +FILES+="GTPv1C_CodecPort.ttcn GTPv1C_CodecPort_CtrlFunct.ttcn GTPv1C_CodecPort_CtrlFunctDef.cc GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn +GTPv1C_Templates.ttcn IPCP_Types.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/gbproxy/regen_makefile.sh b/gbproxy/regen_makefile.sh index e4982ae..cd17d5c 100755 --- a/gbproxy/regen_makefile.sh +++ b/gbproxy/regen_makefile.sh @@ -10,7 +10,8 @@ BSSGP_EncDec.cc GTPC_EncDec.cc GTPU_EncDec.cc - GTP_CodecPort_CtrlFunctDef.cc + GTPv1C_CodecPort_CtrlFunctDef.cc + GTPv1U_CodecPort_CtrlFunctDef.cc IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc diff --git a/ggsn_tests/GGSN_Tests.default b/ggsn_tests/GGSN_Tests.default index 33b96cb..9832ba1 100644 --- a/ggsn_tests/GGSN_Tests.default +++ b/ggsn_tests/GGSN_Tests.default @@ -21,6 +21,6 @@ GGSN_Tests.m_ggsn_ip6_dns1 := "2001:4860:4860::8888" GGSN_Tests.m_ggsn_ip6_dns2 := "2001:4860:4860::8844" Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoGGSN"; -GTP_CodecPort.mp_pl_SystemUnderTest := GGSN; +GTPv1C_CodecPort.mp_pl_SystemUnderTest := GGSN; [EXECUTE] diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 6a61177..68157f3 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -18,11 +18,14 @@ import from Misc_Helpers all; import from IPL4asp_PortType all; import from IPL4asp_Types all; - import from GTP_CodecPort all; - import from GTP_CodecPort_CtrlFunct all; - import from GTP_Templates all; + import from GTPv1C_CodecPort all; + import from GTPv1U_CodecPort all; + import from GTPv1C_CodecPort_CtrlFunct all; + import from GTPv1U_CodecPort_CtrlFunct all; import from GTPC_Types all; import from GTPU_Types all; + import from GTPv1C_Templates all; + import from GTPv1U_Templates all; import from IPCP_Types all; import from PAP_Types all; import from IP_Types all; @@ -121,8 +124,8 @@ var OCT4 g_sgsn_ip_c; var OCT4 g_sgsn_ip_u; /* FIXME: parse remName from config file */ - var GtpPeer g_peer_c := { connId := 0, remName := m_ggsn_ip_gtpc, remPort := GTP1C_PORT }; - var GtpPeer g_peer_u := { connId := 0, remName := m_ggsn_ip_gtpu, remPort := GTP1U_PORT }; + var Gtp1cPeer g_peer_c := { connId := 0, remName := m_ggsn_ip_gtpc, remPort := GTP1C_PORT }; + var Gtp1uPeer g_peer_u := { connId := 0, remName := m_ggsn_ip_gtpu, remPort := GTP1U_PORT }; timer T_default := 3.0; /* next to-be-sent GTP-C sequence number */ @@ -279,12 +282,12 @@ var Result res; map(self:GTPC, system:GTPC); - res := GTP_CodecPort_CtrlFunct.f_IPL4_listen(GTPC, m_bind_ip_gtpc, GTP1C_PORT, {udp:={}}); + res := GTPv1C_CodecPort_CtrlFunct.f_IPL4_listen(GTPC, m_bind_ip_gtpc, GTP1C_PORT, {udp:={}}); log("GTP1C ConnectionID: ", res.connId); g_peer_c.connId := res.connId; map(self:GTPU, system:GTPU); - res := GTP_CodecPort_CtrlFunct.f_GTPU_listen(GTPU, m_bind_ip_gtpu, GTP1U_PORT, {udp:={}}); + res := GTPv1U_CodecPort_CtrlFunct.f_GTPU_listen(GTPU, m_bind_ip_gtpu, GTP1U_PORT, {udp:={}}); g_peer_u.connId:= res.connId; g_restart_ctr := f_rnd_octstring(1); diff --git a/ggsn_tests/gen_links.sh b/ggsn_tests/gen_links.sh index 4981e64..ebeb94b 100755 --- a/ggsn_tests/gen_links.sh +++ b/ggsn_tests/gen_links.sh @@ -59,7 +59,8 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn PAP_Types.ttcn " -FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Templates.ttcn Osmocom_Gb_Types.ttcn " +FILES+="GTPv1C_CodecPort.ttcn GTPv1C_CodecPort_CtrlFunct.ttcn GTPv1C_CodecPort_CtrlFunctDef.cc GTPv1C_Templates.ttcn Osmocom_Gb_Types.ttcn " +FILES+="GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTPv1U_Templates.ttcn " FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn " FILES+="DIAMETER_Templates.ttcn DIAMETER_ts29_212_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn DIAMETER_ts32_299_Templates.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " diff --git a/ggsn_tests/regen_makefile.sh b/ggsn_tests/regen_makefile.sh index bd1b958..ce8e15a 100755 --- a/ggsn_tests/regen_makefile.sh +++ b/ggsn_tests/regen_makefile.sh @@ -9,7 +9,8 @@ DIAMETER_EncDec.cc GTPC_EncDec.cc GTPU_EncDec.cc - GTP_CodecPort_CtrlFunctDef.cc + GTPv1C_CodecPort_CtrlFunctDef.cc + GTPv1U_CodecPort_CtrlFunctDef.cc ICMP_EncDec.cc ICMPv6_EncDec.cc IPL4asp_PT.cc diff --git a/hnodeb/HNBGW_ConnectionHandler.ttcn b/hnodeb/HNBGW_ConnectionHandler.ttcn index 8e95616..e256963 100644 --- a/hnodeb/HNBGW_ConnectionHandler.ttcn +++ b/hnodeb/HNBGW_ConnectionHandler.ttcn @@ -35,8 +35,8 @@ import from HNBLLIF_Templates all; import from GTP_Emulation all; -import from GTP_Templates all; -import from GTP_CodecPort all; +import from GTPv1U_Templates all; +import from GTPv1U_CodecPort all; import from GTPU_Types all; /* this component represents a single Iuh connection at the HNBGW. */ @@ -192,14 +192,14 @@ sac := 4 } -template (value) GtpPeer ts_GtpPeerU(charstring ip) := { +template (value) Gtp1uPeer ts_GtpPeerU(charstring ip) := { connId := 1, remName := ip, remPort := GTP1U_PORT } function f_gtpu_send(uint32_t tei, octetstring payload) runs on HNBGW_ConnHdlr { - var GtpPeer peer := valueof(ts_GtpPeerU(g_pars.hnodeb_addr)); + var Gtp1uPeer peer := valueof(ts_GtpPeerU(g_pars.hnodeb_addr)); GTP.send(ts_GTP1U_GPDU(peer, 0 /*seq*/, int2oct(tei, 4), payload)); } diff --git a/hnodeb/HNB_Tests.ttcn b/hnodeb/HNB_Tests.ttcn index df7a04c..1178695 100644 --- a/hnodeb/HNB_Tests.ttcn +++ b/hnodeb/HNB_Tests.ttcn @@ -53,7 +53,7 @@ import from HNBLLIF_Templates all; import from GTPU_Types all; -import from GTP_Templates all; +import from GTPv1U_Templates all; import from GTP_Emulation all; import from IuUP_Types all; diff --git a/hnodeb/gen_links.sh b/hnodeb/gen_links.sh index 84495e9..e4f453e 100755 --- a/hnodeb/gen_links.sh +++ b/hnodeb/gen_links.sh @@ -63,7 +63,9 @@ FILES+="Iuh_Types.ttcn Iuh_CodecPort.ttcn Iuh_CodecPort_CtrlFunctDef.cc Iuh_CodecPort_CtrlFunct.ttcn Iuh_Emulation.ttcn DNS_Helpers.ttcn " FILES+="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn " FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcn " -FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn GTP_Templates.ttcn IPCP_Types.ttcn GSM_Types.ttcn " +FILES+="GTPv1C_CodecPort.ttcn GTPv1C_CodecPort_CtrlFunct.ttcn GTPv1C_CodecPort_CtrlFunctDef.cc GTPv1C_Templates.ttcn " +FILES+="GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTPv1U_Templates.ttcn " +FILES+="GTP_Emulation.ttcn IPCP_Types.ttcn GSM_Types.ttcn " gen_links $DIR $FILES ignore_pp_results diff --git a/hnodeb/regen_makefile.sh b/hnodeb/regen_makefile.sh index 10f5c21..cf5fed3 100755 --- a/hnodeb/regen_makefile.sh +++ b/hnodeb/regen_makefile.sh @@ -27,7 +27,8 @@ UD_PT.cc GTPC_EncDec.cc GTPU_EncDec.cc - GTP_CodecPort_CtrlFunctDef.cc + GTPv1C_CodecPort_CtrlFunctDef.cc + GTPv1U_CodecPort_CtrlFunctDef.cc " export CPPFLAGS_TTCN3=" diff --git a/library/GTP_Emulation.ttcn b/library/GTP_Emulation.ttcn index 689fb0d..f5c0eef 100644 --- a/library/GTP_Emulation.ttcn +++ b/library/GTP_Emulation.ttcn @@ -16,8 +16,10 @@ import from Osmocom_Types all; import from GTPC_Types all; import from GTPU_Types all; -import from GTP_CodecPort all; -import from GTP_CodecPort_CtrlFunct all; +import from GTPv1C_CodecPort all; +import from GTPv1U_CodecPort all; +import from GTPv1C_CodecPort_CtrlFunct all; +import from GTPv1U_CodecPort_CtrlFunct all; /*********************************************************************** * Main Emulation Component @@ -172,13 +174,13 @@ var Result res; map(self:GTPC, system:GTPC); - res := GTP_CodecPort_CtrlFunct.f_IPL4_listen(GTPC, cfg.gtpc_bind_ip, + res := GTPv1C_CodecPort_CtrlFunct.f_IPL4_listen(GTPC, cfg.gtpc_bind_ip, cfg.gtpc_bind_port, {udp:={}}); g_gtpc_id := res.connId; if (isvalue(cfg.gtpu_bind_ip) and isvalue(cfg.gtpu_bind_port)) { map(self:GTPU, system:GTPU); - res := GTP_CodecPort_CtrlFunct.f_GTPU_listen(GTPU, cfg.gtpu_bind_ip, + res := GTPv1U_CodecPort_CtrlFunct.f_GTPU_listen(GTPU, cfg.gtpu_bind_ip, cfg.gtpu_bind_port, {udp:={}}); g_gtpu_id := res.connId; } diff --git a/library/GTP_CodecPort.ttcn b/library/GTPv1C_CodecPort.ttcn similarity index 61% rename from library/GTP_CodecPort.ttcn rename to library/GTPv1C_CodecPort.ttcn index b516611..956a674 100644 --- a/library/GTP_CodecPort.ttcn +++ b/library/GTPv1C_CodecPort.ttcn @@ -1,4 +1,4 @@ -/* dual-faced port sitting on top of IPL4_asp UDP to encode/decode GTP +/* dual-faced port sitting on top of IPL4_asp UDP to encode/decode GTPv1C * (C) 2017 Harald Welte <laforge(a)gnumonks.org> * All rights reserved. * @@ -9,11 +9,10 @@ */ -module GTP_CodecPort { +module GTPv1C_CodecPort { import from IPL4asp_PortType all; import from IPL4asp_Types all; import from GTPC_Types all; - import from GTPU_Types all; import from Misc_Helpers all; modulepar { @@ -21,7 +20,7 @@ } /* identifies a remote peer (sender or receiver) */ - type record GtpPeer { + type record Gtp1cPeer { ConnectionId connId, HostName remName, PortNumber remPort @@ -29,16 +28,10 @@ /* Decoded GTP1C (Control Plane), used in send and receive direction */ type record Gtp1cUnitdata { - GtpPeer peer, + Gtp1cPeer peer, PDU_GTPC gtpc } - /* Decoded GTP1U (User Plane), used in send and receive direction */ - type record Gtp1uUnitdata { - GtpPeer peer, - PDU_GTPU gtpu - } - /* Translation port on top of IPL4asp; ASP_Event passed through transparently */ type port GTPC_PT message { out Gtp1cUnitdata; @@ -69,33 +62,4 @@ log2str("Rx GTPv1-C with field length ", out_ud.gtpc.lengthf, " + 8 != exp ", lengthof(in_ud.msg))); } } with { extension "prototype(fast)" }; - - - /* dual-faced port on top of IPL4asp; ASP_Event passed through transparently */ - type port GTPU_PT message { - out Gtp1uUnitdata; - in Gtp1uUnitdata, - ASP_ConnId_ReadyToRelease, - ASP_Event; - } with { extension "user IPL4asp_PT - out(Gtp1uUnitdata -> ASP_SendTo: function(f_enc_Gtp1uUD)) - in(ASP_RecvFrom -> Gtp1uUnitdata: function(f_dec_Gtp1uUD); - ASP_ConnId_ReadyToRelease -> ASP_ConnId_ReadyToRelease: simple; - ASP_Event -> ASP_Event: simple)" } - - function f_enc_Gtp1uUD(in Gtp1uUnitdata in_ud, out ASP_SendTo out_ud) { - out_ud.connId := in_ud.peer.connId; - out_ud.remName := in_ud.peer.remName; - out_ud.remPort := in_ud.peer.remPort; - out_ud.proto := { udp := {} }; - out_ud.msg := enc_PDU_GTPU(in_ud.gtpu); - } with { extension "prototype(fast)" }; - - function f_dec_Gtp1uUD(in ASP_RecvFrom in_ud, out Gtp1uUnitdata out_ud) { - out_ud.peer.connId := in_ud.connId; - out_ud.peer.remName := in_ud.remName; - out_ud.peer.remPort := in_ud.remPort; - out_ud.gtpu := dec_PDU_GTPU(in_ud.msg); - } with { extension "prototype(fast)" }; - } diff --git a/library/GTP_CodecPort_CtrlFunct.ttcn b/library/GTPv1C_CodecPort_CtrlFunct.ttcn similarity index 78% rename from library/GTP_CodecPort_CtrlFunct.ttcn rename to library/GTPv1C_CodecPort_CtrlFunct.ttcn index 4f61af7..e0a5ee7 100644 --- a/library/GTP_CodecPort_CtrlFunct.ttcn +++ b/library/GTPv1C_CodecPort_CtrlFunct.ttcn @@ -1,6 +1,6 @@ -module GTP_CodecPort_CtrlFunct { +module GTPv1C_CodecPort_CtrlFunct { - import from GTP_CodecPort all; + import from GTPv1C_CodecPort all; import from IPL4asp_Types all; external function f_IPL4_listen( @@ -39,12 +39,4 @@ in ConnectionId id, out UserData userData ) return Result; - - external function f_GTPU_listen( - inout GTPU_PT portRef, - in HostName locName, - in PortNumber locPort, - in ProtoTuple proto, - in OptionList options := {} - ) return Result; } diff --git a/library/GTP_CodecPort_CtrlFunctDef.cc b/library/GTPv1C_CodecPort_CtrlFunctDef.cc similarity index 69% rename from library/GTP_CodecPort_CtrlFunctDef.cc rename to library/GTPv1C_CodecPort_CtrlFunctDef.cc index c0b9391..2227fe1 100644 --- a/library/GTP_CodecPort_CtrlFunctDef.cc +++ b/library/GTPv1C_CodecPort_CtrlFunctDef.cc @@ -1,11 +1,11 @@ #include "IPL4asp_PortType.hh" #include "IPL4asp_PT.hh" -#include "GTP_CodecPort.hh" +#include "GTPv1C_CodecPort.hh" -namespace GTP__CodecPort__CtrlFunct { +namespace GTPv1C__CodecPort__CtrlFunct { IPL4asp__Types::Result f__IPL4__listen( - GTP__CodecPort::GTPC__PT& portRef, + GTPv1C__CodecPort::GTPC__PT& portRef, const IPL4asp__Types::HostName& locName, const IPL4asp__Types::PortNumber& locPort, const IPL4asp__Types::ProtoTuple& proto, @@ -13,9 +13,9 @@ { return f__IPL4__PROVIDER__listen(portRef, locName, locPort, proto, options); } - + IPL4asp__Types::Result f__IPL4__connect( - GTP__CodecPort::GTPC__PT& portRef, + GTPv1C__CodecPort::GTPC__PT& portRef, const IPL4asp__Types::HostName& remName, const IPL4asp__Types::PortNumber& remPort, const IPL4asp__Types::HostName& locName, @@ -29,38 +29,27 @@ } IPL4asp__Types::Result f__IPL4__close( - GTP__CodecPort::GTPC__PT& portRef, - const IPL4asp__Types::ConnectionId& connId, + GTPv1C__CodecPort::GTPC__PT& portRef, + const IPL4asp__Types::ConnectionId& connId, const IPL4asp__Types::ProtoTuple& proto) { return f__IPL4__PROVIDER__close(portRef, connId, proto); } IPL4asp__Types::Result f__IPL4__setUserData( - GTP__CodecPort::GTPC__PT& portRef, + GTPv1C__CodecPort::GTPC__PT& portRef, const IPL4asp__Types::ConnectionId& connId, const IPL4asp__Types::UserData& userData) { return f__IPL4__PROVIDER__setUserData(portRef, connId, userData); } - + IPL4asp__Types::Result f__IPL4__getUserData( - GTP__CodecPort::GTPC__PT& portRef, + GTPv1C__CodecPort::GTPC__PT& portRef, const IPL4asp__Types::ConnectionId& connId, IPL4asp__Types::UserData& userData) { return f__IPL4__PROVIDER__getUserData(portRef, connId, userData); } - - IPL4asp__Types::Result f__GTPU__listen( - GTP__CodecPort::GTPU__PT& portRef, - const IPL4asp__Types::HostName& locName, - const IPL4asp__Types::PortNumber& locPort, - const IPL4asp__Types::ProtoTuple& proto, - const IPL4asp__Types::OptionList& options) - { - return f__IPL4__PROVIDER__listen(portRef, locName, locPort, proto, options); - } - } diff --git a/library/GTP_Templates.ttcn b/library/GTPv1C_Templates.ttcn similarity index 90% rename from library/GTP_Templates.ttcn rename to library/GTPv1C_Templates.ttcn index 30346d4..4a0c8b2 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTPv1C_Templates.ttcn @@ -1,4 +1,4 @@ -/* GTP Templates in TTCN-3 +/* GTPv1-C Templates in TTCN-3 * (C) 2018 Harald Welte <laforge(a)gnumonks.org> * contributions by sysmocom - s.f.m.c. GmbH * All rights reserved. @@ -9,13 +9,12 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -module GTP_Templates { +module GTPv1C_Templates { import from General_Types all; import from Osmocom_Types all; import from GTPC_Types all; - import from GTPU_Types all; - import from GTP_CodecPort all; + import from GTPv1C_CodecPort all; import from IPCP_Types all; import from GSM_Types all; // RoutingAreaIdentification, CellIdentity @@ -416,7 +415,7 @@ /* template matching reception of GTP-C unit-data */ - template (present) Gtp1cUnitdata tr_GTPC_MsgType(template (present) GtpPeer peer, + template (present) Gtp1cUnitdata tr_GTPC_MsgType(template (present) Gtp1cPeer peer, template (present) OCT1 msg_type, template (present) OCT4 teid, template (present) GTPC_PDUs pdus := ?) := { @@ -425,7 +424,7 @@ } /* template matching reception of GTP-C echo-request */ - template (present) Gtp1cUnitdata tr_GTPC_PING(template (present) GtpPeer peer) := tr_GTPC_MsgType(peer, echoRequest, '00000000'O); + template (present) Gtp1cUnitdata tr_GTPC_PING(template (present) Gtp1cPeer peer) := tr_GTPC_MsgType(peer, echoRequest, '00000000'O); template (present) GTPC_PDUs tr_EchoRespPDU(template (present) OCT1 restart_counter) := { echoResponse := { @@ -435,7 +434,7 @@ } /* template matching reception of GTP-C echo-response */ - template (present) Gtp1cUnitdata tr_GTPC_PONG(template (present) GtpPeer peer) := tr_GTPC_MsgType(peer, echoResponse, '00000000'O, tr_EchoRespPDU(?)); + template (present) Gtp1cUnitdata tr_GTPC_PONG(template (present) Gtp1cPeer peer) := tr_GTPC_MsgType(peer, echoResponse, '00000000'O, tr_EchoRespPDU(?)); template (value) GTPC_PDUs ts_EchoRespPDU(OCT1 restart_counter) := { echoResponse := { @@ -445,7 +444,7 @@ } /* master template for senidng a GTP-C echo response */ - template (value) Gtp1cUnitdata ts_GTPC_PONG(GtpPeer peer, uint16_t seq, OCT1 rest_ctr) := { + template (value) Gtp1cUnitdata ts_GTPC_PONG(Gtp1cPeer peer, uint16_t seq, OCT1 rest_ctr) := { peer := peer, gtpc := ts_GTP1C_PDU(echoResponse, '00000000'O, valueof(ts_EchoRespPDU(rest_ctr)), seq) } @@ -457,7 +456,7 @@ } /* master template for sending a GTP-C echo request */ - template (value) Gtp1cUnitdata ts_GTPC_PING(GtpPeer peer, uint16_t seq) := { + template (value) Gtp1cUnitdata ts_GTPC_PING(Gtp1cPeer peer, uint16_t seq) := { peer := peer, gtpc := ts_GTP1C_PDU(echoRequest, '00000000'O, valueof(ts_EchoReqPDU), seq) } @@ -787,7 +786,7 @@ } } - template (value) Gtp1cUnitdata ts_GTPC_CreatePDP(GtpPeer peer, uint16_t seq, hexstring imsi, + template (value) Gtp1cUnitdata ts_GTPC_CreatePDP(Gtp1cPeer peer, uint16_t seq, hexstring imsi, OCT1 restart_ctr, OCT4 teid_data, OCT4 teid_ctrl, BIT4 nsapi, EndUserAddress eua, octetstring apn, octetstring sgsn_ip_sign, @@ -859,7 +858,7 @@ } } - template (value) Gtp1cUnitdata ts_GTPC_UpdatePDP(GtpPeer peer, OCT4 teid, uint16_t seq, hexstring imsi, + template (value) Gtp1cUnitdata ts_GTPC_UpdatePDP(Gtp1cPeer peer, OCT4 teid, uint16_t seq, hexstring imsi, OCT1 restart_ctr, OCT4 teid_data, OCT4 teid_ctrl, BIT4 nsapi, octetstring sgsn_ip_sign, octetstring sgsn_ip_data, @@ -928,7 +927,7 @@ } } - template (value) Gtp1cUnitdata ts_GTPC_CreatePdpResp(GtpPeer peer, uint16_t seq, OCT4 teid, + template (value) Gtp1cUnitdata ts_GTPC_CreatePdpResp(Gtp1cPeer peer, uint16_t seq, OCT4 teid, OCT1 cause, OCT4 teid_ctrl, OCT4 teid_data, BIT4 nsapi, octetstring ggsn_ip_sign, @@ -1132,7 +1131,7 @@ } } - template (value) Gtp1cUnitdata ts_GTPC_DeletePDP(GtpPeer peer, uint16_t seq, OCT4 teid, + template (value) Gtp1cUnitdata ts_GTPC_DeletePDP(Gtp1cPeer peer, uint16_t seq, OCT4 teid, BIT4 nsapi, template (omit) BIT1 teardown_ind) := { peer := peer, gtpc := ts_GTP1C_PDU(deletePDPContextRequest, teid, @@ -1151,7 +1150,7 @@ } } - template (value) Gtp1cUnitdata ts_GTPC_DeletePdpResp(GtpPeer peer, uint16_t seq, OCT4 teid, + template (value) Gtp1cUnitdata ts_GTPC_DeletePdpResp(Gtp1cPeer peer, uint16_t seq, OCT4 teid, OCT1 cause, template (omit) ProtConfigOptions pco := omit) := { peer := peer, @@ -1188,7 +1187,7 @@ private_extension_gtpc := * } } - template (present) Gtp1cUnitdata tr_GTPC_SGSNContextReq(template (present) GtpPeer peer, + template (present) Gtp1cUnitdata tr_GTPC_SGSNContextReq(template (present) Gtp1cPeer peer, template (present) GTPC_PDUs SGSNContextReqPDU) := { peer := peer, gtpc := tr_GTP1C_PDU(sgsnContextRequest, '00000000'O, SGSNContextReqPDU) @@ -1221,7 +1220,7 @@ private_extension_gtpc := omit } } - template (value) Gtp1cUnitdata ts_GTPC_SGSNContextReq(GtpPeer peer, uint16_t seq, + template (value) Gtp1cUnitdata ts_GTPC_SGSNContextReq(Gtp1cPeer peer, uint16_t seq, template (value) GTPC_PDUs SGSNContextReqPDU) := { peer := peer, gtpc := ts_GTP1C_PDU(sgsnContextRequest, '00000000'O, valueof(SGSNContextReqPDU), seq) @@ -1262,7 +1261,7 @@ private_extension_gtpc := * } } - template (present) Gtp1cUnitdata tr_GTPC_SGSNContextResp(template (present) GtpPeer peer := ?, + template (present) Gtp1cUnitdata tr_GTPC_SGSNContextResp(template (present) Gtp1cPeer peer := ?, template (present) OCT4 teid := ?, template (present) GTPC_PDUs SGSNContextRespPDU := ?) := tr_GTPC_MsgType(peer, sgsnContextResponse, teid, SGSNContextRespPDU); @@ -1305,7 +1304,7 @@ private_extension_gtpc := omit } } - template (value) Gtp1cUnitdata ts_GTPC_SGSNContextResp(GtpPeer peer, OCT4 teid, uint16_t seq, + template (value) Gtp1cUnitdata ts_GTPC_SGSNContextResp(Gtp1cPeer peer, OCT4 teid, uint16_t seq, template (value) GTPC_PDUs SGSNContextRespPDU) := { peer := peer, gtpc := ts_GTP1C_PDU(sgsnContextResponse, teid, valueof(SGSNContextRespPDU), seq) @@ -1323,7 +1322,7 @@ private_extension_gtpc := * } } - template (present) Gtp1cUnitdata tr_GTPC_SGSNContextAck(template (present) GtpPeer peer := ?, + template (present) Gtp1cUnitdata tr_GTPC_SGSNContextAck(template (present) Gtp1cPeer peer := ?, template (present) OCT4 teid := ?, template (present) GTPC_PDUs SGSNContextAckPDU := ?) := tr_GTPC_MsgType(peer, sgsnContextAcknowledge, teid, SGSNContextAckPDU); @@ -1337,7 +1336,7 @@ private_extension_gtpc := omit } } - template (value) Gtp1cUnitdata ts_GTPC_SGSNContextAck(GtpPeer peer, OCT4 teid, uint16_t seq, + template (value) Gtp1cUnitdata ts_GTPC_SGSNContextAck(Gtp1cPeer peer, OCT4 teid, uint16_t seq, template (value) GTPC_PDUs SGSNContextAckPDU := ts_SGSNContextAckPDU(GTP_CAUSE_REQUEST_ACCEPTED)) := { peer := peer, gtpc := ts_GTP1C_PDU(sgsnContextAcknowledge, teid, valueof(SGSNContextAckPDU), seq) @@ -1730,13 +1729,13 @@ } } template (present) Gtp1cUnitdata - tr_GTPC_RANInfoRelay(template (present) GtpPeer peer, + tr_GTPC_RANInfoRelay(template (present) Gtp1cPeer peer, template (present) RANTransparentContainer transparentContainer) := { peer := peer, gtpc := tr_GTP1C_PDU(rANInformationRelay, '00000000'O, tr_RANInfoRelay(transparentContainer)) } template (value) Gtp1cUnitdata - ts_GTPC_RANInfoRelay(template (value) GtpPeer peer, + ts_GTPC_RANInfoRelay(template (value) Gtp1cPeer peer, template (value) RANTransparentContainer transparentContainer, template (omit) RIM_RoutingAddress ra := omit, template (omit) RIM_RoutingAddress_Discriminator ra_discr := omit) := { @@ -1765,157 +1764,6 @@ sON_TransferApplicationIdentity := son_app_id } - /* GTP-U */ - - template (present) PDU_GTPU tr_GTP1U_PDU(template (present) OCT1 msg_type, - template (present) OCT4 teid, - template (present) GTPU_IEs ies := ?) := { - pn_bit := ?, - s_bit := ?, - e_bit := ?, - spare := ?, - /* Protocol Type flag (PT) shall be set to '1' in GTP */ - pt := '1'B, - /* Version shall be set to decimal 1 ('001'). */ - version := '001'B, - messageType := msg_type, - lengthf := ?, - teid := teid, - opt_part := *, - gtpu_IEs := ies - } - - function f_GTPU_s_bit(template (omit) uint16_t seq) return BIT1 { - if (istemplatekind(seq, "omit")) { - return '0'B; - } - return '1'B; - } - - function f_GTPU_opt_part(template (omit) uint16_t seq) return template (omit) GTPU_Header_optional_part { - if (istemplatekind(seq, "omit")) { - return omit; - } - var GTPU_Header_optional_part ret := { - sequenceNumber := int2oct(valueof(seq), 2), - npduNumber := '00'O, - nextExtHeader := '00'O, - gTPU_extensionHeader_List := omit - }; - return ret; - } - - /* generalized GTP-U send template */ - template (value) PDU_GTPU ts_GTP1U_PDU(OCT1 msg_type, template (omit) uint16_t seq, OCT4 teid, GTPU_IEs ies) := { - /* N-PDU Number flag (PN): the GTP-U header contains a meaningful N-PDU Number field if the PN - * flag is set to 1. */ - pn_bit := '0'B, /* we assume the encoder overwrites this if an optional part is given */ - /* If the Sequence Number flag (S) is set to '1' the sequence number field is present and - * meaningful otherwise it is set to '0'. For GTP-U messages Echo Request, Echo Response, - * Error Indication and Supported Extension Headers Notification, the S flag shall be set to '1'. - * - * Note that the caller must ensure that these conditions hold. - * The caller can either pass a sequence number (we set s_bit to '1'B) when appropriate, - * or may omit the sequence number (we set s_bit to '0'B). */ - s_bit := f_GTPU_s_bit(seq), - /* Extension header presence */ - e_bit := '0'B, - spare := '0'B, - /* Protocol Type flag (PT) shall be set to '1' in GTP */ - pt := '1'B, - /* Version shall be set to decimal 1 ('001'). */ - version := '001'B, - messageType := msg_type, - lengthf := 0, /* we assume encoder overwrites this */ - teid := teid, - opt_part := f_GTPU_opt_part(seq), - gtpu_IEs := ies - } - - template (present) Gtp1uUnitdata tr_GTPU_MsgType(template (present) GtpPeer peer, - template (present) OCT1 msg_type, - template (present) OCT4 teid) := { - peer := peer, - gtpu := tr_GTP1U_PDU(msg_type, teid) - } - - - /* template matching reception of GTP-U echo-request/response */ - template (present) Gtp1uUnitdata tr_GTPU_PING(template (present) GtpPeer peer) := tr_GTPU_MsgType(peer, echoRequest, '00000000'O); - template (present) Gtp1uUnitdata tr_GTPU_PONG(template (present) GtpPeer peer) := tr_GTPU_MsgType(peer, echoResponse, '00000000'O); - - /* template matching reception of GTP-U GPDU */ - template GTPU_IEs t_GPDU(template (present) octetstring data) := { - g_PDU_IEs := { - data := data - } - } - template (present) Gtp1uUnitdata tr_GTPU_GPDU(template (present) GtpPeer peer, - template (present) OCT4 teid, - template (present) octetstring data := ?) := { - peer := peer, - gtpu := tr_GTP1U_PDU('FF'O, teid, t_GPDU(data)) - } - - template (present) GTPU_IEs ts_UEchoReqPDU := { - echoRequest_IEs := { - private_extension_gtpu := omit - } - } - - /* master template for sending a GTP-C echo request */ - template (value) Gtp1uUnitdata ts_GTPU_PING(GtpPeer peer, uint16_t seq) := { - peer := peer, - gtpu := ts_GTP1U_PDU(echoRequest, seq, '00000000'O, valueof(ts_UEchoReqPDU)) - } - - template GTPU_IEs ts_UEchoRespPDU(OCT1 restart_counter) := { - echoResponse_IEs := { - recovery_gtpu := { - type_gtpu := '00'O, /* we assume encoder fixes? */ - restartCounter := restart_counter - }, - private_extension_gtpu := omit - } - } - - /* master template for sending a GTP-U echo response */ - template (present) Gtp1uUnitdata ts_GTPU_PONG(GtpPeer peer, uint16_t seq, OCT1 rest_ctr) := { - peer := peer, - gtpu := ts_GTP1U_PDU(echoResponse, seq, '00000000'O, valueof(ts_UEchoRespPDU(rest_ctr))) - } - - template (value) GSNAddress_gtpu ts_UGsnAddr(octetstring ip_addr) := { - type_gtpu := '85'O, - lengthf := lengthof(ip_addr), - gSNAddressValue := ip_addr - } - - template (value) TeidDataI_gtpu ts_UteidDataI(OCT4 teid) := { - type_gtpu := '10'O, - teidDataI := teid - } - - template (value) GTPU_IEs ts_UErrorIndication(OCT4 teid, octetstring gsn_addr) := { - errorIndication_IEs := { - teidDataI_gtpu := ts_UteidDataI(teid), - gSNAddress_gtpu := ts_UGsnAddr(gsn_addr), - private_extension_gtpu := omit - } - } - - /* master template for sending a GTP-U Error indication */ - template (value) Gtp1uUnitdata ts_GTPU_ErrorIndication(GtpPeer peer, uint16_t seq, OCT4 teid, octetstring gsn_addr) := { - peer := peer, - gtpu := ts_GTP1U_PDU('1A'O, seq, '00000000'O, valueof(ts_UErrorIndication(teid, gsn_addr))) - } - - /* master template for sending a GTP-U user plane data */ - template (value) Gtp1uUnitdata ts_GTP1U_GPDU(GtpPeer peer, template (omit) uint16_t seq, OCT4 teid, octetstring data) := { - peer := peer, - gtpu := ts_GTP1U_PDU('FF'O, seq, teid, { g_PDU_IEs := { data := data }}) - } - /* 3GPP TS 29.060, section 7.7.57 */ template (value) RIM_RoutingAddress ts_RIM_RoutingAddress(octetstring addr_value) := { type_gtpc := '9F'O, diff --git a/library/GTPv1U_CodecPort.ttcn b/library/GTPv1U_CodecPort.ttcn new file mode 100644 index 0000000..59c5ef3 --- /dev/null +++ b/library/GTPv1U_CodecPort.ttcn @@ -0,0 +1,58 @@ +/* dual-faced port sitting on top of IPL4_asp UDP to encode/decode GTPv1-U + * (C) 2017 Harald Welte <laforge(a)gnumonks.org> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + + +module GTPv1U_CodecPort { + import from IPL4asp_PortType all; + import from IPL4asp_Types all; + import from GTPU_Types all; + import from Misc_Helpers all; + + /* identifies a remote peer (sender or receiver) */ + type record Gtp1uPeer { + ConnectionId connId, + HostName remName, + PortNumber remPort + } + + /* Decoded GTP1U (User Plane), used in send and receive direction */ + type record Gtp1uUnitdata { + Gtp1uPeer peer, + PDU_GTPU gtpu + } + + /* dual-faced port on top of IPL4asp; ASP_Event passed through transparently */ + type port GTPU_PT message { + out Gtp1uUnitdata; + in Gtp1uUnitdata, + ASP_ConnId_ReadyToRelease, + ASP_Event; + } with { extension "user IPL4asp_PT + out(Gtp1uUnitdata -> ASP_SendTo: function(f_enc_Gtp1uUD)) + in(ASP_RecvFrom -> Gtp1uUnitdata: function(f_dec_Gtp1uUD); + ASP_ConnId_ReadyToRelease -> ASP_ConnId_ReadyToRelease: simple; + ASP_Event -> ASP_Event: simple)" } + + function f_enc_Gtp1uUD(in Gtp1uUnitdata in_ud, out ASP_SendTo out_ud) { + out_ud.connId := in_ud.peer.connId; + out_ud.remName := in_ud.peer.remName; + out_ud.remPort := in_ud.peer.remPort; + out_ud.proto := { udp := {} }; + out_ud.msg := enc_PDU_GTPU(in_ud.gtpu); + } with { extension "prototype(fast)" }; + + function f_dec_Gtp1uUD(in ASP_RecvFrom in_ud, out Gtp1uUnitdata out_ud) { + out_ud.peer.connId := in_ud.connId; + out_ud.peer.remName := in_ud.remName; + out_ud.peer.remPort := in_ud.remPort; + out_ud.gtpu := dec_PDU_GTPU(in_ud.msg); + } with { extension "prototype(fast)" }; + +} diff --git a/library/GTPv1U_CodecPort_CtrlFunct.ttcn b/library/GTPv1U_CodecPort_CtrlFunct.ttcn new file mode 100644 index 0000000..3a86fc9 --- /dev/null +++ b/library/GTPv1U_CodecPort_CtrlFunct.ttcn @@ -0,0 +1,13 @@ +module GTPv1U_CodecPort_CtrlFunct { + + import from GTPv1U_CodecPort all; + import from IPL4asp_Types all; + + external function f_GTPU_listen( + inout GTPU_PT portRef, + in HostName locName, + in PortNumber locPort, + in ProtoTuple proto, + in OptionList options := {} + ) return Result; +} diff --git a/library/GTPv1U_CodecPort_CtrlFunctDef.cc b/library/GTPv1U_CodecPort_CtrlFunctDef.cc new file mode 100644 index 0000000..49f74ce --- /dev/null +++ b/library/GTPv1U_CodecPort_CtrlFunctDef.cc @@ -0,0 +1,17 @@ +#include "IPL4asp_PortType.hh" +#include "IPL4asp_PT.hh" +#include "GTPv1U_CodecPort.hh" + +namespace GTPv1U__CodecPort__CtrlFunct { + + IPL4asp__Types::Result f__GTPU__listen( + GTPv1U__CodecPort::GTPU__PT& portRef, + const IPL4asp__Types::HostName& locName, + const IPL4asp__Types::PortNumber& locPort, + const IPL4asp__Types::ProtoTuple& proto, + const IPL4asp__Types::OptionList& options) + { + return f__IPL4__PROVIDER__listen(portRef, locName, locPort, proto, options); + } + +} diff --git a/library/GTPv1U_Templates.ttcn b/library/GTPv1U_Templates.ttcn new file mode 100644 index 0000000..a31e1d2 --- /dev/null +++ b/library/GTPv1U_Templates.ttcn @@ -0,0 +1,167 @@ +/* GTPv1-U Templates in TTCN-3 + * (C) 2018 Harald Welte <laforge(a)gnumonks.org> + * contributions by sysmocom - s.f.m.c. GmbH + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +module GTPv1U_Templates { + + import from General_Types all; + import from Osmocom_Types all; + import from GTPU_Types all; + import from GTPv1U_CodecPort all; + + template (present) PDU_GTPU tr_GTP1U_PDU(template (present) OCT1 msg_type, + template (present) OCT4 teid, + template (present) GTPU_IEs ies := ?) := { + pn_bit := ?, + s_bit := ?, + e_bit := ?, + spare := ?, + /* Protocol Type flag (PT) shall be set to '1' in GTP */ + pt := '1'B, + /* Version shall be set to decimal 1 ('001'). */ + version := '001'B, + messageType := msg_type, + lengthf := ?, + teid := teid, + opt_part := *, + gtpu_IEs := ies + } + + function f_GTPU_s_bit(template (omit) uint16_t seq) return BIT1 { + if (istemplatekind(seq, "omit")) { + return '0'B; + } + return '1'B; + } + + function f_GTPU_opt_part(template (omit) uint16_t seq) return template (omit) GTPU_Header_optional_part { + if (istemplatekind(seq, "omit")) { + return omit; + } + var GTPU_Header_optional_part ret := { + sequenceNumber := int2oct(valueof(seq), 2), + npduNumber := '00'O, + nextExtHeader := '00'O, + gTPU_extensionHeader_List := omit + }; + return ret; + } + + /* generalized GTP-U send template */ + template (value) PDU_GTPU ts_GTP1U_PDU(OCT1 msg_type, template (omit) uint16_t seq, OCT4 teid, GTPU_IEs ies) := { + /* N-PDU Number flag (PN): the GTP-U header contains a meaningful N-PDU Number field if the PN + * flag is set to 1. */ + pn_bit := '0'B, /* we assume the encoder overwrites this if an optional part is given */ + /* If the Sequence Number flag (S) is set to '1' the sequence number field is present and + * meaningful otherwise it is set to '0'. For GTP-U messages Echo Request, Echo Response, + * Error Indication and Supported Extension Headers Notification, the S flag shall be set to '1'. + * + * Note that the caller must ensure that these conditions hold. + * The caller can either pass a sequence number (we set s_bit to '1'B) when appropriate, + * or may omit the sequence number (we set s_bit to '0'B). */ + s_bit := f_GTPU_s_bit(seq), + /* Extension header presence */ + e_bit := '0'B, + spare := '0'B, + /* Protocol Type flag (PT) shall be set to '1' in GTP */ + pt := '1'B, + /* Version shall be set to decimal 1 ('001'). */ + version := '001'B, + messageType := msg_type, + lengthf := 0, /* we assume encoder overwrites this */ + teid := teid, + opt_part := f_GTPU_opt_part(seq), + gtpu_IEs := ies + } + + template (present) Gtp1uUnitdata tr_GTPU_MsgType(template (present) Gtp1uPeer peer, + template (present) OCT1 msg_type, + template (present) OCT4 teid) := { + peer := peer, + gtpu := tr_GTP1U_PDU(msg_type, teid) + } + + + /* template matching reception of GTP-U echo-request/response */ + template (present) Gtp1uUnitdata tr_GTPU_PING(template (present) Gtp1uPeer peer) := tr_GTPU_MsgType(peer, '01'O, '00000000'O); + template (present) Gtp1uUnitdata tr_GTPU_PONG(template (present) Gtp1uPeer peer) := tr_GTPU_MsgType(peer, '02'O, '00000000'O); + + /* template matching reception of GTP-U GPDU */ + template GTPU_IEs t_GPDU(template (present) octetstring data) := { + g_PDU_IEs := { + data := data + } + } + template (present) Gtp1uUnitdata tr_GTPU_GPDU(template (present) Gtp1uPeer peer, + template (present) OCT4 teid, + template (present) octetstring data := ?) := { + peer := peer, + gtpu := tr_GTP1U_PDU('FF'O, teid, t_GPDU(data)) + } + + template (present) GTPU_IEs ts_UEchoReqPDU := { + echoRequest_IEs := { + private_extension_gtpu := omit + } + } + + /* master template for sending a GTP-C echo request */ + template (value) Gtp1uUnitdata ts_GTPU_PING(Gtp1uPeer peer, uint16_t seq) := { + peer := peer, + gtpu := ts_GTP1U_PDU('01'O, seq, '00000000'O, valueof(ts_UEchoReqPDU)) + } + + template GTPU_IEs ts_UEchoRespPDU(OCT1 restart_counter) := { + echoResponse_IEs := { + recovery_gtpu := { + type_gtpu := '00'O, /* we assume encoder fixes? */ + restartCounter := restart_counter + }, + private_extension_gtpu := omit + } + } + + /* master template for sending a GTP-U echo response */ + template (present) Gtp1uUnitdata ts_GTPU_PONG(Gtp1uPeer peer, uint16_t seq, OCT1 rest_ctr) := { + peer := peer, + gtpu := ts_GTP1U_PDU('02'O, seq, '00000000'O, valueof(ts_UEchoRespPDU(rest_ctr))) + } + + template (value) GSNAddress_gtpu ts_UGsnAddr(octetstring ip_addr) := { + type_gtpu := '85'O, + lengthf := lengthof(ip_addr), + gSNAddressValue := ip_addr + } + + template (value) TeidDataI_gtpu ts_UteidDataI(OCT4 teid) := { + type_gtpu := '10'O, + teidDataI := teid + } + + template (value) GTPU_IEs ts_UErrorIndication(OCT4 teid, octetstring gsn_addr) := { + errorIndication_IEs := { + teidDataI_gtpu := ts_UteidDataI(teid), + gSNAddress_gtpu := ts_UGsnAddr(gsn_addr), + private_extension_gtpu := omit + } + } + + /* master template for sending a GTP-U Error indication */ + template (value) Gtp1uUnitdata ts_GTPU_ErrorIndication(Gtp1uPeer peer, uint16_t seq, OCT4 teid, octetstring gsn_addr) := { + peer := peer, + gtpu := ts_GTP1U_PDU('1A'O, seq, '00000000'O, valueof(ts_UErrorIndication(teid, gsn_addr))) + } + + /* master template for sending a GTP-U user plane data */ + template (value) Gtp1uUnitdata ts_GTP1U_GPDU(Gtp1uPeer peer, template (omit) uint16_t seq, OCT4 teid, octetstring data) := { + peer := peer, + gtpu := ts_GTP1U_PDU('FF'O, seq, teid, { g_PDU_IEs := { data := data }}) + } +} diff --git a/library/GTPv2_CodecPort.ttcn b/library/GTPv2_CodecPort.ttcn index e9cf57e..0c4e9d3 100644 --- a/library/GTPv2_CodecPort.ttcn +++ b/library/GTPv2_CodecPort.ttcn @@ -15,7 +15,7 @@ import from GTPv2_Types all; /* identifies a remote peer (sender or receiver) */ - type record GtpPeer { + type record Gtp2cPeer { ConnectionId connId, HostName remName, IPL4asp_Types.PortNumber remPort @@ -23,7 +23,7 @@ /* Decoded GTP2C (Control Plane), used in send and receive direction */ type record Gtp2cUnitdata { - GtpPeer peer, + Gtp2cPeer peer, PDU_GTPCv2 gtpc } diff --git a/library/GTPv2_Emulation.ttcn b/library/GTPv2_Emulation.ttcn index 240cce4..054bd4b 100644 --- a/library/GTPv2_Emulation.ttcn +++ b/library/GTPv2_Emulation.ttcn @@ -62,7 +62,7 @@ var Gtp2EmulationCfg g_gtp2_cfg; /* State */ - var GtpPeer g_peer; + var Gtp2cPeer g_peer; var integer g_gtp2c_id; var OCT1 g_restart_ctr; var uint16_t g_c_seq_nr; diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index 1cacbd9..d412273 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -35,9 +35,9 @@ import from SGsAP_Emulation all; import from GTP_Emulation all; -import from GTP_Templates all; -import from GTP_CodecPort all; import from GTPC_Types all; +import from GTPv1C_CodecPort all; +import from GTPv1C_Templates all; import from LTE_CryptoFunctions all; @@ -157,7 +157,7 @@ var ConnHdlrPars g_pars; timer g_Tguard := 30.0; - var GtpPeer g_gn_iface_peer := { connId := 1, remName := mp_gn_remote_ip, remPort := mp_gn_remote_port }; + var Gtp1cPeer g_gn_iface_peer := { connId := 1, remName := mp_gn_remote_ip, remPort := mp_gn_remote_port }; } type record ConnHdlrPars { @@ -960,7 +960,7 @@ } -private altstep as_gtp_sgsn_context_2g_to_4g(OCT4 new_sgsn_teid := 'ABABABAB'O, GTP_Templates.GTP_RATType rat_type := GTP_RAT_TYPE_EUTRAN) runs on ConnHdlr { +private altstep as_gtp_sgsn_context_2g_to_4g(OCT4 new_sgsn_teid := 'ABABABAB'O, GTPv1C_Templates.GTP_RATType rat_type := GTP_RAT_TYPE_EUTRAN) runs on ConnHdlr { var Gtp1cUnitdata gtpc_pdu; [] GTP.receive(tr_GTPC_SGSNContextReq(g_gn_iface_peer, tr_SGSNContextReqPDU(rat_type := int2oct(enum2int(rat_type), 1)))) -> value gtpc_pdu { diff --git a/mme/gen_links.sh b/mme/gen_links.sh index 32c782f..be08870 100755 --- a/mme/gen_links.sh +++ b/mme/gen_links.sh @@ -77,7 +77,7 @@ FILES+="NAS_Templates.ttcn GTPv2_PrivateExtensions.ttcn GTPv2_Templates.ttcn " FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn " FILES+="DIAMETER_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn " -FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn GTP_Templates.ttcn Osmocom_Gb_Types.ttcn " +FILES+="GTPv1C_CodecPort.ttcn GTPv1C_CodecPort_CtrlFunct.ttcn GTPv1C_CodecPort_CtrlFunctDef.cc GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn GTPv1C_Templates.ttcn Osmocom_Gb_Types.ttcn " FILES+="GTPv2_PrivateExtensions.ttcn GTPv2_Templates.ttcn " FILES+="GTPv2_CodecPort.ttcn GTPv2_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunct.ttcn GTPv2_Emulation.ttcn " FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index e153d35..6e86346 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -11,7 +11,8 @@ DIAMETER_EncDec.cc GTPC_EncDec.cc GTPU_EncDec.cc - GTP_CodecPort_CtrlFunctDef.cc + GTPv1C_CodecPort_CtrlFunctDef.cc + GTPv1U_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc diff --git a/pgw/gen_links.sh b/pgw/gen_links.sh index 40671f9..19b776b 100755 --- a/pgw/gen_links.sh +++ b/pgw/gen_links.sh @@ -59,7 +59,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn PAP_Types.ttcn " -FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Templates.ttcn Osmocom_Gb_Types.ttcn " +FILES+="GTPv1C_CodecPort.ttcn GTPv1C_CodecPort_CtrlFunct.ttcn GTPv1C_CodecPort_CtrlFunctDef.cc GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTPv1C_Templates.ttcn Osmocom_Gb_Types.ttcn " FILES+="GTPv2_PrivateExtensions.ttcn GTPv2_Templates.ttcn " FILES+="GTPv2_CodecPort.ttcn GTPv2_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunct.ttcn GTPv2_Emulation.ttcn " FILES+="DNS_Helpers.ttcn " diff --git a/pgw/regen_makefile.sh b/pgw/regen_makefile.sh index 5edcaef..2f58493 100755 --- a/pgw/regen_makefile.sh +++ b/pgw/regen_makefile.sh @@ -9,7 +9,8 @@ DIAMETER_EncDec.cc GTPC_EncDec.cc GTPU_EncDec.cc - GTP_CodecPort_CtrlFunctDef.cc + GTPv1C_CodecPort_CtrlFunctDef.cc + GTPv1U_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunctDef.cc ICMP_EncDec.cc ICMPv6_EncDec.cc diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 0824d6e..64ba981 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -42,11 +42,13 @@ import from RANAP_PDU_Descriptions all; import from RANAP_IEs all; -import from GTP_Emulation all; -import from GTP_Templates all; -import from GTP_CodecPort all; +import from GTPv1C_CodecPort all; +import from GTPv1U_CodecPort all; import from GTPC_Types all; import from GTPU_Types all; +import from GTPv1C_Templates all; +import from GTPv1U_Templates all; +import from GTP_Emulation all; import from LLC_Types all; import from LLC_Templates all; @@ -1550,12 +1552,13 @@ runs on BSSGP_ConnHdlr { var Gtp1cUnitdata g_ud; var integer seq_nr := 23; - var GtpPeer peer := valueof(ts_GtpPeerC(apars.sgsn_ip_c)); BSSGP[ran_index].clear; if (error_ind) { + var Gtp1uPeer peer := valueof(ts_GtpPeerU(apars.sgsn_ip_c)); GTP.send(ts_GTPU_ErrorIndication(peer, 0 /* seq */, apars.ggsn_tei_u, apars.ggsn_ip_u)); } else { + var Gtp1cPeer peer := valueof(ts_GtpPeerC(apars.sgsn_ip_c)); GTP.send(ts_GTPC_DeletePDP(peer, seq_nr, apars.sgsn_tei_c, apars.nsapi, '1'B)); } @@ -1650,20 +1653,20 @@ sgsn_ip_u := omit } -template (value) GtpPeer ts_GtpPeerU(octetstring ip) := { +template (value) Gtp1uPeer ts_GtpPeerU(octetstring ip) := { connId := 1, remName := f_inet_ntoa(ip), remPort := GTP1U_PORT } -template (value) GtpPeer ts_GtpPeerC(octetstring ip) := { +template (value) Gtp1cPeer ts_GtpPeerC(octetstring ip) := { connId := 1, remName := f_inet_ntoa(ip), remPort := GTP1C_PORT } private function f_gtpu_send(inout PdpActPars apars, octetstring payload) runs on BSSGP_ConnHdlr { - var GtpPeer peer := valueof(ts_GtpPeerU(apars.sgsn_ip_u)); + var Gtp1uPeer peer := valueof(ts_GtpPeerU(apars.sgsn_ip_u)); GTP.send(ts_GTP1U_GPDU(peer, 0 /*seq*/, apars.sgsn_tei_u, payload)); } @@ -1734,7 +1737,7 @@ private function f_gtpu_xceive_mo(inout PdpActPars apars, octetstring payload, integer ran_index := 0, uint9_t n_u := 0) runs on BSSGP_ConnHdlr { /* Send PDU via SNDCP/LLC/BSSGP/NS via simulated MS/PCU to the SGSN */ - var GtpPeer peer := valueof(ts_GtpPeerU(apars.sgsn_ip_u)); + var Gtp1uPeer peer := valueof(ts_GtpPeerU(apars.sgsn_ip_u)); var PDU_SN sndcp := valueof(ts_SN_UD(apars.nsapi, payload)); BSSGP[ran_index].send(ts_LLC_UI(enc_PDU_SN(sndcp), apars.sapi, '0'B, n_u)); /* Expect PDU via GTP from SGSN on simulated GGSN */ @@ -2049,7 +2052,6 @@ var Gtp1cUnitdata g_ud; var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); var integer seq_nr := 23; - var GtpPeer peer; /* first perform regular attach */ f_TC_attach(id); @@ -2089,7 +2091,7 @@ private function f_TC_attach_pdp_act_deact_mt_t3395_expire(charstring id) runs on BSSGP_ConnHdlr { var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip)); var integer seq_nr := 23; - var GtpPeer peer; + var Gtp1cPeer peer; var integer i; /* first perform regular attach */ @@ -2193,7 +2195,7 @@ /* Now perform an MT DeleteCtxReq and emulate GGSN didn't receive response and sends a duplicated DeleteCtxReq */ BSSGP[0].clear; - var GtpPeer peer := valueof(ts_GtpPeerC(apars.sgsn_ip_c)); + var Gtp1cPeer peer := valueof(ts_GtpPeerC(apars.sgsn_ip_c)); g_delete_req := ts_GTPC_DeletePDP(peer, seq_nr, apars.sgsn_tei_c, apars.nsapi, '1'B); GTP.send(g_delete_req); alt { @@ -3469,7 +3471,7 @@ /* connect RIM related port */ connect(vc_GTP:CLIENT_DEFAULT, self:GTPC); - var GtpPeer peer := { + var Gtp1cPeer peer := { connId := 1, remName := mp_sgsn_gtp_ip, remPort := GTP1C_PORT @@ -3651,7 +3653,7 @@ var octetstring payload := f_rnd_octstring(200); var PDU_SN sndcp := valueof(ts_SN_UD(apars.nsapi, payload)); BSSGP[1].send(ts_LLC_UI(enc_PDU_SN(sndcp), apars.sapi, '0'B, 1)); - var GtpPeer peer := valueof(ts_GtpPeerU(apars.sgsn_ip_u)); + var Gtp1uPeer peer := valueof(ts_GtpPeerU(apars.sgsn_ip_u)); timer T := 2.0; T.start; alt { diff --git a/sgsn/gen_links.sh b/sgsn/gen_links.sh index 3aa2d38..8df1a87 100755 --- a/sgsn/gen_links.sh +++ b/sgsn/gen_links.sh @@ -93,7 +93,9 @@ # IPA_Emulation + dependencies FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="PCO_Types.ttcn GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " -FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Emulation.ttcn GTP_Templates.ttcn IPCP_Types.ttcn RAW_NS.ttcnpp " +FILES+="GTPv1C_CodecPort.ttcn GTPv1C_CodecPort_CtrlFunct.ttcn GTPv1C_CodecPort_CtrlFunctDef.cc GTPv1C_Templates.ttcn Osmocom_Gb_Types.ttcn " +FILES+="GTPv1U_CodecPort.ttcn GTPv1U_CodecPort_CtrlFunct.ttcn GTPv1U_CodecPort_CtrlFunctDef.cc GTPv1U_Templates.ttcn " +FILES+="GTP_Emulation.ttcn IPCP_Types.ttcn RAW_NS.ttcnpp " gen_links $DIR $FILES ignore_pp_results diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh index 4ac7d40..5c9c5ea 100755 --- a/sgsn/regen_makefile.sh +++ b/sgsn/regen_makefile.sh @@ -9,7 +9,8 @@ BSSGP_EncDec.cc GTPC_EncDec.cc GTPU_EncDec.cc - GTP_CodecPort_CtrlFunctDef.cc + GTPv1C_CodecPort_CtrlFunctDef.cc + GTPv1U_CodecPort_CtrlFunctDef.cc IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36126?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic15c9a2e92828cbafb4dda7355ee534107051e2d Gerrit-Change-Number: 36126 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Split GTP_CodecPort/GTP_Templates into C and U variants

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36126?usp=email ) Change subject: Split GTP_CodecPort/GTP_Templates into C and U variants ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36126?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic15c9a2e92828cbafb4dda7355ee534107051e2d Gerrit-Change-Number: 36126 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Mar 2024 10:28:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Introduce test TC_s2b_CreateSession_rejected

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36108?usp=email ) Change subject: epdg: Introduce test TC_s2b_CreateSession_rejected ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36108?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ide1df9e359b12094f82e54a7824c83f515aedcc3 Gerrit-Change-Number: 36108 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Mar 2024 10:28:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Add tests to validate concurrent connections

by pespin

Attention is currently required from: fixeria, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36093?usp=email ) Change subject: epdg: Add tests to validate concurrent connections ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36093?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I842dacda56abe47afb19e951eaae746b5e8d9fe7 Gerrit-Change-Number: 36093 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 01 Mar 2024 10:28:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Split GTP_CodecPort/GTP_Templates into C and U variants

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36126?usp=email ) Change subject: Split GTP_CodecPort/GTP_Templates into C and U variants ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36126?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic15c9a2e92828cbafb4dda7355ee534107051e2d Gerrit-Change-Number: 36126 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 01 Mar 2024 10:27:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in libosmo-netif[master]: stream_{cli,srv}: Free received messages when not forwarded

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36125?usp=email ) Change subject: stream_{cli,srv}: Free received messages when not forwarded ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36125?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ic043f11cdba0df9e0b78cac8db7206800098e0ba Gerrit-Change-Number: 36125 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 01 Mar 2024 10:26:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024