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 uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/20773 ) Change subject: Use osmo_fd_setup() whenever applicable ...................................................................... Use osmo_fd_setup() whenever applicable Change-Id: I68d14b1c19dd8f1764fdf65afe1a957278255e40 --- M src/gtphub/gtphub.c M src/sgsn/sgsn_libgtp.c 2 files changed, 4 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/73/20773/1 diff --git a/src/gtphub/gtphub.c b/src/gtphub/gtphub.c index 699499f..c24652e 100644 --- a/src/gtphub/gtphub.c +++ b/src/gtphub/gtphub.c @@ -853,10 +853,7 @@ return -1; } - ofd->when = OSMO_FD_READ; - ofd->cb = cb; - ofd->data = data; - ofd->priv_nr = ofd_id; + osmo_fd_setup(ofd, -1, OSMO_FD_READ, cb, data, ofd_id); int rc; rc = osmo_sock_init_ofd(ofd, diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index 45a4a07..8081492 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -776,31 +776,19 @@ if (gsn->mode != GTP_MODE_SGSN) return -EINVAL; - sgi->gtp_fd0.fd = gsn->fd0; - sgi->gtp_fd0.priv_nr = 0; - sgi->gtp_fd0.data = sgi; - sgi->gtp_fd0.when = OSMO_FD_READ; - sgi->gtp_fd0.cb = sgsn_gtp_fd_cb; + osmo_fd_setup(&sgi->gtp_fd0, gsn->fd0, OSMO_FD_READ, sgsn_gtp_fd_cb, sgi, 0); rc = osmo_fd_register(&sgi->gtp_fd0); if (rc < 0) return rc; - sgi->gtp_fd1c.fd = gsn->fd1c; - sgi->gtp_fd1c.priv_nr = 1; - sgi->gtp_fd1c.data = sgi; - sgi->gtp_fd1c.when = OSMO_FD_READ; - sgi->gtp_fd1c.cb = sgsn_gtp_fd_cb; + osmo_fd_setup(&sgi->gtp_fd1c, gsn->fd1c, OSMO_FD_READ, sgsn_gtp_fd_cb, sgi, 1); rc = osmo_fd_register(&sgi->gtp_fd1c); if (rc < 0) { osmo_fd_unregister(&sgi->gtp_fd0); return rc; } - sgi->gtp_fd1u.fd = gsn->fd1u; - sgi->gtp_fd1u.priv_nr = 2; - sgi->gtp_fd1u.data = sgi; - sgi->gtp_fd1u.when = OSMO_FD_READ; - sgi->gtp_fd1u.cb = sgsn_gtp_fd_cb; + osmo_fd_setup(&sgi->gtp_fd1u, gsn->fd1u, OSMO_FD_READ, sgsn_gtp_fd_cb, sgi, 2); rc = osmo_fd_register(&sgi->gtp_fd1u); if (rc < 0) { osmo_fd_unregister(&sgi->gtp_fd0); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/20773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I68d14b1c19dd8f1764fdf65afe1a957278255e40 Gerrit-Change-Number: 20773 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/b26e395a/attachment.htm>