- Remove printf, use GNUNET_log INFO

[oweals/gnunet.git] / src / peerinfo / peerinfo.h

diff --git a/src/peerinfo/peerinfo.h b/src/peerinfo/peerinfo.h
index 4cb52fa7c887053c6ce4eb5138d6ed9227105606..e618487578677c04b2e37140c4c54a2ada0f1ca3 100644 (file)
--- a/src/peerinfo/peerinfo.h
+++ b/src/peerinfo/peerinfo.h
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
 /*
      This file is part of GNUnet.

-     (C) 2009 Christian Grothoff (and other contributing authors)
+     (C) 2009, 2010 Christian Grothoff (and other contributing authors)

 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
 
      GNUnet 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
+     by the Free Software Foundation; either version 3, or (at your

      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but


@@ -27,51 +27,26 @@
 #include "gnunet_time_lib.h"
 #include "gnunet_peerinfo_service.h"
 
 #include "gnunet_time_lib.h"
 #include "gnunet_peerinfo_service.h"
 

-#define DEBUG_PEERINFO GNUNET_YES
-
-/**
- * Add the given peer to the list.  This message
- * is always followed by a verified HELLO message.
- */
-struct PeerAddMessage
-{
-
-  /**
-   * Type will be GNUNET_MESSAGE_TYPE_PEERINFO_ADD
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Always zero.
-   */
-  uint32_t reserved GNUNET_PACKED;
-
-  /**
-   * For which peer do we provide a HELLO message here?
-   */
-  struct GNUNET_PeerIdentity peer;
-
-};

 
 

+GNUNET_NETWORK_STRUCT_BEGIN

 
 /**
  * Message requesting a listing of all known peers,
 
 /**
  * Message requesting a listing of all known peers,

- * possibly modified by the specified trust value
- * and restricted to the specified peer identity.
+ * possibly restricted to the specified peer identity.

  */
 struct ListPeerMessage
 {
 
   /**
  */
 struct ListPeerMessage
 {
 
   /**

-   * Type will be GNUNET_MESSAGE_TYPE_PEERINFO_GET
+   * Type will be GNUNET_MESSAGE_TYPE_PEERINFO_GET or
+   * GNUNET_MESSAGE_TYPE_PEERINFO_GET_ALL.

    */
   struct GNUNET_MessageHeader header;
 
   /**
    */
   struct GNUNET_MessageHeader header;
 
   /**

-   * How much to change the trust in each returned peer,
-   * in network byte order.
+   * Always zero.

    */
    */

-  int32_t trust_change GNUNET_PACKED;
+  uint32_t reserved GNUNET_PACKED;

 
   /**
    * Restrict to peers with this identity (optional
 
   /**
    * Restrict to peers with this identity (optional


@@ -82,28 +57,6 @@ struct ListPeerMessage
 };
 
 
 };
 
 

-/**
- * Message requesting a listing of all known peers,
- * possibly modified by the specified trust value
- * and restricted to the specified peer identity.
- */
-struct ListAllPeersMessage
-{
-
-  /**
-   * Type will be GNUNET_MESSAGE_TYPE_PEERINFO_GET
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * How much to change the trust in each returned peer,
-   * in network byte order.
-   */
-  int32_t trust_change GNUNET_PACKED;
-
-};
-
-

 /**
  * Message used to inform the client about
  * a particular peer; this message is optionally followed
 /**
  * Message used to inform the client about
  * a particular peer; this message is optionally followed


@@ -120,10 +73,9 @@ struct InfoMessage
   struct GNUNET_MessageHeader header;
 
   /**
   struct GNUNET_MessageHeader header;
 
   /**

-   * Amount of trust we now have in the peer,
-   * in network byte order.
+   * Always zero.

    */
    */

-  uint32_t trust GNUNET_PACKED;
+  uint32_t reserved GNUNET_PACKED;

 
   /**
    * About which peer are we talking here?
 
   /**
    * About which peer are we talking here?


@@ -131,6 +83,6 @@ struct InfoMessage
   struct GNUNET_PeerIdentity peer;
 
 };
   struct GNUNET_PeerIdentity peer;
 
 };

-
+GNUNET_NETWORK_STRUCT_END

 
 /* end of peerinfo.h */
 
 /* end of peerinfo.h */