diff options
Diffstat (limited to 'src/gprs/sgsn_ares.c')
| -rw-r--r-- | src/gprs/sgsn_ares.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gprs/sgsn_ares.c b/src/gprs/sgsn_ares.c index 623809911..38e31e131 100644 --- a/src/gprs/sgsn_ares.c +++ b/src/gprs/sgsn_ares.c @@ -19,12 +19,12 @@ * */ -#include <openbsc/sgsn.h> -#include <openbsc/debug.h> +#include <osmocom/sgsn/sgsn.h> +#include <osmocom/sgsn/debug.h> #include <netdb.h> -extern void *tall_bsc_ctx; +extern void *tall_sgsn_ctx; struct cares_event_fd { struct llist_head head; @@ -51,8 +51,8 @@ static int ares_osmo_fd_cb(struct osmo_fd *fd, unsigned int what) LOGP(DGPRS, LOGL_DEBUG, "C-ares fd(%d) ready(%d)\n", fd->fd, what); ares_process_fd(sgsn->ares_channel, - (what & BSC_FD_READ) ? fd->fd : ARES_SOCKET_BAD, - (what & BSC_FD_WRITE) ? fd->fd : ARES_SOCKET_BAD); + (what & OSMO_FD_READ) ? fd->fd : ARES_SOCKET_BAD, + (what & OSMO_FD_WRITE) ? fd->fd : ARES_SOCKET_BAD); osmo_ares_reschedule(sgsn); return 0; } @@ -110,7 +110,7 @@ static void setup_ares_osmo_fd(void *data, int fd, int read, int write) } LOGP(DGPRS, LOGL_DEBUG, "Registering C-ares fd (%d)\n", fd); - ufd = talloc_zero(tall_bsc_ctx, struct cares_event_fd); + ufd = talloc_zero(tall_sgsn_ctx, struct cares_event_fd); ufd->fd.fd = fd; ufd->fd.cb = ares_osmo_fd_cb; ufd->fd.data = data; @@ -120,14 +120,14 @@ static void setup_ares_osmo_fd(void *data, int fd, int read, int write) update_fd: if (read) - ufd->fd.when |= BSC_FD_READ; + ufd->fd.when |= OSMO_FD_READ; else - ufd->fd.when &= ~BSC_FD_READ; + ufd->fd.when &= ~OSMO_FD_READ; if (write) - ufd->fd.when |= BSC_FD_WRITE; + ufd->fd.when |= OSMO_FD_WRITE; else - ufd->fd.when &= ~BSC_FD_WRITE; + ufd->fd.when &= ~OSMO_FD_WRITE; osmo_ares_reschedule(sgsn); } @@ -137,7 +137,7 @@ int sgsn_ares_query(struct sgsn_instance *sgsn, const char *name, { struct cares_cb_data *cb_data; - cb_data = talloc_zero(tall_bsc_ctx, struct cares_cb_data); + cb_data = talloc_zero(tall_sgsn_ctx, struct cares_cb_data); cb_data->cb = cb; cb_data->data = data; ares_gethostbyname(sgsn->ares_channel, name, AF_INET, ares_cb, cb_data); |