From 3d89df13efb4493560e51d48531e9ba37e8d2285 Mon Sep 17 00:00:00 2001 From: Jose Pedro Oliveira Date: Thu, 22 Aug 2013 00:57:14 +0100 Subject: [PATCH] Handle Fedora's telnet output: ---------- *** c0 : ('echo A | telnet -e A 127.0.0.1 6633',) telnet: connect to address 127.0.0.1: Connection refused Telnet escape character is 'A'. Trying 127.0.0.1... Unable to contact the remote controller at 127.0.0.1:6633 ---------- --- mininet/node.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mininet/node.py b/mininet/node.py index 3185746..a737845 100644 --- a/mininet/node.py +++ b/mininet/node.py @@ -1140,7 +1140,7 @@ class Controller( Node ): "installed." ) listening = self.cmd( "echo A | telnet -e A %s %d" % ( self.ip, self.port ) ) - if 'Unable' not in listening: + if 'refused' not in listening: servers = self.cmd( 'netstat -atp' ).split( '\n' ) pstr = ':%d ' % self.port clist = servers[ 0:1 ] + [ s for s in servers if pstr in s ] @@ -1235,6 +1235,6 @@ class RemoteController( Controller ): "Warn if remote controller is not accessible" listening = self.cmd( "echo A | telnet -e A %s %d" % ( self.ip, self.port ) ) - if 'Unable' in listening: + if 'refused' in listening: warn( "Unable to contact the remote controller" " at %s:%d\n" % ( self.ip, self.port ) )