- gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: ggsn: Introduce test TC_pdp4(6)_act_deact_mtu
by pespin 18 Oct '24

18 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38469?usp=email ) Change subject: ggsn: Introduce test TC_pdp4(6)_act_deact_mtu ...................................................................... ggsn: Introduce test TC_pdp4(6)_act_deact_mtu This tests so far only test retrieval of MTU over PCO, which is only used for IPv4 APNs. When IPv6 is in used, it is expected to be retrieved over IPv6 SLAAC RA. Such tests will be done in a follow-up patch once the related procedure is implemented in osmo-ggsn. Related: OS#6298 Related: SYS#7122 Change-Id: I2ceb76a3a07b44f69937c9f5a040482320bca377 --- M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/gen_links.sh M library/GTPv1C_Templates.ttcn M library/PCO_Types.ttcn 4 files changed, 120 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/38469/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 8d091f9..54ecd73 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -26,6 +26,7 @@ import from GTPU_Types all; import from GTPv1C_Templates all; import from GTPv1U_Templates all; + import from PCO_Types all; import from IPCP_Types all; import from IPCP_Templates all; import from PAP_Types all; @@ -96,6 +97,12 @@ integer mp_t3_response := 5; /* local T3-RESPONSE timeout, seconds */ integer mp_n3_requests := 3; /* local N3-REQUESTS counter */ + /* MTU to configure and expect when testing related tests. + * This needs to match the value in configured file for open5gs + * since there's no support to configure it dynamically over VTY. + */ + uint16_t m_configured_mtu := 1400; + GGSN_Impl m_ggsn_impl := GGSN_IMPL_OSMOCOM; GGSN_Conf m_ggsn_conf := GGSN_CONF_ALL; } @@ -226,6 +233,31 @@ f_vty_transceive(GGSNVTY, "end"); } + /* -1 = osmo-ggsn default mtu */ + private function f_vty_set_mtu(integer mtu) runs on GT_CT { + var charstring mtu_cmd; + if (mtu >= 0) { + mtu_cmd := "mtu " & int2str(mtu); + } else { + mtu_cmd := "mtu default"; + } + + f_vty_enter_config(GGSNVTY); + f_vty_transceive(GGSNVTY, "ggsn ggsn0"); + + f_vty_transceive(GGSNVTY, "apn internet"); + f_vty_transceive(GGSNVTY, mtu_cmd); + f_vty_transceive(GGSNVTY, "exit"); + + f_vty_transceive(GGSNVTY, "apn inet6"); + f_vty_transceive(GGSNVTY, mtu_cmd); + f_vty_transceive(GGSNVTY, "exit"); + + f_vty_transceive(GGSNVTY, "apn inet46"); + f_vty_transceive(GGSNVTY, mtu_cmd); + f_vty_transceive(GGSNVTY, "end"); + } + private function DiameterForwardUnitdataCallback(PDU_DIAMETER msg) runs on DIAMETER_Emulation_CT return template PDU_DIAMETER { DIAMETER_UNIT.send(msg); @@ -1331,6 +1363,29 @@ f_shutdown_helper(); } + /* Test PDP context activation requesting MTU in PCO */ + testcase TC_pdp4_act_deact_mtu() runs on GT_CT { + f_init(); + f_vty_set_mtu(m_configured_mtu); + + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx.pco_req := valueof(ts_PCO_MTU); + f_pdp_ctx_act(ctx); + + f_PCO_ensure_no_duplicates(ctx.pco_neg); + /* verify PCO contains MTU */ + var octetstring rx_mtu_octstr := f_PCO_extract_proto(ctx.pco_neg, PCO_P_to_OCT2(PCO_P_IPv4_LINK_MTU), 1); + if (not match(rx_mtu_octstr, decmatch tr_PCO_P_UV_U16(m_configured_mtu))) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx Unexpected MTU ", rx_mtu_octstr, + " vs exp ", tr_PCO_P_UV_U16(m_configured_mtu))); + } + + f_pdp_ctx_del(ctx, '1'B); + f_vty_set_mtu(-1); + f_shutdown_helper(); + } + /* Test PDP context activation for dynamic IPv4 EUA. Test we can send ICMPv4 ping over GTPU to DNS server. */ testcase TC_pdp4_act_deact_gtpu_access() runs on GT_CT { @@ -1667,6 +1722,29 @@ f_shutdown_helper(); } + /* Test IPv4v6 context activation requesting MTU in PCO */ + testcase TC_pdp46_act_deact_mtu() runs on GT_CT { + f_init(); + f_vty_set_mtu(m_configured_mtu); + + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); + ctx.pco_req := valueof(ts_PCO_MTU); + f_pdp_ctx_act(ctx); + + f_PCO_ensure_no_duplicates(ctx.pco_neg); + /* verify PCO contains MTU */ + var octetstring rx_mtu_octstr := f_PCO_extract_proto(ctx.pco_neg, PCO_P_to_OCT2(PCO_P_IPv4_LINK_MTU), 1); + if (not match(rx_mtu_octstr, decmatch tr_PCO_P_UV_U16(m_configured_mtu))) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx Unexpected MTU ", rx_mtu_octstr, + " vs exp ", tr_PCO_P_UV_U16(m_configured_mtu))); + } + + f_pdp_ctx_del(ctx, '1'B); + f_vty_set_mtu(-1); + f_shutdown_helper(); + } + /* Test PDP context activation for dynamic IPv4v6 EUA. Test we can send ICMPv6 ping over GTPU to DNS server. */ testcase TC_pdp46_act_deact_gtpu_access() runs on GT_CT { @@ -2279,6 +2357,7 @@ execute(TC_pdp4_act_deact_ipcp()); execute(TC_pdp4_act_deact_ipcp_pap_broken()); execute(TC_pdp4_act_deact_pcodns()); + execute(TC_pdp4_act_deact_mtu()); execute(TC_pdp4_act_deact_gtpu_access()); execute(TC_pdp4_act_deact_gtpu_access_wrong_saddr()); execute(TC_pdp4_act_deact_gtpu_access_ipv6_apn4()); @@ -2308,6 +2387,7 @@ execute(TC_pdp46_act_deact_icmp6()); execute(TC_pdp46_act_deact_pcodns4()); execute(TC_pdp46_act_deact_pcodns6()); + execute(TC_pdp46_act_deact_mtu()); execute(TC_pdp46_act_deact_gtpu_access()); execute(TC_pdp46_act_deact_gtpu_access_wrong_saddr_ipv4()); execute(TC_pdp46_act_deact_gtpu_access_wrong_ll_saddr_ipv6()); diff --git a/ggsn_tests/gen_links.sh b/ggsn_tests/gen_links.sh index 45c84bd..cd4c406 100755 --- a/ggsn_tests/gen_links.sh +++ b/ggsn_tests/gen_links.sh @@ -58,7 +58,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn IPCP_Templates.ttcn PAP_Types.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc PCO_Types.ttcn IPCP_Types.ttcn IPCP_Templates.ttcn PAP_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 " diff --git a/library/GTPv1C_Templates.ttcn b/library/GTPv1C_Templates.ttcn index 9f963f3..98240fb 100644 --- a/library/GTPv1C_Templates.ttcn +++ b/library/GTPv1C_Templates.ttcn @@ -1226,6 +1226,7 @@ protocols := {} } + template (value) ProtConfigOptions ts_PCO_IPv6_DNS modifies ts_PCO := { protocols := { ts_PCO_Proto('0003'O) } } @@ -1291,6 +1292,10 @@ protocols := superset(tr_PCO_Proto('000d'O, 4, contents)) } +template (value) ProtConfigOptions ts_PCO_MTU modifies ts_PCO := { + protocols := { ts_PCO_Proto('0010'O) } +} + /* extract a given protocol payload from PCO */ function f_PCO_extract_proto(ProtConfigOptions pco, OCT2 protocol, integer nth_match := 1) return octetstring { var integer i; diff --git a/library/PCO_Types.ttcn b/library/PCO_Types.ttcn index 04b5080..d5ab012 100644 --- a/library/PCO_Types.ttcn +++ b/library/PCO_Types.ttcn @@ -52,13 +52,24 @@ return int2oct(enum2int(p), 2); } -type set of ProtocolElement ProtocolIDList; +type record ProtocolElementU16 { + uint16_t val +}; + +type union ProtocolElementPayloadUnion { + ProtocolElementU16 u16, + octetstring octstr +}; type record ProtocolElement { PCO_P protocolID, uint8_t lengthProtoID, - octetstring protoIDContents -} with { variant (lengthProtoID) "LENGTHTO(protoIDContents)" }; + ProtocolElementPayloadUnion u +} with { variant (lengthProtoID) "LENGTHTO(u)" + variant (u) "CROSSTAG(u16, protocolID = PCO_P_IPv4_LINK_MTU; + octstr, OTHERWISE)" + }; +type set of ProtocolElement ProtocolIDList; type record PCO_DATA { BIT1 extension0, @@ -77,13 +88,31 @@ * PCO_Templates: **********************/ +/* Union value (payload) templates */ +template (value) ProtocolElementU16 ts_PCO_P_UV_U16(template (value) uint16_t val) +:= { val := val } +template (present) ProtocolElementU16 tr_PCO_P_UV_U16(template (present) uint16_t val := ?) +:= { val := val } + +/* Union templates */ +template (value) ProtocolElementPayloadUnion ts_PCO_P_U_U16(template (value) uint16_t val) +:= { u16 := ts_PCO_P_UV_U16(val) } +template (present) ProtocolElementPayloadUnion tr_PCO_P_U_U16(template (present) uint16_t val := ?) +:= { u16 := tr_PCO_P_UV_U16(val) } + +template (value) ProtocolElementPayloadUnion ts_PCO_P_U_OCTSTR(template (value) octetstring protoIDContents := ''O) +:= { octstr := protoIDContents } +template (present) ProtocolElementPayloadUnion tr_PCO_P_U_OCTSTR(template (present) octetstring protoIDContents := ?) +:= { octstr := protoIDContents } + +/* PCOElement templates */ template (value) ProtocolElement ts_PCO_P_OCTSTR(template (value) PCO_P protocolID, template (value) uint8_t lengthProtoID := 0, template (value) octetstring protoIDContents := ''O) := { protocolID := protocolID, lengthProtoID := lengthProtoID, - protoIDContents := protoIDContents + u := ts_PCO_P_U_OCTSTR(protoIDContents) } template (present) ProtocolElement tr_PCO_P_OCTSTR(template (present) PCO_P protocolID := ?, @@ -92,7 +121,7 @@ := { protocolID := protocolID, lengthProtoID := lengthProtoID, - protoIDContents := protoIDContents + u := tr_PCO_P_U_OCTSTR(protoIDContents) } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38469?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2ceb76a3a07b44f69937c9f5a040482320bca377 Gerrit-Change-Number: 38469 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: library/PCO_Types.ttcn: Drop unsued IPCP_OPT enum
by pespin 18 Oct '24

