From: Benjamin Cama <benoar@dolka.fr>
Date: Thu, 2 Feb 2012 01:15:14 +0000 (+0100)
Subject: Merge branch 'common-cvs-git-upstream' into fdn-mods
X-Git-Tag: 2.2.1-2fdn3.1~19^2
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/99921507eb9b842d4f41c5516af1f455d4a49a99

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

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

99921507eb9b842d4f41c5516af1f455d4a49a99
diff --cc bgp.h
index bc5a0e9,8540375..8e636ab
--- a/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 l2tpns.h
index 5ef6253,5b68df7..8e3d26e
--- a/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