diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2009-11-09 22:54:39 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2009-11-09 22:54:39 +0100 |
| commit | 3f22fa9e74c8643d3e4f7e3a7b4f2aa992ad09f5 (patch) | |
| tree | 703e2606e1f01118098ad662f0ecc54c0c48fcd6 /nest/protocol.h | |
| parent | a6bc04d59130c49a1dbfadffa4285b11e2ff4939 (diff) | |
| parent | b7c0e93ebd40cdc4f6e89067a3e5f7293263c7f9 (diff) | |
| download | bird-3f22fa9e74c8643d3e4f7e3a7b4f2aa992ad09f5.tar bird-3f22fa9e74c8643d3e4f7e3a7b4f2aa992ad09f5.zip | |
Merge branch 'dev' into ospf3
Diffstat (limited to 'nest/protocol.h')
| -rw-r--r-- | nest/protocol.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/nest/protocol.h b/nest/protocol.h index 0f9d59d..484df84 100644 --- a/nest/protocol.h +++ b/nest/protocol.h @@ -12,6 +12,7 @@ #include "lib/lists.h" #include "lib/resource.h" #include "lib/timer.h" +#include "conf/conf.h" struct iface; struct ifa; @@ -81,6 +82,7 @@ struct proto_config { struct proto *proto; /* Instance we've created */ char *name; unsigned debug, preference, disabled; /* Generic parameters */ + u32 router_id; /* Protocol specific router ID */ struct rtable_config *table; /* Table we're attached to */ struct filter *in_filter, *out_filter; /* Attached filters */ @@ -192,6 +194,12 @@ struct proto *proto_get_named(struct symbol *, struct protocol *); void proto_xxable(char *, int); void proto_debug(char *, unsigned int); +static inline u32 +proto_get_router_id(struct proto_config *pc) +{ + return pc->router_id ? pc->router_id : pc->global->router_id; +} + extern list active_proto_list; /* |