Initial commit for bgp_engine branch -- seeding new files...

On branch bgp_engine

	modified:   .gitignore
	modified:   bgpd/Makefile.am
	new file:   bgpd/bgp.h
	new file:   bgpd/bgp_common.c
	new file:   bgpd/bgp_common.h
	new file:   bgpd/bgp_connection.c
	new file:   bgpd/bgp_connection.h
	modified:   bgpd/bgp_debug.c
	new file:   bgpd/bgp_engine.c
	new file:   bgpd/bgp_engine.h
	modified:   bgpd/bgp_fsm.c
	modified:   bgpd/bgp_fsm.h
	modified:   bgpd/bgp_network.c
	modified:   bgpd/bgp_network.h
	new file:   bgpd/bgp_notification.c
	new file:   bgpd/bgp_notification.h
	modified:   bgpd/bgp_open.c
	new file:   bgpd/bgp_open_state.c
	new file:   bgpd/bgp_open_state.h
	modified:   bgpd/bgp_packet.c
	new file:   bgpd/bgp_peer.c
	new file:   bgpd/bgp_peer.h
	modified:   bgpd/bgp_route.c
	new file:   bgpd/bgp_session.c
	new file:   bgpd/bgp_session.h
	modified:   bgpd/bgp_vty.c
	modified:   bgpd/bgp_zebra.c
	modified:   bgpd/bgpd.c
	modified:   bgpd/bgpd.h
	modified:   lib/Makefile.am
	modified:   lib/memtypes.c
	modified:   lib/mqueue.c
	modified:   lib/mqueue.h
	new file:   lib/qafi_safi.h
	modified:   lib/qpselect.c
	modified:   lib/qpselect.h
	modified:   lib/qpthreads.c
	modified:   lib/qpthreads.h
	modified:   lib/sockopt.c
	modified:   lib/sockunion.c
	modified:   lib/sockunion.h
	modified:   lib/stream.c
	modified:   lib/stream.h
	modified:   lib/symtab.h
	modified:   lib/zebra.h

1 files changed, 10 insertions, 23 deletions

diff --git a/lib/zebra.h b/lib/zebra.h
index 2dc84514..65aad161 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -115,7 +115,7 @@ typedef int socklen_t;
 #ifdef __va_copy
 #define va_copy(DST,SRC) __va_copy(DST,SRC)
 #else
-/* Now we are desperate; this should work on many typical platforms. 
+/* Now we are desperate; this should work on many typical platforms.
    But this is slightly dangerous, because the standard does not require
    va_copy to be a macro. */
 #define va_copy(DST,SRC) memcpy(&(DST), &(SRC), sizeof(va_list))
@@ -260,7 +260,7 @@ typedef int socklen_t;
 #endif /* BSDI_NRL */
 
 /* Local includes: */
-#if !(defined(__GNUC__) || defined(VTYSH_EXTRACT_PL)) 
+#if !(defined(__GNUC__) || defined(VTYSH_EXTRACT_PL))
 #define __attribute__(x)
 #endif  /* !__GNUC__ || VTYSH_EXTRACT_PL */
 
@@ -285,7 +285,7 @@ typedef int socklen_t;
 
 
 
-/* 
+/*
  * RFC 3542 defines several macros for using struct cmsghdr.
  * Here, we define those that are not present
  */
@@ -330,7 +330,7 @@ struct in_pktinfo
 };
 #endif
 
-/* 
+/*
  * OSPF Fragmentation / fragmented writes
  *
  * ospfd can support writing fragmented packets, for cases where
@@ -350,13 +350,13 @@ struct in_pktinfo
 #define WANT_OSPF_WRITE_FRAGMENT
 #endif
 
-/* 
+/*
  * IP_HDRINCL / struct ip byte order
  *
  * Linux: network byte order
  * *BSD: network, except for length and offset. (cf Stevens)
  * SunOS: nominally as per BSD. but bug: network order on LE.
- * OpenBSD: network byte order, apart from older versions which are as per 
+ * OpenBSD: network byte order, apart from older versions which are as per
  *          *BSD
  */
 #if defined(__NetBSD__) || defined(__FreeBSD__) \
@@ -385,7 +385,7 @@ struct in_pktinfo
 /* MAX / MIN are not commonly defined, but useful */
 #ifndef MAX
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
-#endif 
+#endif
 #ifndef MIN
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 #endif
@@ -451,7 +451,7 @@ struct in_pktinfo
 extern const char *zebra_route_string(unsigned int route_type);
 /* Map a route type to a char.  For example, ZEBRA_ROUTE_RIPNG -> 'R'. */
 extern char zebra_route_char(unsigned int route_type);
-/* Map a zserv command type to the same string, 
+/* Map a zserv command type to the same string,
  * e.g. ZEBRA_INTERFACE_ADD -> "ZEBRA_INTERFACE_ADD" */
 /* Map a protocol name to its number. e.g. ZEBRA_ROUTE_BGP->9*/
 extern int proto_name2num(const char *s);
@@ -496,17 +496,8 @@ extern const char *zserv_command_string (unsigned int command);
 #define	INADDR_LOOPBACK	0x7f000001	/* Internet address 127.0.0.1.  */
 #endif
 
-/* Address family numbers from RFC1700. */
-#define AFI_IP                    1
-#define AFI_IP6                   2
-#define AFI_MAX                   3
-
-/* Subsequent Address Family Identifier. */
-#define SAFI_UNICAST              1
-#define SAFI_MULTICAST            2
-#define SAFI_UNICAST_MULTICAST    3
-#define SAFI_MPLS_VPN             4
-#define SAFI_MAX                  5
+/* AFI/SAFI types and numbers. */
+#include "qafi_safi.h"
 
 /* Filter direction.  */
 #define FILTER_IN                 0
@@ -530,10 +521,6 @@ extern const char *zserv_command_string (unsigned int command);
 #define SET_FLAG(V,F)        (V) |= (F)
 #define UNSET_FLAG(V,F)      (V) &= ~(F)
 
-/* AFI and SAFI type. */
-typedef u_int16_t afi_t;
-typedef u_int8_t safi_t;
-
 /* Zebra types. Used in Zserv message header. */
 typedef u_int16_t zebra_size_t;
 typedef u_int16_t zebra_command_t;