mscsplit: bsc_init: don't pass telnet dummy conn
We want to create the telnet for VTY only after reading the config file, and the dummy_conn was a workaround to be able to do so, but is not needed: gsmnet_from_vty() used to expect vty->priv to point to a gsm_network struct, but that is not actually the case anymore. It is using a static pointer to store the gsm_network struct instead. Change-Id: I51e7224c5a4cd5baf564bee871cf2fa6e885cda7
This commit is contained in:
parent
73f83d533b
commit
0ce98c749a
|
@ -473,7 +473,6 @@ static int bootstrap_bts(struct gsm_bts *bts)
|
||||||
int bsc_bootstrap_network(int (*mncc_recv)(struct gsm_network *, struct msgb *),
|
int bsc_bootstrap_network(int (*mncc_recv)(struct gsm_network *, struct msgb *),
|
||||||
const char *config_file)
|
const char *config_file)
|
||||||
{
|
{
|
||||||
struct telnet_connection dummy_conn;
|
|
||||||
struct gsm_bts *bts;
|
struct gsm_bts *bts;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
|
@ -485,9 +484,7 @@ int bsc_bootstrap_network(int (*mncc_recv)(struct gsm_network *, struct msgb *),
|
||||||
bsc_gsmnet->name_long = talloc_strdup(bsc_gsmnet, "OpenBSC");
|
bsc_gsmnet->name_long = talloc_strdup(bsc_gsmnet, "OpenBSC");
|
||||||
bsc_gsmnet->name_short = talloc_strdup(bsc_gsmnet, "OpenBSC");
|
bsc_gsmnet->name_short = talloc_strdup(bsc_gsmnet, "OpenBSC");
|
||||||
|
|
||||||
/* our vty command code expects vty->priv to point to a telnet_connection */
|
rc = vty_read_config_file(config_file, NULL);
|
||||||
dummy_conn.priv = bsc_gsmnet;
|
|
||||||
rc = vty_read_config_file(config_file, &dummy_conn);
|
|
||||||
if (rc < 0) {
|
if (rc < 0) {
|
||||||
LOGP(DNM, LOGL_FATAL, "Failed to parse the config file: '%s'\n", config_file);
|
LOGP(DNM, LOGL_FATAL, "Failed to parse the config file: '%s'\n", config_file);
|
||||||
return rc;
|
return rc;
|
||||||
|
|
Loading…
Reference in New Issue