From 0ce98c749a37cc365ab77224d36d6f68061ef727 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Wed, 11 May 2016 13:39:33 +0200 Subject: [PATCH] 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 --- openbsc/src/libbsc/bsc_init.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c index 989fca800..371ddeea3 100644 --- a/openbsc/src/libbsc/bsc_init.c +++ b/openbsc/src/libbsc/bsc_init.c @@ -473,7 +473,6 @@ static int bootstrap_bts(struct gsm_bts *bts) int bsc_bootstrap_network(int (*mncc_recv)(struct gsm_network *, struct msgb *), const char *config_file) { - struct telnet_connection dummy_conn; struct gsm_bts *bts; 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_short = talloc_strdup(bsc_gsmnet, "OpenBSC"); - /* our vty command code expects vty->priv to point to a telnet_connection */ - dummy_conn.priv = bsc_gsmnet; - rc = vty_read_config_file(config_file, &dummy_conn); + rc = vty_read_config_file(config_file, NULL); if (rc < 0) { LOGP(DNM, LOGL_FATAL, "Failed to parse the config file: '%s'\n", config_file); return rc;