diff options
-rw-r--r-- | nest/proto.c | 11 | ||||
-rw-r--r-- | nest/protocol.h | 1 | ||||
-rw-r--r-- | nest/route.h | 1 | ||||
-rw-r--r-- | sysdep/unix/Modules | 1 | ||||
-rw-r--r-- | sysdep/unix/main.c | 2 | ||||
-rw-r--r-- | sysdep/unix/sync-if.c | 1 | ||||
-rw-r--r-- | sysdep/unix/sync-rt.c | 62 | ||||
-rw-r--r-- | sysdep/unix/unix.h | 4 |
8 files changed, 79 insertions, 4 deletions
diff --git a/nest/proto.c b/nest/proto.c index 6db5a0e..6c0843d 100644 --- a/nest/proto.c +++ b/nest/proto.c @@ -107,14 +107,19 @@ protos_dump_all(void) } void +protos_build(void) +{ + init_list(&protocol_list); + add_tail(&protocol_list, &proto_device.n); + add_tail(&protocol_list, &proto_rip.n); +} + +void protos_init(void) { struct protocol *p; debug("Initializing protocols\n"); - init_list(&protocol_list); - add_tail(&protocol_list, &proto_device.n); - add_tail(&protocol_list, &proto_rip.n); /* HACK: We should really read this from config */ WALK_LIST(p, protocol_list) p->init(p); } diff --git a/nest/protocol.h b/nest/protocol.h index 6059f7c..9a0ea98 100644 --- a/nest/protocol.h +++ b/nest/protocol.h @@ -32,6 +32,7 @@ struct protocol { void (*postconfig)(struct protocol *); /* After configuring */ }; +void protos_build(void); void protos_init(void); void protos_preconfig(void); void protos_postconfig(void); diff --git a/nest/route.h b/nest/route.h index e50de07..78f9446 100644 --- a/nest/route.h +++ b/nest/route.h @@ -248,6 +248,7 @@ void rta_dump_all(void); #define DEF_PREF_BGP 100 /* BGP */ #define DEF_PREF_OSPF_EXTERNAL 80 /* OSPF external routes */ #define DEF_PREF_RIP_EXTERNAL 70 /* RIP external routes */ +#define DEF_PREF_UKR 50 /* Unidentified Kernel Route */ #define DEF_PREF_SINK 10 /* Sink route */ #endif diff --git a/sysdep/unix/Modules b/sysdep/unix/Modules index 0b5117a..f3e68e8 100644 --- a/sysdep/unix/Modules +++ b/sysdep/unix/Modules @@ -4,3 +4,4 @@ timer.h io.c unix.h sync-if.c +sync-rt.c diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c index b57e94e..a6c4748 100644 --- a/sysdep/unix/main.c +++ b/sysdep/unix/main.c @@ -76,6 +76,8 @@ main(void) io_init(); rt_init(); if_init(); + protos_build(); + add_tail(&protocol_list, &proto_unix_kernel.n); /* FIXME: Must be _always_ the last one */ protos_init(); protos_preconfig(); protos_postconfig(); diff --git a/sysdep/unix/sync-if.c b/sysdep/unix/sync-if.c index 4478c10..4439256 100644 --- a/sysdep/unix/sync-if.c +++ b/sysdep/unix/sync-if.c @@ -180,4 +180,3 @@ scan_if_init(void) if_scan_timer->recurrent = if_scan_period; tm_start(if_scan_timer, if_scan_period); } - diff --git a/sysdep/unix/sync-rt.c b/sysdep/unix/sync-rt.c new file mode 100644 index 0000000..c1bf7f7 --- /dev/null +++ b/sysdep/unix/sync-rt.c @@ -0,0 +1,62 @@ +/* + * BIRD -- Unix Routing Table Scanning and Syncing + * + * (c) 1998 Martin Mares <mj@ucw.cz> + * + * Can be freely distributed and used under the terms of the GNU GPL. + */ + +#include <string.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <sys/ioctl.h> +#include <errno.h> + +#define LOCAL_DEBUG + +#include "nest/bird.h" +#include "nest/iface.h" +#include "nest/route.h" +#include "nest/protocol.h" +#include "lib/timer.h" + +#include "unix.h" + +void +uk_rt_notify(struct proto *p, net *net, rte *new, rte *old) +{ +} + +void +uk_start(struct proto *p) +{ +} + +void +uk_init(struct protocol *x) +{ +} + +void +uk_preconfig(struct protocol *x) +{ + struct proto *p = proto_new(&proto_unix_kernel, sizeof(struct proto)); + + p->preference = DEF_PREF_UKR; + p->rt_notify = uk_rt_notify; + p->start = uk_start; +} + +void +uk_postconfig(struct protocol *x) +{ +} + +struct protocol proto_unix_kernel = { + { NULL, NULL }, + "kernel", + 0, + uk_init, + uk_preconfig, + uk_postconfig +}; diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h index 127101e..7b0a921 100644 --- a/sysdep/unix/unix.h +++ b/sysdep/unix/unix.h @@ -22,4 +22,8 @@ extern int if_scan_period; void scan_if_init(void); +/* sync-rt.c */ + +extern struct protocol proto_unix_kernel; + #endif |