diff options
| author | Avneesh Sachdev <avneesh@opensourcerouting.org> | 2012-04-09 09:25:15 +0200 |
|---|---|---|
| committer | Avneesh Sachdev <avneesh@opensourcerouting.org> | 2012-04-09 09:25:15 +0200 |
| commit | 3cf6c2b4e43f44a977d218c96c26250654ae333e (patch) | |
| tree | e017cde2015fbf3ef6c250327428d7c6152aa8f7 /bgpd/bgp_aspath.h | |
| parent | bgpd: We try to skip out of updating the multipath aggregate if there are no (diff) | |
| parent | lib: pretty ip_masklen and masklen2ip (diff) | |
| download | frr-3cf6c2b4e43f44a977d218c96c26250654ae333e.tar.xz frr-3cf6c2b4e43f44a977d218c96c26250654ae333e.zip | |
Merge branch 'quagga' into google-bgp-multipath
Conflicts:
bgpd/bgp_route.c
Diffstat (limited to 'bgpd/bgp_aspath.h')
| -rw-r--r-- | bgpd/bgp_aspath.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bgpd/bgp_aspath.h b/bgpd/bgp_aspath.h index b881b6544..fc4dd6b79 100644 --- a/bgpd/bgp_aspath.h +++ b/bgpd/bgp_aspath.h @@ -65,7 +65,7 @@ struct aspath /* Prototypes. */ extern void aspath_init (void); extern void aspath_finish (void); -extern struct aspath *aspath_parse (struct stream *, size_t, int, int); +extern struct aspath *aspath_parse (struct stream *, size_t, int); extern struct aspath *aspath_dup (struct aspath *); extern struct aspath *aspath_aggregate (struct aspath *, struct aspath *); extern struct aspath *aspath_prepend (struct aspath *, struct aspath *); @@ -81,7 +81,7 @@ extern struct aspath *aspath_empty_get (void); extern struct aspath *aspath_str2aspath (const char *); extern void aspath_free (struct aspath *); extern struct aspath *aspath_intern (struct aspath *); -extern void aspath_unintern (struct aspath *); +extern void aspath_unintern (struct aspath **); extern const char *aspath_print (struct aspath *); extern void aspath_print_vty (struct vty *, const char *, struct aspath *, const char *); extern void aspath_print_all_vty (struct vty *); |