- gerrit-log - lists.osmocom.org

Change in pysim[master]: pySim.transport: Add mechanism for handling for CAT/USAT proactive cmds
by laforge 06 Aug '22

06 Aug '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28963 ) Change subject: pySim.transport: Add mechanism for handling for CAT/USAT proactive cmds ...................................................................... pySim.transport: Add mechanism for handling for CAT/USAT proactive cmds This introduces an optional argument to the LinkBase class constructor, where the application can pass an instance of a ProactiveHandler derived class in order to handle the proactive commands that the LinkBase is automatically fetching whenever the card indicates so. Change-Id: I844504e2fc1b27ce4fc7ede20b2307e698baa0f6 --- M pySim/transport/__init__.py 1 file changed, 15 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/63/28963/1 diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py index 9364b07..bc18b5a 100644 --- a/pySim/transport/__init__.py +++ b/pySim/transport/__init__.py @@ -9,11 +9,11 @@ from pySim.exceptions import * from pySim.construct import filter_dict -from pySim.utils import sw_match, b2h, h2b, i2h +from pySim.utils import sw_match, b2h, h2b, i2h, Hexstr # # Copyright (C) 2009-2010 Sylvain Munaut <tnt(a)246tNt.com> -# Copyright (C) 2021 Harald Welte <laforge(a)osmocom.org> +# Copyright (C) 2021-2022 Harald Welte <laforge(a)osmocom.org> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,13 +37,22 @@ def trace_response(self, cmd, sw, resp): pass +class ProactiveHandler(abc.ABC): + """Abstract base class representing the interface of some code that handles + the proactive commands, as returned by the card in responses to the FETCH + command.""" + @abc.abstractmethod + def receive_fetch(payload: Hexstr): + pass class LinkBase(abc.ABC): """Base class for link/transport to card.""" - def __init__(self, sw_interpreter=None, apdu_tracer=None): + def __init__(self, sw_interpreter=None, apdu_tracer=None, + proactive_handler: Optional[ProactiveHandler]=None): self.sw_interpreter = sw_interpreter self.apdu_tracer = apdu_tracer + self.proactive_handler = proactive_handler @abc.abstractmethod def _send_apdu_raw(self, pdu: str) -> Tuple[str, str]: @@ -137,10 +146,12 @@ """ rv = self.send_apdu(pdu) - if sw == '9000' and sw_match(rv[1], '91xx'): + while sw == '9000' and sw_match(rv[1], '91xx'): # proactive sim as per TS 102 221 Setion 7.4.2 rv = self.send_apdu_checksw('80120000' + rv[1][2:], sw) print("FETCH: %s", rv[0]) + if self.proactive_handler: + self.proactive_handler.receive_fetch(rv[0]) if not sw_match(rv[1], sw): raise SwMatchError(rv[1], sw.lower(), self.sw_interpreter) return rv -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I844504e2fc1b27ce4fc7ede20b2307e698baa0f6 Gerrit-Change-Number: 28963 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in libosmo-pfcp[master]: contrib/libosmo-pfcp.spec.in: do not disable LTO
by fixeria 06 Aug '22

06 Aug '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28961 ) Change subject: contrib/libosmo-pfcp.spec.in: do not disable LTO ...................................................................... contrib/libosmo-pfcp.spec.in: do not disable LTO AFAICT, everything compiles just fine with -flto=auto. Change-Id: I632cfd8deaaaa50f0ffba04aca4d422b7b51034e --- M contrib/libosmo-pfcp.spec.in 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/61/28961/1 diff --git a/contrib/libosmo-pfcp.spec.in b/contrib/libosmo-pfcp.spec.in index 95dad82..d3cf821 100644 --- a/contrib/libosmo-pfcp.spec.in +++ b/contrib/libosmo-pfcp.spec.in @@ -1,7 +1,3 @@ -## Disable LTO for now since it breaks compilation of the tests -## https://osmocom.org/issues/4113 -%define _lto_cflags %{nil} - Name: libosmo-pfcp Version: @VERSION@ Release: 0 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I632cfd8deaaaa50f0ffba04aca4d422b7b51034e Gerrit-Change-Number: 28961 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in libosmo-pfcp[master]: contrib/libosmo-pfcp.spec.in: do not depend on systemd
by fixeria 06 Aug '22

