if self.action == ASTAction.EXPR:
return self.left.write(expr_param, expr_param2)
-def parse_ast(expr, parse_expr):
+def parse_ast(expr, parse_expr, comma_is_or):
expr = expr.strip()
comma_split = expr.split(",", 1)
or_split = expr.split("||", 1)
if len(comma_split) > 1 and not "||" in comma_split[0]:
- return ASTNode(ASTAction.OR, parse_ast(comma_split[0], parse_expr), parse_ast(comma_split[1], parse_expr))
+ # Confusingly, BIRD uses `,` as either || or &&, depending on the type
+ # of expression being parsed. Specifically, a `numbers-match` uses `,`
+ # as OR, whereas a `bitmask-match` uses `,` as AND.
+ if comma_is_or:
+ return ASTNode(ASTAction.OR, parse_ast(comma_split[0], parse_expr, comma_is_or), parse_ast(comma_split[1], parse_expr, comma_is_or))
+ else:
+ return ASTNode(ASTAction.AND, parse_ast(comma_split[0], parse_expr, comma_is_or), parse_ast(comma_split[1], parse_expr, comma_is_or))
if len(or_split) > 1:
assert not "," in or_split[0]
- return ASTNode(ASTAction.OR, parse_ast(or_split[0], parse_expr), parse_ast(or_split[1], parse_expr))
+ return ASTNode(ASTAction.OR, parse_ast(or_split[0], parse_expr, comma_is_or), parse_ast(or_split[1], parse_expr, comma_is_or))
and_split = expr.split("&&", 1)
if len(and_split) > 1:
- return ASTNode(ASTAction.AND, parse_ast(and_split[0], parse_expr), parse_ast(and_split[1], parse_expr))
+ return ASTNode(ASTAction.AND, parse_ast(and_split[0], parse_expr, comma_is_or), parse_ast(and_split[1], parse_expr, comma_is_or))
if expr.strip() == "true":
return ASTNode(ASTAction.TRUE, None)
return ASTNode(ASTAction.FALSE, None)
if expr.startswith("!"):
- return ASTNode(ASTAction.NOT, parse_ast(expr[1:], parse_expr))
+ return ASTNode(ASTAction.NOT, parse_ast(expr[1:], parse_expr, comma_is_or))
return parse_expr(expr)
break;"""
def fragment_to_rule(ipproto, rules):
- ast = parse_ast(rules, parse_frag_expr)
+ ast = parse_ast(rules, parse_frag_expr, True)
return "if (!( " + ast.write(ipproto) + " )) break;"
def len_to_rule(rules):
- ast = parse_ast(rules, parse_numbers_expr)
+ ast = parse_ast(rules, parse_numbers_expr, True)
return "if (!( " + ast.write("(data_end - pktdata)") + " )) break;"
def proto_to_rule(ipproto, proto):
- ast = parse_ast(proto, parse_numbers_expr)
+ ast = parse_ast(proto, parse_numbers_expr, True)
if ipproto == 4:
return "if (!( " + ast.write("ip->protocol") + " )) break;"
return "if (!( " + ast.write("ip6->nexthdr") + " )) break;"
def icmp_type_to_rule(proto, ty):
- ast = parse_ast(ty, parse_numbers_expr)
+ ast = parse_ast(ty, parse_numbers_expr, True)
if proto == 4:
return "if (icmp == NULL) break;\nif (!( " + ast.write("icmp->type") + " )) break;"
else:
return "if (icmpv6 == NULL) break;\nif (!( " + ast.write("icmpv6->icmp6_type") + " )) break;"
def icmp_code_to_rule(proto, code):
- ast = parse_ast(code, parse_numbers_expr)
+ ast = parse_ast(code, parse_numbers_expr, True)
if proto == 4:
return "if (icmp == NULL) break;\nif (!( " + ast.write("icmp->code") + " )) break;"
else:
return "if (icmpv6 == NULL) break;\nif (!( " + ast.write("icmpv6->icmp6_code") + " )) break;"
def dscp_to_rule(proto, rules):
- ast = parse_ast(rules, parse_numbers_expr)
+ ast = parse_ast(rules, parse_numbers_expr, True)
if proto == 4:
return "if (!( " + ast.write("((ip->tos & 0xfc) >> 2)") + " )) break;"
def port_to_rule(ty, rules):
if ty == "port" :
- ast = parse_ast(rules, parse_numbers_expr)
+ ast = parse_ast(rules, parse_numbers_expr, True)
return "if (!ports_valid) break;\nif (!( " + ast.write("sport", "dport") + " )) break;"
- ast = parse_ast(rules, parse_numbers_expr)
+ ast = parse_ast(rules, parse_numbers_expr, True)
return "if (!ports_valid) break;\nif (!( " + ast.write(ty) + " )) break;"
def tcp_flags_to_rule(rules):
- ast = parse_ast(rules, parse_bit_expr)
+ ast = parse_ast(rules, parse_bit_expr, False)
return f"""if (tcp == NULL) break;
if (!( {ast.write("(ntohs(tcp->flags) & 0xfff)")} )) break;"""
def flow_label_to_rule(rules):
- ast = parse_ast(rules, parse_bit_expr)
+ ast = parse_ast(rules, parse_bit_expr, False)
return f"""if (ip6 == NULL) break;
if (!( {ast.write("((((uint32_t)(ip6->flow_lbl[0] & 0xf)) << 2*8) | (((uint32_t)ip6->flow_lbl[1]) << 1*8) | (uint32_t)ip6->flow_lbl[0])")} )) break;"""
# Now write the match handling!
first_action = None
+ stats_action = None
last_action = None
for community in line.split("("):
if not community.startswith("generic, "):
first_action = None
exp = (low_bytes & (0xff << 23)) >> 23
if low_bytes == 0:
- first_action = "return XDP_DROP;"
+ first_action = "{stats_replace}\nreturn XDP_DROP;"
elif low_bytes & (1 << 31) != 0:
# Negative limit, just drop
- first_action = "return XDP_DROP;"
+ first_action = "{stats_replace}\nreturn XDP_DROP;"
elif exp == 0xff:
# NaN/INF. Just treat as INF and accept
first_action = None
elif exp <= 127: # < 1
- first_action = "return XDP_DROP;"
+ first_action = "{stats_replace}\nreturn XDP_DROP;"
elif exp >= 127 + 63: # The count won't even fit in 64-bits, just accept
first_action = None
else:
first_action += f"\t\t{spin_unlock}\n"
first_action += "\t} else {\n"
first_action += f"\t\t{spin_unlock}\n"
+ first_action += "\t\t{stats_replace}\n"
first_action += "\t\treturn XDP_DROP;\n"
first_action += "\t}\n"
if ty == "0x8306" or ty == "0x830c":
if low_bytes & 1 == 0:
last_action = "return XDP_PASS;"
if low_bytes & 2 == 2:
- write_rule(f"const uint32_t ruleidx = STATIC_RULE_CNT + {rulecnt};")
- write_rule("INCREMENT_MATCH(ruleidx);")
+ stats_action = f"const uint32_t ruleidx = STATIC_RULE_CNT + {rulecnt};\n"
+ stats_action += "INCREMENT_MATCH(ruleidx);"
elif ty == "0x8008":
assert False # We do not implement the redirect action
elif ty == "0x8009":
write_rule("ip6->priority = " + str(low_bytes >> 2) + ";")
write_rule("ip6->flow_lbl[0] = (ip6->flow_lbl[0] & 0x3f) | " + str((low_bytes & 3) << 6) + ";")
if first_action is not None:
- write_rule(first_action)
+ write_rule(first_action.replace("{stats_replace}", stats_action))
+ if stats_action is not None and (first_action is None or "{stats_replace}" not in first_action):
+ write_rule(stats_action)
if last_action is not None:
write_rule(last_action)
if proto == 6:
projects / flowspec-xdp / blobdiff