Merge remote-tracking branch 'upstream/dev' into dev

1 files changed, 8 insertions, 2 deletions

diff --git a/utils/toripaddr2list.py b/utils/toripaddr2list.py
index 13cc8e1e6..47c5412e5 100755
--- a/utils/toripaddr2list.py
+++ b/utils/toripaddr2list.py
@@ -9,6 +9,12 @@ if len (sys.argv) != 2 :
             
 with open(sys.argv[1]) as fp:
     for cnt, line in enumerate(fp):
-        ipaddr = line.rstrip()
-        print(" { 0x"+socket.inet_aton(ipaddr).hex()+", /* "+ipaddr+" */, 32, NDPI_PROTOCOL_TOR },")
+        x = line.rstrip().split("/")
+        ipaddr = x[0]
+        cidr   = x[1]
+        
+        if(cidr == None):
+            cidr = "32"
+
+        print(" { 0x"+socket.inet_aton(ipaddr).hex().upper()+" /* "+ipaddr+"/"+cidr+" */, "+cidr+", NDPI_PROTOCOL_XYX },")