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

[S] Change in osmo-mgw[master]: mgcp_client: tweak extract_codec_name() implementation
by osmith 30 Jun '23

30 Jun '23

Attention is currently required from: neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33535 ) Change subject: mgcp_client: tweak extract_codec_name() implementation ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33535 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifc7302b6c5f9288a622e33c3e8b5fe0e7037dbdc Gerrit-Change-Number: 33535 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 30 Jun 2023 09:04:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-mgw[master]: mgcp: fix "L: a:" header parsing: heed ";" separator
by osmith 30 Jun '23

30 Jun '23

Attention is currently required from: neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33534 ) Change subject: mgcp: fix "L: a:" header parsing: heed ";" separator ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0342e85b32ed89f3a1fdb6131c3c8ded8f47a455 Gerrit-Change-Number: 33534 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 30 Jun 2023 09:02:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-mgw[master]: mgcp: fix "L: a:" header parsing: heed ";" separator
by fixeria 30 Jun '23

30 Jun '23

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33534 ) Change subject: mgcp: fix "L: a:" header parsing: heed ";" separator ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0342e85b32ed89f3a1fdb6131c3c8ded8f47a455 Gerrit-Change-Number: 33534 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 30 Jun 2023 06:33:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-mgw[master]: mgcp: fix "L: a:" header parsing: heed ";" separator
by falconia 30 Jun '23

30 Jun '23

Attention is currently required from: neels. falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33534 ) Change subject: mgcp: fix "L: a:" header parsing: heed ";" separator ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0342e85b32ed89f3a1fdb6131c3c8ded8f47a455 Gerrit-Change-Number: 33534 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 30 Jun 2023 05:02:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-mgw[master]: mgcp_client: tweak extract_codec_name() implementation
by neels 30 Jun '23

30 Jun '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33535 ) Change subject: mgcp_client: tweak extract_codec_name() implementation ...................................................................... mgcp_client: tweak extract_codec_name() implementation Instead of calling strlen() for every loop iteration, just use strchr() to find the position of '/'. Change-Id: Ifc7302b6c5f9288a622e33c3e8b5fe0e7037dbdc --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 16 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/35/33535/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 75c7b14..78652a1 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -69,17 +69,16 @@ static char *extract_codec_name(const char *str) { static char buf[64]; - unsigned int i; + char *pos; if (!str) return NULL; osmo_strlcpy(buf, str, sizeof(buf)); - for (i = 0; i < strlen(buf); i++) { - if (buf[i] == '/') - buf[i] = '\0'; - } + pos = strchr(buf, '/'); + if (pos) + *pos = '\0'; return buf; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33535 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ifc7302b6c5f9288a622e33c3e8b5fe0e7037dbdc Gerrit-Change-Number: 33535 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-mgw[master]: mgcp: fix "L: a:" header parsing: heed ";" separator
by neels 30 Jun '23

30 Jun '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33534 ) Change subject: mgcp: fix "L: a:" header parsing: heed ";" separator ...................................................................... mgcp: fix "L: a:" header parsing: heed ";" separator In the "L: a:" header, read the first codec name only up to the ";" separator, and ignore the rest. According to RFC-2705, the "L: a:" header may include multiple codecs like "GSM-EFR;GSM" in: L: p:20, a:GSM-EFR;GSM, nt:IN osmo-mgw can handle only a single codec here. Since recently, osmo-msc is our first client that may actually send more than one codec. This uncovered a bug that leads to failing voice calls: * osmo-mgw parses the entire list "GSM-EFR;GSM" as a single codec name, * puts that into the ptmap without scrutiny, * and even sends it back in the OK response, in the *SDP* part, as a single "GSM-EFR;GSM" codec entry. We do not care very much about the "a:" codec list, because we always establish codecs via SDP later. So all we need to fix this is: parse the first codec done correctly, and ignore the rest. Related: OS#6081 Change-Id: I0342e85b32ed89f3a1fdb6131c3c8ded8f47a455 --- M src/libosmo-mgcp/mgcp_protocol.c 1 file changed, 33 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/34/33534/1 diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 80e0f8a..978af42 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -672,8 +672,8 @@ case 'a': /* FIXME: LCO also supports the negotiation of more than one codec. * (e.g. a:PCMU;G726-32) But this implementation only supports a single - * codec only. */ - if (sscanf(lco_id + 1, ":%16[^,]", codec) == 1) { + * codec only. Ignoring all but the first codec. */ + if (sscanf(lco_id + 1, ":%16[^,;]", codec) == 1) { talloc_free(lco->codec); /* MGCP header is case insensive, and we'll need codec in uppercase when using it later: */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0342e85b32ed89f3a1fdb6131c3c8ded8f47a455 Gerrit-Change-Number: 33534 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[L] Change in osmo-msc[master]: ASCI: Use a unique call-id for RTP streams
by neels 29 Jun '23

