diff options
author | Daniel Willmann <daniel@totalueberwachung.de> | 2011-07-22 17:55:42 +0200 |
---|---|---|
committer | Daniel Willmann <daniel@totalueberwachung.de> | 2011-07-28 19:40:26 +0200 |
commit | 81671d54b0141b2db57df386ebf8dd7131131a24 (patch) | |
tree | 2880fc007e8f99f42649acf2e573d5326dd2f2eb /openbsc/src/libctrl | |
parent | 145c58df93e0388ba012b55fc4b70123fb706601 (diff) |
libctrl: Change controlif_setup so it returns the ctrl handle
nat: Catch up with controlif_setup API change
We now save a control handle reference in the nat
osmo-bsc: Catch up with controlif_setup API change
We now save a control handle reference in the gsm network
Diffstat (limited to 'openbsc/src/libctrl')
-rw-r--r-- | openbsc/src/libctrl/control_if.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/openbsc/src/libctrl/control_if.c b/openbsc/src/libctrl/control_if.c index 4ab3f3a6c..fc28bb69d 100644 --- a/openbsc/src/libctrl/control_if.c +++ b/openbsc/src/libctrl/control_if.c @@ -60,14 +60,6 @@ #include <osmocom/vty/command.h> #include <osmocom/vty/vector.h> -struct ctrl_handle { - struct osmo_fd listen_fd; - struct gsm_network *gsmnet; - - /* List of control connections */ - struct llist_head ccon_list; -}; - vector ctrl_node_vec; int ctrl_cmd_send(struct osmo_wqueue *queue, struct ctrl_cmd *cmd) @@ -606,33 +598,35 @@ int verify_counter(struct ctrl_cmd *cmd, const char *value, void *data) return 0; } -int controlif_setup(struct gsm_network *gsmnet, uint16_t port) +struct ctrl_handle *controlif_setup(struct gsm_network *gsmnet, uint16_t port) { int ret; struct ctrl_handle *ctrl; ctrl = talloc_zero(tall_bsc_ctx, struct ctrl_handle); if (!ctrl) - return -ENOMEM; + return NULL; INIT_LLIST_HEAD(&ctrl->ccon_list); ctrl->gsmnet = gsmnet; ctrl_node_vec = vector_init(5); - if (!ctrl_node_vec) - return -ENOMEM; + if (!ctrl_node_vec) { + talloc_free(ctrl); + return NULL; + } /* Listen for control connections */ ret = make_sock(&ctrl->listen_fd, IPPROTO_TCP, 0, port, 0, listen_fd_cb, ctrl); if (ret < 0) { talloc_free(ctrl); - return ret; + return NULL; } ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_rate_ctr); ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_counter); - return ret; + return ctrl; } |