aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2020-10-18 22:38:20 +0200
committerHarald Welte <laforge@osmocom.org>2020-10-18 22:38:20 +0200
commit1719abb4094f841f7cc7d26f68ea53061dccbbe2 (patch)
tree553332f5ead03b5d84c29890e934dc4b5232eeb0
parent3ddf4c6933effb889442b16fd8be5782571c3275 (diff)
Use OSMO_FD_* instead of deprecated BSC_FD_*HEADmaster
-rw-r--r--ggsn/ggsn.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c
index 159362f..267637d 100644
--- a/ggsn/ggsn.c
+++ b/ggsn/ggsn.c
@@ -194,7 +194,7 @@ int apn_start(struct apn_ctx *apn)
LOGPAPN(LOGL_INFO, apn, "Opened TUN device %s\n", apn->tun.tun->devname);
/* Register with libosmcoore */
- osmo_fd_setup(&apn->tun.fd, apn->tun.tun->fd, BSC_FD_READ, ggsn_tun_fd_cb, apn, 0);
+ osmo_fd_setup(&apn->tun.fd, apn->tun.tun->fd, OSMO_FD_READ, ggsn_tun_fd_cb, apn, 0);
osmo_fd_register(&apn->tun.fd);
/* Set TUN library callback */
@@ -704,7 +704,7 @@ static int ggsn_tun_fd_cb(struct osmo_fd *fd, unsigned int what)
{
struct apn_ctx *apn = fd->data;
- OSMO_ASSERT(what & BSC_FD_READ);
+ OSMO_ASSERT(what & OSMO_FD_READ);
return tun_decaps(apn->tun.tun);
}
@@ -715,7 +715,7 @@ static int ggsn_gtp_fd_cb(struct osmo_fd *fd, unsigned int what)
struct ggsn_ctx *ggsn = fd->data;
int rc;
- OSMO_ASSERT(what & BSC_FD_READ);
+ OSMO_ASSERT(what & OSMO_FD_READ);
switch (fd->priv_nr) {
case 0:
@@ -809,15 +809,15 @@ int ggsn_start(struct ggsn_ctx *ggsn)
ggsn->gsn->gsnu = ggsn->cfg.gtpu_addr.v4;
/* Register File Descriptors */
- osmo_fd_setup(&ggsn->gtp_fd0, ggsn->gsn->fd0, BSC_FD_READ, ggsn_gtp_fd_cb, ggsn, 0);
+ osmo_fd_setup(&ggsn->gtp_fd0, ggsn->gsn->fd0, OSMO_FD_READ, ggsn_gtp_fd_cb, ggsn, 0);
rc = osmo_fd_register(&ggsn->gtp_fd0);
OSMO_ASSERT(rc == 0);
- osmo_fd_setup(&ggsn->gtp_fd1c, ggsn->gsn->fd1c, BSC_FD_READ, ggsn_gtp_fd_cb, ggsn, 1);
+ osmo_fd_setup(&ggsn->gtp_fd1c, ggsn->gsn->fd1c, OSMO_FD_READ, ggsn_gtp_fd_cb, ggsn, 1);
rc = osmo_fd_register(&ggsn->gtp_fd1c);
OSMO_ASSERT(rc == 0);
- osmo_fd_setup(&ggsn->gtp_fd1u, ggsn->gsn->fd1u, BSC_FD_READ, ggsn_gtp_fd_cb, ggsn, 2);
+ osmo_fd_setup(&ggsn->gtp_fd1u, ggsn->gsn->fd1u, OSMO_FD_READ, ggsn_gtp_fd_cb, ggsn, 2);
rc = osmo_fd_register(&ggsn->gtp_fd1u);
OSMO_ASSERT(rc == 0);