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.orglaforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/20749 ) Change subject: Use osmo_fd_setup() wherever applicable ...................................................................... Use osmo_fd_setup() wherever applicable Change-Id: Ifb90e00036cc51ef02f3cf4dda1ff7dcd1f8a5b5 --- M examples/rs232-write.c M examples/stream-client.c M examples/stream-server.c M src/datagram.c M src/rs232.c M src/stream.c 6 files changed, 10 insertions(+), 36 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/examples/rs232-write.c b/examples/rs232-write.c index 508c64a..8639c49 100644 --- a/examples/rs232-write.c +++ b/examples/rs232-write.c @@ -376,10 +376,7 @@ LOGP(DRS232TEST, LOGL_ERROR, "OOM\n"); exit(EXIT_FAILURE); } - kbd_ofd->fd = STDIN_FILENO; - kbd_ofd->when = OSMO_FD_READ; - kbd_ofd->data = NULL; - kbd_ofd->cb = kbd_cb; + osmo_fd_setup(kbd_ofd, STDIN_FILENO, OSMO_FD_READ, kbd_cb, NULL, 0); rc = osmo_fd_register(kbd_ofd); if (rc < 0) { LOGP(DRS232TEST, LOGL_ERROR, "FD Register\n"); diff --git a/examples/stream-client.c b/examples/stream-client.c index fd1a517..428402e 100644 --- a/examples/stream-client.c +++ b/examples/stream-client.c @@ -141,10 +141,7 @@ LOGP(DSTREAMTEST, LOGL_ERROR, "OOM\n"); exit(EXIT_FAILURE); } - kbd_ofd->fd = STDIN_FILENO; - kbd_ofd->when = OSMO_FD_READ; - kbd_ofd->data = conn; - kbd_ofd->cb = kbd_cb; + osmo_fd_setup(kbd_ofd, STDIN_FILENO, OSMO_FD_READ, kbd_cb, conn, 0); rc = osmo_fd_register(kbd_ofd); if (rc < 0) { LOGP(DSTREAMTEST, LOGL_ERROR, "FD Register\n"); diff --git a/examples/stream-server.c b/examples/stream-server.c index 4946e13..e4ca480 100644 --- a/examples/stream-server.c +++ b/examples/stream-server.c @@ -165,10 +165,7 @@ LOGP(DSTREAMTEST, LOGL_ERROR, "OOM\n"); exit(EXIT_FAILURE); } - kbd_ofd->fd = STDIN_FILENO; - kbd_ofd->when = OSMO_FD_READ; - kbd_ofd->data = srv; - kbd_ofd->cb = kbd_cb; + osmo_fd_setup(kbd_ofd, STDIN_FILENO, OSMO_FD_READ, kbd_cb, srv, 0); osmo_fd_register(kbd_ofd); LOGP(DSTREAMTEST, LOGL_NOTICE, "Entering main loop on %s\n", osmo_stream_srv_link_get_sockname(srv)); diff --git a/src/datagram.c b/src/datagram.c index d2233d5..4bc7bed 100644 --- a/src/datagram.c +++ b/src/datagram.c @@ -135,11 +135,7 @@ if (!conn) return NULL; - conn->ofd.fd = -1; - conn->ofd.when |= OSMO_FD_READ; - conn->ofd.priv_nr = 0; /* XXX */ - conn->ofd.cb = osmo_dgram_tx_fd_cb; - conn->ofd.data = conn; + osmo_fd_setup(&conn->ofd, -1, OSMO_FD_READ, osmo_dgram_tx_fd_cb, conn, 0); INIT_LLIST_HEAD(&conn->tx_queue); return conn; @@ -309,10 +305,7 @@ if (!conn) return NULL; - conn->ofd.fd = -1; - conn->ofd.when |= OSMO_FD_READ; - conn->ofd.cb = osmo_dgram_rx_cb; - conn->ofd.data = conn; + osmo_fd_setup(&conn->ofd, -1, OSMO_FD_READ, osmo_dgram_rx_cb, conn, 0); return conn; } diff --git a/src/rs232.c b/src/rs232.c index 4ebc7b9..8ee658a 100644 --- a/src/rs232.c +++ b/src/rs232.c @@ -223,9 +223,7 @@ return rc; } - bfd->when = OSMO_FD_READ; - bfd->cb = serial_fd_cb; - bfd->data = r; + osmo_fd_setup(bfd, bfd->fd, OSMO_FD_READ, serial_fd_cb, r, 0); rc = osmo_fd_register(bfd); if (rc < 0) { diff --git a/src/stream.c b/src/stream.c index fc51a49..2bb3e75 100644 --- a/src/stream.c +++ b/src/stream.c @@ -680,8 +680,7 @@ osmo_stream_cli_reconnect(cli); return ret; } - cli->ofd.fd = ret; - cli->ofd.when = OSMO_FD_READ | OSMO_FD_WRITE; + osmo_fd_setup(&cli->ofd, ret, OSMO_FD_READ | OSMO_FD_WRITE, cli->ofd.cb, cli->ofd.data, cli->ofd.priv_nr); if (cli->flags & OSMO_STREAM_CLI_F_NODELAY) { ret = setsockopt_nodelay(cli->ofd.fd, cli->proto, 1); @@ -753,8 +752,7 @@ osmo_stream_cli_reconnect(cli); return ret; } - cli->ofd.fd = ret; - cli->ofd.when = OSMO_FD_READ | OSMO_FD_WRITE; + osmo_fd_setup(&cli->ofd, ret, OSMO_FD_READ | OSMO_FD_WRITE, cli->ofd.cb, cli->ofd.data, cli->ofd.priv_nr); if (cli->flags & OSMO_STREAM_CLI_F_NODELAY) { ret = setsockopt_nodelay(cli->ofd.fd, cli->proto, 1); @@ -902,10 +900,7 @@ return NULL; link->proto = IPPROTO_TCP; - link->ofd.fd = -1; - link->ofd.when |= OSMO_FD_READ | OSMO_FD_WRITE; - link->ofd.cb = osmo_stream_srv_fd_cb; - link->ofd.data = link; + osmo_fd_setup(&link->ofd, -1, OSMO_FD_READ | OSMO_FD_WRITE, osmo_stream_srv_fd_cb, link, 0); return link; } @@ -1206,10 +1201,7 @@ return NULL; } conn->srv = link; - conn->ofd.fd = fd; - conn->ofd.data = conn; - conn->ofd.cb = osmo_stream_srv_cb; - conn->ofd.when = OSMO_FD_READ; + osmo_fd_setup(&conn->ofd, fd, OSMO_FD_READ, osmo_stream_srv_cb, conn, 0); conn->cb = cb; conn->closed_cb = closed_cb; conn->data = data; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/20749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ifb90e00036cc51ef02f3cf4dda1ff7dcd1f8a5b5 Gerrit-Change-Number: 20749 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/ae528d23/attachment.htm>