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

[S] Change in osmo-e1d[master]: proto_clnt: use osmo_fd_close to close the socket on connection loss

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/32393 ) Change subject: proto_clnt: use osmo_fd_close to close the socket on connection loss ...................................................................... proto_clnt: use osmo_fd_close to close the socket on connection loss When the socket is closed due to a connection loss, we currently use close(). This is not enough since this will not remove the file descriptor from the select loop. Let's use osmo_fd_close. Related: OS#5983 Change-Id: I702b944baf2ebbcc84b6a211e245a4a41627bde6 --- M src/proto_clnt.c 1 file changed, 15 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve tnt: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/proto_clnt.c b/src/proto_clnt.c index 5b9a467..6c59593 100644 --- a/src/proto_clnt.c +++ b/src/proto_clnt.c @@ -90,8 +90,7 @@ msgb = osmo_e1dp_recv(ofd, NULL); if (!msgb) { LOGP(DE1D, LOGL_ERROR, "Lost connection with osmo-e1d control socket.\n"); - close(ofd->fd); - ofd->fd = 0; + osmo_fd_close(&clnt->ctl_fd); goto err; } -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/32393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I702b944baf2ebbcc84b6a211e245a4a41627bde6 Gerrit-Change-Number: 32393 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

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

by dexter

Attention is currently required from: osmith, fixeria. 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) ...................................................................... Patch Set 14: (1 comment) Patchset: PS14: Now all problems are fixed. I have tested with 1.5 and the more recent 2.4.3 version (works only with the full patchset of course). -- 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: 14 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 05 May 2023 12:14:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

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: fixeria, msuraev. dexter 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 7: (1 comment) File contrib/jenkins.sh: https://gerrit.osmocom.org/c/pysim/+/30075/comment/6ca2a75b_acdcd0fd PS4, Line 41: E0611: No name 'Fg' in module 'cmd2' (no-name-in-module) > I have now removed the pylint statements again. […] Done -- 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: 7 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 05 May 2023 12:09:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in osmo-pcu[master]: ctrl: drop deprecated neighbor resolution interface

by arehbein

Attention is currently required from: msuraev. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32275 ) Change subject: ctrl: drop deprecated neighbor resolution interface ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iff008c77ab49dd8855d54d2d44198475086012e4 Gerrit-Change-Number: 32275 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 05 May 2023 12:06:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in libasn1c[master]: Disable _ASN_STACK_OVERFLOW_CHECK if building with Asan enabled

by daniel

Attention is currently required from: Hoernchen, pespin, fixeria. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libasn1c/+/32612 ) Change subject: Disable _ASN_STACK_OVERFLOW_CHECK if building with Asan enabled ...................................................................... Patch Set 3: (1 comment) File include/asn1c/asn_internal.h: https://gerrit.osmocom.org/c/libasn1c/+/32612/comment/dc9971ae_d8a74239 PS3, Line 137: _ASN_STACK_OVERFLOW_CHECK(asn_codec_ctx_t *ctx) { Is this function even useful/used if _ASN_SANITIZE_ENABLED is not defined? -- To view, visit https://gerrit.osmocom.org/c/libasn1c/+/32612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Change-Id: I2dda4720f3ea5a023d340863db177e6334beeaa3 Gerrit-Change-Number: 32612 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 05 May 2023 12:06:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

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: fixeria, msuraev, dexter. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/30075 to look at the new patch set (#7). 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, 52 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/75/30075/7 -- 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: 7 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[S] Change in pysim[master]: requirements.txt: allow cmd2 versions greater than 1.5

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/32632 ) Change subject: requirements.txt: allow cmd2 versions greater than 1.5 ...................................................................... requirements.txt: allow cmd2 versions greater than 1.5 Since we now have fixed the compatibility issues with recent cmd2 versions, we may allow also versions greater than 1.5 in the requirements.txt Change-Id: I87702c5250a3660c84458939167bffdca9c06059 --- M requirements.txt 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/32/32632/1 diff --git a/requirements.txt b/requirements.txt index bfdbd62..fb94472 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ pyscard pyserial pytlv -cmd2==1.5 +cmd2>=1.5 jsonpath-ng construct>=2.9.51 bidict -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32632 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I87702c5250a3660c84458939167bffdca9c06059 Gerrit-Change-Number: 32632 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[L] Change in osmo-bsc[master]: ctrl: drop deprecated neighbor resolution interface

by arehbein