18 Oct '24

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38468?usp=email ) Change subject: library/PCO_Types.ttcn: Drop unsued IPCP_OPT enum ...................................................................... library/PCO_Types.ttcn: Drop unsued IPCP_OPT enum It is unused, plus IPCP_Types.ttcn already defines a more complete enum in IpcpConfigOptCode. Change-Id: I867ab36063db262b46fc4546c17a902699a6e37c --- M library/IPCP_Types.ttcn M library/PCO_Types.ttcn 2 files changed, 1 insertion(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/38468/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38468?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I867ab36063db262b46fc4546c17a902699a6e37c Gerrit-Change-Number: 38468 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder

1 0

[XS] Change in osmo-ttcn3-hacks[master]: library/PCO_Types.ttcn: Drop unsued IPCP_OPT enum
by pespin 18 Oct '24

18 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38468?usp=email ) Change subject: library/PCO_Types.ttcn: Drop unsued IPCP_OPT enum ...................................................................... library/PCO_Types.ttcn: Drop unsued IPCP_OPT enum It is unused, plus IPCP_Types.ttcn already defines a more complete enum in IpcpConfigOptCode. Change-Id: I867ab36063db262b46fc4546c17a902699a6e37c --- M library/PCO_Types.ttcn 1 file changed, 0 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/38468/1 diff --git a/library/PCO_Types.ttcn b/library/PCO_Types.ttcn index a308c08..04b5080 100644 --- a/library/PCO_Types.ttcn +++ b/library/PCO_Types.ttcn @@ -52,13 +52,6 @@ return int2oct(enum2int(p), 2); } -/* RFC 1332 IP Control Protocol options, extensions in RFC 1877 */ -type enumerated IPCP_OPT { - IPCP_OPT_IPADDR (3), /* RFC 1332 3.3 */ - IPCP_OPT_PRIMARY_DNS (129), /* RFC 1877 1.1 */ - IPCP_OPT_SECONDARY_DNS (131) /* RFC 1877 1.2 */ -} with { variant "FIELDLENGTH(8)" }; - type set of ProtocolElement ProtocolIDList; type record ProtocolElement { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38468?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I867ab36063db262b46fc4546c17a902699a6e37c Gerrit-Change-Number: 38468 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: library/PCO_Types: Drop unused nonsense enum
by pespin 18 Oct '24

18 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38467?usp=email ) Change subject: library/PCO_Types: Drop unused nonsense enum ...................................................................... library/PCO_Types: Drop unused nonsense enum That enum is PAP related, plus it doesn't really match the section describing, plus it's not used anywhere. Looks like a development artifact which was not dropped during submit. Change-Id: Ic791d20dd600b039daa2abef7fa25aaa6780a448 --- M library/PCO_Types.ttcn 1 file changed, 0 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/38467/1 diff --git a/library/PCO_Types.ttcn b/library/PCO_Types.ttcn index 0eaa45e..a308c08 100644 --- a/library/PCO_Types.ttcn +++ b/library/PCO_Types.ttcn @@ -59,13 +59,6 @@ IPCP_OPT_SECONDARY_DNS (131) /* RFC 1877 1.2 */ } with { variant "FIELDLENGTH(8)" }; -/* RFC 1334, section 3.2. Packet Format */ -type enumerated PAP_CODE_ { - PAP_CODE__IPADDR (1), - PAP_CODE__PRIMARY_DNS (2), - PAP_CODE__SECONDARY_DNS (3) -} with { variant "FIELDLENGTH(8)" }; - type set of ProtocolElement ProtocolIDList; type record ProtocolElement { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38467?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic791d20dd600b039daa2abef7fa25aaa6780a448 Gerrit-Change-Number: 38467 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: library: Move IPCP templates GTPv1C_Templates.ttcn -> IPCP_Templates....
by pespin 18 Oct '24

18 Oct '24

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38464?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: library: Move IPCP templates GTPv1C_Templates.ttcn -> IPCP_Templates.ttcn ...................................................................... library: Move IPCP templates GTPv1C_Templates.ttcn -> IPCP_Templates.ttcn We already have an IPCP_Types.ttcn, and the GTPv1C_Types from ProtocolModules dep we use doesn't actually specify any record for IPCP, so those are totally protocol independent. Change-Id: I233292ea886e1b69a2f9aa1a159c816791b47136 --- M gbproxy/gen_links.sh M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/gen_links.sh M hnodeb/gen_links.sh M library/GTPv1C_Templates.ttcn A library/IPCP_Templates.ttcn M mme/gen_links.sh M pgw/gen_links.sh M sgsn/gen_links.sh 9 files changed, 77 insertions(+), 59 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/38464/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38464?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I233292ea886e1b69a2f9aa1a159c816791b47136 Gerrit-Change-Number: 38464 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: s1gw: Remove unneeded dep IPCP_Types.ttcn
by pespin 18 Oct '24

18 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38466?usp=email ) Change subject: s1gw: Remove unneeded dep IPCP_Types.ttcn ...................................................................... s1gw: Remove unneeded dep IPCP_Types.ttcn Change-Id: Iad81c8d76efa2618ca7e354d2b73617a54a8d5ee --- M s1gw/gen_links.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/38466/1 diff --git a/s1gw/gen_links.sh b/s1gw/gen_links.sh index f2fc81b..63c826e 100755 --- a/s1gw/gen_links.sh +++ b/s1gw/gen_links.sh @@ -28,7 +28,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn Mutex.ttcn General_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn " +FILES="Misc_Helpers.ttcn Mutex.ttcn General_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="PFCP_CodecPort.ttcn PFCP_CodecPort_CtrlFunct.ttcn PFCP_CodecPort_CtrlFunctDef.cc PFCP_Emulation.ttcn PFCP_Templates.ttcn " FILES+="S1AP_CodecPort.ttcn S1AP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunct.ttcn " FILES+="SCTP_Templates.ttcn " -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38466?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iad81c8d76efa2618ca7e354d2b73617a54a8d5ee Gerrit-Change-Number: 38466 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: library: Move IPCP templates GTPv1C_Templates.ttcn -> IPCP_Templates....
by pespin 18 Oct '24

