adding Ludo's gnunet-download-manager.scm back to SVN HEAD

[oweals/gnunet.git] / src / core / gnunet-service-core_typemap.c

diff --git a/src/core/gnunet-service-core_typemap.c b/src/core/gnunet-service-core_typemap.c
index f55254b055c83346792eaf82fe0acfc7847d5468..d2dab5d9988baa27b00852889ccbfcd25c352a43 100644 (file)
--- a/src/core/gnunet-service-core_typemap.c
+++ b/src/core/gnunet-service-core_typemap.c
@@ -36,7 +36,7 @@
  * A type map describing which messages a given neighbour is able
  * to process.
  */
-struct GSC_TypeMap 
+struct GSC_TypeMap
 {
   uint32_t bits[(UINT16_MAX + 1) / 32];
 };
@@ -107,6 +107,8 @@ GSC_TYPEMAP_get_from_message (const struct GNUNET_MessageHeader *msg)
   switch (ntohs (msg->type))
   {
   case GNUNET_MESSAGE_TYPE_CORE_BINARY_TYPE_MAP:
+    GNUNET_STATISTICS_update (GSC_stats, gettext_noop ("# type maps received"),
+                              1, GNUNET_NO);
     if (size != sizeof (struct GSC_TypeMap))
     {
       GNUNET_break_op (0);
@@ -116,12 +118,13 @@ GSC_TYPEMAP_get_from_message (const struct GNUNET_MessageHeader *msg)
     memcpy (ret, &msg[1], sizeof (struct GSC_TypeMap));
     return ret;
   case GNUNET_MESSAGE_TYPE_CORE_COMPRESSED_TYPE_MAP:
+    GNUNET_STATISTICS_update (GSC_stats, gettext_noop ("# type maps received"),
+                              1, GNUNET_NO);
     ret = GNUNET_malloc (sizeof (struct GSC_TypeMap));
     dlen = sizeof (struct GSC_TypeMap);
-    if ( (Z_OK !=
-         uncompress ((Bytef*) ret, &dlen,
-                     (const Bytef*) &msg[1], (uLong) size)) ||
-        (dlen != sizeof (struct GSC_TypeMap) ) )
+    if ((Z_OK !=
+         uncompress ((Bytef *) ret, &dlen, (const Bytef *) &msg[1],
+                     (uLong) size)) || (dlen != sizeof (struct GSC_TypeMap)))
     {
       GNUNET_break_op (0);
       GNUNET_free (ret);
@@ -144,6 +147,9 @@ broadcast_my_type_map ()
   struct GNUNET_MessageHeader *hdr;
 
   hdr = GSC_TYPEMAP_compute_type_map_message ();
+  GNUNET_STATISTICS_update (GSC_stats,
+                            gettext_noop ("# updates to my type map"), 1,
+                            GNUNET_NO);
   GSC_SESSIONS_broadcast (hdr);
   GNUNET_free (hdr);
 }
@@ -153,14 +159,13 @@ broadcast_my_type_map ()
  * Add a set of types to our type map.
  */
 void
-GSC_TYPEMAP_add (const uint16_t *types,
-                unsigned int tlen)
+GSC_TYPEMAP_add (const uint16_t * types, unsigned int tlen)
 {
   unsigned int i;
   int changed;
 
   changed = GNUNET_NO;
-  for (i=0;i<tlen;i++)
+  for (i = 0; i < tlen; i++)
   {
     if (0 == map_counters[types[i]]++)
     {
@@ -177,14 +182,13 @@ GSC_TYPEMAP_add (const uint16_t *types,
  * Remove a set of types from our type map.
  */
 void
-GSC_TYPEMAP_remove (const uint16_t *types,
-                   unsigned int tlen)
+GSC_TYPEMAP_remove (const uint16_t * types, unsigned int tlen)
 {
   unsigned int i;
   int changed;
 
   changed = GNUNET_NO;
-  for (i=0;i<tlen;i++)
+  for (i = 0; i < tlen; i++)
   {
     if (0 == --map_counters[types[i]])
     {
@@ -201,19 +205,22 @@ GSC_TYPEMAP_remove (const uint16_t *types,
  * Test if any of the types from the types array is in the
  * given type map.
  *
- * @param map map to test
+ * @param tmap map to test
  * @param types array of types
  * @param tcnt number of entries in types
  * @return GNUNET_YES if a type is in the map, GNUNET_NO if not
- */ 
+ */
 int
-GSC_TYPEMAP_test_match (const struct GSC_TypeMap *tmap,
-                       const uint16_t *types,
-                       unsigned int tcnt)
-{  
+GSC_TYPEMAP_test_match (const struct GSC_TypeMap *tmap, const uint16_t * types,
+                        unsigned int tcnt)
+{
   unsigned int i;
 
-  for (i=0;i<tcnt;i++) 
+  if (NULL == tmap)
+    return GNUNET_NO;
+  if (0 == tcnt)
+    return GNUNET_YES;          /* matches all */
+  for (i = 0; i < tcnt; i++)
     if (0 != (tmap->bits[types[i] / 32] & (1 << (types[i] % 32))))
       return GNUNET_YES;
   return GNUNET_NO;
@@ -223,15 +230,14 @@ GSC_TYPEMAP_test_match (const struct GSC_TypeMap *tmap,
 /**
  * Add additional types to a given typemap.
  *
- * @param map map to extend (not changed)
+ * @param tmap map to extend (not changed)
  * @param types array of types to add
  * @param tcnt number of entries in types
  * @return updated type map (fresh copy)
- */ 
+ */
 struct GSC_TypeMap *
-GSC_TYPEMAP_extend (const struct GSC_TypeMap *tmap,
-                   const uint16_t *types,
-                   unsigned int tcnt)
+GSC_TYPEMAP_extend (const struct GSC_TypeMap *tmap, const uint16_t * types,
+                    unsigned int tcnt)
 {
   struct GSC_TypeMap *ret;
   unsigned int i;
@@ -239,16 +245,28 @@ GSC_TYPEMAP_extend (const struct GSC_TypeMap *tmap,
   ret = GNUNET_malloc (sizeof (struct GSC_TypeMap));
   if (NULL != tmap)
     memcpy (ret, tmap, sizeof (struct GSC_TypeMap));
-  for (i=0;i<tcnt;i++)
+  for (i = 0; i < tcnt; i++)
     ret->bits[types[i] / 32] |= (1 << (types[i] % 32));
   return ret;
 }
 
 
+/**
+ * Create an empty type map.
+ *
+ * @return an empty type map
+ */
+struct GSC_TypeMap *
+GSC_TYPEMAP_create ()
+{
+  return GNUNET_malloc (sizeof (struct GSC_TypeMap));
+}
+
+
 /**
  * Free the given type map.
  *
- * @param map a type map
+ * @param tmap a type map
  */
 void
 GSC_TYPEMAP_destroy (struct GSC_TypeMap *tmap)