October 2022 - gerrit-log - lists.osmocom.org

Change in osmo-bts[master]: osmo-bts-trx: handle MTS 0b0110 indicating an Access Burst
by pespin 04 Oct '22

04 Oct '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29578 ) Change subject: osmo-bts-trx: handle MTS 0b0110 indicating an Access Burst ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: > SI13 contains the default value, which can be overridden in the polling message. Ah I didn't remember this could be overwritten per message. Fine then. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0fbb63006797e6be386d1f76ed97fff098c036fc Gerrit-Change-Number: 29578 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 16:16:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: mgw: Set osmux bind-ip(-v6) VTY configs
by pespin 04 Oct '22

04 Oct '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29616 ) Change subject: mgw: Set osmux bind-ip(-v6) VTY configs ...................................................................... mgw: Set osmux bind-ip(-v6) VTY configs Until now we forgot to properly configure the osmux socket local ip, but that was find because 0.0.0.0 was taken as a default. With addition of IPv6, this changed, and the socket is not bound unless an IP address is set (to allow conditional use of IPv4, IPv6 or both). Depends: osmo-mgw.git Change-Id I446cd7da217e9f4a74995d7784ae55dcc60a29b7 Change-Id: I4e0ea11ae7e55da600aec56bebf694f3ba0f7b72 --- M mgw/osmo-mgw.cfg 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/29616/1 diff --git a/mgw/osmo-mgw.cfg b/mgw/osmo-mgw.cfg index 8428cd3..1c5cfce 100644 --- a/mgw/osmo-mgw.cfg +++ b/mgw/osmo-mgw.cfg @@ -47,3 +47,5 @@ number endpoints 31 allow-transcoding osmux off + osmux bind-ip 127.0.0.1 + osmux bind-ip-v6 ::1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29616 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: I4e0ea11ae7e55da600aec56bebf694f3ba0f7b72 Gerrit-Change-Number: 29616 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-bts[master]: osmo-bts-trx: handle MTS 0b0110 indicating an Access Burst
by fixeria 04 Oct '22

04 Oct '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29578 ) Change subject: osmo-bts-trx: handle MTS 0b0110 indicating an Access Burst ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Why do you say the BTS has no prior knowledge on whether the 4 acces burst method is used? Because the BTS has no access to the internal scheduler state of the PCU. Only the PCU knows that a particular PDCH block is expected to be received in form of four Access Bursts instead of Normal Bursts, because it's the PCU who polls the MS. Given the dynamic nature of PDCH, the BTS cannot make assumptions on whether an Uplink block is a PACKET_CONTROL_ACK or not. We could introduce some special PCUIF message indicating that N-th block is going to be in form of Access Bursts, but given the scheduling advance (i.e. latency between UL and DL) I think it would be hard to make this work reliably. > AFAIR that's being broadcasted by the BTS in CCCH? SI13 contains the default value, which can be overridden in the polling message. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0fbb63006797e6be386d1f76ed97fff098c036fc Gerrit-Change-Number: 29578 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 16:11:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: ttcn3-mgw: Set osmux bind-ip(-v6) VTY configs
by pespin 04 Oct '22

04 Oct '22

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/docker-playground/+/29615 ) Change subject: ttcn3-mgw: Set osmux bind-ip(-v6) VTY configs ...................................................................... ttcn3-mgw: Set osmux bind-ip(-v6) VTY configs Until now we forgot to properly configure the osmux socket local ip, but that was find because 0.0.0.0 was taken as a default. With addition of IPv6, this changed, and the socket is not bound unless an IP address is set (to allow conditional use of IPv4, IPv6 or both). Depends: osmo-mgw.git Change-Id I446cd7da217e9f4a74995d7784ae55dcc60a29b7 Change-Id: Ib7e9428a10238fae395a1707d6034dc5c97b9024 --- M ttcn3-mgw-test/jenkins.sh M ttcn3-mgw-test/osmo-mgw.cfg 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/15/29615/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib7e9428a10238fae395a1707d6034dc5c97b9024 Gerrit-Change-Number: 29615 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in docker-playground[master]: mgw: Set osmux bind-ip(-v6) VTY configs
by pespin 04 Oct '22

