Merge commit 'f80003e35' into thread-next

diff --cc doc/bird.sgml
Simple merge

diff --cc filter/test.conf
index ce9608279d91fe44f01f15c89936d3066bc401b9,3df9b6975262d2ed905f5f5de6204f00f9d21fb6..8fd03a588e4f709a40a5da289d31f7de18b14bdd
--- 1/filter/test.conf
--- 2/filter/test.conf
+++ b/filter/test.conf
@@@ -249,20 -132,13 +249,21 @@@ function t_int(
        bt_assert(1 <= 1);
        bt_assert(!(1234 < 1234));
  
 +      bt_assert(10 - 5 = 5);
 +      bt_assert(4294967295 + 1 = 0);
 +      bt_assert(6*9=54);
 +      bt_assert(984/41 = 24);
 +      bt_assert(123/45 = 2);
 +      bt_assert(0xfee1a | 0xbeef = 0xffeff);
 +      bt_assert(0xfee1a & 0xbeef = 0xae0a);
 +
        case i {
                4200000000: bt_assert(true);
+               (2+2): bt_assert(false);
                else: bt_assert(false);
        }
- 
        case four {
+               4200000000: bt_assert(false);
                (2+2): bt_assert(true);
                else: bt_assert(false);
        }

diff --cc proto/babel/babel.c
Simple merge

diff --cc proto/babel/babel.h
Simple merge

diff --cc proto/babel/config.Y
index 6a7c071f951751e0a3050199670625ffd4bd512e,de628f7aaa9915669ec891e2ed8ff46b3c79bee4..5ca74c182ba599733defbeb09bc5b2c4e2d11fba
--- 1/proto/babel/config.Y
--- 2/proto/babel/config.Y
+++ b/proto/babel/config.Y
@@@ -24,9 -24,10 +24,10 @@@ CF_DECL
  
  CF_KEYWORDS(BABEL, INTERFACE, METRIC, RXCOST, HELLO, UPDATE, INTERVAL, PORT,
        TYPE, WIRED, WIRELESS, RX, TX, BUFFER, PRIORITY, LENGTH, CHECK, LINK,
 -      NEXT, HOP, IPV4, IPV6, BABEL_METRIC, SHOW, INTERFACES, NEIGHBORS,
 +      NEXT, HOP, IPV4, IPV6, SHOW, INTERFACES, NEIGHBORS,
        ENTRIES, RANDOMIZE, ROUTER, ID, AUTHENTICATION, NONE, MAC, PERMISSIVE,
-       EXTENDED, TUNNEL, RTT, MIN, MAX, DECAY, SEND, TIMESTAMPS, COST, DELAY)
+       EXTENDED, TUNNEL, RTT, MIN, MAX, DECAY, SEND, TIMESTAMPS, COST, DELAY,
+       PREFER, NATIVE)
  
  CF_GRAMMAR