<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/17444">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-virtual: Fix "virtual-um net-device NETDEV"<br><br>The VTY option to bind the virtual Um multicast to a specific<br>network interface has existed ever since osmo-bts-virtual was<br>first merged to the repo. However, embarrassingly, until today<br>it never did anything, i.e. the code to actually perform the bind<br>was missing.<br><br>Depends: libosmocore.git Ib52d22710020b56965aefcef09bde8247ace4a9c<br>Change-Id: I303f2e616d2d32b5a8005c3dcf0f5fad19ad3445<br>Related: OS#2966<br>---<br>M src/osmo-bts-virtual/l1_if.c<br>M src/osmo-bts-virtual/virtual_um.c<br>M src/osmo-bts-virtual/virtual_um.h<br>3 files changed, 21 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/44/17444/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c</span><br><span>index 3128012..c5c526c 100644</span><br><span>--- a/src/osmo-bts-virtual/l1_if.c</span><br><span>+++ b/src/osmo-bts-virtual/l1_if.c</span><br><span>@@ -204,7 +204,7 @@</span><br><span> </span><br><span> plink->u.virt.virt_um = virt_um_init(plink, plink->u.virt.ms_mcast_group, plink->u.virt.ms_mcast_port,</span><br><span> plink->u.virt.bts_mcast_group, plink->u.virt.bts_mcast_port,</span><br><span style="color: hsl(0, 100%, 40%);">- plink->u.virt.ttl, virt_um_rcv_cb);</span><br><span style="color: hsl(120, 100%, 40%);">+ plink->u.virt.ttl, plink->u.virt.mcast_dev, virt_um_rcv_cb);</span><br><span> if (!plink->u.virt.virt_um) {</span><br><span> phy_link_state_set(plink, PHY_LINK_SHUTDOWN);</span><br><span> return -1;</span><br><span>diff --git a/src/osmo-bts-virtual/virtual_um.c b/src/osmo-bts-virtual/virtual_um.c</span><br><span>index e19f9f2..1ff5291 100644</span><br><span>--- a/src/osmo-bts-virtual/virtual_um.c</span><br><span>+++ b/src/osmo-bts-virtual/virtual_um.c</span><br><span>@@ -62,7 +62,7 @@</span><br><span> }</span><br><span> </span><br><span> struct virt_um_inst *virt_um_init(void *ctx, char *tx_mcast_group, uint16_t tx_mcast_port,</span><br><span style="color: hsl(0, 100%, 40%);">- char *rx_mcast_group, uint16_t rx_mcast_port, int ttl,</span><br><span style="color: hsl(120, 100%, 40%);">+ char *rx_mcast_group, uint16_t rx_mcast_port, int ttl, const char *dev_name,</span><br><span> void (*recv_cb)(struct virt_um_inst *vui, struct msgb *msg))</span><br><span> {</span><br><span> struct virt_um_inst *vui = talloc_zero(ctx, struct virt_um_inst);</span><br><span>@@ -81,14 +81,29 @@</span><br><span> rc = osmo_sock_mcast_ttl_set(vui->mcast_sock->tx_ofd.fd, ttl);</span><br><span> if (rc < 0) {</span><br><span> perror("Cannot set TTL of Virtual Um transmit socket");</span><br><span style="color: hsl(0, 100%, 40%);">- mcast_bidir_sock_close(vui->mcast_sock);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(vui);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto out_close;</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%);">+ if (dev_name) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_sock_mcast_iface_set(vui->mcast_sock->tx_ofd.fd, dev_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ perror("Cannot bind multicast tx to given device");</span><br><span style="color: hsl(120, 100%, 40%);">+ goto out_close;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_sock_mcast_iface_set(vui->mcast_sock->rx_ofd.fd, dev_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ perror("Cannot bind multicast rx to given device");</span><br><span style="color: hsl(120, 100%, 40%);">+ goto out_close;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span> return vui;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+out_close:</span><br><span style="color: hsl(120, 100%, 40%);">+ mcast_bidir_sock_close(vui->mcast_sock);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(vui);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> }</span><br><span> </span><br><span> void virt_um_destroy(struct virt_um_inst *vui)</span><br><span>diff --git a/src/osmo-bts-virtual/virtual_um.h b/src/osmo-bts-virtual/virtual_um.h</span><br><span>index 7841c33..87cf03a 100644</span><br><span>--- a/src/osmo-bts-virtual/virtual_um.h</span><br><span>+++ b/src/osmo-bts-virtual/virtual_um.h</span><br><span>@@ -23,7 +23,7 @@</span><br><span> </span><br><span> struct virt_um_inst *virt_um_init(</span><br><span> void *ctx, char *tx_mcast_group, uint16_t tx_mcast_port,</span><br><span style="color: hsl(0, 100%, 40%);">- char *rx_mcast_group, uint16_t rx_mcast_port, int ttl,</span><br><span style="color: hsl(120, 100%, 40%);">+ char *rx_mcast_group, uint16_t rx_mcast_port, int ttl, const char *dev_name,</span><br><span> void (*recv_cb)(struct virt_um_inst *vui, struct msgb *msg));</span><br><span> </span><br><span> void virt_um_destroy(struct virt_um_inst *vui);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/17444">change 17444</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-bts/+/17444"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I303f2e616d2d32b5a8005c3dcf0f5fad19ad3445 </div>
<div style="display:none"> Gerrit-Change-Number: 17444 </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>