04 Oct '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/29615 ) Change subject: mgw: Set osmux bind-ip(-v6) VTY configs ...................................................................... mgw: Set osmux bind-ip(-v6) VTY configs Until now we forgot to properly configure the osmux socket local ip, but that was find because 0.0.0.0 was taken as a default. With addition of IPv6, this changed, and the socket is not bound unless an IP address is set (to allow conditional use of IPv4, IPv6 or both). Depends: osmo-mgw.git Change-Id I446cd7da217e9f4a74995d7784ae55dcc60a29b7 Change-Id: Ib7e9428a10238fae395a1707d6034dc5c97b9024 --- M ttcn3-mgw-test/jenkins.sh M ttcn3-mgw-test/osmo-mgw.cfg 2 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/15/29615/1 diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index c0cf2f5..48cd1d1 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -15,6 +15,10 @@ mkdir $VOL_BASE_DIR/mgw cp osmo-mgw.cfg $VOL_BASE_DIR/mgw/ +# Can be dropped once released osmo-mgw is >1.10.0: +if image_suffix_is_latest; then + sed -i "/^ osmux bind-ip-v6 fd02:db8:4::180/d" $VOL_BASE_DIR/mgw/osmo-mgw.cfg +fi SUBNET=4 network_create $SUBNET diff --git a/ttcn3-mgw-test/osmo-mgw.cfg b/ttcn3-mgw-test/osmo-mgw.cfg index 4770732..36485d8 100644 --- a/ttcn3-mgw-test/osmo-mgw.cfg +++ b/ttcn3-mgw-test/osmo-mgw.cfg @@ -58,6 +58,8 @@ number endpoints 31 allow-transcoding osmux off + osmux bind-ip 172.18.4.180 + osmux bind-ip-v6 fd02:db8:4::180 trunk 1 sdp audio-payload send-ptime sdp audio-payload send-name -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib7e9428a10238fae395a1707d6034dc5c97b9024 Gerrit-Change-Number: 29615 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-mgw[master]: Add Osmux IPv6 support
by Jenkins Builder 04 Oct '22

04 Oct '22

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29614 ) Change subject: Add Osmux IPv6 support ...................................................................... Patch Set 1: (1 comment) File src/libosmo-mgcp/mgcp_protocol.c: Robot Comment from checkpatch (run ID jenkins-gerrit-osmo-mgw-lint-559): https://gerrit.osmocom.org/c/osmo-mgw/+/29614/comment/f153ee49_d2d45f5b PS1, Line 1070: if (mgcp_get_local_addr(conn->end.local_addr, conn) < 0) that open brace { should be on the previous line -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I446cd7da217e9f4a74995d7784ae55dcc60a29b7 Gerrit-Change-Number: 29614 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Oct 2022 16:06:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-mgw[master]: Add Osmux IPv6 support
by pespin 04 Oct '22

