<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcap/+/20744">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;">Use OSMO_FD_* instead of deprecated BSC_FD_*<br><br>Change-Id: I7d57919877520710b5dc1f54de1de89cae78093e<br>---<br>M src/osmo_client_core.c<br>M src/osmo_client_network.c<br>M src/osmo_server_network.c<br>M src/osmo_tls.c<br>4 files changed, 16 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c</span><br><span>index a56ebb4..c49bc1b 100644</span><br><span>--- a/src/osmo_client_core.c</span><br><span>+++ b/src/osmo_client_core.c</span><br><span>@@ -306,7 +306,7 @@</span><br><span> }</span><br><span> </span><br><span> client->fd.fd = fd;</span><br><span style="color: hsl(0, 100%, 40%);">- client->fd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ client->fd.when = OSMO_FD_READ;</span><br><span> client->fd.cb = pcap_read_cb;</span><br><span> client->fd.data = client;</span><br><span> if (osmo_fd_register(&client->fd) != 0) {</span><br><span>diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c</span><br><span>index 2ace22e..c89847d 100644</span><br><span>--- a/src/osmo_client_network.c</span><br><span>+++ b/src/osmo_client_network.c</span><br><span>@@ -120,7 +120,7 @@</span><br><span> int conn_cb(struct osmo_fd *fd, unsigned int what)</span><br><span> {</span><br><span> /* finally the socket is connected... continue */</span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_WRITE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_WRITE) {</span><br><span> struct osmo_pcap_client_conn *conn = fd->data;</span><br><span> /*</span><br><span> * The write queue needs to work differently for GNUtls. Before we can</span><br><span>@@ -144,7 +144,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_READ)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_READ)</span><br><span> read_cb(fd);</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -284,7 +284,7 @@</span><br><span> srv_port = 0;</span><br><span> sock_type = SOCK_RAW;</span><br><span> sock_proto = IPPROTO_IPIP;</span><br><span style="color: hsl(0, 100%, 40%);">- conn->wqueue.bfd.when = BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->wqueue.bfd.when = OSMO_FD_WRITE;</span><br><span> break;</span><br><span> default:</span><br><span> OSMO_ASSERT(0);</span><br><span>@@ -306,9 +306,9 @@</span><br><span> conn->wqueue.bfd.cb = conn_cb;</span><br><span> conn->wqueue.bfd.data = conn;</span><br><span> if (conn->protocol == PROTOCOL_IPIP)</span><br><span style="color: hsl(0, 100%, 40%);">- conn->wqueue.bfd.when = BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->wqueue.bfd.when = OSMO_FD_WRITE;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- conn->wqueue.bfd.when = BSC_FD_READ | BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->wqueue.bfd.when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span> }</span><br><span> </span><br><span> void osmo_client_reconnect(struct osmo_pcap_client_conn *conn)</span><br><span>diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c</span><br><span>index 55934be..164b161 100644</span><br><span>--- a/src/osmo_server_network.c</span><br><span>+++ b/src/osmo_server_network.c</span><br><span>@@ -542,7 +542,7 @@</span><br><span> } else {</span><br><span> client->rem_wq.bfd.cb = osmo_wqueue_bfd_cb;</span><br><span> client->rem_wq.bfd.data = client;</span><br><span style="color: hsl(0, 100%, 40%);">- client->rem_wq.bfd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ client->rem_wq.bfd.when = OSMO_FD_READ;</span><br><span> client->rem_wq.read_cb = read_cb;</span><br><span> client->direct_read = true;</span><br><span> }</span><br><span>@@ -602,7 +602,7 @@</span><br><span> }</span><br><span> </span><br><span> server->listen_fd.fd = fd;</span><br><span style="color: hsl(0, 100%, 40%);">- server->listen_fd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ server->listen_fd.when = OSMO_FD_READ;</span><br><span> server->listen_fd.cb = accept_cb;</span><br><span> server->listen_fd.data = server;</span><br><span> </span><br><span>diff --git a/src/osmo_tls.c b/src/osmo_tls.c</span><br><span>index 0be01a6..56fedbb 100644</span><br><span>--- a/src/osmo_tls.c</span><br><span>+++ b/src/osmo_tls.c</span><br><span>@@ -192,9 +192,9 @@</span><br><span> /* handshake is done. start writing if we are allowed to */</span><br><span> LOGP(DTLS, LOGL_NOTICE, "TLS handshake done.\n");</span><br><span> if (!llist_empty(&tls_session->wqueue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- tls_session->wqueue->bfd.when = BSC_FD_WRITE | BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ tls_session->wqueue->bfd.when = OSMO_FD_WRITE | OSMO_FD_READ;</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- tls_session->wqueue->bfd.when = BSC_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ tls_session->wqueue->bfd.when = OSMO_FD_READ;</span><br><span> tls_session->need_handshake = false;</span><br><span> release_keys(tls_session);</span><br><span> if (tls_session->handshake_done)</span><br><span>@@ -227,7 +227,7 @@</span><br><span> static int tls_write(struct osmo_tls_session *sess)</span><br><span> {</span><br><span> int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- sess->wqueue->bfd.when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ sess->wqueue->bfd.when &= ~OSMO_FD_WRITE;</span><br><span> </span><br><span> if (llist_empty(&sess->wqueue->msg_queue))</span><br><span> return 0;</span><br><span>@@ -252,7 +252,7 @@</span><br><span> }</span><br><span> </span><br><span> if (sess->need_resend || !llist_empty(&sess->wqueue->msg_queue))</span><br><span style="color: hsl(0, 100%, 40%);">- sess->wqueue->bfd.when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ sess->wqueue->bfd.when |= OSMO_FD_WRITE;</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span>@@ -263,14 +263,14 @@</span><br><span> if (sess->need_handshake)</span><br><span> return need_handshake(sess);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_READ) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_READ) {</span><br><span> int rc = tls_read(sess);</span><br><span> if (rc <= 0) {</span><br><span> sess->error(sess);</span><br><span> return rc;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_WRITE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_WRITE) {</span><br><span> int rc = tls_write(sess);</span><br><span> if (rc < 0) {</span><br><span> sess->error(sess);</span><br><span>@@ -437,7 +437,7 @@</span><br><span> GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT);</span><br><span> wq->bfd.cb = osmo_tls_client_bfd_cb;</span><br><span> wq->bfd.data = sess;</span><br><span style="color: hsl(0, 100%, 40%);">- wq->bfd.when = BSC_FD_READ | BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ wq->bfd.when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span> sess->need_handshake = true;</span><br><span> sess->wqueue = wq;</span><br><span> return true;</span><br><span>@@ -533,7 +533,7 @@</span><br><span> GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT);</span><br><span> wq->bfd.cb = osmo_tls_client_bfd_cb;</span><br><span> wq->bfd.data = sess;</span><br><span style="color: hsl(0, 100%, 40%);">- wq->bfd.when = BSC_FD_READ | BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ wq->bfd.when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span> sess->need_handshake = true;</span><br><span> sess->wqueue = wq;</span><br><span> return true;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcap/+/20744">change 20744</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-pcap/+/20744"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcap </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I7d57919877520710b5dc1f54de1de89cae78093e </div>
<div style="display:none"> Gerrit-Change-Number: 20744 </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>