From: Maria Matejka <mq@ucw.cz>
Date: Mon, 31 Mar 2025 14:02:44 +0000 (+0200)
Subject: Merge commit 'f80003e35' into thread-next
X-Git-Tag: v3.1.0~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c796114c987f53a014b9ae031d108ebe50aa17c;p=thirdparty%2Fbird.git

Merge commit 'f80003e35' into thread-next
---

8c796114c987f53a014b9ae031d108ebe50aa17c
diff --cc filter/test.conf
index ce9608279,3df9b6975..8fd03a588
--- a/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/config.Y
index 6a7c071f9,de628f7aa..5ca74c182
--- a/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