March 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-bsc[master]: tests: rename and extend gprs_{bvci_default->params}.vty
by laforge 31 Mar '23

31 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32169 ) Change subject: tests: rename and extend gprs_{bvci_default->params}.vty ...................................................................... tests: rename and extend gprs_{bvci_default->params}.vty Match default values for all GPRS related params, not only the BVCI. Change-Id: Ia02e9a97137eb7724f22526fc3768331b35ac55d Related: OS#5979 --- D tests/gprs_bvci_default.vty A tests/gprs_params.vty 2 files changed, 60 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/gprs_bvci_default.vty b/tests/gprs_bvci_default.vty deleted file mode 100644 index 4bd95ce..0000000 --- a/tests/gprs_bvci_default.vty +++ /dev/null @@ -1,13 +0,0 @@ -OsmoBSC> enable -OsmoBSC# configure terminal -OsmoBSC(config)# network -OsmoBSC(config-net)# bts 0 -OsmoBSC(config-net-bts)# gprs mode gprs -OsmoBSC(config-net-bts)# exit - -OsmoBSC(config-net)# show running-config -... - bts 0 -... - gprs cell bvci 2 -... diff --git a/tests/gprs_params.vty b/tests/gprs_params.vty new file mode 100644 index 0000000..87c64b1 --- /dev/null +++ b/tests/gprs_params.vty @@ -0,0 +1,48 @@ +OsmoBSC> enable +OsmoBSC# configure terminal +OsmoBSC(config)# network +OsmoBSC(config-net)# bts 0 + +OsmoBSC(config-net-bts)# ### GPRS is disabled by default +OsmoBSC(config-net-bts)# show running-config +... + bts 0 +... + gprs mode none +... + +OsmoBSC(config-net-bts)# ### Default [E]GPRS params +OsmoBSC(config-net-bts)# gprs mode gprs +OsmoBSC(config-net-bts)# show running-config +... + bts 0 +... + gprs mode gprs + gprs routing area 0 + gprs network-control-order nc0 + gprs power-control alpha 0 + gprs cell bvci 2 + gprs cell timer blocking-timer 3 + gprs cell timer blocking-retries 3 + gprs cell timer unblocking-retries 3 + gprs cell timer reset-timer 3 + gprs cell timer reset-retries 3 + gprs cell timer suspend-timer 10 + gprs cell timer suspend-retries 3 + gprs cell timer resume-timer 10 + gprs cell timer resume-retries 3 + gprs cell timer capability-update-timer 10 + gprs cell timer capability-update-retries 3 + gprs nsei 0 + gprs ns timer tns-block 3 + gprs ns timer tns-block-retries 3 + gprs ns timer tns-reset 3 + gprs ns timer tns-reset-retries 3 + gprs ns timer tns-test 30 + gprs ns timer tns-alive 3 + gprs ns timer tns-alive-retries 10 + gprs nsvc 0 nsvci 0 + gprs nsvc 0 local udp port 0 + gprs nsvc 1 nsvci 0 + gprs nsvc 1 local udp port 0 +... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia02e9a97137eb7724f22526fc3768331b35ac55d Gerrit-Change-Number: 32169 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-bsc[master]: tests: add more tests for GPRS NSVC parameters
by laforge 31 Mar '23

