cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

Fix bsc_ctrl_node_lookup after libctrl changes 

As bsc_ctrl_node_lookup() is called for each iteration,
the variables 'bts' and 'trx' are no longer static accross multiple
calls, which means we need a different way to determine if we are in the
right node while matching for a trx or a ts.
This commit is contained in:
Harald Welte 2014-08-21 18:25:11 +02:00
parent 0ad2382131
commit e263187a36
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openbsc/src/libbsc/bsc_ctrl_lookup.c
View File

@ -51,7 +51,7 @@ static int bsc_ctrl_node_lookup(void *data, vector vline, int *node_type,
* 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)
if (*node_type != CTRL_NODE_ROOT || !net)
goto err_missing;
(*i)++;
if (!ctrl_parse_get_num(vline, *i, &num))
@ -63,8 +63,9 @@ static int bsc_ctrl_node_lookup(void *data, vector vline, int *node_type,
*node_data = bts;
*node_type = CTRL_NODE_BTS;
} else if (!strcmp(token, "trx")) {
if (!bts)
if (*node_type != CTRL_NODE_BTS || !*node_data)
goto err_missing;
bts = *node_data;
(*i)++;
if (!ctrl_parse_get_num(vline, *i, &num))
goto err_index;
@ -75,8 +76,9 @@ static int bsc_ctrl_node_lookup(void *data, vector vline, int *node_type,
*node_data = trx;
*node_type = CTRL_NODE_TRX;
} else if (!strcmp(token, "ts")) {
if (!trx)
if (*node_type != CTRL_NODE_TRX || !*node_data)
goto err_missing;
trx = *node_data;
(*i)++;
if (!ctrl_parse_get_num(vline, *i, &num))
goto err_index;