diff options
| author | Harald Welte <laforge@gnumonks.org> | 2012-06-16 14:59:56 +0800 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2012-06-16 15:14:00 +0800 |
| commit | ea34a4e3a7741c0b03fc421e2850234b82a0977c (patch) | |
| tree | 6a57247a94bf85ac6b24261fcff831eeb3593920 /openbsc/src/libgb/gprs_ns.c | |
| parent | 704cb8680bbdf62cdaa2583fd5072791b7589a90 (diff) | |
split libgb into a separate library for outside use
This also removes the dependency to osmo_sock() inside libcommon and
replaces it with osmo_sock_* from libosmocore
Diffstat (limited to 'openbsc/src/libgb/gprs_ns.c')
| -rw-r--r-- | openbsc/src/libgb/gprs_ns.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/openbsc/src/libgb/gprs_ns.c b/openbsc/src/libgb/gprs_ns.c index 39ccd2851..c1efa4318 100644 --- a/openbsc/src/libgb/gprs_ns.c +++ b/openbsc/src/libgb/gprs_ns.c @@ -68,18 +68,18 @@ #include <arpa/inet.h> -#include <openbsc/gsm_data.h> #include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> #include <osmocom/core/talloc.h> #include <osmocom/core/select.h> #include <osmocom/core/rate_ctr.h> +#include <osmocom/core/socket.h> +#include <osmocom/gprs/gprs_ns.h> +#include <osmocom/gprs/gprs_bssgp.h> +#include <osmocom/gprs/gprs_ns_frgre.h> + #include <openbsc/debug.h> #include <openbsc/signal.h> -#include <openbsc/gprs_ns.h> -#include <openbsc/gprs_bssgp.h> -#include <openbsc/gprs_ns_frgre.h> -#include <openbsc/socket.h> static const struct tlv_definition ns_att_tlvdef = { .def = { @@ -1026,14 +1026,19 @@ static int nsip_fd_cb(struct osmo_fd *bfd, unsigned int what) */ int gprs_ns_nsip_listen(struct gprs_ns_inst *nsi) { + struct in_addr in; int ret; - ret = make_sock(&nsi->nsip.fd, IPPROTO_UDP, nsi->nsip.local_ip, - nsi->nsip.local_port, 0, nsip_fd_cb, NULL); + in.s_addr = htonl(nsi->nsip.local_ip); + + nsi->nsip.fd.cb = nsip_fd_cb; + nsi->nsip.fd.data = nsi; + ret = osmo_sock_init_ofd(&nsi->nsip.fd, AF_INET, SOCK_DGRAM, + IPPROTO_UDP, inet_ntoa(in), + nsi->nsip.local_port, OSMO_SOCK_F_BIND); if (ret < 0) return ret; - nsi->nsip.fd.data = nsi; return ret; } |