This feature is finally wrongly implemented, and it will be
reimplemented properly while intergrating ConnMan with
systemd-hostnamed.
---
Makefile.plugins | 1 -
plugins/wifi.c | 53 +----------------------------------------------------
plugins/wifi.conf | 16 ----------------
3 files changed, 1 insertion(+), 69 deletions(-)
delete mode 100644 plugins/wifi.conf
diff --git a/Makefile.plugins b/Makefile.plugins
index 140332b..e90ad19 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -24,7 +24,6 @@ gsupplicant_sources = gsupplicant/gsupplicant.h
gsupplicant/dbus.h \
if WIFI
builtin_modules += wifi
builtin_sources += plugins/wifi.c $(gsupplicant_sources)
-EXTRA_DIST += plugins/wifi.conf
endif
if BLUETOOTH
diff --git a/plugins/wifi.c b/plugins/wifi.c
index 8a7ee20..849243b 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -58,9 +58,6 @@
#include <gsupplicant/gsupplicant.h>
-#define CONF_FILE "wifi.conf"
-#define WIFI_CONFIG_FILE CONFIGDIR "/" CONF_FILE
-
#define CLEANUP_TIMEOUT 8 /* in seconds */
#define INACTIVE_TIMEOUT 12 /* in seconds */
#define FAVORITE_MAXIMUM_RETRIES 2
@@ -73,17 +70,6 @@
#define P2P_LISTEN_PERIOD 500
#define P2P_LISTEN_INTERVAL 2000
-static struct {
- char *primary_dev_type;
- char *secondary_dev_types;
-} wifi_settings = {
- .primary_dev_type = NULL,
- .secondary_dev_types = NULL,
-};
-
-#define CONF_PRIMARY_DEV_TYPE "PrimaryDeviceType"
-#define CONF_SECONDARY_DEV_TYPES "SecondaryDeviceTypes"
-
static struct connman_technology *wifi_technology = NULL;
static struct connman_technology *p2p_technology = NULL;
@@ -2480,8 +2466,7 @@ static void p2p_support(GSupplicantInterface *interface)
hostname = "ConnMan";
g_supplicant_interface_set_p2p_device_config(interface,
- hostname, wifi_settings.primary_dev_type,
- wifi_settings.secondary_dev_types);
+ hostname, NULL, NULL);
connman_peer_driver_register(&peer_driver);
}
@@ -3079,38 +3064,6 @@ static struct connman_technology_driver tech_driver = {
.set_regdom = tech_set_regdom,
};
-static void load_wifi_settings(void)
-{
- GKeyFile *keyfile;
- char *str;
-
- keyfile = g_key_file_new();
-
- if (!g_key_file_load_from_file(keyfile, WIFI_CONFIG_FILE, 0, NULL))
- goto out;
-
- str = g_key_file_get_string(keyfile, "General",
- CONF_PRIMARY_DEV_TYPE, NULL);
- if (str)
- wifi_settings.primary_dev_type = g_strchomp(str);
-
- str = g_key_file_get_string(keyfile, "General",
- CONF_SECONDARY_DEV_TYPES, NULL);
- if (str)
- wifi_settings.secondary_dev_types = g_strchomp(str);
-out:
- g_key_file_free(keyfile);
-}
-
-static void unload_wifi_settings(void)
-{
- g_free(wifi_settings.primary_dev_type);
- wifi_settings.primary_dev_type = NULL;
-
- g_free(wifi_settings.secondary_dev_types);
- wifi_settings.secondary_dev_types = NULL;
-}
-
static int wifi_init(void)
{
int err;
@@ -3132,8 +3085,6 @@ static int wifi_init(void)
return err;
}
- load_wifi_settings();
-
return 0;
}
@@ -3146,8 +3097,6 @@ static void wifi_exit(void)
g_supplicant_unregister(&callbacks);
connman_network_driver_unregister(&network_driver);
-
- unload_wifi_settings();
}
CONNMAN_PLUGIN_DEFINE(wifi, "WiFi interface plugin", VERSION,
diff --git a/plugins/wifi.conf b/plugins/wifi.conf
deleted file mode 100644
index b29247f..0000000
--- a/plugins/wifi.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# This is an EXPERIMENTAL configuration file
-
-[General]
-
-# Set the P2P primary device type. It follows such format:
-# <categ><OUI><subcateg>
-# Where all elements are expressed in hexadecimal.
-# Category and subcategory are in network byte order.
-# For the OUI, follow the WSC specification.
-# Default setting is set to category comupter, and sub-category
-# PC.
-PrimaryDeviceType = 01000050F2040100
-
-# Set the P2P secondary device types. Same format as PrimaryDeviceType
-# but you can pile a maximum of 5 types here separated by a space.
-# SecondaryDeviceTypes =
--
1.8.5.5
_______________________________________________
connman mailing list
[email protected]
https://lists.connman.net/mailman/listinfo/connman
