From 3ba0cb4a0578412f7ca371eae7f3941037db7b0c Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 17 Jun 2011 17:36:34 +0000
Subject: [PATCH] fixing typo, possibly over-eager disconnect

---
 src/fs/gnunet-service-fs_cp.c            | 3 +++
 src/fs/gnunet-service-fs_pr.c            | 7 +++++++
 src/fs/gnunet-service-fs_push.c          | 1 +
 src/transport/gnunet-service-transport.c | 4 +---
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c
index 6a4c46862..350ee54f1 100644
--- a/src/fs/gnunet-service-fs_cp.c
+++ b/src/fs/gnunet-service-fs_cp.c
@@ -430,6 +430,7 @@ schedule_transmission (struct GSF_PeerTransmitHandle *pth)
        (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 @@ void
 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 @@ flush_trust (void *cls,
 
   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);
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c
index c70479b22..e17d778db 100644
--- a/src/fs/gnunet-service-fs_pr.c
+++ b/src/fs/gnunet-service-fs_pr.c
@@ -503,6 +503,11 @@ GSF_pending_request_get_message_ (struct GSF_PendingRequest *pr,
   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 @@ GSF_dht_lookup_ (struct GSF_PendingRequest *pr)
     }
   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 @@ GSF_handle_p2p_content_ (struct GSF_ConnectedPeer *cp,
       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 ==
diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c
index c3affeff4..099010758 100644
--- a/src/fs/gnunet-service-fs_push.c
+++ b/src/fs/gnunet-service-fs_push.c
@@ -345,6 +345,7 @@ score_content (struct MigrationReadyPeer *peer,
   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,
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 8ebd8d0e9..61a6c01a6 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -2674,12 +2674,10 @@ plugin_env_session_end  (void *cls,
    * --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
 }
 
 
-- 
2.25.1