[GNUnet-SVN] r34444 - gnunet/src/set

[gnunet]

Author: grothoff
Date: 2014-11-27 15:16:05 +0100 (Thu, 27 Nov 2014)
New Revision: 34444

Added:
   gnunet/src/set/gnunet-service-set_protocol.h
Removed:
   gnunet/src/set/set_protocol.h
Modified:
   gnunet/src/set/Makefile.am
   gnunet/src/set/gnunet-service-set.c
   gnunet/src/set/gnunet-service-set_intersection.c
   gnunet/src/set/gnunet-service-set_union.c
Log:
-rename file

Modified: gnunet/src/set/Makefile.am
===================================================================
--- gnunet/src/set/Makefile.am  2014-11-27 14:14:24 UTC (rev 34443)
+++ gnunet/src/set/Makefile.am  2014-11-27 14:16:05 UTC (rev 34444)
@@ -46,7 +46,7 @@
  gnunet-service-set_intersection.c \
  ibf.c ibf.h \
  gnunet-service-set_union_strata_estimator.c 
gnunet-service-set_union_strata_estimator.h \
- set_protocol.h
+ gnunet-service-set_protocol.h
 gnunet_service_set_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/core/libgnunetcore.la \

Modified: gnunet/src/set/gnunet-service-set.c
===================================================================
--- gnunet/src/set/gnunet-service-set.c 2014-11-27 14:14:24 UTC (rev 34443)
+++ gnunet/src/set/gnunet-service-set.c 2014-11-27 14:16:05 UTC (rev 34444)
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  */
 #include "gnunet-service-set.h"
-#include "set_protocol.h"
+#include "gnunet-service-set_protocol.h"
 
 /**
  * How long do we hold on to an incoming channel if there is

Modified: gnunet/src/set/gnunet-service-set_intersection.c
===================================================================
--- gnunet/src/set/gnunet-service-set_intersection.c    2014-11-27 14:14:24 UTC 
(rev 34443)
+++ gnunet/src/set/gnunet-service-set_intersection.c    2014-11-27 14:16:05 UTC 
(rev 34444)
@@ -26,7 +26,7 @@
 #include "gnunet_util_lib.h"
 #include "gnunet-service-set.h"
 #include "gnunet_block_lib.h"
-#include "set_protocol.h"
+#include "gnunet-service-set_protocol.h"
 #include <gcrypt.h>
 
 #define BLOOMFILTER_SIZE GNUNET_CRYPTO_HASH_LENGTH

Copied: gnunet/src/set/gnunet-service-set_protocol.h (from rev 34431, 
gnunet/src/set/set_protocol.h)
===================================================================
--- gnunet/src/set/gnunet-service-set_protocol.h                                
(rev 0)
+++ gnunet/src/set/gnunet-service-set_protocol.h        2014-11-27 14:16:05 UTC 
(rev 34444)
@@ -0,0 +1,160 @@
+/*
+     This file is part of GNUnet.
+     (C) 2013 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
+     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
+     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 GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @author Florian Dold
+ * @file set/set_protocol.h
+ * @brief Peer-to-Peer messages for gnunet set
+ */
+#ifndef SET_PROTOCOL_H
+#define SET_PROTOCOL_H
+
+#include "platform.h"
+#include "gnunet_common.h"
+
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+struct OperationRequestMessage
+{
+  /**
+   * Type: #GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Operation to request, values from `enum GNUNET_SET_OperationType`
+   */
+  uint32_t operation GNUNET_PACKED;
+
+  /**
+   * Salt to use for this operation.
+   */
+  uint32_t salt GNUNET_PACKED;
+
+  /**
+   * For Intersection: my element count
+   */
+  uint32_t element_count GNUNET_PACKED;
+
+  /**
+   * Application-specific identifier of the request.
+   */
+  struct GNUNET_HashCode app_id;
+
+  /* rest: optional message */
+};
+
+
+struct IBFMessage
+{
+  /**
+   * Type: #GNUNET_MESSAGE_TYPE_SET_P2P_IBF
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Order of the whole ibf, where
+   * num_buckets = 2^order
+   */
+  uint8_t order;
+
+  /**
+   * Padding, must be 0.
+   */
+  uint8_t reserved;
+
+  /**
+   * Offset of the strata in the rest of the message
+   */
+  uint16_t offset GNUNET_PACKED;
+
+  /**
+   * Salt used when hashing elements for this IBF.
+   */
+  uint32_t salt GNUNET_PACKED;
+
+  /* rest: strata */
+};
+
+
+struct BFMessage
+{
+  /**
+   * Type: #GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * mutator used with this bloomfilter.
+   */
+  uint32_t sender_element_count GNUNET_PACKED;
+
+  /**
+   * mutator used with this bloomfilter.
+   */
+  uint32_t sender_mutator GNUNET_PACKED;
+
+  /**
+   * Length of the bloomfilter data
+   */
+  uint32_t bloomfilter_total_length GNUNET_PACKED;
+
+  /**
+   * Length of the appended bloomfilter data block
+   */
+  uint32_t bloomfilter_length GNUNET_PACKED;
+
+  /**
+   * Length of the bloomfilter data
+   */
+  uint32_t bits_per_element GNUNET_PACKED;
+
+  /**
+   * rest: the sender's bloomfilter
+   */
+};
+
+
+struct BFPart
+{
+  /**
+   * Type: #GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Length of the appended bloomfilter data block
+   */
+  uint32_t chunk_length GNUNET_PACKED;
+
+  /**
+   * offset in the bloolfilter data block, if multipart message
+   */
+  uint32_t chunk_offset GNUNET_PACKED;
+
+  /**
+   * rest: the sender's bloomfilter
+   */
+};
+
+GNUNET_NETWORK_STRUCT_END
+
+#endif

