summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>1999-03-01 20:05:58 +0100
committerMartin Mares <mj@ucw.cz>1999-03-01 20:05:58 +0100
commit025d14cd5a0909b534762e5a50bfef97c2b4c9ee (patch)
treea6aa8a4dd6d28364ba4e549bcd9aedbb7095178d
parent12be9b8c1870ab8813d29350a2e2743f8e144642 (diff)
downloadbird-025d14cd5a0909b534762e5a50bfef97c2b4c9ee.tar
bird-025d14cd5a0909b534762e5a50bfef97c2b4c9ee.zip
Use traditional Unix route/iface interface only when CONFIG_NETLINK
is not defined. Also moved declarations of Unix iface logic to krt.h.
-rw-r--r--sysdep/linux/Modules4
-rw-r--r--sysdep/unix/Modules3
-rw-r--r--sysdep/unix/krt.h5
-rw-r--r--sysdep/unix/unix.h7
4 files changed, 12 insertions, 7 deletions
diff --git a/sysdep/linux/Modules b/sysdep/linux/Modules
index 6244479..6af7055 100644
--- a/sysdep/linux/Modules
+++ b/sysdep/linux/Modules
@@ -1,3 +1,7 @@
+#ifdef CONFIG_NETLINK
+netlink.c
+#else
krt-scan.c
krt-scan.h
krt-scan.Y
+#endif
diff --git a/sysdep/unix/Modules b/sysdep/unix/Modules
index 2969ee4..e2ff0f8 100644
--- a/sysdep/unix/Modules
+++ b/sysdep/unix/Modules
@@ -3,6 +3,8 @@ main.c
timer.h
io.c
unix.h
+
+#ifndef CONFIG_NETLINK
sync-if.c
sync-rt.c
krt.Y
@@ -12,3 +14,4 @@ krt-set.h
krt-set.Y
krt-iface.h
krt-iface.Y
+#endif
diff --git a/sysdep/unix/krt.h b/sysdep/unix/krt.h
index 9b630b2..cebf335 100644
--- a/sysdep/unix/krt.h
+++ b/sysdep/unix/krt.h
@@ -56,6 +56,11 @@ void krt_set_shutdown(struct krt_proto *);
/* sync-if.c */
+extern int if_scan_sock;
+extern int if_scan_period;
+
+void scan_if_init(void);
+
void krt_if_preconfig(struct krt_config *);
void krt_if_start(struct krt_proto *);
void krt_if_shutdown(struct krt_proto *);
diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h
index e527102..7b33871 100644
--- a/sysdep/unix/unix.h
+++ b/sysdep/unix/unix.h
@@ -26,11 +26,4 @@ void io_loop(void);
void fill_in_sockaddr(struct sockaddr_in *sa, ip_addr a, unsigned port);
void get_sockaddr(struct sockaddr_in *sa, ip_addr *a, unsigned *port);
-/* sync-if.c */
-
-extern int if_scan_sock;
-extern int if_scan_period;
-
-void scan_if_init(void);
-
#endif