From 5c238a37e7b90838256ae58091f88ff03b449b84 Mon Sep 17 00:00:00 2001 From: Thierry FOURNIER Date: Fri, 23 Aug 2013 15:15:33 +0200 Subject: [PATCH 2/3] HAPEE/ALOHA: PROTOCOL VOLATILE: integration of the protocol in Bird This patch prepares protocol volatile in bird: - define protocol volatile in nest/proto.c, - define protocol volatile in nest/protocol.h, - compile also proto volatile in configure.in, - add documentation link. --- configure.in | 2 +- nest/proto.c | 4 +++- nest/protocol.h | 3 ++- proto/Doc | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index c81709e..1700bf1 100644 --- a/configure.in +++ b/configure.in @@ -205,7 +205,7 @@ fi AC_SUBST(iproutedir) -all_protocols="$proto_bfd bgp ospf pipe $proto_radv rip static" +all_protocols="$proto_bfd bgp ospf pipe $proto_radv rip static volatile" all_protocols=`echo $all_protocols | sed 's/ /,/g'` if test "$with_protocols" = all ; then diff --git a/nest/proto.c b/nest/proto.c index 7a1e9bf..a0331ea 100644 --- a/nest/proto.c +++ b/nest/proto.c @@ -920,7 +920,9 @@ protos_build(void) proto_build(&proto_bfd); bfd_init_all(); #endif - +#ifdef CONFIG_VOLATILE + proto_build(&proto_volatile); +#endif proto_pool = rp_new(&root_pool, "Protocols"); proto_flush_event = ev_new(proto_pool); proto_flush_event->hook = proto_flush_loop; diff --git a/nest/protocol.h b/nest/protocol.h index eb43418..f0fc75d 100644 --- a/nest/protocol.h +++ b/nest/protocol.h @@ -75,7 +75,8 @@ void protos_dump_all(void); extern struct protocol proto_device, proto_radv, proto_rip, proto_static, - proto_ospf, proto_pipe, proto_bgp, proto_bfd; + proto_ospf, proto_pipe, proto_bgp, proto_bfd, + proto_volatile; /* * Routing Protocol Instance diff --git a/proto/Doc b/proto/Doc index 7863472..b582221 100644 --- a/proto/Doc +++ b/proto/Doc @@ -6,4 +6,5 @@ C pipe C rip C radv C static +C volatile S ../nest/rt-dev.c -- 1.7.10.4