Change in osmo-bts[master]: Don't manually create pid file
Attention is currently required from: pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29303 ) Change subject: Don't manually create pid file .. Patch Set 1: (1 comment) Patchset: PS1: > If someone uses sysvinit (like devuan or other distros), which in turn > probably uses the -D (daemoni […] That's the only osmocom service which creates pidfile manually. How would sysvinit distro deal the dozen other osmocom services? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I86bcaedbc8cb1297476ad741eaa45585fea3c380 Gerrit-Change-Number: 29303 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Fri, 09 Sep 2022 16:56:00 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: msuraev Gerrit-MessageType: comment
Change in osmo-smlc[master]: Add git-review config
Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/29314 ) Change subject: Add git-review config .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/29314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: Ia16bb7936e9382dcc51d9122bd7582d75eb7ae15 Gerrit-Change-Number: 29314 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Fri, 09 Sep 2022 16:23:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-smlc[master]: Set working directory in systemd service file
Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/29317 ) Change subject: Set working directory in systemd service file .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/29317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: Ie8b014e8eac23221a6a7087bb2b886014323680b Gerrit-Change-Number: 29317 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Fri, 09 Sep 2022 16:23:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sip-connector[master]: Set working directory in systemd service file
Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/29316 ) Change subject: Set working directory in systemd service file .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/29316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Idad82186d6ef7f00487cf162306b0733886fc129 Gerrit-Change-Number: 29316 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Fri, 09 Sep 2022 16:23:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcap[master]: Set working directory in systemd service file
Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/29315 ) Change subject: Set working directory in systemd service file .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/29315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I39c48167cbe74b599c8edc3659e787792cbcfdfd Gerrit-Change-Number: 29315 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Fri, 09 Sep 2022 16:23:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-uecups[master]: Add git-review config
Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/29313 ) Change subject: Add git-review config .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/29313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I7b822474d554e822fb13d9953e4c6959097a6293 Gerrit-Change-Number: 29313 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Fri, 09 Sep 2022 16:23:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: Don't manually create pid file
Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29303 ) Change subject: Don't manually create pid file .. Patch Set 1: (1 comment) Patchset: PS1: > What's the point of keeping dead code aroud? Do we have anything which uses > that pidfile? If someone uses sysvinit (like devuan or other distros), which in turn probably uses the -D (daemonize) feature, then most probably they will also use the pidfile. That's how sysvinit scripts usually know if a process is running, and how to stop it. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I86bcaedbc8cb1297476ad741eaa45585fea3c380 Gerrit-Change-Number: 29303 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Fri, 09 Sep 2022 16:22:54 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: msuraev Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bts: Add testscase & infra to validate Osmux support BTS<->BSC
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29070 ) Change subject: bts: Add testscase & infra to validate Osmux support BTS<->BSC .. Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1af23c7a60b05edc3b544f1fea0023f48e89f7a7 Gerrit-Change-Number: 29070 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 09 Sep 2022 16:15:34 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bsc: Add testscase & infra to validate Osmux support BTS<->BSC
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29010 ) Change subject: bsc: Add testscase & infra to validate Osmux support BTS<->BSC .. Patch Set 6: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6e82eb9d995de988b812001e1c4cf6923509de66 Gerrit-Change-Number: 29010 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 09 Sep 2022 16:15:32 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-mgw[master]: osmux: Use osmo_sockaddr wherever possible
Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/29309 to look at the new patch set (#3). Change subject: osmux: Use osmo_sockaddr wherever possible .. osmux: Use osmo_sockaddr wherever possible This cleans up all the code, and makes it a lot easier to add IPv6 support later on (mostly only a matter of adding an IPv6 bind address in VTY). Similar changes were done to the Osmux code being added to osmo-bts. Related: SYS#5987 Change-Id: I5a100fc654f88d29b2bcd85889a5a92aef3d576d --- M include/osmocom/mgcp/osmux.h M src/libosmo-mgcp/mgcp_osmux.c 2 files changed, 59 insertions(+), 55 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/09/29309/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I5a100fc654f88d29b2bcd85889a5a92aef3d576d Gerrit-Change-Number: 29309 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: Add Osmux support on the Abis-side data plane
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/29007 to look at the new patch set (#3). Change subject: Add Osmux support on the Abis-side data plane .. Add Osmux support on the Abis-side data plane Related: SYS#5987 Change-Id: I48483b278ff829ee29d3e7fbcab0dd3a54728825 --- M TODO-RELEASE M include/osmocom/bsc/bts.h M include/osmocom/bsc/lchan.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/bts.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/lchan_rtp_fsm.c 7 files changed, 111 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/29007/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I48483b278ff829ee29d3e7fbcab0dd3a54728825 Gerrit-Change-Number: 29007 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: Add Osmux support on the Abis-side data plane
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29007 ) Change subject: Add Osmux support on the Abis-side data plane .. Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I48483b278ff829ee29d3e7fbcab0dd3a54728825 Gerrit-Change-Number: 29007 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 09 Sep 2022 16:08:06 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-smlc[master]: Add git-review config
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/29314 ) Change subject: Add git-review config .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/29314 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: Ia16bb7936e9382dcc51d9122bd7582d75eb7ae15 Gerrit-Change-Number: 29314 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 09 Sep 2022 16:04:16 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-mgw[master]: osmux: don't store conn ptr inside shared osmux_handle
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29318 )
Change subject: osmux: don't store conn ptr inside shared osmux_handle
..
osmux: don't store conn ptr inside shared osmux_handle
The struct osmux_handle is a shared structure which goes together 1-1
with libosmo-netif's struct osmux_in_handle, which is common to all CIDs
to be muxed together. Hence, it makes no sense to store a specific conn
object to it, since it actually manages several of them. Hence, all the
conn specific stuff must be handled beforehand, not at osmux deliver
time.
Related: SYS#5987
Change-Id: Ie739b556e9eb7d3133e798831a09728c7cc87135
---
M src/libosmo-mgcp/mgcp_osmux.c
1 file changed, 3 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/18/29318/1
diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index d9bccb4..f72af81 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -36,7 +36,6 @@
struct osmux_handle {
struct llist_head head;
- struct mgcp_conn_rtp *conn;
struct osmux_in_handle *in;
struct osmo_sockaddr rem_addr;
int refcnt;
@@ -48,14 +47,8 @@
static void osmux_deliver_cb(struct msgb *batch_msg, void *data)
{
struct osmux_handle *handle = data;
- struct mgcp_conn_rtp *conn = handle->conn;
socklen_t dest_len;
- if (!conn->end.output_enabled) {
- msgb_free(batch_msg);
- return;
- }
-
switch (handle->rem_addr.u.sa.sa_family) {
case AF_INET6:
dest_len = sizeof(handle->rem_addr.u.sin6);
@@ -130,7 +123,6 @@
h = talloc_zero(osmux, struct osmux_handle);
if (!h)
return NULL;
- h->conn = conn;
h->rem_addr = *rem_addr;
h->refcnt++;
@@ -192,6 +184,9 @@
int ret;
struct msgb *msg;
+ if (!conn->end.output_enabled)
+ return -1;
+
if (conn->osmux.state != OSMUX_STATE_ENABLED) {
LOGPCONN(conn->conn, DOSMUX, LOGL_INFO, "forwarding RTP to
Osmux conn not yet enabled, dropping (cid=%d)\n",
conn->osmux.cid);
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29318
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Ie739b556e9eb7d3133e798831a09728c7cc87135
Gerrit-Change-Number: 29318
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-smlc[master]: Set working directory in systemd service file
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/29317 ) Change subject: Set working directory in systemd service file .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/29317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: Ie8b014e8eac23221a6a7087bb2b886014323680b Gerrit-Change-Number: 29317 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 09 Sep 2022 15:59:46 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-sip-connector[master]: Set working directory in systemd service file
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/29316 ) Change subject: Set working directory in systemd service file .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/29316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Idad82186d6ef7f00487cf162306b0733886fc129 Gerrit-Change-Number: 29316 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 09 Sep 2022 15:59:17 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-pcap[master]: Set working directory in systemd service file
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcap/+/29315 ) Change subject: Set working directory in systemd service file .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/29315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I39c48167cbe74b599c8edc3659e787792cbcfdfd Gerrit-Change-Number: 29315 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 09 Sep 2022 15:56:25 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-uecups[master]: Add git-review config
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/29313 ) Change subject: Add git-review config .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/29313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I7b822474d554e822fb13d9953e4c6959097a6293 Gerrit-Change-Number: 29313 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 09 Sep 2022 15:37:38 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-mgw[master]: osmux: Fix memleak on error code path
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29312 )
Change subject: osmux: Fix memleak on error code path
..
osmux: Fix memleak on error code path
Change-Id: Ib84f78a53293799b925b645156513e129c32c705
---
M src/libosmo-mgcp/mgcp_osmux.c
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/12/29312/1
diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index b393c2d..d9bccb4 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -192,6 +192,12 @@
int ret;
struct msgb *msg;
+ if (conn->osmux.state != OSMUX_STATE_ENABLED) {
+ LOGPCONN(conn->conn, DOSMUX, LOGL_INFO, "forwarding RTP to
Osmux conn not yet enabled, dropping (cid=%d)\n",
+ conn->osmux.cid);
+ return -1;
+ }
+
msg = msgb_alloc(4096, "RTP");
if (!msg)
return -1;
@@ -199,12 +205,6 @@
memcpy(msg->data, buf, buf_len);
msgb_put(msg, buf_len);
- if (conn->osmux.state != OSMUX_STATE_ENABLED) {
- LOGPCONN(conn->conn, DOSMUX, LOGL_INFO, "forwarding RTP to
Osmux conn not yet enabled, dropping (cid=%d)\n",
- conn->osmux.cid);
- return -1;
- }
-
while ((ret = osmux_xfrm_input(conn->osmux.in, msg, conn->osmux.cid)) >
0) {
/* batch full, build and deliver it */
osmux_xfrm_input_deliver(conn->osmux.in);
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29312
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Ib84f78a53293799b925b645156513e129c32c705
Gerrit-Change-Number: 29312
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-bts[master]: Don't manually create pid file
Attention is currently required from: pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29303 ) Change subject: Don't manually create pid file .. Patch Set 1: (1 comment) Patchset: PS1: > IMHO this shouldn't be dropped, but simply not called if "-D (daemonize)" is > not used. […] What's the point of keeping dead code aroud? Do we have anything which uses that pidfile? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I86bcaedbc8cb1297476ad741eaa45585fea3c380 Gerrit-Change-Number: 29303 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Fri, 09 Sep 2022 15:28:04 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-mgw[master]: osmux: Use osmo_sockaddr wherever possible
Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/29309 to look at the new patch set (#2). Change subject: osmux: Use osmo_sockaddr wherever possible .. osmux: Use osmo_sockaddr wherever possible This cleans up all the code, and makes it a lot easier to add IPv6 support later on (mostly only a matter of adding an IPv6 bind address in VTY). Similar changes were done to the Osmux code being added to osmo-bts. Related: SYS#5987 Change-Id: I5a100fc654f88d29b2bcd85889a5a92aef3d576d --- M include/osmocom/mgcp/osmux.h M src/libosmo-mgcp/mgcp_osmux.c 2 files changed, 59 insertions(+), 55 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/09/29309/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I5a100fc654f88d29b2bcd85889a5a92aef3d576d Gerrit-Change-Number: 29309 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
Change in osmo-mgw[master]: osmux: Log refcounting of osmux_handle_list
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/29310 to look at the new patch set (#2). Change subject: osmux: Log refcounting of osmux_handle_list .. osmux: Log refcounting of osmux_handle_list Change-Id: Ia873e3021078976748762baaf406865149b2a090 --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/10/29310/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia873e3021078976748762baaf406865149b2a090 Gerrit-Change-Number: 29310 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: Don't manually create pid file
Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29303 ) Change subject: Don't manually create pid file .. Patch Set 1: (1 comment) Patchset: PS1: IMHO this shouldn't be dropped, but simply not called if "-D (daemonize)" is not used. That should be enough. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I86bcaedbc8cb1297476ad741eaa45585fea3c380 Gerrit-Change-Number: 29303 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Fri, 09 Sep 2022 15:14:01 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-hlr[master]: Ignore .deb build byproducts
Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/29308 ) Change subject: Ignore .deb build byproducts .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/29308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Id36f55cd55be25f764c2b9515eff84d106bab1dc Gerrit-Change-Number: 29308 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Fri, 09 Sep 2022 15:13:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: Introduce Osmux support
Attention is currently required from: pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/29285 to look at the new patch set (#3). Change subject: Introduce Osmux support .. Introduce Osmux support Related: SYS#5987 Requires: libosmo-netif.git Change-Id I632654221826340423e1e97b0f8ed9a2baf6c6c3 Change-Id: Ib80be434c06d07b3611bd18ae25dff8b14a7aad9 --- M TODO-RELEASE M configure.ac A doc/manuals/chapters/osmux_bts.adoc M doc/manuals/osmobts-usermanual.adoc M include/osmo-bts/Makefile.am M include/osmo-bts/bts.h M include/osmo-bts/l1sap.h M include/osmo-bts/lchan.h M include/osmo-bts/logging.h A include/osmo-bts/osmux.h M include/osmo-bts/vty.h M src/common/Makefile.am M src/common/bts.c M src/common/l1sap.c M src/common/lchan.c M src/common/logging.c M src/common/main.c A src/common/osmux.c M src/common/rsl.c M src/common/vty.c 20 files changed, 882 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/85/29285/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib80be434c06d07b3611bd18ae25dff8b14a7aad9 Gerrit-Change-Number: 29285 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
Change in osmo-mgw[master]: osmux: Log refcounting of osmux_handle_list
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29310 )
Change subject: osmux: Log refcounting of osmux_handle_list
..
osmux: Log refcounting of osmux_handle_list
Change-Id: Ia873e3021078976748762baaf406865149b2a090
---
M src/libosmo-mgcp/mgcp_osmux.c
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/10/29310/1
diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index 428a353..d9c3ffd 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -78,10 +78,10 @@
llist_for_each_entry(h, &osmux_handle_list, head) {
if (osmo_sockaddr_cmp(&h->rem_addr, rem_addr) == 0) {
- LOGP(DOSMUX, LOGL_DEBUG,
-"Using existing OSMUX handle for rem_addr=%s\n",
-osmo_sockaddr_to_str(rem_addr));
h->refcnt++;
+ LOGP(DOSMUX, LOGL_DEBUG,
+"Using existing OSMUX handle for addr=%s
(rfcnt=%u)\n",
+osmo_sockaddr_to_str(rem_addr), h->refcnt);
return h;
}
}
@@ -96,6 +96,9 @@
llist_for_each_entry(h, &osmux_handle_list, head) {
if (h->in == in) {
+ LOGP(DOSMUX, LOGL_DEBUG,
+"Putting existing OSMUX handle for addr=%s
(rfcnt=%u)\n",
+osmo_sockaddr_to_str(&h->rem_addr), h->refcnt);
if (--h->refcnt == 0) {
LOGP(DOSMUX, LOGL_INFO,
"Releasing unused osmux handle for %s\n",
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29310
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Ia873e3021078976748762baaf406865149b2a090
Gerrit-Change-Number: 29310
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-mgw[master]: osmux: Use osmo_sockaddr wherever possible
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29309 )
Change subject: osmux: Use osmo_sockaddr wherever possible
..
osmux: Use osmo_sockaddr wherever possible
This cleans up all the code, and makes it a lot easier to add IPv6 support
later on (mostly only a matter of adding an IPv6 bind address in VTY).
Similar changes were done to the Osmux code being added to osmo-bts.
Related: SYS#5987
Change-Id: I5a100fc654f88d29b2bcd85889a5a92aef3d576d
---
M include/osmocom/mgcp/osmux.h
M src/libosmo-mgcp/mgcp_osmux.c
2 files changed, 59 insertions(+), 55 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/09/29309/1
diff --git a/include/osmocom/mgcp/osmux.h b/include/osmocom/mgcp/osmux.h
index f138901..62245a9 100644
--- a/include/osmocom/mgcp/osmux.h
+++ b/include/osmocom/mgcp/osmux.h
@@ -11,7 +11,7 @@
int osmux_init(int role, struct mgcp_config *cfg);
int osmux_enable_conn(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn,
- struct osmo_sockaddr *addr, uint16_t port);
+ const struct osmo_sockaddr *addr);
void conn_osmux_disable(struct mgcp_conn_rtp *conn);
int conn_osmux_allocate_cid(struct mgcp_conn_rtp *conn, int osmux_cid);
void conn_osmux_release_cid(struct mgcp_conn_rtp *conn);
diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index 287fa7c..428a353 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -38,8 +38,7 @@
struct llist_head head;
struct mgcp_conn_rtp *conn;
struct osmux_in_handle *in;
- struct in_addr rem_addr;
- int rem_port; /* network byte order */
+ struct osmo_sockaddr rem_addr;
int refcnt;
};
@@ -50,31 +49,38 @@
{
struct osmux_handle *handle = data;
struct mgcp_conn_rtp *conn = handle->conn;
+ socklen_t dest_len;
- if (conn->end.output_enabled) {
- struct sockaddr_in out = {
- .sin_family = AF_INET,
- .sin_port = handle->rem_port,
- };
- memcpy(&out.sin_addr, &handle->rem_addr,
sizeof(handle->rem_addr));
- sendto(osmux_fd.fd, batch_msg->data, batch_msg->len, 0,
- (struct sockaddr *)&out, sizeof(out));
+ if (!conn->end.output_enabled) {
+ msgb_free(batch_msg);
+ return;
}
+
+ switch (handle->rem_addr.u.sa.sa_family) {
+ case AF_INET6:
+ dest_len = sizeof(handle->rem_addr.u.sin6);
+ break;
+ case AF_INET:
+ default:
+ dest_len = sizeof(handle->rem_addr.u.sin);
+ break;
+ }
+ sendto(osmux_fd.fd, batch_msg->data, batch_msg->len, 0,
+ (struct sockaddr *)&handle->rem_addr.u.sa, dest_len);
msgb_free(batch_msg);
}
/* Lookup existing OSMUX handle for specified destination address. */
static struct osmux_handle *
-osmux_handle_find_get(struct in_addr *addr, int rem_port)
+osmux_handle_find_get(const struct osmo_sockaddr *rem_addr)
{
struct osmux_handle *h;
llist_for_each_entry(h, &osmux_handle_list, head) {
- if (memcmp(&h->rem_addr, addr, sizeof(struct in_addr)) == 0 &&
- h->rem_port == rem_port) {
- LOGP(DOSMUX, LOGL_DEBUG, "using existing OSMUX handle "
- "for addr=%s:%d\n",
- inet_ntoa(*addr), ntohs(rem_port));
+ if (osmo_sockaddr_cmp(&h->rem_addr, rem_addr) == 0) {
+ LOGP(DOSMUX, LOGL_DEBUG,
+"Using existing OSMUX handle for rem_addr=%s\n",
+osmo_sockaddr_to_str(rem_addr));
h->refcnt++;
return h;
}
@@ -92,9 +98,8 @@
if (h->in == in) {
if (--h->refcnt == 0) {
LOGP(DOSMUX, LOGL_INFO,
-"Releasing unused osmux handle for
%s:%d\n",
-inet_ntoa(h->rem_addr),
-ntohs(h->rem_port));
+"Releasing unused osmux handle for %s\n",
+osmo_sockaddr_to_str(&h->rem_addr));
LOGP(DOSMUX, LOGL_INFO, "Stats: "
"input RTP msgs: %u bytes: %"PRIu64" "
"output osmux msgs: %u bytes: %"PRIu64"\n",
@@ -109,12 +114,12 @@
return;
}
}
- LOGP(DOSMUX, LOGL_ERROR, "cannot find Osmux input handle %p\n", in);
+ LOGP(DOSMUX, LOGL_ERROR, "Cannot find Osmux input handle %p\n",
Change in osmo-hlr[master]: Ignore .deb build byproducts
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/29308 ) Change subject: Ignore .deb build byproducts .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/29308 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Id36f55cd55be25f764c2b9515eff84d106bab1dc Gerrit-Change-Number: 29308 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 09 Sep 2022 15:09:16 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-mgw[master]: osmux: Use better name for function which may allocate a new struct
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29307 )
Change subject: osmux: Use better name for function which may allocate a new
struct
..
osmux: Use better name for function which may allocate a new struct
Change-Id: I867e3f74775d97749a78c2f198452b1f2916492f
---
M src/libosmo-mgcp/mgcp_osmux.c
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/07/29307/1
diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index 980dbf0..287fa7c 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -155,7 +155,7 @@
/* Lookup existing handle for a specified address, if the handle can not be
* found, the function will automatically allocate one */
static struct osmux_in_handle *
-osmux_handle_lookup(struct mgcp_conn_rtp *conn, struct osmo_sockaddr *addr,
int rem_port)
+osmux_handle_find_or_create(struct mgcp_conn_rtp *conn, struct osmo_sockaddr
*addr, int rem_port)
{
struct osmux_handle *h;
@@ -481,7 +481,7 @@
return -1;
}
- conn->osmux.in = osmux_handle_lookup(conn, addr, port);
+ conn->osmux.in = osmux_handle_find_or_create(conn, addr, port);
if (!conn->osmux.in) {
LOGPCONN(conn->conn, DOSMUX, LOGL_ERROR,
"Cannot allocate input osmux handle for conn:%s\n",
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29307
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I867e3f74775d97749a78c2f198452b1f2916492f
Gerrit-Change-Number: 29307
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-bts[master]: Document realtime options in .service units
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29306 ) Change subject: Document realtime options in .service units .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib047762a336851e6205d77c83068a99d8a868e8b Gerrit-Change-Number: 29306 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 09 Sep 2022 14:34:08 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: Don't manually create pid file
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29303 ) Change subject: Don't manually create pid file .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29303 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I86bcaedbc8cb1297476ad741eaa45585fea3c380 Gerrit-Change-Number: 29303 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 09 Sep 2022 14:33:39 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-mgw[master]: cosmetic: main: Properly format log_info_cat
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29305 )
Change subject: cosmetic: main: Properly format log_info_cat
..
cosmetic: main: Properly format log_info_cat
Change-Id: If130d1debc1977b7f8d82f515861df2c513d55bb
---
M src/osmo-mgw/mgw_main.c
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/05/29305/1
diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c
index 247dfd3..71b1f1e 100644
--- a/src/osmo-mgw/mgw_main.c
+++ b/src/osmo-mgw/mgw_main.c
@@ -295,19 +295,22 @@
.name = "DRTP",
.description = "RTP stream handling",
.color = "\033[1;30m",
- .enabled = 1,.loglevel = LOGL_NOTICE,
+ .enabled = 1,
+ .loglevel = LOGL_NOTICE,
},
[DE1] = {
.name = "DE1",
.description = "E1 line handling",
.color = "\033[1;31m",
- .enabled = 1,.loglevel = LOGL_NOTICE,
+ .enabled = 1,
+ .loglevel = LOGL_NOTICE,
},
[DOSMUX] = {
.name = "DOSMUX",
.description = "Osmux (Osmocom RTP multiplexing)",
.color = "\033[1;32m",
- .enabled = 1,.loglevel = LOGL_NOTICE,
+ .enabled = 1,
+ .loglevel = LOGL_NOTICE,
},
};
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29305
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: If130d1debc1977b7f8d82f515861df2c513d55bb
Gerrit-Change-Number: 29305
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-mgw[master]: Add Osmux log category
pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29304 ) Change subject: Add Osmux log category .. Removed Verified-1 by Jenkins Builder (102) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia75de7965c39f3f84164a25584d901dbdd43f10f Gerrit-Change-Number: 29304 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote
Change in osmo-mgw[master]: Add Osmux log category
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29304 ) Change subject: Add Osmux log category .. Patch Set 1: Verified+1 (1 comment) Patchset: PS1: linter doesn't apply here since I'm following already present syntax around. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia75de7965c39f3f84164a25584d901dbdd43f10f Gerrit-Change-Number: 29304 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 09 Sep 2022 14:19:33 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-mgw[master]: Add Osmux log category
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/29304 )
Change subject: Add Osmux log category
..
Add Osmux log category
Change-Id: Ia75de7965c39f3f84164a25584d901dbdd43f10f
---
M include/osmocom/mgcp/debug.h
M src/libosmo-mgcp/mgcp_osmux.c
M src/osmo-mgw/mgw_main.c
3 files changed, 41 insertions(+), 33 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/04/29304/1
diff --git a/include/osmocom/mgcp/debug.h b/include/osmocom/mgcp/debug.h
index 7044c1e..f7d47d6 100644
--- a/include/osmocom/mgcp/debug.h
+++ b/include/osmocom/mgcp/debug.h
@@ -30,6 +30,7 @@
enum {
DRTP,
DE1,
+ DOSMUX,
Debug_LastEntry,
};
diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index 0b84ad3..980dbf0 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -22,6 +22,7 @@
#include
#include
+#include
#include
#include
#include
@@ -71,7 +72,7 @@
llist_for_each_entry(h, &osmux_handle_list, head) {
if (memcmp(&h->rem_addr, addr, sizeof(struct in_addr)) == 0 &&
h->rem_port == rem_port) {
- LOGP(DLMGCP, LOGL_DEBUG, "using existing OSMUX handle "
+ LOGP(DOSMUX, LOGL_DEBUG, "using existing OSMUX handle "
"for addr=%s:%d\n",
inet_ntoa(*addr), ntohs(rem_port));
h->refcnt++;
@@ -90,11 +91,11 @@
llist_for_each_entry(h, &osmux_handle_list, head) {
if (h->in == in) {
if (--h->refcnt == 0) {
- LOGP(DLMGCP, LOGL_INFO,
+ LOGP(DOSMUX, LOGL_INFO,
"Releasing unused osmux handle for
%s:%d\n",
inet_ntoa(h->rem_addr),
ntohs(h->rem_port));
- LOGP(DLMGCP, LOGL_INFO, "Stats: "
+ LOGP(DOSMUX, LOGL_INFO, "Stats: "
"input RTP msgs: %u bytes: %"PRIu64" "
"output osmux msgs: %u bytes: %"PRIu64"\n",
in->stats.input_rtp_msgs,
@@ -108,7 +109,7 @@
return;
}
}
- LOGP(DLMGCP, LOGL_ERROR, "cannot find Osmux input handle %p\n", in);
+ LOGP(DOSMUX, LOGL_ERROR, "cannot find Osmux input handle %p\n", in);
}
/* Allocate free OSMUX handle */
@@ -145,7 +146,7 @@
llist_add(&h->head, &osmux_handle_list);
- LOGP(DLMGCP, LOGL_DEBUG, "created new OSMUX handle for addr=%s:%d\n",
+ LOGP(DOSMUX, LOGL_DEBUG, "created new OSMUX handle for addr=%s:%d\n",
inet_ntoa(*addr), ntohs(rem_port));
return h;
@@ -159,7 +160,7 @@
struct osmux_handle *h;
if (addr->u.sa.sa_family != AF_INET) {
- LOGP(DLMGCP, LOGL_DEBUG, "IPv6 not supported in osmux yet!\n");
+ LOGP(DOSMUX, LOGL_DEBUG, "IPv6 not supported in osmux yet!\n");
return NULL;
}
@@ -192,7 +193,7 @@
msgb_put(msg, buf_len);
if (conn->osmux.state != OSMUX_STATE_ENABLED) {
- LOGPCONN(conn->conn, DLMGCP, LOGL_INFO, "forwarding RTP to
Osmux conn not yet enabled, dropping (cid=%d)\n",
+ LOGPCONN(conn->conn, DOSMUX, LOGL_INFO, "forwarding RTP to
Osmux conn not yet enabled, dropping (cid=%d)\n",
conn->osmux.cid);
return -1;
}
@@ -232,7 +233,7 @@
}
}
- LOGP(DLMGCP, LOGL_ERROR, "Cannot find osmux conn with cid=%d\n", cid);
+ LOGP(DOSMUX, LOGL_ERROR, "Cannot find osmux conn with cid=%d\n", cid);
return NULL;
}
@@ -267,14 +268,14 @@
msg = msgb_alloc(4096, "OSMUX");
if (!msg) {
- LOGP(DLMGCP, LOGL_ERROR, "cannot allocate message\n");
+ LOGP(DOSMUX, LOGL_ERROR, "cannot allocate message\n");
return NULL;
}
ret = recvfrom(ofd->fd, msg->data, msg->data_len, 0,
(struct sockaddr *)addr, &slen);
if (ret <= 0) {
msgb_free(msg);
- LOGP(DLMGCP, LOGL_ERROR, "cannot receive message\n");
+ LOGP(DOSMUX, LOGL_ERROR, "cannot receive message\n");
return NULL;
}
msgb_put(msg, ret);
@@ -291,13 +292,13 @@
switch(conn->osmux.state) {
case OSMUX_STATE_ACTIVATING:
if (osmux_enable_conn(endp, conn, &conn->end.addr,
conn->end.rtp_port) < 0) {
- LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,
+ LOGPCONN(conn->conn, DOSMUX, LOGL_ERROR,
"Could not enable osmux for conn on %s: %s\n",
Change in osmo-bts[master]: Set working directory in systemd service file
Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29302 ) Change subject: Set working directory in systemd service file .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4b7bcd441e5da81c4c5267715675041171a1ce1e Gerrit-Change-Number: 29302 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Fri, 09 Sep 2022 14:00:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: Set working directory in systemd service file
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29302 ) Change subject: Set working directory in systemd service file .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4b7bcd441e5da81c4c5267715675041171a1ce1e Gerrit-Change-Number: 29302 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 09 Sep 2022 13:58:52 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmo-netif[master]: osmux: osmux_xfrm_input_close_circuit(): Log circuit not found
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-netif/+/29301 )
Change subject: osmux: osmux_xfrm_input_close_circuit(): Log circuit not found
..
osmux: osmux_xfrm_input_close_circuit(): Log circuit not found
Change-Id: I486b81d15b4d9d6abd08fbd73ca460bae22586a9
---
M src/osmux.c
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/01/29301/1
diff --git a/src/osmux.c b/src/osmux.c
index 71afe5c..5515e88 100644
--- a/src/osmux.c
+++ b/src/osmux.c
@@ -843,8 +843,11 @@
struct osmux_circuit *circuit;
circuit = osmux_batch_find_circuit(batch, ccid);
- if (circuit == NULL)
+ if (circuit == NULL) {
+ LOGP(DLMUX, LOGL_NOTICE, "Unable to close circuit %d: Not
found\n",
+ccid);
return;
+ }
osmux_batch_del_circuit(batch, circuit);
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29301
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I486b81d15b4d9d6abd08fbd73ca460bae22586a9
Gerrit-Change-Number: 29301
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-trx[master]: Set working directory in systemd service file
Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/29300 ) Change subject: Set working directory in systemd service file .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/29300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I041bb9e0b4250826d2d15d0ea2cdb93d7a0cd04b Gerrit-Change-Number: 29300 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: msuraev Gerrit-Comment-Date: Fri, 09 Sep 2022 12:16:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-trx[master]: Set working directory in systemd service file
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/29300 ) Change subject: Set working directory in systemd service file .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/29300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I041bb9e0b4250826d2d15d0ea2cdb93d7a0cd04b Gerrit-Change-Number: 29300 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 09 Sep 2022 12:12:03 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-pcu[master]: Set working directory in systemd service file
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29299 ) Change subject: Set working directory in systemd service file .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib6acc84c3018e468f4c320bc2a3003ba906e4aeb Gerrit-Change-Number: 29299 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 09 Sep 2022 11:55:16 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmo-sccp[master]: Set working directory in systemd service file
msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/29298 ) Change subject: Set working directory in systemd service file .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/29298 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: If21e3471ec129892ff8b410db30d8ce0e4014e05 Gerrit-Change-Number: 29298 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 09 Sep 2022 11:42:34 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmo-netif[master]: osmux: Allow the user to alloc msgbs used to provide generated RTP pa...
Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/29260 ) Change subject: osmux: Allow the user to alloc msgbs used to provide generated RTP packets .. Patch Set 3: (1 comment) Patchset: PS3: I'm happy to explore other proposals but I cannot think of a better one. This one is wroking fine so far, I tested with with osmo-bts. This can also be reused in osmo-mgw to improve efficency to avoid recreating/duplicating msgbs, but I didn't look into that yet since it's not really top prio. So I'd say let's merge this one as it is now. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/29260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I632654221826340423e1e97b0f8ed9a2baf6c6c3 Gerrit-Change-Number: 29260 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 09 Sep 2022 11:29:11 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmo-sccp[master]: SIGTRAN: arrange the comments in the encoder to match the spec
msuraev has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/29284 ) Change subject: SIGTRAN: arrange the comments in the encoder to match the spec .. SIGTRAN: arrange the comments in the encoder to match the spec Related: OS#5579 Change-Id: Ib986137057856afb8725541d912db210a9a46294 --- M src/sccp_scoc.c 1 file changed, 8 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index 3b1ca02..2ed72ee 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -596,10 +596,12 @@ /* optional: sequence number (class 3 only) */ if (conn->calling_addr.presence) xua_msg_add_sccp_addr(xua, SUA_IEI_SRC_ADDR, &conn->calling_addr); - /* optional: hop count; importance; priority; credit */ + /* optional: data */ if (prim && msgb_l2(prim->oph.msg) && msgb_l2len(prim->oph.msg)) xua_msg_add_data(xua, SUA_IEI_DATA, msgb_l2len(prim->oph.msg), msgb_l2(prim->oph.msg)); + /* optional: hop count */ + /* optional: importance */ break; case SUA_CO_COAK: /* Connect Acknowledge == SCCP CC */ xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_COAK); @@ -617,9 +619,11 @@ * parameter */ if (conn->calling_addr.presence) xua_msg_add_sccp_addr(xua, SUA_IEI_DEST_ADDR, &conn->calling_addr); + /* optional: data */ if (prim && msgb_l2(prim->oph.msg) && msgb_l2len(prim->oph.msg)) xua_msg_add_data(xua, SUA_IEI_DATA, msgb_l2len(prim->oph.msg), msgb_l2(prim->oph.msg)); + /* optional: importance */ break; case SUA_CO_RELRE: /* Release Request == SCCP RLSD */ if (!prim) @@ -629,17 +633,17 @@ xua_msg_add_u32(xua, SUA_IEI_DEST_REF, conn->remote_ref); xua_msg_add_u32(xua, SUA_IEI_SRC_REF, conn->conn_id); xua_msg_add_u32(xua, SUA_IEI_CAUSE, SUA_CAUSE_T_RELEASE | prim->u.disconnect.cause); - /* optional: importance */ + /* optional: data */ if (prim && msgb_l2(prim->oph.msg) && msgb_l2len(prim->oph.msg)) xua_msg_add_data(xua, SUA_IEI_DATA, msgb_l2len(prim->oph.msg), msgb_l2(prim->oph.msg)); + /* optional: importance */ break; case SUA_CO_RELCO: /* Release Confirm == SCCP RLC */ xua->hdr = XUA_HDR(SUA_MSGC_CO, SUA_CO_RELCO); xua_msg_add_u32(xua, SUA_IEI_ROUTE_CTX, conn->inst->route_ctx); xua_msg_add_u32(xua, SUA_IEI_DEST_REF, conn->remote_ref); xua_msg_add_u32(xua, SUA_IEI_SRC_REF, conn->conn_id); - /* optional: importance */ break; case SUA_CO_CODT: /* Connection Oriented Data Transfer == SCCP DT1 */ if (!prim) @@ -672,11 +676,11 @@ /* conditional: dest addr */ if (conn->calling_addr.presence) xua_msg_add_sccp_addr(xua, SUA_IEI_DEST_ADDR, &conn->calling_addr); - /* optional: importance */ /* optional: data */ if (prim && msgb_l2(prim->oph.msg) && msgb_l2len(prim->oph.msg)) xua_msg_add_data(xua, SUA_IEI_DATA, msgb_l2len(prim->oph.msg), msgb_l2(prim->oph.msg)); + /* optional: importance */ break; /* FIXME */ default: -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/29284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ib986137057856afb8725541d912db210a9a46294 Gerrit-Change-Number: 29284 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: msuraev Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in libosmo-sccp[master]: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD
msuraev has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/29084 )
Change subject: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD
..
SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD
The length limit of optional Data parameter is 130 bytes according to ITU-T Rec
Q.713 §4.2..§4.5. If we receive CR, CC or
RLSD message with bigger data - cache it if necessary and send via separate DT1
message after connection becomes active.
Fixes: OS#5579
Change-Id: I0033faf9da393418930252233ce74d62cd1cef8a
---
M src/sccp_scoc.c
1 file changed, 130 insertions(+), 13 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
msuraev: Looks good to me, approved
diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c
index 2ed72ee..cff6e80 100644
--- a/src/sccp_scoc.c
+++ b/src/sccp_scoc.c
@@ -49,12 +49,13 @@
#include
#include
+#include
#include
#include
#include
#include
#include
-
+#include
#include
#include
#include
@@ -99,6 +100,8 @@
uint32_t sccp_class;
uint32_t release_cause; /* WAIT_CONN_CONF */
+ struct msgb *opt_data_cache;
+
/* incoming (true) or outgoing (false) */
bool incoming;
@@ -514,10 +517,20 @@
return conn_create_id(user, conn_id);
}
+static void conn_opt_data_clear_cache(struct sccp_connection *conn)
+{
+ if (conn->opt_data_cache) {
+ msgb_free(conn->opt_data_cache);
+ conn->opt_data_cache = NULL;
+ }
+}
+
/* destroy a SCCP connection state, releasing all timers, terminating
* FSM and releasing associated memory */
static void conn_destroy(struct sccp_connection *conn)
{
+ conn_opt_data_clear_cache(conn);
+
conn_stop_connect_timer(conn);
conn_stop_inact_timers(conn);
conn_stop_release_timers(conn);
@@ -575,11 +588,112 @@
return 0;
}
+/* Send cached optional data (if any) from expected message type and clear
cache */
+static void xua_opt_data_send_cache(struct sccp_connection *conn, int
exp_type, uint8_t msg_class)
+{
+ const struct xua_dialect *dialect = &xua_dialect_sua;
+ const struct xua_msg_class *xmc = dialect->class[msg_class];
+
+ if (!conn->opt_data_cache)
+ return;
+
+ if (conn->opt_data_cache->cb[0] != exp_type) {
+ /* Caller (from the FSM) knows what was the source of Optional
Data we're sending.
+* Compare this information with source of Optional Data
recorded while caching
+* to make sure we're on the same page.
+*/
+ LOGP(DLSCCP, LOGL_ERROR, "unexpected message type %s != cache
source %s\n",
+xua_class_msg_name(xmc, exp_type),
xua_class_msg_name(xmc, conn->opt_data_cache->cb[0]));
+ } else {
+ osmo_sccp_tx_data(conn->user, conn->conn_id,
msgb_data(conn->opt_data_cache), msgb_length(conn->opt_data_cache));
+ }
+
+ conn_opt_data_clear_cache(conn);
+}
+
+/* Check if optional data should be dropped, log given error message if so */
+static bool xua_drop_data_check_drop(const struct osmo_scu_prim *prim,
unsigned lim, const char *message)
+{
+ if (msgb_l2len(prim->oph.msg) > lim) {
+ LOGP(DLSCCP, LOGL_ERROR,
+"%s: dropping optional data with length %u > %u -
%s\n",
+osmo_scu_prim_name(&prim->oph),
msgb_l2len(prim->oph.msg), lim, message);
+ return true;
+ }
+ return false;
+}
+
+/* Cache the optional data (if necessary)
+ * returns true if Optional Data should be kept while encoding the message */
+static bool xua_opt_data_cache_keep(struct sccp_connection *conn, const struct
osmo_scu_prim *prim, int msg_type)
+{
+ uint8_t *buf;
+
+ if (xua_drop_data_check_drop(prim, SCCP_MAX_DATA, "cache overrun"))
+ return false;
+
+ if (msgb_l2len(prim->oph.msg) > SCCP_MAX_OPTIONAL_DATA) {
+ if (conn->opt_data_cache) {
+ /* Caching optional data, but there already is optional
data occupying the cache: */
+ LOGP(DLSCCP, LOGL_ERROR, "replacing unsent %u bytes of
optional data cache with %s optional data\n",
+msgb_length(conn->opt_data_cache),
osmo_scu_prim_name(&prim->oph));
+ msgb_trim(conn->opt_data_cache, 0);
+ } else {
+ conn->opt_data_cache = msgb_alloc_c(conn,
SCCP_MAX_DATA, "SCCP optional data cache for CR/CC/RLSD");
+ }
+
+ buf = msgb_put(conn->opt_data_cache, msgb_l2len(prim->oph.msg));
+ memcpy(buf, msgb_l2(prim->oph.msg), msgb_l2len(prim->oph.msg));
+
+ conn->opt_data_cache->cb[0] = msg_t
Change in libosmo-sccp[master]: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD
Attention is currently required from: neels, fixeria. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/29084 ) Change subject: SIGTRAN: cache Optional Data for SCCP CR/CC/RLSD .. Patch Set 17: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/29084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0033faf9da393418930252233ce74d62cd1cef8a Gerrit-Change-Number: 29084 Gerrit-PatchSet: 17 Gerrit-Owner: msuraev Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: msuraev Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 09 Sep 2022 09:41:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
