<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/20786">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">use osmo_fd_setup() whenever applicable<br><br>Change-Id: I1586e855d37670af2602fc26b5d1fc72a32d1929<br>---<br>M src/libosmo-mgcp-client/mgcp_client.c<br>M src/libosmo-mgcp/mgcp_network.c<br>2 files changed, 7 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/86/20786/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>index 5972803..6f4c1f3 100644</span><br><span>--- a/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>+++ b/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>@@ -832,6 +832,11 @@</span><br><span>       }</span><br><span> </span><br><span>        wq = &mgcp->wq;</span><br><span style="color: hsl(120, 100%, 40%);">+        osmo_wqueue_init(wq, 1024);</span><br><span style="color: hsl(120, 100%, 40%);">+   wq->read_cb = mgcp_do_read;</span><br><span style="color: hsl(120, 100%, 40%);">+        wq->write_cb = mgcp_do_write;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    osmo_fd_setup(&wq->bfd, -1, OSMO_FD_READ, osmo_wqueue_bfd_cb, mgcp, 0);</span><br><span> </span><br><span>   rc = init_socket(mgcp);</span><br><span>      if (rc < 0) {</span><br><span>@@ -842,11 +847,6 @@</span><br><span>              goto error_close_fd;</span><br><span>         }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   osmo_wqueue_init(wq, 1024);</span><br><span style="color: hsl(0, 100%, 40%);">-     wq->bfd.when = OSMO_FD_READ;</span><br><span style="color: hsl(0, 100%, 40%);">- wq->bfd.data = mgcp;</span><br><span style="color: hsl(0, 100%, 40%);">- wq->read_cb = mgcp_do_read;</span><br><span style="color: hsl(0, 100%, 40%);">-  wq->write_cb = mgcp_do_write;</span><br><span> </span><br><span>         LOGP(DLMGCP, LOGL_INFO, "MGCP GW connection: %s\n", osmo_sock_get_name2(wq->bfd.fd));</span><br><span> </span><br><span>diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c</span><br><span>index b452201..6b31f2b 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_network.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_network.c</span><br><span>@@ -1577,7 +1577,6 @@</span><br><span>      mgcp_set_ip_tos(rtp_end->rtp.fd, cfg->endp_dscp);</span><br><span>      mgcp_set_ip_tos(rtp_end->rtcp.fd, cfg->endp_dscp);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    rtp_end->rtp.when = OSMO_FD_READ;</span><br><span>         if (osmo_fd_register(&rtp_end->rtp) != 0) {</span><br><span>           LOGPENDP(endp, DRTP, LOGL_ERROR,</span><br><span>                      "failed to register RTP port %d\n",</span><br><span>@@ -1585,7 +1584,6 @@</span><br><span>               goto cleanup2;</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   rtp_end->rtcp.when = OSMO_FD_READ;</span><br><span>        if (osmo_fd_register(&rtp_end->rtcp) != 0) {</span><br><span>          LOGPENDP(endp, DRTP, LOGL_ERROR,</span><br><span>                      "failed to register RTCP port %d\n",</span><br><span>@@ -1634,10 +1632,8 @@</span><br><span>     }</span><br><span> </span><br><span>        end->local_port = rtp_port;</span><br><span style="color: hsl(0, 100%, 40%);">-  end->rtp.cb = rtp_data_net;</span><br><span style="color: hsl(0, 100%, 40%);">-  end->rtp.data = conn;</span><br><span style="color: hsl(0, 100%, 40%);">-        end->rtcp.data = conn;</span><br><span style="color: hsl(0, 100%, 40%);">-       end->rtcp.cb = rtp_data_net;</span><br><span style="color: hsl(120, 100%, 40%);">+       osmo_fd_setup(&end->rtp, -1, OSMO_FD_READ, rtp_data_net, conn, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_fd_setup(&end->rtcp, -1, OSMO_FD_READ, rtp_data_net, conn, 0);</span><br><span> </span><br><span>       return bind_rtp(endp->cfg, conn->end.local_addr, end, endp);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/20786">change 20786</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/+/20786"/><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: I1586e855d37670af2602fc26b5d1fc72a32d1929 </div>
<div style="display:none"> Gerrit-Change-Number: 20786 </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>