vty: Remove more globals from the bsc data.

This is a interim solution until we have the new and all mighty
new config file format. This should work for now, makes the init
abit harder to understand though.

1 files changed, 16 insertions, 8 deletions

diff --git a/src/main.c b/src/main.c
index 825eb8c..fdc5730 100644
--- a/src/main.c
+++ b/src/main.c
@@ -95,6 +95,20 @@ int main(int argc, char **argv)
 	srand(time(NULL));
 
 	cell_vty_init();
+
+	set = link_set_create(bsc);
+	if (!set) {
+		LOGP(DINP, LOGL_ERROR, "Failed to allocate the link.\n");
+		return -1;
+	}
+
+	app = ss7_application_alloc(bsc);
+	if (!app) {
+		LOGP(DINP, LOGL_ERROR, "Failed to create the SS7 application.\n");
+		return -1;
+	}
+
+	/* Now parse the configuration file */
 	if (vty_read_config_file(config, NULL) < 0) {
 		fprintf(stderr, "Failed to read the VTY config.\n");
 		return -1;
@@ -104,15 +118,9 @@ int main(int argc, char **argv)
 	if (rc < 0)
 		return rc;
 
-	set = link_init(bsc);
-	if (!set)
-		return -1;
-
-	app = ss7_application_alloc(bsc);
-	if (!app) {
-		LOGP(DINP, LOGL_ERROR, "Failed to create the SS7 application.\n");
+	/* create the links and start */
+	if (link_init(bsc, set) != 0)
 		return -1;
-	}
 
 	ss7_application_setup(app, APP_CELLMGR,
 			      SS7_SET_LINKSET, 0,