<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17446">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">virtphy: Add command line arguments to set multicast netdev + TTL<br><br>This allows us to bind the multicast sockets to a given network device<br>and/or to set the TTL of the multicast frames and hence control their<br>reach in terms of number of network hops.<br><br>Change-Id: Ia74aa381a4c1921cb8c7e263842a864ea8028139<br>Related: OS#2966<br>---<br>M src/host/virt_phy/src/virtphy.c<br>1 file changed, 15 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/46/17446/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/virt_phy/src/virtphy.c b/src/host/virt_phy/src/virtphy.c</span><br><span>index 3290dd8..412da9c 100644</span><br><span>--- a/src/host/virt_phy/src/virtphy.c</span><br><span>+++ b/src/host/virt_phy/src/virtphy.c</span><br><span>@@ -59,6 +59,8 @@</span><br><span> static char *l1ctl_sock_path = L1CTL_SOCK_PATH;</span><br><span> static char *arfcn_sig_lev_red_mask = NULL;</span><br><span> static char *pm_timeout = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+static char *mcast_netdev = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+static int mcast_ttl = -1;</span><br><span> </span><br><span> static void print_usage()</span><br><span> {</span><br><span>@@ -76,6 +78,8 @@</span><br><span> printf(" -s --l1ctl-sock l1ctl socket path path.\n");</span><br><span> printf(" -r --arfcn-sig-lev-red reduce signal level (e.g. 666,12:888,43:176,22).\n");</span><br><span> printf(" -t --pm-timeout power management timeout.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -T --mcast-ttl TTL set TTL of Virtual Um GSMTAP multicast frames\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -D --mcast-deav NETDEV bind to given network device for Virtual Um\n");</span><br><span> }</span><br><span> </span><br><span> static void handle_options(int argc, char **argv)</span><br><span>@@ -91,9 +95,11 @@</span><br><span> {"l1ctl-sock", required_argument, 0, 's'},</span><br><span> {"arfcn-sig-lev-red", required_argument, 0, 'r'},</span><br><span> {"pm-timeout", required_argument, 0, 't'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"mcast-ttl", required_argument, 0, 'T'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"mcast-dev", required_argument, 0, 'D'},</span><br><span> {0, 0, 0, 0},</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">- c = getopt_long(argc, argv, "hz:y:x:d:s:r:t:", long_options,</span><br><span style="color: hsl(120, 100%, 40%);">+ c = getopt_long(argc, argv, "hz:y:x:d:s:r:t:T:D:", long_options,</span><br><span> &option_index);</span><br><span> if (c == -1)</span><br><span> break;</span><br><span>@@ -124,6 +130,12 @@</span><br><span> case 't':</span><br><span> pm_timeout = optarg;</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'T':</span><br><span style="color: hsl(120, 100%, 40%);">+ mcast_ttl = atoi(optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'D':</span><br><span style="color: hsl(120, 100%, 40%);">+ mcast_netdev = optarg;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> break;</span><br><span> }</span><br><span>@@ -231,8 +243,8 @@</span><br><span> </span><br><span> LOGP(DVIRPHY, LOGL_INFO, "Virtual physical layer starting up...\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- g_vphy.virt_um = virt_um_init(tall_vphy_ctx, ul_tx_grp, port, dl_rx_grp, port, -1, NULL,</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtapl1_rx_from_virt_um_inst_cb);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_vphy.virt_um = virt_um_init(tall_vphy_ctx, ul_tx_grp, port, dl_rx_grp, port, mcast_ttl,</span><br><span style="color: hsl(120, 100%, 40%);">+ mcast_netdev, gsmtapl1_rx_from_virt_um_inst_cb);</span><br><span> </span><br><span> g_vphy.l1ctl_sock = l1ctl_sock_init(tall_vphy_ctx, l1ctl_sap_rx_from_l23_inst_cb,</span><br><span> l1ctl_accept_cb, l1ctl_close_cb, l1ctl_sock_path);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17446">change 17446</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/osmocom-bb/+/17446"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia74aa381a4c1921cb8c7e263842a864ea8028139 </div>
<div style="display:none"> Gerrit-Change-Number: 17446 </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>