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

[S] Change in libusrp[master]: debian/rules: don't build in parallel

by osmith

Attention is currently required from: osmith. osmith has removed a vote from this change. ( https://gerrit.osmocom.org/c/libusrp/+/32545 ) Change subject: debian/rules: don't build in parallel ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/32545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ic23778320a44ec6ee2fef499216eb8a0c52603d2 Gerrit-Change-Number: 32545 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: deleteVote

1 year

1
0
0 0

[S] Change in libusrp[master]: Cosmetic: contrib/jenkins.sh: fix typo

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/32544 ) Change subject: Cosmetic: contrib/jenkins.sh: fix typo ...................................................................... Patch Set 1: Verified+1 (1 comment) Patchset: PS1: rpm verification failing is a known bug: https://osmocom.org/issues/5898 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/32544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ic0459bd5585fbcf3af785dfda167811a07107edb Gerrit-Change-Number: 32544 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Apr 2023 09:03:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in libusrp[master]: Cosmetic: contrib/jenkins.sh: fix typo

by osmith

Attention is currently required from: osmith. osmith has removed a vote from this change. ( https://gerrit.osmocom.org/c/libusrp/+/32544 ) Change subject: Cosmetic: contrib/jenkins.sh: fix typo ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/32544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ic0459bd5585fbcf3af785dfda167811a07107edb Gerrit-Change-Number: 32544 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: deleteVote

1 year

1
0
0 0

[S] Change in libusrp[master]: debian/rules: don't build in parallel

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libusrp/+/32545 ) Change subject: debian/rules: don't build in parallel ...................................................................... debian/rules: don't build in parallel With upgrading the debhelper compat level to v10, parallel building was enabled by default. But this doesn't work reliably with libusrp, so disable it. On OBS, out of 18 builds, two failed. Related: OS#3970 Change-Id: Ic23778320a44ec6ee2fef499216eb8a0c52603d2 --- M debian/rules 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/45/32545/1 diff --git a/debian/rules b/debian/rules index c00c435..3ad8a03 100755 --- a/debian/rules +++ b/debian/rules @@ -9,8 +9,9 @@ #export DH_VERBOSE=1 +# --no-parallel: OS#3970 %: - dh $@ --with autoreconf --fail-missing + dh $@ --with autoreconf --fail-missing --no-parallel override_dh_auto_configure: dh_auto_configure -- --enable-doxygen -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/32545 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ic23778320a44ec6ee2fef499216eb8a0c52603d2 Gerrit-Change-Number: 32545 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[S] Change in libusrp[master]: Cosmetic: contrib/jenkins.sh: fix typo

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libusrp/+/32544 ) Change subject: Cosmetic: contrib/jenkins.sh: fix typo ...................................................................... Cosmetic: contrib/jenkins.sh: fix typo Change-Id: Ic0459bd5585fbcf3af785dfda167811a07107edb --- M contrib/jenkins.sh 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/44/32544/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 7a7e782..5360a6b 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -4,6 +4,6 @@ autoreconf --install --force ./configure -$MAKE # Parallel make fails ocsasionally, see OS#3970. +$MAKE # Parallel make fails occasionally, see OS#3970. $MAKE distcheck $MAKE maintainer-clean -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/32544 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ic0459bd5585fbcf3af785dfda167811a07107edb Gerrit-Change-Number: 32544 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[S] Change in libosmocore[master]: gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind()

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32534 ) Change subject: gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3f45a4ef339cadd47920ee3b36c38628b38221f6 Gerrit-Change-Number: 32534 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Apr 2023 08:39:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Increase log level of Rx msg log lines

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32509 ) Change subject: gmm: Increase log level of Rx msg log lines ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32509 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I461d6815ec42e5f77ee5d6e4d307011c566b61f0 Gerrit-Change-Number: 32509 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Apr 2023 08:36:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Print IMSI and TLLI in LOGGMME macro

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32508 ) Change subject: gmm: Print IMSI and TLLI in LOGGMME macro ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I34145eb83c1678bcf1b32ae6cbf3e4b01c717406 Gerrit-Change-Number: 32508 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Apr 2023 08:36:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[L] Change in libosmo-gprs[master]: gmm, rlcmac: Properly handle P-TMSI vs TLLI

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32507 ) Change subject: gmm, rlcmac: Properly handle P-TMSI vs TLLI ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/gmm/gmm.c: https://gerrit.osmocom.org/c/libosmo-gprs/+/32507/comment/874ca437_d2cf1087 PS2, Line 260: goto restart > I took some code from osmo-sgsn allocating random PTMSI as a base, that's why. I'll rework it. Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I44c95b3bc973b9dfcc79daf6b529fd2826f574e8 Gerrit-Change-Number: 32507 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Apr 2023 08:36:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in libosmocore[master]: gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind()

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32534 ) Change subject: gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3f45a4ef339cadd47920ee3b36c38628b38221f6 Gerrit-Change-Number: 32534 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Apr 2023 07:13:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in libosmocore[master]: gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind()

by lynxis lazus

Attention is currently required from: osmith, pespin. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32534 ) Change subject: gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind() ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > The saddr stands for socket address and not source address. what about peer_addr? I don't have a strong opinion here. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3f45a4ef339cadd47920ee3b36c38628b38221f6 Gerrit-Change-Number: 32534 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Apr 2023 00:53:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in libosmocore[master]: gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind()

by lynxis lazus

