Use OSMO_FD_* instead of deprecated BSC_FD_*

Change-Id: I7d57919877520710b5dc1f54de1de89cae78093e
This commit is contained in:
Harald Welte 2020-10-18 22:39:39 +02:00
parent f93e3dc1f8
commit 20c6ba5a9e
4 changed files with 16 additions and 16 deletions

View File

@ -306,7 +306,7 @@ int osmo_client_capture(struct osmo_pcap_client *client, const char *device)
}
client->fd.fd = fd;
client->fd.when = BSC_FD_READ;
client->fd.when = OSMO_FD_READ;
client->fd.cb = pcap_read_cb;
client->fd.data = client;
if (osmo_fd_register(&client->fd) != 0) {

View File

@ -120,7 +120,7 @@ static void tls_error_cb(struct osmo_tls_session *session)
int conn_cb(struct osmo_fd *fd, unsigned int what)
{
/* finally the socket is connected... continue */
if (what & BSC_FD_WRITE) {
if (what & OSMO_FD_WRITE) {
struct osmo_pcap_client_conn *conn = fd->data;
/*
* The write queue needs to work differently for GNUtls. Before we can
@ -144,7 +144,7 @@ int conn_cb(struct osmo_fd *fd, unsigned int what)
}
}
if (what & BSC_FD_READ)
if (what & OSMO_FD_READ)
read_cb(fd);
return 0;
}
@ -284,7 +284,7 @@ void osmo_client_connect(struct osmo_pcap_client_conn *conn)
srv_port = 0;
sock_type = SOCK_RAW;
sock_proto = IPPROTO_IPIP;
conn->wqueue.bfd.when = BSC_FD_WRITE;
conn->wqueue.bfd.when = OSMO_FD_WRITE;
break;
default:
OSMO_ASSERT(0);
@ -306,9 +306,9 @@ void osmo_client_connect(struct osmo_pcap_client_conn *conn)
conn->wqueue.bfd.cb = conn_cb;
conn->wqueue.bfd.data = conn;
if (conn->protocol == PROTOCOL_IPIP)
conn->wqueue.bfd.when = BSC_FD_WRITE;
conn->wqueue.bfd.when = OSMO_FD_WRITE;
else
conn->wqueue.bfd.when = BSC_FD_READ | BSC_FD_WRITE;
conn->wqueue.bfd.when = OSMO_FD_READ | OSMO_FD_WRITE;
}
void osmo_client_reconnect(struct osmo_pcap_client_conn *conn)

View File

@ -542,7 +542,7 @@ static void new_connection(struct osmo_pcap_server *server,
} else {
client->rem_wq.bfd.cb = osmo_wqueue_bfd_cb;
client->rem_wq.bfd.data = client;
client->rem_wq.bfd.when = BSC_FD_READ;
client->rem_wq.bfd.when = OSMO_FD_READ;
client->rem_wq.read_cb = read_cb;
client->direct_read = true;
}
@ -602,7 +602,7 @@ int osmo_pcap_server_listen(struct osmo_pcap_server *server)
}
server->listen_fd.fd = fd;
server->listen_fd.when = BSC_FD_READ;
server->listen_fd.when = OSMO_FD_READ;
server->listen_fd.cb = accept_cb;
server->listen_fd.data = server;

View File

@ -192,9 +192,9 @@ static int need_handshake(struct osmo_tls_session *tls_session)
/* handshake is done. start writing if we are allowed to */
LOGP(DTLS, LOGL_NOTICE, "TLS handshake done.\n");
if (!llist_empty(&tls_session->wqueue->msg_queue))
tls_session->wqueue->bfd.when = BSC_FD_WRITE | BSC_FD_READ;
tls_session->wqueue->bfd.when = OSMO_FD_WRITE | OSMO_FD_READ;
else
tls_session->wqueue->bfd.when = BSC_FD_READ;
tls_session->wqueue->bfd.when = OSMO_FD_READ;
tls_session->need_handshake = false;
release_keys(tls_session);
if (tls_session->handshake_done)
@ -227,7 +227,7 @@ static int tls_read(struct osmo_tls_session *sess)
static int tls_write(struct osmo_tls_session *sess)
{
int rc;
sess->wqueue->bfd.when &= ~BSC_FD_WRITE;
sess->wqueue->bfd.when &= ~OSMO_FD_WRITE;
if (llist_empty(&sess->wqueue->msg_queue))
return 0;
@ -252,7 +252,7 @@ static int tls_write(struct osmo_tls_session *sess)
}
if (sess->need_resend || !llist_empty(&sess->wqueue->msg_queue))
sess->wqueue->bfd.when |= BSC_FD_WRITE;
sess->wqueue->bfd.when |= OSMO_FD_WRITE;
return rc;
}
@ -263,14 +263,14 @@ int osmo_tls_client_bfd_cb(struct osmo_fd *fd, unsigned what)
if (sess->need_handshake)
return need_handshake(sess);
if (what & BSC_FD_READ) {
if (what & OSMO_FD_READ) {
int rc = tls_read(sess);
if (rc <= 0) {
sess->error(sess);
return rc;
}
}
if (what & BSC_FD_WRITE) {
if (what & OSMO_FD_WRITE) {
int rc = tls_write(sess);
if (rc < 0) {
sess->error(sess);
@ -437,7 +437,7 @@ bool osmo_tls_init_server_session(struct osmo_pcap_conn *conn,
GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT);
wq->bfd.cb = osmo_tls_client_bfd_cb;
wq->bfd.data = sess;
wq->bfd.when = BSC_FD_READ | BSC_FD_WRITE;
wq->bfd.when = OSMO_FD_READ | OSMO_FD_WRITE;
sess->need_handshake = true;
sess->wqueue = wq;
return true;
@ -533,7 +533,7 @@ bool osmo_tls_init_client_session(struct osmo_pcap_client_conn *client)
GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT);
wq->bfd.cb = osmo_tls_client_bfd_cb;
wq->bfd.data = sess;
wq->bfd.when = BSC_FD_READ | BSC_FD_WRITE;
wq->bfd.when = OSMO_FD_READ | OSMO_FD_WRITE;
sess->need_handshake = true;
sess->wqueue = wq;
return true;