[GNUnet-SVN] r17686 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2011-10-23 15:51:43 +0200 (Sun, 23 Oct 2011)
New Revision: 17686

Modified:
   gnunet/src/core/gnunet-service-core_sessions.c
   gnunet/src/core/gnunet-service-core_typemap.c
   gnunet/src/core/gnunet-service-core_typemap.h
Log:
possibly fixing 1840 and/or related issues


Modified: gnunet/src/core/gnunet-service-core_sessions.c
===================================================================
--- gnunet/src/core/gnunet-service-core_sessions.c      2011-10-23 13:38:01 UTC 
(rev 17685)
+++ gnunet/src/core/gnunet-service-core_sessions.c      2011-10-23 13:51:43 UTC 
(rev 17686)
@@ -200,11 +200,8 @@
                         gettext_noop ("# entries in session map"),
                         GNUNET_CONTAINER_multihashmap_size (sessions), 
                         GNUNET_NO);
-  if (NULL != session->tmap)
-  {
-    GSC_TYPEMAP_destroy (session->tmap);
-    session->tmap = NULL;
-  }
+  GSC_TYPEMAP_destroy (session->tmap);
+  session->tmap = NULL;
   GNUNET_free (session);
 }
 
@@ -260,6 +257,7 @@
               "Creating session for peer `%4s'\n", GNUNET_i2s (peer));
 #endif
   session = GNUNET_malloc (sizeof (struct Session));
+  session->tmap = GSC_TYPEMAP_create ();
   session->peer = *peer;
   session->kxinfo = kx;
   session->time_established = GNUNET_TIME_absolute_get ();
@@ -767,8 +765,7 @@
                                              NULL, 0, /* FIXME: ATS */
                                              session->tmap,
                                              nmap);
-  if (NULL != session->tmap)
-    GSC_TYPEMAP_destroy (session->tmap);
+  GSC_TYPEMAP_destroy (session->tmap);
   session->tmap = nmap;
 }
 
@@ -802,8 +799,7 @@
                                              NULL, 0, /* FIXME: ATS */
                                              session->tmap,
                                              nmap);
-  if (NULL != session->tmap)
-    GSC_TYPEMAP_destroy (session->tmap);
+  GSC_TYPEMAP_destroy (session->tmap);
   session->tmap = nmap;
 }
 

Modified: gnunet/src/core/gnunet-service-core_typemap.c
===================================================================
--- gnunet/src/core/gnunet-service-core_typemap.c       2011-10-23 13:38:01 UTC 
(rev 17685)
+++ gnunet/src/core/gnunet-service-core_typemap.c       2011-10-23 13:51:43 UTC 
(rev 17686)
@@ -260,6 +260,18 @@
 
 
 /**
+ * Create an empty type map.
+ *
+ * @param map a 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

Modified: gnunet/src/core/gnunet-service-core_typemap.h
===================================================================
--- gnunet/src/core/gnunet-service-core_typemap.h       2011-10-23 13:38:01 UTC 
(rev 17685)
+++ gnunet/src/core/gnunet-service-core_typemap.h       2011-10-23 13:51:43 UTC 
(rev 17686)
@@ -98,7 +98,15 @@
                    const uint16_t *types,
                    unsigned int tcnt);
 
+/**
+ * Create an empty type map.
+ *
+ * @param map a type map
+ */
+struct GSC_TypeMap *
+GSC_TYPEMAP_create (void);
 
+
 /**
  * Free the given type map.
  *