29 Jun '23

Attention is currently required from: jolly. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33498 ) Change subject: ASCI: Use a unique call-id for RTP streams ...................................................................... Patch Set 3: Code-Review+1 (4 comments) This change is ready for review. Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/33498/comment/36d32225_1d982bfd PS3, Line 9: The call-id may be used by the MGW to identify which connections belong ( "The MGCP protocol features the 'C' (call-id) to identify which connections belong..." ) https://gerrit.osmocom.org/c/osmo-msc/+/33498/comment/0d52ca22_340d5025 PS3, Line 13: The use of MNCC callref as call-id is replaced by a unique call-id. The (" So far we sent the MNCC callref as call-id. Instead, add a separate unique call_id number space. Assign a unique call-id to each transaction...") https://gerrit.osmocom.org/c/osmo-msc/+/33498/comment/259eccc8_26ee3bd8 PS3, Line 16: indipendant ("independent") https://gerrit.osmocom.org/c/osmo-msc/+/33498/comment/6e7cff4c_b569f184 PS3, Line 20: Related: OS#4854 can we also add Related: OS#3294 thx -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33498 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I36c5f159fa0b54fb576ff8bd279928b895554793 Gerrit-Change-Number: 33498 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Thu, 29 Jun 2023 23:05:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: mobile: Fix gsm_refer_pcs(): PCS can only be ARFCN 512..810
by jolly 29 Jun '23

29 Jun '23

Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33532 ) Change subject: mobile: Fix gsm_refer_pcs(): PCS can only be ARFCN 512..810 ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > This would only allow cells in the DCS range to refer to cells with PCS frequencies. […] double entry, sorry. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id99c8534bf853f4f24f99364790c1ac1df6cc007 Gerrit-Change-Number: 33532 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 29 Jun 2023 17:44:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: modem: properly handle Dedicated mode or TBF IE
by fixeria 29 Jun '23

29 Jun '23

Attention is currently required from: osmith, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33414 ) Change subject: modem: properly handle Dedicated mode or TBF IE ...................................................................... Patch Set 4: (1 comment) File src/host/layer23/src/modem/grr.c: https://gerrit.osmocom.org/c/osmocom-bb/+/33414/comment/20ecf1ff_9c92c872 PS3, Line 278: if ((dm_or_tbf & (1 << 1)) == 0) { > "check Request Reference IE if this is an Uplink TBF assignment. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idb9b3203147be3b42256c0bcab3ecdabcf2d2fa9 Gerrit-Change-Number: 33414 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 Jun 2023 17:06:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: osmo_io: Use bitfield for various boolean flags
by laforge 29 Jun '23

