<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12730">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Auto-cleanup inactive connections<br><br>Add a three minutes watchdog timer to connections, and close these<br>connections when the watchdog timer expires. Kick the watchdog<br>whenever RTP messages or MGCP messages (only makes sense for MDCX)<br>arrive.<br><br>Related: OS#3429<br>Change-Id: I18886052e090466f73829133c24f011806cc1fe0<br>---<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>4 files changed, 29 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/30/12730/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp_internal.h b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>index f75ae8b..656b929 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_internal.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_internal.h</span><br><span>@@ -37,6 +37,9 @@</span><br><span> #define CONN_ID_BTS "0"</span><br><span> #define CONN_ID_NET "1"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Kill connections without any RTP or MGCP (MDCX) messages after 3 minutes */</span><br><span style="color: hsl(120, 100%, 40%);">+#define MGCP_CONN_TIMEOUT 180</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> enum mgcp_trunk_type {</span><br><span> MGCP_TRUNK_VIRTUAL,</span><br><span> MGCP_TRUNK_E1,</span><br><span>@@ -231,6 +234,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 +334,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..63306d5 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,19 @@</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%);">+ 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, MGCP_CONN_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 +181,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 +291,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></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: newchange </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: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>