31 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32171 ) Change subject: tests: add more tests for GPRS NSVC parameters ...................................................................... tests: add more tests for GPRS NSVC parameters Change-Id: I13d6ac887ddb1c9bc5d1e4122f20405a28f135d4 Related: OS#5979 --- M tests/gprs_params.vty 1 file changed, 78 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/gprs_params.vty b/tests/gprs_params.vty index 87c64b1..e0c8b39 100644 --- a/tests/gprs_params.vty +++ b/tests/gprs_params.vty @@ -46,3 +46,71 @@ gprs nsvc 1 nsvci 0 gprs nsvc 1 local udp port 0 ... + + +OsmoBSC(config-net-bts)# ### NSVC sub-command syntax +OsmoBSC(config-net-bts)# gprs nsvc? + nsvc Network Service Virtual Connection (NS-VC) +OsmoBSC(config-net-bts)# gprs nsvc ? + <0-1> NSVC Logical Number +OsmoBSC(config-net-bts)# gprs nsvc 0 ? + nsvci NS Virtual Connection Identifier + local GPRS NS Local UDP Port + remote GPRS NS Remote UDP Port +OsmoBSC(config-net-bts)# gprs nsvc 0 nsvci ? + <0-65535> GPRS NS VC Identifier +OsmoBSC(config-net-bts)# gprs nsvc 0 local ? + udp GPRS NS Local UDP Port +OsmoBSC(config-net-bts)# gprs nsvc 0 local udp ? + port GPRS NS Local UDP Port +OsmoBSC(config-net-bts)# gprs nsvc 0 local udp port ? + <0-65535> GPRS NS Local UDP Port Number +OsmoBSC(config-net-bts)# gprs nsvc 0 remote ? + udp GPRS NS Remote UDP Port + ip GPRS NS Remote IP Address +OsmoBSC(config-net-bts)# gprs nsvc 0 remote udp ? + port GPRS NS Remote UDP Port +OsmoBSC(config-net-bts)# gprs nsvc 0 remote udp port ? + <0-65535> GPRS NS Remote UDP Port Number +OsmoBSC(config-net-bts)# gprs nsvc 0 remote ip ? + A.B.C.D GPRS NS Remote IPv4 Address + X:X::X:X GPRS NS Remote IPv6 Address + +OsmoBSC(config-net-bts)# ### NSVC sub-command params +OsmoBSC(config-net-bts)# gprs nsvc 0 nsvci 4242 +OsmoBSC(config-net-bts)# gprs nsvc 1 nsvci 2424 +OsmoBSC(config-net-bts)# show running-config +... + bts 0 +... + gprs nsvc 0 nsvci 4242 + gprs nsvc 0 local udp port 0 + gprs nsvc 1 nsvci 2424 + gprs nsvc 1 local udp port 0 +... +OsmoBSC(config-net-bts)# gprs nsvc 1 local udp port 23023 +OsmoBSC(config-net-bts)# gprs nsvc 1 remote udp port 23032 +OsmoBSC(config-net-bts)# gprs nsvc 1 remote ip 1.2.3.4 +OsmoBSC(config-net-bts)# show running-config +... + bts 0 +... + gprs nsvc 0 nsvci 4242 + gprs nsvc 0 local udp port 0 + gprs nsvc 1 nsvci 2424 + gprs nsvc 1 local udp port 23023 + gprs nsvc 1 remote ip 1.2.3.4 + gprs nsvc 1 remote udp port 23032 +... + +OsmoBSC(config-net-bts)# ### Disable secondary NSVC +OsmoBSC(config-net-bts)# gprs nsvc 1 remote udp port 0 +OsmoBSC(config-net-bts)# show running-config +... + bts 0 +... + gprs nsvc 0 nsvci 4242 + gprs nsvc 0 local udp port 0 + gprs nsvc 1 nsvci 2424 + gprs nsvc 1 local udp port 23023 +... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I13d6ac887ddb1c9bc5d1e4122f20405a28f135d4 Gerrit-Change-Number: 32171 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bsc[master]: gprs: fix has_valid_nsvc(): permit local udp port 0
by laforge 31 Mar '23