18 Oct '24

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38464?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: library: Move IPCP templates GTPv1C_Templates.ttcn -> IPCP_Templates.ttcn ...................................................................... library: Move IPCP templates GTPv1C_Templates.ttcn -> IPCP_Templates.ttcn We already have an IPCP_Types.ttcn, and the GTPv1C_Types from ProtocolModules dep we use doesn't actually specify any record for IPCP, so those are totally protocol independent. Change-Id: I233292ea886e1b69a2f9aa1a159c816791b47136 --- M gbproxy/gen_links.sh M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/gen_links.sh M hnodeb/gen_links.sh M library/GTPv1C_Templates.ttcn A library/IPCP_Templates.ttcn M mme/gen_links.sh M sgsn/gen_links.sh 8 files changed, 76 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/38464/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38464?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I233292ea886e1b69a2f9aa1a159c816791b47136 Gerrit-Change-Number: 38464 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: mgw: Remove unneeded dep IPCP_Types.ttcn
by pespin 18 Oct '24

18 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38465?usp=email ) Change subject: mgw: Remove unneeded dep IPCP_Types.ttcn ...................................................................... mgw: Remove unneeded dep IPCP_Types.ttcn Change-Id: I318f4ba78adf778820e8d65d5932e454bc5da670 --- M mgw/MGCP_Test.ttcn M mgw/gen_links.sh 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/38465/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 7d8c235..d341022 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -30,7 +30,6 @@ import from IPL4asp_Types all; import from General_Types all; import from Native_Functions all; - import from IPCP_Types all; import from IP_Types all; import from Osmocom_VTY_Functions all; import from TELNETasp_PortType all; diff --git a/mgw/gen_links.sh b/mgw/gen_links.sh index 7662b55..629be98 100755 --- a/mgw/gen_links.sh +++ b/mgw/gen_links.sh @@ -43,7 +43,7 @@ FILES+="AMR_Types.ttcn " FILES+="RTP_CodecPort.ttcn RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_Emulation.ttcn IuUP_EncDec.cc " FILES+="OSMUX_CodecPort.ttcn OSMUX_Emulation.ttcn OSMUX_Types.ttcn OSMUX_CodecPort_CtrlFunct.ttcn OSMUX_CodecPort_CtrlFunctDef.cc " -FILES+="Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn " +FILES+="Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="Osmocom_VTY_Functions.ttcn " FILES+="RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc " FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcnpp " -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38465?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I318f4ba78adf778820e8d65d5932e454bc5da670 Gerrit-Change-Number: 38465 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: library: Move IPCP templates GTPv1C_Templates.ttcn -> IPCP_Templates....
by pespin 18 Oct '24

