[GNUnet-SVN] r7979 - GNUnet/src/include

[gnunet]

Author: nevans
Date: 2008-12-02 20:46:58 -0700 (Tue, 02 Dec 2008)
New Revision: 7979

Modified:
   GNUnet/src/include/dv.h
Log:


Modified: GNUnet/src/include/dv.h
===================================================================
--- GNUnet/src/include/dv.h     2008-12-01 01:41:35 UTC (rev 7978)
+++ GNUnet/src/include/dv.h     2008-12-03 03:46:58 UTC (rev 7979)
@@ -30,9 +30,9 @@
 #include "gnunet_core.h"
 
 #define GNUNET_DV_LEAST_COST 1
-#define GNUNET_DV_MAX_DISTANCE -1
-#define GNUNET_DV_INITIAL_SEQUENCE_NUMBER 0
+#define GNUNET_DV_MAX_COST -1
 
+
 typedef struct
 {
   GNUNET_MessageHeader header;
@@ -43,41 +43,25 @@
   unsigned int reserved;
 
   /**
-   * Cost from received from node to neighbor node
+   * Cost from received from node to neighbor node, takes distance into account
    */
   unsigned int cost;
 
   /**
-   * Distance from received from node to neighbor node (physical hops)
-   */
-  unsigned int distance;
-
-  /**
-   * Sequence number of value
-   */
-  unsigned int sequence_number;
-
-  /**
    * Identity of neighbor of received from node
    */
   GNUNET_PeerIdentity neighbor;
 
 } p2p_dv_MESSAGE_NeighborInfo;
 
-struct GNUNET_dv_connected_neighbor
-*findConnectedNeighbor(const GNUNET_PeerIdentity *);
+struct GNUNET_dv_neighbor
+*findNeighbor(const GNUNET_PeerIdentity *, const GNUNET_PeerIdentity *);
 
-struct GNUNET_dv_extended_neighbor
-*findExtendedNeighbor(const GNUNET_PeerIdentity *);
-
 static int
-addUpdateConnectedNeighbor(const GNUNET_PeerIdentity *, unsigned int, unsigned 
int, unsigned int);
+addUpdateNeighbor(const GNUNET_PeerIdentity *, const GNUNET_PeerIdentity *, 
unsigned int);
 
-static int
-addUpdateExtendedNeighbor(const GNUNET_PeerIdentity *,const 
GNUNET_PeerIdentity *, unsigned int, unsigned int, unsigned int);
-
 static void
-initialAddConnectedNeighbor(const GNUNET_PeerIdentity *, void *);
+initialAddNeighbor(const GNUNET_PeerIdentity *, void *);
 
 #endif