31 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32176 ) Change subject: gprs: fix has_valid_nsvc(): permit local udp port 0 ...................................................................... gprs: fix has_valid_nsvc(): permit local udp port 0 NSVC local port 0 is actually a valid value, which tells the PCU to pick a random port for bind()ing. It was supported before 315af2f9e, but now osmo-bsc would simply ignore NSVCs with 'local udp port 0' and leave the respective MOs unconfigured in the BTS. Change-Id: I0afd83e77f3daeeb082e7db911610428b5bc587c Fixes: 315af2f9e "bts: ipa/osmo-bts/sysmobts: MO: add support for the second NSVC" Related: OS#5979 --- M src/osmo-bsc/nm_gprs_nsvc_fsm.c 1 file changed, 23 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/nm_gprs_nsvc_fsm.c b/src/osmo-bsc/nm_gprs_nsvc_fsm.c index 5186082..906ba2a 100644 --- a/src/osmo-bsc/nm_gprs_nsvc_fsm.c +++ b/src/osmo-bsc/nm_gprs_nsvc_fsm.c @@ -90,12 +90,17 @@ } } -static bool has_valid_nsvc(struct gsm_gprs_nsvc *nsvc) +static bool has_valid_nsvc(const struct gsm_gprs_nsvc *nsvc) { + /* remote address must be valid */ + if (osmo_sockaddr_is_any(&nsvc->remote)) + return false; + /* remote port must be valid */ switch (nsvc->remote.u.sa.sa_family) { case AF_INET: + return nsvc->remote.u.sin.sin_port != 0; case AF_INET6: - return (nsvc->local_port > 0 && !osmo_sockaddr_is_any(&nsvc->remote)); + return nsvc->remote.u.sin6.sin6_port != 0; default: return false; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0afd83e77f3daeeb082e7db911610428b5bc587c Gerrit-Change-Number: 32176 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bsc[master]: gprs: fix has_valid_nsvc(): permit local udp port 0
by laforge 31 Mar '23

31 Mar '23

Attention is currently required from: fixeria, daniel, lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32176 ) Change subject: gprs: fix has_valid_nsvc(): permit local udp port 0 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0afd83e77f3daeeb082e7db911610428b5bc587c Gerrit-Change-Number: 32176 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 31 Mar 2023 15:46:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: tests: add more tests for GPRS NSVC parameters
by laforge 31 Mar '23

31 Mar '23

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32171 ) Change subject: tests: add more tests for GPRS NSVC parameters ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I13d6ac887ddb1c9bc5d1e4122f20405a28f135d4 Gerrit-Change-Number: 32171 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 31 Mar 2023 15:45:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: tests: rename and extend gprs_{bvci_default->params}.vty
by laforge 31 Mar '23

31 Mar '23

Attention is currently required from: fixeria, daniel, lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32169 ) Change subject: tests: rename and extend gprs_{bvci_default->params}.vty ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia02e9a97137eb7724f22526fc3768331b35ac55d Gerrit-Change-Number: 32169 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 31 Mar 2023 15:44:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: gmm: Free ms_fsm when freeing gmme
by pespin 31 Mar '23

31 Mar '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32124 ) Change subject: gmm: Free ms_fsm when freeing gmme ...................................................................... gmm: Free ms_fsm when freeing gmme Change-Id: I0f2dd55bf0241a37a06e2ea438ca6ac2418eb7b8 --- M include/osmocom/gprs/gmm/gmm_ms_fsm.h M src/gmm/gmm.c M src/gmm/gmm_ms_fsm.c 3 files changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmocom/gprs/gmm/gmm_ms_fsm.h b/include/osmocom/gprs/gmm/gmm_ms_fsm.h index 7aff7ab..dd22a32 100644 --- a/include/osmocom/gprs/gmm/gmm_ms_fsm.h +++ b/include/osmocom/gprs/gmm/gmm_ms_fsm.h @@ -53,3 +53,4 @@ void gprs_gmm_ms_fsm_set_log_cat(int logcat); int gprs_gmm_ms_fsm_ctx_init(struct gprs_gmm_ms_fsm_ctx *ctx, struct gprs_gmm_entity *gmme); +void gprs_gmm_ms_fsm_ctx_release(struct gprs_gmm_ms_fsm_ctx *ctx); diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index 2ac6e97..163bbe8 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -150,6 +150,7 @@ return; LOGGMME(gmme, LOGL_DEBUG, "free()\n"); + gprs_gmm_ms_fsm_ctx_release(&gmme->ms_fsm); llist_del(&gmme->list); talloc_free(gmme); } diff --git a/src/gmm/gmm_ms_fsm.c b/src/gmm/gmm_ms_fsm.c index 72c6d15..423d1d0 100644 --- a/src/gmm/gmm_ms_fsm.c +++ b/src/gmm/gmm_ms_fsm.c @@ -289,3 +289,8 @@ return 0; } + +void gprs_gmm_ms_fsm_ctx_release(struct gprs_gmm_ms_fsm_ctx *ctx) +{ + osmo_fsm_inst_free(ctx->fi); +} -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I0f2dd55bf0241a37a06e2ea438ca6ac2418eb7b8 Gerrit-Change-Number: 32124 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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

