From: Daniel Wagner <daniel.wagner@bmw-carit.de>
Date: Mon, 7 May 2012 15:31:03 +0000 (+0200)
Subject: connection: Fix host route to VPN server
X-Git-Tag: 1.0~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ad0a13c86d3ff5538236746c0c527c93d1d285e2;p=platform%2Fupstream%2Fconnman.git

connection: Fix host route to VPN server

The kernel will ignore host routes which are bogus.
In case of a PtP connection such as PPP for cellular the
gateway address should not be used.
---

diff --git a/src/connection.c b/src/connection.c
index f4abd57..712a4be 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -832,6 +832,7 @@ int __connman_connection_gateway_add(struct connman_service *service,
 	}
 
 	if (service_type == CONNMAN_SERVICE_TYPE_VPN) {
+		char *dest;
 
 		if (type == CONNMAN_IPCONFIG_TYPE_IPV4) {
 			if (new_gateway->ipv4_gateway != NULL)
@@ -844,18 +845,28 @@ int __connman_connection_gateway_add(struct connman_service *service,
 			 * the VPN. The route might already exist depending
 			 * on network topology.
 			 */
+			if (g_strcmp0(active_gateway->ipv4_gateway->gateway, "0.0.0.0") != 0)
+				dest = active_gateway->ipv4_gateway->gateway;
+			else
+				dest = NULL;
+
 			connman_inet_add_host_route(active_gateway->index,
 					gateway,
-					active_gateway->ipv4_gateway->gateway);
+					dest);
 
 		} else if (type == CONNMAN_IPCONFIG_TYPE_IPV6) {
 			if (new_gateway->ipv6_gateway != NULL)
 				set_vpn_routes(new_gateway->ipv6_gateway,
 					service, gateway, type, peer);
 
+			if (g_strcmp0(active_gateway->ipv6_gateway->gateway, "::") != 0)
+				dest = active_gateway->ipv6_gateway->gateway;
+			else
+				dest = NULL;
+
 			connman_inet_add_ipv6_host_route(active_gateway->index,
 					gateway,
-					active_gateway->ipv6_gateway->gateway);
+					dest);
 		}
 
 	} else {