ipv6: add support for ipv6 addresses lists (#2113)

1 files changed, 30 insertions, 4 deletions

diff --git a/utils/ipaddr2list.py b/utils/ipaddr2list.py
index 1f610c88e..2aa244b35 100755
--- a/utils/ipaddr2list.py
+++ b/utils/ipaddr2list.py
@@ -8,15 +8,14 @@ import socket, struct
 proto = "NDPI_PROTOCOL_XYX"
 append_name = ""
 if len (sys.argv) < 2 :
-    print("Usage: ipaddr2list.py <file> <protocol> [<append_name>]")
+    print("Usage: ipaddr2list.py <file> <protocol> [file6] [<append_name>]")
     sys.exit (1)
 
 if len (sys.argv) >= 3:
     proto = sys.argv[2]
 
-if len (sys.argv) >= 4:
-    append_name = sys.argv[3]
-
+if len (sys.argv) >= 5:
+    append_name = sys.argv[4]
 
 
 print("""/*
@@ -67,5 +66,32 @@ print(" /* End */")
 print(" { 0x0, 0, 0 }")
 print("};")
 
+print("");
+print("static ndpi_network6 "+proto.lower()+append_name+"_protocol_list_6[] = {")
+
+if(len (sys.argv) >= 4):
+
+    with open(sys.argv[3]) as fp:
+        for cnt, line in enumerate(fp):
+            line = line.rstrip()
+
+            if(line != ""):
+                lines += 1
+                x = line.split("/")
+
+                if(len(x) == 2):
+                    ipaddr = x[0]
+                    cidr   = x[1]
+                else:
+                    ipaddr = line
+                    cidr = "128"
+
+                if(ipaddr != ""):
+                    print(" { \""+ipaddr+"\", "+cidr+", "+proto+" },")
+
+print(" /* End */")
+print(" { NULL, 0, 0 }")
+print("};")
+
 if lines == 0:
     sys.stderr.write(f'{sys.argv[0]}: File {sys.argv[1]} is empty.\n')