paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-11-03 05:23:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

libctrl, osmo-bsc: Get rid of net prefix

Browse Source 
net is now implicit in the root node
This commit is contained in:
Daniel Willmann
2011-08-25 16:37:45 +02:00
parent 68399ea77e
commit b59f450314
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,6 @@
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

@@ -137,9 +137,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;
@@ -147,8 +146,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)
@@ -171,13 +170,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++;

4
openbsc/src/osmo-bsc/osmo_bsc_ctrl.c
View File

@@ -67,7 +67,7 @@ static void generate_location_state_trap(struct gsm_bts *bts, struct bsc_msc_con
}
cmd->id = "0";
cmd->variable = talloc_asprintf(cmd, "net.bts.%i.location-state", bts->nr);
cmd->variable = talloc_asprintf(cmd, "bts.%i.location-state", bts->nr);
/* Prepare the location reply */
cmd->node = bts;
@@ -318,7 +318,7 @@ int bsc_ctrl_cmds_install()
rc = ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_loc);
if (rc)
goto end;
rc = ctrl_cmd_install(CTRL_NODE_NET, &cmd_net_rf_lock);
rc = ctrl_cmd_install(CTRL_NODE_ROOT, &cmd_net_rf_lock);
if (rc)
goto end;
end: