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

Change in osmo-bts[master]: osmo-bts-trx: respond to tx-attenuation config in real time.

by keith

Attention is currently required from: pespin, fixeria. keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29649 ) Change subject: osmo-bts-trx: respond to tx-attenuation config in real time. ...................................................................... Patch Set 5: (1 comment) File src/osmo-bts-trx/trx_vty.c: https://gerrit.osmocom.org/c/osmo-bts/+/29649/comment/bbf65aca_3ef0176a PS4, Line 397: DEFUN > Ack I don't see anything changing in the vty help, but here it is anyway. Thanks for reminding me of these things! -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1fa5e8130202fb509593db4132863b762b0f40b7 Gerrit-Change-Number: 29649 Gerrit-PatchSet: 5 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Oct 2022 16:50:51 +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

2 years, 8 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: respond to tx-attenuation config in real time.

by keith

Attention is currently required from: fixeria, keith. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/29649 to look at the new patch set (#5). Change subject: osmo-bts-trx: respond to tx-attenuation config in real time. ...................................................................... osmo-bts-trx: respond to tx-attenuation config in real time. Some osmo-bts varieties have a method to make an immediate change to TX power from the vty. In osmo-bts-trx there does not seem to be any way, so lets start the power ramp loop when the parameter osmotrx tx-attenution is changed on a running TRX. Change-Id: I1fa5e8130202fb509593db4132863b762b0f40b7 --- M src/osmo-bts-trx/trx_vty.c 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/49/29649/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1fa5e8130202fb509593db4132863b762b0f40b7 Gerrit-Change-Number: 29649 Gerrit-PatchSet: 5 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

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

by keith

Attention is currently required from: pespin. keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29718 ) Change subject: Fix typo in log message ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I wonder if we might actually clarify what is it that does not exist? You'll see this message, but if you do show ms tlli [tlli from log message] it will be there. So I think the log message is wrong. -- 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Oct 2022 16:33:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( 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, 73 insertions(+), 71 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/25/29725/1 diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h index a48dec8..6649450 100644 --- a/include/osmocom/mgcp/mgcp.h +++ b/include/osmocom/mgcp/mgcp.h @@ -158,23 +158,25 @@ enum mgcp_role role; /* Osmux usage policy: */ - enum osmux_usage osmux_use; + struct { + enum osmux_usage usage; /* addr to bind the server to */ - char *osmux_addr_v4; - char *osmux_addr_v6; + 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 osmux_initialized; + bool initialized; /* osmux batch factor: from 1 to 4 maximum */ - int osmux_batch; + int batch_factor; /* osmux batch size (in bytes) */ - int osmux_batch_size; - /* osmux port */ - uint16_t osmux_port; + int batch_size; /* Pad circuit with dummy AMR frames if no payload to transmit is available */ - bool osmux_dummy; + bool dummy_padding; /* Whether peer is behind NAT (Retrieve remote addr from 1st received Osmux packet) */ - bool osmux_peer_behind_nat; + 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-gsm-manuals[master]: osmux: Improve NAT related documentation

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29723 ) Change subject: osmux: Improve NAT related documentation ...................................................................... osmux: Improve NAT related documentation Related: SYS#5987 Change-Id: I5ed7aa834bfd0d5ef84ff69ece6d1d5e5b920d4e --- M common/chapters/osmux/osmux.adoc 1 file changed, 25 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/23/29723/1 diff --git a/common/chapters/osmux/osmux.adoc b/common/chapters/osmux/osmux.adoc index 24dc446..448d7af 100644 --- a/common/chapters/osmux/osmux.adoc +++ b/common/chapters/osmux/osmux.adoc @@ -45,13 +45,31 @@ that point on, the BSC/MGW punched a hole in the NAT (its connection table is updated) and MSC/MGW is able to send data back to it on that connection. -Moreover, NATs tend to drop connections from their connection tables after some -inactivity time, meaning a peer may receive notice about the other end not being -available while it actually is. This means the GSM network needs to be -configured in a way to ensure inactivity periods are short enough that this -cannot occur. That's the reason why OsmoMGW provides the `osmux dummy` VTY -command to enable sending dummy packets from time to time to keep the -connections alive. +In order to make use of the features above, OsmoMGW must be made aware +explicitly through VTY configuration that its peers are located behind a NAT. +This is done through the `osmux peer-behind-nat (on|off)` VTY commands. + +If OsmoMGW itself is behind a NAT, it must use the VTY config `rtp keep-alive` +(used for both RTP and Osmux) to at least the value `once`, in order for it to +punch the hole in its NAT so that its peer can know where to send packets back +to it. + +Another charachtersitic of NATs is that they tend to drop connections from their +connection tables after some inactivity time, meaning a peer may receive notice +about the other end not being available while it actually is. This means the GSM +network needs to be configured in a way to ensure inactivity periods are short +enough that this cannot occur. + +Hence, if OsmoMGW is behind a NAT, it is actually desirable to have the VTY +config `rtp keep-alive` configured with the `<1-120>` value in order to force +transmission of dummy packets ever few seconds. + +Osmux implementations such as OsmoMGW also come with the `osmux dummy` VTY +command to enable sending dummy AMR payloads to the peer even if no real data +was received (for insance if DTX is used). This is useful under some specific +satellite links which were proven to work unreliably if the total throughput in +use over the link changes over time. This way throughput resources are kept +pre-allocated until they are needed again (audio is received again). === CID allocation -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I5ed7aa834bfd0d5ef84ff69ece6d1d5e5b920d4e Gerrit-Change-Number: 29723 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

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

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/29659 to look at the new patch set (#3). 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/59/29659/3 -- 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: delete CHAN RQD from que when rach ind was sent

by fixeria

Attention is currently required from: lynxis lazus, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29705 ) Change subject: abis_rsl: delete CHAN RQD from que when rach ind was sent ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia4abc55fc6fcb1c00991cc84d09529131d014910 Gerrit-Change-Number: 29705 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Oct 2022 15:25:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: show full request reference in log

by fixeria

Attention is currently required from: pespin, lynxis lazus, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29703 ) Change subject: abis_rsl: show full request reference in log ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/29703/comment/1ca41781_4f8a9f93 PS1, Line 1915: LOG_BTS(bts, DRSL, LOGL_INFO, "CHAN RQD: reason: %s (ra=0x%02x, t1=%d, t3=%d, t2=%d, neci=0x%02x, chreq_reason=0x%02x)\n", > Ack. LOGL1S macro in osmo-bts.git prints t1, t2, and then t3. Actually, from the end user perspective, it probably makes sense to convert T1/T2/T3 into TDMA Fn value (see gsm_gsmtime2fn()), and simply print a frame number? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I78499b49ae176b736e384e193fadc0bdd669dffa Gerrit-Change-Number: 29703 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Oct 2022 15:24:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-gbproxy[master]: Improve log levels

by pespin

Attention is currently required from: daniel, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/29715 ) Change subject: Improve log levels ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/29715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ieddf20a5eafaa9738d5d1e9a9aae320e48aa2efc Gerrit-Change-Number: 29715 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 12 Oct 2022 15:16:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-gbproxy[master]: Fix obsolete documentation of function

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/29719 ) Change subject: Fix obsolete documentation of function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/29719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I9588b237f1ee2979fe4ac7c802f1ff6300573e0a Gerrit-Change-Number: 29719 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 12 Oct 2022 15:16:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022