<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12730">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Inactive connection cleanup (disabled by default)<br><br>Add a watchdog timer to connections, and close these connections when<br>the watchdog timer expires. Kick the watchdog whenever RTP messages or<br>the relevant MGCP messages arrive. Add the currently remaining timeout<br>to "show mgcp stats" in the VTY.<br><br>This feature is disabled by default, as it is incompatible with LCLS<br>(connections in LCLS state appear to be inactive). Enable it with the<br>new "conn-timeout" VTY setting. In general, this feature can be used to<br>work around interoperability problems causing connections to stay open<br>forever, and slowly exhausting all available ports. This happened for<br>various reasons already.<br><br>MDCX is the only relevant MGCP message:<br>- CRCX creates the conn and timer<br>- DLCX deletes the conn and timer<br>- MDCX is the only remaining supported MGCP message that indicates a CI<br>- Can't easily generically parse a CI for all MGCP messages, parsing is<br> done in handle_modify_con().<br><br>Related: OS#3429<br>Change-Id: I18886052e090466f73829133c24f011806cc1fe0<br>---<br>M include/osmocom/mgcp/mgcp.h<br>M include/osmocom/mgcp/mgcp_internal.h<br>M src/libosmo-mgcp/mgcp_conn.c<br>M src/libosmo-mgcp/mgcp_network.c<br>M src/libosmo-mgcp/mgcp_protocol.c<br>M src/libosmo-mgcp/mgcp_vty.c<br>M tests/mgcp/mgcp_test.c<br>7 files changed, 61 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h</span><br><span>index 034a780..7597af8 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp.h</span><br><span>@@ -274,6 +274,9 @@</span><br><span> uint16_t osmux_dummy;</span><br><span> /* domain name of the media gateway */</span><br><span> char domain[255+1];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* time after which inactive connections (CIs) get closed */</span><br><span style="color: hsl(120, 100%, 40%);">+ int conn_timeout;</span><br><span> };</span><br><span> </span><br><span> /* config management */</span><br><span>diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>index f75ae8b..14c5f11 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_internal.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>@@ -231,6 +231,9 @@</span><br><span> /*! human readable name (vty, logging) */</span><br><span> char name[256];</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /*! activity tracker (for cleaning up inactive connections) */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_timer_list watchdog;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! union with connection description */</span><br><span> union {</span><br><span> struct mgcp_conn_rtp rtp;</span><br><span>@@ -328,3 +331,4 @@</span><br><span> #define PTYPE_UNDEFINED (-1)</span><br><span> </span><br><span> void mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn);</span><br><span style="color: hsl(120, 100%, 40%);">+void mgcp_conn_watchdog_kick(struct mgcp_conn *conn);</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>index fce8a78..a8341d6 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_conn.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>@@ -29,6 +29,7 @@</span><br><span> #include <osmocom/mgcp/mgcp_codec.h></span><br><span> #include <osmocom/gsm/gsm_utils.h></span><br><span> #include <osmocom/core/rate_ctr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/timer.h></span><br><span> #include <ctype.h></span><br><span> </span><br><span> const static struct rate_ctr_group_desc rate_ctr_group_desc = {</span><br><span>@@ -125,6 +126,23 @@</span><br><span> rate_ctr_group_free(conn_rtp->rate_ctr_group);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void mgcp_conn_watchdog_cb(void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_conn *conn = data;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMGCP, LOGL_ERROR, "endpoint:0x%x CI:%s connection timed out!\n", ENDPOINT_NUMBER(conn->endp), conn->id);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_conn_free(conn->endp, conn->id);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void mgcp_conn_watchdog_kick(struct mgcp_conn *conn)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int timeout = conn->endp->cfg->conn_timeout;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!timeout)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMGCP, LOGL_DEBUG, "endpoint:0x%x CI:%s watchdog kicked\n", ENDPOINT_NUMBER(conn->endp), conn->id);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&conn->watchdog, timeout, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! allocate a new connection list entry.</span><br><span> * \param[in] ctx talloc context</span><br><span> * \param[in] endp associated endpoint</span><br><span>@@ -167,6 +185,9 @@</span><br><span> OSMO_ASSERT(false);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Initialize watchdog */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_setup(&conn->watchdog, mgcp_conn_watchdog_cb, conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_conn_watchdog_kick(conn);</span><br><span> llist_add(&conn->entry, &endp->conns);</span><br><span> </span><br><span> return conn;</span><br><span>@@ -274,6 +295,7 @@</span><br><span> OSMO_ASSERT(false);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_del(&conn->watchdog);</span><br><span> llist_del(&conn->entry);</span><br><span> talloc_free(conn);</span><br><span> }</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c</span><br><span>index 7af8e71..2c86f8f 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_network.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_network.c</span><br><span>@@ -1246,6 +1246,8 @@</span><br><span> if (len < 0)</span><br><span> return -1;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_conn_watchdog_kick(conn_src->conn);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Check if the connection is in loopback mode, if yes, just send the</span><br><span> * incoming data back to the origin */</span><br><span> if (conn_src->conn->mode == MGCP_CONN_LOOPBACK) {</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index f141485..9f95ea4 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -1141,6 +1141,8 @@</span><br><span> return create_err_response(endp, 400, "MDCX", p->trans);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_conn_watchdog_kick(conn->conn);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (mode) {</span><br><span> if (mgcp_parse_conn_mode(mode, endp, conn->conn) != 0) {</span><br><span> rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_INVALID_MODE]);</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>index 83f845a..ef63b04 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_vty.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_vty.c</span><br><span>@@ -154,6 +154,10 @@</span><br><span> vty_out(vty, " osmux dummy %s%s",</span><br><span> g_cfg->osmux_dummy ? "on" : "off", VTY_NEWLINE);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_cfg->conn_timeout)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " conn-timeout %u%s", g_cfg->conn_timeout, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -215,6 +219,13 @@</span><br><span> vty_out(vty, " CONN: %s%s", mgcp_conn_dump(conn), VTY_NEWLINE);</span><br><span> </span><br><span> if (show_stats) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (endp->cfg->conn_timeout) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct timeval remaining;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_remaining(&conn->watchdog, NULL, &remaining);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " Currently remaining timeout (seconds): %d.%06d%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ (int)remaining.tv_sec, (int)remaining.tv_usec, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* FIXME: Also add verbosity for other</span><br><span> * connection types (E1) as soon as</span><br><span> * the implementation is available */</span><br><span>@@ -1327,6 +1338,18 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_mgcp_conn_timeout,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_mgcp_conn_timeout_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "conn-timeout <1-65534>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set a time after which inactive connections (CIs) are closed. This can be used to work around interoperability"</span><br><span style="color: hsl(120, 100%, 40%);">+ " problems causing connections to stay open forever, and slowly exhausting all available ports. Do not enable"</span><br><span style="color: hsl(120, 100%, 40%);">+ " when LCLS is used (connections in LCLS state appear to be inactive)!\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Timeout value (sec.)\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->conn_timeout = strtoul(argv[0], NULL, 10);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int mgcp_vty_init(void)</span><br><span> {</span><br><span> install_element_ve(&show_mgcp_cmd);</span><br><span>@@ -1391,6 +1414,7 @@</span><br><span> install_element(MGCP_NODE, &cfg_mgcp_allow_transcoding_cmd);</span><br><span> install_element(MGCP_NODE, &cfg_mgcp_no_allow_transcoding_cmd);</span><br><span> install_element(MGCP_NODE, &cfg_mgcp_domain_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MGCP_NODE, &cfg_mgcp_conn_timeout_cmd);</span><br><span> </span><br><span> install_element(MGCP_NODE, &cfg_mgcp_trunk_cmd);</span><br><span> install_node(&trunk_node, config_write_trunk);</span><br><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index a540056..78ddcdc 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -970,6 +970,7 @@</span><br><span> {</span><br><span> int i;</span><br><span> struct mgcp_endpoint endp;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_config cfg = {0};</span><br><span> struct mgcp_trunk_config trunk;</span><br><span> </span><br><span> printf("Testing packet loss calculation.\n");</span><br><span>@@ -977,6 +978,7 @@</span><br><span> memset(&endp, 0, sizeof(endp));</span><br><span> memset(&trunk, 0, sizeof(trunk));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ endp.cfg = &cfg;</span><br><span> endp.type = &ep_typeset.rtp;</span><br><span> trunk.vty_number_endpoints = 1;</span><br><span> trunk.endpoints = &endp;</span><br><span>@@ -1197,6 +1199,7 @@</span><br><span> </span><br><span> struct mgcp_trunk_config trunk;</span><br><span> struct mgcp_endpoint endp;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_config cfg = {0};</span><br><span> struct mgcp_rtp_state state;</span><br><span> struct mgcp_rtp_end *rtp;</span><br><span> struct sockaddr_in addr = { 0 };</span><br><span>@@ -1224,6 +1227,7 @@</span><br><span> state.in_stream.err_ts_ctr = &test_ctr_in;</span><br><span> state.out_stream.err_ts_ctr = &test_ctr_out;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ endp.cfg = &cfg;</span><br><span> endp.type = &ep_typeset.rtp;</span><br><span> </span><br><span> trunk.vty_number_endpoints = 1;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12730">change 12730</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12730"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I18886052e090466f73829133c24f011806cc1fe0 </div>
<div style="display:none"> Gerrit-Change-Number: 12730 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>