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.
diff --git a/openbsc/src/libctrl/control_if.c b/openbsc/src/libctrl/control_if.c
index b5db31d..2727d0d 100644
--- a/openbsc/src/libctrl/control_if.c
+++ b/openbsc/src/libctrl/control_if.c
@@ -115,153 +115,6 @@
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;i<strlen(request);i++) {
- if (request[i] == '.')
- request[i] = ' ';
- }
-
- vline = cmd_make_strvec(request);
- talloc_free(request);
- if (!vline) {
- cmd->reply = "cmd_make_strvec failed.";
- goto err;
- }
-
- for (i=0;i<vector_active(vline);i++) {
- token = vector_slot(vline, i);
- /* TODO: We need to make sure that the following chars are digits
- * and/or use strtol to check if number conversion was successful
- * Right now something like net.bts_stats will not work */
- if (!strcmp(token, "bts")) {
- if (!net)
- goto err_missing;
- i++;
- if (!get_num(vline, i, &num))
- goto err_index;
-
- bts = gsm_bts_num(net, num);
- if (!bts)
- goto err_missing;
- cmd->node = 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; j<vector_active(vline); j++) {
- vector_set(cmdvec, vector_slot(vline, j));
- }
-
- /* Get the command vector of the right node */
- cmds_vec = vector_lookup(ctrl_node_vec, node);
-
- if (!cmds_vec) {
- cmd->reply = "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 @@
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 @@
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 @@
INIT_LLIST_HEAD(&ctrl->ccon_list);
ctrl->gsmnet = gsmnet;
+ ctrl->handler = handler;
ctrl_node_vec = vector_init(5);
if (!ctrl_node_vec)