Modified: gnunet/src/set/gnunet-service-set_union.c
===================================================================
--- gnunet/src/set/gnunet-service-set_union.c   2014-11-27 14:14:24 UTC (rev 
34443)
+++ gnunet/src/set/gnunet-service-set_union.c   2014-11-27 14:16:05 UTC (rev 
34444)
@@ -27,7 +27,7 @@
 #include "gnunet-service-set.h"
 #include "ibf.h"
 #include "gnunet-service-set_union_strata_estimator.h"
-#include "set_protocol.h"
+#include "gnunet-service-set_protocol.h"
 #include <gcrypt.h>
 
 

Deleted: gnunet/src/set/set_protocol.h
===================================================================
--- gnunet/src/set/set_protocol.h       2014-11-27 14:14:24 UTC (rev 34443)
+++ gnunet/src/set/set_protocol.h       2014-11-27 14:16:05 UTC (rev 34444)
@@ -1,160 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2013 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
-     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
-     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 GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @author Florian Dold
- * @file set/set_protocol.h
- * @brief Peer-to-Peer messages for gnunet set
- */
-#ifndef SET_PROTOCOL_H
-#define SET_PROTOCOL_H
-
-#include "platform.h"
-#include "gnunet_common.h"
-
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-struct OperationRequestMessage
-{
-  /**
-   * Type: #GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Operation to request, values from `enum GNUNET_SET_OperationType`
-   */
-  uint32_t operation GNUNET_PACKED;
-
-  /**
-   * Salt to use for this operation.
-   */
-  uint32_t salt GNUNET_PACKED;
-
-  /**
-   * For Intersection: my element count
-   */
-  uint32_t element_count GNUNET_PACKED;
-
-  /**
-   * Application-specific identifier of the request.
-   */
-  struct GNUNET_HashCode app_id;
-
-  /* rest: optional message */
-};
-
-
-struct IBFMessage
-{
-  /**
-   * Type: #GNUNET_MESSAGE_TYPE_SET_P2P_IBF
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Order of the whole ibf, where
-   * num_buckets = 2^order
-   */
-  uint8_t order;
-
-  /**
-   * Padding, must be 0.
-   */
-  uint8_t reserved;
-
-  /**
-   * Offset of the strata in the rest of the message
-   */
-  uint16_t offset GNUNET_PACKED;
-
-  /**
-   * Salt used when hashing elements for this IBF.
-   */
-  uint32_t salt GNUNET_PACKED;
-
-  /* rest: strata */
-};
-
-
-struct BFMessage
-{
-  /**
-   * Type: #GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * mutator used with this bloomfilter.
-   */
-  uint32_t sender_element_count GNUNET_PACKED;
-
-  /**
-   * mutator used with this bloomfilter.
-   */
-  uint32_t sender_mutator GNUNET_PACKED;
-
-  /**
-   * Length of the bloomfilter data
-   */
-  uint32_t bloomfilter_total_length GNUNET_PACKED;
-
-  /**
-   * Length of the appended bloomfilter data block
-   */
-  uint32_t bloomfilter_length GNUNET_PACKED;
-
-  /**
-   * Length of the bloomfilter data
-   */
-  uint32_t bits_per_element GNUNET_PACKED;
-
-  /**
-   * rest: the sender's bloomfilter
-   */
-};
-
-
-struct BFPart
-{
-  /**
-   * Type: #GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Length of the appended bloomfilter data block
-   */
-  uint32_t chunk_length GNUNET_PACKED;
-
-  /**
-   * offset in the bloolfilter data block, if multipart message
-   */
-  uint32_t chunk_offset GNUNET_PACKED;
-
-  /**
-   * rest: the sender's bloomfilter
-   */
-};
-
-GNUNET_NETWORK_STRUCT_END
-
-#endif