18 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38464?usp=email ) Change subject: library: Move IPCP templates GTPv1C_Templates.ttcn -> IPCP_Templates.ttcn ...................................................................... library: Move IPCP templates GTPv1C_Templates.ttcn -> IPCP_Templates.ttcn We already have an IPCP_Types.ttcn, and the GTPv1C_Types from ProtocolModules dep we use doesn't actually specify any record for IPCP, so those are totally protocol independent. Change-Id: I233292ea886e1b69a2f9aa1a159c816791b47136 --- M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/gen_links.sh M library/GTPv1C_Templates.ttcn A library/IPCP_Templates.ttcn 4 files changed, 72 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/38464/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 7c4c5a1..8d091f9 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -27,6 +27,7 @@ import from GTPv1C_Templates all; import from GTPv1U_Templates all; import from IPCP_Types all; + import from IPCP_Templates all; import from PAP_Types all; import from IP_Types all; import from ICMP_Types all; diff --git a/ggsn_tests/gen_links.sh b/ggsn_tests/gen_links.sh index bc17b64..45c84bd 100755 --- a/ggsn_tests/gen_links.sh +++ b/ggsn_tests/gen_links.sh @@ -58,7 +58,7 @@ gen_links $DIR $FILES 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="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn IPCP_Templates.ttcn PAP_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 " diff --git a/library/GTPv1C_Templates.ttcn b/library/GTPv1C_Templates.ttcn index 8eae7c0..9f963f3 100644 --- a/library/GTPv1C_Templates.ttcn +++ b/library/GTPv1C_Templates.ttcn @@ -16,6 +16,7 @@ import from GTPC_Types all; import from GTPv1C_CodecPort all; import from IPCP_Types all; +import from IPCP_Templates all; import from GSM_Types all; // RoutingAreaIdentification, CellIdentity template (present) OCT1 gtp1_requests := ( @@ -1307,59 +1308,6 @@ return ''O; } -template (present) IpcpPacket tr_IPCP(template (present) LcpCode code, - template (present) uint8_t identifier, - template (present) IpcpOptionList opts) := { - code := code, - identifier := identifier, - len := ?, - options := opts -} -template (value) IpcpPacket ts_IPCP(template (value) LcpCode code, - template (value) uint8_t identifier, - template (value) IpcpOptionList opts) := { - code := code, - identifier := identifier, - len := 0, /* overwritten */ - options := opts -} -template (present) IpcpOption tr_IPCP_PrimaryDns(template (present) OCT4 addr) := { - code := IPCP_OPT_PrimaryDNS, - len := 6, - data := addr -} -template (value) IpcpOption ts_IPCP_PrimaryDns(template (value) OCT4 addr) := { - code := IPCP_OPT_PrimaryDNS, - len := 6, - data := addr -} -template (present) IpcpOption tr_IPCP_SecondaryDns(template (present) OCT4 addr) := { - code := IPCP_OPT_SecondaryDNS, - len := 6, - data := addr -} -template (value) IpcpOption ts_IPCP_SecondaryDns(template (value) OCT4 addr) := { - code := IPCP_OPT_SecondaryDNS, - len := 6, - data := addr -} -template (present) IpcpPacket tr_IPCP_Ack_DNS(template (present) uint8_t identifier := ?, - template (present) OCT4 dns1 := ?, - template (present) OCT4 dns2 := ?) := - tr_IPCP(LCP_Configure_Ack, identifier, - { *, tr_IPCP_PrimaryDns(dns1), *, tr_IPCP_SecondaryDns(dns2), * }); - -template (value) IpcpPacket ts_IPCP_ReqDNS(template (value) uint8_t identifier := 0) := - ts_IPCP(LCP_Configure_Request, identifier, - { ts_IPCP_PrimaryDns('00000000'O), ts_IPCP_SecondaryDns('00000000'O) }); - -template (value) IpcpPacket ts_IPCP_ReqDNS_Primary(template (value) uint8_t identifier := 0) := - ts_IPCP(LCP_Configure_Request, identifier, - { ts_IPCP_PrimaryDns('00000000'O) }); -template (value) IpcpPacket ts_IPCP_ReqDNS_Secondary(template (value) uint8_t identifier := 0) := - ts_IPCP(LCP_Configure_Request, identifier, - { ts_IPCP_SecondaryDns('00000000'O) }); - function f_teardown_ind_IE(in template (omit) BIT1 ind) return template (omit) TearDownInd { if (istemplatekind(ind, "omit")) { return omit; diff --git a/library/IPCP_Templates.ttcn b/library/IPCP_Templates.ttcn new file mode 100644 index 0000000..bdf1a70 --- /dev/null +++ b/library/IPCP_Templates.ttcn @@ -0,0 +1,69 @@ +/* Templates for IPCP (IP Configuration Protocol) in TTCN-3 + * (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 IPCP_Templates { +import from General_Types all; +import from Osmocom_Types all; +import from IPCP_Types all; + +template (present) IpcpPacket tr_IPCP(template (present) LcpCode code, + template (present) uint8_t identifier, + template (present) IpcpOptionList opts) := { + code := code, + identifier := identifier, + len := ?, + options := opts +} +template (value) IpcpPacket ts_IPCP(template (value) LcpCode code, + template (value) uint8_t identifier, + template (value) IpcpOptionList opts) := { + code := code, + identifier := identifier, + len := 0, /* overwritten */ + options := opts +} +template (present) IpcpOption tr_IPCP_PrimaryDns(template (present) OCT4 addr) := { + code := IPCP_OPT_PrimaryDNS, + len := 6, + data := addr +} +template (value) IpcpOption ts_IPCP_PrimaryDns(template (value) OCT4 addr) := { + code := IPCP_OPT_PrimaryDNS, + len := 6, + data := addr +} +template (present) IpcpOption tr_IPCP_SecondaryDns(template (present) OCT4 addr) := { + code := IPCP_OPT_SecondaryDNS, + len := 6, + data := addr +} +template (value) IpcpOption ts_IPCP_SecondaryDns(template (value) OCT4 addr) := { + code := IPCP_OPT_SecondaryDNS, + len := 6, + data := addr +} +template (present) IpcpPacket tr_IPCP_Ack_DNS(template (present) uint8_t identifier := ?, + template (present) OCT4 dns1 := ?, + template (present) OCT4 dns2 := ?) := + tr_IPCP(LCP_Configure_Ack, identifier, + { *, tr_IPCP_PrimaryDns(dns1), *, tr_IPCP_SecondaryDns(dns2), * }); + +template (value) IpcpPacket ts_IPCP_ReqDNS(template (value) uint8_t identifier := 0) := + ts_IPCP(LCP_Configure_Request, identifier, + { ts_IPCP_PrimaryDns('00000000'O), ts_IPCP_SecondaryDns('00000000'O) }); + +template (value) IpcpPacket ts_IPCP_ReqDNS_Primary(template (value) uint8_t identifier := 0) := + ts_IPCP(LCP_Configure_Request, identifier, + { ts_IPCP_PrimaryDns('00000000'O) }); +template (value) IpcpPacket ts_IPCP_ReqDNS_Secondary(template (value) uint8_t identifier := 0) := + ts_IPCP(LCP_Configure_Request, identifier, + { ts_IPCP_SecondaryDns('00000000'O) }); + +} with { encode "RAW" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38464?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I233292ea886e1b69a2f9aa1a159c816791b47136 Gerrit-Change-Number: 38464 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: library/GTPv1C_Templates: Clean up PCO templates
by pespin 18 Oct '24

