From: Daniel Wagner <[email protected]>
---
include/network.h | 36 +++++-
plugins/bluetooth.c | 6 +-
plugins/ofono.c | 21 +---
plugins/wifi.c | 38 +++----
src/agent.c | 6 +-
src/device.c | 3 +-
src/network.c | 319 +++++++++++++++++++++++++++++++++------------------
src/service.c | 67 ++++++-----
8 files changed, 300 insertions(+), 196 deletions(-)
diff --git a/include/network.h b/include/network.h
index c5742ab..d4c52b1 100644
--- a/include/network.h
+++ b/include/network.h
@@ -105,17 +105,41 @@ int connman_network_set_domain(struct connman_network
*network,
const char *domain);
int connman_network_set_pac(struct connman_network *network,
const char *pac);
-int connman_network_set_name(struct connman_network *network,
- const char *name);
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_string(struct connman_network *network,
- const char *key, const char *value);
-const char *connman_network_get_string(struct connman_network *network,
- const char *key);
+int connman_network_set_path(struct connman_network *network, const char
*path);
+int connman_network_set_name(struct connman_network *network, const char
*name);
+int connman_network_set_node(struct connman_network *network, const char
*node);
+int connman_network_set_wifi_mode(struct connman_network *network, const char
*mode);
+int connman_network_set_wifi_security(struct connman_network *network, const
char *security);
+int connman_network_set_wifi_passphrase(struct connman_network *network, const
char *passphrase);
+int connman_network_set_wifi_eap(struct connman_network *network, const char
*eap);
+int connman_network_set_wifi_identity(struct connman_network *network, const
char *identity);
+int connman_network_set_wifi_ca_cert_file(struct connman_network *network,
const char *file);
+int connman_network_set_wifi_client_cert_file(struct connman_network *network,
const char *file);
+int connman_network_set_wifi_private_key_file(struct connman_network *network,
const char *file);
+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);
+
+const char *connman_network_get_path(struct connman_network *network);
+const char *connman_network_get_name(struct connman_network *network);
+const char *connman_network_get_node(struct connman_network *network);
+const char *connman_network_get_wifi_mode(struct connman_network *network);
+const char *connman_network_get_wifi_security(struct connman_network *network);
+const char *connman_network_get_wifi_passphrase(struct connman_network
*network);
+const char *connman_network_get_wifi_eap(struct connman_network *network);
+const char *connman_network_get_wifi_identity(struct connman_network *network);
+const char *connman_network_get_wifi_ca_cert_file(struct connman_network
*network);
+const char *connman_network_get_wifi_client_cert_file(struct connman_network
*network);
+const char *connman_network_get_wifi_private_key_file(struct connman_network
*network);
+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);
+
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,
diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c
index ccc5e9b..f67e9ec 100644
--- a/plugins/bluetooth.c
+++ b/plugins/bluetooth.c
@@ -141,7 +141,7 @@ err:
static int pan_connect(struct connman_network *network)
{
- const char *path = connman_network_get_string(network, "Path");
+ const char *path = connman_network_get_path(network);
const char *uuid = "nap";
DBusMessage *message;
DBusPendingCall *call;
@@ -220,7 +220,7 @@ done:
static int pan_disconnect(struct connman_network *network)
{
- const char *path = connman_network_get_string(network, "Path");
+ const char *path = connman_network_get_path(network);
DBusMessage *message;
DBusPendingCall *call;
@@ -438,7 +438,7 @@ static void network_properties_reply(DBusPendingCall *call,
void *user_data)
if (network == NULL)
goto done;
- connman_network_set_string(network, "Path", path);
+ connman_network_set_path(network, path);
connman_network_set_name(network, name);
diff --git a/plugins/ofono.c b/plugins/ofono.c
index 0c23462..2af54d6 100644
--- a/plugins/ofono.c
+++ b/plugins/ofono.c
@@ -392,7 +392,7 @@ static void create_service(struct connman_network *network)
DBG("");
- path = connman_network_get_string(network, "Path");
+ path = connman_network_get_path(network);
group = get_ident(path);
@@ -504,7 +504,7 @@ done:
static int set_network_active(struct connman_network *network)
{
dbus_bool_t value = TRUE;
- const char *path = connman_network_get_string(network, "Path");
+ const char *path = connman_network_get_path(network);
DBG("network %p, path %s", network, path);
@@ -517,7 +517,7 @@ static int set_network_inactive(struct connman_network
*network)
{
int err;
dbus_bool_t value = FALSE;
- const char *path = connman_network_get_string(network, "Path");
+ const char *path = connman_network_get_path(network);
DBG("network %p, path %s", network, path);
@@ -572,7 +572,7 @@ static int network_disconnect(struct connman_network
*network)
static void network_remove(struct connman_network *network)
{
- char const *path = connman_network_get_string(network, "Path");
+ char const *path = connman_network_get_path(network);
DBG("network %p path %s", network, path);
@@ -807,7 +807,6 @@ static int add_network(struct connman_device *device,
struct connman_network *network;
struct network_info *info;
char *ident;
- const char *hash_path;
dbus_bool_t active = FALSE;
DBG("modem %p device %p path %s", modem, device, path);
@@ -841,18 +840,12 @@ static int add_network(struct connman_device *device,
connman_ipaddress_clear(&info->ipv6_address);
info->network = network;
- connman_network_set_string(network, "Path", path);
- hash_path = connman_network_get_string(network, "Path");
- if (hash_path == NULL) {
- connman_network_unref(network);
- g_free(info);
- return -EIO;
- }
+ connman_network_set_path(network, path);
create_service(network);
connman_network_ref(network);
- g_hash_table_insert(network_hash, (char *) hash_path, info);
+ g_hash_table_insert(network_hash, (char *) path, info);
connman_network_set_available(network, TRUE);
connman_network_set_index(network, -1);
@@ -904,7 +897,7 @@ static int add_network(struct connman_device *device,
error:
connman_network_unref(network);
- g_hash_table_remove(network_hash, hash_path);
+ g_hash_table_remove(network_hash, path);
return -EIO;
}
diff --git a/plugins/wifi.c b/plugins/wifi.c
index e3849ce..c0576cb 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -355,16 +355,15 @@ static void ssid_init(GSupplicantSSID *ssid, struct
connman_network *network)
ssid->ssid = connman_network_get_blob(network, "WiFi.SSID",
&ssid->ssid_len);
ssid->scan_ssid = 1;
- security = connman_network_get_string(network, "WiFi.Security");
+ security = connman_network_get_wifi_security(network);
ssid->security = network_security(security);
- passphrase = connman_network_get_string(network,
- "WiFi.Passphrase");
+ passphrase = connman_network_get_wifi_passphrase(network);
if (passphrase == NULL || strlen(passphrase) == 0)
ssid->passphrase = NULL;
else
ssid->passphrase = passphrase;
- ssid->eap = connman_network_get_string(network, "WiFi.EAP");
+ ssid->eap = connman_network_get_wifi_eap(network);
/*
* If our private key password is unset,
@@ -372,25 +371,19 @@ static void ssid_init(GSupplicantSSID *ssid, struct
connman_network *network)
* for PEAP where 2 passphrases (identity and client
* cert may have to be provided.
*/
- if (connman_network_get_string(network,
- "WiFi.PrivateKeyPassphrase") == NULL)
- connman_network_set_string(network,
- "WiFi.PrivateKeyPassphrase",
+ if (connman_network_get_wifi_private_key_passphrase(network) == NULL)
+ connman_network_set_wifi_private_key_passphrase(network,
ssid->passphrase);
/* We must have an identity for both PEAP and TLS */
- ssid->identity = connman_network_get_string(network, "WiFi.Identity");
- ssid->ca_cert_path = connman_network_get_string(network,
- "WiFi.CACertFile");
- ssid->client_cert_path = connman_network_get_string(network,
- "WiFi.ClientCertFile");
- ssid->private_key_path = connman_network_get_string(network,
- "WiFi.PrivateKeyFile");
- ssid->private_key_passphrase = connman_network_get_string(network,
- "WiFi.PrivateKeyPassphrase");
- ssid->phase2_auth = connman_network_get_string(network, "WiFi.Phase2");
+ ssid->identity = connman_network_get_wifi_identity(network);
+ ssid->ca_cert_path = connman_network_get_wifi_ca_cert_file(network);
+ ssid->client_cert_path =
connman_network_get_wifi_client_cert_file(network);
+ ssid->private_key_path =
connman_network_get_wifi_private_key_file(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->pin_wps = connman_network_get_string(network, "WiFi.PinWPS");
+ ssid->pin_wps = connman_network_get_wifi_pin_wps(network);
}
@@ -611,10 +604,9 @@ static connman_bool_t
handle_wps_completion(GSupplicantInterface *interface,
}
wps_key = g_supplicant_interface_get_wps_key(interface);
- connman_network_set_string(network, "WiFi.Passphrase",
- wps_key);
+ connman_network_set_wifi_passphrase(network, wps_key);
- connman_network_set_string(network, "WiFi.PinWPS", NULL);
+ connman_network_set_wifi_pin_wps(network, NULL);
}
return TRUE;
@@ -796,7 +788,7 @@ static void network_added(GSupplicantNetwork
*supplicant_network)
connman_network_set_blob(network, "WiFi.SSID",
ssid, ssid_len);
- connman_network_set_string(network, "WiFi.Security", security);
+ connman_network_set_wifi_security(network, security);
connman_network_set_strength(network,
calculate_strength(supplicant_network));
connman_network_set_bool(network, "WiFi.WPS", wps);
diff --git a/src/agent.c b/src/agent.c
index 3a8674e..3e7481c 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -156,11 +156,9 @@ static void request_input_passphrase_reply(DBusPendingCall
*call, void *user_dat
connman_network_set_bool(network, "WiFi.UseWPS", wps);
if (wpspin != NULL && strlen(wpspin) > 0)
- connman_network_set_string(network,
- "WiFi.PinWPS", wpspin);
+ connman_network_set_wifi_pin_wps(network, wpspin);
else
- connman_network_set_string(network,
- "WiFi.PinWPS", NULL);
+ connman_network_set_wifi_pin_wps(network, NULL);
}
done:
diff --git a/src/device.c b/src/device.c
index 48be10f..43f0bcf 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1148,8 +1148,7 @@ void __connman_device_set_network(struct connman_device
*device,
connman_network_unref(device->network);
if (network != NULL) {
- name = connman_network_get_string(network,
- CONNMAN_PROPERTY_ID_NAME);
+ name = connman_network_get_name(network);
g_free(device->last_network);
device->last_network = g_strdup(name);
diff --git a/src/network.c b/src/network.c
index 8af90f8..85b85ac 100644
--- a/src/network.c
+++ b/src/network.c
@@ -43,6 +43,7 @@ struct connman_network {
char *name;
char *node;
char *group;
+ char *path;
struct connman_network_driver *driver;
void *driver_data;
@@ -172,6 +173,7 @@ static void network_destruct(struct connman_element
*element)
g_free(network->wifi.phase2_auth);
g_free(network->wifi.pin_wps);
+ g_free(network->path);
g_free(network->group);
g_free(network->node);
g_free(network->name);
@@ -1278,24 +1280,6 @@ int connman_network_set_domain(struct connman_network
*network,
}
/**
- * connman_network_set_name:
- * @network: network structure
- * @name: name value
- *
- * Set display name value for network
- */
-int connman_network_set_name(struct connman_network *network,
- const char *name)
-{
- DBG("network %p name %s", network, name);
-
- g_free(network->name);
- network->name = g_strdup(name);
-
- return connman_element_set_string(&network->element, "Name", name);
-}
-
-/**
* connman_network_set_strength:
* @network: network structure
* @strength: strength value
@@ -1331,103 +1315,214 @@ int connman_network_set_roaming(struct
connman_network *network,
"Roaming", roaming);
}
-/**
- * connman_network_set_string:
- * @network: network structure
- * @key: unique identifier
- * @value: string value
- *
- * Set string value for specific key
- */
-int connman_network_set_string(struct connman_network *network,
- const char *key, const char *value)
-{
- DBG("network %p key %s value %s", network, key, value);
-
- if (g_strcmp0(key, "Name") == 0)
- return connman_network_set_name(network, value);
-
- if (g_str_equal(key, "Node") == TRUE) {
- g_free(network->node);
- network->node = g_strdup(value);
- } else if (g_str_equal(key, "WiFi.Mode") == TRUE) {
- g_free(network->wifi.mode);
- network->wifi.mode = g_strdup(value);
- } else if (g_str_equal(key, "WiFi.Security") == TRUE) {
- g_free(network->wifi.security);
- network->wifi.security = g_strdup(value);
- } else if (g_str_equal(key, "WiFi.Passphrase") == TRUE) {
- g_free(network->wifi.passphrase);
- network->wifi.passphrase = g_strdup(value);
- } else if (g_str_equal(key, "WiFi.EAP") == TRUE) {
- g_free(network->wifi.eap);
- network->wifi.eap = g_strdup(value);
- } else if (g_str_equal(key, "WiFi.Identity") == TRUE) {
- g_free(network->wifi.identity);
- network->wifi.identity = g_strdup(value);
- } else if (g_str_equal(key, "WiFi.CACertFile") == TRUE) {
- g_free(network->wifi.ca_cert_path);
- network->wifi.ca_cert_path = g_strdup(value);
- } else if (g_str_equal(key, "WiFi.ClientCertFile") == TRUE) {
- g_free(network->wifi.client_cert_path);
- network->wifi.client_cert_path = g_strdup(value);
- } else if (g_str_equal(key, "WiFi.PrivateKeyFile") == TRUE) {
- g_free(network->wifi.private_key_path);
- network->wifi.private_key_path = g_strdup(value);
- } else if (g_str_equal(key, "WiFi.PrivateKeyPassphrase") == TRUE) {
- g_free(network->wifi.private_key_passphrase);
- network->wifi.private_key_passphrase = g_strdup(value);
- } else if (g_str_equal(key, "WiFi.Phase2") == TRUE) {
- g_free(network->wifi.phase2_auth);
- network->wifi.phase2_auth = g_strdup(value);
- } else if (g_str_equal(key, "WiFi.PinWPS") == TRUE) {
- g_free(network->wifi.pin_wps);
- network->wifi.pin_wps = g_strdup(value);
- }
+int connman_network_set_path(struct connman_network *network, const char *path)
+{
+ DBG("network %p path %s", network, path);
+
+ g_free(network->path);
+ network->path = g_strdup(path);
- return connman_element_set_string(&network->element, key, value);
+ return 0;
}
-/**
- * connman_network_get_string:
- * @network: network structure
- * @key: unique identifier
- *
- * Get string value for specific key
- */
-const char *connman_network_get_string(struct connman_network *network,
- const char *key)
+int connman_network_set_name(struct connman_network *network, const char *name)
{
- DBG("network %p key %s", network, key);
+ DBG("network %p name %s", network, name);
+
+ g_free(network->name);
+ network->name = g_strdup(name);
+
+ return 0;
+}
+
+int connman_network_set_node(struct connman_network *network, const char *node)
+{
+ DBG("network %p node %s", network, node);
+
+ g_free(network->node);
+ network->node = g_strdup(node);
+
+ return 0;
+}
+
+int connman_network_set_wifi_mode(struct connman_network *network, const char
*mode)
+{
+ DBG("network %p wifi mode %s", network, mode);
+
+ g_free(network->wifi.mode);
+ network->wifi.mode = g_strdup(mode);
+
+ return 0;
+}
+
+int connman_network_set_wifi_security(struct connman_network *network, const
char *security)
+{
+ DBG("network %p wifi security %s", network, security);
+
+ g_free(network->wifi.security);
+ network->wifi.security = g_strdup(security);
+
+ return 0;
+}
+
+int connman_network_set_wifi_passphrase(struct connman_network *network, const
char *passphrase)
+{
+ DBG("network %p wifi passphrase %s", network, passphrase);
+
+ g_free(network->wifi.passphrase);
+ network->wifi.passphrase = g_strdup(passphrase);
- if (g_str_equal(key, "Name") == TRUE)
- return network->name;
- else if (g_str_equal(key, "Node") == TRUE)
- return network->node;
- else if (g_str_equal(key, "WiFi.Mode") == TRUE)
- return network->wifi.mode;
- else if (g_str_equal(key, "WiFi.Security") == TRUE)
- return network->wifi.security;
- else if (g_str_equal(key, "WiFi.Passphrase") == TRUE)
- return network->wifi.passphrase;
- else if (g_str_equal(key, "WiFi.EAP") == TRUE)
- return network->wifi.eap;
- else if (g_str_equal(key, "WiFi.Identity") == TRUE)
- return network->wifi.identity;
- else if (g_str_equal(key, "WiFi.CACertFile") == TRUE)
- return network->wifi.ca_cert_path;
- else if (g_str_equal(key, "WiFi.ClientCertFile") == TRUE)
- return network->wifi.client_cert_path;
- else if (g_str_equal(key, "WiFi.PrivateKeyFile") == TRUE)
- return network->wifi.private_key_path;
- else if (g_str_equal(key, "WiFi.PrivateKeyPassphrase") == TRUE)
- return network->wifi.private_key_passphrase;
- else if (g_str_equal(key, "WiFi.Phase2") == TRUE)
- return network->wifi.phase2_auth;
- else if (g_str_equal(key, "WiFi.PinWPS") == TRUE)
- return network->wifi.pin_wps;
-
- return connman_element_get_string(&network->element, key);
+ return 0;
+}
+
+int connman_network_set_wifi_eap(struct connman_network *network, const char
*eap)
+{
+ DBG("network %p wifi eap %s", network, eap);
+
+ g_free(network->wifi.eap);
+ network->wifi.eap = g_strdup(eap);
+
+ return 0;
+}
+
+int connman_network_set_wifi_identity(struct connman_network *network, const
char *identity)
+{
+ DBG("network %p wifi identity %s", network, identity);
+
+ g_free(network->wifi.identity);
+ network->wifi.identity = g_strdup(identity);
+
+ return 0;
+}
+
+int connman_network_set_wifi_ca_cert_file(struct connman_network *network,
const char *file)
+{
+ DBG("network %p wifi ca cert path %s", network, file);
+
+ g_free(network->wifi.ca_cert_path);
+ network->wifi.ca_cert_path = g_strdup(file);
+
+ return 0;
+}
+
+int connman_network_set_wifi_client_cert_file(struct connman_network *network,
const char *file)
+{
+ DBG("network %p wifi client cert path %s", network, file);
+
+ g_free(network->wifi.client_cert_path);
+ network->wifi.client_cert_path = g_strdup(file);
+
+ return 0;
+}
+
+int connman_network_set_wifi_private_key_file(struct connman_network *network,
const char *file)
+{
+ DBG("network %p wifi private key path %s", network, file);
+
+ g_free(network->wifi.private_key_path);
+ network->wifi.private_key_path = g_strdup(file);
+
+ return 0;
+}
+
+int connman_network_set_wifi_private_key_passphrase(struct connman_network
*network, const char *passphrase)
+{
+ DBG("network %p wifi private key passphrase %s", network, passphrase);
+
+ g_free(network->wifi.private_key_passphrase);
+ network->wifi.private_key_passphrase = g_strdup(passphrase);
+
+ return 0;
+}
+
+int connman_network_set_wifi_phase2(struct connman_network *network, const
char *phase2)
+{
+ DBG("network %p wifi phase2 %s", network, phase2);
+
+ g_free(network->wifi.phase2_auth);
+ network->wifi.phase2_auth = g_strdup(phase2);
+
+ return 0;
+}
+
+int connman_network_set_wifi_pin_wps(struct connman_network *network, const
char *pin)
+{
+ DBG("network %p wifi pin wps %s", network, pin);
+
+ g_free(network->wifi.pin_wps);
+ network->wifi.pin_wps = g_strdup(pin);
+
+ return 0;
+}
+
+const char *connman_network_get_name(struct connman_network *network)
+{
+ return network->name;
+}
+
+const char *connman_network_get_path(struct connman_network *network)
+{
+ return network->path;
+}
+
+const char *connman_network_get_node(struct connman_network *network)
+{
+ return network->node;
+}
+
+const char *connman_network_get_wifi_mode(struct connman_network *network)
+{
+ return network->wifi.mode;
+}
+
+const char *connman_network_get_wifi_security(struct connman_network *network)
+{
+ return network->wifi.security;
+}
+
+const char *connman_network_get_wifi_passphrase(struct connman_network
*network)
+{
+ return network->wifi.passphrase;
+}
+
+const char *connman_network_get_wifi_eap(struct connman_network *network)
+{
+ return network->wifi.eap;
+}
+
+const char *connman_network_get_wifi_identity(struct connman_network *network)
+{
+ return network->wifi.identity;
+}
+
+const char *connman_network_get_wifi_ca_cert_file(struct connman_network
*network)
+{
+ return network->wifi.ca_cert_path;
+}
+
+const char *connman_network_get_wifi_client_cert_file(struct connman_network
*network)
+{
+ return network->wifi.client_cert_path;
+}
+
+const char *connman_network_get_wifi_private_key_file(struct connman_network
*network)
+{
+ return network->wifi.private_key_path;
+}
+
+const char *connman_network_get_wifi_private_key_passphrase(struct
connman_network *network)
+{
+ return network->wifi.private_key_passphrase;
+}
+
+const char *connman_network_get_wifi_phase2(struct connman_network *network)
+{
+ return network->wifi.phase2_auth;
+}
+
+const char *connman_network_get_wifi_pin_wps(struct connman_network *network)
+{
+ return network->wifi.pin_wps;
}
/**
diff --git a/src/service.c b/src/service.c
index ff8e056..8b6f88f 100644
--- a/src/service.c
+++ b/src/service.c
@@ -2002,8 +2002,7 @@ void __connman_service_set_identity(struct
connman_service *service,
service->identity = g_strdup(identity);
if (service->network != NULL)
- connman_network_set_string(service->network,
- "WiFi.Identity",
+ connman_network_set_wifi_identity(service->network,
service->identity);
}
@@ -2019,8 +2018,7 @@ void __connman_service_set_passphrase(struct
connman_service *service,
passphrase_changed(service);
if (service->network != NULL)
- connman_network_set_string(service->network,
- "WiFi.Passphrase",
+ connman_network_set_wifi_passphrase(service->network,
service->passphrase);
__connman_storage_save_service(service);
@@ -3553,8 +3551,7 @@ int __connman_service_indicate_state(struct
connman_service *service,
"WiFi.UseWPS") == TRUE) {
const char *pass;
- pass = connman_network_get_string(service->network,
- "WiFi.Passphrase");
+ pass =
connman_network_get_wifi_passphrase(service->network);
__connman_service_set_passphrase(service, pass);
@@ -3715,9 +3712,10 @@ static connman_bool_t prepare_network(struct
connman_service *service)
&ssid_len) == NULL)
return FALSE;
- if (service->passphrase != NULL)
- connman_network_set_string(service->network,
- "WiFi.Passphrase", service->passphrase);
+ if (service->passphrase != NULL) {
+ connman_network_set_wifi_passphrase(service->network,
+ service->passphrase);
+ }
break;
case CONNMAN_NETWORK_TYPE_ETHERNET:
case CONNMAN_NETWORK_TYPE_WIMAX:
@@ -3732,36 +3730,41 @@ static connman_bool_t prepare_network(struct
connman_service *service)
static void prepare_8021x(struct connman_service *service)
{
- if (service->eap != NULL)
- connman_network_set_string(service->network, "WiFi.EAP",
- service->eap);
+ if (service->eap != NULL) {
+ connman_network_set_wifi_eap(service->network,
+ service->eap);
+ }
- if (service->identity != NULL)
- connman_network_set_string(service->network, "WiFi.Identity",
+ if (service->identity != NULL) {
+ connman_network_set_wifi_identity(service->network,
service->identity);
+ }
- if (service->ca_cert_file != NULL)
- connman_network_set_string(service->network, "WiFi.CACertFile",
+ if (service->ca_cert_file != NULL) {
+ connman_network_set_wifi_ca_cert_file(service->network,
service->ca_cert_file);
+ }
- if (service->client_cert_file != NULL)
- connman_network_set_string(service->network,
- "WiFi.ClientCertFile",
+ if (service->client_cert_file != NULL) {
+ connman_network_set_wifi_client_cert_file(service->network,
service->client_cert_file);
+ }
- if (service->private_key_file != NULL)
- connman_network_set_string(service->network,
- "WiFi.PrivateKeyFile",
+ if (service->private_key_file != NULL) {
+ connman_network_set_wifi_private_key_file(service->network,
service->private_key_file);
+ }
- if (service->private_key_passphrase != NULL)
- connman_network_set_string(service->network,
- "WiFi.PrivateKeyPassphrase",
+ if (service->private_key_passphrase != NULL) {
+ connman_network_set_wifi_private_key_passphrase(
+ service->network,
service->private_key_passphrase);
+ }
- if (service->phase2 != NULL)
- connman_network_set_string(service->network, "WiFi.Phase2",
+ if (service->phase2 != NULL) {
+ connman_network_set_wifi_phase2(service->network,
service->phase2);
+ }
}
static int service_connect(struct connman_service *service)
@@ -4043,8 +4046,8 @@ static struct connman_network *create_hidden_wifi(struct
connman_device *device,
connman_network_set_blob(network, "WiFi.SSID",
(unsigned char *) ssid, ssid_len);
- connman_network_set_string(network, "WiFi.Mode", mode);
- connman_network_set_string(network, "WiFi.Security", security);
+ connman_network_set_wifi_mode(network, mode);
+ connman_network_set_wifi_security(network, security);
name = g_try_malloc0(ssid_len + 1);
if (name == NULL) {
@@ -4691,7 +4694,7 @@ static void update_from_network(struct connman_service
*service,
if (is_connecting(service) == TRUE)
return;
- str = connman_network_get_string(network, "Name");
+ str = connman_network_get_name(network);
if (str != NULL) {
g_free(service->name);
service->name = g_strdup(str);
@@ -4713,7 +4716,7 @@ static void update_from_network(struct connman_service
*service,
service->strength = strength;
}
- str = connman_network_get_string(network, "WiFi.Security");
+ str = connman_network_get_wifi_security(network);
service->security = convert_wifi_security(str);
if (service->type == CONNMAN_SERVICE_TYPE_WIFI)
@@ -4837,7 +4840,7 @@ void __connman_service_update_from_network(struct
connman_network *network)
if (service->network == NULL)
return;
- name = connman_network_get_string(service->network, "Name");
+ name = connman_network_get_name(service->network);
if (g_strcmp0(service->name, name) != 0) {
g_free(service->name);
service->name = g_strdup(name);
--
1.7.5.2
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
