summaryrefslogtreecommitdiff
path: root/src/network.c
diff options
context:
space:
mode:
authorDaniel Wagner <daniel.wagner@bmw-carit.de>2012-08-10 11:58:59 +0200
committerPatrik Flykt <patrik.flykt@linux.intel.com>2012-08-14 08:59:37 +0300
commit152171411d7d9891e1ff6b5683a2e624ea2340cd (patch)
tree3eb3143f772327fb48ad9302126883e43938ed47 /src/network.c
parent9b7c4dccb6496f1acb9ca44026fc9d91eaddf0b5 (diff)
downloadconnman-152171411d7d9891e1ff6b5683a2e624ea2340cd.tar.gz
connman-152171411d7d9891e1ff6b5683a2e624ea2340cd.tar.bz2
connman-152171411d7d9891e1ff6b5683a2e624ea2340cd.zip
service: Allow plugins to lookup services by networks
Diffstat (limited to 'src/network.c')
-rw-r--r--src/network.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/network.c b/src/network.c
index c37f1281..e72e35f9 100644
--- a/src/network.c
+++ b/src/network.c
@@ -464,7 +464,7 @@ void connman_network_set_index(struct connman_network *network, int index)
struct connman_service *service;
struct connman_ipconfig *ipconfig;
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
if (service == NULL)
goto done;
@@ -647,7 +647,7 @@ int connman_network_set_associating(struct connman_network *network,
if (associating == TRUE) {
struct connman_service *service;
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
__connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_ASSOCIATION,
CONNMAN_IPCONFIG_TYPE_IPV4);
@@ -663,7 +663,7 @@ static void set_associate_error(struct connman_network *network)
{
struct connman_service *service;
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
__connman_service_indicate_error(service,
CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
@@ -673,7 +673,7 @@ static void set_configure_error(struct connman_network *network)
{
struct connman_service *service;
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
__connman_service_indicate_error(service,
CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
@@ -683,7 +683,7 @@ static void set_invalid_key_error(struct connman_network *network)
{
struct connman_service *service;
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
__connman_service_indicate_error(service,
CONNMAN_SERVICE_ERROR_INVALID_KEY);
@@ -693,7 +693,7 @@ static void set_connect_error(struct connman_network *network)
{
struct connman_service *service;
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
__connman_service_indicate_error(service,
CONNMAN_SERVICE_ERROR_CONNECT_FAILED);
@@ -705,7 +705,7 @@ void connman_network_set_ipv4_method(struct connman_network *network,
struct connman_service *service;
struct connman_ipconfig *ipconfig;
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
if (service == NULL)
return;
@@ -722,7 +722,7 @@ void connman_network_set_ipv6_method(struct connman_network *network,
struct connman_service *service;
struct connman_ipconfig *ipconfig;
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
if (service == NULL)
return;
@@ -773,7 +773,7 @@ void connman_network_clear_error(struct connman_network *network)
if (network->connecting == TRUE || network->associating == TRUE)
return;
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
__connman_service_clear_error(service);
}
@@ -791,7 +791,7 @@ static void set_configuration(struct connman_network *network,
connman_device_set_disconnected(network->device, FALSE);
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
__connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_CONFIGURATION,
type);
@@ -803,7 +803,7 @@ static void dhcp_success(struct connman_network *network)
struct connman_ipconfig *ipconfig_ipv4;
int err;
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
if (service == NULL)
goto err;
@@ -831,7 +831,7 @@ static void dhcp_failure(struct connman_network *network)
{
struct connman_service *service;
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
if (service == NULL)
return;
@@ -859,7 +859,7 @@ static int set_connected_fixed(struct connman_network *network)
DBG("");
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
ipconfig_ipv4 = __connman_service_get_ip4config(service);
@@ -894,7 +894,7 @@ static void set_connected_manual(struct connman_network *network)
DBG("network %p", network);
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
ipconfig = __connman_service_get_ip4config(service);
@@ -948,7 +948,7 @@ static int manual_ipv6_set(struct connman_network *network,
DBG("network %p ipv6 %p", network, ipconfig_ipv6);
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
if (service == NULL)
return -EINVAL;
@@ -1011,7 +1011,7 @@ static gboolean dhcpv6_set_addresses(struct connman_network *network)
struct connman_ipconfig *ipconfig_ipv6;
int err = -EINVAL;
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
if (service == NULL)
goto err;
@@ -1203,7 +1203,7 @@ static void autoconf_ipv6_set(struct connman_network *network)
network->connecting = FALSE;
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
if (service == NULL)
return;
@@ -1232,7 +1232,7 @@ static void set_connected(struct connman_network *network)
network->connected = TRUE;
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
ipconfig_ipv4 = __connman_service_get_ip4config(service);
ipconfig_ipv6 = __connman_service_get_ip6config(service);
@@ -1304,7 +1304,7 @@ static void set_disconnected(struct connman_network *network)
network->connected = FALSE;
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
ipconfig_ipv4 = __connman_service_get_ip4config(service);
ipconfig_ipv6 = __connman_service_get_ip6config(service);
@@ -1477,7 +1477,7 @@ int connman_network_connect_hidden(struct connman_network *network,
int err = 0;
struct connman_service *service;
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
DBG("network %p service %p user_data %p", network, service, user_data);
@@ -1592,7 +1592,7 @@ static int manual_ipv4_set(struct connman_network *network,
struct connman_service *service;
int err;
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
if (service == NULL)
return -EINVAL;
@@ -1613,7 +1613,7 @@ int __connman_network_clear_ipconfig(struct connman_network *network,
enum connman_ipconfig_method method;
enum connman_ipconfig_type type;
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
if (service == NULL)
return -EINVAL;
@@ -1709,7 +1709,7 @@ int connman_network_set_ipaddress(struct connman_network *network,
DBG("network %p", network);
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
if (service == NULL)
return -EINVAL;
@@ -1735,7 +1735,7 @@ int connman_network_set_nameservers(struct connman_network *network,
DBG("network %p nameservers %s", network, nameservers);
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
if (service == NULL)
return -EINVAL;
@@ -1763,7 +1763,7 @@ int connman_network_set_domain(struct connman_network *network,
DBG("network %p domain %s", network, domain);
- service = __connman_service_lookup_from_network(network);
+ service = connman_service_lookup_from_network(network);
if (service == NULL)
return -EINVAL;