From: Benjamin Cama <benoar@dolka.fr>
Date: Mon, 19 Sep 2011 16:12:48 +0000 (+0200)
Subject: Merge branch 'use-netlink' into fdn-mods
X-Git-Tag: debian/2.2.1-1fdn3~1^2~7
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/d19fdcba627f175fe92c9f9642eb4da7997fc54f?ds=sidebyside;hp=--cc

Merge branch 'use-netlink' into fdn-mods
---

d19fdcba627f175fe92c9f9642eb4da7997fc54f
diff --cc bgp.c
index 4b8cb64,c5abe7a..85415d1
--- a/bgp.c
+++ b/bgp.c
@@@ -29,15 -29,10 +29,14 @@@ char const *cvs_id_bgp = "$Id: bgp.c,v 
  
  static void bgp_clear(struct bgp_peer *peer);
  static void bgp_set_retry(struct bgp_peer *peer);
- static void bgp_cidr(in_addr_t ip, int prefixlen, struct bgp_ip_prefix *pfx);
  static struct bgp_route_list *bgp_insert_route(struct bgp_route_list *head,
      struct bgp_route_list *new);
 +static struct bgp_route6_list *bgp_insert_route6(struct bgp_route6_list *head,
 +    struct bgp_route6_list *new);
  
 +static void bgp_process_timers(struct bgp_peer *peer);
  static void bgp_free_routes(struct bgp_route_list *routes);
 +static void bgp_free_routes6(struct bgp_route6_list *routes);
  static char const *bgp_msg_type_str(uint8_t type);
  static int bgp_connect(struct bgp_peer *peer);
  static int bgp_handle_connect(struct bgp_peer *peer);