Merge tag 'upstream/1.40' into tizen.

[platform/upstream/connman.git] / vpn / vpn-ipconfig.c

diff --git a/vpn/vpn-ipconfig.c b/vpn/vpn-ipconfig.c
old mode 100644 (file)
new mode 100755 (executable)
index c3e6145..825b43c
--- a/vpn/vpn-ipconfig.c
+++ b/vpn/vpn-ipconfig.c
@@ -69,27 +69,13 @@ struct vpn_ipdevice {
 
 static GHashTable *ipdevice_hash = NULL;
 
-unsigned char __vpn_ipconfig_netmask_prefix_len(const char *netmask)
+struct connman_ipaddress *
+__vpn_ipconfig_get_address(struct vpn_ipconfig *ipconfig)
 {
-       unsigned char bits;
-       in_addr_t mask;
-       in_addr_t host;
-
-       if (!netmask)
-               return 32;
-
-       mask = inet_network(netmask);
-       host = ~mask;
-
-       /* a valid netmask must be 2^n - 1 */
-       if ((host & (host + 1)) != 0)
-               return -1;
-
-       bits = 0;
-       for (; mask; mask <<= 1)
-               ++bits;
+       if (!ipconfig)
+               return NULL;
 
-       return bits;
+       return ipconfig->address;
 }
 
 const char *__vpn_ipconfig_get_peer(struct vpn_ipconfig *ipconfig)
@@ -122,7 +108,7 @@ unsigned int __vpn_ipconfig_get_flags_from_index(int index)
        return ipdevice->flags;
 }
 
-void __vpn_ipconfig_foreach(void (*function) (int index,
+void vpn_ipconfig_foreach(void (*function) (int index,
                                        void *user_data), void *user_data)
 {
        GList *list, *keys;
@@ -225,7 +211,7 @@ int __vpn_ipconfig_address_add(struct vpn_ipconfig *ipconfig, int family)
 
        if (family == AF_INET)
                return connman_inet_set_address(ipconfig->index,
-                                               ipconfig->address);
+                                                       ipconfig->address);
        else if (family == AF_INET6)
                return connman_inet_set_ipv6_address(ipconfig->index,
                                                        ipconfig->address);
@@ -296,7 +282,10 @@ static struct vpn_ipconfig *create_ipv6config(int index)
                return NULL;
        }
 
+       connman_ipaddress_set_p2p(ipv6config->address, true);
+
        ipv6config->system = connman_ipaddress_alloc(AF_INET6);
+       connman_ipaddress_set_p2p(ipv6config->system, true);
 
        DBG("ipconfig %p", ipv6config);
 
@@ -328,7 +317,10 @@ struct vpn_ipconfig *__vpn_ipconfig_create(int index, int family)
                return NULL;
        }
 
+       connman_ipaddress_set_p2p(ipconfig->address, true);
+
        ipconfig->system = connman_ipaddress_alloc(AF_INET);
+       connman_ipaddress_set_p2p(ipconfig->system, true);
 
        DBG("ipconfig %p", ipconfig);