Network: removed memory leak and moved config file related funcs to manager.c

1 files changed, 1 insertions, 128 deletions

diff --git a/network/main.c b/network/main.c
index 414ff938..6efdb81d 100644
--- a/network/main.c
+++ b/network/main.c
@@ -27,136 +27,11 @@
 
 #include <errno.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/sdp.h>
-
 #include <gdbus.h>
 
 #include "plugin.h"
-#include "logging.h"
 #include "manager.h"
 
-#define IFACE_PREFIX "bnep%d"
-#define GN_IFACE  "pan0"
-#define NAP_IFACE "pan1"
-
-static struct network_conf conf = {
-	.connection_enabled = TRUE,
-	.server_enabled = TRUE,
-	.iface_prefix = NULL,
-	.panu_script = NULL,
-	.gn_script = NULL,
-	.nap_script = NULL,
-	.gn_iface = NULL,
-	.nap_iface = NULL,
-	.security = TRUE
-};
-
-static void read_config(const char *file)
-{
-	GKeyFile *keyfile;
-	GError *err = NULL;
-	char **disabled;
-
-	keyfile = g_key_file_new();
-
-	if (!g_key_file_load_from_file(keyfile, file, 0, &err)) {
-		error("Parsing %s failed: %s", file, err->message);
-		g_error_free(err);
-		goto done;
-	}
-
-	disabled = g_key_file_get_string_list(keyfile, "General",
-						"Disable", NULL, &err);
-	if (err) {
-		debug("%s: %s", file, err->message);
-		g_error_free(err);
-		err = NULL;
-	} else {
-		int i;
-		for (i = 0; disabled[i] != NULL; i++) {
-			if (g_str_equal(disabled[i], "Connection"))
-				conf.connection_enabled = FALSE;
-			else if (g_str_equal(disabled[i], "Server"))
-				conf.server_enabled = FALSE;
-		}
-		g_strfreev(disabled);
-	}
-
-	conf.security = !g_key_file_get_boolean(keyfile, "General",
-						"DisableSecurity", &err);
-	if (err) {
-		debug("%s: %s", file, err->message);
-		g_error_free(err);
-		err = NULL;
-	}
-
-	conf.panu_script = g_key_file_get_string(keyfile, "PANU Role",
-						"Script", &err);
-	if (err) {
-		debug("%s: %s", file, err->message);
-		g_error_free(err);
-		err = NULL;
-	}
-
-	conf.gn_script = g_key_file_get_string(keyfile, "GN Role",
-						"Script", &err);
-	if (err) {
-		debug("%s: %s", file, err->message);
-		g_error_free(err);
-		err = NULL;
-	}
-
-	conf.nap_script = g_key_file_get_string(keyfile, "NAP Role",
-						"Script", &err);
-	if (err) {
-		debug("%s: %s", file, err->message);
-		g_error_free(err);
-		err = NULL;
-	}
-
-	conf.iface_prefix = g_key_file_get_string(keyfile, "PANU Role",
-						"Interface", &err);
-	if (err) {
-		debug("%s: %s", file, err->message);
-		g_error_free(err);
-		err = NULL;
-	}
-
-	conf.gn_iface = g_key_file_get_string(keyfile, "GN Role",
-						"Interface", &err);
-	if (err) {
-		debug("%s: %s", file, err->message);
-		g_error_free(err);
-		err = NULL;
-	}
-
-	conf.nap_iface = g_key_file_get_string(keyfile, "NAP Role",
-						"Interface", &err);
-	if (err) {
-		debug("%s: %s", file, err->message);
-		g_error_free(err);
-		err = NULL;
-	}
-
-done:
-	g_key_file_free(keyfile);
-
-	if (!conf.iface_prefix)
-		conf.iface_prefix = g_strdup(IFACE_PREFIX);
-	if (!conf.gn_iface)
-		conf.gn_iface = g_strdup(GN_IFACE);
-	if (!conf.nap_iface)
-		conf.nap_iface = g_strdup(NAP_IFACE);
-
-	debug("Config options: InterfacePrefix=%s, PANU_Script=%s, "
-		"GN_Script=%s, NAP_Script=%s, GN_Interface=%s, "
-		"NAP_Interface=%s, Security=%s",
-		conf.iface_prefix, conf.panu_script, conf.gn_script,
-		conf.nap_script, conf.gn_iface, conf.nap_iface,
-		conf.security ? "true" : "false");
-}
-
 static int network_init(void)
 {
 	DBusConnection *conn;
@@ -165,9 +40,7 @@ static int network_init(void)
 	if (conn == NULL)
 		return -EIO;
 
-	read_config(CONFIGDIR "/network.conf");
-
-	if (network_manager_init(conn, &conf) < 0) {
+	if (network_manager_init(conn) < 0) {
 		dbus_connection_unref(conn);
 		return -EIO;
 	}