diff options
Diffstat (limited to 'net/openbgpd/files/patch-bgpd_rde.h')
| -rw-r--r-- | net/openbgpd/files/patch-bgpd_rde.h | 49 |
1 files changed, 34 insertions, 15 deletions
diff --git a/net/openbgpd/files/patch-bgpd_rde.h b/net/openbgpd/files/patch-bgpd_rde.h index 47972547926..a19b053cac1 100644 --- a/net/openbgpd/files/patch-bgpd_rde.h +++ b/net/openbgpd/files/patch-bgpd_rde.h @@ -2,13 +2,13 @@ Index: bgpd/rde.h =================================================================== RCS file: /home/cvs/private/hrs/openbgpd/bgpd/rde.h,v retrieving revision 1.1.1.8 -retrieving revision 1.1.1.9 -diff -u -p -r1.1.1.8 -r1.1.1.9 +retrieving revision 1.1.1.10 +diff -u -p -r1.1.1.8 -r1.1.1.10 --- bgpd/rde.h 14 Feb 2010 20:19:57 -0000 1.1.1.8 -+++ bgpd/rde.h 14 Feb 2010 20:27:06 -0000 1.1.1.9 ++++ bgpd/rde.h 10 Apr 2010 12:13:05 -0000 1.1.1.10 @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.h,v 1.120 2009/06/06 01:10:29 claudio Exp $ */ -+/* $OpenBSD: rde.h,v 1.129 2010/01/13 06:02:37 claudio Exp $ */ ++/* $OpenBSD: rde.h,v 1.133 2010/03/29 09:24:07 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> and @@ -89,15 +89,25 @@ diff -u -p -r1.1.1.8 -r1.1.1.9 }; struct rib_entry { -@@ -264,6 +275,7 @@ struct rib_entry { +@@ -262,16 +273,10 @@ struct rib_entry { + u_int16_t flags; + }; - enum rib_state { - RIB_NONE, -+ RIB_NEW, - RIB_ACTIVE, - RIB_DELETE +-enum rib_state { +- RIB_NONE, +- RIB_ACTIVE, +- RIB_DELETE +-}; +- + struct rib { + char name[PEER_DESCR_LEN]; + struct rib_tree rib; +- enum rib_state state; ++ enum reconf_action state; + u_int16_t flags; + u_int16_t id; }; -@@ -342,9 +354,13 @@ int aspath_loopfree(struct aspath *, u +@@ -342,21 +347,29 @@ int aspath_loopfree(struct aspath *, u int aspath_compare(struct aspath *, struct aspath *); u_char *aspath_prepend(struct aspath *, u_int32_t, int, u_int16_t *); int aspath_match(struct aspath *, enum as_spec, u_int32_t); @@ -105,14 +115,23 @@ diff -u -p -r1.1.1.8 -r1.1.1.9 +int community_match(struct rde_aspath *, int, int); int community_set(struct rde_aspath *, int, int); void community_delete(struct rde_aspath *, int, int); ++int community_ext_match(struct rde_aspath *, ++ struct filter_extcommunity *, u_int16_t); +int community_ext_set(struct rde_aspath *, + struct filter_extcommunity *, u_int16_t); +void community_ext_delete(struct rde_aspath *, + struct filter_extcommunity *, u_int16_t); ++int community_ext_conv(struct filter_extcommunity *, u_int16_t, ++ u_int64_t *); /* rde_rib.c */ extern u_int16_t rib_size; -@@ -356,7 +372,7 @@ void rib_free(struct rib *); + extern struct rib *ribs; + +-u_int16_t rib_new(int, char *, u_int16_t); ++u_int16_t rib_new(char *, u_int16_t); + u_int16_t rib_find(char *); + void rib_free(struct rib *); struct rib_entry *rib_get(struct rib *, struct bgpd_addr *, int); struct rib_entry *rib_lookup(struct rib *, struct bgpd_addr *); void rib_dump(struct rib *, void (*)(struct rib_entry *, void *), @@ -121,7 +140,7 @@ diff -u -p -r1.1.1.8 -r1.1.1.9 void rib_dump_r(struct rib_context *); void rib_dump_runner(void); int rib_dump_pending(void); -@@ -395,7 +411,7 @@ void prefix_network_clean(struct rde_p +@@ -395,7 +408,7 @@ void prefix_network_clean(struct rde_p void nexthop_init(u_int32_t); void nexthop_shutdown(void); void nexthop_modify(struct rde_aspath *, struct bgpd_addr *, @@ -130,7 +149,7 @@ diff -u -p -r1.1.1.8 -r1.1.1.9 void nexthop_link(struct rde_aspath *); void nexthop_unlink(struct rde_aspath *); int nexthop_delete(struct nexthop *); -@@ -415,12 +431,15 @@ int up_generate(struct rde_peer *, str +@@ -415,12 +428,15 @@ int up_generate(struct rde_peer *, str void up_generate_updates(struct filter_head *, struct rde_peer *, struct prefix *, struct prefix *); void up_generate_default(struct filter_head *, struct rde_peer *, @@ -149,7 +168,7 @@ diff -u -p -r1.1.1.8 -r1.1.1.9 /* rde_prefix.c */ #define pt_empty(pt) ((pt)->refcnt == 0) -@@ -452,8 +471,7 @@ enum filter_actions rde_filter(u_int16_t +@@ -452,8 +468,7 @@ enum filter_actions rde_filter(u_int16_t struct rde_aspath *, struct bgpd_addr *, u_int8_t, struct rde_peer *, enum directions); void rde_apply_set(struct rde_aspath *, struct filter_set_head *, |