aboutsummaryrefslogtreecommitdiffstats
path: root/src/ctrl/control_if.c
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2014-08-20 19:50:04 +0200
committerHarald Welte <laforge@gnumonks.org>2014-08-21 15:34:17 +0200
commit1238cc64d79308c3db46baa7f755f17ac3db9e49 (patch)
tree2323e625470e604a586ed41c78c4f1991f5e54c4 /src/ctrl/control_if.c
parente1a502b0df4a2e8ca90db42549fc22f00c2b72f6 (diff)
libctrl: remove openbsc headers, convert from make_sock to libosmocore
Diffstat (limited to 'src/ctrl/control_if.c')
-rw-r--r--src/ctrl/control_if.c24
1 files changed, 8 insertions, 16 deletions
diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c
index 156a24f6..7ce8bf60 100644
--- a/src/ctrl/control_if.c
+++ b/src/ctrl/control_if.c
@@ -38,31 +38,21 @@
#include <sys/socket.h>
#include <sys/types.h>
-#include <openbsc/control_cmd.h>
-#include <openbsc/control_if.h>
-#include <openbsc/debug.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/ipaccess.h>
-#include <openbsc/socket.h>
-#include <osmocom/abis/subchan_demux.h>
-
-#include <openbsc/abis_rsl.h>
-#include <openbsc/abis_nm.h>
+#include <osmocom/ctrl/control_cmd.h>
+#include <osmocom/ctrl/control_if.h>
#include <osmocom/core/msgb.h>
#include <osmocom/core/rate_ctr.h>
#include <osmocom/core/select.h>
#include <osmocom/core/statistics.h>
#include <osmocom/core/talloc.h>
+#include <osmocom/core/socket.h>
-#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/protocol/ipaccess.h>
#include <osmocom/vty/command.h>
#include <osmocom/vty/vector.h>
-#include <osmocom/abis/e1_input.h>
-#include <osmocom/abis/ipa.h>
-
vector ctrl_node_vec;
/* Send command to all */
@@ -551,8 +541,10 @@ struct ctrl_handle *controlif_setup(struct gsm_network *gsmnet, uint16_t port,
goto err;
/* Listen for control connections */
- ret = make_sock(&ctrl->listen_fd, IPPROTO_TCP, INADDR_LOOPBACK, port,
- 0, listen_fd_cb, ctrl);
+ ctrl->listen_fd.cb = listen_fd_cb;
+ ctrl->listen_fd.data = ctrl;
+ ret = osmo_sock_init_ofd(&ctrl->listen_fd, AF_INET, SOCK_STREAM, IPPROTO_TCP,
+ "127.0.0.1", port, OSMO_SOCK_F_BIND);
if (ret < 0)
goto err_vec;