[GNUnet-SVN] r15708 - in gnunet/src: fs transport

[gnunet]

Author: grothoff
Date: 2011-06-17 19:36:34 +0200 (Fri, 17 Jun 2011)
New Revision: 15708

Modified:
   gnunet/src/fs/gnunet-service-fs_cp.c
   gnunet/src/fs/gnunet-service-fs_pr.c
   gnunet/src/fs/gnunet-service-fs_push.c
   gnunet/src/transport/gnunet-service-transport.c
Log:
fixing typo, possibly over-eager disconnect

Modified: gnunet/src/fs/gnunet-service-fs_cp.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_cp.c        2011-06-17 16:52:53 UTC (rev 
15707)
+++ gnunet/src/fs/gnunet-service-fs_cp.c        2011-06-17 17:36:34 UTC (rev 
15708)
@@ -430,6 +430,7 @@
        (0 != pth->cth_in_progress) )
     return; /* already done */
   cp = pth->cp;
+  GNUNET_assert (0 != cp->ppd.pid);
   GNUNET_PEER_resolve (cp->ppd.pid,
                       &target);
   if ( (GNUNET_YES == pth->is_query) &&
@@ -1789,6 +1790,7 @@
 GSF_connected_peer_get_identity_ (const struct GSF_ConnectedPeer *cp,
                                  struct GNUNET_PeerIdentity *id)
 {
+  GNUNET_assert (0 != cp->ppd.pid);
   GNUNET_PEER_resolve (cp->ppd.pid,
                       id);
 }
@@ -1882,6 +1884,7 @@
 
   if (cp->ppd.trust == cp->disk_trust)
     return GNUNET_OK;                     /* unchanged */
+  GNUNET_assert (0 != cp->ppd.pid);
   GNUNET_PEER_resolve (cp->ppd.pid,
                       &pid);
   fn = get_trust_filename (&pid);

Modified: gnunet/src/fs/gnunet-service-fs_pr.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pr.c        2011-06-17 16:52:53 UTC (rev 
15707)
+++ gnunet/src/fs/gnunet-service-fs_pr.c        2011-06-17 17:36:34 UTC (rev 
15708)
@@ -503,6 +503,11 @@
   k = 0;
   bm = 0;
   do_route = (0 == (pr->public_data.options & GSF_PRO_FORWARD_ONLY));
+  if ( (do_route) && (pr->sender_pid == 0))
+    {
+      GNUNET_break (0);
+      do_route = GNUNET_NO;
+    }
   if (! do_route)
     {
       bm |= GET_MESSAGE_BIT_RETURN_TO;
@@ -1055,6 +1060,7 @@
     }
   if (0 != (pr->public_data.options & GSF_PRO_FORWARD_ONLY))
     {
+      GNUNET_assert (0 != pr->sender_pid);
       GNUNET_PEER_resolve (pr->sender_pid,
                           &pi);
       memcpy (&buf[xquery_size], &pi, sizeof (struct GNUNET_PeerIdentity));
@@ -1531,6 +1537,7 @@
       pmc = GNUNET_malloc (sizeof (struct PutMigrationContext));
       pmc->start = GNUNET_TIME_absolute_get ();
       pmc->requested = prq.request_found;
+      GNUNET_assert (0 != GSF_get_peer_performance_data_ (cp)->pid);
       GNUNET_PEER_resolve (GSF_get_peer_performance_data_ (cp)->pid,
                           &pmc->origin);
       if (NULL ==

Modified: gnunet/src/fs/gnunet-service-fs_push.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_push.c      2011-06-17 16:52:53 UTC (rev 
15707)
+++ gnunet/src/fs/gnunet-service-fs_push.c      2011-06-17 17:36:34 UTC (rev 
15708)
@@ -345,6 +345,7 @@
   for (i=0;i<MIGRATION_LIST_SIZE;i++)
     if (block->target_list[i] == ppd->pid)
       return -1;
+  GNUNET_assert (0 != ppd->pid);
   GNUNET_PEER_resolve (ppd->pid,
                       &id);
   dist = GNUNET_CRYPTO_hash_distance_u32 (&block->query,

Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2011-06-17 16:52:53 UTC 
(rev 15707)
+++ gnunet/src/transport/gnunet-service-transport.c     2011-06-17 17:36:34 UTC 
(rev 15708)
@@ -2674,12 +2674,10 @@
    * --NE
    */
   GNUNET_STATISTICS_update (stats,
-                            gettext_noop ("# disconnects due to 
try-fast-reconnect"),
+                            gettext_noop ("# disconnects due to 
plugin_env_session_end"),
                             1,
                             GNUNET_NO);
-#if DISCONNECT
   disconnect_neighbour (nl, GNUNET_YES);
-#endif
 }