Attention is currently required from: msuraev. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32277 ) Change subject: ctrl: drop deprecated neighbor resolution interface ...................................................................... Patch Set 9: Code-Review+1 (1 comment) Patchset: PS9: Not sure about the implications of the 'neighbor-cgi-ps' commands being removed (what pespin commented on). -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32277 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I93e25856eede4b2f5aa36d8a16714b43d37b4fd0 Gerrit-Change-Number: 32277 Gerrit-PatchSet: 9 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 05 May 2023 11:59:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: Store and use SAPI & NSAPI in apn->pdp

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32597 ) Change subject: layer23: Store and use SAPI & NSAPI in apn->pdp ...................................................................... layer23: Store and use SAPI & NSAPI in apn->pdp Change-Id: If82c94ca9c84a94e63a9a5d642a27a7b4e3ff089 --- M src/host/layer23/include/osmocom/bb/common/apn.h M src/host/layer23/src/common/apn.c M src/host/layer23/src/modem/sm.c M src/host/layer23/src/modem/sndcp.c 4 files changed, 24 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/common/apn.h b/src/host/layer23/include/osmocom/bb/common/apn.h index 538b31d..c449530 100644 --- a/src/host/layer23/include/osmocom/bb/common/apn.h +++ b/src/host/layer23/include/osmocom/bb/common/apn.h @@ -28,6 +28,11 @@ #define APN_TYPE_IPv6 0x02 /* v6-only */ #define APN_TYPE_IPv4v6 0x04 /* v4v6 dual-stack */ +struct osmobb_pdp_ctx { + uint8_t nsapi; + uint8_t llc_sapi; +}; + struct osmobb_apn { /* list of APNs inside MS */ struct llist_head list; @@ -52,6 +57,7 @@ } cfg; struct osmo_tundev *tun; struct apn_fsm_ctx fsm; + struct osmobb_pdp_ctx pdp; }; struct osmobb_apn *apn_alloc(struct osmocom_ms *ms, const char *name); diff --git a/src/host/layer23/src/common/apn.c b/src/host/layer23/src/common/apn.c index b9b032c..4ea5d3a 100644 --- a/src/host/layer23/src/common/apn.c +++ b/src/host/layer23/src/common/apn.c @@ -23,6 +23,8 @@ #include <talloc.h> +#include <osmocom/gprs/sm/sm.h> + #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/apn.h> #include <osmocom/bb/common/ms.h> @@ -49,6 +51,9 @@ osmo_tundev_set_priv_data(apn->tun, apn); apn->ms = ms; + /* FIXME: may want to configure or pick free one in the future: */ + apn->pdp.nsapi = 6; + apn->pdp.llc_sapi = OSMO_GPRS_SM_LLC_SAPI_SAPI3; llist_add_tail(&apn->list, &ms->gprs.apn_list); return apn; diff --git a/src/host/layer23/src/modem/sm.c b/src/host/layer23/src/modem/sm.c index aac2b52..03982c6 100644 --- a/src/host/layer23/src/modem/sm.c +++ b/src/host/layer23/src/modem/sm.c @@ -229,8 +229,6 @@ struct osmo_gprs_sm_prim *sm_prim; const struct gsm_subscriber *subscr = &ms->subscr; enum osmo_gprs_sm_pdp_addr_ietf_type pdp_addr_ietf_type; - uint8_t nsapi = 6; - enum osmo_gprs_sm_llc_sapi llc_sapi = OSMO_GPRS_SM_LLC_SAPI_SAPI3; struct osmo_sockaddr pdp_addr_any = {0}; uint8_t qos[OSMO_GPRS_SM_QOS_MAXLEN] = {0}; uint8_t pco[OSMO_GPRS_SM_QOS_MAXLEN] = {0}; @@ -248,8 +246,8 @@ } sm_prim = osmo_gprs_sm_prim_alloc_smreg_pdp_act_req(); - sm_prim->smreg.pdp_act_req.nsapi = nsapi; - sm_prim->smreg.pdp_act_req.llc_sapi = llc_sapi; + sm_prim->smreg.pdp_act_req.nsapi = apn->pdp.nsapi; + sm_prim->smreg.pdp_act_req.llc_sapi = apn->pdp.llc_sapi; sm_prim->smreg.pdp_act_req.pdp_addr_ietf_type = pdp_addr_ietf_type; sm_prim->smreg.pdp_act_req.pdp_addr_v4 = pdp_addr_any; sm_prim->smreg.pdp_act_req.pdp_addr_v6 = pdp_addr_any; diff --git a/src/host/layer23/src/modem/sndcp.c b/src/host/layer23/src/modem/sndcp.c index b4b7761..7814e50 100644 --- a/src/host/layer23/src/modem/sndcp.c +++ b/src/host/layer23/src/modem/sndcp.c @@ -181,10 +181,8 @@ /* TODO: look up PDP context IDs from ms once we have GMM layer. */ uint32_t tlli = 0xe1c5d364; - uint8_t sapi = OSMO_GPRS_LLC_SAPI_SNDCP3; - uint8_t nsapi = 1; - sndcp_prim = osmo_gprs_sndcp_prim_alloc_sn_xid_req(tlli, sapi, nsapi); + sndcp_prim = osmo_gprs_sndcp_prim_alloc_sn_xid_req(tlli, apn->pdp.llc_sapi, apn->pdp.nsapi); OSMO_ASSERT(sndcp_prim); sndcp_prim->sn.xid_req.pcomp_rfc1144.active = set->pcomp_rfc1144.active; sndcp_prim->sn.xid_req.pcomp_rfc1144.s01 = set->pcomp_rfc1144.s01; @@ -203,10 +201,8 @@ /* TODO: look up PDP context IDs from apn->ms once we have GMM layer. */ uint32_t tlli = 0xe1c5d364; - uint8_t sapi = OSMO_GPRS_LLC_SAPI_SNDCP3; - uint8_t nsapi = 1; - sndcp_prim = osmo_gprs_sndcp_prim_alloc_sn_unitdata_req(tlli, sapi, nsapi, npdu, npdu_len); + sndcp_prim = osmo_gprs_sndcp_prim_alloc_sn_unitdata_req(tlli, apn->pdp.llc_sapi, apn->pdp.nsapi, npdu, npdu_len); OSMO_ASSERT(sndcp_prim); rc = osmo_gprs_sndcp_prim_upper_down(sndcp_prim); return rc; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If82c94ca9c84a94e63a9a5d642a27a7b4e3ff089 Gerrit-Change-Number: 32597 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: Store and use SAPI & NSAPI in apn->pdp

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32597 ) Change subject: layer23: Store and use SAPI & NSAPI in apn->pdp ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If82c94ca9c84a94e63a9a5d642a27a7b4e3ff089 Gerrit-Change-Number: 32597 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 05 May 2023 11:39:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023