Attention is currently required from: osmith, pespin. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32534 ) Change subject: gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind() ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: The saddr stands for socket address and not source address. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3f45a4ef339cadd47920ee3b36c38628b38221f6 Gerrit-Change-Number: 32534 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Apr 2023 00:51:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in libosmo-abis[master]: trau_pcu_ericsson: do not set unused D bits to 1

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32543 ) Change subject: trau_pcu_ericsson: do not set unused D bits to 1 ...................................................................... trau_pcu_ericsson: do not set unused D bits to 1 The er_gprs_trau_frame_encode already pre set all non T0 bits in the TRAU frame to 1, there is no need to set unused bits explicitly. Related: OS#6015 Change-Id: I003632a08cc80bc195b306bef5f907351b6fe94e --- M src/trau/trau_pcu_ericsson.c 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/43/32543/1 diff --git a/src/trau/trau_pcu_ericsson.c b/src/trau/trau_pcu_ericsson.c index 8f2e2a2..5a12cdd 100644 --- a/src/trau/trau_pcu_ericsson.c +++ b/src/trau/trau_pcu_ericsson.c @@ -1067,9 +1067,6 @@ trau_bits[73] = 0; trau_bits[74] = calc_parity(trau_bits + 65, 8); - /* Set unused D-Bits to 1 */ - memset(trau_bits + 76, 1, 1280 - 76 - 16); - /* D-Bits */ rc = put_trau_uint32(trau_bits, 1280, T_bits_64, sizeof(T_bits_64), ind->pseq, 170, 22); if (rc < 0) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32543 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I003632a08cc80bc195b306bef5f907351b6fe94e Gerrit-Change-Number: 32543 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[S] Change in libosmo-abis[master]: trau_pcu_ericsson: set uplink frame error bit correctly

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32542 ) Change subject: trau_pcu_ericsson: set uplink frame error bit correctly ...................................................................... trau_pcu_ericsson: set uplink frame error bit correctly At the moment we set the uplink frame error bit to 1 if ul_frame_err is set to false. Unfortunately the er_gprs_trau_frame_encode pre set all non T0 bits to 1 before calling the encoder function. This means that with this logic the uplink frame error bit can never be set to 0. Related: OS#6015 Change-Id: I74f56bc40ed074eb1588b202849870e2786ded24 --- M src/trau/trau_pcu_ericsson.c 1 file changed, 25 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/42/32542/1 diff --git a/src/trau/trau_pcu_ericsson.c b/src/trau/trau_pcu_ericsson.c index 585e847..8f2e2a2 100644 --- a/src/trau/trau_pcu_ericsson.c +++ b/src/trau/trau_pcu_ericsson.c @@ -500,8 +500,8 @@ /* C-Bits */ osmo_pbit2ubit_ext(trau_bits, 17, &c_1_5, 0, 5, 1); osmo_pbit2ubit_ext(trau_bits, 22, (pbit_t *) &ind->tav, 0, 2, 1); - if (ind->ul_frame_err == false) - trau_bits[24] = 1; + if (ind->ul_frame_err) + trau_bits[24] = 0; trau_bits[25] = calc_parity(trau_bits + 17, 8); /* D-Bits */ @@ -555,8 +555,8 @@ /* C-Bits */ osmo_pbit2ubit_ext(trau_bits, 17, &c_1_5, 0, 5, 1); osmo_pbit2ubit_ext(trau_bits, 22, (pbit_t *) &ind->tav, 0, 2, 1); - if (ind->ul_frame_err == false) - trau_bits[24] = 1; + if (ind->ul_frame_err) + trau_bits[24] = 0; trau_bits[25] = calc_parity(trau_bits + 17, 8); /* Set coding scheme (E1-E2) */ @@ -1063,8 +1063,8 @@ /* C-Bits */ osmo_pbit2ubit_ext(trau_bits, 65, &c_1_5, 0, 5, 1); osmo_pbit2ubit_ext(trau_bits, 70, (pbit_t *) &ind->tav, 0, 2, 1); - if (ind->ul_frame_err == false) - trau_bits[73] = 1; + if (ind->ul_frame_err) + trau_bits[73] = 0; trau_bits[74] = calc_parity(trau_bits + 65, 8); /* Set unused D-Bits to 1 */ @@ -1135,8 +1135,8 @@ /* C-Bits */ osmo_pbit2ubit_ext(trau_bits, 65, &c_1_5, 0, 5, 1); osmo_pbit2ubit_ext(trau_bits, 70, (pbit_t *) &ind->tav, 0, 2, 1); - if (ind->ul_frame_err == false) - trau_bits[73] = 1; + if (ind->ul_frame_err) + trau_bits[73] = 0; trau_bits[74] = calc_parity(trau_bits + 65, 8); /* Set coding scheme (E1-E3) */ @@ -1321,8 +1321,8 @@ /* C-Bits */ osmo_pbit2ubit_ext(trau_bits, 65, &c_1_5, 0, 5, 1); osmo_pbit2ubit_ext(trau_bits, 70, (pbit_t *) &ind->tav, 0, 2, 1); - if (ind->ul_frame_err == false) - trau_bits[73] = 1; + if (ind->ul_frame_err) + trau_bits[73] = 0; trau_bits[74] = calc_parity(trau_bits + 65, 8); /* Set demodulation in uplink (E1-E3) */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I74f56bc40ed074eb1588b202849870e2786ded24 Gerrit-Change-Number: 32542 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[S] Change in osmo-bsc[master]: bts_is_online(): make the BTS pointer const, return bool

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32537 ) Change subject: bts_is_online(): make the BTS pointer const, return bool ...................................................................... bts_is_online(): make the BTS pointer const, return bool Change-Id: Idb4f9f8862041c5902df0e6e8d1ac2a60ada95df --- M src/osmo-bsc/bts.c 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/37/32537/1 diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 108c355..527220f 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -888,14 +888,14 @@ return (base->depends_on[idx] & (1U << bit)) > 0; } -static int bts_is_online(struct gsm_bts *bts) +static bool bts_is_online(const struct gsm_bts *bts) { /* TODO: support E1 BTS too */ if (!is_ipaccess_bts(bts)) - return 1; + return true; if (!bts->oml_link) - return 0; + return false; return bts->mo.nm_state.operational == NM_OPSTATE_ENABLED; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idb4f9f8862041c5902df0e6e8d1ac2a60ada95df Gerrit-Change-Number: 32537 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[S] Change in osmo-bsc[master]: bootstrap_rsl(): cosmetic: cache trx->bts and use it directly

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32539 ) Change subject: bootstrap_rsl(): cosmetic: cache trx->bts and use it directly ...................................................................... bootstrap_rsl(): cosmetic: cache trx->bts and use it directly Change-Id: I736ebf185028976dad5ff6f61386b6d2eeab8fbd Related: SYS#6435 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 17 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/39/32539/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 50cc0e0..133e5c2 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -312,16 +312,16 @@ static void bootstrap_rsl(struct gsm_bts_trx *trx) { + struct gsm_bts *bts = trx->bts; unsigned int i; int rc; LOG_TRX(trx, DRSL, LOGL_NOTICE, "bootstrapping RSL " "on ARFCN %u using MCC-MNC %s LAC=%u CID=%u BSIC=%u\n", trx->arfcn, osmo_plmn_name(&bsc_gsmnet->plmn), - trx->bts->location_area_code, - trx->bts->cell_identity, trx->bts->bsic); + bts->location_area_code, bts->cell_identity, bts->bsic); - if (trx->bts->type == GSM_BTS_TYPE_NOKIA_SITE) { + if (bts->type == GSM_BTS_TYPE_NOKIA_SITE) { rsl_nokia_si_begin(trx); } @@ -338,14 +338,14 @@ return; } - if (trx->bts->type == GSM_BTS_TYPE_NOKIA_SITE) { + if (bts->type == GSM_BTS_TYPE_NOKIA_SITE) { /* channel unspecific, power reduction in 2 dB steps */ rsl_bs_power_control(trx, 0xFF, trx->max_power_red / 2); rsl_nokia_si_end(trx); } - if (trx->bts->model->power_ctrl_send_def_params != NULL) { - rc = trx->bts->model->power_ctrl_send_def_params(trx); + if (bts->model->power_ctrl_send_def_params != NULL) { + rc = bts->model->power_ctrl_send_def_params(trx); if (rc) { LOG_TRX(trx, DRSL, LOGL_ERROR, "Failed to send default " "MS/BS Power control parameters (rc=%d)\n", rc); @@ -360,7 +360,7 @@ } /* Drop all expired channel requests in the list */ - abis_rsl_chan_rqd_queue_flush(trx->bts); + abis_rsl_chan_rqd_queue_flush(bts); } struct osmo_timer_list update_connection_stats_timer; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32539 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I736ebf185028976dad5ff6f61386b6d2eeab8fbd Gerrit-Change-Number: 32539 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[S] Change in osmo-bsc[master]: struct gsm_bts_model: rename power_ctrl_{set->send}_c0_power_red

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32538 ) Change subject: struct gsm_bts_model: rename power_ctrl_{set->send}_c0_power_red ...................................................................... struct gsm_bts_model: rename power_ctrl_{set->send}_c0_power_red Change-Id: I13d9e6ea2a2b7b11f92532d377e71f0e83974622 Related: SYS#6435 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_osmobts.c 3 files changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/38/32538/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 20ed089..9b2aaab 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -300,7 +300,7 @@ /* (Optional) function for sending default MS/BS Power Control paramaters */ int (*power_ctrl_send_def_params)(const struct gsm_bts_trx *trx); /* (Optional) function for toggling BCCH carrier power reduction operation */ - int (*power_ctrl_set_c0_power_red)(const struct gsm_bts *bts, const uint8_t red); + int (*power_ctrl_send_c0_power_red)(const struct gsm_bts *bts, const uint8_t red); void (*config_write_bts)(struct vty *vty, struct gsm_bts *bts); void (*config_write_trx)(struct vty *vty, struct gsm_bts_trx *trx); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 527220f..f5936c7 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -986,10 +986,10 @@ if (!osmo_bts_has_feature(&bts->features, BTS_FEAT_BCCH_POWER_RED)) return -ENOTSUP; - if (bts->model->power_ctrl_set_c0_power_red == NULL) + if (bts->model->power_ctrl_send_c0_power_red == NULL) return -ENOTSUP; - rc = bts->model->power_ctrl_set_c0_power_red(bts, red); + rc = bts->model->power_ctrl_send_c0_power_red(bts, red); if (rc != 0) return rc; diff --git a/src/osmo-bsc/bts_osmobts.c b/src/osmo-bsc/bts_osmobts.c index 078cfe7..5f6f86f 100644 --- a/src/osmo-bsc/bts_osmobts.c +++ b/src/osmo-bsc/bts_osmobts.c @@ -159,8 +159,7 @@ *ie_len = msg->tail - (ie_len + 1); } -static int power_ctrl_set_c0_power_red(const struct gsm_bts *bts, - const uint8_t red) +static int power_ctrl_send_c0_power_red(const struct gsm_bts *bts, const uint8_t red) { struct abis_rsl_dchan_hdr *dh; struct msgb *msg; @@ -198,7 +197,7 @@ model_osmobts.force_combined_si = false; /* Power control API */ - model_osmobts.power_ctrl_set_c0_power_red = &power_ctrl_set_c0_power_red; + model_osmobts.power_ctrl_send_c0_power_red = &power_ctrl_send_c0_power_red; model_osmobts.features.data = &model_osmobts._features_data[0]; model_osmobts.features.data_len = -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I13d9e6ea2a2b7b11f92532d377e71f0e83974622 Gerrit-Change-Number: 32538 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[M] Change in osmo-bsc[master]: bts: st_op_enabled_on_enter(): resume C0 power reduction

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32540 ) Change subject: bts: st_op_enabled_on_enter(): resume C0 power reduction ...................................................................... bts: st_op_enabled_on_enter(): resume C0 power reduction If power saving is enabled for a BTS, it should remain enabled even if the BTS is restarted for whatever reason. This persistence can be achieved by re-sending the configured power reduction value whenever the BTS NM FSM enters the ENABLED state again (i.e. reconnects). Separate gsm_bts_send_c0_power_red() from gsm_bts_set_c0_power_red() and call the former from st_op_enabled_on_enter(). All we need to do is to send the value that was configured before, per-timeslot power reduction limits remain and need not to be updated. Take a chance to move logging from BTS specific to the generic code. Change-Id: Ic3f8a2ab0ffd049a8ed84361a3a588c1e1b23ac6 Related: SYS#6435 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_osmobts.c M src/osmo-bsc/nm_bts_fsm.c 4 files changed, 47 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/40/32540/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 9b2aaab..78fc6a0 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -822,6 +822,7 @@ int gsm_bts_set_system_infos(struct gsm_bts *bts); +int gsm_bts_send_c0_power_red(const struct gsm_bts *bts, const uint8_t red); int gsm_bts_set_c0_power_red(struct gsm_bts *bts, const uint8_t red); void gsm_bts_stats_reset(struct gsm_bts *bts); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index f5936c7..a6fc4a4 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -978,21 +978,31 @@ return 0; } +/* Send the given C0 power reduction value to the BTS */ +int gsm_bts_send_c0_power_red(const struct gsm_bts *bts, const uint8_t red) +{ + if (!osmo_bts_has_feature(&bts->features, BTS_FEAT_BCCH_POWER_RED)) + return -ENOTSUP; + if (bts->model->power_ctrl_send_c0_power_red == NULL) + return -ENOTSUP; + return bts->model->power_ctrl_send_c0_power_red(bts, red); +} + +/* Send the given C0 power reduction value to the BTS and update the internal state */ int gsm_bts_set_c0_power_red(struct gsm_bts *bts, const uint8_t red) { struct gsm_bts_trx *c0 = bts->c0; unsigned int tn; int rc; - if (!osmo_bts_has_feature(&bts->features, BTS_FEAT_BCCH_POWER_RED)) - return -ENOTSUP; - if (bts->model->power_ctrl_send_c0_power_red == NULL) - return -ENOTSUP; - - rc = bts->model->power_ctrl_send_c0_power_red(bts, red); + rc = gsm_bts_send_c0_power_red(bts, red); if (rc != 0) return rc; + LOGP(DRSL, LOGL_NOTICE, "%sabling BCCH carrier power reduction " + "operation mode for BTS%u (maximum %u dB)\n", + red ? "En" : "Dis", bts->nr, red); + /* Timeslot 0 is always transmitting BCCH/CCCH */ c0->ts[0].c0_max_power_red_db = 0; diff --git a/src/osmo-bsc/bts_osmobts.c b/src/osmo-bsc/bts_osmobts.c index 5f6f86f..ea0405b 100644 --- a/src/osmo-bsc/bts_osmobts.c +++ b/src/osmo-bsc/bts_osmobts.c @@ -168,10 +168,6 @@ if (msg == NULL) return -ENOMEM; - LOGP(DRSL, LOGL_NOTICE, "%sabling BCCH carrier power reduction " - "operation mode for BTS%u (maximum %u dB)\n", - red ? "En" : "Dis", bts->nr, red); - /* Abuse the standard BS POWER CONTROL message by specifying 'Common Channel' * in the Protocol Discriminator field and 'BCCH' in the Channel Number IE. */ dh = (struct abis_rsl_dchan_hdr *) msgb_put(msg, sizeof(*dh)); diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c index 92728dc..acd69a5 100644 --- a/src/osmo-bsc/nm_bts_fsm.c +++ b/src/osmo-bsc/nm_bts_fsm.c @@ -286,6 +286,14 @@ bts->mo.get_attr_rep_received = false; bts->mo.set_attr_sent = false; bts->mo.set_attr_ack_received = false; + + /* Resume power saving on the BCCH carrier, if was enabled */ + if (bts->c0_max_power_red_db > 0) { + LOGP(DRSL, LOGL_NOTICE, "Resuming BCCH carrier power reduction " + "operation mode for BTS%u (maximum %u dB)\n", + bts->nr, bts->c0_max_power_red_db); + gsm_bts_send_c0_power_red(bts, bts->c0_max_power_red_db); + } } static void st_op_enabled(struct osmo_fsm_inst *fi, uint32_t event, void *data) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32540 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic3f8a2ab0ffd049a8ed84361a3a588c1e1b23ac6 Gerrit-Change-Number: 32540 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[S] Change in osmo-bsc[master]: gsm_bts_send_c0_power_red(): check if BTS is online first

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32541 ) Change subject: gsm_bts_send_c0_power_red(): check if BTS is online first ...................................................................... gsm_bts_send_c0_power_red(): check if BTS is online first ... and print a proper error message instead of "not supported". We don't know for sure whether it's supported before the BTS is connected. Change-Id: I080aa7ef331b76918ae48d555eea6e4290c57120 Related: SYS#6435 --- M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts.c M src/osmo-bsc/bts_ctrl.c 3 files changed, 31 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/41/32541/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index f1bd7c4..34676a2 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1426,18 +1426,22 @@ } rc = gsm_bts_set_c0_power_red(bts, red); - if (rc == -ENOTSUP) { + switch (rc) { + case 0: /* success */ + return CMD_SUCCESS; + case -ENOTCONN: + vty_out(vty, "%% BTS%u is offline%s", bts_nr, VTY_NEWLINE); + return CMD_WARNING; + case -ENOTSUP: vty_out(vty, "%% BCCH carrier power reduction operation mode " "is not supported for BTS%u%s", bts_nr, VTY_NEWLINE); return CMD_WARNING; - } else if (rc != 0) { + default: vty_out(vty, "%% Failed to %sable BCCH carrier power reduction " "operation mode for BTS%u%s", red ? "en" : "dis", bts_nr, VTY_NEWLINE); return CMD_WARNING; } - - return CMD_SUCCESS; } /* this command is now hidden, as it's a low-level debug hack, and people should diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index a6fc4a4..4a27c55 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -981,6 +981,8 @@ /* Send the given C0 power reduction value to the BTS */ int gsm_bts_send_c0_power_red(const struct gsm_bts *bts, const uint8_t red) { + if (!bts_is_online(bts)) + return -ENOTCONN; if (!osmo_bts_has_feature(&bts->features, BTS_FEAT_BCCH_POWER_RED)) return -ENOTSUP; if (bts->model->power_ctrl_send_c0_power_red == NULL) diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index a971fab..5ac1e0d 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -497,15 +497,19 @@ int rc; rc = gsm_bts_set_c0_power_red(bts, red); - if (rc == -ENOTSUP) { + switch (rc) { + case 0: /* success */ + return get_bts_c0_power_red(cmd, data); + case -ENOTCONN: + cmd->reply = "BTS is offline"; + return CTRL_CMD_ERROR; + case -ENOTSUP: cmd->reply = "BCCH carrier power reduction is not supported"; return CTRL_CMD_ERROR; - } else if (rc != 0) { + default: cmd->reply = "Failed to enable BCCH carrier power reduction"; return CTRL_CMD_ERROR; } - - return get_bts_c0_power_red(cmd, data); } CTRL_CMD_DEFINE(bts_c0_power_red, "c0-power-reduction"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32541 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I080aa7ef331b76918ae48d555eea6e4290c57120 Gerrit-Change-Number: 32541 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[M] Change in libosmo-abis[master]: osmo_rtp2trau() for FR & EFR UL: set C13 & C14 correctly

