Replaced nest/confile.h by conf/conf.h, added a lot of new definitions.

3 files changed, 41 insertions, 18 deletions

diff --git a/conf/conf.h b/conf/conf.h
new file mode 100644
index 00000000..d49ee5db
--- /dev/null
+++ b/conf/conf.h
@@ -0,0 +1,40 @@
+/*
+ *	BIRD Internet Routing Daemon -- Configuration File Handling
+ *
+ *	(c) 1998 Martin Mares <mj@ucw.cz>
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#ifndef _BIRD_CONF_H_
+#define _BIRD_CONF_H_
+
+#include "lib/resource.h"
+
+extern pool *cfg_pool;
+extern mempool *cfg_mem;
+
+/* Lexer */
+
+extern int (*cf_read_hook)(byte *buf, unsigned int max);
+
+struct symbol {
+  struct symbol *next;
+  int class;
+  void *def;
+  char name[1];
+};
+
+#define SYM_VOID 0
+
+void cf_lex_init_tables(void);
+int cf_lex(void);
+void cf_lex_init(int flag);
+void cf_error(char *msg) NORET;
+void cf_allocate(void);
+
+/* Parser */
+
+int cf_parse(void);
+
+#endif
diff --git a/nest/confile.h b/nest/confile.h
deleted file mode 100644
index cdc86feb..00000000
--- a/nest/confile.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- *	BIRD Internet Routing Daemon -- Configuration File
- *
- *	(c) 1998 Martin Mares <mj@ucw.cz>
- *
- *	Can be freely distributed and used under the terms of the GNU GPL.
- */
-
-#ifndef _BIRD_CONFILE_H_
-#define _BIRD_CONFILE_H_
-
-#include "lib/resource.h"
-
-extern pool *cfg_pool;
-extern mempool *cfg_mem;
-
-#endif
diff --git a/nest/proto.c b/nest/proto.c
index 07601302..6aa83990 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -14,7 +14,7 @@
 #include "nest/protocol.h"
 #include "lib/resource.h"
 #include "lib/lists.h"
-#include "nest/confile.h"
+#include "conf/conf.h"
 #include "nest/route.h"
 #include "nest/iface.h"