From e9013d761fe8f04607b53e42df496d8b6f3f3455 Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Mon, 7 Jul 2014 21:58:30 -0700
Subject: [PATCH] Fix pid regex to eat \r\n
---
mininet/node.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mininet/node.py b/mininet/node.py
index 9e50319e..258ce84e 100644
--- a/mininet/node.py
+++ b/mininet/node.py
@@ -250,7 +250,7 @@ def monitor( self, timeoutms=None, findPid=True ):
self.waitReadable( timeoutms )
data = self.read( 1024 )
# Look for PID
- marker = chr( 1 ) + r'\d+'
+ marker = chr( 1 ) + r'\d+\r\n'
if findPid and chr( 1 ) in data:
markers = re.findall( marker, data )
if markers:
--
GitLab