<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17445">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">virtphy: Sync virtual_um.[ch] with osmo-bts<br><br>The files are used in both projects, and while the osmo-bts code has<br>evolved, this copy didn't. Let's sync again (to libosmocore<br>change-Id I303f2e616d2d32b5a8005c3dcf0f5fad19ad3445).<br><br>Change-Id: I189ee28a85a6d7a7a07b062f6b07012478503e8f<br>Depends: libosmocore.git Ib52d22710020b56965aefcef09bde8247ace4a9c<br>Related: OS#2966<br>---<br>M src/host/virt_phy/include/virtphy/virtual_um.h<br>M src/host/virt_phy/src/shared/virtual_um.c<br>M src/host/virt_phy/src/virtphy.c<br>3 files changed, 54 insertions(+), 26 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/virt_phy/include/virtphy/virtual_um.h b/src/host/virt_phy/include/virtphy/virtual_um.h</span><br><span>index 52f2df6..fe06092 100644</span><br><span>--- a/src/host/virt_phy/include/virtphy/virtual_um.h</span><br><span>+++ b/src/host/virt_phy/include/virtphy/virtual_um.h</span><br><span>@@ -17,7 +17,9 @@</span><br><span> </span><br><span> #define VIRT_UM_MSGB_SIZE 256</span><br><span> #define DEFAULT_MS_MCAST_GROUP "239.193.23.1"</span><br><span style="color: hsl(120, 100%, 40%);">+#define DEFAULT_MS_MCAST_PORT 4729 /* IANA-registered port for GSMTAP */</span><br><span> #define DEFAULT_BTS_MCAST_GROUP "239.193.23.2"</span><br><span style="color: hsl(120, 100%, 40%);">+#define DEFAULT_BTS_MCAST_PORT 4729 /* IANA-registered port for GSMTAP */</span><br><span> </span><br><span> struct virt_um_inst {</span><br><span> void *priv;</span><br><span>@@ -27,7 +29,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,</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>diff --git a/src/host/virt_phy/src/shared/virtual_um.c b/src/host/virt_phy/src/shared/virtual_um.c</span><br><span>index 9415bfb..14a444c 100644</span><br><span>--- a/src/host/virt_phy/src/shared/virtual_um.c</span><br><span>+++ b/src/host/virt_phy/src/shared/virtual_um.c</span><br><span>@@ -27,7 +27,9 @@</span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <virtphy/osmo_mcast_sock.h></span><br><span> #include <virtphy/virtual_um.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <unistd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <errno.h></span><br><span> </span><br><span> /**</span><br><span> * Virtual UM interface file descriptor callback.</span><br><span>@@ -37,49 +39,71 @@</span><br><span> {</span><br><span> struct virt_um_inst *vui = ofd->data;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- // check if the read flag is set</span><br><span> if (what & BSC_FD_READ) {</span><br><span style="color: hsl(0, 100%, 40%);">- // allocate message buffer of specified size</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = msgb_alloc(VIRT_UM_MSGB_SIZE,</span><br><span style="color: hsl(0, 100%, 40%);">- "Virtual UM Rx");</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = msgb_alloc(VIRT_UM_MSGB_SIZE, "Virtual UM Rx");</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- // read message from fd in message buffer</span><br><span style="color: hsl(0, 100%, 40%);">- rc = mcast_bidir_sock_rx(vui->mcast_sock, msgb_data(msg),</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_tailroom(msg));</span><br><span style="color: hsl(0, 100%, 40%);">- // rc is number of bytes actually read</span><br><span style="color: hsl(120, 100%, 40%);">+ /* read message from fd into message buffer */</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = mcast_bidir_sock_rx(vui->mcast_sock, msgb_data(msg), msgb_tailroom(msg));</span><br><span> if (rc > 0) {</span><br><span> msgb_put(msg, rc);</span><br><span> msg->l1h = msgb_data(msg);</span><br><span style="color: hsl(0, 100%, 40%);">- // call the l1 callback function for a received msg</span><br><span style="color: hsl(120, 100%, 40%);">+ /* call the l1 callback function for a received msg */</span><br><span> vui->recv_cb(vui, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- // TODO: this kind of error handling might be a bit harsh</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (rc == 0) {</span><br><span> vui->recv_cb(vui, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- // Unregister fd from select loop</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_unregister(ofd);</span><br><span style="color: hsl(0, 100%, 40%);">- close(ofd->fd);</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->fd = -1;</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->when = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_close(ofd);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span style="color: hsl(120, 100%, 40%);">+ perror("Read from multicast socket");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> }</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct virt_um_inst *virt_um_init(</span><br><span style="color: hsl(0, 100%, 40%);">- 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,</span><br><span style="color: hsl(0, 100%, 40%);">- void (*recv_cb)(struct virt_um_inst *vui, struct msgb *msg))</span><br><span style="color: hsl(120, 100%, 40%);">+struct virt_um_inst *virt_um_init(void *ctx, char *tx_mcast_group, uint16_t tx_mcast_port,</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 style="color: hsl(120, 100%, 40%);">+ 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 style="color: hsl(0, 100%, 40%);">- vui->mcast_sock = mcast_bidir_sock_setup(ctx, tx_mcast_group,</span><br><span style="color: hsl(0, 100%, 40%);">- tx_mcast_port, rx_mcast_group, rx_mcast_port, 1,</span><br><span style="color: hsl(0, 100%, 40%);">- virt_um_fd_cb, vui);</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vui->mcast_sock = mcast_bidir_sock_setup(ctx, tx_mcast_group, tx_mcast_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_mcast_group, rx_mcast_port, 1, virt_um_fd_cb, vui);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!vui->mcast_sock) {</span><br><span style="color: hsl(120, 100%, 40%);">+ perror("Unable to create VirtualUm multicast socket");</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 style="color: hsl(120, 100%, 40%);">+ }</span><br><span> vui->recv_cb = recv_cb;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (ttl >= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_sock_mcast_ttl_set(vui->mcast_sock->tx_ofd.fd, ttl);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ perror("Cannot set TTL of Virtual Um transmit socket");</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 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> 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>@@ -97,6 +121,8 @@</span><br><span> </span><br><span> rc = mcast_bidir_sock_tx(vui->mcast_sock, msgb_data(msg),</span><br><span> msgb_length(msg));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -errno;</span><br><span> msgb_free(msg);</span><br><span> </span><br><span> return rc;</span><br><span>diff --git a/src/host/virt_phy/src/virtphy.c b/src/host/virt_phy/src/virtphy.c</span><br><span>index d0a2ddb..3290dd8 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>@@ -231,7 +231,7 @@</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,</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, -1, NULL,</span><br><span> 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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/17445">change 17445</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/+/17445"/><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: I189ee28a85a6d7a7a07b062f6b07012478503e8f </div>
<div style="display:none"> Gerrit-Change-Number: 17445 </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-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>