by falconia

falconia has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32347 ) Change subject: osmo_rtp2trau() for FR & EFR UL: set C13 & C14 correctly ...................................................................... osmo_rtp2trau() for FR & EFR UL: set C13 & C14 correctly Control bits C13 & C14 in TRAU-UL frames indicate SID classification per section 6.1.1 of GSM 06.31 for FR or GSM 06.81 for EFR. Previous commit 08d0c0990275 implements correct setting of C16 in TRAU-DL, but the case of generating TRAU-UL was left as a FIXME. Now that we have osmo_{fr,efr}_sid_classify() functions in libosmocodec, we can set C13 & C14 in TRAU-UL too. Do it. Change-Id: Ifcfc28ad7d77e561d456be546689995abfd8a6f5 --- M TODO-RELEASE M src/trau/trau_rtp_conv.c 2 files changed, 39 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index c021505..5f2f654 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmo-abis struct e1inp_driver Field added at the end (ABI break) +libosmocodec >1.8.0 osmo_{fr,efr}_sid_classify() new functions diff --git a/src/trau/trau_rtp_conv.c b/src/trau/trau_rtp_conv.c index e08b0b9..5c87c46 100644 --- a/src/trau/trau_rtp_conv.c +++ b/src/trau/trau_rtp_conv.c @@ -257,6 +257,7 @@ static int rtp2trau_fr(struct osmo_trau_frame *tf, const uint8_t *data, size_t data_len) { int i, j, k, l, o; + enum osmo_gsm631_sid_class sidc; /* data_len == 0 for BFI frame */ if (data_len < GSM_FR_BYTES && data_len != 0) @@ -296,13 +297,17 @@ } memset(&tf->c_bits[5], 0, 6); /* C6 .. C11: Time Alignment */ if (tf->dir == OSMO_TRAU_DIR_UL) { - if (data_len == 0) + if (data_len == 0) { tf->c_bits[11] = 1; /* C12: BFI */ - else + tf->c_bits[12] = 0; /* C13: SID=0 */ + tf->c_bits[13] = 0; /* C14: SID=0 */ + } else { tf->c_bits[11] = 0; /* C12: BFI */ - /* FIXME: set C13 & C14 per GSM 06.31 section 6.1.1 */ - tf->c_bits[12] = 0; /* C13: SID=0 */ - tf->c_bits[13] = 0; /* C14: SID=0 */ + /* SID classification per GSM 06.31 section 6.1.1 */ + sidc = osmo_fr_sid_classify(data); + tf->c_bits[12] = (sidc >> 1) & 1; /* C13: msb */ + tf->c_bits[13] = (sidc >> 0) & 1; /* C14: lsb */ + } tf->c_bits[14] = 0; /* C15: TAF (SACCH or not) */ tf->c_bits[15] = 1; /* C16: spare */ tf->c_bits[16] = 0; /* C17: DTXd not applied */ @@ -430,6 +435,7 @@ { int i, j; ubit_t check_bits[26]; + enum osmo_gsm631_sid_class sidc; /* data_len == 0 for BFI frame */ if (data_len < GSM_EFR_BYTES && data_len != 0) @@ -461,13 +467,17 @@ memset(&tf->c_bits[5], 0, 6); /* C6 .. C11: Time Alignment */ if (tf->dir == OSMO_TRAU_DIR_UL) { - if (data_len == 0) - tf->c_bits[11] = 1; /* C12: BFI=1 */ - else - tf->c_bits[11] = 0; /* C12: BFI=1 */ - /* FIXME: set C13 & C14 per GSM 06.81 section 6.1.1 */ - tf->c_bits[12] = 0; /* C13: SID=0 */ - tf->c_bits[13] = 0; /* C14: SID=0 */ + if (data_len == 0) { + tf->c_bits[11] = 1; /* C12: BFI */ + tf->c_bits[12] = 0; /* C13: SID=0 */ + tf->c_bits[13] = 0; /* C14: SID=0 */ + } else { + tf->c_bits[11] = 0; /* C12: BFI */ + /* SID classification per GSM 06.81 section 6.1.1 */ + sidc = osmo_efr_sid_classify(data); + tf->c_bits[12] = (sidc >> 1) & 1; /* C13: msb */ + tf->c_bits[13] = (sidc >> 0) & 1; /* C14: lsb */ + } tf->c_bits[14] = 0; /* C15: TAF (SACCH) */ tf->c_bits[15] = 1; /* C16: spare */ tf->c_bits[16] = 0; /* C17: DTXd applied */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ifcfc28ad7d77e561d456be546689995abfd8a6f5 Gerrit-Change-Number: 32347 Gerrit-PatchSet: 3 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in libosmo-abis[master]: osmo_rtp2trau() for FR & EFR UL: set C13 & C14 correctly

by fixeria

Attention is currently required from: falconia. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32347 ) Change subject: osmo_rtp2trau() for FR & EFR UL: set C13 & C14 correctly ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ifcfc28ad7d77e561d456be546689995abfd8a6f5 Gerrit-Change-Number: 32347 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Thu, 27 Apr 2023 19:49:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[L] Change in libosmocore[master]: [WIP, BROKEN] osmo_io: Add io_uring backend

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/32536 ) Change subject: [WIP, BROKEN] osmo_io: Add io_uring backend ...................................................................... [WIP, BROKEN] osmo_io: Add io_uring backend Change-Id: I5152129eb84b31ccc9e02bc2a5c5bdb046d331bc --- M configure.ac M include/osmocom/core/osmo_io.h M src/core/Makefile.am M src/core/osmo_io.c M src/core/osmo_io_internal.h A src/core/osmo_io_uring.c 6 files changed, 471 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/36/32536/1 diff --git a/configure.ac b/configure.ac index 5e17c7a..3e5d8f6 100644 --- a/configure.ac +++ b/configure.ac @@ -174,6 +174,20 @@ PKG_CHECK_MODULES(TALLOC, [talloc >= 2.1.0]) +AC_ARG_ENABLE([uring], [AS_HELP_STRING([--disable-uring], [Build without io_uring support])], + [ + ENABLE_URING=$enableval + ], + [ + ENABLE_URING="yes" + ]) +AS_IF([test "x$ENABLE_URING" = "xyes"], [ + PKG_CHECK_MODULES(URING, [liburing >= 2]) + AC_DEFINE([HAVE_URING],[1],[Build with io_uring support]) +]) +AM_CONDITIONAL(ENABLE_URING, test "x$ENABLE_URING" = "xyes") +AC_SUBST(ENABLE_URING) + AC_ARG_ENABLE([pcsc], [AS_HELP_STRING([--disable-pcsc], [Build without PC/SC support])], [ ENABLE_PCSC=$enableval diff --git a/include/osmocom/core/osmo_io.h b/include/osmocom/core/osmo_io.h index fa7a745..01a7ada 100644 --- a/include/osmocom/core/osmo_io.h +++ b/include/osmocom/core/osmo_io.h @@ -22,6 +22,7 @@ enum osmo_io_backend { OSMO_IO_BACKEND_POLL, + OSMO_IO_BACKEND_URING, }; extern const struct value_string osmo_io_backend_names[]; diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 80ee458..2f2fc19 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -4,7 +4,7 @@ LIBVERSION=20:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) -AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) +AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) $(URING_CFLAGS) if ENABLE_PSEUDOTALLOC AM_CPPFLAGS += -I$(top_srcdir)/src/pseudotalloc @@ -18,6 +18,7 @@ $(LIBRARY_RT) \ $(PTHREAD_LIBS) \ $(LIBSCTP_LIBS) \ + $(URING_LIBS) \ $(NULL) libosmocore_la_SOURCES = \ @@ -156,5 +157,9 @@ libosmocore_la_LIBADD += probes.lo endif +if ENABLE_URING +libosmocore_la_SOURCES += osmo_io_uring.c +endif + crc%gen.c: crcXXgen.c.tpl $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@ diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index caf776a..3647deb 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -44,6 +44,7 @@ const struct value_string osmo_io_backend_names[] = { { OSMO_IO_BACKEND_POLL, "Poll" }, + { OSMO_IO_BACKEND_URING, "Uring" }, { 0, NULL } }; @@ -52,12 +53,21 @@ /* Used by some tests, can't be static */ struct iofd_backend_ops osmo_iofd_ops; +#if defined(HAVE_URING) +void osmo_iofd_uring_init(void); +#endif + /*! initialize osmo_io for the current thread */ void osmo_iofd_init(void) { switch (g_io_backend) { case OSMO_IO_BACKEND_POLL: break; +#if defined(HAVE_URING) + case OSMO_IO_BACKEND_URING: + osmo_iofd_uring_init(); + break; +#endif default: OSMO_ASSERT(0); break; @@ -75,6 +85,11 @@ if (!strcmp("POLL", backend)) { g_io_backend = OSMO_IO_BACKEND_POLL; osmo_iofd_ops = iofd_poll_ops; +#if defined(HAVE_URING) + } else if (!strcmp("URING", backend)) { + g_io_backend = OSMO_IO_BACKEND_URING; + osmo_iofd_ops = iofd_uring_ops; +#endif } else { fprintf(stderr, "Invalid LIBOSMO_IO_BACKEND selected (got: %s)\n", backend); exit(1); diff --git a/src/core/osmo_io_internal.h b/src/core/osmo_io_internal.h index 0d61519..a396b53 100644 --- a/src/core/osmo_io_internal.h +++ b/src/core/osmo_io_internal.h @@ -19,6 +19,10 @@ extern struct iofd_backend_ops iofd_poll_ops; #define OSMO_IO_BACKEND_DEFAULT "POLL" +#if defined(HAVE_URING) +extern struct iofd_backend_ops iofd_uring_ops; +#endif + struct iofd_backend_ops { int (*register_fd)(struct osmo_io_fd *iofd); int (*unregister_fd)(struct osmo_io_fd *iofd); diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c new file mode 100644 index 0000000..b092faa --- /dev/null +++ b/src/core/osmo_io_uring.c @@ -0,0 +1,422 @@ +/*! \file osmo_io_uring.c + * io_uring backend for osmo_io. + * + * (C) 2022-2023 by sysmocom s.f.m.c. + * Author: Daniel Willmann <daniel(a)sysmocom.de> + * + * All Rights Reserved. + * + * SPDX-License-Identifier: GPL-2.0+ + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* TODO: + * Parameters: + * - number of simultaneous read/write in uring for given fd + * + */ + +#include <stdio.h> +#include <talloc.h> +#include <unistd.h> +#include <string.h> +#include <stdbool.h> +#include <errno.h> + +#include <sys/eventfd.h> +#include <liburing.h> + +#include <osmocom/core/osmo_io.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/select.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/socket.h> + +#include "../config.h" +#include "osmo_io_internal.h" + +#define IOFD_URING_ENTRIES 4096 + +struct osmo_io_uring { + struct osmo_fd event_ofd; + struct io_uring ring; +}; + +static __thread struct osmo_io_uring g_ring; + +int iofd_uring_poll_cb(struct osmo_fd *ofd, unsigned int what); + +/*! initialize the uring */ +void osmo_iofd_uring_init(void) +{ + int rc; + rc = io_uring_queue_init(IOFD_URING_ENTRIES, &g_ring.ring, 0); + if (rc < 0) + OSMO_ASSERT(0); + + rc = eventfd(0, 0); + if (rc < 0) { + io_uring_queue_exit(&g_ring.ring); + OSMO_ASSERT(0); + } + + /* FIXME: This can't be done in _init because it depends on the osmo_fd constructor being run and order is unspecified */ + osmo_fd_setup(&g_ring.event_ofd, rc, OSMO_FD_READ, iofd_uring_poll_cb, &g_ring.ring, 1); + osmo_fd_register(&g_ring.event_ofd); + io_uring_register_eventfd(&g_ring.ring, rc); +} + +static int iofd_uring_cqe(struct io_uring *ring); +int iofd_uring_poll_cb(struct osmo_fd *ofd, unsigned int what) +{ + struct io_uring *ring = ofd->data; + eventfd_t val; + int rc; + + if (what & OSMO_FD_READ) { + rc = eventfd_read(ofd->fd, &val); + // TODO: Logging + if (rc < 0) + return rc; + + iofd_uring_cqe(ring); + } + if (what & OSMO_FD_WRITE) { + OSMO_ASSERT(0); + } + + return 0; +} + +static void iofd_uring_submit_read(struct osmo_io_fd *iofd) +{ + struct msgb *msg; + struct iofd_msghdr *msghdr; + struct io_uring_sqe *sqe = io_uring_get_sqe(&g_ring.ring); + if (!sqe) + // FIXME + OSMO_ASSERT(0); + + // TODO: This only works if we have one read per fd + msg = iofd_msgb_pending_or_alloc(iofd); + if (!msg) { + // FIXME: complain + return; + } + + msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_READ, msg); + if (!msghdr) + return; + + msghdr->iov[0].iov_base = msgb_data(msg); + msghdr->iov[0].iov_len = msgb_tailroom(msg); + + // Prep msgb/iov + io_uring_prep_readv(sqe, iofd->fd, msghdr->iov, 1, 0); + io_uring_sqe_set_data(sqe, msghdr); + + io_uring_submit(&g_ring.ring); + iofd->u.uring.read_pending = true; +} + +static void iofd_uring_submit_recvfrom(struct osmo_io_fd *iofd) +{ + struct msgb *msg; + struct iofd_msghdr *msghdr; + struct io_uring_sqe *sqe = io_uring_get_sqe(&g_ring.ring); + if (!sqe) + // FIXME + OSMO_ASSERT(0); + + msg = iofd_msgb_pending_or_alloc(iofd); + if (!msg) { + // FIXME: complain + return; + } + + msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_RECVFROM, msg); + if (!msghdr) + return; + + msghdr->iov[0].iov_base = msgb_data(msg); + msghdr->iov[0].iov_len = msgb_tailroom(msg); + + msghdr->hdr.msg_iov = &msghdr->iov[0]; + msghdr->hdr.msg_iovlen = 1; + msghdr->hdr.msg_name = &msghdr->osa.u.sa; + msghdr->hdr.msg_namelen = osmo_sockaddr_size(&msghdr->osa); + + // Prep msgb/iov + io_uring_prep_recvmsg(sqe, iofd->fd, &msghdr->hdr, msghdr->flags); + io_uring_sqe_set_data(sqe, msghdr); + + io_uring_submit(&g_ring.ring); + iofd->u.uring.read_pending = true; +} + +void iofd_uring_read_enable(struct osmo_io_fd *iofd) +{ + iofd->u.uring.read_enabled = true; + + if (iofd->u.uring.read_pending) + return; + + switch (iofd->mode) { + case OSMO_IO_FD_MODE_READ_WRITE: + iofd_uring_submit_read(iofd); + break; + case OSMO_IO_FD_MODE_RECVFROM_SENDTO: + iofd_uring_submit_recvfrom(iofd); + break; + default: + OSMO_ASSERT(0); + } + +} + +static void iofd_uring_handle_read(struct iofd_msghdr *msghdr, int rc) +{ + struct osmo_io_fd * iofd = msghdr->iofd; + struct msgb *msg = msghdr->msg; + + if (rc > 0) + msgb_put(msg, rc); + + if (!iofd->closed) + iofd_handle_segmented_read(iofd, msg, rc); + + iofd_msghdr_free(msghdr); + if (iofd->u.uring.read_enabled && !iofd->closed) { + iofd_uring_submit_read(iofd); + } else { + iofd->u.uring.read_pending = false; + } +} + +static void iofd_uring_handle_recvfrom(struct iofd_msghdr *msghdr, int rc) +{ + struct osmo_io_fd * iofd = msghdr->iofd; + struct msgb *msg = msghdr->msg; + + if (rc > 0) + msgb_put(msg, rc); + + if (!iofd->closed) + // FIXME: Include flags + iofd->io_ops.recvfrom_cb(iofd, rc, msghdr->msg, &msghdr->osa); + + iofd_msghdr_free(msghdr); + + if (iofd->u.uring.read_enabled && !iofd->closed) { + iofd_uring_submit_recvfrom(iofd); + } else { + iofd->u.uring.read_pending = false; + } +} + +static int iofd_uring_submit_tx(struct osmo_io_fd *iofd); + +static void iofd_uring_handle_tx(struct iofd_msghdr *msghdr, int rc) +{ + struct osmo_io_fd *iofd = msghdr->iofd; + + if (iofd->closed) + goto out_free; + + if (rc < 0) { + if (msghdr->action == IOFD_ACT_WRITE) + iofd->io_ops.write_cb(iofd, rc, msghdr->msg); + else if (msghdr->action == IOFD_ACT_SENDTO) + iofd->io_ops.sendto_cb(iofd, rc, msghdr->msg, &msghdr->osa); + else + OSMO_ASSERT(0); + goto out_free; + } + + if (rc < msgb_length(msghdr->msg)) { + iofd_txqueue_enqueue_front(iofd, msghdr); + goto out; + } + + if (msghdr->action == IOFD_ACT_WRITE) + iofd->io_ops.write_cb(iofd, rc, msghdr->msg); + else if (msghdr->action == IOFD_ACT_SENDTO) + iofd->io_ops.sendto_cb(iofd, rc, msghdr->msg, &msghdr->osa); + else + OSMO_ASSERT(0); + +out_free: + msgb_free(msghdr->msg); + iofd_msghdr_free(msghdr); + +out: + iofd->u.uring.write_pending = false; + if (iofd->u.uring.write_enabled && !iofd->closed) { + iofd_uring_submit_tx(iofd); + } +} + +static void iofd_uring_handle_completion(struct iofd_msghdr *msghdr, int res) +{ + struct osmo_io_fd *iofd = msghdr->iofd; + + switch (msghdr->action) { + case IOFD_ACT_READ: + iofd_uring_handle_read(msghdr, res); + break; + case IOFD_ACT_RECVFROM: + iofd_uring_handle_recvfrom(msghdr, res); + break; + case IOFD_ACT_WRITE: + /* Fallthrough */ + case IOFD_ACT_SENDTO: + iofd_uring_handle_tx(msghdr, res); + break; + default: + OSMO_ASSERT(0) + } + + if (iofd->closed && !iofd->u.uring.read_pending && ! iofd->u.uring.write_pending) + talloc_free(iofd); +} + +static int iofd_uring_cqe(struct io_uring *ring) +{ + int rc; + struct io_uring_cqe *cqe; + struct iofd_msghdr *msghdr; + + do { + /* Maybe use peek_batch? */ + rc = io_uring_peek_cqe(ring, &cqe); + if (rc < 0) + break; + + msghdr = io_uring_cqe_get_data(cqe); + OSMO_ASSERT(msghdr); + + iofd_uring_handle_completion(msghdr, cqe->res); + // FIXME: Call seen inside the handlers? + /* Hand the entry back to the kernel */ + io_uring_cqe_seen(ring, cqe); + } while (rc == 0); + + return 0; +} + +static int iofd_uring_submit_write(struct osmo_io_fd *iofd, struct iofd_msghdr *msghdr) +{ + struct io_uring_sqe *sqe = io_uring_get_sqe(&g_ring.ring); + if (!sqe) + // FIXME + OSMO_ASSERT(0); + + msghdr->iov[0].iov_base = msgb_data(msghdr->msg); + msghdr->iov[0].iov_len = msgb_length(msghdr->msg); + msghdr->hdr.msg_iov = &msghdr->iov[0]; + msghdr->hdr.msg_iovlen = 1; + + // Prep msgb/iov + io_uring_prep_writev(sqe, msghdr->iofd->fd, msghdr->iov, 1, 0); + io_uring_sqe_set_data(sqe, msghdr); + + io_uring_submit(&g_ring.ring); + + return 0; +} + +static int iofd_uring_submit_sendto(struct osmo_io_fd *iofd, struct iofd_msghdr *msghdr) +{ + struct io_uring_sqe *sqe = io_uring_get_sqe(&g_ring.ring); + if (!sqe) + // FIXME + OSMO_ASSERT(0); + + msghdr->iov[0].iov_base = msgb_data(msghdr->msg); + msghdr->iov[0].iov_len = msgb_length(msghdr->msg); + msghdr->hdr.msg_iov = &msghdr->iov[0]; + msghdr->hdr.msg_iovlen = 1; + msghdr->hdr.msg_name = &msghdr->osa.u.sa; + msghdr->hdr.msg_namelen = osmo_sockaddr_size(&msghdr->osa); + + // Prep msgb/iov + io_uring_prep_sendmsg(sqe, msghdr->iofd->fd, &msghdr->hdr, msghdr->flags); + io_uring_sqe_set_data(sqe, msghdr); + + io_uring_submit(&g_ring.ring); + + return 0; +} + +static int iofd_uring_submit_tx(struct osmo_io_fd *iofd) +{ + int rc; + struct iofd_msghdr *msghdr; + + msghdr = iofd_txqueue_dequeue(iofd); + if (!msghdr) + return -ENODATA; + + switch (msghdr->action) { + case IOFD_ACT_WRITE: + rc = iofd_uring_submit_write(iofd, msghdr); + break; + case IOFD_ACT_SENDTO: + rc = iofd_uring_submit_sendto(iofd, msghdr); + break; + default: + OSMO_ASSERT(0); + } + if (rc == 0) + iofd->u.uring.write_pending = true; + + return rc; +} + +void iofd_uring_write_enable(struct osmo_io_fd *iofd) +{ + iofd->u.uring.write_enabled = true; + + if (iofd->u.uring.write_pending) + return; + + iofd_uring_submit_tx(iofd); +} + +void iofd_uring_write_disable(struct osmo_io_fd *iofd) +{ + iofd->u.uring.write_enabled = false; +} + +void iofd_uring_read_disable(struct osmo_io_fd *iofd) +{ + iofd->u.uring.read_enabled = false; +} + +int iofd_uring_close(struct osmo_io_fd *iofd) +{ + if (iofd->u.uring.read_pending || iofd->u.uring.write_pending) + return 0; + + return close(iofd->fd); +} + +struct iofd_backend_ops iofd_uring_ops = { + .close = iofd_uring_close, + .write_enable = iofd_uring_write_enable, + .write_disable = iofd_uring_write_disable, + .read_enable = iofd_uring_read_enable, + .read_disable = iofd_uring_read_disable, +}; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32536 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5152129eb84b31ccc9e02bc2a5c5bdb046d331bc Gerrit-Change-Number: 32536 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[L] Change in osmo-hnbgw[master]: sccp: allow separate cs7 for IuPS and IuCS