[S] Change in libosmo-gprs[master]: gmm: Several fixes to GMMSM prim alloc functions
by pespin 31 Mar '23

31 Mar '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32101 ) Change subject: gmm: Several fixes to GMMSM prim alloc functions ...................................................................... gmm: Several fixes to GMMSM prim alloc functions Change-Id: Ie49cb448806101a24c58a85f7073e13baccada5b --- M include/osmocom/gprs/gmm/gmm_prim.h M src/gmm/gmm_prim.c 2 files changed, 17 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmocom/gprs/gmm/gmm_prim.h b/include/osmocom/gprs/gmm/gmm_prim.h index a345651..16cd712 100644 --- a/include/osmocom/gprs/gmm/gmm_prim.h +++ b/include/osmocom/gprs/gmm/gmm_prim.h @@ -195,7 +195,7 @@ } establish_cnf; /* OSMO_GPRS_GMM_GMMSM_RELEASE | Ind */ struct { - } page_ind; + } release_ind; /* OSMO_GPRS_GMM_GMMSM_UNITDATA | Req */ struct { uint8_t *smpdu; diff --git a/src/gmm/gmm_prim.c b/src/gmm/gmm_prim.c index 059c22a..c4de625 100644 --- a/src/gmm/gmm_prim.c +++ b/src/gmm/gmm_prim.c @@ -263,7 +263,7 @@ /*** GMMSM ***/ -static inline struct osmo_gprs_gmm_prim *gmm_prim_gmmsm_alloc(enum osmo_gprs_gmm_gmmrr_prim_type type, +static inline struct osmo_gprs_gmm_prim *gmm_prim_gmmsm_alloc(enum osmo_gprs_gmm_gmmsm_prim_type type, enum osmo_prim_operation operation, unsigned int extra_size) { @@ -274,7 +274,7 @@ struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmsm_establish_req(void) { struct osmo_gprs_gmm_prim *gmm_prim; - gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMSM_ESTABLISH, PRIM_OP_REQUEST, 0); + gmm_prim = gmm_prim_gmmsm_alloc(OSMO_GPRS_GMM_GMMSM_ESTABLISH, PRIM_OP_REQUEST, 0); return gmm_prim; } @@ -282,16 +282,16 @@ struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmsm_establish_cnf(uint8_t cause) { struct osmo_gprs_gmm_prim *gmm_prim; - gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMSM_ESTABLISH, PRIM_OP_CONFIRM, 0); + gmm_prim = gmm_prim_gmmsm_alloc(OSMO_GPRS_GMM_GMMSM_ESTABLISH, PRIM_OP_CONFIRM, 0); gmm_prim->gmmsm.establish_cnf.cause = cause; return gmm_prim; } /* 3GPP TS 24.007 9.5.1.4 GMMSM-RELEASE-IND:*/ -struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmrr_release_ind(void) +struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmsm_release_ind(void) { struct osmo_gprs_gmm_prim *gmm_prim; - gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMSM_RELEASE, PRIM_OP_INDICATION, 0); + gmm_prim = gmm_prim_gmmsm_alloc(OSMO_GPRS_GMM_GMMSM_RELEASE, PRIM_OP_INDICATION, 0); return gmm_prim; } @@ -299,7 +299,7 @@ struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmsm_unitdata_req(uint8_t *smpdu, unsigned int smpdu_len) { struct osmo_gprs_gmm_prim *gmm_prim; - gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMSM_UNITDATA, PRIM_OP_REQUEST, 0); + gmm_prim = gmm_prim_gmmsm_alloc(OSMO_GPRS_GMM_GMMSM_UNITDATA, PRIM_OP_REQUEST, smpdu_len); gmm_prim->gmmsm.unitdata_req.smpdu = smpdu; gmm_prim->gmmsm.unitdata_req.smpdu_len = smpdu_len; return gmm_prim; @@ -309,7 +309,7 @@ struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmsm_unitdata_ind(uint8_t *smpdu, unsigned int smpdu_len) { struct osmo_gprs_gmm_prim *gmm_prim; - gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMSM_UNITDATA, PRIM_OP_INDICATION, 0); + gmm_prim = gmm_prim_gmmsm_alloc(OSMO_GPRS_GMM_GMMSM_UNITDATA, PRIM_OP_INDICATION, smpdu_len); gmm_prim->gmmsm.unitdata_ind.smpdu = smpdu; gmm_prim->gmmsm.unitdata_ind.smpdu_len = smpdu_len; return gmm_prim; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ie49cb448806101a24c58a85f7073e13baccada5b Gerrit-Change-Number: 32101 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-gprs[master]: gmm: Free allocated GMMEs when freeing main context
by pespin 31 Mar '23

