From c21f7fd3e23791cb6ea8a3b0b968af8892c75931 Mon Sep 17 00:00:00 2001
From: Chris Hall <GMCH@hestia.halldom.com>
Date: Sun, 24 Jan 2010 18:46:20 +0000
Subject: Getting BGP Engine to start and removing warnings.

Finish the wiring required to get bgp_msg_read to process OPEN
messages into the connection's open_state, and be able to check
for correct peer AS, etc.

Removed bugs preventing messages from being written.

Added BGP Id check to collision detection logic.

Removed as many warnings from comilation as possible.  Replaced
horrible FIFO kludge in the process.  (Introduced the even more
horrible miyagi kludge.)

  modified:   bgpd/bgp_advertise.c
  modified:   bgpd/bgp_advertise.h
  modified:   bgpd/bgp_connection.c
  modified:   bgpd/bgp_connection.h
  modified:   bgpd/bgp_debug.c
  modified:   bgpd/bgp_fsm.c
  modified:   bgpd/bgp_msg_read.c
  modified:   bgpd/bgp_msg_write.c
  modified:   bgpd/bgp_network.c
  modified:   bgpd/bgp_nexthop.c
  modified:   bgpd/bgp_notification.c
  modified:   bgpd/bgp_open.c
  modified:   bgpd/bgp_packet.c
  modified:   bgpd/bgp_session.c
  modified:   bgpd/bgp_session.h
  modified:   bgpd/bgpd.c
  modified:   lib/Makefile.am
  modified:   lib/distribute.c
  modified:   lib/if_rmap.c
  new file:   lib/miyagi.h
  modified:   lib/prefix.h
  modified:   lib/sockopt.c
  modified:   lib/stream.c
  modified:   lib/thread.c
  modified:   lib/vty.c
  modified:   lib/zebra.h
  modified:   tests/bgp_capability_test.c
  modified:   tests/bgp_mp_attr_test.c
  modified:   tests/ecommunity_test.c
  modified:   tests/heavy-thread.c
  modified:   tests/heavy-wq.c
  modified:   tests/heavy.c
  modified:   tests/main.c
  modified:   tests/test-checksum.c
  modified:   tests/test-sig.c
  modified:   watchquagga/watchquagga.c
  modified:   zebra/if_netlink.c
  modified:   zebra/ioctl.c
  modified:   zebra/rt_netlink.c
  modified:   zebra/rtread_netlink.c
---
 lib/zebra.h | 32 --------------------------------
 1 file changed, 32 deletions(-)

(limited to 'lib/zebra.h')

diff --git a/lib/zebra.h b/lib/zebra.h
index 65aad161..799cfc3d 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -525,28 +525,6 @@ extern const char *zserv_command_string (unsigned int command);
 typedef u_int16_t zebra_size_t;
 typedef u_int16_t zebra_command_t;
 
-/* FIFO -- first in first out structure and macros.  */
-struct fifo
-{
-  struct fifo *next;
-  struct fifo *prev;
-};
-
-#define FIFO_INIT(F)                                  \
-  do {                                                \
-    struct fifo *Xfifo = (struct fifo *)(F);          \
-    Xfifo->next = Xfifo->prev = Xfifo;                \
-  } while (0)
-
-#define FIFO_ADD(F,N)                                 \
-  do {                                                \
-    struct fifo *Xfifo = (struct fifo *)(F);          \
-    struct fifo *Xnode = (struct fifo *)(N);          \
-    Xnode->next = Xfifo;                              \
-    Xnode->prev = Xfifo->prev;                        \
-    Xfifo->prev = Xfifo->prev->next = Xnode;          \
-  } while (0)
-
 #define FIFO_DEL(N)                                   \
   do {                                                \
     struct fifo *Xnode = (struct fifo *)(N);          \
@@ -554,14 +532,4 @@ struct fifo
     Xnode->next->prev = Xnode->prev;                  \
   } while (0)
 
-#define FIFO_HEAD(F)                                  \
-  ((((struct fifo *)(F))->next == (struct fifo *)(F)) \
-  ? NULL : (F)->next)
-
-#define FIFO_EMPTY(F)                                 \
-  (((struct fifo *)(F))->next == (struct fifo *)(F))
-
-#define FIFO_TOP(F)                                   \
-  (FIFO_EMPTY(F) ? NULL : ((struct fifo *)(F))->next)
-
 #endif /* _ZEBRA_H */
-- 
cgit v1.2.3