From ea62a38b5d770f31e3d3cc635c52d4854f585fb3 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 23 Mar 2014 16:25:16 +0100 Subject: ctrl: Move the lookup into a separate file in preparation for GPRS For GPRS the look-up via bts/trx does not make any sense and would introduce bad depdencies for the SGSN. Move the look-up code to a new file and introduce new setup methods. --- openbsc/include/openbsc/control_cmd.h | 1 - openbsc/include/openbsc/control_if.h | 12 ++- openbsc/src/libctrl/control_if.c | 153 +--------------------------------- 3 files changed, 14 insertions(+), 152 deletions(-) diff --git a/openbsc/include/openbsc/control_cmd.h b/openbsc/include/openbsc/control_cmd.h index cd7b7b6d..725dce06 100644 --- a/openbsc/include/openbsc/control_cmd.h +++ b/openbsc/include/openbsc/control_cmd.h @@ -77,7 +77,6 @@ struct ctrl_cmd_map { int ctrl_cmd_exec(vector vline, struct ctrl_cmd *command, vector node, void *data); int ctrl_cmd_install(enum ctrl_node_type node, struct ctrl_cmd_element *cmd); -int ctrl_cmd_handle(struct ctrl_cmd *cmd, void *data); int ctrl_cmd_send(struct osmo_wqueue *queue, struct ctrl_cmd *cmd); int ctrl_cmd_send_to_all(struct ctrl_handle *ctrl, struct ctrl_cmd *cmd); struct ctrl_cmd *ctrl_cmd_parse(void *ctx, struct msgb *msg); diff --git a/openbsc/include/openbsc/control_if.h b/openbsc/include/openbsc/control_if.h index 6afc86d7..d103332a 100644 --- a/openbsc/include/openbsc/control_if.h +++ b/openbsc/include/openbsc/control_if.h @@ -5,17 +5,25 @@ #include #include +typedef int (*ctrl_cmd_handler)(struct ctrl_cmd *, void *); + struct ctrl_handle { struct osmo_fd listen_fd; struct gsm_network *gsmnet; + ctrl_cmd_handler handler; + /* List of control connections */ struct llist_head ccon_list; }; + int ctrl_cmd_send(struct osmo_wqueue *queue, struct ctrl_cmd *cmd); -int ctrl_cmd_handle(struct ctrl_cmd *cmd, void *data); -struct ctrl_handle *controlif_setup(struct gsm_network *gsmnet, uint16_t port); +struct ctrl_handle *controlif_setup(struct gsm_network *, uint16_t port, + ctrl_cmd_handler handler); +struct ctrl_handle *bsc_controlif_setup(struct gsm_network *gsmnet, uint16_t port); + +int bsc_ctrl_cmd_handle(struct ctrl_cmd *cmd, void *data); #endif /* _CONTROL_IF_H */ diff --git a/openbsc/src/libctrl/control_if.c b/openbsc/src/libctrl/control_if.c index b5db31da..2727d0dd 100644 --- a/openbsc/src/libctrl/control_if.c +++ b/openbsc/src/libctrl/control_if.c @@ -115,153 +115,6 @@ struct ctrl_cmd *ctrl_cmd_trap(struct ctrl_cmd *cmd) return trap; } -static int get_num(vector vline, int i, long *num) -{ - char *token, *tmp; - - if (i >= vector_active(vline)) - return 0; - token = vector_slot(vline, i); - - errno = 0; - if (token[0] == '\0') - return 0; - - *num = strtol(token, &tmp, 10); - if (tmp[0] != '\0' || errno != 0) - return 0; - - return 1; -} - -int ctrl_cmd_handle(struct ctrl_cmd *cmd, void *data) -{ - char *token, *request; - long num; - int i, j, ret, node; - - struct gsm_network *net = data; - struct gsm_bts *bts = NULL; - struct gsm_bts_trx *trx = NULL; - struct gsm_bts_trx_ts *ts = NULL; - vector vline, cmdvec, cmds_vec; - - ret = CTRL_CMD_ERROR; - cmd->reply = NULL; - node = CTRL_NODE_ROOT; - cmd->node = net; - - request = talloc_strdup(tall_bsc_ctx, cmd->variable); - if (!request) - goto err; - - for (i=0;ireply = "cmd_make_strvec failed."; - goto err; - } - - for (i=0;inode = bts; - node = CTRL_NODE_BTS; - } else if (!strcmp(token, "trx")) { - if (!bts) - goto err_missing; - i++; - if (!get_num(vline, i, &num)) - goto err_index; - - trx = gsm_bts_trx_num(bts, num); - if (!trx) - goto err_missing; - cmd->node = trx; - node = CTRL_NODE_TRX; - } else if (!strcmp(token, "ts")) { - if (!trx) - goto err_missing; - i++; - if (!get_num(vline, i, &num)) - goto err_index; - - if ((num >= 0) && (num < TRX_NR_TS)) - ts = &trx->ts[num]; - if (!ts) - goto err_missing; - cmd->node = ts; - node = CTRL_NODE_TS; - } else { - /* If we're here the rest must be the command */ - cmdvec = vector_init(vector_active(vline)-i); - for (j=i; jreply = "Command not found."; - vector_free(cmdvec); - break; - } - - ret = ctrl_cmd_exec(cmdvec, cmd, cmds_vec, data); - - vector_free(cmdvec); - break; - } - - if (i+1 == vector_active(vline)) - cmd->reply = "Command not present."; - } - - cmd_free_strvec(vline); - -err: - if (!cmd->reply) { - LOGP(DCTRL, LOGL_ERROR, "cmd->reply has not been set.\n"); - if (ret == CTRL_CMD_ERROR) - cmd->reply = "An error has occured."; - else - cmd->reply = "Command has been handled."; - } - - if (ret == CTRL_CMD_ERROR) - cmd->type = CTRL_TYPE_ERROR; - return ret; - -err_missing: - cmd_free_strvec(vline); - cmd->type = CTRL_TYPE_ERROR; - cmd->reply = "Error while resolving object"; - return ret; -err_index: - cmd_free_strvec(vline); - cmd->type = CTRL_TYPE_ERROR; - cmd->reply = "Error while parsing the index."; - return ret; -} - static void control_close_conn(struct ctrl_connection *ccon) { osmo_wqueue_clear(&ccon->write_queue); @@ -320,7 +173,7 @@ static int handle_control_read(struct osmo_fd * bfd) if (cmd) { cmd->ccon = ccon; - if (ctrl_cmd_handle(cmd, ctrl->gsmnet) != CTRL_CMD_HANDLED) { + if (ctrl->handler(cmd, ctrl->gsmnet) != CTRL_CMD_HANDLED) { ctrl_cmd_send(queue, cmd); talloc_free(cmd); } @@ -675,7 +528,8 @@ static int verify_counter(struct ctrl_cmd *cmd, const char *value, void *data) return 0; } -struct ctrl_handle *controlif_setup(struct gsm_network *gsmnet, uint16_t port) +struct ctrl_handle *controlif_setup(struct gsm_network *gsmnet, uint16_t port, + ctrl_cmd_handler handler) { int ret; struct ctrl_handle *ctrl; @@ -687,6 +541,7 @@ struct ctrl_handle *controlif_setup(struct gsm_network *gsmnet, uint16_t port) INIT_LLIST_HEAD(&ctrl->ccon_list); ctrl->gsmnet = gsmnet; + ctrl->handler = handler; ctrl_node_vec = vector_init(5); if (!ctrl_node_vec) -- cgit v1.2.3