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

[S] Change in osmo-ttcn3-hacks[master]: ttcn3-(tcp)dump(pcap)-stop.sh: store multiple runs of same test into ...

by pespin

Attention is currently required from: fixeria, laforge, osmith. Hello Jenkins Builder, fixeria, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37723?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review-1 by fixeria, Verified+1 by Jenkins Builder Change subject: ttcn3-(tcp)dump(pcap)-stop.sh: store multiple runs of same test into different pcap file ...................................................................... ttcn3-(tcp)dump(pcap)-stop.sh: store multiple runs of same test into different pcap file This is useful when testing the behavior of a SUT when the same scenario is run twice, for instance to debug a crash in the SUT. In this setup, it is definetly interesting to have stored pcaps of the several times the scenario is run. Change-Id: Ib68fc4df1f5a105b4b2c904d2d2003c621a2ad31 --- M ttcn3-dumpcap-stop.sh M ttcn3-tcpdump-stop.sh 2 files changed, 36 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/37723/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37723?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib68fc4df1f5a105b4b2c904d2d2003c621a2ad31 Gerrit-Change-Number: 37723 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

11 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ttcn3-(tcp)dump(pcap)-stop.sh: store multiple runs of same test into ...

by pespin

Attention is currently required from: fixeria, laforge, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37723?usp=email ) Change subject: ttcn3-(tcp)dump(pcap)-stop.sh: store multiple runs of same test into different pcap file ...................................................................... Patch Set 2: (1 comment) File ttcn3-dumpcap-stop.sh: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37723/comment/04033ca5_5f73… PS2, Line 53: pcap > Are you sure about `.pcap`? It's `.pcapng` above. Thanks I tested this with a testsuite using tcpdump and then saw that I had to apply the same for dumpcap script. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37723?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib68fc4df1f5a105b4b2c904d2d2003c621a2ad31 Gerrit-Change-Number: 37723 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Aug 2024 22:57:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

11 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: mme: initial testenv.cfg

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37709?usp=email ) Change subject: mme: initial testenv.cfg ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37709?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I780584cc7722d92baa213049ee0a35e16a0e087c Gerrit-Change-Number: 37709 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Aug 2024 22:14:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: hss: initial testenv.cfg

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37708?usp=email ) Change subject: hss: initial testenv.cfg ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37708?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8a095f51f1a9516967d5188587537a2f90927f6c Gerrit-Change-Number: 37708 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Aug 2024 22:14:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: dia2gsup: initial testenv.cfg

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37704?usp=email ) Change subject: dia2gsup: initial testenv.cfg ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37704?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1f3f7235134a5acb4436fd4745fa5304ad51bc56 Gerrit-Change-Number: 37704 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Aug 2024 22:11:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: smlc: import current configs from docker-playground

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37705?usp=email ) Change subject: smlc: import current configs from docker-playground ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37705?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3ed9e971daf32458bc554fa0a7f4698b4a461bfa Gerrit-Change-Number: 37705 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Aug 2024 22:11:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ttcn3-(tcp)dump(pcap)-stop.sh: store multiple runs of same test into ...

by fixeria

Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37723?usp=email ) Change subject: ttcn3-(tcp)dump(pcap)-stop.sh: store multiple runs of same test into different pcap file ...................................................................... Patch Set 2: Code-Review-1 (1 comment) File ttcn3-dumpcap-stop.sh: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37723/comment/968f4f58_0887… PS2, Line 53: pcap Are you sure about `.pcap`? It's `.pcapng` above. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37723?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib68fc4df1f5a105b4b2c904d2d2003c621a2ad31 Gerrit-Change-Number: 37723 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Aug 2024 22:00:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

11 months

1
0
0 0

[L] Change in libosmo-gprs[master]: tests/gmm: Introduce skeleton for gmm_prim_network tests

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/libosmo-gprs/+/37726?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: tests/gmm: Introduce skeleton for gmm_prim_network tests ...................................................................... tests/gmm: Introduce skeleton for gmm_prim_network tests A new skeleton to add tests for the network (SGSN) mode is added. Related: OS#5852 Change-Id: I832f16f598f49c18455531fac75367376a3065e6 --- M tests/gmm/Makefile.am M tests/gmm/gmm_prim_ms_test.c A tests/gmm/gmm_prim_network_test.c A tests/gmm/gmm_prim_network_test.err A tests/gmm/gmm_prim_network_test.ok A tests/gmm/gmm_prim_test.h M tests/testsuite.at 7 files changed, 370 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/26/37726/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/37726?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I832f16f598f49c18455531fac75367376a3065e6 Gerrit-Change-Number: 37726 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

