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

1 files changed, 10 insertions, 10 deletions

diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
index d86ddfc7..78ac799d 100644
--- a/bgpd/bgp_debug.c
+++ b/bgpd/bgp_debug.c
@@ -66,14 +66,14 @@ unsigned long term_bgp_debug_zebra;
 /* messages for BGP-4 status */
 const struct message bgp_status_msg[] =
 {
-  { bgp_fsm_Initial,     "Initial"     },
-  { bgp_fsm_Idle,        "Idle"        },
-  { bgp_fsm_Connect,     "Connect"     },
-  { bgp_fsm_Active,      "Active"      },
-  { bgp_fsm_OpenSent,    "OpenSent"    },
-  { bgp_fsm_OpenConfirm, "OpenConfirm" },
-  { bgp_fsm_Established, "Established" },
-  { bgp_fsm_Stopping,    "Stopping"    },
+  { bgp_fsm_sInitial,     "Initial"     },
+  { bgp_fsm_sIdle,        "Idle"        },
+  { bgp_fsm_sConnect,     "Connect"     },
+  { bgp_fsm_sActive,      "Active"      },
+  { bgp_fsm_sOpenSent,    "OpenSent"    },
+  { bgp_fsm_sOpenConfirm, "OpenConfirm" },
+  { bgp_fsm_sEstablished, "Established" },
+  { bgp_fsm_sStopping,    "Stopping"    },
 };
 const int bgp_status_msg_max = bgp_fsm_last_state + 1 ;
 
@@ -280,14 +280,14 @@ bgp_notify_print(struct peer *peer, struct bgp_notify *bgp_notify,
               peer->host, bgp_notify->code, bgp_notify->subcode,
                LOOKUP (bgp_notify_msg, bgp_notify->code),
               subcode_str, bgp_notify->length,
-              bgp_notify->size ? bgp_notify->data : "");
+              bgp_notify->size ? (const char*)bgp_notify->data : "");
   else if (BGP_DEBUG (normal, NORMAL))
     plog_debug (peer->log, "%s %s NOTIFICATION %d/%d (%s%s) %d bytes %s",
 	       peer ? peer->host : "",
 	       direct, bgp_notify->code, bgp_notify->subcode,
 	       LOOKUP (bgp_notify_msg, bgp_notify->code),
 	       subcode_str, bgp_notify->length,
-	       bgp_notify->size ? bgp_notify->data : "");
+	       bgp_notify->size ? (const char*)bgp_notify->data : "");
 }
 
 /* Debug option setting interface. */