by neels

Attention is currently required from: laforge, pespin, msuraev. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32323 ) Change subject: sccp: allow separate cs7 for IuPS and IuCS ...................................................................... Patch Set 5: (2 comments) Patchset: PS5: > That's pretty big - shouldn't there be some tests/ additions to ensure things won't fall apart? I tested with the ttcn3 test suite, first of all whether everything still works with a single cs7, same as jenkins, and then i also tested manually with separate cs7 instances ... So I tested it (TM) and we can merge it now; Or, if you reviewers prefer we can first wait for the entire MSC/SGSN pooling feature to be complete -- this is only the first step in a yet larger refactoring. I submitted it early because customer wants to use this as a workaround. For the CN pooling feature, there will be substantial new tests and infrastructure in HNBGW_Tests.ttcn and I guess we should configure one or two of the MSCs/SGSNs of the CN pool in the ttcn3 tests in separate cs7 instances. Short answer is: yes, will come =) not part of this patch PS5: > What I am missing here is dding a new .cfg file to doc/examples/ showcasing this new possible setup. […] (i have no idea why this is marked resolved, unresolving now) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iea1824f1c586723d989c80a909bae16bd2866e08 Gerrit-Change-Number: 32323 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Apr 2023 17:03:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-iuh[master]: asn1tostruct.py: fix leak in error paths of iesDefs

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/32531 ) Change subject: asn1tostruct.py: fix leak in error paths of iesDefs ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > I have no idea ¯\_(ツ)_/¯ Yeah they generate better code now. The problem with that is that using a new upstream asn1c would mean we need to rewrite lots of code, and make sure there are no regressions. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/32531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I424c4ea2681f5c9a5eec99396502615de5eab841 Gerrit-Change-Number: 32531 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Apr 2023 16:53:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in pysim[master]: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (Settable)

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/32532 ) Change subject: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (Settable) ...................................................................... Patch Set 8: (1 comment) Commit Message: https://gerrit.osmocom.org/c/pysim/+/32532/comment/2d16e3f4_8bde24e0 PS8, Line 11: Older versions will ignore the settable_object parameter The minimum cmd2 version that works with this patchset applied is 2.0.0 :/ > or we finally bump the version (at least to 0.8.5, which is provided by debian:bullseye). Damn, I am surprised bullseye ships such an ancient version (April 15, 2018). Nevermind, we of course cannot bump from currently required 1.5 to 0.8.5. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I38efe4702277ee092a5542d7d659df08cb0adeff Gerrit-Change-Number: 32532 Gerrit-PatchSet: 8 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Apr 2023 16:49:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-bsc[master]: fix length check in abis_rsl_rx_rll()

