diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-06-17 14:42:20 +0800 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-06-17 14:42:20 +0800 |
| commit | 7b4a53d537a1d6cb6bfff2c65e3252c2a4ac0aa7 (patch) | |
| tree | a20f2cf12cb0d92f6b1e142ae5e2024afb33f83e | |
| parent | 9c78697fa22ddbb376713019c1adc953552ebb58 (diff) | |
nat: Rename BSC_NODE to NAT_BSC_NODE to avoid future issues.
| -rw-r--r-- | openbsc/include/openbsc/vty.h | 2 | ||||
| -rw-r--r-- | openbsc/src/common_vty.c | 4 | ||||
| -rw-r--r-- | openbsc/src/nat/bsc_nat_vty.c | 20 |
3 files changed, 13 insertions, 13 deletions
diff --git a/openbsc/include/openbsc/vty.h b/openbsc/include/openbsc/vty.h index 3346a2c6c..570f1fd53 100644 --- a/openbsc/include/openbsc/vty.h +++ b/openbsc/include/openbsc/vty.h @@ -31,7 +31,7 @@ enum bsc_vty_node { BSSGP_NODE, OML_NODE, NAT_NODE, - BSC_NODE, + NAT_BSC_NODE, }; #endif diff --git a/openbsc/src/common_vty.c b/openbsc/src/common_vty.c index ffa676d77..1d1ede6bd 100644 --- a/openbsc/src/common_vty.c +++ b/openbsc/src/common_vty.c @@ -76,7 +76,7 @@ enum node_type bsc_vty_go_parent(struct vty *vty) vty->node = CONFIG_NODE; vty->index = NULL; break; - case BSC_NODE: + case NAT_BSC_NODE: vty->node = NAT_NODE; { struct bsc_config *bsc_config = vty->index; @@ -126,7 +126,7 @@ gDEFUN(ournode_exit, vty->index_sub = &ts->trx->description; } break; - case BSC_NODE: + case NAT_BSC_NODE: vty->node = NAT_NODE; { struct bsc_config *bsc_config = vty->index; diff --git a/openbsc/src/nat/bsc_nat_vty.c b/openbsc/src/nat/bsc_nat_vty.c index 66c45f602..eea5dd894 100644 --- a/openbsc/src/nat/bsc_nat_vty.c +++ b/openbsc/src/nat/bsc_nat_vty.c @@ -41,7 +41,7 @@ static struct cmd_node nat_node = { }; static struct cmd_node bsc_node = { - BSC_NODE, + NAT_BSC_NODE, "%s(bsc)#", 1, }; @@ -343,7 +343,7 @@ DEFUN(cfg_bsc, cfg_bsc_cmd, "bsc BSC_NR", "Select a BSC to configure") return CMD_WARNING; vty->index = bsc; - vty->node = BSC_NODE; + vty->node = NAT_BSC_NODE; return CMD_SUCCESS; } @@ -541,14 +541,14 @@ int bsc_nat_vty_init(struct bsc_nat *nat) /* BSC subgroups */ install_element(NAT_NODE, &cfg_bsc_cmd); install_node(&bsc_node, config_write_bsc); - install_default(BSC_NODE); - install_element(BSC_NODE, &ournode_exit_cmd); - install_element(BSC_NODE, &ournode_end_cmd); - install_element(BSC_NODE, &cfg_bsc_token_cmd); - install_element(BSC_NODE, &cfg_bsc_lac_cmd); - install_element(BSC_NODE, &cfg_bsc_paging_cmd); - install_element(BSC_NODE, &cfg_bsc_desc_cmd); - install_element(BSC_NODE, &cfg_bsc_acc_lst_name_cmd); + install_default(NAT_BSC_NODE); + install_element(NAT_BSC_NODE, &ournode_exit_cmd); + install_element(NAT_BSC_NODE, &ournode_end_cmd); + install_element(NAT_BSC_NODE, &cfg_bsc_token_cmd); + install_element(NAT_BSC_NODE, &cfg_bsc_lac_cmd); + install_element(NAT_BSC_NODE, &cfg_bsc_paging_cmd); + install_element(NAT_BSC_NODE, &cfg_bsc_desc_cmd); + install_element(NAT_BSC_NODE, &cfg_bsc_acc_lst_name_cmd); mgcp_vty_init(); |