11 months

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Rename gmm_prim_test -> gmm_prim_ms_test

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/37725?usp=email ) Change subject: gmm: Rename gmm_prim_test -> gmm_prim_ms_test ...................................................................... gmm: Rename gmm_prim_test -> gmm_prim_ms_test A new test file will be added to test GMM in network (SGSN) mode. Change-Id: I9c7bccbf229aa2e136869baf98c5401c0dbae954 --- M tests/gmm/Makefile.am R tests/gmm/gmm_prim_ms_test.c R tests/gmm/gmm_prim_ms_test.err R tests/gmm/gmm_prim_ms_test.ok M tests/testsuite.at 5 files changed, 22 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/25/37725/1 diff --git a/tests/gmm/Makefile.am b/tests/gmm/Makefile.am index 83517e5..c84c879 100644 --- a/tests/gmm/Makefile.am +++ b/tests/gmm/Makefile.am @@ -14,14 +14,14 @@ check_PROGRAMS = \ gmm_misc_test \ - gmm_prim_test \ + gmm_prim_ms_test \ $(NULL) EXTRA_DIST = \ gmm_misc_test.err \ gmm_misc_test.ok \ - gmm_prim_test.err \ - gmm_prim_test.ok \ + gmm_prim_ms_test.err \ + gmm_prim_ms_test.ok \ $(NULL) # libosmo-gprs-gmm.a is used below to access non-exported private symbols used in the test: @@ -39,8 +39,8 @@ # libosmo-gprs-llc.a is used below to access non-exported private symbols used in the test: # libosmo-gprs-rlcmac.a is used below to access non-exported private symbols used in the test: -gmm_prim_test_SOURCES = gmm_prim_test.c -gmm_prim_test_LDADD = \ +gmm_prim_ms_test_SOURCES = gmm_prim_ms_test.c +gmm_prim_ms_test_LDADD = \ $(top_builddir)/src/gmm/libosmo-gprs-gmm.la \ $(top_builddir)/src/llc/.libs/libosmo-gprs-llc.a \ $(top_builddir)/src/rlcmac/.libs/libosmo-gprs-rlcmac.a \ @@ -49,7 +49,7 @@ $(LIBOSMOGSM_LIBS) \ $(NULL) -gmm_prim_test_LDFLAGS = \ +gmm_prim_ms_test_LDFLAGS = \ -Wl,--wrap=osmo_get_rand_id \ -no-install \ $(NULL) diff --git a/tests/gmm/gmm_prim_test.c b/tests/gmm/gmm_prim_ms_test.c similarity index 100% rename from tests/gmm/gmm_prim_test.c rename to tests/gmm/gmm_prim_ms_test.c diff --git a/tests/gmm/gmm_prim_test.err b/tests/gmm/gmm_prim_ms_test.err similarity index 100% rename from tests/gmm/gmm_prim_test.err rename to tests/gmm/gmm_prim_ms_test.err diff --git a/tests/gmm/gmm_prim_test.ok b/tests/gmm/gmm_prim_ms_test.ok similarity index 100% rename from tests/gmm/gmm_prim_test.ok rename to tests/gmm/gmm_prim_ms_test.ok diff --git a/tests/testsuite.at b/tests/testsuite.at index ce51e35..3b5c326 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -8,11 +8,11 @@ AT_CHECK([$abs_top_builddir/tests/gmm/gmm_misc_test], [0], [expout], [experr]) AT_CLEANUP -AT_SETUP([gmm/gmm_prim]) -AT_KEYWORDS([gmm gmm_prim]) -cat $abs_srcdir/gmm/gmm_prim_test.ok > expout -cat $abs_srcdir/gmm/gmm_prim_test.err > experr -AT_CHECK([$abs_top_builddir/tests/gmm/gmm_prim_test], [0], [expout], [experr]) +AT_SETUP([gmm/gmm_prim_ms]) +AT_KEYWORDS([gmm gmm_prim_ms]) +cat $abs_srcdir/gmm/gmm_prim_ms_test.ok > expout +cat $abs_srcdir/gmm/gmm_prim_ms_test.err > experr +AT_CHECK([$abs_top_builddir/tests/gmm/gmm_prim_ms_test], [0], [expout], [experr]) AT_CLEANUP AT_SETUP([llc/llc]) -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/37725?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I9c7bccbf229aa2e136869baf98c5401c0dbae954 Gerrit-Change-Number: 37725 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months

