diff options
| author | Jukka Rissanen <jukka.rissanen@nokia.com> | 2011-03-25 15:03:19 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-03-25 14:46:56 +0100 |
| commit | 72397eb95321ba03392052db5d877ddef79f6d0d (patch) | |
| tree | 679648a3c074a4cf8b5958953435e1196ce83b20 /src/ipconfig.c | |
| parent | 7370e6d24a9a15053045026755a51965a804599a (diff) | |
| download | connman-72397eb95321ba03392052db5d877ddef79f6d0d.tar.gz connman-72397eb95321ba03392052db5d877ddef79f6d0d.tar.bz2 connman-72397eb95321ba03392052db5d877ddef79f6d0d.zip | |
service: Return 6to4 tunnel status to dbus caller.
Diffstat (limited to 'src/ipconfig.c')
| -rw-r--r-- | src/ipconfig.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/ipconfig.c b/src/ipconfig.c index 0599a73c..22dd03bc 100644 --- a/src/ipconfig.c +++ b/src/ipconfig.c @@ -1701,7 +1701,8 @@ void __connman_ipconfig_append_ipv4(struct connman_ipconfig *ipconfig, } void __connman_ipconfig_append_ipv6(struct connman_ipconfig *ipconfig, - DBusMessageIter *iter) + DBusMessageIter *iter, + struct connman_ipconfig *ipconfig_ipv4) { const char *str, *privacy; @@ -1714,6 +1715,12 @@ void __connman_ipconfig_append_ipv6(struct connman_ipconfig *ipconfig, if (str == NULL) return; + if (ipconfig_ipv4 != NULL && + ipconfig->method == CONNMAN_IPCONFIG_METHOD_AUTO) { + if (__connman_6to4_check(ipconfig_ipv4) == 1) + str = "6to4"; + } + connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str); if (ipconfig->system == NULL) |