18 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38463?usp=email ) Change subject: library/GTPv1C_Templates: Clean up PCO templates ...................................................................... library/GTPv1C_Templates: Clean up PCO templates * Define a generic ProtoElem template and use it everywhere. * User superset instead of "*, tr_..., *" construct. Change-Id: I005a6dea0606bcb677260f85b24396b55a150153 --- M library/GTPv1C_Templates.ttcn 1 file changed, 35 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/38463/1 diff --git a/library/GTPv1C_Templates.ttcn b/library/GTPv1C_Templates.ttcn index 12e2f51..8eae7c0 100644 --- a/library/GTPv1C_Templates.ttcn +++ b/library/GTPv1C_Templates.ttcn @@ -1186,6 +1186,26 @@ sgsn_addr_traffic, qos, dtf)) } +/******** + * PCO + ********/ + +template (value) ProtocolElement ts_PCO_Proto(template (value) OCT2 protocolID, + template (value) integer lengthProtoID := 0, + template (value) octetstring protoIDContents := ''O) := { + protocolID := protocolID, + lengthProtoID := lengthProtoID, + protoIDContents := protoIDContents +} + +template (present) ProtocolElement tr_PCO_Proto(template (present) OCT2 protocolID := ?, + template (present) integer lengthProtoID:= ?, + template (present) octetstring protoIDContents:= ?) := { + protocolID := protocolID, + lengthProtoID := lengthProtoID, + protoIDContents := protoIDContents +} + /* PCO send base template */ template (value) ProtConfigOptions ts_PCO := { type_gtpc := '84'O, @@ -1206,23 +1226,18 @@ } template (value) ProtConfigOptions ts_PCO_IPv6_DNS modifies ts_PCO := { - protocols := { - { protocolID := '0003'O, lengthProtoID := 0, protoIDContents := ''O } - } + protocols := { ts_PCO_Proto('0003'O) } } template (present) ProtConfigOptions tr_PCO_IPv6_DNS_resp(template (present) OCT16 contents) modifies tr_PCO := { - protocols := { - *, { protocolID := '0003'O, lengthProtoID := 16, protoIDContents := contents }, * - } + protocols := superset(tr_PCO_Proto('0003'O, 16, contents)) } template (value) ProtConfigOptions ts_PCO_IPv4_DNS_IPCP(template (value) uint8_t ipcp_req_id := 0) modifies ts_PCO := { protocols := { /* dummy PAP entry to check if our parser in the GGSN can properly iterate over * the list of protocols, see Change-Id Icc2e6716c33d78d3c3e000f529806228d8aa155e */ - { protocolID := 'C023'O, lengthProtoID := 0, protoIDContents := ''O }, - { protocolID := '8021'O, lengthProtoID := 16, protoIDContents := - enc_IpcpPacket(valueof(ts_IPCP_ReqDNS(ipcp_req_id))) } + ts_PCO_Proto('C023'O), + ts_PCO_Proto('8021'O, 16, enc_IpcpPacket(valueof(ts_IPCP_ReqDNS(ipcp_req_id)))) } } @@ -1230,37 +1245,28 @@ protocols := { /* dummy PAP entry to check if our parser can cope with a single primary DNS entry * see Change-Id Icffde89f9bc5d8fcadf6e2dd6c0b4de03440edd5 and OS#3288 */ - { protocolID := 'C023'O, lengthProtoID := 0, protoIDContents := ''O }, - { protocolID := '8021'O, lengthProtoID := 16, protoIDContents := - enc_IpcpPacket(valueof(ts_IPCP_ReqDNS_Primary)) } + ts_PCO_Proto('C023'O), + ts_PCO_Proto('8021'O, 16, enc_IpcpPacket(valueof(ts_IPCP_ReqDNS_Primary))) } } template (value) ProtConfigOptions ts_PCO_IPv4_SEC_DNS_IPCP modifies ts_PCO := { protocols := { /* dummy PAP entry to check if our parser can cope with a single secondary DNS entry * see Change-Id Icffde89f9bc5d8fcadf6e2dd6c0b4de03440edd5 and OS#3288 */ - { protocolID := 'C023'O, lengthProtoID := 0, protoIDContents := ''O }, - { protocolID := '8021'O, lengthProtoID := 16, protoIDContents := - enc_IpcpPacket(valueof(ts_IPCP_ReqDNS_Secondary)) } + ts_PCO_Proto('C023'O), + ts_PCO_Proto('8021'O, 16, enc_IpcpPacket(valueof(ts_IPCP_ReqDNS_Secondary))) } } template (value) ProtConfigOptions ts_PCO_IPv4_SEPARATE_DNS_IPCP modifies ts_PCO := { protocols := { /* dummy PAP entry to check if our parser can cope with a primary and secondary DNS * in separate IPCP containers OS#3381 */ - { protocolID := 'C023'O, lengthProtoID := 0, protoIDContents := ''O }, - { protocolID := '8021'O, lengthProtoID := 16, protoIDContents := - enc_IpcpPacket(valueof(ts_IPCP_ReqDNS_Primary)) }, - { protocolID := '8021'O, lengthProtoID := 16, protoIDContents := - enc_IpcpPacket(valueof(ts_IPCP_ReqDNS_Secondary)) } + ts_PCO_Proto('C023'O), + ts_PCO_Proto('8021'O, 16, enc_IpcpPacket(valueof(ts_IPCP_ReqDNS_Primary))), + ts_PCO_Proto('8021'O, 16, enc_IpcpPacket(valueof(ts_IPCP_ReqDNS_Secondary))) } } -template (present) ProtocolElement tr_PCO_Proto(template (present) OCT2 prot_id := ?) := { - protocolID := prot_id, - lengthProtoID := ?, - protoIDContents := ? -} template (value) ProtocolElement ts_PCOelem_PAP_broken := { protocolID := 'C023'O, lengthProtoID := 60, @@ -1270,22 +1276,18 @@ template (value) ProtConfigOptions ts_PCO_PAP_IPv4_DNS modifies ts_PCO := { protocols := { ts_PCOelem_PAP_broken, - { protocolID := '8021'O, lengthProtoID := 16, protoIDContents := enc_IpcpPacket(valueof(ts_IPCP_ReqDNS)) } + ts_PCO_Proto('8021'O, 16, enc_IpcpPacket(valueof(ts_IPCP_ReqDNS))) } } template (present) ProtConfigOptions tr_PCO_Contains(template (present) OCT2 prot_id) modifies tr_PCO := { - protocols := { *, tr_PCO_Proto(prot_id), * } + protocols := superset(tr_PCO_Proto(prot_id)) } template (value) ProtConfigOptions ts_PCO_IPv4_DNS_CONT modifies ts_PCO := { - protocols := { - { protocolID := '000d'O, lengthProtoID := 0, protoIDContents := ''O } - } + protocols := { ts_PCO_Proto('000d'O) } } template (present) ProtConfigOptions tr_PCO_IPv4_DNS_CONT_resp(template (present) OCT4 contents) modifies tr_PCO := { - protocols := { - *, { protocolID := '000d'O, lengthProtoID := 4, protoIDContents := contents }, * - } + protocols := superset(tr_PCO_Proto('000d'O, 4, contents)) } /* extract a given protocol payload from PCO */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38463?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I005a6dea0606bcb677260f85b24396b55a150153 Gerrit-Change-Number: 38463 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log