06 Aug '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28960 ) Change subject: contrib/libosmo-pfcp.spec.in: do not depend on systemd ...................................................................... contrib/libosmo-pfcp.spec.in: do not depend on systemd There is no need to do so, this project has nothing to do with systemd. Change-Id: I57d6c46a6b9aab161f7ccfa663c26ea2e7f05e7b --- M contrib/libosmo-pfcp.spec.in 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/60/28960/1 diff --git a/contrib/libosmo-pfcp.spec.in b/contrib/libosmo-pfcp.spec.in index 6af8319..95dad82 100644 --- a/contrib/libosmo-pfcp.spec.in +++ b/contrib/libosmo-pfcp.spec.in @@ -15,14 +15,10 @@ BuildRequires: libtool >= 2 BuildRequires: lksctp-tools-devel BuildRequires: pkgconfig >= 0.20 -%if 0%{?suse_version} -BuildRequires: systemd-rpm-macros -%endif BuildRequires: pkgconfig(libosmocore) >= 1.6.0 BuildRequires: pkgconfig(libosmoctrl) >= 1.6.0 BuildRequires: pkgconfig(libosmovty) >= 1.6.0 BuildRequires: pkgconfig(talloc) -%{?systemd_requires} %description libosmo-pfcp: PFCP protocol encoding and decoding, and generic PFCP endpoint implementation -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I57d6c46a6b9aab161f7ccfa663c26ea2e7f05e7b Gerrit-Change-Number: 28960 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-pcu[master]: tests: target 'check-local' does not depend on BUILT_SOURCES
by fixeria 06 Aug '22

06 Aug '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28958 ) Change subject: tests: target 'check-local' does not depend on BUILT_SOURCES ...................................................................... tests: target 'check-local' does not depend on BUILT_SOURCES Change-Id: I6cef8024cc10998b29e2bf7fc64c4c98fed7d8dd --- M tests/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/58/28958/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index d1021ee..fdc0a6c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -244,7 +244,7 @@ @echo "Not running python-based tests (determined at configure-time)" endif -check-local: atconfig $(BUILT_SOURCES) $(TESTSUITE) +check-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) $(MAKE) $(AM_MAKEFLAGS) python-tests -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I6cef8024cc10998b29e2bf7fc64c4c98fed7d8dd Gerrit-Change-Number: 28958 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-pcu[master]: Makefile.am: generate missing .version file
by fixeria 06 Aug '22

06 Aug '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28959 ) Change subject: Makefile.am: generate missing .version file ...................................................................... Makefile.am: generate missing .version file Change-Id: Id0cd2debf9b2d120c6dec1e534eefc4fe0a4210f --- M .gitignore M Makefile.am 2 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/59/28959/1 diff --git a/.gitignore b/.gitignore index c8b1d06..20c6470 100644 --- a/.gitignore +++ b/.gitignore @@ -42,8 +42,11 @@ tests/testsuite tests/testsuite.log -# ignore debian files +# git-version-gen magic .tarball-version +.version + +# ignore debian files debian/autoreconf.after debian/autoreconf.before debian/files diff --git a/Makefile.am b/Makefile.am index 85e3c65..3c08733 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,8 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 SUBDIRS = include src doc tests contrib + +BUILT_SOURCES = $(top_srcdir)/.version EXTRA_DIST = \ README.md \ contrib/osmo-pcu.spec.in \ @@ -12,3 +14,8 @@ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) @RELMAKE@ + +$(top_srcdir)/.version: + echo $(VERSION) > $@-t && mv $@-t $@ +dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id0cd2debf9b2d120c6dec1e534eefc4fe0a4210f Gerrit-Change-Number: 28959 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-pcu[master]: tests: make target 'check-local' depend on 'atconfig'
by fixeria 06 Aug '22