04 Oct '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29614 ) Change subject: Add Osmux IPv6 support ...................................................................... Add Osmux IPv6 support A new osmux bind-ip-v6 VTY command is added, similar to what's already available for RTP. This way the user can decide whether to support IPv4, IPv6 or both types of IP versions. Both IP sockets are by default disabled, and must be explicitly enabled by setting the bind-ip in the VTY configuration. Change-Id: I446cd7da217e9f4a74995d7784ae55dcc60a29b7 --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/mgcp_network.h M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 6 files changed, 100 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/14/29614/1 diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index 4c541cb..2005e4f 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -160,7 +160,8 @@ /* Osmux usage policy: */ enum osmux_usage osmux_use; /* addr to bind the server to */ - char osmux_addr[INET6_ADDRSTRLEN]; + char *osmux_addr_v4; + char *osmux_addr_v6; /* The BSC-NAT may ask for enabling osmux on demand. This tells us if * the osmux socket is already initialized. */ diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h index 349ff94..a3d57f0 100644 --- a/include/osmocom/mgcp/mgcp_network.h +++ b/include/osmocom/mgcp/mgcp_network.h @@ -157,7 +157,7 @@ struct mgcp_rtp_state *state, struct mgcp_rtp_end *rtp_end, struct osmo_sockaddr *addr, struct msgb *msg); -void mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn); +int mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn); /* payload processing default functions */ int mgcp_rtp_processing_default(struct mgcp_endpoint *endp, struct mgcp_rtp_end *dst_end, diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 401bb09..41e6ffc 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -81,12 +81,13 @@ /*! Determine the local rtp bind IP-address. * \param[out] addr caller provided memory to store the resulting IP-Address. * \param[in] endp mgcp endpoint, that holds a copy of the VTY parameters. + * \ returns 0 on success, -1 if no local address could be provided. * * The local bind IP-address is automatically selected by probing the * IP-Address of the interface that is pointing towards the remote IP-Address, * if no remote IP-Address is known yet, the statically configured * IP-Addresses are used as fallback. */ -void mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn) +int mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn) { struct mgcp_endpoint *endp; @@ -99,12 +100,30 @@ /* Osmux: No smart IP addresses allocation is supported yet. Simply * return the one set in VTY config: */ if (mgcp_conn_rtp_is_osmux(conn)) { - bind_addr = conn->conn->endp->trunk->cfg->osmux_addr; - LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, - "using configured osmux bind ip as local bind ip %s\n", + if (rem_addr_set) { + /* Match IP version with what was requested from remote: */ + bind_addr = conn->end.addr.u.sa.sa_family == AF_INET6 ? + conn->conn->endp->trunk->cfg->osmux_addr_v6 : + conn->conn->endp->trunk->cfg->osmux_addr_v4; + } else { + /* Choose any of the bind addresses, preferring v6 over v4 if available: */ + bind_addr = conn->conn->endp->trunk->cfg->osmux_addr_v6; + if (!bind_addr) + bind_addr = conn->conn->endp->trunk->cfg->osmux_addr_v4; + } + if (!bind_addr) { + LOGPCONN(conn->conn, DOSMUX, LOGL_ERROR, + "Unable to locate local Osmux address, check your configuration! v4=%u v6=%u remote_known=%s\n", + !!conn->conn->endp->trunk->cfg->osmux_addr_v4, + !!conn->conn->endp->trunk->cfg->osmux_addr_v6, + rem_addr_set ? osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf) : "no"); + return -1; + } + LOGPCONN(conn->conn, DOSMUX, LOGL_DEBUG, + "Using configured osmux bind ip as local bind ip %s\n", bind_addr); osmo_strlcpy(addr, bind_addr, INET6_ADDRSTRLEN); - return; + return 0; } /* Try probing the local IP-Address */ @@ -117,7 +136,7 @@ LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, "selected local rtp bind ip %s by probing using remote ip %s\n", addr, osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf)); - return; + return 0; } } @@ -147,6 +166,7 @@ "using mgcp bind ip as local rtp bind ip: %s\n", bind_addr); } osmo_strlcpy(addr, bind_addr, INET6_ADDRSTRLEN); + return 0; } /* This does not need to be a precision timestamp and diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index de0bc38..5b404bc 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -30,7 +30,8 @@ #include <osmocom/mgcp/mgcp_endp.h> #include <osmocom/mgcp/mgcp_trunk.h> -static struct osmo_fd osmux_fd; +static struct osmo_fd osmux_fd_v4; +static struct osmo_fd osmux_fd_v6; static LLIST_HEAD(osmux_handle_list); @@ -76,20 +77,22 @@ { struct osmux_handle *handle = data; socklen_t dest_len; - int rc; - struct mgcp_trunk *trunk = (struct mgcp_trunk *)osmux_fd.data; + int rc, fd; + struct mgcp_trunk *trunk = (struct mgcp_trunk *)osmux_fd_v4.data; struct rate_ctr_group *all_osmux_stats = trunk->ratectr.all_osmux_conn_stats; switch (handle->rem_addr.u.sa.sa_family) { case AF_INET6: dest_len = sizeof(handle->rem_addr.u.sin6); + fd = osmux_fd_v6.fd; break; case AF_INET: default: dest_len = sizeof(handle->rem_addr.u.sin); + fd = osmux_fd_v4.fd; break; } - rc = sendto(osmux_fd.fd, batch_msg->data, batch_msg->len, 0, + rc = sendto(fd, batch_msg->data, batch_msg->len, 0, (struct sockaddr *)&handle->rem_addr.u.sa, dest_len); if (rc < 0) { char errbuf[129]; @@ -187,11 +190,6 @@ { struct osmux_handle *h; - if (rem_addr->u.sa.sa_family != AF_INET) { - LOGP(DOSMUX, LOGL_DEBUG, "IPv6 not supported in osmux yet!\n"); - return NULL; - } - h = osmux_handle_find_get(rem_addr); if (h != NULL) return h->in; @@ -450,27 +448,46 @@ /* So far we only support running on one trunk: */ OSMO_ASSERT(trunk == mgcp_trunk_by_num(cfg, MGCP_TRUNK_VIRTUAL, MGCP_VIRT_TRUNK_ID)); - osmo_fd_setup(&osmux_fd, -1, OSMO_FD_READ, osmux_read_fd_cb, trunk, 0); + osmo_fd_setup(&osmux_fd_v4, -1, OSMO_FD_READ, osmux_read_fd_cb, trunk, 0); + osmo_fd_setup(&osmux_fd_v6, -1, OSMO_FD_READ, osmux_read_fd_cb, trunk, 0); - ret = mgcp_create_bind(cfg->osmux_addr, &osmux_fd, cfg->osmux_port, - cfg->endp_dscp, cfg->endp_priority); - if (ret < 0) { - LOGP(DOSMUX, LOGL_ERROR, "cannot bind OSMUX socket to %s:%u\n", - cfg->osmux_addr, cfg->osmux_port); - return ret; + if (cfg->osmux_addr_v4) { + ret = mgcp_create_bind(cfg->osmux_addr_v4, &osmux_fd_v4, cfg->osmux_port, + cfg->endp_dscp, cfg->endp_priority); + if (ret < 0) { + LOGP(DOSMUX, LOGL_ERROR, "Cannot bind OSMUX IPv4 socket to %s:%u\n", + cfg->osmux_addr_v4, cfg->osmux_port); + return ret; + } + + ret = osmo_fd_register(&osmux_fd_v4); + if (ret < 0) { + LOGP(DOSMUX, LOGL_ERROR, "Cannot register OSMUX IPv4 socket %s\n", + osmo_sock_get_name2(osmux_fd_v4.fd)); + return ret; + } + LOGP(DOSMUX, LOGL_INFO, "OSMUX IPv4 socket listening on %s\n", + osmo_sock_get_name2(osmux_fd_v4.fd)); } + if (cfg->osmux_addr_v6) { + ret = mgcp_create_bind(cfg->osmux_addr_v6, &osmux_fd_v6, cfg->osmux_port, + cfg->endp_dscp, cfg->endp_priority); + if (ret < 0) { + LOGP(DOSMUX, LOGL_ERROR, "Cannot bind OSMUX IPv6 socket to %s:%u\n", + cfg->osmux_addr_v6, cfg->osmux_port); + return ret; + } - ret = osmo_fd_register(&osmux_fd); - if (ret < 0) { - LOGP(DOSMUX, LOGL_ERROR, "cannot register OSMUX socket %s\n", - osmo_sock_get_name2(osmux_fd.fd)); - return ret; + ret = osmo_fd_register(&osmux_fd_v6); + if (ret < 0) { + LOGP(DOSMUX, LOGL_ERROR, "Cannot register OSMUX IPv6 socket %s\n", + osmo_sock_get_name2(osmux_fd_v6.fd)); + return ret; + } + LOGP(DOSMUX, LOGL_INFO, "OSMUX IPv6 socket listening on %s\n", + osmo_sock_get_name2(osmux_fd_v6.fd)); } cfg->osmux_initialized = true; - - LOGP(DOSMUX, LOGL_INFO, "OSMUX socket listening on %s\n", - osmo_sock_get_name2(osmux_fd.fd)); - return 0; } @@ -647,7 +664,7 @@ osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf), osmo_sockaddr_port(&conn->end.addr.u.sa), conn->osmux.remote_cid); - return mgcp_udp_send(osmux_fd.fd, &conn->end.addr, (char *)osmuxh, buf_len); + return mgcp_udp_send(osmux_fd_v4.fd, &conn->end.addr, (char *)osmuxh, buf_len); } /* bsc-nat allocates/releases the Osmux circuit ID. +7 to round up to 8 bit boundary. */ diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index a257ffe..de48c8f 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1067,7 +1067,11 @@ /* Find a local address for conn based on policy and initial SDP remote information, then find a free port for it */ - mgcp_get_local_addr(conn->end.local_addr, conn); + if (mgcp_get_local_addr(conn->end.local_addr, conn) < 0) + { + rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_BIND_PORT)); + goto error2; + } if (allocate_port(endp, conn) != 0) { rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_BIND_PORT)); goto error2; @@ -1279,7 +1283,10 @@ to update our announced IP addr and re-bind our local end. This can happen for instance if MGW initially provided an IPv4 during CRCX ACK, and now MDCX tells us the remote has an IPv6 address. */ - mgcp_get_local_addr(new_local_addr, conn); + if (mgcp_get_local_addr(new_local_addr, conn) < 0) { + rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_BIND_PORT)); + goto error3; + } if (strcmp(new_local_addr, conn->end.local_addr)) { osmo_strlcpy(conn->end.local_addr, new_local_addr, sizeof(conn->end.local_addr)); mgcp_free_rtp_port(&conn->end); @@ -1627,7 +1634,6 @@ cfg->source_port = 2427; osmo_strlcpy(cfg->source_addr, "0.0.0.0", sizeof(cfg->source_addr)); - osmo_strlcpy(cfg->osmux_addr, "0.0.0.0", sizeof(cfg->osmux_addr)); cfg->rtp_processing_cb = &mgcp_rtp_processing_default; cfg->setup_rtp_processing_cb = &mgcp_setup_rtp_processing_default; diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index 1bf8789..bc2673d 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -142,8 +142,12 @@ break; } if (g_cfg->osmux_use != OSMUX_USAGE_OFF) { - vty_out(vty, " osmux bind-ip %s%s", - g_cfg->osmux_addr, VTY_NEWLINE); + if (g_cfg->osmux_addr_v4) + vty_out(vty, " osmux bind-ip %s%s", + g_cfg->osmux_addr_v4, VTY_NEWLINE); + if (g_cfg->osmux_addr_v6) + vty_out(vty, " osmux bind-ip-v6 %s%s", + g_cfg->osmux_addr_v6, VTY_NEWLINE); vty_out(vty, " osmux batch-factor %d%s", g_cfg->osmux_batch, VTY_NEWLINE); vty_out(vty, " osmux batch-size %u%s", @@ -1584,12 +1588,21 @@ DEFUN(cfg_mgcp_osmux_ip, cfg_mgcp_osmux_ip_cmd, - "osmux bind-ip " VTY_IPV46_CMD, + "osmux bind-ip " VTY_IPV4_CMD, OSMUX_STR IP_STR - "IPv4 Address to bind to\n" + "IPv4 Address to bind to\n") +{ + osmo_talloc_replace_string(g_cfg, &g_cfg->osmux_addr_v4, argv[0]); + return CMD_SUCCESS; +} + +DEFUN(cfg_mgcp_osmux_ip_v6, + cfg_mgcp_osmux_ip_v6_cmd, + "osmux bind-ip-v6 " VTY_IPV6_CMD, + OSMUX_STR IP_STR "IPv6 Address to bind to\n") { - osmo_strlcpy(g_cfg->osmux_addr, argv[0], sizeof(g_cfg->osmux_addr)); + osmo_talloc_replace_string(g_cfg, &g_cfg->osmux_addr_v6, argv[0]); return CMD_SUCCESS; } @@ -1718,6 +1731,7 @@ install_element(MGCP_NODE, &cfg_mgcp_no_sdp_payload_send_name_cmd); install_element(MGCP_NODE, &cfg_mgcp_osmux_cmd); install_element(MGCP_NODE, &cfg_mgcp_osmux_ip_cmd); + install_element(MGCP_NODE, &cfg_mgcp_osmux_ip_v6_cmd); install_element(MGCP_NODE, &cfg_mgcp_osmux_batch_factor_cmd); install_element(MGCP_NODE, &cfg_mgcp_osmux_batch_size_cmd); install_element(MGCP_NODE, &cfg_mgcp_osmux_port_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I446cd7da217e9f4a74995d7784ae55dcc60a29b7 Gerrit-Change-Number: 29614 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-mgw[master]: Get rid of separate rtp_port field
by fixeria 04 Oct '22

04 Oct '22

Attention is currently required from: pespin, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29589 ) Change subject: Get rid of separate rtp_port field ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I294eb5d85fae79bf62d36eb9e818426e187d442c Gerrit-Change-Number: 29589 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 15:56:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-mgw[master]: Get rid of separate rtp_port field
by fixeria 04 Oct '22

04 Oct '22

Attention is currently required from: pespin, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29589 ) Change subject: Get rid of separate rtp_port field ...................................................................... Patch Set 3: (1 comment) File include/osmocom/mgcp/mgcp_network.h: https://gerrit.osmocom.org/c/osmo-mgw/+/29589/comment/9fd26ea3_4b61802c PS3, Line 96: int rtp_port, rtcp_port > The rtcp_port can also be dropped completely, since it's basically rtp_port+1 in all cases. […] Fine with me then. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29589 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I294eb5d85fae79bf62d36eb9e818426e187d442c Gerrit-Change-Number: 29589 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 15:56: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

Change in osmo-bts[master]: osmo-bts-trx: handle MTS 0b0110 indicating an Access Burst
by pespin 04 Oct '22

04 Oct '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29578 ) Change subject: osmo-bts-trx: handle MTS 0b0110 indicating an Access Burst ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Why do you say the BTS has no prior knowledge on whether the 4 acces burst method is used? AFAIR that's being broadcasted by the BTS in CCCH? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0fbb63006797e6be386d1f76ed97fff098c036fc Gerrit-Change-Number: 29578 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 04 Oct 2022 15:22:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

2025

2024

2023

2022

gerrit-log October 2022