diff --git a/dns.py b/dns.py index a738240b6690b7df0fd8d127defa56c4a0fec5f7..0d6e001f97bef6f307b5342e91e5c6b9262c49a4 100644 --- a/dns.py +++ b/dns.py @@ -17,7 +17,7 @@ class dns(Custom): @staticmethod def get_domain_name_rule(domain_name: str) -> dict: """ - Retrieves the NFQueue rule to match a given domain name. + Retrieve the NFQueue rule to match a given domain name. :param domain_name: Domain name to match. :return: Dictionary containing the NFQueue rule to match the given domain name. diff --git a/ip.py b/ip.py index abdb51bff8c3a05806d52fc68b15ceb1458b8eed..f6ce60e8502ae3fbcd39fce9c026fe6b6f1387ef 100644 --- a/ip.py +++ b/ip.py @@ -145,11 +145,10 @@ class ip(Protocol): domain_name_rule_suffix = "_addr}})" ip_addr_rule_prefix = "compare_ip((ip_addr_t) {{.version = " + str(version) + ", .value." + self.protocol_name + " = " ip_addr_rule_suffix = "_addr(payload)}}, ip_str_to_net(\"{}\", " + str(version) + "))" - cached_ip_rule_suffix = "_addr}}, interactions_data[{}].cached_ip)" # Template rules for a domain name rules_domain_name = { - "forward": "( " + ip_addr_rule_prefix + addr_dir + cached_ip_rule_suffix + " || " + domain_name_rule_prefix + addr_dir + domain_name_rule_suffix + " )", - "backward": "( " + ip_addr_rule_prefix + other_dir + cached_ip_rule_suffix + " || " + domain_name_rule_prefix + other_dir + domain_name_rule_suffix + " )" + "forward": "( " + domain_name_rule_prefix + addr_dir + domain_name_rule_suffix + " )", + "backward": "( " + domain_name_rule_prefix + other_dir + domain_name_rule_suffix + " )" } # Template rules for an IP address rules_address = { diff --git a/ipv4.py b/ipv4.py index 391fd882b7c99335df834c637f6e018fca7cae40..0777fd78187e1b176321b2a5058e2440554a9a85 100644 --- a/ipv4.py +++ b/ipv4.py @@ -1,5 +1,4 @@ from ip import ip -from igmp import igmp class ipv4(ip):