<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/18165">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use OSMO_FD_* instead of deprecated BSC_FD_*<br><br>New define is available since libosmocore 1.1.0, and we already require<br>1.1.0, so no need to update dependenices.<br>Let's change it to avoid people re-using old BSC_FD_* symbols when<br>copy-pasting somewhere else.<br><br>Change-Id: I9b6463af713f76c06a144bdbf202c0d91eef4d21<br>---<br>M src/libosmo-mgcp-client/mgcp_client.c<br>M src/libosmo-mgcp/mgcp_network.c<br>M src/libosmo-mgcp/mgcp_osmux.c<br>3 files changed, 4 insertions(+), 4 deletions(-)<br><br></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 b6bf43b..74bdf4d 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>@@ -829,7 +829,7 @@</span><br><span>         mgcp->remote_addr = htonl(addr.sin_addr.s_addr);</span><br><span> </span><br><span>      osmo_wqueue_init(wq, 1024);</span><br><span style="color: hsl(0, 100%, 40%);">-     wq->bfd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+        wq->bfd.when = OSMO_FD_READ;</span><br><span>      wq->bfd.data = mgcp;</span><br><span>      wq->read_cb = mgcp_do_read;</span><br><span>       wq->write_cb = mgcp_do_write;</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c</span><br><span>index cd60ce2..fc15ad2 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_network.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_network.c</span><br><span>@@ -1462,7 +1462,7 @@</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 = BSC_FD_READ;</span><br><span style="color: hsl(120, 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>@@ -1470,7 +1470,7 @@</span><br><span>               goto cleanup2;</span><br><span>       }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   rtp_end->rtcp.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 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>diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>index 72d3b91..a1121de 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>@@ -406,7 +406,7 @@</span><br><span>               return ret;</span><br><span>  }</span><br><span>    mgcp_set_ip_tos(osmux_fd.fd, cfg->endp_dscp);</span><br><span style="color: hsl(0, 100%, 40%);">-        osmux_fd.when |= BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_fd.when |= OSMO_FD_READ;</span><br><span> </span><br><span>   ret = osmo_fd_register(&osmux_fd);</span><br><span>       if (ret < 0) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/18165">change 18165</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/+/18165"/><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: I9b6463af713f76c06a144bdbf202c0d91eef4d21 </div>
<div style="display:none"> Gerrit-Change-Number: 18165 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>