cellular-infrastructure
/
osmo-el2tpd
mirror of https://gerrit.osmocom.org/osmo-el2tpd
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use osmo_fd_setup() whenever applicable 

Change-Id: Id6cbb0058b9eb400d69f556232bbe112f257775b
This commit is contained in:
Harald Welte 2020-10-19 12:10:47 +02:00
parent ca8ef91e0f
commit 0e7068f40c
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/l2tpd.c
View File

@ -88,10 +88,7 @@ static int l2tpd_instance_start(struct l2tpd_instance *li)
INIT_LLIST_HEAD(&li->connections); INIT_LLIST_HEAD(&li->connections);
li->l2tp_ofd.when = OSMO_FD_READ; osmo_fd_setup(&li->l2tp_ofd, -1, OSMO_FD_READ, l2tp_ip_read_cb, li, 0);
li->l2tp_ofd.cb = l2tp_ip_read_cb;
li->l2tp_ofd.data = li;
rc = osmo_sock_init_ofd(&li->l2tp_ofd, AF_INET, SOCK_RAW, rc = osmo_sock_init_ofd(&li->l2tp_ofd, AF_INET, SOCK_RAW,
IPPROTO_L2TP, li->cfg.bind_ip, 0, 0); IPPROTO_L2TP, li->cfg.bind_ip, 0, 0);
if (rc < 0) if (rc < 0)

8
src/l2tpd_socket.c
View File

@ -83,9 +83,7 @@ static int l2tp_sock_accept(struct osmo_fd *bfd, unsigned int flags)
return 0; return 0;
} }
conn_bfd->fd = rc; osmo_fd_setup(conn_bfd, rc, OSMO_FD_READ, conn_bfd->cb, conn_bfd->data, conn_bfd->priv_nr);
conn_bfd->when = OSMO_FD_READ;
if (osmo_fd_register(conn_bfd) != 0) { if (osmo_fd_register(conn_bfd) != 0) {
LOGP(state->log_class, LOGL_ERROR, "Failed to register new connection fd\n"); LOGP(state->log_class, LOGL_ERROR, "Failed to register new connection fd\n");
close(conn_bfd->fd); close(conn_bfd->fd);
@ -142,9 +140,7 @@ int l2tp_socket_init(struct l2tp_socket_state *state, const char *sock_path, int
return -1; return -1;
} }
bfd->when = OSMO_FD_READ; osmo_fd_setup(bfd, bfd->fd, OSMO_FD_READ, l2tp_sock_accept, NULL, 0);
bfd->cb = l2tp_sock_accept;
rc = osmo_fd_register(bfd); rc = osmo_fd_register(bfd);
if (rc < 0) { if (rc < 0) {
LOGP(state->log_class, LOGL_ERROR, "Could not register listen fd: %d\n", rc); LOGP(state->log_class, LOGL_ERROR, "Could not register listen fd: %d\n", rc);