diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2010-07-13 09:57:25 -0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-07-13 09:57:25 -0300 |
| commit | d078b85e5737462abec2318f6078c97ed2cd30e0 (patch) | |
| tree | 9c19ccda4178870869eb7f811d5e93651e08102b /network | |
| parent | 48349b6430f4c194bbad4e89f60079d3a8909a85 (diff) | |
| download | bluez-d078b85e5737462abec2318f6078c97ed2cd30e0.tar.gz | |
Remove last crufts of overbloated network configuration
Diffstat (limited to 'network')
| -rw-r--r-- | network/manager.c | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/network/manager.c b/network/manager.c index ef861c08..c9101484 100644 --- a/network/manager.c +++ b/network/manager.c @@ -44,15 +44,7 @@ static DBusConnection *connection = NULL; -static struct network_conf { - gboolean connection_enabled; - gboolean server_enabled; - gboolean security; -} conf = { - .connection_enabled = TRUE, - .server_enabled = TRUE, - .security = TRUE, -}; +static gboolean conf_security = TRUE; static void read_config(const char *file) { @@ -66,7 +58,7 @@ static void read_config(const char *file) goto done; } - conf.security = !g_key_file_get_boolean(keyfile, "General", + conf_security = !g_key_file_get_boolean(keyfile, "General", "DisableSecurity", &err); if (err) { DBG("%s: %s", file, err->message); @@ -77,7 +69,7 @@ done: g_key_file_free(keyfile); DBG("Config options: Security=%s", - conf.security ? "true" : "false"); + conf_security ? "true" : "false"); } static int network_probe(struct btd_device *device, GSList *uuids, uint16_t id) @@ -194,7 +186,7 @@ int network_manager_init(DBusConnection *conn) * field that defines which service the source is connecting to. */ - if (server_init(conn, conf.security) < 0) + if (server_init(conn, conf_security) < 0) return -1; /* Register network server if it doesn't exist */ @@ -214,15 +206,13 @@ int network_manager_init(DBusConnection *conn) void network_manager_exit(void) { - if (conf.server_enabled) - server_exit(); - - if (conf.connection_enabled) { - btd_unregister_device_driver(&network_panu_driver); - btd_unregister_device_driver(&network_gn_driver); - btd_unregister_device_driver(&network_nap_driver); - connection_exit(); - } + server_exit(); + + btd_unregister_device_driver(&network_panu_driver); + btd_unregister_device_driver(&network_gn_driver); + btd_unregister_device_driver(&network_nap_driver); + + connection_exit(); btd_unregister_adapter_driver(&network_server_driver); |