by neels

Attention is currently required from: msuraev. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32421 ) Change subject: fix length check in abis_rsl_rx_rll() ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/32421/comment/4fc547f2_df10360e PS1, Line 21: - We are going to be accessing rrlh->data[3], so we must check for at > I think it's better to wrap this into static function and add this comment there. i agree but i'd rather fix the code dup as separate patch; for now i just want to get the buffer access fix in... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie4aee615c8c904ae8308ec0074d8bc5208137061 Gerrit-Change-Number: 32421 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Apr 2023 16:46:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-iuh[master]: fix PDU leaks in rua_generate_*() functions

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/32530 ) Change subject: fix PDU leaks in rua_generate_*() functions ...................................................................... fix PDU leaks in rua_generate_*() functions Related: SYS#6297 Change-Id: I04eb1455e1fd43c239f352470bf971b73eb8b205 --- M src/rua_common.c 1 file changed, 22 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/rua_common.c b/src/rua_common.c index f21bf8f..37cf3ba 100644 --- a/src/rua_common.c +++ b/src/rua_common.c @@ -134,6 +134,7 @@ { RUA_RUA_PDU_t pdu; int rc; + struct msgb *msg; memset(&pdu, 0, sizeof(pdu)); @@ -146,7 +147,9 @@ return NULL; } - return _rua_gen_msg(&pdu); + msg = _rua_gen_msg(&pdu); + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RUA_RUA_PDU, &pdu); + return msg; } struct msgb *rua_generate_successful_outcome( @@ -157,6 +160,7 @@ { RUA_RUA_PDU_t pdu; int rc; + struct msgb *msg; memset(&pdu, 0, sizeof(pdu)); @@ -169,7 +173,9 @@ return NULL; } - return _rua_gen_msg(&pdu); + msg = _rua_gen_msg(&pdu); + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RUA_RUA_PDU, &pdu); + return msg; } struct msgb *rua_generate_unsuccessful_outcome( @@ -180,6 +186,7 @@ { RUA_RUA_PDU_t pdu; int rc; + struct msgb *msg; memset(&pdu, 0, sizeof(pdu)); @@ -192,7 +199,9 @@ return NULL; } - return _rua_gen_msg(&pdu); + msg = _rua_gen_msg(&pdu); + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RUA_RUA_PDU, &pdu); + return msg; } RUA_IE_t *rua_new_ie(RUA_ProtocolIE_ID_t id, -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/32530 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I04eb1455e1fd43c239f352470bf971b73eb8b205 Gerrit-Change-Number: 32530 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-iuh[master]: asn1tostruct.py: fix leak in error paths of iesDefs

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/32531 ) Change subject: asn1tostruct.py: fix leak in error paths of iesDefs ...................................................................... asn1tostruct.py: fix leak in error paths of iesDefs Related: SYS#6297 Change-Id: I424c4ea2681f5c9a5eec99396502615de5eab841 --- M asn1/utils/asn1tostruct.py 1 file changed, 17 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/asn1/utils/asn1tostruct.py b/asn1/utils/asn1tostruct.py index 9b1c1a1..f39f45b 100755 --- a/asn1/utils/asn1tostruct.py +++ b/asn1/utils/asn1tostruct.py @@ -328,6 +328,7 @@ f.write(" int i, decoded = 0;\n") if len(iesDefs[key]["ies"]) != 0: f.write(" int tempDecoded = 0;\n") + f.write(" int rc = -1;\n") f.write(" assert(any_p != NULL);\n") if len(iesDefs[key]["ies"]) != 0: @@ -364,7 +365,7 @@ f.write(" tempDecoded = ANY_to_type_aper(&ie_p->value, &asn_DEF_%s, (void**)&%s_p);\n" % (ietypeunderscore, lowerFirstCamelWord(ietypesubst))) f.write(" if (tempDecoded < 0) {\n") f.write(" %s_DEBUG(\"Decoding of IE %s failed\\n\");\n" % (fileprefix.upper(), ienameunderscore)) - f.write(" return -1;\n") + f.write(" goto free_and_return_rc;\n") f.write(" }\n") f.write(" decoded += tempDecoded;\n") f.write(" if (asn1_xer_print)\n") @@ -379,11 +380,14 @@ f.write(" } break;\n") f.write(" default:\n") f.write(" %s_DEBUG(\"Unknown protocol IE id (%%d) for message %s\\n\", (int)ie_p->id);\n" % (fileprefix.upper(), re.sub('-', '_', structName.lower()))) - f.write(" return -1;\n") + f.write(" goto free_and_return_rc;\n") f.write(" }\n") f.write(" }\n") + f.write(" rc = decoded;\n") + f.write("\n") + f.write("free_and_return_rc:\n") f.write(" ASN_STRUCT_FREE(asn_DEF_%s, %s_p);\n" % (asn1cStruct, asn1cStructfirstlower)) - f.write(" return decoded;\n") + f.write(" return rc;\n") f.write("}\n\n") for key in iesDefs: -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/32531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I424c4ea2681f5c9a5eec99396502615de5eab841 Gerrit-Change-Number: 32531 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-iuh[master]: asn1tostruct.py: fix leak in error paths of iesDefs

