From 603d0ae6c67a2c4487be193a265e7755fe3a5470 Mon Sep 17 00:00:00 2001 From: Claudio-Daniel Freire Date: Mon, 4 Jul 2011 12:59:30 +0200 Subject: [PATCH] Routing fix: TunIface.routes_here was not accounting for automatic p2p linkage --- src/nepi/testbeds/planetlab/interfaces.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/nepi/testbeds/planetlab/interfaces.py b/src/nepi/testbeds/planetlab/interfaces.py index 8eace7b3..088127e3 100644 --- a/src/nepi/testbeds/planetlab/interfaces.py +++ b/src/nepi/testbeds/planetlab/interfaces.py @@ -185,7 +185,11 @@ class TunIface(object): """ if self.address and self.netprefix: addr, prefix = self.address, self.netprefix - if self.pointopoint: + pointopoint = self.pointopoint + if not pointopoint: + pointopoint = self.peer_iface.address + + if pointopoint: prefix = 32 dest, destprefix, nexthop = route @@ -193,8 +197,8 @@ class TunIface(object): myNet = ipaddr.IPNetwork("%s/%d" % (addr, prefix)) gwIp = ipaddr.IPNetwork(nexthop) - if self.pointopoint: - peerIp = ipaddr.IPNetwork(self.pointopoint) + if pointopoint: + peerIp = ipaddr.IPNetwork(pointopoint) if gwIp == peerIp: return True -- 2.47.0