mirror of
https://git.openwrt.org/feed/routing.git
synced 2024-06-26 09:37:31 +02:00
688901a664
This adds a separate package for the 2.0 branch of Bird, allowing it to co-exist with the bird1 package. The two packages conflict with each other, so they can't be installed at the same time; but in the build system they coexist just fine. Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From 823ad12191e66e243dd088a81c66e4a518563e40 Mon Sep 17 00:00:00 2001
|
|
From: Jan Maria Matejka <mq@ucw.cz>
|
|
Date: Fri, 27 Apr 2018 14:38:41 +0200
|
|
Subject: [PATCH] Filter: Added missing instruction comparators.
|
|
|
|
These instructions caused SIGABORTs on reconfiguration.
|
|
---
|
|
filter/filter.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/filter/filter.c b/filter/filter.c
|
|
index bb3146e7..881ba420 100644
|
|
--- a/filter/filter.c
|
|
+++ b/filter/filter.c
|
|
@@ -1712,7 +1712,10 @@ i_same(struct f_inst *f1, struct f_inst *f2)
|
|
case FI_EA_SET: ONEARG; A2_SAME; break;
|
|
|
|
case FI_RETURN: ONEARG; break;
|
|
+ case FI_ROA_MAXLEN: ONEARG; break;
|
|
+ case FI_ROA_ASN: ONEARG; break;
|
|
case FI_IP: ONEARG; break;
|
|
+ case FI_IS_V4: ONEARG; break;
|
|
case FI_ROUTE_DISTINGUISHER: ONEARG; break;
|
|
case FI_CALL: /* Call rewriting trickery to avoid exponential behaviour */
|
|
ONEARG;
|
|
@@ -1735,6 +1738,8 @@ i_same(struct f_inst *f1, struct f_inst *f2)
|
|
((struct f_inst_roa_check *) f2)->rtc->name))
|
|
return 0;
|
|
break;
|
|
+ case FI_FORMAT: ONEARG; break;
|
|
+ case FI_ASSERT: ONEARG; break;
|
|
default:
|
|
bug( "Unknown instruction %d in same (%c)", f1->fi_code, f1->fi_code & 0xff);
|
|
}
|
|
--
|
|
2.17.0
|
|
|