06 Aug '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28957 ) Change subject: tests: make target 'check-local' depend on 'atconfig' ...................................................................... tests: make target 'check-local' depend on 'atconfig' I believe this may be related to sporadic failures we hit on Jenkins: test -z "atconfig" || rm -f atconfig ../../../tests/testsuite: line 987: ./atconfig: No such file or directory make[2]: *** [Makefile:1464: clean-local] Error 1 This dependency is present in all other Osmocom projects. Change-Id: Id9bf06392ad31e1ecc66a5bd13069a915183a76b --- M tests/Makefile.am 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/57/28957/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 08cdc17..d1021ee 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -244,7 +244,7 @@ @echo "Not running python-based tests (determined at configure-time)" endif -check-local: $(BUILT_SOURCES) $(TESTSUITE) +check-local: atconfig $(BUILT_SOURCES) $(TESTSUITE) $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) $(MAKE) $(AM_MAKEFLAGS) python-tests -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id9bf06392ad31e1ecc66a5bd13069a915183a76b Gerrit-Change-Number: 28957 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-pcu[master]: tests/rlcmac: remove unused printSizeofRLCMAC()
by fixeria 06 Aug '22

06 Aug '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28952 ) Change subject: tests/rlcmac: remove unused printSizeofRLCMAC() ...................................................................... tests/rlcmac: remove unused printSizeofRLCMAC() Change-Id: I4858d1cb0c4ffb0a152b1d975e30d50efa6296a7 --- M tests/rlcmac/RLCMACTest.cpp 1 file changed, 0 insertions(+), 49 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 7b98d18..b1241f6 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -33,54 +33,6 @@ void *tall_pcu_ctx; -void printSizeofRLCMAC() -{ - printf("*** %s ***\n", __func__); - cout << "sizeof RlcMacUplink_t " << sizeof(RlcMacUplink_t) << endl; - cout << "sizeof Packet_Cell_Change_Failure_t " << sizeof(Packet_Cell_Change_Failure_t) << endl; - cout << "sizeof Packet_Control_Acknowledgement_t " << sizeof(Packet_Control_Acknowledgement_t) << endl; - cout << "sizeof Packet_Downlink_Ack_Nack_t " << sizeof(Packet_Downlink_Ack_Nack_t) << endl; - cout << "sizeof EGPRS_PD_AckNack_t " << sizeof(EGPRS_PD_AckNack_t) << endl; - cout << "sizeof Packet_Uplink_Dummy_Control_Block_t " << sizeof(Packet_Uplink_Dummy_Control_Block_t) << endl; - cout << "sizeof Packet_Measurement_Report_t " << sizeof(Packet_Measurement_Report_t) << endl; - cout << "sizeof Packet_Resource_Request_t " << sizeof(Packet_Resource_Request_t) << endl; - cout << "sizeof Packet_Mobile_TBF_Status_t " << sizeof(Packet_Mobile_TBF_Status_t) << endl; - cout << "sizeof Packet_PSI_Status_t " << sizeof(Packet_PSI_Status_t) << endl; - cout << "sizeof Packet_Enh_Measurement_Report_t " << sizeof(Packet_Enh_Measurement_Report_t) << endl; - cout << "sizeof Packet_Cell_Change_Notification_t " << sizeof(Packet_Cell_Change_Notification_t) << endl; - cout << "sizeof Packet_SI_Status_t " << sizeof(Packet_SI_Status_t) << endl; - cout << "sizeof Additional_MS_Rad_Access_Cap_t " << sizeof(Additional_MS_Rad_Access_Cap_t) << endl; - cout << "sizeof Packet_Pause_t " << sizeof(Packet_Pause_t) << endl; - - cout << "sizeof RlcMacDownlink_t " << sizeof(RlcMacDownlink_t) << endl; - cout << "sizeof Packet_Access_Reject_t " << sizeof(Packet_Access_Reject_t) << endl; - cout << "sizeof Packet_Cell_Change_Order_t " << sizeof(Packet_Cell_Change_Order_t) << endl; - cout << "sizeof Packet_Downlink_Assignment_t " << sizeof(Packet_Downlink_Assignment_t) << endl; - cout << "sizeof Packet_Neighbour_Cell_Data_t " << sizeof(Packet_Neighbour_Cell_Data_t) << endl; - cout << "sizeof Packet_Serving_Cell_Data_t " << sizeof(Packet_Serving_Cell_Data_t) << endl; - cout << "sizeof Packet_Paging_Request_t " << sizeof(Packet_Paging_Request_t) << endl; - cout << "sizeof Packet_PDCH_Release_t " << sizeof(Packet_PDCH_Release_t) << endl; - cout << "sizeof Packet_Polling_Request_t " << sizeof(Packet_Polling_Request_t) << endl; - cout << "sizeof Packet_Power_Control_Timing_Advance_t " << sizeof(Packet_Power_Control_Timing_Advance_t) << endl; - cout << "sizeof Packet_PRACH_Parameters_t " << sizeof(Packet_PRACH_Parameters_t) << endl; - cout << "sizeof Packet_Queueing_Notification_t " << sizeof(Packet_Queueing_Notification_t) << endl; - cout << "sizeof Packet_Timeslot_Reconfigure_t " << sizeof(Packet_Timeslot_Reconfigure_t) << endl; - cout << "sizeof Packet_TBF_Release_t " << sizeof(Packet_TBF_Release_t) << endl; - cout << "sizeof Packet_Uplink_Ack_Nack_t " << sizeof(Packet_Uplink_Ack_Nack_t) << endl; - cout << "sizeof Packet_Uplink_Assignment_t " << sizeof(Packet_Uplink_Assignment_t) << endl; - cout << "sizeof Packet_Cell_Change_Continue_t " << sizeof(Packet_Cell_Change_Continue_t) << endl; - cout << "sizeof Packet_Handover_Command_t " << sizeof(Packet_Handover_Command_t) << endl; - cout << "sizeof Packet_PhysicalInformation_t " << sizeof(Packet_PhysicalInformation_t) << endl; - cout << "sizeof Packet_Downlink_Dummy_Control_Block_t " << sizeof(Packet_Downlink_Dummy_Control_Block_t) << endl; - cout << "sizeof PSI1_t " << sizeof(PSI1_t) << endl; - cout << "sizeof PSI2_t " << sizeof(PSI2_t) << endl; - cout << "sizeof PSI3_t " << sizeof(PSI3_t) << endl; - cout << "sizeof PSI3_BIS_t " << sizeof(PSI3_BIS_t) << endl; - cout << "sizeof PSI4_t " << sizeof(PSI4_t) << endl; - cout << "sizeof PSI13_t " << sizeof(PSI13_t) << endl; - cout << "sizeof PSI5_t " << sizeof(PSI5_t) << endl; -} - void testRlcMacDownlink(void *test_ctx) { printf("*** %s ***\n", __func__); @@ -872,7 +824,6 @@ log_set_print_level(osmo_stderr_target, 1); log_set_use_color(osmo_stderr_target, 0); - //printSizeofRLCMAC(); testRlcMacDownlink(ctx); testRlcMacUplink(ctx); testCsnLeftAlignedVarBmpBounds(ctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4858d1cb0c4ffb0a152b1d975e30d50efa6296a7 Gerrit-Change-Number: 28952 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-pcu[master]: tests/rlcmac: make all test functions static
by fixeria 06 Aug '22

