From: Daniel Wagner <[email protected]>
---
include/network.h | 8 +-----
src/network.c | 56 +++++++++++-----------------------------------------
src/service.c | 4 +-
3 files changed, 16 insertions(+), 52 deletions(-)
diff --git a/include/network.h b/include/network.h
index 9fe8a22..0f42b4f 100644
--- a/include/network.h
+++ b/include/network.h
@@ -105,8 +105,6 @@ 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_strength(struct connman_network *network,
- connman_uint8_t strength);
int connman_network_set_path(struct connman_network *network, const char
*path);
int connman_network_set_name(struct connman_network *network, const char
*name);
@@ -125,6 +123,7 @@ int connman_network_set_wifi_pin_wps(struct connman_network
*network, const char
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);
+int connman_network_set_strength(struct connman_network *network,
connman_uint8_t strength);
const char *connman_network_get_path(struct connman_network *network);
const char *connman_network_get_name(struct connman_network *network);
@@ -143,11 +142,8 @@ 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);
+connman_uint8_t connman_network_get_strength(struct connman_network *network);
-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,
- const char *key);
int connman_network_set_uint16(struct connman_network *network,
const char *key, connman_uint16_t
value);
connman_uint16_t connman_network_get_uint16(struct connman_network *network,
diff --git a/src/network.c b/src/network.c
index f5d0178..3a6372b 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1286,16 +1286,6 @@ int connman_network_set_domain(struct connman_network
*network,
*
* Set signal strength value for network
*/
-int connman_network_set_strength(struct connman_network *network,
- connman_uint8_t strength)
-{
- DBG("network %p strengh %d", network, strength);
-
- network->strength = strength;
-
- return connman_element_set_uint8(&network->element,
- "Strength", strength);
-}
int connman_network_set_path(struct connman_network *network, const char *path)
{
@@ -1464,6 +1454,16 @@ int connman_network_set_roaming(struct connman_network
*network, connman_bool_t
return 0;
}
+int connman_network_set_strength(struct connman_network *network,
+ connman_uint8_t strength)
+{
+ DBG("network %p strengh %d", network, strength);
+
+ network->strength = strength;
+
+ return 0;
+}
+
const char *connman_network_get_name(struct connman_network *network)
{
return network->name;
@@ -1549,41 +1549,9 @@ connman_bool_t connman_network_get_wifi_use_wps(struct
connman_network *network)
return network->wifi.use_wps;
}
-/**
- * connman_network_set_uint8:
- * @network: network structure
- * @key: unique identifier
- * @value: integer value
- *
- * Set integer value for specific key
- */
-int connman_network_set_uint8(struct connman_network *network,
- const char *key, connman_uint8_t value)
-{
- DBG("network %p key %s value %d", network, key, value);
-
- if (g_strcmp0(key, "Strength") == 0)
- return connman_network_set_strength(network, value);
-
- return connman_element_set_uint8(&network->element, key, value);
-}
-
-/**
- * connman_network_get_uint8:
- * @network: network structure
- * @key: unique identifier
- *
- * Get integer value for specific key
- */
-connman_uint8_t connman_network_get_uint8(struct connman_network *network,
- const char *key)
+connman_uint8_t connman_network_get_strength(struct connman_network *network)
{
- DBG("network %p key %s", network, key);
-
- if (g_str_equal(key, "Strength") == TRUE)
- return network->strength;
-
- return connman_element_get_uint8(&network->element, key);
+ return network->strength;
}
/**
diff --git a/src/service.c b/src/service.c
index 676cebc..9a983fd 100644
--- a/src/service.c
+++ b/src/service.c
@@ -4704,7 +4704,7 @@ static void update_from_network(struct connman_service
*service,
service->hidden = TRUE;
}
- service->strength = connman_network_get_uint8(network, "Strength");
+ service->strength = connman_network_get_strength(network);
service->roaming = connman_network_get_roaming(network);
if (service->strength == 0) {
@@ -4851,7 +4851,7 @@ void __connman_service_update_from_network(struct
connman_network *network)
if (service->type == CONNMAN_SERVICE_TYPE_WIFI)
service->wps = connman_network_get_wifi_wps(network);
- strength = connman_network_get_uint8(service->network, "Strength");
+ strength = connman_network_get_strength(service->network);
if (strength == service->strength)
goto roaming;
--
1.7.5.2
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
