May 2022 - gerrit-log - lists.osmocom.org

Change in pysim[master]: pySim-shell: more generic export options

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28159 ) Change subject: pySim-shell: more generic export options ...................................................................... pySim-shell: more generic export options The as_json parameter has been added as an additional parameter to the export function. Lets use a dictionary here and put the parameter in it. This makes it easier to add more options in the future Change-Id: Ie860eec918e7cdb01651642f4bc2474c9fb1924f --- M pySim-shell.py 1 file changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/59/28159/1 diff --git a/pySim-shell.py b/pySim-shell.py index 33c18fd..5a51fcd 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -461,7 +461,7 @@ self._cmd.poutput(directory_str) self._cmd.poutput("%d files" % len(selectables)) - def walk(self, indent=0, action=None, context=None, as_json=False): + def walk(self, indent=0, action=None, context=None, opts={}): """Recursively walk through the file system, starting at the currently selected DF""" files = self._cmd.rs.selected_file.get_selectables( flags=['FNAMES', 'ANAMES']) @@ -493,12 +493,12 @@ # If the DF was skipped, we never have entered the directory # below, so we must not move up. if skip_df == False: - self.walk(indent + 1, action, context, as_json) + self.walk(indent + 1, action, context, opts) fcp_dec = self._cmd.rs.select("..", self._cmd) elif action: df_before_action = self._cmd.rs.selected_file - action(f, context, as_json) + action(f, context, opts) # When walking through the file system tree the action must not # always restore the currently selected file to the file that # was selected before executing the action() callback. @@ -510,10 +510,11 @@ """Display a filesystem-tree with all selectable files""" self.walk() - def export(self, filename, context, as_json=False): + def export(self, filename, context, opts): """ Select and export a single file """ context['COUNT'] += 1 df = self._cmd.rs.selected_file + as_json = opts['JSON'] # The currently selected file (not the file we are going to export) # must always be an ADF or DF. From this starting point we select @@ -619,10 +620,11 @@ """Export files to script that can be imported back later""" context = {'ERR': 0, 'COUNT': 0, 'BAD': [], 'DF_SKIP': 0, 'DF_SKIP_REASON': []} + opts_export = {'JSON': opts.json} if opts.filename: - self.export(opts.filename, context, opts.json) + self.export(opts.filename, context, opts_export) else: - self.walk(0, self.export, context, opts.json) + self.walk(0, self.export, context, opts_export) self._cmd.poutput(boxed_heading_str("Export summary")) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie860eec918e7cdb01651642f4bc2474c9fb1924f Gerrit-Change-Number: 28159 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in pysim[master]: pySim-shell: explain why we insist on a DF or ADF

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28158 ) Change subject: pySim-shell: explain why we insist on a DF or ADF ...................................................................... pySim-shell: explain why we insist on a DF or ADF Change-Id: I155cefb10864432d59a0a66410783b4c9772f8a4 --- M pySim-shell.py 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/58/28158/1 diff --git a/pySim-shell.py b/pySim-shell.py index 06977f0..33c18fd 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -515,6 +515,10 @@ context['COUNT'] += 1 df = self._cmd.rs.selected_file + # The currently selected file (not the file we are going to export) + # must always be an ADF or DF. From this starting point we select + # the EF we want to export. To maintain consistency we will then + # select the current DF again (see comment below). if not isinstance(df, CardDF): raise RuntimeError( "currently selected file %s is not a DF or ADF" % str(df)) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28158 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I155cefb10864432d59a0a66410783b4c9772f8a4 Gerrit-Change-Number: 28158 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Build failure of network:osmocom:nightly/osmo-msc in Raspbian_10/armv7l

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o… Package network:osmocom:nightly/osmo-msc failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 1019s] 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 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -c -o msc_vlr_test_no_authen.o msc_vlr_test_no_authen.c [ 1024s] 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 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -std=gnu11 -c -o msc_vlr_tests.o msc_vlr_tests.c [ 1025s] 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 -fdebug-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 [ 1026s] /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 -fdebug-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 [ 1026s] libtool: 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 -fdebug-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/arm-linux-gnueabihf/libsmpp34.so /usr/lib/arm-linux-gnueabihf/libosmogsm.so /usr/lib/arm-linux-gnueabihf/libosmovty.so /usr/lib/arm-linux-gnueabihf/libosmocore.so /usr/lib/arm-linux-gnueabihf/libosmoabis.so /usr/lib/arm-linux-gnueabihf/libosmo-sigtran.so -losmo-ranap -ltalloc -lasn1c -losmo-mgcp-client /usr/lib/arm-linux-gnueabihf/libosmo-gsup-client.so /usr/lib/arm-linux-gnueabihf/libsqlite3.so -ldbi -pthread [ 1026s] /usr/bin/ld: cannot find -ldbi [ 1026s] collect2: error: ld returned 1 exit status [ 1026s] make[6]: *** [Makefile:764: msc_vlr_test_no_authen] Error 1 [ 1026s] make[6]: Leaving directory '/usr/src/packages/BUILD/tests/msc_vlr' [ 1026s] make[5]: *** [Makefile:936: check-am] Error 2 [ 1026s] make[5]: Leaving directory '/usr/src/packages/BUILD/tests/msc_vlr' [ 1026s] make[4]: *** [Makefile:423: check-recursive] Error 1 [ 1026s] make[4]: Leaving directory '/usr/src/packages/BUILD/tests' [ 1026s] make[3]: *** [Makefile:471: check-recursive] Error 1 [ 1026s] make[3]: Leaving directory '/usr/src/packages/BUILD' [ 1026s] make[2]: *** [Makefile:765: check] Error 2 [ 1026s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1026s] dh_auto_test: make -j1 check VERBOSE=1 returned exit code 2 [ 1026s] make[1]: *** [debian/rules:63: override_dh_auto_test] Error 1 [ 1026s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1026s] make: *** [debian/rules:45: build] Error 2 [ 1026s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1026s] ### VM INTERACTION START ### [ 1027s] [ 1001.388390] sysrq: SysRq : Power Off [ 1027s] [ 1001.390257] reboot: Power down [ 1027s] ### VM INTERACTION END ### [ 1027s] [ 1027s] armbuild21 failed "build osmo-msc_1.8.0.33.d302.202205180026.dsc" at Wed May 18 20:51:49 UTC 2022. [ 1027s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

3 years, 1 month

1
0
0 0

Build failure of network:osmocom:nightly/osmo-msc in Debian_Unstable/x86_64

by OBS Notification

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/)

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pgw: Improve checks around Gy messages

by pespin

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

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/DIAMETER: Rename template to follow naming style

by pespin

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

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Improve checks around Gy messages

by pespin

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

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Properly encode MISDN IE in GTP

by pespin

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

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Improve checks around Gy messages

by pespin

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

3 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Improve checks around Gy messages

by pespin

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

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2022