From 970764c65560c96f29a26b850bcd9b4bd19e6957 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Fri, 13 Jan 2012 17:39:07 +0100 Subject: [PATCH] ipconfig: Move connman_ipconfig_* to connman.h Non of those function are used in the plugins. Let's move them to connman.h. --- include/ipconfig.h | 29 ----------------------------- src/connman.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/include/ipconfig.h b/include/ipconfig.h index 295bba8..c15dd75 100644 --- a/include/ipconfig.h +++ b/include/ipconfig.h @@ -74,35 +74,6 @@ enum connman_ipconfig_method { struct connman_ipconfig; -struct connman_ipconfig_ops { - void (*up) (struct connman_ipconfig *ipconfig); - void (*down) (struct connman_ipconfig *ipconfig); - void (*lower_up) (struct connman_ipconfig *ipconfig); - void (*lower_down) (struct connman_ipconfig *ipconfig); - void (*ip_bound) (struct connman_ipconfig *ipconfig); - void (*ip_release) (struct connman_ipconfig *ipconfig); - void (*route_set) (struct connman_ipconfig *ipconfig); - void (*route_unset) (struct connman_ipconfig *ipconfig); -}; - -struct connman_ipconfig *connman_ipconfig_create(int index, - enum connman_ipconfig_type type); -struct connman_ipconfig *connman_ipconfig_ref(struct connman_ipconfig *ipconfig); -void connman_ipconfig_unref(struct connman_ipconfig *ipconfig); - -void *connman_ipconfig_get_data(struct connman_ipconfig *ipconfig); -void connman_ipconfig_set_data(struct connman_ipconfig *ipconfig, void *data); - -int connman_ipconfig_get_index(struct connman_ipconfig *ipconfig); -const char *connman_ipconfig_get_ifname(struct connman_ipconfig *ipconfig); - -void connman_ipconfig_set_ops(struct connman_ipconfig *ipconfig, - const struct connman_ipconfig_ops *ops); -int connman_ipconfig_set_method(struct connman_ipconfig *ipconfig, - enum connman_ipconfig_method method); -void __connman_ipconfig_disable_ipv6(struct connman_ipconfig *ipconfig); -void __connman_ipconfig_enable_ipv6(struct connman_ipconfig *ipconfig); - #ifdef __cplusplus } #endif diff --git a/src/connman.h b/src/connman.h index 5dc588a..791de61 100644 --- a/src/connman.h +++ b/src/connman.h @@ -176,6 +176,35 @@ void __connman_proxy_cleanup(void); #include +struct connman_ipconfig_ops { + void (*up) (struct connman_ipconfig *ipconfig); + void (*down) (struct connman_ipconfig *ipconfig); + void (*lower_up) (struct connman_ipconfig *ipconfig); + void (*lower_down) (struct connman_ipconfig *ipconfig); + void (*ip_bound) (struct connman_ipconfig *ipconfig); + void (*ip_release) (struct connman_ipconfig *ipconfig); + void (*route_set) (struct connman_ipconfig *ipconfig); + void (*route_unset) (struct connman_ipconfig *ipconfig); +}; + +struct connman_ipconfig *connman_ipconfig_create(int index, + enum connman_ipconfig_type type); +struct connman_ipconfig *connman_ipconfig_ref(struct connman_ipconfig *ipconfig); +void connman_ipconfig_unref(struct connman_ipconfig *ipconfig); + +void *connman_ipconfig_get_data(struct connman_ipconfig *ipconfig); +void connman_ipconfig_set_data(struct connman_ipconfig *ipconfig, void *data); + +int connman_ipconfig_get_index(struct connman_ipconfig *ipconfig); +const char *connman_ipconfig_get_ifname(struct connman_ipconfig *ipconfig); + +void connman_ipconfig_set_ops(struct connman_ipconfig *ipconfig, + const struct connman_ipconfig_ops *ops); +int connman_ipconfig_set_method(struct connman_ipconfig *ipconfig, + enum connman_ipconfig_method method); +void __connman_ipconfig_disable_ipv6(struct connman_ipconfig *ipconfig); +void __connman_ipconfig_enable_ipv6(struct connman_ipconfig *ipconfig); + int __connman_ipconfig_init(void); void __connman_ipconfig_cleanup(void); -- 2.7.4