diff options
| author | Jan Moskyto Matejka <mq@ucw.cz> | 2016-12-07 15:30:46 +0100 |
|---|---|---|
| committer | Jan Moskyto Matejka <mq@ucw.cz> | 2016-12-07 15:30:46 +0100 |
| commit | ad88b94bca78e010357a6c7806e1d5e01701d4a7 (patch) | |
| tree | 9c06e9c1b0c87f372dcf27cc832d5692db112e80 /nest/protocol.h | |
| parent | d15b0b0a1b494c14b139d2d28706d82cd6e2f139 (diff) | |
| parent | af62c0f9f1f6382fe88c8ae5e514f70c0b5b6d05 (diff) | |
Merge branch 'int-new-rpki-squashed' (early part) into int-new
Diffstat (limited to 'nest/protocol.h')
| -rw-r--r-- | nest/protocol.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nest/protocol.h b/nest/protocol.h index 19414525..6efaaaf7 100644 --- a/nest/protocol.h +++ b/nest/protocol.h @@ -81,7 +81,7 @@ 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_babel; + proto_ospf, proto_pipe, proto_bgp, proto_bfd, proto_babel, proto_rpki; /* * Routing Protocol Instance @@ -271,7 +271,7 @@ proto_get_router_id(struct proto_config *pc) } /* Moved from route.h to avoid dependency conflicts */ -static inline void rte_update(struct proto *p, net_addr *n, rte *new) { rte_update2(p->main_channel, n, new, p->main_source); } +static inline void rte_update(struct proto *p, const net_addr *n, rte *new) { rte_update2(p->main_channel, n, new, p->main_source); } extern pool *proto_pool; extern list proto_list; @@ -568,11 +568,9 @@ int proto_configure_channel(struct proto *p, struct channel **c, struct channel_ void channel_set_state(struct channel *c, uint state); -/* static inline void channel_init(struct channel *c) { channel_set_state(c, CS_START); } static inline void channel_open(struct channel *c) { channel_set_state(c, CS_UP); } static inline void channel_close(struct channel *c) { channel_set_state(c, CS_FLUSHING); } -*/ void channel_request_feeding(struct channel *c); void *channel_config_new(const struct channel_class *cc, uint net_type, struct proto_config *proto); |