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

[gnunet]

Author: grothoff
Date: 2011-10-11 13:35:20 +0200 (Tue, 11 Oct 2011)
New Revision: 17369

Modified:
   gnunet/src/core/gnunet-service-core_sessions.c
Log:
fixes

Modified: gnunet/src/core/gnunet-service-core_sessions.c
===================================================================
--- gnunet/src/core/gnunet-service-core_sessions.c      2011-10-11 11:23:26 UTC 
(rev 17368)
+++ gnunet/src/core/gnunet-service-core_sessions.c      2011-10-11 11:35:20 UTC 
(rev 17369)
@@ -484,12 +484,15 @@
     size_t used;
 
     used = 0;
-    pos = session->sme_head;
-    while ( (NULL != pos) &&
+    while ( (NULL != (pos = session->sme_head)) &&
            (used + pos->size <= msize) )
     {
       memcpy (&pbuf[used], &pos[1], pos->size);
       used += pos->size;
+      GNUNET_CONTAINER_DLL_remove (session->sme_head,
+                                  session->sme_tail,
+                                  pos);      
+      GNUNET_free (pos);
     }
     /* compute average payload size */
     total_bytes += used;
@@ -737,7 +740,10 @@
   struct Session *session;
   struct GSC_TypeMap *nmap;
 
+  if (0 == memcmp (peer, &GSC_my_identity, sizeof (struct 
GNUNET_PeerIdentity)))
+    return;
   session = find_session (peer);
+  GNUNET_assert (NULL != session);
   if (GNUNET_YES ==
       GSC_TYPEMAP_test_match (session->tmap,
                              &type, 1))