bsc: Call the RF Control interface ctrl all the way
We had the rf_ctrl_name and the rf_ctl pointer, make both use
the word ctrl.
diff --git a/openbsc/include/openbsc/osmo_msc_data.h b/openbsc/include/openbsc/osmo_msc_data.h
index 3212b36..59b75c3 100644
--- a/openbsc/include/openbsc/osmo_msc_data.h
+++ b/openbsc/include/openbsc/osmo_msc_data.h
@@ -65,7 +65,7 @@
char *mid_call_txt;
int mid_call_timeout;
char *rf_ctrl_name;
- struct osmo_bsc_rf *rf_ctl;
+ struct osmo_bsc_rf *rf_ctrl;
/* ussd welcome text */
char *ussd_welcome_txt;
diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c
index a290693..54d7c6e 100644
--- a/openbsc/src/libbsc/bsc_vty.c
+++ b/openbsc/src/libbsc/bsc_vty.c
@@ -189,9 +189,9 @@
dump_pchan_load_vty(vty, " ", &pl);
/* show rf */
- if (net->msc_data && net->msc_data->rf_ctl)
+ if (net->msc_data && net->msc_data->rf_ctrl)
vty_out(vty, " Last RF Command: %s%s",
- net->msc_data->rf_ctl->last_state_command,
+ net->msc_data->rf_ctrl->last_state_command,
VTY_NEWLINE);
}
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_grace.c b/openbsc/src/osmo-bsc/osmo_bsc_grace.c
index c67984b..fbc26ac 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_grace.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_grace.c
@@ -26,9 +26,9 @@
int bsc_grace_allow_new_connection(struct gsm_network *network)
{
- if (!network->msc_data->rf_ctl)
+ if (!network->msc_data->rf_ctrl)
return 1;
- return network->msc_data->rf_ctl->policy == S_RF_ON;
+ return network->msc_data->rf_ctrl->policy == S_RF_ON;
}
static int handle_sub(struct gsm_lchan *lchan, const char *text)
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/openbsc/src/osmo-bsc/osmo_bsc_main.c
index c9ae975..2a4ed1a 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_main.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c
@@ -48,7 +48,7 @@
struct gsm_network *bsc_gsmnet = 0;
static const char *config_file = "openbsc.cfg";
-static const char *rf_ctl = NULL;
+static const char *rf_ctrl = NULL;
extern const char *openbsc_copyright;
static int daemonize = 0;
@@ -119,7 +119,7 @@
log_set_log_level(osmo_stderr_target, atoi(optarg));
break;
case 'r':
- rf_ctl = optarg;
+ rf_ctrl = optarg;
break;
default:
/* ignore */
@@ -370,13 +370,13 @@
ctrl_cmd_install(CTRL_NODE_TRX, &cmd_trx_rf_lock);
data = bsc_gsmnet->msc_data;
- if (rf_ctl)
- bsc_replace_string(data, &data->rf_ctrl_name, rf_ctl);
+ if (rf_ctrl)
+ bsc_replace_string(data, &data->rf_ctrl_name, rf_ctrl);
if (data->rf_ctrl_name) {
- data->rf_ctl = osmo_bsc_rf_create(data->rf_ctrl_name,
+ data->rf_ctrl = osmo_bsc_rf_create(data->rf_ctrl_name,
bsc_gsmnet);
- if (!data->rf_ctl) {
+ if (!data->rf_ctrl) {
fprintf(stderr, "Failed to create the RF service.\n");
exit(1);
}
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_rf.c b/openbsc/src/osmo-bsc/osmo_bsc_rf.c
index cd64b52..6e9e027 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_rf.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_rf.c
@@ -243,7 +243,7 @@
return 0;
}
-static int rf_ctl_accept(struct osmo_fd *bfd, unsigned int what)
+static int rf_ctrl_accept(struct osmo_fd *bfd, unsigned int what)
{
struct osmo_bsc_rf_conn *conn;
struct osmo_bsc_rf *rf = bfd->data;
@@ -338,7 +338,7 @@
}
bfd->when = BSC_FD_READ;
- bfd->cb = rf_ctl_accept;
+ bfd->cb = rf_ctrl_accept;
bfd->data = rf;
if (osmo_fd_register(bfd) != 0) {