Merge branch 'common-cvs-git-upstream' into fdn-mods

Signed-off-by: Benjamin Cama <benoar@dolka.fr>

diff --cc bgp.c
Simple merge

diff --cc bgp.h
index bc5a0e9,8540375..8e636ab
--- 1/bgp.h
--- 2/bgp.h
+++ b/bgp.h
@@@ -278,9 -198,6 +278,7 @@@ int bgp_del_route6(struct in6_addr ip, 
  void bgp_enable_routing(int enable);
  int bgp_set_poll(void);
  int bgp_process(uint32_t events[]);
 +void bgp_process_peers_timers();
  char const *bgp_state_str(enum bgp_state state);
  
- extern char const *cvs_id_bgp;
- 
  #endif /* __BGP_H__ */

diff --cc cli.c
Simple merge

diff --cc l2tpns.c
Simple merge

diff --cc l2tpns.h
index 5ef6253,5b68df7..8e3d26e
--- 1/l2tpns.h
--- 2/l2tpns.h
+++ b/l2tpns.h
@@@ -38,9 -38,9 +38,10 @@@
  #define PPPoE_MRU     1492            // maximum PPPoE MRU (rfc2516: 1500 less PPPoE header (6) and PPP protocol ID (2))
  #define MAXETHER      (MAXMTU+18)     // max packet we try sending to tun
  #define MAXTEL                96              // telephone number
 +#define MAXHOSTNAME   256             // hostname
  #define MAXUSER               128             // username
  #define MAXPASS               128             // password
+ #define MAXCLASS      128             // radius class attribute size
  #define MAXPLUGINS    20              // maximum number of plugins to load
  #define MAXRADSERVER  10              // max radius servers
  #define MAXROUTE      10              // max static routes per session

diff --cc ppp.c
Simple merge

diff --cc radius.c
Simple merge

diff --cc util.c
Simple merge