-extern int bgp_adj_out_lookup (struct peer *, struct prefix *, afi_t, safi_t,
- struct bgp_node *);
-
-extern void bgp_adj_in_set (struct bgp_node *, struct peer *, struct attr *);
-extern void bgp_adj_in_unset (struct bgp_node *, struct peer *);
-extern void bgp_adj_in_remove (struct bgp_node *, struct bgp_adj_in *);
-
-extern void bgp_sync_init (struct peer *);
-extern void bgp_sync_delete (struct peer *);
-extern unsigned int baa_hash_key (void *p);
-extern int baa_hash_cmp (const void *p1, const void *p2);
-extern void bgp_advertise_add (struct bgp_advertise_attr *baa,
- struct bgp_advertise *adv);
-extern struct bgp_advertise *bgp_advertise_new (void);
-extern void bgp_advertise_free (struct bgp_advertise *adv);
-extern struct bgp_advertise_attr *
-bgp_advertise_intern (struct hash *hash, struct attr *attr);
-extern struct bgp_advertise_attr *baa_new (void);
-extern void
-bgp_advertise_delete (struct bgp_advertise_attr *baa,
- struct bgp_advertise *adv);
-extern void
-bgp_advertise_unintern (struct hash *hash, struct bgp_advertise_attr *baa);
-extern struct bgp_adj_out *
-bgp_adj_peer_lookup (struct peer *peer, struct bgp_node *rn);
+extern int bgp_adj_out_lookup(struct peer *, struct bgp_node *, uint32_t);
+extern void bgp_adj_in_set(struct bgp_node *, struct peer *, struct attr *,
+ uint32_t);
+extern int bgp_adj_in_unset(struct bgp_node *, struct peer *, uint32_t);
+extern void bgp_adj_in_remove(struct bgp_node *, struct bgp_adj_in *);
+
+extern void bgp_sync_init(struct peer *);
+extern void bgp_sync_delete(struct peer *);
+extern unsigned int baa_hash_key(void *p);
+extern bool baa_hash_cmp(const void *p1, const void *p2);
+extern void bgp_advertise_add(struct bgp_advertise_attr *baa,
+ struct bgp_advertise *adv);
+extern struct bgp_advertise *bgp_advertise_new(void);
+extern void bgp_advertise_free(struct bgp_advertise *adv);
+extern struct bgp_advertise_attr *bgp_advertise_intern(struct hash *hash,
+ struct attr *attr);
+extern struct bgp_advertise_attr *baa_new(void);
+extern void bgp_advertise_delete(struct bgp_advertise_attr *baa,
+ struct bgp_advertise *adv);
+extern void bgp_advertise_unintern(struct hash *hash,
+ struct bgp_advertise_attr *baa);