filters_init() renamed to filters_postconfig().

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..fa437ed
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,16 @@
+# Generated automatically from Makefile-top.in by configure.
+# Makefile for in place build of BIRD
+# (c) 1999 Martin Mares <mj@ucw.cz>
+
+objdir=obj
+
+all:
+       $(MAKE) -C $(objdir) $@
+
+clean:
+       $(MAKE) -C $(objdir) clean
+       rm -f `find . -name "*~" -or -name "*.[oa]" -or -name "\#*\#" -or -name TAGS -or -name core -or -name depend -or -name .#*`
+
+distclean: clean
+       rm -rf $(objdir)
+       rm -f config.* configure sysdep/autoconf.h Makefile

diff --git a/bird.conf b/bird.conf
new file mode 100644 (file)
index 0000000..09b03d4
--- /dev/null
+++ b/bird.conf
@@ -0,0 +1,54 @@
+/*
+ *     This is an example configuration file.
+ */
+
+# Yet another comment
+
+router id 62.168.0.1
+
+define xyzzy = 120+10
+
+function test() {
+       int i;
+
+       printdebug;
+       i = 5;
+       print( i );
+       printdebug;
+       i = 1234;
+       print( i );
+       printdebug;
+}
+
+/*
+protocol rip MyRIP_test {
+       preference xyzzy
+       debug all
+       port 1520
+       period 5
+       garbagetime 30
+       interface "*"
+}
+*/
+
+protocol device {
+       disabled
+       interface "eth*", "ppp*"
+}
+
+#protocol kernel {
+#      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"
+}

diff --git a/filter/f-util.c b/filter/f-util.c
index df6babb757198da761271083f0f9eea4ec72ce62..65b8b52ade0903705013419dc520c38d045458b5 100644 (file)
--- a/filter/f-util.c
+++ b/filter/f-util.c
@@ -56,7 +56,7 @@ interpret(struct f_instruction *what)
 }
 
 void
-filters_init(void)
+filters_postconfig(void)
 {
   if (!last_func)
     printf( "No function defined\n" );

diff --git a/filter/filter.h b/filter/filter.h
index 499be0a16b9e6004c73f6a0b59e467dbcd42a13d..09cd7a2327cb907b4e0020a50f20e256d8f033ce 100644 (file)
--- a/filter/filter.h
+++ b/filter/filter.h
@@ -18,4 +18,6 @@ struct f_instruction {
   void *arg1, *arg2;
 };
 
+void filters_postconfig(void);
+
 #endif

diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index 2eac89e33ff7006841ad4b0ffefde2e48e2cccaa..bea479c1ae077faaf7c7fc287db1248b59d7016e 100644 (file)
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -83,6 +83,7 @@ read_config(void)
   cf_read_hook = cf_read;
   cf_lex_init(1);
   cf_parse();
+  filters_postconfig();
   protos_postconfig();
 }
 /*
@@ -108,7 +109,6 @@ main(void)
 
   debug("Reading configuration file.\n");
   read_config();
-  filters_init();
 
   signal_init();