31 Mar '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32125 ) Change subject: gmm: Free allocated GMMEs when freeing main context ...................................................................... gmm: Free allocated GMMEs when freeing main context Change-Id: I092b2d133467d1c2dcb8dfe5def99d49807b6273 --- M src/gmm/gmm.c 1 file changed, 20 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index 163bbe8..a8b8362 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -78,6 +78,16 @@ { 0 } /* empty item at the end */ }; +static void gprs_gmm_ctx_free(void) +{ + struct gprs_gmm_entity *gmme; + + while ((gmme = llist_first_entry_or_null(&g_ctx->gmme_list, struct gprs_gmm_entity, list))) + gprs_gmm_gmme_free(gmme); + + talloc_free(g_ctx); +} + int osmo_gprs_gmm_init(enum osmo_gprs_gmm_location location) { bool first_init = true; @@ -86,7 +96,7 @@ if (g_ctx) { first_init = false; - talloc_free(g_ctx); + gprs_gmm_ctx_free(); } g_ctx = talloc_zero(NULL, struct gprs_gmm_ctx); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32125 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I092b2d133467d1c2dcb8dfe5def99d49807b6273 Gerrit-Change-Number: 32125 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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

[S] Change in libosmo-gprs[master]: llc: Free allocated LLMEs when freeing main context
by pespin 31 Mar '23

31 Mar '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32126 ) Change subject: llc: Free allocated LLMEs when freeing main context ...................................................................... llc: Free allocated LLMEs when freeing main context Change-Id: Ifb51a956d5a41f01184db4d453c64128db439f7c --- M src/llc/llc.c 1 file changed, 20 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/llc/llc.c b/src/llc/llc.c index 1c572d6..2ad0228 100644 --- a/src/llc/llc.c +++ b/src/llc/llc.c @@ -121,6 +121,16 @@ }, }; +static void gprs_llc_ctx_free(void) +{ + struct gprs_llc_llme *llme; + + while ((llme = llist_first_entry_or_null(&g_ctx->llme_list, struct gprs_llc_llme, list))) + gprs_llc_llme_free(llme); + + talloc_free(g_ctx); +} + int osmo_gprs_llc_init(enum osmo_gprs_llc_location location, const char *cipher_plugin_path) { int rc; @@ -132,7 +142,7 @@ } if (g_ctx) - talloc_free(g_ctx); + gprs_llc_ctx_free(); g_ctx = talloc_zero(NULL, struct gprs_llc_ctx); g_ctx->location = location; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32126 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ifb51a956d5a41f01184db4d453c64128db439f7c Gerrit-Change-Number: 32126 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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