From 9b7c4dccb6496f1acb9ca44026fc9d91eaddf0b5 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Fri, 10 Aug 2012 11:58:58 +0200 Subject: [PATCH] service: Allow plugins access to connman_service_create_ip4/6config --- include/service.h | 5 +++++ src/connman.h | 5 +---- src/network.c | 2 +- src/provider.c | 4 ++-- src/service.c | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/include/service.h b/include/service.h index 460fdd4..717098c 100644 --- a/include/service.h +++ b/include/service.h @@ -116,6 +116,11 @@ char **connman_service_get_proxy_excludes(struct connman_service *service); const char *connman_service_get_proxy_url(struct connman_service *service); const char *connman_service_get_proxy_autoconfig(struct connman_service *service); +void connman_service_create_ip4config(struct connman_service *service, + int index); +void connman_service_create_ip6config(struct connman_service *service, + int index); + #ifdef __cplusplus } #endif diff --git a/src/connman.h b/src/connman.h index e72bc2a..822c8eb 100644 --- a/src/connman.h +++ b/src/connman.h @@ -573,11 +573,8 @@ struct connman_service *__connman_service_get_default(void); void __connman_service_update_from_network(struct connman_network *network); void __connman_service_remove_from_network(struct connman_network *network); void __connman_service_read_ip4config(struct connman_service *service); -void __connman_service_create_ip4config(struct connman_service *service, - int index); void __connman_service_read_ip6config(struct connman_service *service); -void __connman_service_create_ip6config(struct connman_service *service, - int index); + struct connman_ipconfig *__connman_service_get_ip4config( struct connman_service *service); struct connman_ipconfig *__connman_service_get_ip6config( diff --git a/src/network.c b/src/network.c index bf01767..c37f128 100644 --- a/src/network.c +++ b/src/network.c @@ -482,7 +482,7 @@ void connman_network_set_index(struct connman_network *network, int index) * ipconfig layer yet, due to not being able to get * a network index prior to creating a service. */ - __connman_service_create_ip4config(service, index); + connman_service_create_ip4config(service, index); else __connman_ipconfig_set_index(ipconfig, index); diff --git a/src/provider.c b/src/provider.c index 76e8478..52f3ade 100644 --- a/src/provider.c +++ b/src/provider.c @@ -1118,7 +1118,7 @@ void connman_provider_set_index(struct connman_provider *provider, int index) ipconfig = __connman_service_get_ip4config(service); if (ipconfig == NULL) { - __connman_service_create_ip4config(service, index); + connman_service_create_ip4config(service, index); ipconfig = __connman_service_get_ip4config(service); if (ipconfig == NULL) { @@ -1134,7 +1134,7 @@ void connman_provider_set_index(struct connman_provider *provider, int index) ipconfig = __connman_service_get_ip6config(service); if (ipconfig == NULL) { - __connman_service_create_ip6config(service, index); + connman_service_create_ip6config(service, index); ipconfig = __connman_service_get_ip6config(service); if (ipconfig == NULL) { diff --git a/src/service.c b/src/service.c index d0843fc..cafd605 100644 --- a/src/service.c +++ b/src/service.c @@ -5909,7 +5909,7 @@ void __connman_service_read_ip4config(struct connman_service *service) g_key_file_free(keyfile); } -void __connman_service_create_ip4config(struct connman_service *service, +void connman_service_create_ip4config(struct connman_service *service, int index) { DBG("ipv4 %p", service->ipconfig_ipv4); @@ -5938,7 +5938,7 @@ void __connman_service_read_ip6config(struct connman_service *service) g_key_file_free(keyfile); } -void __connman_service_create_ip6config(struct connman_service *service, +void connman_service_create_ip6config(struct connman_service *service, int index) { DBG("ipv6 %p", service->ipconfig_ipv6); -- 2.7.4