by neels

Attention is currently required from: msuraev. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/32531 ) Change subject: asn1tostruct.py: fix leak in error paths of iesDefs ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Do we still need this? I thought asn.1 compilers got mature enough to generate proper code nowadays. I have no idea ¯\_(ツ)_/¯ -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/32531 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I424c4ea2681f5c9a5eec99396502615de5eab841 Gerrit-Change-Number: 32531 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Apr 2023 16:41:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in osmo-hnbgw[master]: place asn1 context under hnb_ctx for better visibility

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32522 ) Change subject: place asn1 context under hnb_ctx for better visibility ...................................................................... place asn1 context under hnb_ctx for better visibility Include talloc_asn1_context in 'show talloc-context application'. It belongs there IMO. Related: SYS#6297 Change-Id: Iffc320c64713b225b57211da4fb95a868bf1f369 --- M src/osmo-hnbgw/hnbgw.c 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index 50ada60..4885a2c 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -732,7 +732,7 @@ talloc_enable_null_tracking(); tall_hnb_ctx = talloc_named_const(NULL, 0, "hnb_context"); - talloc_asn1_ctx = talloc_named_const(NULL, 1, "asn1_context"); + talloc_asn1_ctx = talloc_named_const(tall_hnb_ctx, 1, "asn1_context"); msgb_talloc_ctx_init(tall_hnb_ctx, 0); g_hnb_gw = hnb_gw_create(tall_hnb_ctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iffc320c64713b225b57211da4fb95a868bf1f369 Gerrit-Change-Number: 32522 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-hnbgw[master]: fix asn1 leak in handle_cn_ranap()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32523 ) Change subject: fix asn1 leak in handle_cn_ranap() ...................................................................... fix asn1 leak in handle_cn_ranap() Related: SYS#6297 Change-Id: I307f65ae083aba16f75510bcd0a7d1f124e62be4 --- M src/osmo-hnbgw/hnbgw_cn.c 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index e2dccf9..fdc5cde 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -276,6 +276,7 @@ } rc = _cn_ranap_rx(cnlink, unitdata, pdu, data, len); + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RANAP_PDU, pdu); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I307f65ae083aba16f75510bcd0a7d1f124e62be4 Gerrit-Change-Number: 32523 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-hnbgw[master]: fix vty: show talloc-context all

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32521 ) Change subject: fix vty: show talloc-context all ...................................................................... fix vty: show talloc-context all Without "null tracking" enabled, the VTY 'show talloc-ctx all' shows nothing at all. Since the talloc_asn1_ctx is "created in NULL ctx", it was not visible in any talloc reports before this patch. This patch uncovers a slur of leaks, which accumulate in talloc_asn1_ctx. Fixes follow. Related: SYS#6297 Change-Id: I5cb4e9a3b393100877f03d68a09acf5817c5a878 --- M src/osmo-hnbgw/hnbgw.c 1 file changed, 21 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index bd45dda..50ada60 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -729,6 +729,8 @@ struct osmo_stream_srv_link *srv; int rc; + talloc_enable_null_tracking(); + tall_hnb_ctx = talloc_named_const(NULL, 0, "hnb_context"); talloc_asn1_ctx = talloc_named_const(NULL, 1, "asn1_context"); msgb_talloc_ctx_init(tall_hnb_ctx, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I5cb4e9a3b393100877f03d68a09acf5817c5a878 Gerrit-Change-Number: 32521 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-hnbgw[master]: fix asn1 leak in error path of hnbgw_tx_ue_register_acc_tmsi()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32525 ) Change subject: fix asn1 leak in error path of hnbgw_tx_ue_register_acc_tmsi() ...................................................................... fix asn1 leak in error path of hnbgw_tx_ue_register_acc_tmsi() Related: SYS#6297 Change-Id: Iad1519aea36d8b6fef51fedb22a861ad1bc462fc --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 27 insertions(+), 14 deletions(-) Approvals: pespin: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index bc3dccd..980c6b0 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -338,19 +338,8 @@ memset(&accept_out, 0, sizeof(accept_out)); rc = hnbap_encode_ueregisteraccepties(&accept_out, &accept); - if (rc < 0) { - /* If we allocated the UE context but the UE REGISTER fails, get rid of it again: there will likely - * never be a UE DE-REGISTER for this UE from the HNB, and the ue_context would linger forever. */ - if (ue_allocated) - ue_context_free(ue_allocated); - return rc; - } - msg = hnbap_generate_successful_outcome(HNBAP_ProcedureCode_id_UERegister, - HNBAP_Criticality_reject, - &asn_DEF_HNBAP_UERegisterAccept, - &accept_out); - + /* free 'accept', now encoded in 'accept_out' */ switch (ue_id->present) { case HNBAP_UE_Identity_PR_tMSILAI: ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_BIT_STRING, @@ -377,9 +366,23 @@ break; } - ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_HNBAP_UERegisterAccept, &accept_out); + if (rc < 0) { + /* Encoding failed. Nothing in 'accept_out'. */ + /* If we allocated the UE context but the UE REGISTER fails, get rid of it again: there will likely + * never be a UE DE-REGISTER for this UE from the HNB, and the ue_context would linger forever. */ + if (ue_allocated) + ue_context_free(ue_allocated); + return rc; + } - return hnbgw_hnbap_tx(hnb, msg); + /* Encoding successful, transmit, then free 'accept_out'. */ + msg = hnbap_generate_successful_outcome(HNBAP_ProcedureCode_id_UERegister, + HNBAP_Criticality_reject, + &asn_DEF_HNBAP_UERegisterAccept, + &accept_out); + rc = hnbgw_hnbap_tx(hnb, msg); + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_HNBAP_UERegisterAccept, &accept_out); + return rc; } static int hnbgw_rx_hnb_deregister(struct hnb_context *ctx, ANY_t *in) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32525 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iad1519aea36d8b6fef51fedb22a861ad1bc462fc Gerrit-Change-Number: 32525 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-hnbgw[master]: fix asn1 leaks in ps_rab_ass_resp_send_if_ready()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32526 ) Change subject: fix asn1 leaks in ps_rab_ass_resp_send_if_ready() ...................................................................... fix asn1 leaks in ps_rab_ass_resp_send_if_ready() Related: SYS#6297 Change-Id: Icdb6eef0d1fde849c0b9121cc96d8221e72d45c8 --- M src/osmo-hnbgw/ps_rab_ass_fsm.c 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/ps_rab_ass_fsm.c b/src/osmo-hnbgw/ps_rab_ass_fsm.c index 65a6116..464c4d0 100644 --- a/src/osmo-hnbgw/ps_rab_ass_fsm.c +++ b/src/osmo-hnbgw/ps_rab_ass_fsm.c @@ -569,6 +569,8 @@ /* Reencode this list item in the RANAP message */ rc = ANY_fromType_aper(&list_ie->value, &asn_DEF_RANAP_RAB_SetupOrModifiedItem, rab_item); + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_BIT_STRING, &rab_item->transportLayerAddress); + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_OCTET_STRING, &rab_item->iuTransportAssociation->choice.gTP_TEI); if (rc < 0) { ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifiedItem, &item_ies); LOG_PS_RAB_ASS(rab_ass, LOGL_ERROR, "Re-encoding RANAP PS RAB-AssignmentResponse failed\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32526 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Icdb6eef0d1fde849c0b9121cc96d8221e72d45c8 Gerrit-Change-Number: 32526 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-hnbgw[master]: fix asn1 leak in error path of hnbgw_tx_ue_register_acc()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32524 ) Change subject: fix asn1 leak in error path of hnbgw_tx_ue_register_acc() ...................................................................... fix asn1 leak in error path of hnbgw_tx_ue_register_acc() Related: SYS#6297 Change-Id: Iaaf7a393ef1fcad619687e2eb2dcc31f0aec0e96 --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index a1cbec5..bc3dccd 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -146,6 +146,7 @@ memset(&accept_out, 0, sizeof(accept_out)); rc = hnbap_encode_ueregisteraccepties(&accept_out, &accept); + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_OCTET_STRING, &accept.uE_Identity.choice.iMSI); if (rc < 0) { return rc; } @@ -155,7 +156,6 @@ &asn_DEF_HNBAP_UERegisterAccept, &accept_out); - ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_OCTET_STRING, &accept.uE_Identity.choice.iMSI); ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_HNBAP_UERegisterAccept, &accept_out); return hnbgw_hnbap_tx(ue->hnb, msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32524 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iaaf7a393ef1fcad619687e2eb2dcc31f0aec0e96 Gerrit-Change-Number: 32524 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[S] Change in osmo-hnbgw[master]: fix asn1 leak in hnbgw_rua_rx()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32527 ) Change subject: fix asn1 leak in hnbgw_rua_rx() ...................................................................... fix asn1 leak in hnbgw_rua_rx() Related: SYS#6297 Change-Id: I7392e0bb07c2cb02c1a12f8e19acb142cd101f77 --- M src/osmo-hnbgw/hnbgw_rua.c 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c index 83410b9..5e68e32 100644 --- a/src/osmo-hnbgw/hnbgw_rua.c +++ b/src/osmo-hnbgw/hnbgw_rua.c @@ -536,6 +536,8 @@ rc = _hnbgw_rua_rx(msg, pdu); + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RUA_RUA_PDU, pdu); + return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I7392e0bb07c2cb02c1a12f8e19acb142cd101f77 Gerrit-Change-Number: 32527 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year

