Improved regex.

dreibh · Feb 26, 2024 · e1f3de3 · e1f3de3
1 parent 12c3d7a
commit e1f3de3
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/tracedataimporter b/src/tracedataimporter
@@ -94,8 +94,8 @@ def processInput(inputFile, outputType):
                elif inputType != IT_PING:
                   raise Exception('Multiple input types in the same file?!')
 
-               sourceIP      = ip_address(re.sub(r'(fe80::.*)%.*$', '\\1', tuples[1]))
-               destinationIP = ip_address(re.sub(r'(fe80::.*)%.*$', '\\1', tuples[2]))
+               sourceIP      = ip_address(re.sub(r'^(fe80::.*)%.*$', '\\1', tuples[1]))
+               destinationIP = ip_address(re.sub(r'^(fe80::.*)%.*$', '\\1', tuples[2]))
                timeStamp     = int(tuples[3], 16)
                checksum      = int(tuples[4], 16)
                status        = int(tuples[5])
@@ -150,8 +150,8 @@ def processInput(inputFile, outputType):
                elif inputType != IT_TRACEROUTE:
                   raise Exception('Multiple input types in the same file?!')
 
-               sourceIP      = ip_address(re.sub(r'(fe80::.*)%.*$', '\\1', tuples[1]))
-               destinationIP = ip_address(re.sub(r'(fe80::.*)%.*$', '\\1', tuples[2]))
+               sourceIP      = ip_address(re.sub(r'^(fe80::.*)%.*$', '\\1', tuples[1]))
+               destinationIP = ip_address(re.sub(r'^(fe80::.*)%.*$', '\\1', tuples[2]))
                timeStamp     = int(tuples[3], 16)
                roundNumber   = int(tuples[4])
                checksum      = int(tuples[5], 16)
@@ -205,7 +205,7 @@ def processInput(inputFile, outputType):
                hopNumber = int(tuples[1])
                status    = int(tuples[2], 16)
                rtt       = int(tuples[3])
-               hopIP     = ip_address(re.sub(r'(fe80::.*)%.*$', '\\1', tuples[4]))
+               hopIP     = ip_address(re.sub(r'^(fe80::.*)%.*$', '\\1', tuples[4]))
 
                assert hopNumber <= totalHops
                assert ('0x' + tuples[2]) == hex(status)