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

Signed-off-by: Benjamin Cama <benoar@dolka.fr>
This commit is contained in:
Benjamin Cama 2012-02-02 02:15:14 +01:00
commit 99921507eb
30 changed files with 115 additions and 213 deletions

4
bgp.h
View file

@ -1,5 +1,5 @@
/* BGPv4 (RFC1771) */
/* $Id: bgp.h,v 1.5 2005/06/04 15:42:35 bodea Exp $ */
/* $Id: bgp.h,v 1.5 2005-06-04 15:42:35 bodea Exp $ */
#ifndef __BGP_H__
#define __BGP_H__
@ -281,6 +281,4 @@ 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__ */