Change in osmo-pcap[master]: Use OSMO_FD_* instead of deprecated BSC_FD_*

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Sun Oct 18 20:39:56 UTC 2020


laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/20744 )


Change subject: Use OSMO_FD_* instead of deprecated BSC_FD_*
......................................................................

Use OSMO_FD_* instead of deprecated BSC_FD_*

Change-Id: I7d57919877520710b5dc1f54de1de89cae78093e
---
M src/osmo_client_core.c
M src/osmo_client_network.c
M src/osmo_server_network.c
M src/osmo_tls.c
4 files changed, 16 insertions(+), 16 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/44/20744/1

diff --git a/src/osmo_client_core.c b/src/osmo_client_core.c
index a56ebb4..c49bc1b 100644
--- a/src/osmo_client_core.c
+++ b/src/osmo_client_core.c
@@ -306,7 +306,7 @@
 	}
 
 	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) {
diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c
index 2ace22e..c89847d 100644
--- a/src/osmo_client_network.c
+++ b/src/osmo_client_network.c
@@ -120,7 +120,7 @@
 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 @@
 		}
 	}
 
-	if (what & BSC_FD_READ)
+	if (what & OSMO_FD_READ)
 		read_cb(fd);
 	return 0;
 }
@@ -284,7 +284,7 @@
 		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 @@
 	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)
diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c
index 55934be..164b161 100644
--- a/src/osmo_server_network.c
+++ b/src/osmo_server_network.c
@@ -542,7 +542,7 @@
 	} 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 @@
 	}
 
 	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;
 
diff --git a/src/osmo_tls.c b/src/osmo_tls.c
index 0be01a6..56fedbb 100644
--- a/src/osmo_tls.c
+++ b/src/osmo_tls.c
@@ -192,9 +192,9 @@
 		/* 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_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 @@
 	}
 
 	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 @@
 	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 @@
 					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 @@
 					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;

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/20744
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-Change-Id: I7d57919877520710b5dc1f54de1de89cae78093e
Gerrit-Change-Number: 20744
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201018/74350adc/attachment.htm>


More information about the gerrit-log mailing list