<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/mncc-python/+/17431">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rtpsource: Make local RTP bind IP configurble via "-r" cmdline opt<br><br>Change-Id: Ia742180326f3d945eb7933cebbef3fd17d127d51<br>---<br>M rtpsource/internal.h<br>M rtpsource/rtpsource.c<br>2 files changed, 28 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/mncc-python refs/changes/31/17431/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/rtpsource/internal.h b/rtpsource/internal.h</span><br><span>index 788b695..13d07aa 100644</span><br><span>--- a/rtpsource/internal.h</span><br><span>+++ b/rtpsource/internal.h</span><br><span>@@ -27,6 +27,7 @@</span><br><span> struct llist_head connections;</span><br><span> struct osmo_fd timer_ofd;</span><br><span> struct ctrl_handle *ctrl;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *rtp_bind_ip;</span><br><span> };</span><br><span> extern struct rtpsource_state *g_rss;</span><br><span> </span><br><span>diff --git a/rtpsource/rtpsource.c b/rtpsource/rtpsource.c</span><br><span>index 58e6bf0..569d962 100644</span><br><span>--- a/rtpsource/rtpsource.c</span><br><span>+++ b/rtpsource/rtpsource.c</span><br><span>@@ -34,6 +34,7 @@</span><br><span> #include <stdio.h></span><br><span> #include <unistd.h></span><br><span> #include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <getopt.h></span><br><span> #include <sys/signal.h></span><br><span> </span><br><span> #include <osmocom/core/linuxlist.h></span><br><span>@@ -77,7 +78,7 @@</span><br><span> conn->rtp_sock = osmo_rtp_socket_create(conn, OSMO_RTP_F_POLL);</span><br><span> OSMO_ASSERT(conn->rtp_sock);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_rtp_socket_bind(conn->rtp_sock, "127.23.23.23", -1);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_rtp_socket_bind(conn->rtp_sock, rss->rtp_bind_ip, -1);</span><br><span> OSMO_ASSERT(rc == 0);</span><br><span> </span><br><span> rc = osmo_rtp_get_bound_addr(conn->rtp_sock, &host, &port);</span><br><span>@@ -200,6 +201,28 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void handle_options(int argc, char **argv)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ while (1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int option_index = 0, c;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct option long_options[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ {"rtp-bind-ip", 1, 0, 'r' },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, 0, 0, 0}</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ c = getopt_long(argc, argv, "r:", long_options, &option_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (c == -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (c) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'r':</span><br><span style="color: hsl(120, 100%, 40%);">+ g_rss->rtp_bind_ip = optarg;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span> struct timespec interval = {</span><br><span>@@ -226,6 +249,9 @@</span><br><span> g_rss = talloc_zero(g_tall_ctx, struct rtpsource_state);</span><br><span> OSMO_ASSERT(g_rss);</span><br><span> INIT_LLIST_HEAD(&g_rss->connections);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_rss->rtp_bind_ip = "127.23.23.23";</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_options(argc, argv);</span><br><span> </span><br><span> /* Create CTRL interface */</span><br><span> //g_rss->ctrl = ctrl_interface_setup_dynip(g_rss, ctrl_vty_get_bind_addr(), 11111, NULL);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/mncc-python/+/17431">change 17431</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/mncc-python/+/17431"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: mncc-python </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia742180326f3d945eb7933cebbef3fd17d127d51 </div>
<div style="display:none"> Gerrit-Change-Number: 17431 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>