29 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33495 ) Change subject: osmo_io: Use bitfield for various boolean flags ...................................................................... osmo_io: Use bitfield for various boolean flags Change-Id: Ic134e4c8d791c34778202fea98a70bc04007a113 --- M src/core/osmo_io.c M src/core/osmo_io_internal.h M src/core/osmo_io_poll.c 3 files changed, 34 insertions(+), 13 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index b00da63..253dfa2 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -388,6 +388,7 @@ iofd->fd = fd; iofd->mode = mode; + IOFD_FLAG_SET(iofd, IOFD_FLAG_CLOSED); if (name) iofd->name = talloc_strdup(iofd, name); @@ -427,7 +428,7 @@ if (rc) return rc; - iofd->closed = false; + IOFD_FLAG_UNSET(iofd, IOFD_FLAG_CLOSED); osmo_iofd_ops.read_enable(iofd); osmo_iofd_ops.write_enable(iofd); @@ -443,6 +444,7 @@ { if (osmo_iofd_ops.unregister_fd) return osmo_iofd_ops.unregister_fd(iofd); + IOFD_FLAG_SET(iofd, IOFD_FLAG_CLOSED); return 0; } @@ -483,12 +485,12 @@ osmo_iofd_close(iofd); - if (!iofd->in_callback) { + if (!IOFD_FLAG_ISSET(iofd, IOFD_FLAG_IN_CALLBACK)) { talloc_free(iofd); } else { /* Prevent our parent context from freeing us prematurely */ talloc_steal(NULL, iofd); - iofd->to_free = true; + IOFD_FLAG_SET(iofd, IOFD_FLAG_TO_FREE); } } @@ -503,10 +505,10 @@ { int rc = 0; - if (iofd->closed) + if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED)) return rc; - iofd->closed = true; + IOFD_FLAG_SET(iofd, IOFD_FLAG_CLOSED); /* Free pending msgs in tx queue */ osmo_iofd_txqueue_clear(iofd); diff --git a/src/core/osmo_io_internal.h b/src/core/osmo_io_internal.h index cd620e7..d45b161 100644 --- a/src/core/osmo_io_internal.h +++ b/src/core/osmo_io_internal.h @@ -29,6 +29,19 @@ void (*read_disable)(struct osmo_io_fd *iofd); }; +#define IOFD_FLAG_CLOSED (1<<0) +#define IOFD_FLAG_IN_CALLBACK (1<<1) +#define IOFD_FLAG_TO_FREE (1<<2) +#define IOFD_FLAG_NOTIFY_CONNECTED (1<<3) + +#define IOFD_FLAG_SET(iofd, flag) \ + (iofd)->flags |= (flag) + +#define IOFD_FLAG_UNSET(iofd, flag) \ + (iofd)->flags &= ~(flag) + +#define IOFD_FLAG_ISSET(iofd, flag) ((iofd)->flags & (flag)) + struct osmo_io_fd { /*! linked list for internal management */ struct llist_head list; @@ -38,10 +51,7 @@ enum osmo_io_fd_mode mode; /*! flags to guard closing/freeing of iofd */ - /* TODO: Move to bitfield */ - bool closed; - bool in_callback; - bool to_free; + uint32_t flags; /*! human-readable name to associte with fd */ char *name; diff --git a/src/core/osmo_io_poll.c b/src/core/osmo_io_poll.c index 571f2bb..77a741a 100644 --- a/src/core/osmo_io_poll.c +++ b/src/core/osmo_io_poll.c @@ -81,7 +81,7 @@ } } - if (iofd->closed) + if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED)) return; if (what & OSMO_FD_WRITE) { @@ -126,11 +126,11 @@ { struct osmo_io_fd *iofd = ofd->data; - iofd->in_callback = true; + IOFD_FLAG_SET(iofd, IOFD_FLAG_IN_CALLBACK); iofd_poll_ofd_cb_recvmsg_sendmsg(ofd, what); - iofd->in_callback = false; + IOFD_FLAG_UNSET(iofd, IOFD_FLAG_IN_CALLBACK); - if (iofd->to_free) { + if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_TO_FREE)) { talloc_free(iofd); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic134e4c8d791c34778202fea98a70bc04007a113 Gerrit-Change-Number: 33495 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0