1
0
0 0

[M] Change in pysim[master]: pySim-shell: fix compatibility problem with cmd2 >= 2.3.0 (bg)

by fixeria

Attention is currently required from: laforge, msuraev, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/30075 ) Change subject: pySim-shell: fix compatibility problem with cmd2 >= 2.3.0 (bg) ...................................................................... Patch Set 4: Code-Review-1 (1 comment) File contrib/jenkins.sh: https://gerrit.osmocom.org/c/pysim/+/30075/comment/96d935a2_7242afc0 PS4, Line 41: E0611: No name 'Fg' in module 'cmd2' (no-name-in-module) better use inline `pylint: ...` comments, we don't want to ignore import errors globally, right? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/30075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9fd32c0fd8f6d40e00a318602af97c288605e8e5 Gerrit-Change-Number: 30075 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Apr 2023 16:36:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in pysim[master]: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (include_ipy)

by fixeria

Attention is currently required from: markb, laforge, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/32533 ) Change subject: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (include_ipy) ...................................................................... Patch Set 2: (1 comment) File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/32533/comment/835554fd_798c2c77 PS2, Line 138: USE IPYTHON debugging leftovers? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32533 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibc0e18b002a03ed17933be4d0b4f4e86ad99c26e Gerrit-Change-Number: 32533 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: markb <markboldyrev(a)gmail.com> Gerrit-Attention: markb <markboldyrev(a)gmail.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Apr 2023 16:33:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in pysim[master]: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (Settable)

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/32532 ) Change subject: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (Settable) ...................................................................... Patch Set 8: Code-Review-2 (1 comment) Commit Message: https://gerrit.osmocom.org/c/pysim/+/32532/comment/0a24453e_6a305891 PS8, Line 11: Older versions will ignore the settable_object parameter Are you sure? Have you tested this at all? In `requirements.txt` we require `cmd2==1.5`, which does not like this argument. I quickly tested this patch in docker: ``` Card initialization failed with an exception: ---------------------8<--------------------- Traceback (most recent call last): File "/data/./pySim-shell.py", line 983, in <module> app = PysimApp(card, rs, sl, ch, opts.script) File "/data/./pySim-shell.py", line 148, in __init__ self.add_settable(cmd2.Settable('numeric_path', bool, 'Print File IDs instead of names', self, TypeError: __init__() takes 4 positional arguments but 5 positional arguments (and 1 keyword-only argument) were given ---------------------8<--------------------- ``` Either we maintain backwards compatibility with 1.5 and don't break it, or we finally bump the version (at least to 0.8.5, which is provided by debian:bullseye). -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I38efe4702277ee092a5542d7d659df08cb0adeff Gerrit-Change-Number: 32532 Gerrit-PatchSet: 8 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Apr 2023 16:30:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in libosmocore[master]: ns2: Count transmitted/dropped in each layer implementation

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/32535 ) Change subject: ns2: Count transmitted/dropped in each layer implementation ...................................................................... ns2: Count transmitted/dropped in each layer implementation This allows better control on how the counters are ticked. For instance, since nowadays the writing in ns2_udp is done asyncrhonously, most probable failures occur at a later point and not when returning to the caller. Change-Id: I8109cee07f157ebf1806f82a071f58de3a2dcc9c --- M src/gb/gprs_ns2_fr.c M src/gb/gprs_ns2_frgre.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_message.c M src/gb/gprs_ns2_udp.c 5 files changed, 52 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/35/32535/1 diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c index d651601..f6bee39 100644 --- a/src/gb/gprs_ns2_fr.c +++ b/src/gb/gprs_ns2_fr.c @@ -332,9 +332,19 @@ static int fr_vc_sendmsg(struct gprs_ns2_vc *nsvc, struct msgb *msg) { struct priv_vc *vcpriv = nsvc->priv; + unsigned int vc_len = msgb_length(msg); + int rc; msg->dst = vcpriv->dlc; - return osmo_fr_tx_dlc(msg); + rc = osmo_fr_tx_dlc(msg); + if (OSMO_LIKELY(rc >= 0)) { + RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_OUT); + RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_OUT, vc_len); + } else { + RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_OUT_DROP); + RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_OUT_DROP, vc_len); + } + return rc; } static void enqueue_at_head(struct gprs_ns2_vc_bind *bind, struct msgb *msg) diff --git a/src/gb/gprs_ns2_frgre.c b/src/gb/gprs_ns2_frgre.c index 9391343..b99761e 100644 --- a/src/gb/gprs_ns2_frgre.c +++ b/src/gb/gprs_ns2_frgre.c @@ -503,6 +503,8 @@ uint16_t dlci = osmo_htons(bindpriv->dlci); uint8_t *frh; struct gre_hdr *greh; + unsigned int vc_len = msgb_length(msg); + int rc; /* Prepend the FR header */ frh = msgb_push(msg, 2); @@ -514,7 +516,15 @@ greh->flags = 0; greh->ptype = osmo_htons(GRE_PTYPE_FR); - return frgre_sendmsg(bind, msg, &vcpriv->remote); + rc = frgre_sendmsg(bind, msg, &vcpriv->remote); + if (OSMO_LIKELY(rc >= 0)) { + RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_OUT); + RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_OUT, rc); + } else { + RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_OUT_DROP); + RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_OUT_DROP, vc_len); + } + return rc; } static int frgre_fd_cb(struct osmo_fd *bfd, unsigned int what) diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index 4f33221..37b142e 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -6,6 +6,7 @@ #include <stdint.h> #include <osmocom/core/logging.h> +#include <osmocom/core/rate_ctr.h> #include <osmocom/gprs/protocol/gsm_08_16.h> #include <osmocom/gprs/gprs_ns2.h> diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c index 1b986fe..de63b7a 100644 --- a/src/gb/gprs_ns2_message.c +++ b/src/gb/gprs_ns2_message.c @@ -169,23 +169,9 @@ return 0; } - static int ns_vc_tx(struct gprs_ns2_vc *nsvc, struct msgb *msg) { - unsigned int bytes = msgb_length(msg); - int rc; - - - rc = nsvc->bind->send_vc(nsvc, msg); - if (rc < 0) { - RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_OUT_DROP); - RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_OUT_DROP, bytes); - } else { - RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_OUT); - RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_OUT, bytes); - } - - return rc; + return nsvc->bind->send_vc(nsvc, msg); } /* transmit functions */ diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index d7dc0db..71a0b28 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -226,6 +226,20 @@ const struct msgb *msg, const struct osmo_sockaddr *daddr) { + struct gprs_ns2_vc_bind *bind = osmo_iofd_get_data(iofd); + struct gprs_ns2_vc *nsvc; + + nsvc = gprs_ns2_nsvc_by_sockaddr_bind(bind, daddr); + if (!nsvc) + return; + + if (OSMO_LIKELY(res >= 0)) { + RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_OUT); + RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_OUT, res); + } else { + RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_OUT_DROP); + RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_OUT_DROP, msgb_length(msg)); + } } /*! Find NS bind for a given socket address -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32535 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8109cee07f157ebf1806f82a071f58de3a2dcc9c Gerrit-Change-Number: 32535 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[XL] Change in libosmocore[master]: Add osmo_io with initial poll backend

