From: Daniel Wagner <[email protected]>
---
include/network.h | 12 +++---
plugins/wifi.c | 8 ++--
src/agent.c | 2 +-
src/network.c | 91 ++++++++++++++++++++--------------------------------
src/service.c | 21 ++++++------
5 files changed, 56 insertions(+), 78 deletions(-)
diff --git a/include/network.h b/include/network.h
index d4c52b1..9fe8a22 100644
--- a/include/network.h
+++ b/include/network.h
@@ -107,8 +107,6 @@ int connman_network_set_pac(struct connman_network *network,
const char *pac);
int connman_network_set_strength(struct connman_network *network,
connman_uint8_t strength);
-int connman_network_set_roaming(struct connman_network *network,
- connman_bool_t roaming);
int connman_network_set_path(struct connman_network *network, const char
*path);
int connman_network_set_name(struct connman_network *network, const char
*name);
@@ -124,6 +122,9 @@ int connman_network_set_wifi_private_key_file(struct
connman_network *network, c
int connman_network_set_wifi_private_key_passphrase(struct connman_network
*network, const char *file);
int connman_network_set_wifi_phase2(struct connman_network *network, const
char *phase2);
int connman_network_set_wifi_pin_wps(struct connman_network *network, const
char *pin);
+int connman_network_set_wifi_wps(struct connman_network *network,
connman_bool_t wps);
+int connman_network_set_wifi_use_wps(struct connman_network *network,
connman_bool_t use_wps);
+int connman_network_set_roaming(struct connman_network *network,
connman_bool_t roaming);
const char *connman_network_get_path(struct connman_network *network);
const char *connman_network_get_name(struct connman_network *network);
@@ -139,11 +140,10 @@ const char
*connman_network_get_wifi_private_key_file(struct connman_network *ne
const char *connman_network_get_wifi_private_key_passphrase(struct
connman_network *network);
const char *connman_network_get_wifi_phase2(struct connman_network *network);
const char *connman_network_get_wifi_pin_wps(struct connman_network *network);
+connman_bool_t connman_network_get_roaming(struct connman_network *network);
+connman_bool_t connman_network_get_wifi_wps(struct connman_network *network);
+connman_bool_t connman_network_get_wifi_use_wps(struct connman_network
*network);
-int connman_network_set_bool(struct connman_network *network,
- const char *key, connman_bool_t value);
-connman_bool_t connman_network_get_bool(struct connman_network *network,
- const char *key);
int connman_network_set_uint8(struct connman_network *network,
const char *key, connman_uint8_t value);
connman_uint8_t connman_network_get_uint8(struct connman_network *network,
diff --git a/plugins/wifi.c b/plugins/wifi.c
index c0576cb..bc145e5 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -382,7 +382,7 @@ static void ssid_init(GSupplicantSSID *ssid, struct
connman_network *network)
ssid->private_key_passphrase =
connman_network_get_wifi_private_key_passphrase(network);
ssid->phase2_auth = connman_network_get_wifi_phase2(network);;
- ssid->use_wps = connman_network_get_bool(network, "WiFi.UseWPS");
+ ssid->use_wps = connman_network_get_wifi_use_wps(network);
ssid->pin_wps = connman_network_get_wifi_pin_wps(network);
}
@@ -581,7 +581,7 @@ static connman_bool_t
handle_wps_completion(GSupplicantInterface *interface,
{
connman_bool_t wps;
- wps = connman_network_get_bool(network, "WiFi.UseWPS");
+ wps = connman_network_get_wifi_use_wps(network);
if (wps == TRUE) {
const unsigned char *ssid, *wps_ssid;
unsigned int ssid_len, wps_ssid_len;
@@ -660,7 +660,7 @@ static void interface_state(GSupplicantInterface *interface)
* those ones to FALSE could cancel an association
* in progress.
*/
- wps = connman_network_get_bool(network, "WiFi.UseWPS");
+ wps = connman_network_get_wifi_use_wps(network);
if (wps == TRUE)
if (is_idle_wps(interface, wifi) == TRUE)
break;
@@ -791,7 +791,7 @@ static void network_added(GSupplicantNetwork
*supplicant_network)
connman_network_set_wifi_security(network, security);
connman_network_set_strength(network,
calculate_strength(supplicant_network));
- connman_network_set_bool(network, "WiFi.WPS", wps);
+ connman_network_set_wifi_wps(network, wps);
connman_network_set_available(network, TRUE);
diff --git a/src/agent.c b/src/agent.c
index 3e7481c..d50c2c7 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -153,7 +153,7 @@ static void request_input_passphrase_reply(DBusPendingCall
*call, void *user_dat
if (network == NULL)
goto done;
- connman_network_set_bool(network, "WiFi.UseWPS", wps);
+ connman_network_set_wifi_use_wps(network, wps);
if (wpspin != NULL && strlen(wpspin) > 0)
connman_network_set_wifi_pin_wps(network, wpspin);
diff --git a/src/network.c b/src/network.c
index 85b85ac..f5d0178 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1297,24 +1297,6 @@ int connman_network_set_strength(struct connman_network
*network,
"Strength", strength);
}
-/**
- * connman_network_set_roaming:
- * @network: network structure
- * @roaming: roaming state
- *
- * Set roaming state for network
- */
-int connman_network_set_roaming(struct connman_network *network,
- connman_bool_t roaming)
-{
- DBG("network %p roaming %d", network, roaming);
-
- network->roaming = roaming;
-
- return connman_element_set_bool(&network->element,
- "Roaming", roaming);
-}
-
int connman_network_set_path(struct connman_network *network, const char *path)
{
DBG("network %p path %s", network, path);
@@ -1455,6 +1437,33 @@ int connman_network_set_wifi_pin_wps(struct
connman_network *network, const char
return 0;
}
+int connman_network_set_wifi_wps(struct connman_network *network,
connman_bool_t wps)
+{
+ DBG("network %p wifi wps %d", network, wps);
+
+ network->wifi.wps = wps;
+
+ return 0;
+}
+
+int connman_network_set_wifi_use_wps(struct connman_network *network,
connman_bool_t use_wps)
+{
+ DBG("network %p wifi use_wps %d", network, use_wps);
+
+ network->wifi.use_wps = use_wps;
+
+ return 0;
+}
+
+int connman_network_set_roaming(struct connman_network *network,
connman_bool_t roaming)
+{
+ DBG("network %p roaming %d", network, roaming);
+
+ network->roaming = roaming;
+
+ return 0;
+}
+
const char *connman_network_get_name(struct connman_network *network)
{
return network->name;
@@ -1525,49 +1534,19 @@ const char *connman_network_get_wifi_pin_wps(struct
connman_network *network)
return network->wifi.pin_wps;
}
-/**
- * connman_network_set_bool:
- * @network: network structure
- * @key: unique identifier
- * @value: boolean value
- *
- * Set boolean value for specific key
- */
-int connman_network_set_bool(struct connman_network *network,
- const char *key, connman_bool_t value)
+connman_bool_t connman_network_get_roaming(struct connman_network *network)
{
- DBG("network %p key %s value %d", network, key, value);
-
- if (g_strcmp0(key, "Roaming") == 0)
- return connman_network_set_roaming(network, value);
- else if (g_strcmp0(key, "WiFi.WPS") == 0)
- network->wifi.wps = value;
- else if (g_strcmp0(key, "WiFi.UseWPS") == 0)
- network->wifi.use_wps = value;
-
- return connman_element_set_bool(&network->element, key, value);
+ return network->roaming;
}
-/**
- * connman_network_get_bool:
- * @network: network structure
- * @key: unique identifier
- *
- * Get boolean value for specific key
- */
-connman_bool_t connman_network_get_bool(struct connman_network *network,
- const char *key)
+connman_bool_t connman_network_get_wifi_wps(struct connman_network *network)
{
- DBG("network %p key %s", network, key);
-
- if (g_str_equal(key, "Roaming") == TRUE)
- return network->roaming;
- else if (g_str_equal(key, "WiFi.WPS") == TRUE)
- return network->wifi.wps;
- else if (g_str_equal(key, "WiFi.UseWPS") == TRUE)
- return network->wifi.use_wps;
+ return network->wifi.wps;
+}
- return connman_element_get_bool(&network->element, key);
+connman_bool_t connman_network_get_wifi_use_wps(struct connman_network
*network)
+{
+ return network->wifi.use_wps;
}
/**
diff --git a/src/service.c b/src/service.c
index 8b6f88f..676cebc 100644
--- a/src/service.c
+++ b/src/service.c
@@ -3547,16 +3547,16 @@ int __connman_service_indicate_state(struct
connman_service *service,
__connman_notifier_connect(service->type);
if (service->type == CONNMAN_SERVICE_TYPE_WIFI &&
- connman_network_get_bool(service->network,
- "WiFi.UseWPS") == TRUE) {
+ connman_network_get_wifi_use_wps(service->network)
+ == TRUE) {
const char *pass;
pass =
connman_network_get_wifi_passphrase(service->network);
__connman_service_set_passphrase(service, pass);
- connman_network_set_bool(service->network,
- "WiFi.UseWPS", FALSE);
+ connman_network_set_wifi_use_wps(service->network,
+ FALSE);
}
default_changed();
@@ -3797,9 +3797,8 @@ static int service_connect(struct connman_service
*service)
return -EOPNOTSUPP;
if (service->wps == FALSE ||
- connman_network_get_bool(
- service->network,
- "WiFi.UseWPS") == FALSE)
+ connman_network_get_wifi_use_wps(
+ service->network) == FALSE)
return -ENOKEY;
}
break;
@@ -4706,7 +4705,7 @@ static void update_from_network(struct connman_service
*service,
}
service->strength = connman_network_get_uint8(network, "Strength");
- service->roaming = connman_network_get_bool(network, "Roaming");
+ service->roaming = connman_network_get_roaming(network);
if (service->strength == 0) {
/*
@@ -4720,7 +4719,7 @@ static void update_from_network(struct connman_service
*service,
service->security = convert_wifi_security(str);
if (service->type == CONNMAN_SERVICE_TYPE_WIFI)
- service->wps = connman_network_get_bool(network, "WiFi.WPS");
+ service->wps = connman_network_get_wifi_wps(network);
if (service->strength > strength && service->network != NULL) {
connman_network_unref(service->network);
@@ -4850,7 +4849,7 @@ void __connman_service_update_from_network(struct
connman_network *network)
}
if (service->type == CONNMAN_SERVICE_TYPE_WIFI)
- service->wps = connman_network_get_bool(network, "WiFi.WPS");
+ service->wps = connman_network_get_wifi_wps(network);
strength = connman_network_get_uint8(service->network, "Strength");
if (strength == service->strength)
@@ -4861,7 +4860,7 @@ void __connman_service_update_from_network(struct
connman_network *network)
strength_changed(service);
roaming:
- roaming = connman_network_get_bool(service->network, "Roaming");
+ roaming = connman_network_get_roaming(service->network);
if (roaming == service->roaming)
return;
--
1.7.5.2
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