1
0
0 0

[L] Change in libosmo-gprs[master]: gmm: Introduce interface GMMBSSGP

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/37724?usp=email ) Change subject: gmm: Introduce interface GMMBSSGP ...................................................................... gmm: Introduce interface GMMBSSGP This interface was not described in TS 24.007 like the rest, though some references to it can be seen in that document in Annex C. The interface is actually described in TS 48.018 5.3. This commit only adds the skeleton with all the primitives, etc. All the logic inside GMM layer implementation, and primitive specific fields, is still missing. Related: OS#5852 Change-Id: I39045833fd43cfe98cb1a3812fbce3fdcaae6dc6 --- M include/osmocom/gprs/gmm/gmm_prim.h M include/osmocom/gprs/gmm/gmm_private.h M src/gmm/gmm_prim.c 3 files changed, 274 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/24/37724/1 diff --git a/include/osmocom/gprs/gmm/gmm_prim.h b/include/osmocom/gprs/gmm/gmm_prim.h index e066a15..e38e188 100644 --- a/include/osmocom/gprs/gmm/gmm_prim.h +++ b/include/osmocom/gprs/gmm/gmm_prim.h @@ -30,6 +30,7 @@ OSMO_GPRS_GMM_SAP_GMMRABM, /* UMTS only */ OSMO_GPRS_GMM_SAP_GMMSS, OSMO_GPRS_GMM_SAP_GMMSS2, + OSMO_GPRS_GMM_SAP_GMMBSSGP, /* TS 48.018 5.3 */ }; extern const struct value_string osmo_gprs_gmm_prim_sap_names[]; static inline const char *osmo_gprs_gmm_prim_sap_name(enum osmo_gprs_gmm_prim_sap val) @@ -197,6 +198,63 @@ }; }; +/* TS 48.018 Section 5.3 "GMM<->BSSGP" + * This interface wasn't described in TS 24.007 like the others, but can be seen + * greyed up in TS 24.007 Annex C diagrams. + */ +enum osmo_gprs_gmm_gmmbssgp_prim_type { + OSMO_GPRS_GMM_GMMBSSGP_PAGING, /* Req: BVCI, NSEI,... */ + OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY, /* Req: BVCI, NSEI,... */ + OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY_UPDATE, /* Ind, Resp */ + OSMO_GPRS_GMM_GMMBSSGP_RADIO_STATUS, /* Ind: BVCI, NSEI,... */ + OSMO_GPRS_GMM_GMMBSSGP_SUSPEND, /* Ind: BVCI, NSEI,... */ + OSMO_GPRS_GMM_GMMBSSGP_RESUME, /* Ind: BVCI, NSEI,... */ + OSMO_GPRS_GMM_GMMBSSGP_MS_REGISTRATION_ENQUIRY, /* Ind, Resp */ +}; +extern const struct value_string osmo_gprs_gmm_gmmbssgp_prim_type_names[]; +static inline const char *osmo_gprs_gmm_gmmbssgp_prim_type_name(enum osmo_gprs_gmm_gmmbssgp_prim_type val) +{ + return get_value_string(osmo_gprs_gmm_gmmbssgp_prim_type_names, val); +} + +/* Parameters for OSMO_GPRS_GMM_BSSGP_* prims + * Same as struct osmo_gprs_rlcmac_gmmbssgp_prim. + */ +struct osmo_gprs_gmm_gmmbssgp_prim { + /* Common fields */ + uint16_t bvci; + uint16_t nsei; + union { + /* OSMO_GPRS_GMM_GMMBSSGP_PAGING | Req */ + struct { + } paging_req; + /* OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY | Req */ + struct { + } ra_capability_req; + /* OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY_UPDATE | Ind */ + struct { + } ra_capability_update_ind; + /* OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY_UPDATE | Resp */ + struct { + } ra_capability_update_resp; + /* OSMO_GPRS_GMM_GMMBSSGP_RADIO_STATUS | Ind */ + struct { + } radio_status_ind; + /* OSMO_GPRS_GMM_GMMBSSGP_SUSPEND | Ind */ + struct { + } suspend_ind; + /* OSMO_GPRS_GMM_GMMBSSGP_RESUME | Ind */ + struct { + } resume_ind; + /* OSMO_GPRS_GMM_GMMBSSGP_MS_REGISTRATION_ENQUIRY | Ind */ + struct { + } ms_registration_enquiry_ind; + /* OSMO_GPRS_GMM_GMMBSSGP_MS_REGISTRATION_ENQUIRY | Resp */ + struct { + } ms_registration_enquiry_resp; + }; +}; + /* TS 24.007 Section 9.5.1 "Service primitives for GMMSM-SAP" */ enum osmo_gprs_gmm_gmmsm_prim_type { @@ -279,6 +337,7 @@ union { struct osmo_gprs_gmm_gmmreg_prim gmmreg; struct osmo_gprs_gmm_gmmrr_prim gmmrr; + struct osmo_gprs_gmm_gmmbssgp_prim gmmbssgp; struct osmo_gprs_gmm_gmmsm_prim gmmsm; }; }; @@ -307,6 +366,13 @@ /* Alloc primitive for GMMRR SAP: */ struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmrr_page_ind(uint32_t tlli); +/* Alloc primitive for GMMBSSGP SAP: */ +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_ra_capability_update_ind(uint16_t bvci, uint16_t nsei); +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_radio_status_ind(uint16_t bvci, uint16_t nsei); +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_suspend_ind(uint16_t bvci, uint16_t nsei); +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_resume_ind(uint16_t bvci, uint16_t nsei); +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_ms_registration_enquiry_ind(uint16_t bvci, uint16_t nsei); + /* Alloc primitive for GMMSM SAP: */ struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmsm_establish_req(uint32_t id); struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmsm_unitdata_req(uint32_t id, uint8_t *smpdu, unsigned int smpdu_len); diff --git a/include/osmocom/gprs/gmm/gmm_private.h b/include/osmocom/gprs/gmm/gmm_private.h index db2cc8e..a94fec2 100644 --- a/include/osmocom/gprs/gmm/gmm_private.h +++ b/include/osmocom/gprs/gmm/gmm_private.h @@ -110,10 +110,16 @@ struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmrr_assign_req(uint32_t old_tlli, uint32_t new_tlli); +struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmbssgp_paging_req(uint16_t bvci, uint16_t nsei); +struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmbssgp_ra_capability_req(uint16_t bvci, uint16_t nsei); +struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmbssgp_ra_capability_update_resp(uint16_t bvci, uint16_t nsei); +struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmbssgp_ms_registration_enquiry_resp(uint16_t bvci, uint16_t nsei); + struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmsm_establish_cnf(uint32_t id, uint8_t cause); struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmsm_release_ind(uint32_t id); struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmsm_unitdata_ind(uint32_t id, uint8_t *smpdu, unsigned int smpdu_len); struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmsm_modify_ind(uint32_t id); + /* gmm.c: */ struct gprs_gmm_entity *gprs_gmm_gmme_alloc(uint32_t ptmsi, const char *imsi); void gprs_gmm_gmme_free(struct gprs_gmm_entity *gmme); diff --git a/src/gmm/gmm_prim.c b/src/gmm/gmm_prim.c index 693a811..bae2dbd 100644 --- a/src/gmm/gmm_prim.c +++ b/src/gmm/gmm_prim.c @@ -43,6 +43,7 @@ { OSMO_GPRS_GMM_SAP_GMMRABM, "GMMRABM" }, { OSMO_GPRS_GMM_SAP_GMMSS, "GMMSS" }, { OSMO_GPRS_GMM_SAP_GMMSS2, "GMMSS2" }, + { OSMO_GPRS_GMM_SAP_GMMBSSGP, "GMMBSSGP" }, { 0, NULL } }; @@ -60,6 +61,17 @@ { 0, NULL } }; +const struct value_string osmo_gprs_gmm_gmmbssgp_prim_type_names[] = { + { OSMO_GPRS_GMM_GMMBSSGP_PAGING, "AGING" }, + { OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY, "A_CAPABILITY" }, + { OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY_UPDATE, "A_CAPABILITY_UPDATE" }, + { OSMO_GPRS_GMM_GMMBSSGP_RADIO_STATUS, "RADIO_STATUS" }, + { OSMO_GPRS_GMM_GMMBSSGP_SUSPEND, "SUSPEND" }, + { OSMO_GPRS_GMM_GMMBSSGP_RESUME, "RESUME" }, + { OSMO_GPRS_GMM_GMMBSSGP_MS_REGISTRATION_ENQUIRY, "MS_REGISTRATION_ENQUIRY" }, + { 0, NULL } +}; + const struct value_string osmo_gprs_gmm_gmmsm_prim_type_names[] = { { OSMO_GPRS_GMM_GMMSM_ESTABLISH, "ESTABLISH" }, { OSMO_GPRS_GMM_GMMSM_RELEASE, "RELEASE" }, @@ -107,6 +119,9 @@ case OSMO_GPRS_GMM_SAP_GMMSM: type = osmo_gprs_gmm_gmmsm_prim_type_name(gmm_prim->oph.primitive); break; + case OSMO_GPRS_GMM_SAP_GMMBSSGP: + type = osmo_gprs_gmm_gmmbssgp_prim_type_name(gmm_prim->oph.primitive); + break; default: type = "unsupported-gmm-sap"; } @@ -281,6 +296,105 @@ return gmm_prim; } +/*** GMMBSSGP ***/ +static inline struct osmo_gprs_gmm_prim *gmm_prim_gmmbssgp_alloc(enum osmo_gprs_gmm_gmmbssgp_prim_type type, + enum osmo_prim_operation operation, + unsigned int extra_size) +{ + return gprs_gmm_prim_alloc(OSMO_GPRS_GMM_SAP_GMMBSSGP, type, operation, extra_size); +} + +/* 3GPP TS 48.018 5.3.4 GMM-PAGING.req: */ +struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmbssgp_paging_req(uint16_t bvci, uint16_t nsei) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMBSSGP_PAGING, PRIM_OP_REQUEST, 0); + gmm_prim->gmmbssgp.bvci = bvci; + gmm_prim->gmmbssgp.nsei = nsei; + return gmm_prim; +} + +/* 3GPP TS 48.018 5.3.5 GMM-RA-CAPABILITY.req: */ +struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmbssgp_ra_capability_req(uint16_t bvci, uint16_t nsei) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY, PRIM_OP_REQUEST, 0); + gmm_prim->gmmbssgp.bvci = bvci; + gmm_prim->gmmbssgp.nsei = nsei; + return gmm_prim; +} + +/* 3GPP TS 48.018 5.3.6 GMM-RA-CAPABILITY-UPDATE.ind: */ +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_ra_capability_update_ind(uint16_t bvci, uint16_t nsei) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY_UPDATE, PRIM_OP_INDICATION, 0); + gmm_prim->gmmbssgp.bvci = bvci; + gmm_prim->gmmbssgp.nsei = nsei; + return gmm_prim; +} + +/* 3GPP TS 48.018 5.3.7 GMM-RA-CAPABILITY-UPDATE.res: */ +struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmbssgp_ra_capability_update_resp(uint16_t bvci, uint16_t nsei) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY_UPDATE, PRIM_OP_RESPONSE, 0); + gmm_prim->gmmbssgp.bvci = bvci; + gmm_prim->gmmbssgp.nsei = nsei; + return gmm_prim; +} + +/* 3GPP TS 48.018 5.3.8 GMM-RADIO-STATUS.ind: */ +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_radio_status_ind(uint16_t bvci, uint16_t nsei) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMBSSGP_RADIO_STATUS, PRIM_OP_INDICATION, 0); + gmm_prim->gmmbssgp.bvci = bvci; + gmm_prim->gmmbssgp.nsei = nsei; + return gmm_prim; +} + +/* 3GPP TS 48.018 5.3.9 GMM-SUSPEND.ind: */ +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_suspend_ind(uint16_t bvci, uint16_t nsei) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMBSSGP_SUSPEND, PRIM_OP_INDICATION, 0); + gmm_prim->gmmbssgp.bvci = bvci; + gmm_prim->gmmbssgp.nsei = nsei; + return gmm_prim; +} + +/* 3GPP TS 48.018 5.3.10 GMM-RESUME.ind: */ +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_resume_ind(uint16_t bvci, uint16_t nsei) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMBSSGP_RESUME, PRIM_OP_INDICATION, 0); + gmm_prim->gmmbssgp.bvci = bvci; + gmm_prim->gmmbssgp.nsei = nsei; + return gmm_prim; +} + +/* 3GPP TS 48.018 5.3.10a GMM-MS-REGISTRATION-ENQUIRY.ind: */ +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_ms_registration_enquiry_ind(uint16_t bvci, uint16_t nsei) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMBSSGP_MS_REGISTRATION_ENQUIRY, PRIM_OP_INDICATION, 0); + gmm_prim->gmmbssgp.bvci = bvci; + gmm_prim->gmmbssgp.nsei = nsei; + return gmm_prim; +} + +/* 3GPP TS 48.018 5.3.10b GMM-MS-REGISTRATION-ENQUIRY.res: */ +struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmbssgp_ms_registration_enquiry_resp(uint16_t bvci, uint16_t nsei) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMBSSGP_MS_REGISTRATION_ENQUIRY, PRIM_OP_RESPONSE, 0); + gmm_prim->gmmbssgp.bvci = bvci; + gmm_prim->gmmbssgp.nsei = nsei; + return gmm_prim; +} + + /*** GMMSM ***/ static inline struct osmo_gprs_gmm_prim *gmm_prim_gmmsm_alloc(enum osmo_gprs_gmm_gmmsm_prim_type type, @@ -666,6 +780,72 @@ return rc; } +static int gprs_gmm_prim_handle_gmmbssgp_ra_capability_update_ind(struct osmo_gprs_gmm_prim *gmm_prim) +{ + int rc; + rc = gprs_gmm_prim_handle_unsupported(gmm_prim); + rc = 1; /* prim ownership taken, already freed */ + return rc; +} + +static int gprs_gmm_prim_handle_gmmbssgp_radio_status_ind(struct osmo_gprs_gmm_prim *gmm_prim) +{ + int rc; + rc = gprs_gmm_prim_handle_unsupported(gmm_prim); + rc = 1; /* prim ownership taken, already freed */ + return rc; +} + +static int gprs_gmm_prim_handle_gmmbssgp_suspend_ind(struct osmo_gprs_gmm_prim *gmm_prim) +{ + int rc; + rc = gprs_gmm_prim_handle_unsupported(gmm_prim); + rc = 1; /* prim ownership taken, already freed */ + return rc; +} + +static int gprs_gmm_prim_handle_gmmbssgp_resume_ind(struct osmo_gprs_gmm_prim *gmm_prim) +{ + int rc; + rc = gprs_gmm_prim_handle_unsupported(gmm_prim); + rc = 1; /* prim ownership taken, already freed */ + return rc; +} + +static int gprs_gmm_prim_handle_gmmbssgp_ms_registration_enquiry_ind(struct osmo_gprs_gmm_prim *gmm_prim) +{ + int rc; + rc = gprs_gmm_prim_handle_unsupported(gmm_prim); + rc = 1; /* prim ownership taken, already freed */ + return rc; +} + +static int gprs_gmm_prim_handle_gmmbssgp(struct osmo_gprs_gmm_prim *gmm_prim) +{ + int rc = 0; + switch (OSMO_PRIM_HDR(&gmm_prim->oph)) { + case OSMO_PRIM(OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY_UPDATE, PRIM_OP_INDICATION): + rc = gprs_gmm_prim_handle_gmmbssgp_ra_capability_update_ind(gmm_prim); + break; + case OSMO_PRIM(OSMO_GPRS_GMM_GMMBSSGP_RADIO_STATUS, PRIM_OP_INDICATION): + rc = gprs_gmm_prim_handle_gmmbssgp_radio_status_ind(gmm_prim); + break; + case OSMO_PRIM(OSMO_GPRS_GMM_GMMBSSGP_SUSPEND, PRIM_OP_INDICATION): + rc = gprs_gmm_prim_handle_gmmbssgp_suspend_ind(gmm_prim); + break; + case OSMO_PRIM(OSMO_GPRS_GMM_GMMBSSGP_RESUME, PRIM_OP_INDICATION): + rc = gprs_gmm_prim_handle_gmmbssgp_resume_ind(gmm_prim); + break; + case OSMO_PRIM(OSMO_GPRS_GMM_GMMBSSGP_MS_REGISTRATION_ENQUIRY, PRIM_OP_INDICATION): + rc = gprs_gmm_prim_handle_gmmbssgp_ms_registration_enquiry_ind(gmm_prim); + break; + default: + rc = gprs_gmm_prim_handle_unsupported(gmm_prim); + rc = 1; + } + return rc; +} + /* GMM lower layers (LLC) push GMM primitive up to GMM layer: */ int osmo_gprs_gmm_prim_lower_up(struct osmo_gprs_gmm_prim *gmm_prim) { @@ -680,6 +860,9 @@ case OSMO_GPRS_GMM_SAP_GMMRR: rc = gprs_gmm_prim_handle_gmmrr(gmm_prim); break; + case OSMO_GPRS_GMM_SAP_GMMBSSGP: + rc = gprs_gmm_prim_handle_gmmbssgp(gmm_prim); + break; default: rc = gprs_gmm_prim_handle_unsupported(gmm_prim); rc = 1; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/37724?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I39045833fd43cfe98cb1a3812fbce3fdcaae6dc6 Gerrit-Change-Number: 37724 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2024