by pespin

Attention is currently required from: osmith, Hoernchen, neels, pespin, fixeria, daniel. pespin has uploaded a new patch set (#12) to the change originally created by daniel. ( https://gerrit.osmocom.org/c/libosmocore/+/30934 ) Change subject: Add osmo_io with initial poll backend ...................................................................... Add osmo_io with initial poll backend * make backend configurable for later * segmentation callback for chunked streams * logging target for osmo_io * support partial writes Change-Id: I50d73cf550d6ce8154bf827bf47408131cf5b0a0 Related: SYS#5094, OS#5751 --- M TODO-RELEASE M include/osmocom/core/Makefile.am M include/osmocom/core/logging.h A include/osmocom/core/osmo_io.h M src/core/Makefile.am M src/core/libosmocore.map M src/core/logging.c A src/core/osmo_io.c A src/core/osmo_io_internal.h A src/core/osmo_io_poll.c M tests/logging/logging_vty_test.vty 11 files changed, 1,061 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/34/30934/12 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I50d73cf550d6ce8154bf827bf47408131cf5b0a0 Gerrit-Change-Number: 30934 Gerrit-PatchSet: 12 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year

1
0
0 0

[M] Change in pysim[master]: WIP: attempt to support cmd2 2.4.0

by dexter

dexter has abandoned this change. ( https://gerrit.osmocom.org/c/pysim/+/30076 ) Change subject: WIP: attempt to support cmd2 2.4.0 ...................................................................... Abandoned This fix went into I9fd32c0fd8f6d40e00a318602af97c288605e8e5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/30076 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ifce40410587c85ae932774144b9548b154ee8ad0 Gerrit-Change-Number: 30076 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: abandon

1 year

1
0
0 0

[S] Change in pysim[laforge/cmd2_2.4]: shell: Use a double asterisk for kwargs

by dexter

Attention is currently required from: markb, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/29439 ) Change subject: shell: Use a double asterisk for kwargs ...................................................................... Patch Set 5: (1 comment) Patchset: PS5: This fix went into Ibc0e18b002a03ed17933be4d0b4f4e86ad99c26e, so it is no longer needed as a separate fix and can be abandoned. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/29439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: laforge/cmd2_2.4 Gerrit-Change-Id: I19d28276e73e7024f64ed693c3b5e37c1344c687 Gerrit-Change-Number: 29439 Gerrit-PatchSet: 5 Gerrit-Owner: markb <markboldyrev(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: markb <markboldyrev(a)gmail.com> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 27 Apr 2023 16:04:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in pysim[master]: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (include_ipy)

by dexter

dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/32533 ) Change subject: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (include_ipy) ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32533 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibc0e18b002a03ed17933be4d0b4f4e86ad99c26e Gerrit-Change-Number: 32533 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 27 Apr 2023 16:01:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year

1
0
0 0

[S] Change in pysim[master]: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (Settable)

by dexter

dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/32532 ) Change subject: pySim-shell: fix compatibility problem with cmd2 >= 2.0.0 (Settable) ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I38efe4702277ee092a5542d7d659df08cb0adeff Gerrit-Change-Number: 32532 Gerrit-PatchSet: 8 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 27 Apr 2023 16:00:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year

1
0
0 0

[M] Change in pysim[master]: pySim-shell: fix compatibility problem with cmd2 >= 2.3.0 (bg)

by dexter

Attention is currently required from: msuraev, dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/30075 to look at the new patch set (#4). Change subject: pySim-shell: fix compatibility problem with cmd2 >= 2.3.0 (bg) ...................................................................... pySim-shell: fix compatibility problem with cmd2 >= 2.3.0 (bg) cmd2.fg and cmd2.bg have been deprecated in cmd2 2.3.0 and removed in cmd2 2.4.0. Let's work around this by a version check. Related upstream commits: (See also: https://github.com/python-cmd2/cmd2) Commit f57b08672af97f9d973148b6c30d74fe4e712d14 Author: Kevin Van Brunt <kmvanbrunt(a)gmail.com> Date: Mon Oct 11 15:20:46 2021 -0400 and Commit f217861feae45a0a1abb56436e68c5dd859d64c0 Author: Kevin Van Brunt <kmvanbrunt(a)gmail.com> Date: Wed Feb 16 13:34:13 2022 -0500 Change-Id: I9fd32c0fd8f6d40e00a318602af97c288605e8e5 --- M contrib/jenkins.sh M pySim-shell.py 2 files changed, 55 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/75/30075/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/30075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9fd32c0fd8f6d40e00a318602af97c288605e8e5 Gerrit-Change-Number: 30075 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year

1
0
0 0

[S] Change in libosmocore[master]: gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind()

by pespin

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmocore/+/32534 ) Change subject: gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind() ...................................................................... gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind() The old name seems to describe that this function can only be used in incoming message paths, but it can be used in transmitting context too, so the param is actually a remote address. Change-Id: I3f45a4ef339cadd47920ee3b36c38628b38221f6 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2_udp.c 2 files changed, 18 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/34/32534/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3f45a4ef339cadd47920ee3b36c38628b38221f6 Gerrit-Change-Number: 32534 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 year

1
0
0 0

[M] Change in pysim[master]: pySim-shell: fix compatibility problem with cmd2 >= 2.3.0 (bg)

by dexter

Attention is currently required from: msuraev, dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/30075 to look at the new patch set (#3). Change subject: pySim-shell: fix compatibility problem with cmd2 >= 2.3.0 (bg) ...................................................................... pySim-shell: fix compatibility problem with cmd2 >= 2.3.0 (bg) cmd2.fg and cmd2.bg have been deprecated in cmd2 2.3.0 and removed in cmd2 2.4.0. Let's work around this by a version check. Related upstream commits: (See also: https://github.com/python-cmd2/cmd2) Commit f57b08672af97f9d973148b6c30d74fe4e712d14 Author: Kevin Van Brunt <kmvanbrunt(a)gmail.com> Date: Mon Oct 11 15:20:46 2021 -0400 and Commit f217861feae45a0a1abb56436e68c5dd859d64c0 Author: Kevin Van Brunt <kmvanbrunt(a)gmail.com> Date: Wed Feb 16 13:34:13 2022 -0500 Change-Id: I9fd32c0fd8f6d40e00a318602af97c288605e8e5 --- M pySim-shell.py 1 file changed, 53 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/75/30075/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/30075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9fd32c0fd8f6d40e00a318602af97c288605e8e5 Gerrit-Change-Number: 30075 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year

1
0
0 0

[S] Change in libosmocore[master]: gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/32534 ) Change subject: gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind() ...................................................................... gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind() The old name seems to describe that this function can only be used in incoming message paths, but it can be used in transmitting context too, so the param is actually a remote address. Change-Id: I3f45a4ef339cadd47920ee3b36c38628b38221f6 --- M include/osmocom/gprs/gprs_ns2.h M src/gb/gprs_ns2_udp.c 2 files changed, 17 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/34/32534/1 diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h index a9c144c..7c7e221 100644 --- a/include/osmocom/gprs/gprs_ns2.h +++ b/include/osmocom/gprs/gprs_ns2.h @@ -249,7 +249,7 @@ int gprs_ns2_ip_bind_set_priority(struct gprs_ns2_vc_bind *bind, uint8_t priority); struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr_bind( struct gprs_ns2_vc_bind *bind, - const struct osmo_sockaddr *saddr); + const struct osmo_sockaddr *rem_addr); int gprs_ns2_frgre_bind(struct gprs_ns2_inst *nsi, const char *name, diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index 4816021..766aa66 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -121,7 +121,7 @@ * \param[in] saddr remote peer socket adddress to search * \returns NS-VC matching sockaddr; NULL if none found */ struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr_bind(struct gprs_ns2_vc_bind *bind, - const struct osmo_sockaddr *saddr) + const struct osmo_sockaddr *rem_addr) { struct gprs_ns2_vc *nsvc; struct priv_vc *vcpriv; @@ -130,9 +130,9 @@ llist_for_each_entry(nsvc, &bind->nsvc, blist) { vcpriv = nsvc->priv; - if (vcpriv->remote.u.sa.sa_family != saddr->u.sa.sa_family) + if (vcpriv->remote.u.sa.sa_family != rem_addr->u.sa.sa_family) continue; - if (osmo_sockaddr_cmp(&vcpriv->remote, saddr)) + if (osmo_sockaddr_cmp(&vcpriv->remote, rem_addr)) continue; return nsvc; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3f45a4ef339cadd47920ee3b36c38628b38221f6 Gerrit-Change-Number: 32534 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year

1
0
0 0

[M] Change in libosmocore[master]: tests: Add initial osmo_io tests

by pespin

Attention is currently required from: laforge, pespin, fixeria, daniel. pespin has uploaded a new patch set (#7) to the change originally created by daniel. ( https://gerrit.osmocom.org/c/libosmocore/+/32181 ) Change subject: tests: Add initial osmo_io tests ...................................................................... tests: Add initial osmo_io tests Change-Id: Ia67629e53f4d2e5784177250d58e268fdfcaa0c2 --- M tests/Makefile.am A tests/osmo_io/osmo_io_test.c A tests/osmo_io/osmo_io_test.err A tests/osmo_io/osmo_io_test.ok M tests/testsuite.at 5 files changed, 215 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/81/32181/7 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia67629e53f4d2e5784177250d58e268fdfcaa0c2 Gerrit-Change-Number: 32181 Gerrit-PatchSet: 7 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year

1
0
0 0

2024

2023

2022

gerrit-log April 2023