<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/20030">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgw: Release endpoint after last conn times out<br><br>Otherwise some state is kept, like the previous CallId, which may then<br>provoke issues next time the endpoint is to be used.<br><br>Change-Id: I3ac4f4542c1c8c877127c64acce6c82b458f697f<br>---<br>M include/osmocom/mgcp/mgcp_endp.h<br>M src/libosmo-mgcp/mgcp_conn.c<br>M src/libosmo-mgcp/mgcp_endp.c<br>M src/libosmo-mgcp/mgcp_network.c<br>4 files changed, 24 insertions(+), 9 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/20030/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp_endp.h b/include/osmocom/mgcp/mgcp_endp.h</span><br><span>index 14cae25..8d19b44 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_endp.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_endp.h</span><br><span>@@ -139,3 +139,5 @@</span><br><span> struct mgcp_endpoint *mgcp_endp_by_name(int *cause, const char *epname,</span><br><span> struct mgcp_config *cfg);</span><br><span> bool mgcp_endp_avail(struct mgcp_endpoint *endp);</span><br><span style="color: hsl(120, 100%, 40%);">+void mgcp_endp_add_conn(struct mgcp_endpoint *endp, struct mgcp_conn *conn);</span><br><span style="color: hsl(120, 100%, 40%);">+void mgcp_endp_remove_conn(struct mgcp_endpoint *endp, 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 328e580..6424dcb 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_conn.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>@@ -199,7 +199,7 @@</span><br><span> /* Initialize watchdog */</span><br><span> osmo_timer_setup(&conn->watchdog, mgcp_conn_watchdog_cb, conn);</span><br><span> mgcp_conn_watchdog_kick(conn);</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add(&conn->entry, &endp->conns);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endp_add_conn(endp, conn);</span><br><span> </span><br><span> return conn;</span><br><span> }</span><br><span>@@ -289,12 +289,6 @@</span><br><span> if (!conn)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Run endpoint cleanup action. By this we inform the endpoint about</span><br><span style="color: hsl(0, 100%, 40%);">- * the removal of the connection and allow it to clean up its inner</span><br><span style="color: hsl(0, 100%, 40%);">- * state accordingly */</span><br><span style="color: hsl(0, 100%, 40%);">- if (endp->type->cleanup_cb)</span><br><span style="color: hsl(0, 100%, 40%);">- endp->type->cleanup_cb(endp, conn);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> switch (conn->type) {</span><br><span> case MGCP_CONN_TYPE_RTP:</span><br><span> aggregate_rtp_conn_stats(endp, &conn->u.rtp);</span><br><span>@@ -308,7 +302,8 @@</span><br><span> }</span><br><span> </span><br><span> osmo_timer_del(&conn->watchdog);</span><br><span style="color: hsl(0, 100%, 40%);">- llist_del(&conn->entry);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endp_remove_conn(endp, conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* WARN: endp may have be freed after call to mgcp_endp_remove_conn */</span><br><span> talloc_free(conn);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/libosmo-mgcp/mgcp_endp.c b/src/libosmo-mgcp/mgcp_endp.c</span><br><span>index c4f3653..ecb2845 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_endp.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_endp.c</span><br><span>@@ -666,3 +666,20 @@</span><br><span> OSMO_ASSERT(false);</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void mgcp_endp_add_conn(struct mgcp_endpoint *endp, struct mgcp_conn *conn)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add(&conn->entry, &endp->conns);</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_endp_remove_conn(struct mgcp_endpoint *endp, struct mgcp_conn *conn)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Run endpoint cleanup action. By this we inform the endpoint about</span><br><span style="color: hsl(120, 100%, 40%);">+ * the removal of the connection and allow it to clean up its inner</span><br><span style="color: hsl(120, 100%, 40%);">+ * state accordingly */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (endp->type->cleanup_cb)</span><br><span style="color: hsl(120, 100%, 40%);">+ endp->type->cleanup_cb(endp, conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&conn->entry);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (llist_empty(&endp->conns))</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_endp_release(endp);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c</span><br><span>index 75a4754..fa40f1f 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_network.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_network.c</span><br><span>@@ -1379,7 +1379,8 @@</span><br><span> * connections present when one connection is removed from the</span><br><span> * endpoint. */</span><br><span> llist_for_each_entry(conn_cleanup, &endp->conns, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- conn_cleanup->priv = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn_cleanup->priv == conn)</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_cleanup->priv = NULL;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/20030">change 20030</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/c/osmo-mgw/+/20030"/><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-Change-Id: I3ac4f4542c1c8c877127c64acce6c82b458f697f </div>
<div style="display:none"> Gerrit-Change-Number: 20030 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>