06 Aug '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28953 ) Change subject: tests/rlcmac: make all test functions static ...................................................................... tests/rlcmac: make all test functions static Change-Id: Ia7f1615edf1cac630631c14ccaeebab758aa4f72 --- M tests/rlcmac/RLCMACTest.cpp 1 file changed, 9 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index b1241f6..9908a81 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -33,7 +33,7 @@ void *tall_pcu_ctx; -void testRlcMacDownlink(void *test_ctx) +static void testRlcMacDownlink(void *test_ctx) { printf("*** %s ***\n", __func__); @@ -86,7 +86,7 @@ } -void testRlcMacUplink(void *test_ctx) +static void testRlcMacUplink(void *test_ctx) { printf("*** %s ***\n", __func__); @@ -140,7 +140,7 @@ bitvec_free(resultVector); } -void testCsnLeftAlignedVarBmpBounds(void *test_ctx) +static void testCsnLeftAlignedVarBmpBounds(void *test_ctx) { printf("*** %s ***\n", __func__); @@ -168,7 +168,7 @@ int encode_gsm_ra_cap(struct bitvec *vector, MS_Radio_Access_capability_t * data); } -void testRAcap(void *test_ctx) +static void testRAcap(void *test_ctx) { printf("*** %s ***\n", __func__); MS_Radio_Access_capability_t data; @@ -237,7 +237,7 @@ printf("decode_gsm_ra_cap() returns %d\n", rc); } -void testMalformedRAcap(void *test_ctx) +static void testMalformedRAcap(void *test_ctx) { printf("*** %s ***\n", __func__); MS_Radio_Access_capability_t data; @@ -280,7 +280,7 @@ } /* Reproduce crash from ticket OS#4463 */ -void testRAcap2(void *test_ctx) +static void testRAcap2(void *test_ctx) { printf("*** %s ***\n", __func__); MS_Radio_Access_capability_t data; @@ -421,7 +421,7 @@ } /* RAcap larger than 23 bytes */ -void testRAcap3(void *test_ctx) +static void testRAcap3(void *test_ctx) { printf("*** %s ***\n", __func__); MS_Radio_Access_capability_t data; @@ -618,7 +618,7 @@ } /* RAcap larger than 23 bytes */ -void testRAcap4(void *test_ctx) +static void testRAcap4(void *test_ctx) { printf("*** %s ***\n", __func__); MS_Radio_Access_capability_t data; @@ -759,7 +759,7 @@ bitvec_free(bv_dec); } -void testEGPRSPktChReq(void *test_ctx) +static void testEGPRSPktChReq(void *test_ctx) { EGPRS_PacketChannelRequest_t req; int rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia7f1615edf1cac630631c14ccaeebab758aa4f72 Gerrit-Change-Number: 28953 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-pcu[master]: tests/rlcmac: cosmetic: fix coding style in arrays
by fixeria 06 Aug '22

