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

Change in docker-playground[master]: debian-buster-build: order pkgs alphabetically

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29728 ) Change subject: debian-buster-build: order pkgs alphabetically ...................................................................... debian-buster-build: order pkgs alphabetically Change-Id: I16da41b9bcb3d1137218b0ed5c2f6adf2a723fce --- M debian-buster-build/Dockerfile 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile index 80e5678..0d2b5b7 100644 --- a/debian-buster-build/Dockerfile +++ b/debian-buster-build/Dockerfile @@ -44,15 +44,15 @@ libortp-dev \ libpcap-dev \ libpcsclite-dev \ - libtalloc-dev \ - libtool \ libreadline-dev \ libsctp-dev \ libsofia-sip-ua-glib-dev \ libsqlite3-dev \ libssl-dev \ - libusb-dev \ + libtalloc-dev \ + libtool \ libusb-1.0-0-dev \ + libusb-dev \ make \ pkg-config \ sqlite3 \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I16da41b9bcb3d1137218b0ed5c2f6adf2a723fce Gerrit-Change-Number: 29728 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in docker-playground[master]: debian-buster-build: add LLVMEmbeddedToolchainForArm

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/29729 ) Change subject: debian-buster-build: add LLVMEmbeddedToolchainForArm ...................................................................... debian-buster-build: add LLVMEmbeddedToolchainForArm This is needed for simtrace2. As the bootloader goes beyond partition size in modern gcc, we'll use clang instead. Related: OS#5260 Related: simtrace2 I2aa2e20e75e334560dbe1f6db9fd1491873ff91f Change-Id: Ib82a53fa7edc62d21e772efbb9b2c049d1b50c4d --- M debian-buster-build/Dockerfile 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile index 0d2b5b7..a22a3bf 100644 --- a/debian-buster-build/Dockerfile +++ b/debian-buster-build/Dockerfile @@ -6,6 +6,9 @@ ARG OSMOCOM_REPO_PATH="packages/osmocom:" ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/nightly/Debian_10/" +# LLVM-embedded-toolchain-for-Arm version +ARG LLVM_VERSION="14.0.0" + RUN apt-get update && \ apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ @@ -50,6 +53,7 @@ libsqlite3-dev \ libssl-dev \ libtalloc-dev \ + libtinfo5 \ libtool \ libusb-1.0-0-dev \ libusb-dev \ @@ -61,6 +65,14 @@ wget && \ apt-get clean +RUN set -x && \ + wget -q https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/do… && \ + tar -xf LLVMEmbeddedToolchainForArm-${LLVM_VERSION}-linux.tar.gz && \ + rm LLVMEmbeddedToolchainForArm-${LLVM_VERSION}-linux.tar.gz && \ + mv LLVMEmbeddedToolchainForArm-${LLVM_VERSION} /opt/llvm-arm && \ + /opt/llvm-arm/bin/clang --version && \ + /opt/llvm-arm/bin/clang --print-targets + # Make respawn.sh part of this image, so it can be used by other images based on it COPY .common/respawn.sh /usr/local/bin/respawn.sh -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29729 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib82a53fa7edc62d21e772efbb9b2c049d1b50c4d Gerrit-Change-Number: 29729 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-pcu[master]: Fix typo in log message

by pespin

pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29718 ) Change subject: Fix typo in log message ...................................................................... Removed Code-Review+2 by pespin <pespin(a)sysmocom.de> -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I29a290d1e8b6e237a74ac8fab8dd5e5e5db71796 Gerrit-Change-Number: 29718 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: deleteVote

2 years, 8 months

1
0
0 0

