X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fdv%2Fdv.h;h=10b531cedc0e9efcae5a5aeeccd2e7698bd20653;hb=cb3c882dbb05a797728dfd8b5983ade5a8999eac;hp=b9c3887b0917d21db1a402ceea31fc538dddeaab;hpb=9bf45399bdcac0c503418276b73a05e40c7bbe57;p=oweals%2Fgnunet.git

diff --git a/src/dv/dv.h b/src/dv/dv.h
index b9c3887b0..10b531ced 100644
--- a/src/dv/dv.h
+++ b/src/dv/dv.h
@@ -4,7 +4,7 @@
 
      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
@@ -64,7 +64,7 @@ struct GNUNET_DV_MessageReceived
   struct GNUNET_PeerIdentity sender;
 
   /**
-   * The message that was sent
+   * The length of the message that was sent (appended to this end of struct)
    */
   uint32_t msg_len;
 
@@ -73,11 +73,6 @@ struct GNUNET_DV_MessageReceived
    */
   uint32_t distance;
 
-  /**
-   * Length of the sender address, appended to end of this message
-   */
-  uint32_t sender_address_len;
-
 };
 
 
@@ -155,11 +150,6 @@ struct GNUNET_DV_SendMessage
    */
   struct GNUNET_PeerIdentity target;
 
-  /**
-   * The size of the msgbuf
-   */
-  uint32_t msgbuf_size;
-
   /**
    * Message priority
    */
@@ -229,17 +219,11 @@ typedef struct
 {
   struct GNUNET_MessageHeader header;
 
-#if DEBUG_DV_MESSAGES
   /**
-   * Unique ID for this message.
+   * Unique ID for this message.  Will be zero unless
+   * message tracking is desired.
    */
   uint32_t uid GNUNET_PACKED;
-#else
-  /*
-   * Alignment.
-   */
-  uint32_t reserved GNUNET_PACKED;
-#endif
 
   /**
    * Identity of peer that ultimately sent the message.
@@ -274,9 +258,15 @@ typedef struct
 
 
 struct GNUNET_DV_Handle *
-GNUNET_DV_connect (struct GNUNET_SCHEDULER_Handle *sched,
-                  const struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_DV_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
                   GNUNET_DV_MessageReceivedHandler receive_handler,
                   void *receive_handler_cls);
 
+/**
+ * Disconnect from the DV service
+ *
+ * @param handle the current handle to the service to disconnect
+ */
+void GNUNET_DV_disconnect(struct GNUNET_DV_Handle *handle);
+
 #endif