<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/20785">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use osmo_fd_*_{disable,enable}<br><br>Change-Id: I5208124e08d3b403492fe83acee235e61e423450<br>Depends: libosmocore.git Idb89ba7bc7c129a6304a76900d17f47daf54d17d<br>---<br>M TODO-RELEASE<br>M src/libmsc/mncc_sock.c<br>2 files changed, 7 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index fdddbc2..9c358ae 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -10,3 +10,4 @@</span><br><span> manual needs common chapter cs7-config.adoc, vty_cpu_sched.adoc from osmo-gsm-manuals > 0.3.0</span><br><span> osmo-msc Mobile Identity Coding OsmoMSC is stricter in rejecting invalid coding of Mobile Identity IEs</span><br><span> libmosmo-mgcp-client needs osmo-mgw.git > 1.7.0 (8667d5169df8d06e10ee3f3104e4cd533d15ac57), ABI break due to struct size in mgcp_conn_peer and mgcp_response</span><br><span style="color: hsl(120, 100%, 40%);">+osmo-msc update version dependency to version with osmo_fd_*_{disable,enable}</span><br><span>diff --git a/src/libmsc/mncc_sock.c b/src/libmsc/mncc_sock.c</span><br><span>index 4c1362d..b76855f 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 |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(&net->mncc_state->conn_bfd);</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 |= OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_read_enable(&state->listen_bfd);</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 &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(bfd);</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 |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(bfd);</span><br><span> break;</span><br><span> }</span><br><span> goto close;</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 |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(&mncc->conn_bfd);</span><br><span> }</span><br><span> </span><br><span> /* accept a new connection */</span><br><span>@@ -245,7 +245,7 @@</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 &= ~OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_read_disable(&state->listen_bfd);</span><br><span> close(rc);</span><br><span> return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/20785">change 20785</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/+/20785"/><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: I5208124e08d3b403492fe83acee235e61e423450 </div>
<div style="display:none"> Gerrit-Change-Number: 20785 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>