Filters upgraded - a bit. Moved code to filter.c because it is where

it belongs. (f-util.c stays there for auxiliary and non-important things.)

1 files changed, 41 insertions, 21 deletions

diff --git a/bird.conf b/bird.conf
index 1b5b534..3d22f5a 100644
--- a/bird.conf
+++ b/bird.conf
@@ -4,42 +4,62 @@
 
 # Yet another comment
 
-router id 62.168.0.1
+router id 62.168.0.1;
 
-define xyzzy = 120+10
+define xyzzy = 120+10;
 
-function startup () int i; { printdebug; printdebug; i = 5; print( i ); i = 1234 + i; print( i ); if 0 then { puts( "You must not ever see this" ); quitbird; } print( 2 ); if 1 then puts( "jedna dve honza jde" ); quitbird; }
+function startup () 
+int i; 
+{ 
+	print "Bird filter language: selftesting...";
+	i = 4; 
+	i = 1230 + i; 
+	print "Testing arithmetics: 1234 = " i;
+	if i = 4 then { print "*** FAIL: if 0"; quitbird; } else print "test 1 passed";
+	if 1234 = i then print "test 2 passed"; else { print "*** FAIL: if 1 else"; }
+	if 1 <= 1 then print "test 3 passed"; else { print "*** FAIL: test 3"; }
+	if 1234 < 1234 then { print "*** FAIL: test 4"; quitbird; } else print "test 4 passed";
 
-filter testf int j; { j = const(4321); print( j ); }
+	
+	print "done";
+	quitbird;
+	print "*** FAIL: this is unreachable"; 
+}
 
+filter testf 
+int j; 
+{ 
+	j = const(4321); 
+	print j;
+}
 
 protocol rip MyRIP_test {
-	preference xyzzy
-	debug all
-	port 1520
-	period 5
-	garbagetime 30
-	interface "*"
+	preference xyzzy;
+	debug all;
+	port 1520;
+	period 5;
+	garbagetime 30;
+	interface "*";
 }
 
 protocol device {
-	disabled
-	interface "eth*", "ppp*"
+#	disabled;
+#	interface "eth*", "ppp*";
 }
 
 #protocol kernel {
-#	disabled
+#	disabled;
 #	learn;			# Learn all routes from the kernel
 #	scan time 10;		# Scan kernel tables every 10 seconds
 #}
 
 protocol static {
-#	disabled
-	route 0.0.0.0/0 via 62.168.0.13
-	route 62.168.0.0/25 reject
-#	route 10.0.0.0/8 reject
-#	route 10.1.1.0:255.255.255.0 via 62.168.0.3
-#	route 10.1.2.0:255.255.255.0 via 62.168.0.3
-#	route 10.1.3.0:255.255.255.0 via 62.168.0.4
-#	route 10.2.0.0/24 via "arc0"
+#	disabled;
+	route 0.0.0.0/0 via 62.168.0.13;
+	route 62.168.0.0/25 reject;
+#	route 10.0.0.0/8 reject;
+#	route 10.1.1.0:255.255.255.0 via 62.168.0.3;
+#	route 10.1.2.0:255.255.255.0 via 62.168.0.3;
+#	route 10.1.3.0:255.255.255.0 via 62.168.0.4;
+#	route 10.2.0.0/24 via "arc0";
 }