Change in osmo-msc[master]: Use osmo_fd_setup() whenever applicable

[laforge]

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


Change subject: Use osmo_fd_setup() whenever applicable
......................................................................

Use osmo_fd_setup() whenever applicable

Change-Id: Ib570e2ada619b72001d76d2cae159d78f09d6fb6
---
M src/libmsc/mncc_sock.c
M src/libmsc/smpp_smsc.c
2 files changed, 3 insertions(+), 12 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/84/20784/1

diff --git a/src/libmsc/mncc_sock.c b/src/libmsc/mncc_sock.c
index a3527ef..4c1362d 100644
--- a/src/libmsc/mncc_sock.c
+++ b/src/libmsc/mncc_sock.c
@@ -250,11 +250,7 @@
 		return 0;
 	}
 
-	conn_bfd->fd = rc;
-	conn_bfd->when = OSMO_FD_READ;
-	conn_bfd->cb = mncc_sock_cb;
-	conn_bfd->data = state;
-
+	osmo_fd_setup(conn_bfd, rc, OSMO_FD_READ, mncc_sock_cb, state, 0);
 	if (osmo_fd_register(conn_bfd) != 0) {
 		LOGP(DMNCC, LOGL_ERROR, "Failed to register new connection fd\n");
 		close(conn_bfd->fd);
@@ -294,10 +290,7 @@
 		return -1;
 	}
 
-	bfd->when = OSMO_FD_READ;
-	bfd->cb = mncc_sock_accept;
-	bfd->data = state;
-
+	osmo_fd_setup(bfd, bfd->fd, OSMO_FD_READ, mncc_sock_accept, state, 0);
 	rc = osmo_fd_register(bfd);
 	if (rc < 0) {
 		LOGP(DMNCC, LOGL_ERROR, "Could not register listen fd: %d\n", rc);
diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c
index 2d82d98..a5c6165 100644
--- a/src/libmsc/smpp_smsc.c
+++ b/src/libmsc/smpp_smsc.c
@@ -929,9 +929,7 @@
 	esme_inc_seq_nr(esme);
 	esme->smsc = smsc;
 	osmo_wqueue_init(&esme->wqueue, 10);
-	esme->wqueue.bfd.fd = fd;
-	esme->wqueue.bfd.data = esme;
-	esme->wqueue.bfd.when = OSMO_FD_READ;
+	osmo_fd_setup(&esme->wqueue.bfd, fd, OSMO_FD_READ, osmo_wqueue_bfd_cb, esme, 0);
 
 	if (osmo_fd_register(&esme->wqueue.bfd) != 0) {
 		close(fd);

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

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Ib570e2ada619b72001d76d2cae159d78f09d6fb6
Gerrit-Change-Number: 20784
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/20201019/bc697021/attachment.htm>