diff options
| author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-06-07 11:25:49 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-06-07 11:25:49 +0200 |
| commit | f67471fb7f691cfe19622693c2bd59a6b9837cd4 (patch) | |
| tree | 7734d43644834012d973e738be59f9b77778b6f1 /src/input/ipaccess.c | |
| parent | 7b2d18bc4fae9f91c2e046f3641a4cbcb6da2801 (diff) | |
src: use new socket API in libosmocore
get rid of internal copy of openbsc/libcommon/socket.c, we now
use the new socket API available in libosmocore.
Diffstat (limited to 'src/input/ipaccess.c')
| -rw-r--r-- | src/input/ipaccess.c | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 5777d56..9894920 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -41,6 +41,7 @@ #include <talloc.h> #include <osmocom/gsm/abis/e1_input.h> #include <osmocom/gsm/abis/ipaccess.h> +#include <osmocom/core/socket.h> /*#include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> @@ -424,16 +425,35 @@ ipaccess_line_update(struct e1inp_line *line, enum e1inp_line_role role) switch(role) { case E1INP_LINE_R_BSC: /* Listen for OML connections */ - ret = make_sock(&e1h->listen_fd, IPPROTO_TCP, INADDR_ANY, - IPA_TCP_PORT_OML, 0, listen_fd_cb, line); + ret = osmo_sock_init(AF_INET, SOCK_STREAM, IPPROTO_TCP, + "0.0.0.0", IPA_TCP_PORT_OML, 1); if (ret < 0) return ret; + e1h->listen_fd.fd = ret; + e1h->listen_fd.when |= BSC_FD_READ; + e1h->listen_fd.cb = listen_fd_cb; + e1h->listen_fd.data = line; + + if (osmo_fd_register(&e1h->listen_fd) < 0) { + close(ret); + return ret; + } /* Listen for RSL connections */ - ret = make_sock(&e1h->rsl_listen_fd, IPPROTO_TCP, INADDR_ANY, - IPA_TCP_PORT_RSL, 0, rsl_listen_fd_cb, NULL); + ret = osmo_sock_init(AF_INET, SOCK_STREAM, IPPROTO_TCP, + "0.0.0.0", IPA_TCP_PORT_RSL, 1); if (ret < 0) return ret; + + e1h->rsl_listen_fd.fd = ret; + e1h->rsl_listen_fd.when |= BSC_FD_READ; + e1h->rsl_listen_fd.cb = rsl_listen_fd_cb; + e1h->rsl_listen_fd.data = NULL; + + if (osmo_fd_register(&e1h->rsl_listen_fd) < 0) { + close(ret); + return ret; + } break; case E1INP_LINE_R_BTS: /* XXX: no implemented yet. */ |