Some tweaks to direct route to gateway

The previous patch added code to add a static route prior to adding the gateway to the interface. This commit simply changes the logic so that this is only done on failure to add the gateway. Signed-off-by: Stéphane Graber <stgraber@ubuntu.com> Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com>

Some tweaks to direct route to gateway
fc739df5 · Stéphane Graber · 77dcf03a · fc739df5
Commit fc739df5 authored Nov 25, 2013 by Stéphane Graber
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

conf.c src/lxc/conf.c +6 -0

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2504,6 +2504,8 @@ static int setup_netdev(struct lxc_netdev *netdev)
 			return -1;
 		}
+		err = lxc_ipv4_gateway_add(netdev->ifindex, netdev->ipv4_gateway);
+		if (err) {
 			err = lxc_ipv4_dest_add(netdev->ifindex, netdev->ipv4_gateway);
 			if (err) {
 				ERROR("failed to add ipv4 dest for '%s': %s",
@@ -2522,6 +2524,7 @@ static int setup_netdev(struct lxc_netdev *netdev)
 				return -1;
 			}
 		}
+	}
 	/* setup ipv6 gateway on the interface */
 	if (netdev->ipv6_gateway) {
@@ -2535,6 +2538,8 @@ static int setup_netdev(struct lxc_netdev *netdev)
 			return -1;
 		}
+		err = lxc_ipv6_gateway_add(netdev->ifindex, netdev->ipv6_gateway);
+		if (err) {
 			err = lxc_ipv6_dest_add(netdev->ifindex, netdev->ipv6_gateway);
 			if (err) {
 				ERROR("failed to add ipv6 dest for '%s': %s",
@@ -2553,6 +2558,7 @@ static int setup_netdev(struct lxc_netdev *netdev)
 				return -1;
 			}
 		}
+	}
 	DEBUG("'%s' has been setup", current_ifname);