fixed ip counter and added a lot of juicy ports

Author: nullt3r

jfscan/__version__.py

@@ -1,3 +1,3 @@
-VERSION = (1, 5, 1)
+VERSION = (1, 6, 2)
 
 __version__ = ".".join(map(str, VERSION))

jfscan/core/resources.py

@@ -249,9 +249,9 @@ def count_ips(self):
 
         for (cidr,) in cidrs:
             if Validator.is_ipv6_cidr(cidr):
-                address_count += (2 ** (128 - int(cidr.split("/")[1]))) - 2
+                address_count += (2 ** (128 - int(cidr.split("/")[1])))
             elif Validator.is_ipv4_cidr(cidr):
-                address_count += (2 ** (32 - int(cidr.split("/")[1]))) - 2
+                address_count += (2 ** (32 - int(cidr.split("/")[1])))
 
         ips_count = cur.execute("SELECT count(DISTINCT ip) FROM ips_to_scan").fetchall()