---
src/ipconfig.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 98 insertions(+), 2 deletions(-)
diff --git a/src/ipconfig.c b/src/ipconfig.c
index 6196a03..3e6f738 100644
--- a/src/ipconfig.c
+++ b/src/ipconfig.c
@@ -23,6 +23,7 @@
#include <config.h>
#endif
+#include <stdio.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <linux/if_link.h>
@@ -76,6 +77,8 @@ struct connman_ipdevice {
struct connman_ipconfig *config_ipv4;
struct connman_ipconfig *config_ipv6;
+
+ gboolean ipv6_enabled;
};
static GHashTable *ipdevice_hash = NULL;
@@ -291,6 +294,58 @@ static const char *scope2str(unsigned char scope)
return "";
}
+static gboolean get_ipv6_state(gchar *ifname)
+{
+ int disabled;
+ gchar *path;
+ FILE *f;
+ gboolean enabled = FALSE;
+
+ if (ifname == NULL)
+ path = g_strdup("/proc/sys/net/ipv6/conf/all/disable_ipv6");
+ else
+ path = g_strdup_printf(
+ "/proc/sys/net/ipv6/conf/%s/disable_ipv6", ifname);
+
+ f = fopen(path, "r");
+
+ g_free(path);
+
+ if (f != NULL) {
+ if (fscanf(f, "%d", &disabled) > 0)
+ enabled = !disabled;
+ fclose(f);
+ }
+
+ return enabled;
+}
+
+static void set_ipv6_state(gchar *ifname, gboolean enable)
+{
+ gchar *path;
+ FILE *f;
+
+ if (ifname == NULL)
+ path = g_strdup("/proc/sys/net/ipv6/conf/all/disable_ipv6");
+ else
+ path = g_strdup_printf(
+ "/proc/sys/net/ipv6/conf/%s/disable_ipv6", ifname);
+
+ f = fopen(path, "r+");
+
+ g_free(path);
+
+ if (f == NULL)
+ return;
+
+ if (enable == FALSE)
+ fprintf(f, "1");
+ else
+ fprintf(f, "0");
+
+ fclose(f);
+}
+
static void free_ipdevice(gpointer data)
{
struct connman_ipdevice *ipdevice = data;
@@ -314,6 +369,9 @@ static void free_ipdevice(gpointer data)
g_free(ipdevice->pac);
g_free(ipdevice->address);
+
+ set_ipv6_state(ipdevice->ifname, ipdevice->ipv6_enabled);
+
g_free(ipdevice->ifname);
g_free(ipdevice);
}
@@ -409,6 +467,8 @@ void __connman_ipconfig_newlink(int index, unsigned short
type,
ipdevice->ifname = connman_inet_ifname(index);
ipdevice->type = type;
+ ipdevice->ipv6_enabled = get_ipv6_state(ipdevice->ifname);
+
ipdevice->address = g_strdup(address);
g_hash_table_insert(ipdevice_hash, GINT_TO_POINTER(index), ipdevice);
@@ -1507,6 +1567,34 @@ void __connman_ipconfig_append_ipv4config(struct
connman_ipconfig *ipconfig,
DBUS_TYPE_STRING, &ipconfig->address->gateway);
}
+static void disable_ipv6(struct connman_ipconfig *ipconfig)
+{
+ struct connman_ipdevice *ipdevice;
+
+ DBG("");
+
+ ipdevice = g_hash_table_lookup(ipdevice_hash,
+ GINT_TO_POINTER(ipconfig->index));
+ if (ipdevice == NULL)
+ return;
+
+ set_ipv6_state(ipdevice->ifname, FALSE);
+}
+
+static void enable_ipv6(struct connman_ipconfig *ipconfig)
+{
+ struct connman_ipdevice *ipdevice;
+
+ DBG("");
+
+ ipdevice = g_hash_table_lookup(ipdevice_hash,
+ GINT_TO_POINTER(ipconfig->index));
+ if (ipdevice == NULL)
+ return;
+
+ set_ipv6_state(ipdevice->ifname, TRUE);
+}
+
int __connman_ipconfig_set_config(struct connman_ipconfig *ipconfig,
enum connman_ipconfig_type type, DBusMessageIter *array)
{
@@ -1585,11 +1673,19 @@ int __connman_ipconfig_set_config(struct
connman_ipconfig *ipconfig,
switch (method) {
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
- case CONNMAN_IPCONFIG_METHOD_OFF:
case CONNMAN_IPCONFIG_METHOD_FIXED:
- case CONNMAN_IPCONFIG_METHOD_AUTO:
return -EINVAL;
+ case CONNMAN_IPCONFIG_METHOD_OFF:
+ ipconfig->method = method;
+ disable_ipv6(ipconfig);
+ break;
+
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
+ ipconfig->method = method;
+ enable_ipv6(ipconfig);
+ break;
+
case CONNMAN_IPCONFIG_METHOD_MANUAL:
if (address == NULL)
return -EINVAL;
--
1.7.0.4
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