Change in osmo-pcu[master]: Fix typo in log message

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29718 ) Change subject: Fix typo in log message ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I29a290d1e8b6e237a74ac8fab8dd5e5e5db71796 Gerrit-Change-Number: 29718 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Oct 2022 11:48:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: cosmetic: Fix typo in comment

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29731 ) Change subject: cosmetic: Fix typo in comment ...................................................................... cosmetic: Fix typo in comment Change-Id: I6b0fcd7ee13e0e712d47741258f83a6f98503e27 --- M src/libosmo-mgcp-client/mgcp_client_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index 4bf6cd0..88b056b 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -35,7 +35,7 @@ #define MGW_STR MGCP_CLIENT_MGW_STR -/* Only common (non-pooled) VTY connands will use this talloc context. All +/* Only common (non-pooled) VTY commands will use this talloc context. All * pooled VTY commands will use the pool (global_mgcp_client_pool) as * talloc context. */ static void *global_mgcp_client_ctx = NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6b0fcd7ee13e0e712d47741258f83a6f98503e27 Gerrit-Change-Number: 29731 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Introduce osmux peer-behind-nat (on|off) and rework conn activ...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29659 ) Change subject: osmux: Introduce osmux peer-behind-nat (on|off) and rework conn activation ...................................................................... osmux: Introduce osmux peer-behind-nat (on|off) and rework conn activation Change-Id: I7654ddf51d197a4107e55f4e406053b2e4a02f83 --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/osmux.h M src/libosmo-mgcp/mgcp_osmux.c M src/libosmo-mgcp/mgcp_protocol.c M src/libosmo-mgcp/mgcp_vty.c 5 files changed, 142 insertions(+), 51 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index c6d628e..a48dec8 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -173,6 +173,8 @@ uint16_t osmux_port; /* Pad circuit with dummy AMR frames if no payload to transmit is available */ bool osmux_dummy; + /* Whether peer is behind NAT (Retrieve remote addr from 1st received Osmux packet) */ + bool osmux_peer_behind_nat; /* domain name of the media gateway */ char domain[255+1]; diff --git a/include/osmocom/mgcp/osmux.h b/include/osmocom/mgcp/osmux.h index be5ee6a..044a33f 100644 --- a/include/osmocom/mgcp/osmux.h +++ b/include/osmocom/mgcp/osmux.h @@ -1,5 +1,7 @@ #pragma once +#include <stdint.h> + #include <osmocom/core/socket.h> #include <osmocom/netif/osmux.h> @@ -12,6 +14,7 @@ int osmux_init_conn(struct mgcp_conn_rtp *conn); int conn_osmux_enable(struct mgcp_conn_rtp *conn); void conn_osmux_disable(struct mgcp_conn_rtp *conn); +int conn_osmux_event_rx_crcx_mdcx(struct mgcp_conn_rtp *conn); int osmux_xfrm_to_osmux(char *buf, int buf_len, struct mgcp_conn_rtp *conn); int osmux_send_dummy(struct mgcp_conn_rtp *conn); diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index e20868b..f0d9e15 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -264,18 +264,34 @@ if (!mgcp_conn_rtp_is_osmux(conn_rtp)) continue; - /* Current implementation sets remote address & port for - * the conn based on src address received on the socket - * for the CID, in order to workaround NATs. - * Once the conn is fully established (remote address is - * known), validate the remote address doesn't change: */ + /* If Osmux peer is behind NAT: + * + state OSMUX_STATE_ACTIVATING: we cannot validate the remote address & port for + * the conn since we actually set conn's remote IP address from the info we received + * from this source address. NOTE: This means if Osmux peer is behind NAT we cannot + * have more than 1 osmux trunk since it's not possible to differentiate based on + * remote address. + * + state OSMUX_STATE_ENABLED: the conn is fully established (remote address is known), + * it is now posssible to validate the remote address doesn't change. + * If Osmux peer is not behind NAT: + * We can always validate the remote IP address is matching the one we received in + * CRCX/MDCX, we can support several parallel Osmux trunks since we can differentiate same CID + * based on remote IP addr+port. However, if Osmux peer is not behind NAT it means it will go + * into OSMUX_STATE_ENABLED as soon as the remote address is known, meaning if the conn is not + * in that state we cannot (nor want) validate the IP address, we want to skip it until it is + * ready (to avoid 3rd party data injections). + * TLDR: When in OSMUX_STATE_ENABLED we can always validate remote address+port. + * When in OSMUX_STATE_ACTIVATING, in case peer behind NAT we select it, + * in case peer NOT behind NAT we skip it. + */ if (conn_rtp->osmux.state == OSMUX_STATE_ENABLED) { h = osmux_xfrm_input_get_deliver_cb_data(conn_rtp->osmux.in); if (osmo_sockaddr_cmp(&h->rem_addr, rem_addr) != 0) continue; - } - /* else: select based on CID only, to learn rem addr in NAT-based scenarios. - * FIXME: This should be configurable, have some sort of "osmux nat (on|off)" */ + } else if (!trunk->cfg->osmux_peer_behind_nat) { + LOGPCONN(conn, DOSMUX, LOGL_DEBUG, "osmux_conn_lookup(rem_addr=%s local_cid=%d): Skipping because not (yet) ENABLED\n", + osmo_sockaddr_to_str(rem_addr), local_cid); + continue; /* skip, read above */ + } /* else: continue CID validation below: */ if (conn_rtp->osmux.local_cid == local_cid) return conn_rtp; @@ -326,36 +342,78 @@ return msg; } -/* Updates conn osmux state and returns 0 if it can process messages, -1 otherwise */ -static int conn_osmux_state_check(struct mgcp_conn_rtp *conn, - bool sending) +/* To be called every time some AMR data is received on a connection + * returns: 0 if conn can process data, negative if an error ocurred and data should not be further processed */ +static int conn_osmux_event_data_received(struct mgcp_conn_rtp *conn, const struct osmo_sockaddr *rem_addr) { + const struct mgcp_config *cfg; switch(conn->osmux.state) { case OSMUX_STATE_ACTIVATING: + /* If peer is not behind NAT, transition to OSMUX_STATE_ENABLED is done through + * conn_osmux_rx_mdcx() whenever a CRCX/MDCX with the remote address is received. + */ + cfg = conn->conn->endp->trunk->cfg; + if (!cfg->osmux_peer_behind_nat) { + /* osmux_conn_lookup() should never provide us with an + * ACTIVATING conn without NAT in first place. This should never happen. */ + LOGPCONN(conn->conn, DOSMUX, LOGL_ERROR, + "Unexpected rx osmux data for conn in ACTIVATING state without NAT\n"); + return -1; + } + /* We have to wait until we received the remote CID from CRCX/MDCX. */ + if (!conn->osmux.remote_cid_present) + return -1; + + /* Update remote address with the src address of the package we received */ + conn->end.addr = *rem_addr; + /* mgcp_rtp_end_remote_addr_available() is now true and we can enable the conn: */ if (conn_osmux_enable(conn) < 0) { LOGPCONN(conn->conn, DOSMUX, LOGL_ERROR, - "Could not enable osmux for conn on %s: %s\n", - sending ? "sent" : "received", + "Could not enable osmux conn: %s\n", mgcp_conn_dump(conn->conn)); return -1; } - LOGPCONN(conn->conn, DOSMUX, LOGL_INFO, - "Osmux %s CID %u towards %s is now enabled\n", - sending ? "sent" : "received", - sending ? conn->osmux.remote_cid : conn->osmux.local_cid, - osmo_sockaddr_to_str(&conn->end.addr)); return 0; case OSMUX_STATE_ENABLED: return 0; default: - LOGPCONN(conn->conn, DOSMUX, LOGL_ERROR, - "Osmux %s in conn %s without full negotiation, state %d\n", - sending ? "sent" : "received", - mgcp_conn_dump(conn->conn), conn->osmux.state); return -1; } } +/* To be called every time an CRCX/MDCX is received. + * returns: 0 if conn can continue, negative if an error ocurred during setup */ +int conn_osmux_event_rx_crcx_mdcx(struct mgcp_conn_rtp *conn) +{ + struct mgcp_config *cfg; + + switch (conn->osmux.state) { + case OSMUX_STATE_ACTIVATING: + /* If peer is behind NAT, we have to wait until 1st osmux frame is received + * to discover peer's real remote address */ + cfg = conn->conn->endp->trunk->cfg; + if (cfg->osmux_peer_behind_nat) + return 0; + /* Keep waiting to receive remote CID through CRCX/MDCX */ + if (!conn->osmux.remote_cid_present) + return 0; + /* keep waiting to receive remote address through CRCX/MDCX */ + if (!mgcp_rtp_end_remote_addr_available(&conn->end)) + return 0; + /* Since the peer is not behind NAT, we can enable the conn right away since the proper + * remote address is now known: */ + if (conn_osmux_enable(conn) < 0) + return -1; + /* We have already transitioned to OSMUX_STATE_ENABLED here */ + return 0; + case OSMUX_STATE_ENABLED: + return 0; + default: + OSMO_ASSERT(NULL); + } + return 0; +} + /* Old versions of osmux used to send dummy packets [0x23 0x<CID>] to punch the * hole in the NAT. Let's handle them speficially. */ static int osmux_handle_legacy_dummy(const struct mgcp_trunk *trunk, const struct osmo_sockaddr *rem_addr, @@ -371,7 +429,7 @@ goto out; } - conn_osmux_state_check(conn, false); + conn_osmux_event_data_received(conn, rem_addr); /* Only needed to punch hole in firewall, it can be dropped */ out: msgb_free(msg); @@ -416,17 +474,19 @@ LOGP(DOSMUX, LOGL_DEBUG, "Cannot find a src conn for %s CID=%d\n", addr_str, osmuxh->circuit_id); - rem = msg->len; - continue; + goto next; } + + if (conn_osmux_event_data_received(conn_src, &rem_addr) < 0) + goto next; + mgcp_conn_watchdog_kick(conn_src->conn); - if (conn_osmux_state_check(conn_src, false) == 0) { - rtpconn_osmux_rate_ctr_inc(conn_src, OSMUX_CHUNKS_RX_CTR); - rtpconn_osmux_rate_ctr_add(conn_src, OSMUX_OCTETS_RX_CTR, - osmux_chunk_length(msg, rem)); - osmux_xfrm_output_sched(conn_src->osmux.out, osmuxh); - } + rtpconn_osmux_rate_ctr_inc(conn_src, OSMUX_CHUNKS_RX_CTR); + rtpconn_osmux_rate_ctr_add(conn_src, OSMUX_OCTETS_RX_CTR, + osmux_chunk_length(msg, rem)); + osmux_xfrm_output_sched(conn_src->osmux.out, osmuxh); +next: rem = msg->len; } out: @@ -535,6 +595,8 @@ * \returns 0 on success, -1 on ERROR */ int conn_osmux_enable(struct mgcp_conn_rtp *conn) { + OSMO_ASSERT(conn->osmux.state == OSMUX_STATE_ACTIVATING); + OSMO_ASSERT(conn->osmux.remote_cid_present == true); /*! If osmux is enabled, initialize the output handler. This handler is * used to reconstruct the RTP flow from osmux. The RTP SSRC is * allocated based on the circuit ID (conn_net->osmux.cid), which is unique @@ -548,15 +610,8 @@ static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 1); bool osmux_dummy = trunk->cfg->osmux_dummy; - /* Check if osmux is enabled for the specified connection */ - if (conn->osmux.state != OSMUX_STATE_ACTIVATING) { - LOGPCONN(conn->conn, DOSMUX, LOGL_ERROR, - "conn:%s didn't negotiate Osmux, state %d\n", - mgcp_conn_dump(conn->conn), conn->osmux.state); - return -1; - } - - /* Wait until we have the connection information from MDCX */ + /* Wait until we have the remote connection information, be it from MDCX (peer not behind NAT) + * or later learned from first received remote osmux packet (peer behind NAT) */ if (!mgcp_rtp_end_remote_addr_available(&conn->end)) { LOGPCONN(conn->conn, DOSMUX, LOGL_INFO, "Osmux remote address/port still unknown\n"); @@ -586,7 +641,10 @@ scheduled_from_osmux_tx_rtp_cb, conn); conn->osmux.state = OSMUX_STATE_ENABLED; - + LOGPCONN(conn->conn, DOSMUX, LOGL_INFO, + "Osmux CID %u towards %s is now enabled\n", + conn->osmux.remote_cid, + osmo_sockaddr_to_str(&conn->end.addr)); return 0; } @@ -638,10 +696,6 @@ * endpoint may have already punched the hole in the firewall. This * approach is simple though. */ - - if (conn_osmux_state_check(conn, true) < 0) - return 0; - buf_len = sizeof(struct osmux_hdr) + osmo_amr_bytes(AMR_FT_0); osmuxh = (struct osmux_hdr *) alloca(buf_len); memset(osmuxh, 0, buf_len); diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index fdac665..f3ebe60 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -1086,6 +1086,14 @@ goto error2; } + /* Notify Osmux conn that CRCX was received */ + if (mgcp_conn_rtp_is_osmux(conn)) { + if (conn_osmux_event_rx_crcx_mdcx(conn) < 0) { + LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR, "CRCX: Osmux handling failed!\n"); + goto error2; + } + } + LOGPCONN(conn->conn, DLMGCP, LOGL_DEBUG, "CRCX: Creating connection: port: %u\n", conn->end.local_port); @@ -1271,13 +1279,19 @@ "MDCX: wilcard in MDCX is not supported!\n"); goto error3; } else if (conn->osmux.remote_cid_present && - remote_osmux_cid != (int) conn->osmux.remote_cid) { - LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR, - "MDCX: changing already allocated CID is not supported!\n"); - goto error3; + remote_osmux_cid != conn->osmux.remote_cid) { + LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR, + "MDCX: changing already allocated CID is not supported!\n"); + goto error3; + } else { + conn->osmux.remote_cid_present = true; + conn->osmux.remote_cid = remote_osmux_cid; + if (conn_osmux_event_rx_crcx_mdcx(conn) < 0) { + LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR, + "MDCX: Osmux handling failed!\n"); + goto error3; + } } - conn->osmux.remote_cid_present = true; - conn->osmux.remote_cid = remote_osmux_cid; } /* MDCX may have provided a new remote address, which means we may need diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index a3af94a..faa6479 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -156,6 +156,8 @@ g_cfg->osmux_port, VTY_NEWLINE); vty_out(vty, " osmux dummy %s%s", g_cfg->osmux_dummy ? "on" : "off", VTY_NEWLINE); + vty_out(vty, " osmux peer-behind-nat %s%s", + g_cfg->osmux_peer_behind_nat ? "on" : "off", VTY_NEWLINE); } if (g_cfg->conn_timeout) @@ -1646,6 +1648,21 @@ return CMD_SUCCESS; } +DEFUN(cfg_mgcp_osmux_peer_behind_nat, + cfg_mgcp_osmux_peer_behind_nat_cmd, + "osmux peer-behind-nat (on|off)", + OSMUX_STR "Define whether peer is behind NAT\n" + "Peer is behind NAT\n" + "Peer is NOT behind NAT\n") +{ + if (strcmp(argv[0], "on") == 0) + g_cfg->osmux_peer_behind_nat = true; + else if (strcmp(argv[0], "off") == 0) + g_cfg->osmux_peer_behind_nat = false; + + return CMD_SUCCESS; +} + DEFUN(cfg_mgcp_domain, cfg_mgcp_domain_cmd, "domain NAME", @@ -1736,6 +1753,7 @@ install_element(MGCP_NODE, &cfg_mgcp_osmux_batch_size_cmd); install_element(MGCP_NODE, &cfg_mgcp_osmux_port_cmd); install_element(MGCP_NODE, &cfg_mgcp_osmux_dummy_cmd); + install_element(MGCP_NODE, &cfg_mgcp_osmux_peer_behind_nat_cmd); install_element(MGCP_NODE, &cfg_mgcp_allow_transcoding_cmd); install_element(MGCP_NODE, &cfg_mgcp_no_allow_transcoding_cmd); install_element(MGCP_NODE, &cfg_mgcp_domain_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I7654ddf51d197a4107e55f4e406053b2e4a02f83 Gerrit-Change-Number: 29659 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Clean up mgcp_config osmux fields

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29725 ) Change subject: osmux: Clean up mgcp_config osmux fields ...................................................................... osmux: Clean up mgcp_config osmux fields * Move all of them to an anonymous "osmux" substruct to have them all together. * Rename some fields to clarify its meanings, similar to what was already done in osmo-bts. * Move the port VTY config next to the ip address ones. Change-Id: Icc1c1ce3ab3a8beb941cda7c112485a0db882a90 --- M include/osmocom/mgcp/mgcp.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_sdp.c M src/libosmo-mgcp/mgcp_stat.c M src/libosmo-mgcp/mgcp_vty.c 7 files changed, 81 insertions(+), 79 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index a48dec8..224d756 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -157,24 +157,26 @@ enum mgcp_role role; - /* Osmux usage policy: */ - enum osmux_usage osmux_use; - /* addr to bind the server to */ - char *osmux_addr_v4; - char *osmux_addr_v6; - /* The osmux socket is allocated on demand (1st time used). - * This tells us if the osmux socket is already initialized. */ - bool osmux_initialized; - /* osmux batch factor: from 1 to 4 maximum */ - int osmux_batch; - /* osmux batch size (in bytes) */ - int osmux_batch_size; - /* osmux port */ - uint16_t osmux_port; - /* Pad circuit with dummy AMR frames if no payload to transmit is available */ - bool osmux_dummy; - /* Whether peer is behind NAT (Retrieve remote addr from 1st received Osmux packet) */ - bool osmux_peer_behind_nat; + struct { + /* Osmux usage policy: */ + enum osmux_usage usage; + /* addr to bind the server to */ + char *local_addr_v4; + char *local_addr_v6; + /* osmux port */ + uint16_t local_port; + /* The osmux socket is allocated on demand (1st time used). + * This tells us if the osmux socket is already initialized. */ + bool initialized; + /* osmux batch factor: from 1 to 4 maximum */ + int batch_factor; + /* osmux batch size (in bytes) */ + int batch_size; + /* Pad circuit with dummy AMR frames if no payload to transmit is available */ + bool dummy_padding; + /* Whether peer is behind NAT (Retrieve remote addr from 1st received Osmux packet) */ + bool peer_behind_nat; + } osmux; /* domain name of the media gateway */ char domain[255+1]; diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index 781bb44..3981975 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -102,19 +102,19 @@ if (rem_addr_set) { /* Match IP version with what was requested from remote: */ bind_addr = conn->end.addr.u.sa.sa_family == AF_INET6 ? - cfg->osmux_addr_v6 : - cfg->osmux_addr_v4; + cfg->osmux.local_addr_v6 : + cfg->osmux.local_addr_v4; } else { /* Choose any of the bind addresses, preferring v6 over v4 if available: */ - bind_addr = cfg->osmux_addr_v6; + bind_addr = cfg->osmux.local_addr_v6; if (!bind_addr) - bind_addr = cfg->osmux_addr_v4; + bind_addr = cfg->osmux.local_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", - !!cfg->osmux_addr_v4, - !!cfg->osmux_addr_v6, + !!cfg->osmux.local_addr_v4, + !!cfg->osmux.local_addr_v6, rem_addr_set ? osmo_sockaddr_ntop(&conn->end.addr.u.sa, ipbuf) : "no"); return -1; } diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index f0d9e15..0fd1ba7 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -169,9 +169,9 @@ } /* sequence number to start OSMUX message from */ osmux_xfrm_input_set_initial_seqnum(h->in, 0); - osmux_xfrm_input_set_batch_factor(h->in, cfg->osmux_batch); + osmux_xfrm_input_set_batch_factor(h->in, cfg->osmux.batch_factor); /* If batch size is zero, the library defaults to 1472 bytes. */ - osmux_xfrm_input_set_batch_size(h->in, cfg->osmux_batch_size); + osmux_xfrm_input_set_batch_size(h->in, cfg->osmux.batch_size); osmux_xfrm_input_set_deliver_cb(h->in, osmux_deliver_cb, h); llist_add(&h->head, &osmux_handle_list); @@ -287,7 +287,7 @@ h = osmux_xfrm_input_get_deliver_cb_data(conn_rtp->osmux.in); if (osmo_sockaddr_cmp(&h->rem_addr, rem_addr) != 0) continue; - } else if (!trunk->cfg->osmux_peer_behind_nat) { + } else if (!trunk->cfg->osmux.peer_behind_nat) { LOGPCONN(conn, DOSMUX, LOGL_DEBUG, "osmux_conn_lookup(rem_addr=%s local_cid=%d): Skipping because not (yet) ENABLED\n", osmo_sockaddr_to_str(rem_addr), local_cid); continue; /* skip, read above */ @@ -353,7 +353,7 @@ * conn_osmux_rx_mdcx() whenever a CRCX/MDCX with the remote address is received. */ cfg = conn->conn->endp->trunk->cfg; - if (!cfg->osmux_peer_behind_nat) { + if (!cfg->osmux.peer_behind_nat) { /* osmux_conn_lookup() should never provide us with an * ACTIVATING conn without NAT in first place. This should never happen. */ LOGPCONN(conn->conn, DOSMUX, LOGL_ERROR, @@ -392,7 +392,7 @@ /* If peer is behind NAT, we have to wait until 1st osmux frame is received * to discover peer's real remote address */ cfg = conn->conn->endp->trunk->cfg; - if (cfg->osmux_peer_behind_nat) + if (cfg->osmux.peer_behind_nat) return 0; /* Keep waiting to receive remote CID through CRCX/MDCX */ if (!conn->osmux.remote_cid_present) @@ -454,7 +454,7 @@ rate_ctr_inc(rate_ctr_group_get_ctr(all_rtp_stats, OSMUX_PACKETS_RX_CTR)); osmo_sockaddr_to_str_buf(addr_str, sizeof(addr_str), &rem_addr); - if (trunk->cfg->osmux_use == OSMUX_USAGE_OFF) { + if (trunk->cfg->osmux.usage == OSMUX_USAGE_OFF) { LOGP(DOSMUX, LOGL_ERROR, "Peer %s wants to use Osmux but MGCP Client did not request it\n", addr_str); @@ -505,12 +505,12 @@ 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); - if (cfg->osmux_addr_v4) { - ret = mgcp_create_bind(cfg->osmux_addr_v4, &osmux_fd_v4, cfg->osmux_port, + if (cfg->osmux.local_addr_v4) { + ret = mgcp_create_bind(cfg->osmux.local_addr_v4, &osmux_fd_v4, cfg->osmux.local_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); + cfg->osmux.local_addr_v4, cfg->osmux.local_port); return ret; } @@ -523,12 +523,12 @@ 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, + if (cfg->osmux.local_addr_v6) { + ret = mgcp_create_bind(cfg->osmux.local_addr_v6, &osmux_fd_v6, cfg->osmux.local_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); + cfg->osmux.local_addr_v6, cfg->osmux.local_port); return ret; } @@ -541,7 +541,7 @@ LOGP(DOSMUX, LOGL_INFO, "OSMUX IPv6 socket listening on %s\n", osmo_sock_get_name2(osmux_fd_v6.fd)); } - cfg->osmux_initialized = true; + cfg->osmux.initialized = true; return 0; } @@ -608,7 +608,7 @@ */ const struct mgcp_trunk *trunk = conn->conn->endp->trunk; static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 1); - bool osmux_dummy = trunk->cfg->osmux_dummy; + bool osmux_dummy = trunk->cfg->osmux.dummy_padding; /* Wait until we have the remote connection information, be it from MDCX (peer not behind NAT) * or later learned from first received remote osmux packet (peer behind NAT) */ diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index f3ebe60..77c99f3 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -745,7 +745,7 @@ */ static int mgcp_osmux_setup(struct mgcp_endpoint *endp, const char *line) { - if (!endp->trunk->cfg->osmux_initialized) { + if (!endp->trunk->cfg->osmux.initialized) { if (osmux_init(endp->trunk) < 0) { LOGPENDP(endp, DOSMUX, LOGL_ERROR, "Cannot init OSMUX\n"); return -3; @@ -898,7 +898,7 @@ case 'X': if (strncasecmp("Osmux: ", line + 2, strlen("Osmux: ")) == 0) { /* If osmux is disabled, just skip setting it up */ - if (rq->endp->trunk->cfg->osmux_use == OSMUX_USAGE_OFF) + if (rq->endp->trunk->cfg->osmux.usage == OSMUX_USAGE_OFF) break; remote_osmux_cid = mgcp_osmux_setup(endp, line); break; @@ -1013,7 +1013,7 @@ conn->osmux.remote_cid_present = true; conn->osmux.remote_cid = remote_osmux_cid; } - } else if (endp->trunk->cfg->osmux_use == OSMUX_USAGE_ONLY) { + } else if (endp->trunk->cfg->osmux.usage == OSMUX_USAGE_ONLY) { LOGPCONN(_conn, DLMGCP, LOGL_ERROR, "CRCX: osmux only and no osmux offered\n"); rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_NO_OSMUX)); @@ -1190,7 +1190,7 @@ case 'X': if (strncasecmp("Osmux: ", line + 2, strlen("Osmux: ")) == 0) { /* If osmux is disabled, just skip setting it up */ - if (endp->trunk->cfg->osmux_use == OSMUX_USAGE_OFF) + if (endp->trunk->cfg->osmux.usage == OSMUX_USAGE_OFF) break; remote_osmux_cid = mgcp_osmux_setup(endp, line); break; diff --git a/src/libosmo-mgcp/mgcp_sdp.c b/src/libosmo-mgcp/mgcp_sdp.c index 1414cf9..ad2da7f 100644 --- a/src/libosmo-mgcp/mgcp_sdp.c +++ b/src/libosmo-mgcp/mgcp_sdp.c @@ -601,7 +601,7 @@ payload_types[0] = payload_type; if (mgcp_conn_rtp_is_osmux(conn)) - local_port = endp->trunk->cfg->osmux_port; + local_port = endp->trunk->cfg->osmux.local_port; else local_port = conn->end.local_port; rc = add_audio(sdp, payload_types, 1, local_port); diff --git a/src/libosmo-mgcp/mgcp_stat.c b/src/libosmo-mgcp/mgcp_stat.c index acc9419..c66ce6b 100644 --- a/src/libosmo-mgcp/mgcp_stat.c +++ b/src/libosmo-mgcp/mgcp_stat.c @@ -99,7 +99,7 @@ str += nchars; str_len -= nchars; - if (conn->conn->endp->trunk->cfg->osmux_use != OSMUX_USAGE_OFF) { + if (conn->conn->endp->trunk->cfg->osmux.usage != OSMUX_USAGE_OFF) { /* Error Counter */ nchars = snprintf(str, str_len, "\r\nX-Osmo-CP: EC TI=%" PRIu64 ", TO=%" PRIu64, diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index faa6479..e404fb5 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -129,7 +129,7 @@ vty_out(vty, " rtp force-ptime %d%s", g_cfg->force_ptime, VTY_NEWLINE); - switch (g_cfg->osmux_use) { + switch (g_cfg->osmux.usage) { case OSMUX_USAGE_ON: vty_out(vty, " osmux on%s", VTY_NEWLINE); break; @@ -141,23 +141,23 @@ vty_out(vty, " osmux off%s", VTY_NEWLINE); break; } - if (g_cfg->osmux_use != OSMUX_USAGE_OFF) { - if (g_cfg->osmux_addr_v4) + if (g_cfg->osmux.usage != OSMUX_USAGE_OFF) { + if (g_cfg->osmux.local_addr_v4) vty_out(vty, " osmux bind-ip %s%s", - g_cfg->osmux_addr_v4, VTY_NEWLINE); - if (g_cfg->osmux_addr_v6) + g_cfg->osmux.local_addr_v4, VTY_NEWLINE); + if (g_cfg->osmux.local_addr_v6) vty_out(vty, " osmux bind-ip-v6 %s%s", - g_cfg->osmux_addr_v6, VTY_NEWLINE); + g_cfg->osmux.local_addr_v6, VTY_NEWLINE); vty_out(vty, " osmux batch-factor %d%s", - g_cfg->osmux_batch, VTY_NEWLINE); + g_cfg->osmux.batch_factor, VTY_NEWLINE); vty_out(vty, " osmux batch-size %u%s", - g_cfg->osmux_batch_size, VTY_NEWLINE); + g_cfg->osmux.batch_size, VTY_NEWLINE); vty_out(vty, " osmux port %u%s", - g_cfg->osmux_port, VTY_NEWLINE); + g_cfg->osmux.local_port, VTY_NEWLINE); vty_out(vty, " osmux dummy %s%s", - g_cfg->osmux_dummy ? "on" : "off", VTY_NEWLINE); + g_cfg->osmux.dummy_padding ? "on" : "off", VTY_NEWLINE); vty_out(vty, " osmux peer-behind-nat %s%s", - g_cfg->osmux_peer_behind_nat ? "on" : "off", VTY_NEWLINE); + g_cfg->osmux.peer_behind_nat ? "on" : "off", VTY_NEWLINE); } if (g_cfg->conn_timeout) @@ -380,7 +380,7 @@ llist_for_each_entry(trunk, &g_cfg->trunks, entry) dump_trunk(vty, trunk, show_stats, active_only); - if (g_cfg->osmux_use != OSMUX_USAGE_OFF) + if (g_cfg->osmux.usage != OSMUX_USAGE_OFF) vty_out(vty, "Osmux used CID: %d%s", osmux_cid_pool_count_used(), VTY_NEWLINE); @@ -1577,12 +1577,12 @@ OSMO_ASSERT(trunk); if (strcmp(argv[0], "off") == 0) { - g_cfg->osmux_use = OSMUX_USAGE_OFF; + g_cfg->osmux.usage = OSMUX_USAGE_OFF; return CMD_SUCCESS; } else if (strcmp(argv[0], "on") == 0) - g_cfg->osmux_use = OSMUX_USAGE_ON; + g_cfg->osmux.usage = OSMUX_USAGE_ON; else if (strcmp(argv[0], "only") == 0) - g_cfg->osmux_use = OSMUX_USAGE_ONLY; + g_cfg->osmux.usage = OSMUX_USAGE_ONLY; return CMD_SUCCESS; @@ -1594,7 +1594,7 @@ OSMUX_STR IP_STR "IPv4 Address to bind to\n") { - osmo_talloc_replace_string(g_cfg, &g_cfg->osmux_addr_v4, argv[0]); + osmo_talloc_replace_string(g_cfg, &g_cfg->osmux.local_addr_v4, argv[0]); return CMD_SUCCESS; } @@ -1604,7 +1604,15 @@ OSMUX_STR IP_STR "IPv6 Address to bind to\n") { - osmo_talloc_replace_string(g_cfg, &g_cfg->osmux_addr_v6, argv[0]); + osmo_talloc_replace_string(g_cfg, &g_cfg->osmux.local_addr_v6, argv[0]); + return CMD_SUCCESS; +} + +DEFUN(cfg_mgcp_osmux_port, + cfg_mgcp_osmux_port_cmd, + "osmux port <1-65535>", OSMUX_STR "port\n" "UDP port\n") +{ + g_cfg->osmux.local_port = atoi(argv[0]); return CMD_SUCCESS; } @@ -1613,7 +1621,7 @@ "osmux batch-factor <1-8>", OSMUX_STR "Batching factor\n" "Number of messages in the batch\n") { - g_cfg->osmux_batch = atoi(argv[0]); + g_cfg->osmux.batch_factor = atoi(argv[0]); return CMD_SUCCESS; } @@ -1622,15 +1630,7 @@ "osmux batch-size <1-65535>", OSMUX_STR "batch size\n" "Batch size in bytes\n") { - g_cfg->osmux_batch_size = atoi(argv[0]); - return CMD_SUCCESS; -} - -DEFUN(cfg_mgcp_osmux_port, - cfg_mgcp_osmux_port_cmd, - "osmux port <1-65535>", OSMUX_STR "port\n" "UDP port\n") -{ - g_cfg->osmux_port = atoi(argv[0]); + g_cfg->osmux.batch_size = atoi(argv[0]); return CMD_SUCCESS; } @@ -1641,9 +1641,9 @@ "Disable dummy padding\n") { if (strcmp(argv[0], "on") == 0) - g_cfg->osmux_dummy = true; + g_cfg->osmux.dummy_padding = true; else if (strcmp(argv[0], "off") == 0) - g_cfg->osmux_dummy = false; + g_cfg->osmux.dummy_padding = false; return CMD_SUCCESS; } @@ -1656,9 +1656,9 @@ "Peer is NOT behind NAT\n") { if (strcmp(argv[0], "on") == 0) - g_cfg->osmux_peer_behind_nat = true; + g_cfg->osmux.peer_behind_nat = true; else if (strcmp(argv[0], "off") == 0) - g_cfg->osmux_peer_behind_nat = false; + g_cfg->osmux.peer_behind_nat = false; return CMD_SUCCESS; } @@ -1749,9 +1749,9 @@ 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_port_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); install_element(MGCP_NODE, &cfg_mgcp_osmux_dummy_cmd); install_element(MGCP_NODE, &cfg_mgcp_osmux_peer_behind_nat_cmd); install_element(MGCP_NODE, &cfg_mgcp_allow_transcoding_cmd); @@ -1798,9 +1798,9 @@ int rc; struct mgcp_trunk *trunk; - cfg->osmux_port = OSMUX_DEFAULT_PORT; - cfg->osmux_batch = 4; - cfg->osmux_batch_size = OSMUX_BATCH_DEFAULT_MAX; + cfg->osmux.local_port = OSMUX_DEFAULT_PORT; + cfg->osmux.batch_factor = 4; + cfg->osmux.batch_size = OSMUX_BATCH_DEFAULT_MAX; g_cfg = cfg; rc = vty_read_config_file(config_file, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icc1c1ce3ab3a8beb941cda7c112485a0db882a90 Gerrit-Change-Number: 29725 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Clean up mgcp_config osmux fields

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29725 ) Change subject: osmux: Clean up mgcp_config osmux fields ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icc1c1ce3ab3a8beb941cda7c112485a0db882a90 Gerrit-Change-Number: 29725 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Oct 2022 11:48:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: osmux: Introduce osmux peer-behind-nat (on|off) and rework conn activ...

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29659 ) Change subject: osmux: Introduce osmux peer-behind-nat (on|off) and rework conn activation ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I7654ddf51d197a4107e55f4e406053b2e4a02f83 Gerrit-Change-Number: 29659 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 13 Oct 2022 11:48:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-bsc[master]: cosmetic: Fix whitespace indentation

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29732 ) Change subject: cosmetic: Fix whitespace indentation ...................................................................... cosmetic: Fix whitespace indentation Change-Id: I7d713872220e665e126dee670cdd77f7eb44eba4 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 61a1559..fd5382f 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -3455,7 +3455,7 @@ install_element(GSMNET_NODE, &cfg_net_nri_null_del_cmd); bts_vty_init(); - mgcp_client_pool_vty_init(GSMNET_NODE, MGW_NODE, " ", vty_global_gsm_network->mgw.mgw_pool); + mgcp_client_pool_vty_init(GSMNET_NODE, MGW_NODE, " ", vty_global_gsm_network->mgw.mgw_pool); install_element(ENABLE_NODE, &drop_bts_cmd); install_element(ENABLE_NODE, &restart_bts_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7d713872220e665e126dee670cdd77f7eb44eba4 Gerrit-Change-Number: 29732 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022