Fix reading of mapped IP from list_file, fix error with clean

devenbansod · Nov 18, 2018 · fddcfff · fddcfff
1 parent cab427d
commit fddcfff
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/examples/run.py b/examples/run.py
@@ -49,14 +49,13 @@ def getArgParser():
         'orig_ports': args.orig_ports,
     }
 
-    pToD = pcap_to_ditg.pcap_to_ditg(
-        args.pcap_file, # Pcap file to read
-        args.mapper_file, # File with mapping of IPs to topology hosts
-        args.list_file, # File with list of IPs
-        options
-    )
-
     if args.print_all_ips:
+        pToD = pcap_to_ditg.pcap_to_ditg(
+            args.pcap_file, # Pcap file to read
+            args.mapper_file, # File with mapping of IPs to topology hosts
+            args.list_file, # File with list of IPs
+            options
+        )
         ips = pToD.getAllDistinctIPs()
         print
         print('\nThe list of distinct IPs appearing in \'' + args.pcap_file + '\' are:')
@@ -66,6 +65,12 @@ def getArgParser():
         os.system('rm -rf *_ditg_files')
         print('\nThe generated files and folders have been cleaned.')
     else:
+        pToD = pcap_to_ditg.pcap_to_ditg(
+            args.pcap_file, # Pcap file to read
+            args.mapper_file, # File with mapping of IPs to topology hosts
+            args.list_file, # File with list of IPs
+            options
+        )
         pToD.generateDITGFlowFiles()
 
         print('\nThe flow scripts and the IDT files have been generated' + \

diff --git a/pcap_to_ditg/pcap_to_ditg.py b/pcap_to_ditg/pcap_to_ditg.py
@@ -183,7 +183,7 @@ def __readPartitions(self):
                         endPoints = []
                         endPoints.append(line.split(',')[1]) # start
                         endPoints.append(line.split(',')[2]) # end
-                        endPoints.append(line.split(',')[4][:-1]) # ip
+                        endPoints.append(line.split(',')[4].strip()) # ip
                         Partitions[host] = endPoints
             return Partitions
         except Exception, e: