commented out wrong message type

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

diff --git a/src/peerinfo/peerinfo.h b/src/peerinfo/peerinfo.h
index 992dde782eab44ea4b7bee772ac9eed3a8934dca..518b8d5e5a4862f55f19be39cf6229cd9e6629e4 100644 (file)
--- a/src/peerinfo/peerinfo.h
+++ b/src/peerinfo/peerinfo.h
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2010 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -23,15 +23,21 @@
  * @brief common internal definitions for peerinfo service
  * @author Christian Grothoff
  */
+
+#ifndef PEERINFO_H
+#define PEERINFO_H
+
 #include "gnunet_crypto_lib.h"
 #include "gnunet_time_lib.h"
 #include "gnunet_peerinfo_service.h"
 
-#define DEBUG_PEERINFO GNUNET_EXTRA_LOGGING
+
+
+GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
- * Message requesting a listing of all known peers,
- * possibly restricted to the specified peer identity.
+ * Message requesting a listing of peers,
+ * restricted to the specified peer identity.
  */
 struct ListPeerMessage
 {
@@ -42,9 +48,9 @@ struct ListPeerMessage
   struct GNUNET_MessageHeader header;
 
   /**
-   * Always zero.
+   * Include friend only HELLOs and peers in callbacks
    */
-  uint32_t reserved GNUNET_PACKED;
+  uint32_t include_friend_only GNUNET_PACKED;
 
   /**
    * Restrict to peers with this identity (optional
@@ -54,6 +60,42 @@ struct ListPeerMessage
 
 };
 
+/**
+ * Message requesting a listing of all peers,
+ * restricted to the specified peer identity.
+ */
+struct ListAllPeersMessage
+{
+  /**
+   * Type will be GNUNET_MESSAGE_TYPE_PEERINFO_GET_ALL
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Include friend only HELLOs and peers in callbacks
+   */
+  uint32_t include_friend_only GNUNET_PACKED;
+
+};
+
+
+/**
+ * Header for all communications.
+ */
+struct NotifyMessage
+{
+  /**
+   * Type will be GNUNET_MESSAGE_TYPE_PEERINFO_NOTIFY
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Include friend only HELLOs and peers in callbacks
+   */
+  uint32_t include_friend_only GNUNET_PACKED;
+
+};
+
 
 /**
  * Message used to inform the client about
@@ -81,6 +123,8 @@ struct InfoMessage
   struct GNUNET_PeerIdentity peer;
 
 };
+GNUNET_NETWORK_STRUCT_END
 
-
+/*#ifndef PEERINFO_H*/
+#endif
 /* end of peerinfo.h */