<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/18167">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.3.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: Ifc89fffac0443d94f3e49555684975b293ef90fb<br>---<br>M src/libmsc/mncc_sock.c<br>M src/libmsc/smpp_smsc.c<br>2 files changed, 11 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/mncc_sock.c b/src/libmsc/mncc_sock.c</span><br><span>index 670d692..a3527ef 100644</span><br><span>--- a/src/libmsc/mncc_sock.c</span><br><span>+++ b/src/libmsc/mncc_sock.c</span><br><span>@@ -65,7 +65,7 @@</span><br><span> </span><br><span> /* Actually enqueue the message and mark socket write need */</span><br><span> msgb_enqueue(&net->upqueue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- net->mncc_state->conn_bfd.when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ net->mncc_state->conn_bfd.when |= OSMO_FD_WRITE;</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -80,7 +80,7 @@</span><br><span> osmo_fd_unregister(bfd);</span><br><span> </span><br><span> /* re-enable the generation of ACCEPT for new connections */</span><br><span style="color: hsl(0, 100%, 40%);">- state->listen_bfd.when |= BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ state->listen_bfd.when |= OSMO_FD_READ;</span><br><span> </span><br><span> /* release all existing calls */</span><br><span> gsm0408_clear_all_trans(state->net, TRANS_CC);</span><br><span>@@ -146,7 +146,7 @@</span><br><span> msg = llist_entry(net->upqueue.next, struct msgb, list);</span><br><span> mncc_prim = (struct gsm_mncc *)msg->data;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when &= ~OSMO_FD_WRITE;</span><br><span> </span><br><span> /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */</span><br><span> if (!msgb_length(msg)) {</span><br><span>@@ -161,7 +161,7 @@</span><br><span> goto close;</span><br><span> if (rc < 0) {</span><br><span> if (errno == EAGAIN) {</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when |= OSMO_FD_WRITE;</span><br><span> break;</span><br><span> }</span><br><span> goto close;</span><br><span>@@ -185,12 +185,12 @@</span><br><span> {</span><br><span> int rc = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & BSC_FD_READ)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_FD_READ)</span><br><span> rc = mncc_sock_read(bfd);</span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (flags & BSC_FD_WRITE)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (flags & OSMO_FD_WRITE)</span><br><span> rc = mncc_sock_write(bfd);</span><br><span> </span><br><span> return rc;</span><br><span>@@ -222,7 +222,7 @@</span><br><span> hello->lchan_type_offset = offsetof(struct gsm_mncc, lchan_type);</span><br><span> </span><br><span> msgb_enqueue(&mncc->net->upqueue, msg);</span><br><span style="color: hsl(0, 100%, 40%);">- mncc->conn_bfd.when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc->conn_bfd.when |= OSMO_FD_WRITE;</span><br><span> }</span><br><span> </span><br><span> /* accept a new connection */</span><br><span>@@ -245,13 +245,13 @@</span><br><span> LOGP(DMNCC, LOGL_NOTICE, "MNCC app connects but we already have "</span><br><span> "another active connection ?!?\n");</span><br><span> /* We already have one MNCC app connected, this is all we support */</span><br><span style="color: hsl(0, 100%, 40%);">- state->listen_bfd.when &= ~BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ state->listen_bfd.when &= ~OSMO_FD_READ;</span><br><span> close(rc);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span> conn_bfd->fd = rc;</span><br><span style="color: hsl(0, 100%, 40%);">- conn_bfd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_bfd->when = OSMO_FD_READ;</span><br><span> conn_bfd->cb = mncc_sock_cb;</span><br><span> conn_bfd->data = state;</span><br><span> </span><br><span>@@ -294,7 +294,7 @@</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bfd->when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->when = OSMO_FD_READ;</span><br><span> bfd->cb = mncc_sock_accept;</span><br><span> bfd->data = state;</span><br><span> </span><br><span>diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c</span><br><span>index df3c847..2d82d98 100644</span><br><span>--- a/src/libmsc/smpp_smsc.c</span><br><span>+++ b/src/libmsc/smpp_smsc.c</span><br><span>@@ -931,7 +931,7 @@</span><br><span> osmo_wqueue_init(&esme->wqueue, 10);</span><br><span> esme->wqueue.bfd.fd = fd;</span><br><span> esme->wqueue.bfd.data = esme;</span><br><span style="color: hsl(0, 100%, 40%);">- esme->wqueue.bfd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ esme->wqueue.bfd.when = OSMO_FD_READ;</span><br><span> </span><br><span> if (osmo_fd_register(&esme->wqueue.bfd) != 0) {</span><br><span> close(fd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/18167">change 18167</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-msc/+/18167"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ifc89fffac0443d94f3e49555684975b293ef90fb </div>
<div style="display:none"> Gerrit-Change-Number: 18167 </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>