osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

libctrl, osmo-bsc: Get rid of net prefix 

net is now implicit in the root node
This commit is contained in:
Daniel Willmann 2011-08-25 16:37:45 +02:00 committed by Harald Welte
parent 3463941c72
commit 9c97493c5c
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openbsc/include/openbsc/control_cmd.h
View File

@ -14,7 +14,6 @@ struct ctrl_handle;
enum ctrl_node_type {
CTRL_NODE_ROOT, /* Root elements */
CTRL_NODE_NET, /* Network specific (net.) */
CTRL_NODE_BTS, /* BTS specific (net.btsN.) */
CTRL_NODE_TRX, /* TRX specific (net.btsN.trxM.) */
CTRL_NODE_TS, /* TS specific (net.btsN.trxM.tsI.) */

13
openbsc/src/libctrl/control_if.c
View File

@ -139,9 +139,8 @@ int ctrl_cmd_handle(struct ctrl_cmd *cmd, void *data)
char *token, *request;
long num;
int i, j, ret, node;
struct gsm_network *gsmnet = data;
struct gsm_network *net = NULL;
struct gsm_network *net = data;
struct gsm_bts *bts = NULL;
struct gsm_bts_trx *trx = NULL;
struct gsm_bts_trx_ts *ts = NULL;
@ -149,8 +148,8 @@ int ctrl_cmd_handle(struct ctrl_cmd *cmd, void *data)
ret = CTRL_CMD_ERROR;
cmd->reply = "Someone forgot to fill in the reply.";
cmd->node = NULL;
node = CTRL_NODE_ROOT;
cmd->node = net;
request = talloc_strdup(tall_bsc_ctx, cmd->variable);
if (!request)
@ -173,13 +172,7 @@ int ctrl_cmd_handle(struct ctrl_cmd *cmd, void *data)
/* 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, "net")) {
net = gsmnet;
if (!net)
goto err_missing;
cmd->node = net;
node = CTRL_NODE_NET;
} else if (!strcmp(token, "bts")) {
if (!strcmp(token, "bts")) {
if (!net)
goto err_missing;
i++;