Fixed makefiles

ruantiblock-mod-py/files/usr/lib/python3.9/ruab_sum_ip.py

@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+# (с) 2020 gSpot (https://github.com/gSpotx2f/ruantiblock_openwrt)
+
+from ipaddress import IPv4Address, IPv4Network, summarize_address_range
+
+HOSTS_LIMIT = 0
+NETS_LIMIT = 0
+
+
+def _sort_ip_func(e: str) -> IPv4Address:
+    return IPv4Address(e)
+
+
+def _group_ip_ranges(ip_list: list, raw_list=None) -> tuple:
+    def remove_items(start, end):
+        for ip in range(int(start), int(end) + 1):
+            raw_list.remove(str(IPv4Address(ip)))
+
+    start = end = None
+    hosts = 1
+    for ip in ip_list:
+        ip_obj = IPv4Address(ip)
+        if end and (end + 1) == ip_obj:
+            hosts += 1
+        else:
+            if hosts > 1 and hosts >= HOSTS_LIMIT:
+                if raw_list:
+                    remove_items(start, end)
+                yield start, end
+            start = ip_obj
+            hosts = 1
+        end = ip_obj
+    else:
+        if hosts > 1 and hosts >= HOSTS_LIMIT:
+            if raw_list:
+                remove_items(start, end)
+            yield start, end
+
+
+def summarize_ip_ranges(ip_list: (list, set), modify_raw_list=False) -> IPv4Network:
+    for s, e in _group_ip_ranges(sorted(ip_list, key=_sort_ip_func),
+                                 modify_raw_list and ip_list):
+        for i in summarize_address_range(s, e):
+            if i.prefixlen == 32:
+                if modify_raw_list:
+                    if type(ip_list) == set:
+                        ip_list.add(i.network_address)
+                    else:
+                        ip_list.append(i.network_address)
+            else:
+                yield i
+
+
+def _sort_net_func(e: str) -> IPv4Network:
+    return IPv4Network(e)
+
+
+def _group_nets(cidr_list: list, raw_list=None) -> IPv4Network:
+
+    def remove_items(start, end):
+        for ip in range(int(start), int(end) + 1, 256):
+            raw_list.remove(str(IPv4Address(ip)) + "/24")
+
+    start = end = curr_super_net = None
+    nets = 1
+    for net in cidr_list:
+        net_obj = IPv4Network(net)
+        prefix_len = net_obj.prefixlen
+        if prefix_len == 24:
+            address = net_obj.network_address
+            super_net = net_obj.supernet(new_prefix=16)
+            if end and super_net == curr_super_net and (end + 256) == address:
+                nets += 1
+            else:
+                if nets > 1 and nets >= NETS_LIMIT:
+                    if raw_list:
+                        remove_items(start, end)
+                    yield summarize_address_range(IPv4Address(start), IPv4Address(end + 255))
+                start = address
+                curr_super_net = super_net
+                nets = 1
+            end = address
+    else:
+        if nets > 1 and nets >= NETS_LIMIT:
+            if raw_list:
+                remove_items(start, end)
+            yield summarize_address_range(IPv4Address(start), IPv4Address(end + 255))
+
+
+def summarize_nets(cidr_list: (list, set)) -> IPv4Network:
+    for i in _group_nets(sorted(cidr_list, key=_sort_net_func), cidr_list):
+        for j in i:
+            yield j