Merge pull request #685 from maufl/fix-ping-parse-regex

Fix regex for ping result parsing, supporting optional 'packets' word in ping output
2017-01-06 14:53:42 -08:00
parent 36c2e7cd79 c128712d4d
commit 2bfaec75e0
1 changed files with 1 additions and 1 deletions
@@ -633,7 +633,7 @@ class Mininet( object ):
        # Check for downed link
        if 'connect: Network is unreachable' in pingOutput:
            return 1, 0
-        r = r'(\d+) packets transmitted, (\d+) received'
+        r = r'(\d+) packets transmitted, (\d+)( packets)? received'
        m = re.search( r, pingOutput )
        if m is None:
            error( '*** Error: could not parse ping output: %s\n' %