The library is now glued together from generic and OS-dependent parts

by the `mergedirs' script. Few more IP address manipulation functions
and some fixes.

9 files changed, 66 insertions, 4 deletions

diff --git a/sysdep/cf/linux-20.h b/sysdep/cf/linux-20.h
index 6100add3..092ab71f 100644
--- a/sysdep/cf/linux-20.h
+++ b/sysdep/cf/linux-20.h
@@ -9,3 +9,7 @@
 #undef CONFIG_TOS
 #undef CONFIG_MULTIPATH
 #undef CONFIG_NETLINK
+
+/*
+Link: sysdep/linux
+ */
diff --git a/sysdep/cf/linux-21.h b/sysdep/cf/linux-21.h
index a2afcbbd..c810ec1a 100644
--- a/sysdep/cf/linux-21.h
+++ b/sysdep/cf/linux-21.h
@@ -9,3 +9,7 @@
 #define CONFIG_TOS
 #define CONFIG_MULTIPATH
 #define CONFIG_NETLINK
+
+/*
+Link: sysdep/linux
+ */
diff --git a/sysdep/cf/linux-v6.h b/sysdep/cf/linux-v6.h
index de397fc1..21939b86 100644
--- a/sysdep/cf/linux-v6.h
+++ b/sysdep/cf/linux-v6.h
@@ -11,3 +11,7 @@
 #define CONFIG_TOS
 #define CONFIG_MULTIPATH
 #define CONFIG_NETLINK
+
+/*
+Link: sysdep/linux
+ */
diff --git a/sysdep/linux/Makefile b/sysdep/linux/Makefile
deleted file mode 100644
index a81db06d..00000000
--- a/sysdep/linux/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include $(TOPDIR)/Rules
diff --git a/sysdep/linux/Modules b/sysdep/linux/Modules
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/sysdep/linux/Modules
diff --git a/sysdep/unix/Makefile b/sysdep/unix/Makefile
deleted file mode 100644
index 60f80576..00000000
--- a/sysdep/unix/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-OBJS=log.o
-
-include $(TOPDIR)/Rules
diff --git a/sysdep/unix/Modules b/sysdep/unix/Modules
new file mode 100644
index 00000000..450f5795
--- /dev/null
+++ b/sysdep/unix/Modules
@@ -0,0 +1,3 @@
+log.c
+main.c
+timer.h
diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
new file mode 100644
index 00000000..f3b01d41
--- /dev/null
+++ b/sysdep/unix/main.c
@@ -0,0 +1,25 @@
+/*
+ *	BIRD Internet Routing Daemon -- Unix Entry Point
+ *
+ *	(c) 1998 Martin Mares <mj@ucw.cz>
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#include <stdio.h>
+
+#include "nest/bird.h"
+#include "lib/lists.h"
+#include "lib/resource.h"
+#include "nest/route.h"
+
+int
+main(void)
+{
+  log(L_INFO "Launching BIRD -1.-1-pre-omega...");
+
+  log_init_debug(NULL);
+  resource_init();
+
+  return 0;
+}
diff --git a/sysdep/unix/timer.h b/sysdep/unix/timer.h
new file mode 100644
index 00000000..506e3c94
--- /dev/null
+++ b/sysdep/unix/timer.h
@@ -0,0 +1,26 @@
+/*
+ *	BIRD Timers
+ *
+ *	(c) 1998 Martin Mares <mj@ucw.cz>
+ *
+ *	Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#ifndef _BIRD_TIMER_H_
+#define _BIRD_TIMER_H_
+
+#include "lib/resource.h"
+
+typedef struct timer {
+	resource r;
+	void (*hook)(struct timer *);
+	void *data;
+	/* internal fields should be here */
+} timer;
+
+timer *tm_new(pool *, void (*hook)(timer *), void *data);
+void tm_start(timer *, unsigned after);
+void tm_stop(timer *);
+void tm_trigger(timer *);
+
+#endif