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

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-el2tpd/+/20765 )

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

Use osmo_fd_setup() whenever applicable

Change-Id: Id6cbb0058b9eb400d69f556232bbe112f257775b
---
M src/l2tpd.c
M src/l2tpd_socket.c
2 files changed, 3 insertions(+), 10 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/src/l2tpd.c b/src/l2tpd.c
index 635394d..f56d5d9 100644
--- a/src/l2tpd.c
+++ b/src/l2tpd.c
@@ -88,10 +88,7 @@
 
 	INIT_LLIST_HEAD(&li->connections);
 
-	li->l2tp_ofd.when = OSMO_FD_READ;
-	li->l2tp_ofd.cb = l2tp_ip_read_cb;
-	li->l2tp_ofd.data = li;
-
+	osmo_fd_setup(&li->l2tp_ofd, -1, OSMO_FD_READ, l2tp_ip_read_cb, li, 0);
 	rc = osmo_sock_init_ofd(&li->l2tp_ofd, AF_INET, SOCK_RAW,
 				IPPROTO_L2TP, li->cfg.bind_ip, 0, 0);
 	if (rc < 0)
diff --git a/src/l2tpd_socket.c b/src/l2tpd_socket.c
index efdb482..209a6fa 100644
--- a/src/l2tpd_socket.c
+++ b/src/l2tpd_socket.c
@@ -83,9 +83,7 @@
 		return 0;
 	}
 
-	conn_bfd->fd = rc;
-	conn_bfd->when = OSMO_FD_READ;
-
+	osmo_fd_setup(conn_bfd, rc, OSMO_FD_READ, conn_bfd->cb, conn_bfd->data, conn_bfd->priv_nr);
 	if (osmo_fd_register(conn_bfd) != 0) {
 		LOGP(state->log_class, LOGL_ERROR, "Failed to register new connection fd\n");
 		close(conn_bfd->fd);
@@ -142,9 +140,7 @@
 		return -1;
 	}
 
-	bfd->when = OSMO_FD_READ;
-	bfd->cb = l2tp_sock_accept;
-
+	osmo_fd_setup(bfd, bfd->fd, OSMO_FD_READ, l2tp_sock_accept, NULL, 0);
 	rc = osmo_fd_register(bfd);
 	if (rc < 0) {
 		LOGP(state->log_class, LOGL_ERROR, "Could not register listen fd: %d\n", rc);

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

Gerrit-Project: osmo-el2tpd
Gerrit-Branch: master
Gerrit-Change-Id: Id6cbb0058b9eb400d69f556232bbe112f257775b
Gerrit-Change-Number: 20765
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201021/9311c4f8/attachment.htm>