06 Aug '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28954 ) Change subject: tests/rlcmac: cosmetic: fix coding style in arrays ...................................................................... tests/rlcmac: cosmetic: fix coding style in arrays Change-Id: I65a5313704f692c411714006def143cfdb7cc04a --- M tests/rlcmac/RLCMACTest.cpp 1 file changed, 22 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 9908a81..f2b0447 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -42,17 +42,17 @@ bitvec_unhex(resultVector, DUMMY_VEC); std::string testData[] = { - "4e082500e3f1a81d080820800b2b2b2b2b2b2b2b2b2b2b", // Packet Downlink Assignment - "48282407a6a07422720100032b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Assignment - "47240c00400000000000000079eb2ac9402b2b2b2b2b2b", // Packet Uplink Ack Nack - "47283c367513ba333004242b2b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Assignment - "400820001a3904df0680efb3300b2b2b2b2b2b2b2b2b2b", // Packet Downlink Assignment (EGPRS) - "40284f0000001009810c826f4406809dcecb2b2b2b2b2b", // Packet Uplink Assignment (EGPRS) - "4024030f2f0000000087b0042b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Ack Nack (EGPRS) - "4913e00850884013a8048b2b2b2b2b2b2b2b2b2b2b2b2b", // Polling Request (malformed) - "412430007fffffffffffffffefd19c7ba12b2b2b2b2b2b", // Packet Uplink Ack Nack? - "41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b", // System Info 13? - "40883c1493120000000012002b2b2b2b2b2b2b2b2b2b2b", // Pkt Paging Request (OS#4838) + "4e082500e3f1a81d080820800b2b2b2b2b2b2b2b2b2b2b", // Packet Downlink Assignment + "48282407a6a07422720100032b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Assignment + "47240c00400000000000000079eb2ac9402b2b2b2b2b2b", // Packet Uplink Ack Nack + "47283c367513ba333004242b2b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Assignment + "400820001a3904df0680efb3300b2b2b2b2b2b2b2b2b2b", // Packet Downlink Assignment (EGPRS) + "40284f0000001009810c826f4406809dcecb2b2b2b2b2b", // Packet Uplink Assignment (EGPRS) + "4024030f2f0000000087b0042b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Ack Nack (EGPRS) + "4913e00850884013a8048b2b2b2b2b2b2b2b2b2b2b2b2b", // Polling Request (malformed) + "412430007fffffffffffffffefd19c7ba12b2b2b2b2b2b", // Packet Uplink Ack Nack? + "41942b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b", // System Info 13? + "40883c1493120000000012002b2b2b2b2b2b2b2b2b2b2b", // Pkt Paging Request (OS#4838) }; int testDataSize = sizeof(testData)/sizeof(testData[0]); @@ -95,18 +95,18 @@ bitvec_unhex(resultVector, DUMMY_VEC); std::string testData[] = { - "400e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Dummy Control Block - "400b8020000000000000002480e0032b2b2b2b2b2b2b2b", // Packet Downlink Ack/Nack - "4016713dc094270ca2ae57ef909006aa0fc0001f80222b", // Packet Resource Request - "401673c87f24af2632b25964200600000091000b780080", // Packet Resource Request (from keith) - "40200ffc0021ec010b2b2b2b2b2b2b2b2b2b2b2b2b2b2b", // EPDAN - "400a9020000000000000003010012a0800132b2b2b2b2b", // Packet Downlink Ack/Nack ? + "400e1e61d11d2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Dummy Control Block + "400b8020000000000000002480e0032b2b2b2b2b2b2b2b", // Packet Downlink Ack/Nack + "4016713dc094270ca2ae57ef909006aa0fc0001f80222b", // Packet Resource Request + "401673c87f24af2632b25964200600000091000b780080", // Packet Resource Request (from keith) + "40200ffc0021ec010b2b2b2b2b2b2b2b2b2b2b2b2b2b2b", // EPDAN + "400a9020000000000000003010012a0800132b2b2b2b2b", // Packet Downlink Ack/Nack ? - /* Packet Resource Request (see OS#4955, mistakes in 3GPP TS 44.060) */ - "4117ea1b903eaeb2686564b2330820078000102b2b2b2b", - "40167e49f7f8ef2632b2596620060000806d00541c0080", - "4017787174d92eba686564b2ccc30800a000040b2b2b2b", - "4017e5b2cd5a2eca68655e44aec84880139300412b2b2b", + /* Packet Resource Request (see OS#4955, mistakes in 3GPP TS 44.060) */ + "4117ea1b903eaeb2686564b2330820078000102b2b2b2b", + "40167e49f7f8ef2632b2596620060000806d00541c0080", + "4017787174d92eba686564b2ccc30800a000040b2b2b2b", + "4017e5b2cd5a2eca68655e44aec84880139300412b2b2b", }; int testDataSize = sizeof(testData)/sizeof(testData[0]); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I65a5313704f692c411714006def143cfdb7cc04a Gerrit-Change-Number: 28954 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-pcu[master]: tests/rlcmac: remove unused #includes
by fixeria 06 Aug '22

06 Aug '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28951 ) Change subject: tests/rlcmac: remove unused #includes ...................................................................... tests/rlcmac: remove unused #includes Change-Id: Ib3315f61eb90704b1216094a80e9f379f4150d33 --- M tests/rlcmac/RLCMACTest.cpp 1 file changed, 0 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 30476c5..7b98d18 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -15,21 +15,14 @@ -//#include <BitVector.h> #include <iostream> -#include <cstdlib> #include <cstring> -#include <assert.h> #include "gprs_rlcmac.h" #include "decoding.h" extern "C" { -#include "pcu_vty.h" -#include <osmocom/vty/telnet_interface.h> -#include <osmocom/vty/logging.h> #include <osmocom/core/utils.h> #include <osmocom/core/msgb.h> -#include <osmocom/core/application.h> #include "csn1.h" #include "gsm_rlcmac.h" -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib3315f61eb90704b1216094a80e9f379f4150d33 Gerrit-Change-Number: 28951 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log