- gerrit-log - lists.osmocom.org

Build failure of network:osmocom:nightly/osmo-msc in Debian_Unstable/x86_64
by OBS Notification 18 May '22

18 May '22

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o… Package network:osmocom:nightly/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 546s] gcc -DHAVE_CONFIG_H -I. -I../.. -I../../include -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -ggdb3 -pthread -I/usr/include/ -pthread -I/usr/include/ -I/usr/include/ -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -g -O2 -ffile-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -c -o stubs.o `test -f './../stubs.c' || echo './'`./../stubs.c [ 547s] /bin/bash ../../libtool --tag=CC --mode=link gcc -Wall -ggdb3 -pthread -I/usr/include/ -pthread -I/usr/include/ -I/usr/include/ -pthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -g -O2 -ffile-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wl,--wrap=osmo_gsup_client_create2 -Wl,--wrap=osmo_gsup_client_send -Wl,--wrap=gsm340_gen_scts -Wl,--wrap=osmo_get_rand_id -Wl,--wrap=ran_peers_down_paging -Wl,--wrap=call_leg_ensure_ci -Wl,-z,relro -o msc_vlr_test_no_authen msc_vlr_test_no_authen.o msc_vlr_tests.o stubs.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a -lsmpp34 -losmocore -ltalloc -losmogsm -losmocore -ltalloc -losmovty -losmocore -ltalloc -losmoabis -losmo-sigtran -losmo-ranap -ltalloc -lasn1c -losmo-mgcp-client -losmo-gsup-client -lsqlite3 -ldbi [ 547s] libtool: link: gcc -Wall -ggdb3 -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/ -I/usr/include/asn1c -I/usr/include/ -I/usr/include/ -g -O2 -ffile-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -Wl,--wrap=osmo_gsup_client_create2 -Wl,--wrap=osmo_gsup_client_send -Wl,--wrap=gsm340_gen_scts -Wl,--wrap=osmo_get_rand_id -Wl,--wrap=ran_peers_down_paging -Wl,--wrap=call_leg_ensure_ci -Wl,-z -Wl,relro -o msc_vlr_test_no_authen msc_vlr_test_no_authen.o msc_vlr_tests.o stubs.o ../../src/libmsc/libmsc.a ../../src/libvlr/libvlr.a /usr/lib/x86_64-linux-gnu/libsmpp34.so /usr/lib/x86_64-linux-gnu/libosmogsm.so /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so /usr/lib/x86_64-linux-gnu/libosmoabis.so /usr/lib/x86_64-linux-gnu/libosmo-sigtran.so -losmo-ranap -ltalloc -lasn1c -losmo-mgcp-client /usr/lib/x86_64-linux-gnu/libosmo-gsup-client.so -lsqlite3 -ldbi -pthread [ 548s] /usr/bin/ld: cannot find -ldbi: No such file or directory [ 548s] collect2: error: ld returned 1 exit status [ 548s] make[6]: *** [Makefile:765: msc_vlr_test_no_authen] Error 1 [ 548s] make[6]: Leaving directory '/usr/src/packages/BUILD/tests/msc_vlr' [ 548s] make[5]: *** [Makefile:936: check-am] Error 2 [ 548s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests/msc_vlr' [ 548s] make[4]: *** [Makefile:424: check-recursive] Error 1 [ 548s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 548s] make[3]: *** [Makefile:473: check-recursive] Error 1 [ 548s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 548s] make[2]: *** [Makefile:772: check] Error 2 [ 548s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 548s] dh_auto_test: error: make -j1 check "TESTSUITEFLAGS=-j1 --verbose" VERBOSE=1 returned exit code 2 [ 548s] make[1]: *** [debian/rules:63: override_dh_auto_test] Error 1 [ 548s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 548s] make: *** [debian/rules:45: build] Error 2 [ 548s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 548s] ### VM INTERACTION START ### [ 548s] Failed to write wtmp record, ignoring: Read-only file system [ 548s] Failed to write utmp record: Read-only file system [ 548s] Powering off. [ 548s] [ 530.600026][T20527] reboot: Power down [ 548s] ### VM INTERACTION END ### [ 549s] [ 549s] lamb10 failed "build osmo-msc_1.8.0.33.d302.202205180026.dsc" at Wed May 18 20:11:48 UTC 2022. [ 549s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

1 0

Change in osmo-ttcn3-hacks[master]: pgw: Improve checks around Gy messages
by pespin 18 May '22

18 May '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28157 ) Change subject: pgw: Improve checks around Gy messages ...................................................................... pgw: Improve checks around Gy messages Change-Id: Ica3ca4cf72113d66e74dcff9f838e39cc5d63468 --- M pgw/PGW_Tests.ttcn M pgw/gen_links.sh M pgw/regen_makefile.sh 3 files changed, 179 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/57/28157/1 diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 44bf6f9..6df4ca7 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -1,5 +1,7 @@ module PGW_Tests { +import from TCCEncoding_Functions all; + import from General_Types all; import from Osmocom_Types all; import from Native_Functions all; @@ -33,6 +35,8 @@ charstring mp_ocs_local_ip := "127.0.0.9"; integer mp_ocs_local_port := 3869; + + charstring mp_diam_realm := "localdomain"; } /* main component, we typically have one per testcase */ @@ -112,7 +116,7 @@ /* configuration data for a given Session */ type record SessionPars { hexstring imsi, - octetstring msisdn optional, + hexstring msisdn optional, // serving network integer rat_type, // flags? @@ -138,7 +142,7 @@ t_SessionPars(hexstring imsi, charstring tundev, integer rat_type := 6, charstring apn := "internet", boolean selection_mode := false, BIT3 pdn_type := '001'B) := { imsi := imsi, - msisdn := omit, + msisdn := '1234'H, rat_type := rat_type, apn := apn, selection_mode := selection_mode, @@ -176,8 +180,8 @@ remote_sctp_port := -1, local_ip := mp_pcrf_local_ip, local_sctp_port := mp_pcrf_local_port, - origin_host := "pcrf.localdomain", - origin_realm := "localdomain", + origin_host := "pcrf." & mp_diam_realm, + origin_realm := mp_diam_realm, auth_app_id := omit, vendor_app_id := c_DIAMETER_3GPP_Gx_AID }; @@ -193,8 +197,8 @@ remote_sctp_port := -1, local_ip := mp_ocs_local_ip, local_sctp_port := mp_ocs_local_port, - origin_host := "ocs.localdomain", - origin_realm := "localdomain", + origin_host := "ocs." & mp_diam_realm, + origin_realm := mp_diam_realm, auth_app_id := c_DIAMETER_CREDIT_CONTROL_AID, vendor_app_id := omit }; @@ -296,10 +300,6 @@ return f_concat_pad(15, '26242'H, suffix); } -function f_gen_msisdn(integer suffix) return hexstring { - return f_concat_pad(12, '49123'H, suffix); -} - private altstep as_DIA_Gx_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { var PDU_DIAMETER rx_dia; [] Gx.receive(tr_DIA_Gx_CCR(req_type := req_type)) -> value rx_dia { @@ -322,9 +322,174 @@ } } +function f_tr_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) +runs on PGW_Session_CT return template (present) PDU_DIAMETER +{ + var template (present) PDU_DIAMETER tpl; + var charstring smf_origin_host := "smf." & mp_diam_realm; + var template (present) octetstring imsi := ?; + var template (present) octetstring msisdn := ?; + var template (present) octetstring rat_type := ?; + var template (present) OCT4 charging_char := ?; + var template (present) OCT1 nsapi := ?; + imsi := char2oct(f_dec_TBCD(imsi_hex2oct(g_pars.imsi))); + //msisdn := char2oct(f_dec_TBCD(substr(ctx_val.msisdn, 1, lengthof(ctx_val.msisdn) -1))); + rat_type := int2oct(g_pars.rat_type, 1); + charging_char := char2oct(oct2str('0000'O)); // f_create_session() uses hardcoded chg_car := '0000'O + nsapi := '01'O; // f_create_session() uses hardcoded bearer_id := 1 + select (req_type) { + case (INITIAL_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(smf_origin_host), + tr_AVP_OriginRealm(mp_diam_realm), + tr_AVP_DestinationRealm(mp_diam_realm), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_ServiceContextId, + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?), + tr_AVP_EventTimestamp(?), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), + tr_AVP_RequestedAction(DIRECT_DEBITING), + tr_AVP_3GPP_AoCRequestType, + tr_AVP_MultipleServicesIndicator, + tr_AVP_Multiple_Services_Credit_Control(content := superset( + tr_AVP_Requested_Service_Unit, + tr_AVP_Used_Service_Unit, + tr_AVP_3GPP_QoS_Information, + tr_AVP_GI_3GPP_RatType(rat_type) + )), + tr_AVP_3GPP_ServiceInformation(content := superset( + tr_AVP_3GPP_PSInformation(content := superset( + tr_AVP_3GPP_ChargingId, + tr_AVP_3GPP_PDPType((IPv4,IPv6,IPv4v6)), + tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), + tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pcrf_local_ip))), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pgw_hostname))), + tr_AVP_3GPP_CalledStationId, + tr_AVP_3GPP_SelectionMode, + tr_AVP_3GPP_ChargingCharacteristics(charging_char), + tr_AVP_3GPP_SGSNMCCMNC, + tr_AVP_3GPP_NSAPI(nsapi), + /*We don't yet send MS_Tz in CreateSessionReq: + tr_AVP_3GPP_MS_TimeZone,*/ + tr_AVP_3GPP_ULI/*, + We don't yet send IMEI in CreateSessionReq: + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + })*/ + )) + )) + )); + } + case (UPDATE_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(smf_origin_host), + tr_AVP_OriginRealm(mp_diam_realm), + tr_AVP_DestinationRealm(mp_diam_realm), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_ServiceContextId, + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?), + tr_AVP_DestinationHost(?), + tr_AVP_EventTimestamp(?), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), + tr_AVP_RequestedAction(DIRECT_DEBITING), + tr_AVP_3GPP_AoCRequestType, + tr_AVP_MultipleServicesIndicator, + tr_AVP_Multiple_Services_Credit_Control(content := superset( + tr_AVP_Requested_Service_Unit, + tr_AVP_Used_Service_Unit, + tr_AVP_3GPP_Reporting_Reason, + tr_AVP_3GPP_QoS_Information, + tr_AVP_GI_3GPP_RatType(rat_type) + )), + tr_AVP_3GPP_ServiceInformation(content := superset( + tr_AVP_3GPP_PSInformation(content := superset( + tr_AVP_3GPP_ChargingId, + /* tr_AVP_3GPP_PDPType, Only in INIT */ + tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), + tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pcrf_local_ip))), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pgw_hostname))), + tr_AVP_3GPP_CalledStationId, + tr_AVP_3GPP_SelectionMode, + tr_AVP_3GPP_ChargingCharacteristics(charging_char), + tr_AVP_3GPP_SGSNMCCMNC, + tr_AVP_3GPP_NSAPI(nsapi), + /*We don't yet send MS_Tz in CreateSessionReq: + tr_AVP_3GPP_MS_TimeZone,*/ + tr_AVP_3GPP_ULI/*, + We don't yet send IMEI in CreateSessionReq: + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + })*/ + )) + )) + )); + } + case (TERMINATION_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(smf_origin_host), + tr_AVP_OriginRealm(mp_diam_realm), + tr_AVP_DestinationRealm(mp_diam_realm), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_ServiceContextId, + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?), + tr_AVP_DestinationHost(?), + tr_AVP_EventTimestamp(?), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), + tr_AVP_TerminationCause(?), + tr_AVP_RequestedAction(DIRECT_DEBITING), + tr_AVP_3GPP_AoCRequestType, + tr_AVP_MultipleServicesIndicator, + tr_AVP_Multiple_Services_Credit_Control(content := superset( + /* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */ + tr_AVP_Used_Service_Unit, + tr_AVP_3GPP_QoS_Information, + tr_AVP_GI_3GPP_RatType(rat_type) + )), + tr_AVP_3GPP_ServiceInformation(content := superset( + tr_AVP_3GPP_PSInformation(content := superset( + tr_AVP_3GPP_ChargingId, + /* tr_AVP_3GPP_PDPType, Only in INIT */ + tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), + tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pcrf_local_ip))), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pgw_hostname))), + tr_AVP_3GPP_CalledStationId, + tr_AVP_3GPP_SelectionMode, + tr_AVP_3GPP_ChargingCharacteristics(charging_char), + tr_AVP_3GPP_SGSNMCCMNC, + tr_AVP_3GPP_NSAPI(nsapi), + /*We don't yet send MS_Tz in CreateSessionReq: + tr_AVP_3GPP_MS_TimeZone,*/ + tr_AVP_3GPP_ULI/*, + We don't yet send IMEI in CreateSessionReq: + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + })*/ + )) + )) + )); + } + } + return tpl; +} + private altstep as_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { var PDU_DIAMETER rx_dia; - [] Gy.receive(tr_DIA_Gy_CCR(req_type := req_type)) -> value rx_dia { + [] Gy.receive(f_tr_DIA_Gy_CCR(req_type := req_type)) -> value rx_dia { var template (value) PDU_DIAMETER tx_dia; var template (omit) AVP avp; var octetstring sess_id; @@ -421,7 +586,7 @@ fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S5S8_SGW_GTPU, g_teid, 2, f_inet_addr(mp_local_hostname_u), omit); var template (value) PDU_GTPCv2 g2c := - ts_GTP2C_CreateSessionReq(imsi := g_pars.imsi, msisdn := oct2hex('1234567890'O), rat_type := 6, + ts_GTP2C_CreateSessionReq(imsi := g_pars.imsi, msisdn := g_pars.msisdn, rat_type := 6, sender_fteid := fteid_c_ie, apn := f_enc_dns_hostname(g_pars.apn), pdn_type := g_pars.pdn_type, teid_list := { fteid_u_ie }, diff --git a/pgw/gen_links.sh b/pgw/gen_links.sh index b061fea..c8333c7 100755 --- a/pgw/gen_links.sh +++ b/pgw/gen_links.sh @@ -6,6 +6,7 @@ DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" +FILES+=" TCCEncoding_Functions.ttcn TCCEncoding.cc " # BCD coding gen_links $DIR $FILES DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src diff --git a/pgw/regen_makefile.sh b/pgw/regen_makefile.sh index ce59dfb..5edcaef 100755 --- a/pgw/regen_makefile.sh +++ b/pgw/regen_makefile.sh @@ -19,6 +19,7 @@ Native_FunctionDefs.cc TCCConversion.cc TCCInterface.cc + TCCEncoding.cc UDP_EncDec.cc UECUPS_CodecPort_CtrlFunctDef.cc " -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28157 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: Ica3ca4cf72113d66e74dcff9f838e39cc5d63468 Gerrit-Change-Number: 28157 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: ggsn: Improve checks around Gy messages
by pespin 18 May '22

18 May '22

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28156 to look at the new patch set (#4). Change subject: ggsn: Improve checks around Gy messages ...................................................................... ggsn: Improve checks around Gy messages Change-Id: I702796f2f941b78da904faa2ffdba4185333bc0d --- M ggsn_tests/GGSN_Tests.ttcn M library/DIAMETER_Templates.ttcn 2 files changed, 479 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/28156/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28156 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: I702796f2f941b78da904faa2ffdba4185333bc0d Gerrit-Change-Number: 28156 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

Change in osmo-ttcn3-hacks[master]: library/DIAMETER: Rename template to follow naming style
by pespin 18 May '22

18 May '22

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/+/28154 to look at the new patch set (#3). Change subject: library/DIAMETER: Rename template to follow naming style ...................................................................... library/DIAMETER: Rename template to follow naming style Change-Id: I1c7cfbea25a2da99813aa3c4f8a5760c4185ee26 --- M library/DIAMETER_Emulation.ttcn M library/DIAMETER_Templates.ttcn 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/54/28154/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28154 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: I1c7cfbea25a2da99813aa3c4f8a5760c4185ee26 Gerrit-Change-Number: 28154 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-ttcn3-hacks[master]: ggsn: Properly encode MISDN IE in GTP
by pespin 18 May '22

18 May '22

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/+/28153 to look at the new patch set (#2). Change subject: ggsn: Properly encode MISDN IE in GTP ...................................................................... ggsn: Properly encode MISDN IE in GTP ISDN-AddressString contains an initial byte at the start. We didn't care so far because we were not yet checking the content of msisdn, so the usual first '12'O byte was being considered as a header. Let's store it in GTP format as before, but let's pass it as a charstring when initializing the PdpContext, so that the human-style is visible in the test for easy visualization/comparison (It will be verified in a follow-up patch in Gy Diameter interface). Change-Id: Ie1b65707d4b08f2201572e1fa44a1f9f985eb096 --- M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/gen_links.sh M ggsn_tests/regen_makefile.sh 3 files changed, 49 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/28153/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28153 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: Ie1b65707d4b08f2201572e1fa44a1f9f985eb096 Gerrit-Change-Number: 28153 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-ttcn3-hacks[master]: ggsn: Improve checks around Gy messages
by pespin 18 May '22

18 May '22

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28156 to look at the new patch set (#3). Change subject: ggsn: Improve checks around Gy messages ...................................................................... ggsn: Improve checks around Gy messages Change-Id: I702796f2f941b78da904faa2ffdba4185333bc0d --- M ggsn_tests/GGSN_Tests.ttcn M library/DIAMETER_Templates.ttcn 2 files changed, 479 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/28156/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28156 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: I702796f2f941b78da904faa2ffdba4185333bc0d Gerrit-Change-Number: 28156 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

Change in osmo-ttcn3-hacks[master]: ggsn: Improve checks around Gy messages
by pespin 18 May '22

18 May '22

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28156 to look at the new patch set (#2). Change subject: ggsn: Improve checks around Gy messages ...................................................................... ggsn: Improve checks around Gy messages Change-Id: I702796f2f941b78da904faa2ffdba4185333bc0d --- M ggsn_tests/GGSN_Tests.ttcn M library/DIAMETER_Templates.ttcn 2 files changed, 475 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/28156/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28156 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: I702796f2f941b78da904faa2ffdba4185333bc0d Gerrit-Change-Number: 28156 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

Change in osmo-ttcn3-hacks[master]: ggsn: Improve checks around Gy messages
by pespin 18 May '22

18 May '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28156 ) Change subject: ggsn: Improve checks around Gy messages ...................................................................... ggsn: Improve checks around Gy messages Change-Id: I702796f2f941b78da904faa2ffdba4185333bc0d --- M ggsn_tests/GGSN_Tests.ttcn M library/DIAMETER_Templates.ttcn 2 files changed, 473 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/28156/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index cc26f92..319bb09 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -130,9 +130,11 @@ var integer g_use_echo_intval := 0; /* 0 = disabled */ /* emulated PCRF, used with m_ggsn_impl = GGSN_IMPL_OPEN5GS */ + var DIAMETER_conn_parameters gx_pars; var DIAMETER_Emulation_CT vc_Gx; port DIAMETER_PT Gx_UNIT; port DIAMETEREM_PROC_PT Gx_PROC; + var DIAMETER_conn_parameters gy_pars; var DIAMETER_Emulation_CT vc_Gy; port DIAMETER_PT Gy_UNIT; port DIAMETEREM_PROC_PT Gy_PROC; @@ -212,10 +214,9 @@ unitdata_cb := refers(DiameterForwardUnitdataCallback), raw := true /* handler mode (single component for all IMSI)) */ }; - var DIAMETER_conn_parameters pars; /* Gx setup: */ - pars := { + gx_pars := { remote_ip := m_ggsn_ip_gtpc, remote_sctp_port := -1, local_ip := m_bind_ip_gtpc, @@ -229,10 +230,10 @@ map(vc_Gx:DIAMETER, system:DIAMETER_CODEC_PT); connect(vc_Gx:DIAMETER_UNIT, self:Gx_UNIT); connect(vc_Gx:DIAMETER_PROC, self:Gx_PROC); - vc_Gx.start(DIAMETER_Emulation.main(ops, pars, id)); + vc_Gx.start(DIAMETER_Emulation.main(ops, gx_pars, id)); /* Gy setup: */ - pars := { + gy_pars := { remote_ip := m_ggsn_ip_gtpc, remote_sctp_port := -1, local_ip := m_bind_ip_gtpc, @@ -246,7 +247,7 @@ map(vc_Gy:DIAMETER, system:DIAMETER_CODEC_PT); connect(vc_Gy:DIAMETER_UNIT, self:Gy_UNIT); connect(vc_Gy:DIAMETER_PROC, self:Gy_PROC); - vc_Gy.start(DIAMETER_Emulation.main(ops, pars, id)); + vc_Gy.start(DIAMETER_Emulation.main(ops, gy_pars, id)); f_diameter_wait_capability(Gx_UNIT); f_diameter_wait_capability(Gy_UNIT); @@ -485,9 +486,173 @@ } } - private altstep as_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) runs on GT_CT { + private function f_tr_DIA_Gy_CCR(template (omit) PdpContext ctx, DCC_NONE_CC_Request_Type req_type) + runs on GT_CT return template (present) PDU_DIAMETER + { + var template (present) PDU_DIAMETER tpl; + var charstring smf_origin_host := "smf.localdomain"; + var template (present) octetstring imsi := ?; + var template (present) octetstring msisdn := ?; + var template (present) octetstring imeisv := ?; + var template (present) octetstring rat_type := ?; + var template (present) OCT4 charging_char := ?; + var template (present) OCT1 nsapi := ?; + if (not istemplatekind(ctx, "omit")) { + var PdpContext ctx_val := valueof(ctx); + imsi := char2oct(f_dec_TBCD(imsi_hex2oct(ctx_val.imsi))); + msisdn := char2oct(f_dec_TBCD(substr(ctx_val.msisdn, 1, lengthof(ctx_val.msisdn) -1))); + imeisv := char2oct(f_dec_TBCD(ctx_val.imeisv)); + rat_type := ctx_val.ratType; + charging_char := char2oct(oct2str(ctx_val.charging_char)); + nsapi := char2oct(hex2str(bit2hex(ctx_val.nsapi))); + } + select (req_type) { + case (INITIAL_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(smf_origin_host), + tr_AVP_OriginRealm(gy_pars.origin_realm), + tr_AVP_DestinationRealm(gy_pars.origin_realm), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_ServiceContextId, + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?), + tr_AVP_EventTimestamp(?), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), + tr_AVP_RequestedAction(DIRECT_DEBITING), + tr_AVP_3GPP_AoCRequestType, + tr_AVP_MultipleServicesIndicator, + tr_AVP_Multiple_Services_Credit_Control(content := superset( + tr_AVP_Requested_Service_Unit, + tr_AVP_Used_Service_Unit, + tr_AVP_3GPP_QoS_Information, + tr_AVP_GI_3GPP_RatType(rat_type) + )), + tr_AVP_3GPP_ServiceInformation(content := superset( + tr_AVP_3GPP_PSInformation(content := superset( + tr_AVP_3GPP_ChargingId, + tr_AVP_3GPP_PDPType((IPv4,IPv6,IPv4v6)), + tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), + tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, f_inet_addr(m_bind_ip_gtpc))), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, f_inet_addr(m_ggsn_ip_gtpc))), + tr_AVP_3GPP_CalledStationId, + tr_AVP_3GPP_SelectionMode, + tr_AVP_3GPP_ChargingCharacteristics(charging_char), + tr_AVP_3GPP_SGSNMCCMNC, + tr_AVP_3GPP_NSAPI(nsapi), + tr_AVP_3GPP_MS_TimeZone, + tr_AVP_3GPP_ULI, + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + }) + )) + )) + )); + } + case (UPDATE_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(smf_origin_host), + tr_AVP_OriginRealm(gy_pars.origin_realm), + tr_AVP_DestinationRealm(gy_pars.origin_realm), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_ServiceContextId, + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?), + tr_AVP_DestinationHost(?), + tr_AVP_EventTimestamp(?), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), + tr_AVP_RequestedAction(DIRECT_DEBITING), + tr_AVP_3GPP_AoCRequestType, + tr_AVP_MultipleServicesIndicator, + tr_AVP_Multiple_Services_Credit_Control(content := superset( + tr_AVP_Requested_Service_Unit, + tr_AVP_Used_Service_Unit, + tr_AVP_3GPP_Reporting_Reason, + tr_AVP_3GPP_QoS_Information, + tr_AVP_GI_3GPP_RatType(rat_type) + )), + tr_AVP_3GPP_ServiceInformation(content := superset( + tr_AVP_3GPP_PSInformation(content := superset( + tr_AVP_3GPP_ChargingId, + /* tr_AVP_3GPP_PDPType, Only in INIT */ + tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), + tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, f_inet_addr(m_bind_ip_gtpc))), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, f_inet_addr(m_ggsn_ip_gtpc))), + tr_AVP_3GPP_CalledStationId, + tr_AVP_3GPP_SelectionMode, + tr_AVP_3GPP_ChargingCharacteristics(charging_char), + tr_AVP_3GPP_SGSNMCCMNC, + tr_AVP_3GPP_NSAPI(nsapi), + tr_AVP_3GPP_MS_TimeZone, + tr_AVP_3GPP_ULI, + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + }) + )) + )) + )); + } + case (TERMINATION_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(smf_origin_host), + tr_AVP_OriginRealm(gy_pars.origin_realm), + tr_AVP_DestinationRealm(gy_pars.origin_realm), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_ServiceContextId, + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?), + tr_AVP_DestinationHost(?), + tr_AVP_EventTimestamp(?), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), + tr_AVP_TerminationCause(?), + tr_AVP_RequestedAction(DIRECT_DEBITING), + tr_AVP_3GPP_AoCRequestType, + tr_AVP_MultipleServicesIndicator, + tr_AVP_Multiple_Services_Credit_Control(content := superset( + /* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */ + tr_AVP_Used_Service_Unit, + tr_AVP_3GPP_QoS_Information, + tr_AVP_GI_3GPP_RatType(rat_type) + )), + tr_AVP_3GPP_ServiceInformation(content := superset( + tr_AVP_3GPP_PSInformation(content := superset( + tr_AVP_3GPP_ChargingId, + /* tr_AVP_3GPP_PDPType, Only in INIT */ + tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), + tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, f_inet_addr(m_bind_ip_gtpc))), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, f_inet_addr(m_ggsn_ip_gtpc))), + tr_AVP_3GPP_CalledStationId, + tr_AVP_3GPP_SelectionMode, + tr_AVP_3GPP_ChargingCharacteristics(charging_char), + tr_AVP_3GPP_SGSNMCCMNC, + tr_AVP_3GPP_NSAPI(nsapi), + tr_AVP_3GPP_MS_TimeZone, + tr_AVP_3GPP_ULI, + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + }) + )) + )) + )); + } + } + return tpl; + } + + private altstep as_DIA_Gy_CCR(template (omit) PdpContext ctx, DCC_NONE_CC_Request_Type req_type) runs on GT_CT { var PDU_DIAMETER rx_dia; - [] Gy_UNIT.receive(tr_DIA_Gy_CCR(req_type := req_type)) -> value rx_dia { + [] Gy_UNIT.receive(f_tr_DIA_Gy_CCR(ctx, req_type := req_type)) -> value rx_dia { var template (value) PDU_DIAMETER tx_dia; var template (omit) AVP avp; var octetstring sess_id; @@ -498,6 +663,7 @@ avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_DCC_NONE_CC_Request_Number); req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); + if (g_gy_validity_time > 0) { tx_dia := ts_DIA_Gy_CCA_ValidityTime(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, req_type, req_num, g_gy_validity_time); @@ -530,7 +696,7 @@ as_DIA_Gx_CCR(INITIAL_REQUEST); } if (Gy_PROC.checkstate("Connected")) { - as_DIA_Gy_CCR(INITIAL_REQUEST); + as_DIA_Gy_CCR(ctx, INITIAL_REQUEST); } alt { [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ctx.teic)) -> value ud { @@ -595,7 +761,7 @@ as_DIA_Gx_CCR(TERMINATION_REQUEST); } if (Gy_PROC.checkstate("Connected") and expect_diameter) { - as_DIA_Gy_CCR(TERMINATION_REQUEST); + as_DIA_Gy_CCR(ctx, TERMINATION_REQUEST); } alt { [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextResponse, expect_teid)) -> value ud { @@ -2225,17 +2391,17 @@ g_gy_validity_time := 2; /* First update reports octests/pkt on both UL/DL (see icmp ping-pong above) */ - as_DIA_Gy_CCR(UPDATE_REQUEST); + as_DIA_Gy_CCR(ctx, UPDATE_REQUEST); /* Second update: 0 ul/dl pkt/octet should be reported, since nothing was sent */ - as_DIA_Gy_CCR(UPDATE_REQUEST); + as_DIA_Gy_CCR(ctx, UPDATE_REQUEST); /* Third update: make sure report contains again octets/pkts for both UL/DL: */ f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr, dns1_addr)); f_wait_icmp4_echo_reply(ctx); f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr, dns1_addr)); f_wait_icmp4_echo_reply(ctx); - as_DIA_Gy_CCR(UPDATE_REQUEST); + as_DIA_Gy_CCR(ctx, UPDATE_REQUEST); /* Let the CCA reach the GGSN */ f_sleep(0.5); diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 07b5c74..855358d 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -195,8 +195,23 @@ vendor_id := vendor_id_3GPP } +template (present) AVP_Address tr_AVP_Address(template (present) AddressType addr_type := ?, + template (present) octetstring addr_data := ?) := { + address_type := addr_type, + address_data := addr_data +} + template (present) GenericAVP tr_AVP_SubcrId(template (present) DCC_NONE_Subscription_Id t) := { avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Subscription_Id), + avp_data := { + avp_DCC_NONE_Subscription_Id := t + } + } +} + +template (present) GenericAVP tr_AVP_SubcrIdType(template (present) DCC_NONE_Subscription_Id_Type t) := { + avp := { avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Subscription_Id_Type), avp_data := { avp_DCC_NONE_Subscription_Id_Type := t @@ -204,6 +219,42 @@ } } +template (present) GenericAVP tr_AVP_SubcrIdData(template (present) DCC_NONE_Subscription_Id_Data t) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Subscription_Id_Data), + avp_data := { + avp_DCC_NONE_Subscription_Id_Data := t + } + } +} + +template (present) GenericAVP tr_AVP_RequestedAction(template (present) DCC_NONE_Requested_Action t := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Requested_Action), + avp_data := { + avp_DCC_NONE_Requested_Action := t + } + } +} + +template (present) GenericAVP tr_AVP_MultipleServicesIndicator(template (present) DCC_NONE_Multiple_Services_Indicator t := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Multiple_Services_Indicator), + avp_data := { + avp_DCC_NONE_Multiple_Services_Indicator := t + } + } +} + +template (present) GenericAVP tr_AVP_ServiceContextId(template (present) DCC_NONE_Service_Context_Id id := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Service_Context_Id), + avp_data := { + avp_DCC_NONE_Service_Context_Id := id + } + } +} + template (value) GenericAVP ts_AVP_OriginHost(template (value) charstring host) := { avp := { avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Origin_Host), @@ -257,6 +308,15 @@ } } +template (present) GenericAVP tr_AVP_TerminationCause(template (present) BASE_NONE_Termination_Cause tc) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Termination_Cause), + avp_data := { + avp_BASE_NONE_Termination_Cause := tc + } + } +} + template (value) GenericAVP ts_AVP_HostIpAddr(template (value) OCTET4 ipv4_addr) := { avp := { avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Host_IP_Address), @@ -381,7 +441,14 @@ } } - +template (present) GenericAVP tr_AVP_EventTimestamp(template (present) AVP_Unsigned32 n := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Event_Timestamp), + avp_data := { + avp_BASE_NONE_Event_Timestamp := n + } + } +} template (value) GenericAVP ts_AVP_SuppVendorIdRaw(uint32_t vendor_id) := { @@ -446,6 +513,15 @@ } } +template (present) GenericAVP tr_AVP_DestinationHost(template (present) charstring host := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Destination_Host), + avp_data := { + avp_BASE_NONE_Destination_Host := host + } + } +} + /* 3.3 Destination Realm */ template (value) GenericAVP ts_AVP_DestinationRealm(template (value) charstring dest_realm) := { avp := { @@ -611,7 +687,7 @@ } /* TS 29.262 7.3.13 RAT-Type */ -template (value) GenericAVP ts_AVP_3GPP_RatType(template (value) PCC_3GPP_RAT_Type rat_type) := { +template (value) GenericAVP ts_AVP_PCC_3GPP_RatType(template (value) PCC_3GPP_RAT_Type rat_type) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_RAT_Type), avp_data := { @@ -619,7 +695,7 @@ } } } -template (present) GenericAVP tr_AVP_3GPP_RatType(template (present) PCC_3GPP_RAT_Type rat_type := ?) := { +template (present) GenericAVP tr_AVP_PCC_3GPP_RatType(template (present) PCC_3GPP_RAT_Type rat_type := ?) := { avp := { avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_RAT_Type), avp_data := { @@ -628,6 +704,15 @@ } } +template (present) GenericAVP tr_AVP_GI_3GPP_RatType(template (present) GI_3GPP_3GPP_RAT_Type rat_type := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_GI_3GPP_3GPP_RAT_Type), + avp_data := { + avp_GI_3GPP_3GPP_RAT_Type := rat_type + } + } +} + /* TS 29.262 7.3.7 ULR-Flags */ template (value) GenericAVP ts_AVP_3GPP_UlrFlags(template (value) UINT32 flags) := { avp := { @@ -774,6 +859,15 @@ } } +template (present) GenericAVP tr_AVP_3GPP_QoS_Information(template (present) AVP_list list := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_QoS_Information), + avp_data := { + avp_PCC_3GPP_QoS_Information := list + } + } +} + template (value) GenericAVP ts_AVP_3GPP_QosClassId(uint32_t id) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_QoS_Class_Identifier), @@ -850,7 +944,167 @@ } } +template (present) GenericAVP tr_AVP_3GPP_Reporting_Reason(template (present) DCA_3GPP_Reporting_Reason r := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_DCA_3GPP_Reporting_Reason), + avp_data := { + avp_DCA_3GPP_Reporting_Reason := r + } + } +} +template (present) GenericAVP tr_AVP_3GPP_AoCRequestType(template (present) DCA_3GPP_AoC_Request_Type t := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_DCA_3GPP_AoC_Request_Type), + avp_data := { + avp_DCA_3GPP_AoC_Request_Type := t + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_ServiceInformation(template (present) AVP_list content := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_DCA_3GPP_Service_Information), + avp_data := { + avp_DCA_3GPP_Service_Information := content + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_PSInformation(template (present) AVP_list content := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_DCA_3GPP_PS_Information), + avp_data := { + avp_DCA_3GPP_PS_Information := content + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_ChargingId(template (present) AVP_OctetString id := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_GI_3GPP_3GPP_Charging_Id), + avp_data := { + avp_GI_3GPP_3GPP_Charging_Id := id + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_PDPType(template (present) GI_3GPP_3GPP_PDP_Type t := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_GI_3GPP_3GPP_PDP_Type), + avp_data := { + avp_GI_3GPP_3GPP_PDP_Type := t + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_PDPAddress(template (present) DCA_3GPP_PDP_Address addr := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_DCA_3GPP_PDP_Address), + avp_data := { + avp_DCA_3GPP_PDP_Address := addr + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_SGSNAddress(template (present) DCA_3GPP_SGSN_Address addr := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_DCA_3GPP_SGSN_Address), + avp_data := { + avp_DCA_3GPP_SGSN_Address := addr + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_GGSNAddress(template (present) DCA_3GPP_GGSN_Address addr := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_DCA_3GPP_GGSN_Address), + avp_data := { + avp_DCA_3GPP_GGSN_Address := addr + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_SelectionMode(template (present) GI_3GPP_3GPP_Selection_Mode sm := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_GI_3GPP_3GPP_Selection_Mode), + avp_data := { + avp_GI_3GPP_3GPP_Selection_Mode := sm + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_ChargingCharacteristics(template (present) GI_3GPP_3GPP_Charging_Characteristics cc := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_GI_3GPP_3GPP_Charging_Characteristics), + avp_data := { + avp_GI_3GPP_3GPP_Charging_Characteristics := cc + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_SGSNMCCMNC(template (present) GI_3GPP_3GPP_SGSN_MCC_MNC smn := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_GI_3GPP_3GPP_SGSN_MCC_MNC), + avp_data := { + avp_GI_3GPP_3GPP_SGSN_MCC_MNC := smn + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_NSAPI(template (present) GI_3GPP_3GPP_NSAPI nsapi := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_GI_3GPP_3GPP_NSAPI), + avp_data := { + avp_GI_3GPP_3GPP_NSAPI := nsapi + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_MS_TimeZone(template (present) GI_3GPP_3GPP_MS_TimeZone ms_tz := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_GI_3GPP_3GPP_MS_TimeZone), + avp_data := { + avp_GI_3GPP_3GPP_MS_TimeZone := ms_tz + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_ULI(template (present) GI_3GPP_3GPP_User_Location_Info uli := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_GI_3GPP_3GPP_User_Location_Info), + avp_data := { + avp_GI_3GPP_3GPP_User_Location_Info := uli + } + } +} + +template (present) GenericAVP tr_AVP_UserEquipmentInfo(template (present) DCC_NONE_User_Equipment_Info uei := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_User_Equipment_Info), + avp_data := { + avp_DCC_NONE_User_Equipment_Info := uei + } + } +} + +template (present) GenericAVP tr_AVP_UserEquipmentInfoType(template (present) DCC_NONE_User_Equipment_Info_Type ueit := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_User_Equipment_Info_Type), + avp_data := { + avp_DCC_NONE_User_Equipment_Info_Type := ueit + } + } +} + +template (present) GenericAVP tr_AVP_UserEquipmentInfoValue(template (present) DCC_NONE_User_Equipment_Info_Value ueiv := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_User_Equipment_Info_Value), + avp_data := { + avp_DCC_NONE_User_Equipment_Info_Value := ueiv + } + } +} /* TS 29.262 7.3.62 PDN-Type */ template (value) GenericAVP ts_AVP_3GPP_PdnType(template (value) AAA_3GPP_PDN_Type pdn_type) := { @@ -871,6 +1125,34 @@ } } } +template (present) GenericAVP tr_AVP_Multiple_Services_Credit_Control(template (present) AVP_list content := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Multiple_Services_Credit_Control), + avp_data := { + avp_DCC_NONE_Multiple_Services_Credit_Control := content + } + } +} + +/* Requested-Service-Unit AVP */ +template (present) GenericAVP tr_AVP_Requested_Service_Unit(template (present) AVP_list content := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Requested_Service_Unit), + avp_data := { + avp_DCC_NONE_Requested_Service_Unit := content + } + } +} + +/* Used-Service-Unit AVP */ +template (present) GenericAVP tr_AVP_Used_Service_Unit(template (present) AVP_list content := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Used_Service_Unit), + avp_data := { + avp_DCC_NONE_Used_Service_Unit := content + } + } +} /* RFC4006 8.17 Granted-Service-Unit AVP */ template (value) GenericAVP ts_AVP_Granted_Service_Unit(template (value) AVP_list content) := { @@ -912,6 +1194,14 @@ } } +template (present) GenericAVP tr_AVP_3GPP_CalledStationId(template (present) DNAS_NONE_Called_Station_Id id := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DNAS_NONE_Called_Station_Id), + avp_data := { + avp_DNAS_NONE_Called_Station_Id := id + } + } +} /* 5.3.2 Capabilities Exchange Answer */ @@ -1076,7 +1366,7 @@ ts_AVP_UserNameImsi(imsi), ts_AVP_3GPP_UlrFlags('00000000'O), ts_AVP_3GPP_VisitedPlmnId('11111F'O), - ts_AVP_3GPP_RatType(EUTRAN), + ts_AVP_PCC_3GPP_RatType(EUTRAN), ts_AVP_OriginHost(orig_host), ts_AVP_OriginRealm(orig_realm), ts_AVP_DestinationRealm(dest_realm) @@ -1101,7 +1391,7 @@ tr_AVP_OriginRealm(orig_realm), tr_AVP_DestinationRealm(dest_realm), tr_AVP_UserNameImsi(imsi), - tr_AVP_3GPP_RatType(EUTRAN), + tr_AVP_PCC_3GPP_RatType, tr_AVP_3GPP_UlrFlags, tr_AVP_3GPP_VisitedPlmnId )); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28156 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: I702796f2f941b78da904faa2ffdba4185333bc0d Gerrit-Change-Number: 28156 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: DIAMETER_Templates: Drop unused param
by pespin 18 May '22

18 May '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28155 ) Change subject: DIAMETER_Templates: Drop unused param ...................................................................... DIAMETER_Templates: Drop unused param Change-Id: Ic806f7d23f6e3b23365f4d45874b0bc3b3ec91d1 --- M library/DIAMETER_Templates.ttcn 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/55/28155/1 diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 510a3d4..07b5c74 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -1155,7 +1155,6 @@ template (present) PDU_DIAMETER tr_DIA_Gx_CCR(template (present) DCC_NONE_CC_Request_Type req_type := INITIAL_REQUEST) := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, - app_id:=int2oct(c_DIAMETER_3GPP_Gx_AID, 4), avps := superset( tr_AVP_SessionId, tr_AVP_OriginHost, @@ -1168,7 +1167,6 @@ template (present) PDU_DIAMETER tr_DIA_Gy_CCR(template (present) DCC_NONE_CC_Request_Type req_type := INITIAL_REQUEST) := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, - app_id:=int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4), avps := superset( tr_AVP_SessionId, tr_AVP_OriginHost, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28155 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: Ic806f7d23f6e3b23365f4d45874b0bc3b3ec91d1 Gerrit-Change-Number: 28155 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: ggsn: Properly encode MISDN IE in GTP
by pespin 18 May '22

18 May '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28153 ) Change subject: ggsn: Properly encode MISDN IE in GTP ...................................................................... ggsn: Properly encode MISDN IE in GTP ISDN-AddressString contains an initial byte at the start. We didn't care so far because we were not yet checking the content of msisdn, so the usual first '12'O byte was being considered as a header. Let's store it in GTP format as before, but let's pass it as a charstring when initializing the PdpContext, so that the human-style is visible in the test for easy visualization/comparison (It will be verified in a follow-up patch in Gy Diameter interface). Change-Id: Ie1b65707d4b08f2201572e1fa44a1f9f985eb096 --- M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/gen_links.sh M ggsn_tests/regen_makefile.sh 3 files changed, 53 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/53/28153/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index c18e78e..cc26f92 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -11,6 +11,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ + import from TCCEncoding_Functions all; import from General_Types all; import from Osmocom_Types all; @@ -340,10 +341,10 @@ } /* define an (internal) representation of a PDP context */ - template PdpContext t_DefinePDP(hexstring imsi, octetstring msisdn, octetstring apn, + template PdpContext t_DefinePDP(hexstring imsi, charstring msisdn, octetstring apn, EndUserAddress eua, OCT1 ratType := '02'O /* GERAN */) := { imsi := imsi, - msisdn := msisdn, + msisdn := '11'O & f_enc_TBCD(msisdn), /* encoded as TS 29.060 7.7.33, TS 29.002 */ nsapi := f_rnd_nsapi(), apn := apn, pco_req := omit, @@ -1104,7 +1105,7 @@ testcase TC_pdp6_act_deact() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet6, valueof(t_EuaIPv6Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet6, valueof(t_EuaIPv6Dyn))); f_pdp_ctx_act(ctx); f_pdp_ctx_del(ctx, '1'B); f_shutdown_helper(); @@ -1114,7 +1115,7 @@ testcase TC_pdp6_act_deact_pcodns() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet6, valueof(t_EuaIPv6Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet6, valueof(t_EuaIPv6Dyn))); ctx.pco_req := valueof(ts_PCO_IPv6_DNS); f_pdp_ctx_act(ctx); @@ -1138,7 +1139,7 @@ testcase TC_pdp6_act_deact_icmp6() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet6, valueof(t_EuaIPv6Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet6, valueof(t_EuaIPv6Dyn))); ctx.pco_req := valueof(ts_PCO_IPv6_DNS); f_pdp_ctx_act(ctx); @@ -1158,7 +1159,7 @@ Test we can send ICMPv6 ping over GTPU to DNS server. */ testcase TC_pdp6_act_deact_gtpu_access() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet6, valueof(t_EuaIPv6Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet6, valueof(t_EuaIPv6Dyn))); ctx.pco_req := valueof(ts_PCO_IPv6_DNS); f_pdp_ctx_act(ctx); @@ -1189,7 +1190,7 @@ /* Check that attempting RA with another ll src addr won't work, packet dropped: */ testcase TC_pdp6_act_deact_gtpu_access_wrong_ll_saddr() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet6, valueof(t_EuaIPv6Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet6, valueof(t_EuaIPv6Dyn))); ctx.pco_req := valueof(ts_PCO_IPv6_DNS); f_pdp_ctx_act(ctx); @@ -1209,7 +1210,7 @@ /* Assert that packets with wrong global src addr are dropped by GGSN */ testcase TC_pdp6_act_deact_gtpu_access_wrong_global_saddr() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet6, valueof(t_EuaIPv6Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet6, valueof(t_EuaIPv6Dyn))); ctx.pco_req := valueof(ts_PCO_IPv6_DNS); f_pdp_ctx_act(ctx); @@ -1230,7 +1231,7 @@ /* Send an IPv4 ICMP ECHO REQUEST to APN6, should fail (packet dropped */ testcase TC_pdp6_act_deact_gtpu_access_ipv4_apn6() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet6, valueof(t_EuaIPv6Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet6, valueof(t_EuaIPv6Dyn))); ctx.pco_req := valueof(ts_PCO_IPv6_DNS); f_pdp_ctx_act(ctx); @@ -1250,8 +1251,8 @@ /* Validate if different clients (pdp ctx) can reach one another through GGSN. */ testcase TC_pdp6_clients_interact() runs on GT_CT { f_init(); - var PdpContext ctxA := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet6, valueof(t_EuaIPv6Dyn))); - var PdpContext ctxB := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet6, valueof(t_EuaIPv6Dyn))); + var PdpContext ctxA := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet6, valueof(t_EuaIPv6Dyn))); + var PdpContext ctxB := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet6, valueof(t_EuaIPv6Dyn))); f_pdp_ctx_act(ctxA); f_send_gtpu(ctxA, f_icmpv6_rs_for_pdp(ctxA)); f_wait_rtr_adv(ctxA); @@ -1283,7 +1284,7 @@ /* Test PDP context activation for dynamic IPv4 EUA without DNS request */ testcase TC_pdp4_act_deact() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); f_pdp_ctx_act(ctx); f_pdp_ctx_del(ctx, '1'B); f_shutdown_helper(); @@ -1294,7 +1295,7 @@ f_init(); var OCT4 ggsn_ip4_dns1 := f_inet_addr(m_ggsn_ip4_dns1); var OCT4 ggsn_ip4_dns2 := f_inet_addr(m_ggsn_ip4_dns2); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); ctx.pco_req := valueof(ts_PCO_IPv4_DNS_IPCP); f_pdp_ctx_act(ctx); f_PCO_ensure_no_duplicates(ctx.pco_neg); @@ -1320,7 +1321,7 @@ f_init(); var OCT4 ggsn_ip4_dns1 := f_inet_addr(m_ggsn_ip4_dns1); var OCT4 ggsn_ip4_dns2 := f_inet_addr(m_ggsn_ip4_dns2); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); ctx.pco_req := valueof(ts_PCO_PAP_IPv4_DNS); f_pdp_ctx_act(ctx); f_PCO_ensure_no_duplicates(ctx.pco_neg); @@ -1352,7 +1353,7 @@ /* Test PDP context activation for dynamic IPv4 EUA with IPv4 DNS in PCO */ testcase TC_pdp4_act_deact_pcodns() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); f_pdp_ctx_act(ctx); @@ -1376,7 +1377,7 @@ Test we can send ICMPv6 ping over GTPU to DNS server. */ testcase TC_pdp4_act_deact_gtpu_access() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); f_pdp_ctx_act(ctx); @@ -1395,7 +1396,7 @@ /* Assert that packets with wrong global src addr are dropped by GGSN */ testcase TC_pdp4_act_deact_gtpu_access_wrong_saddr() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); f_pdp_ctx_act(ctx); @@ -1413,7 +1414,7 @@ /* Send an IPv6 RA to APN4, should fail (packet dropped) */ testcase TC_pdp4_act_deact_gtpu_access_ipv6_apn4() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); f_pdp_ctx_act(ctx); @@ -1429,8 +1430,8 @@ /* Helper function for tests below. */ function f_pdp4_clients_interact() runs on GT_CT { f_init(); - var PdpContext ctxA := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); - var PdpContext ctxB := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctxA := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctxB := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); f_pdp_ctx_act(ctxA); f_pdp_ctx_act(ctxB); var OCT4 addrA := ctxA.eua.endUserAddress.endUserAddressIPv4.ipv4_address; @@ -1491,7 +1492,7 @@ * see also: Change-Id Icffde89f9bc5d8fcadf6e2dd6c0b4de03440edd5 and OS#3288 */ f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); var OCT4 ggsn_ip4_dns1 := f_inet_addr(m_ggsn_ip4_dns1); var OCT4 ggsn_ip4_dns2 := f_inet_addr(m_ggsn_ip4_dns2); var octetstring pco_neg_dns; @@ -1516,7 +1517,7 @@ f_pdp_ctx_del(ctx, '1'B); /* PCO with secondary DNS only */ - ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); ctx.pco_req := valueof(ts_PCO_IPv4_SEC_DNS_IPCP); f_pdp_ctx_act(ctx); pco_neg_dns := f_PCO_extract_proto(ctx.pco_neg, '8021'O, 1); @@ -1538,7 +1539,7 @@ * see also: Change-Id Icffde89f9bc5d8fcadf6e2dd6c0b4de03440edd5 and OS#3288 */ f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); var OCT4 ggsn_ip4_dns1 := f_inet_addr(m_ggsn_ip4_dns1); var OCT4 ggsn_ip4_dns2 := f_inet_addr(m_ggsn_ip4_dns2); var octetstring pco_neg_dns; @@ -1568,7 +1569,7 @@ /* Validate that SUT updates remote TEIC when requested through UpdatePDPContextRequest */ testcase TC_pdp4_act_update_teic() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); f_pdp_ctx_act(ctx); @@ -1584,7 +1585,7 @@ /* Validate that SUT updates remote TEID when requested through UpdatePDPContextRequest */ testcase TC_pdp4_act_update_teid() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); f_pdp_ctx_act(ctx); @@ -1612,7 +1613,7 @@ /* Test IPv4v6 context activation for dynamic IPv4v6 EUA without DNS request */ testcase TC_pdp46_act_deact() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); f_pdp_ctx_act(ctx); f_pdp_ctx_del(ctx, '1'B); f_shutdown_helper(); @@ -1623,7 +1624,7 @@ f_init(); var OCT4 ggsn_ip4_dns1 := f_inet_addr(m_ggsn_ip4_dns1); var OCT4 ggsn_ip4_dns2 := f_inet_addr(m_ggsn_ip4_dns2); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); ctx.pco_req := valueof(ts_PCO_IPv4_DNS_IPCP); f_pdp_ctx_act(ctx); f_PCO_ensure_no_duplicates(ctx.pco_neg); @@ -1648,7 +1649,7 @@ /* Test PDP context activation for dynamic IPv4v6 EUA with IPv6 DNS in PCO and router solicitation/advertisement */ testcase TC_pdp46_act_deact_icmp6() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); ctx.pco_req := valueof(ts_PCO_IPv6_DNS); f_pdp_ctx_act(ctx); @@ -1664,7 +1665,7 @@ testcase TC_pdp46_act_deact_pcodns4() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); f_pdp_ctx_act(ctx); @@ -1688,7 +1689,7 @@ testcase TC_pdp46_act_deact_pcodns6() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); ctx.pco_req := valueof(ts_PCO_IPv6_DNS); f_pdp_ctx_act(ctx); @@ -1712,7 +1713,7 @@ Test we can send ICMPv6 ping over GTPU to DNS server. */ testcase TC_pdp46_act_deact_gtpu_access() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); f_pdp_ctx_act(ctx); @@ -1730,7 +1731,7 @@ /* Assert that packets with wrong ipv4 src addr are dropped by GGSN on APN IPv4v6 */ testcase TC_pdp46_act_deact_gtpu_access_wrong_saddr_ipv4() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); f_pdp_ctx_act(ctx); @@ -1747,7 +1748,7 @@ /* Check that attempting RA with another ll src addr won't work, packet dropped: */ testcase TC_pdp46_act_deact_gtpu_access_wrong_ll_saddr_ipv6() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); f_pdp_ctx_act(ctx); @@ -1763,7 +1764,7 @@ /* Assert that packets with wrong ipv6 global src addr are dropped by GGSN on APN IPv4v6 */ testcase TC_pdp46_act_deact_gtpu_access_wrong_global_saddr_ipv6() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); ctx.pco_req := valueof(ts_PCO_IPv6_DNS); f_pdp_ctx_act(ctx); @@ -1784,8 +1785,8 @@ /* Validate if different clients (pdp ctx) can reach one another through GGSN. */ testcase TC_pdp46_clients_interact() runs on GT_CT { f_init(); - var PdpContext ctxA := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); - var PdpContext ctxB := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); + var PdpContext ctxA := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); + var PdpContext ctxB := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); f_pdp_ctx_act(ctxA); f_send_gtpu(ctxA, f_icmpv6_rs_for_pdp46(ctxA)); f_wait_rtr_adv(ctxA); @@ -1822,7 +1823,7 @@ var CreatePDPContextResponse cpr; f_init(); - var PdpContext ctx46 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dynv6Dyn))); + var PdpContext ctx46 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dynv6Dyn))); cpr := f_pdp_ctx_act(ctx46, (cause_unknown_pdp, cause_new_pdp_type)); if (cpr.cause.causevalue == cause_new_pdp_type) { @@ -1842,10 +1843,10 @@ * IPv4 PDP context and an IPv6 PDP context, both to the same APN. A * typical MS first attempts v4v6, and if rejected, then tries v4 * and v6 separetly */ - var PdpContext ctx4 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctx4 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); f_pdp_ctx_act(ctx4, cause_accept); /* Normal accept cause */ - var PdpContext ctx6 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv6Dyn))); + var PdpContext ctx6 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv6Dyn))); f_pdp_ctx_act(ctx6, cause_unknown_pdp); /* Cause: Unknown PDP address or PDP type */ f_pdp_ctx_del(ctx4, '1'B); @@ -1861,8 +1862,8 @@ var boolean ctxB_created := false; f_init(); - var PdpContext ctxA := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); - var PdpContext ctxB := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctxA := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctxB := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); f_pdp_ctx_act(ctxA); g_restart_ctr := int2oct((oct2int(g_restart_ctr) + 1) mod 256, 1); @@ -1922,7 +1923,7 @@ detected, saved duplicate response should be sent back. */ testcase TC_act_deact_retrans_duplicate() runs on GT_CT { f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); f_pdp_ctx_act(ctx); f_pdp_ctx_del(ctx, '1'B); /* leave some time in between to make sure retransmit response queue keeps packets for a while */ @@ -1945,7 +1946,7 @@ g_use_echo_intval := 5; timer T_echo; f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); f_pdp_ctx_act(ctx); /* Wait to receive echo request and send initial Restart counter */ @@ -2000,7 +2001,7 @@ f_init(); for (var integer i := 0; i < num_ctx; i := i + 1) { - ctx[i] := valueof(t_DefinePDP(f_rnd_imsi('26242'H), f_rnd_msisdn('1234'O), c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx[i] := valueof(t_DefinePDP(f_rnd_imsi('26242'H), f_dec_TBCD(f_rnd_msisdn('1234'O)), c_ApnInternet, valueof(t_EuaIPv4Dyn))); ctx[i].teic := int2oct(i+1, 4); /* +1: skip TEIC=0 */ ctx[i].teid := int2oct(i+1, 4); /* +1: skip TEID=0 */ ctx[i].pco_req := valueof(ts_PCO_IPv4_DNS_CONT); @@ -2011,7 +2012,7 @@ T_next.start; alt { [Gx_PROC.checkstate("Connected")] as_DIA_Gx_CCR(INITIAL_REQUEST) { repeat; } - [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(INITIAL_REQUEST) { repeat; } + [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(omit, INITIAL_REQUEST) { repeat; } [] pingpong(); [] T_next.timeout { f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctx[next_req_ctx].imsi, g_restart_ctr, @@ -2067,7 +2068,7 @@ T_next.start; alt { [Gx_PROC.checkstate("Connected")] as_DIA_Gx_CCR(TERMINATION_REQUEST) { repeat; } - [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(TERMINATION_REQUEST) { repeat; } + [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(omit, TERMINATION_REQUEST) { repeat; } [] pingpong(); [] T_next.timeout { f_send_gtpc(ts_GTPC_DeletePDP(g_peer_c, g_c_seq_nr, ctx[next_req_ctx].teic_remote, ctx[next_req_ctx].nsapi, '1'B)); @@ -2120,12 +2121,12 @@ T_next.start; alt { [Gx_PROC.checkstate("Connected")] as_DIA_Gx_CCR(INITIAL_REQUEST) { repeat; } - [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(INITIAL_REQUEST) { repeat; } + [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(omit, INITIAL_REQUEST) { repeat; } [] pingpong(); [] T_next.timeout { if (cont_req) { if (next_req_ctx - rx_resp_ctx < 100) { /* if we have too many in progress, wait a bit to continue */ - ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), f_rnd_msisdn('1234'O), c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), f_dec_TBCD(f_rnd_msisdn('1234'O)), c_ApnInternet, valueof(t_EuaIPv4Dyn))); ctx.nsapi := '0001'B; ctx.teic := int2oct(next_req_ctx+1, 4); /* +1: skip TEIC=0 */ ctx.teid := int2oct(next_req_ctx+1, 4); /* +1: skip TEID=0 */ @@ -2171,7 +2172,7 @@ T_next.start; alt { [Gx_PROC.checkstate("Connected")] as_DIA_Gx_CCR(TERMINATION_REQUEST) { repeat; } - [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(TERMINATION_REQUEST) { repeat; } + [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(omit, TERMINATION_REQUEST) { repeat; } [] pingpong(); [] T_next.timeout { f_send_gtpc(ts_GTPC_DeletePDP(g_peer_c, g_c_seq_nr, teic_list[next_req_ctx], '0001'B, '1'B)); @@ -2208,7 +2209,7 @@ g_gy_validity_time := 3; /* Grant access for 3 seconds, needs to be re-validated afterwards */ f_init(); - var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234567890'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); f_pdp_ctx_act(ctx); diff --git a/ggsn_tests/gen_links.sh b/ggsn_tests/gen_links.sh index 6626467..c30e3da 100755 --- a/ggsn_tests/gen_links.sh +++ b/ggsn_tests/gen_links.sh @@ -10,6 +10,7 @@ DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" +FILES+=" TCCEncoding_Functions.ttcn TCCEncoding.cc " # BCD coding gen_links $DIR $FILES DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src diff --git a/ggsn_tests/regen_makefile.sh b/ggsn_tests/regen_makefile.sh index 4bdc87a..bd1b958 100755 --- a/ggsn_tests/regen_makefile.sh +++ b/ggsn_tests/regen_makefile.sh @@ -18,6 +18,7 @@ Native_FunctionDefs.cc TCCConversion.cc TCCInterface.cc + TCCEncoding.cc TELNETasp_PT.cc UDP_EncDec.cc " -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28153 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: Ie1b65707d4b08f2201572e1fa44a1f9f985eb096 Gerrit-Change-Number: 28153 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2025

2024

2023

2022

gerrit-log