Continuing work-in-progress

	modified:   bgpd/Makefile.am
	modified:   bgpd/bgp.h
	modified:   bgpd/bgp_common.h
	modified:   bgpd/bgp_connection.c
	modified:   bgpd/bgp_connection.h
	modified:   bgpd/bgp_engine.h
	modified:   bgpd/bgp_fsm.c
	modified:   bgpd/bgp_network.c
	modified:   bgpd/bgp_network.h
	new file:   bgpd/bgp_peer_index.c
	new file:   bgpd/bgp_peer_index.h
	modified:   bgpd/bgp_session.c
	modified:   bgpd/bgp_session.h
	modified:   lib/memtypes.c
	modified:   lib/mqueue.h

1 files changed, 89 insertions, 0 deletions

diff --git a/bgpd/bgp_peer_index.h b/bgpd/bgp_peer_index.h
new file mode 100644
index 00000000..ae41de24
--- /dev/null
+++ b/bgpd/bgp_peer_index.h
@@ -0,0 +1,89 @@
+/* BGP Peer Index -- header
+ * Copyright (C) 2009 Chris Hall (GMCH), Highwayman
+ *
+ * This file is part of GNU Zebra.
+ *
+ * GNU Zebra is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2, or (at your option) any
+ * later version.
+ *
+ * GNU Zebra is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Zebra; see the file COPYING.  If not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef _QUAGGA_BGP_PEER_INDEX_H
+#define _QUAGGA_BGP_PEER_INDEX_H
+
+#include "bgpd/bgp_common.h"
+
+#include "lib/sockunion.h"
+
+/*==============================================================================
+ * The Peer Index maps:
+ *
+ *   * IP address (name of peer)
+ *   * peer_id    (ordinal of peer)
+ *
+ * To the bgp_peer_index_entry.
+ */
+typedef struct bgp_peer_index_entry* bgp_peer_index_entry ;
+
+typedef unsigned bgp_peer_id_t ;
+
+struct bgp_peer_index_entry
+{
+  bgp_peer      peer ;          /* used by Peering Engine               */
+
+  /* The accept pointer is used by the listening socket(s) to find the
+   * session when it is prepared to accept a connection.
+   *
+   * This pointer MUST be NULL when not sEnabled or sEstablished.  It
+   * will be set by the BGP Engine when it decides to accept connections,
+   * and cleared by it otherwise (and when a session stops).
+   *
+   * An active session contains a pointer to the peer index entry to
+   * facilitate this.
+   */
+
+  bgp_session   accept ;        /* used by BGP Engine                   */
+
+  bgp_peer_id_t id ;            /* maps IP address to peer_id           */
+} ;
+
+enum { bgp_peer_id_null = 0 } ; /* no peer can have id == 0     */
+
+/*==============================================================================
+ *
+ */
+
+extern void
+bgp_peer_index_init(void* parent) ;
+
+extern void
+bgp_peer_index_mutex_init(void* parent) ;
+
+extern void
+bgp_peer_index_register(bgp_peer peer, union sockunion* su) ;
+
+extern void
+bgp_peer_index_deregister(bgp_peer peer, union sockunion* su) ;
+
+extern bgp_peer
+bgp_peer_index_seek(union sockunion* su) ;
+
+extern bgp_peer_index_entry
+bgp_peer_index_seek_entry(union sockunion* su) ;
+
+extern bgp_session
+bgp_session_index_seek(union sockunion* su, int* p_found) ;
+
+#endif /* _QUAGGA_BGP_PEER_INDEX_H */
+