<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/25424">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
dexter: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">globally lock the portrange when trying to grab a port to prep for multithreading<br><br>Change-Id: I78ae737b829bb428372f34db7d5bc601b5088b78<br>---<br>M configure.ac<br>M include/osmocom/mgcp/mgcp.h<br>M src/libosmo-mgcp/mgcp_protocol.c<br>3 files changed, 10 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 192c012..b996e87 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -57,6 +57,9 @@</span><br><span> PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0)</span><br><span> PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 1.1.0)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+CFLAGS="$CFLAGS -pthread"</span><br><span style="color: hsl(120, 100%, 40%);">+LDFLAGS="$LDFLAGS -pthread"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> AC_ARG_ENABLE(sanitize,</span><br><span> [AS_HELP_STRING(</span><br><span> [--enable-sanitize],</span><br><span>diff --git a/include/osmocom/mgcp/mgcp.h b/include/osmocom/mgcp/mgcp.h</span><br><span>index b3f2eb5..228b0b3 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp.h</span><br><span>@@ -34,6 +34,7 @@</span><br><span> #include <sys/types.h></span><br><span> #include <sys/socket.h></span><br><span> #include <netinet/in.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <pthread.h></span><br><span> </span><br><span> #include "mgcp_ratectr.h"</span><br><span> </span><br><span>@@ -92,6 +93,7 @@</span><br><span> * This holds information on how to allocate ports</span><br><span> */</span><br><span> struct mgcp_port_range {</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_mutex_t lock;</span><br><span> /* addr or NULL to fall-back to default */</span><br><span> char *bind_addr_v4;</span><br><span> char *bind_addr_v6;</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index ba80d7d..16b7dab 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -28,6 +28,7 @@</span><br><span> #include <limits.h></span><br><span> #include <unistd.h></span><br><span> #include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <pthread.h></span><br><span> </span><br><span> #include <osmocom/core/msgb.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span>@@ -478,6 +479,7 @@</span><br><span> </span><br><span> range = &endp->cfg->net_ports;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_mutex_lock(&range->lock);</span><br><span> /* attempt to find a port */</span><br><span> tries = (range->range_end - range->range_start) / 2;</span><br><span> for (i = 0; i < tries; ++i) {</span><br><span>@@ -490,11 +492,12 @@</span><br><span> </span><br><span> range->last_port += 2;</span><br><span> if (rc == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_mutex_unlock(&range->lock);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ pthread_mutex_unlock(&range->lock);</span><br><span> LOGPENDP(endp, DLMGCP, LOGL_ERROR,</span><br><span> "Allocating a RTP/RTCP port failed %u times.\n",</span><br><span> tries);</span><br><span>@@ -1606,6 +1609,7 @@</span><br><span> </span><br><span> osmo_strlcpy(cfg->domain, "mgw", sizeof(cfg->domain));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->net_ports.lock = (pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER;</span><br><span> cfg->net_ports.range_start = RTP_PORT_DEFAULT_RANGE_START;</span><br><span> cfg->net_ports.range_end = RTP_PORT_DEFAULT_RANGE_END;</span><br><span> cfg->net_ports.last_port = cfg->net_ports.range_start;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/25424">change 25424</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/+/25424"/><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: I78ae737b829bb428372f34db7d5bc601b5088b78 </div>
<div style="display:none"> Gerrit-Change-Number: 25424 </div>
<div style="display:none"> Gerrit-PatchSet: 12 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>