disabled some useless old branches in the flushing of incoming items due to calling pqihandler::tick() and pqipersongrp::tickServiceRecv()

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8163 b45a01b8-16f6-495d-af2f-9b41ad6348cc

libretroshare/src/pqi/pqihandler.cc

@@ -349,7 +349,7 @@ int pqihandler::locked_GetItems()
 			{
 
 				static int ntimes =0 ;
-				if(++ntimes < 20)
+//				if(++ntimes < 20)
 				{
 		std::cerr << "pqihandler::locked_GetItems() pqi->GetItem()";
         std::cerr << " should never happen anymore!";

libretroshare/src/pqi/pqipersongrp.cc

@@ -70,7 +70,7 @@ bool pqipersongrp::RecvRsRawItem(RsRawItem *item)
 
 
 
-
+#ifdef TO_BE_REMOVED
 // handle the tunnel services.
 int pqipersongrp::tickServiceRecv()
 {
@@ -103,13 +103,14 @@ int pqipersongrp::tickServiceRecv()
 	}
 	return 0;
 }
+#endif
 
 // handle the tunnel services.
 
 // Improvements:
 // This function is no longer necessary, and data is pushed directly to pqihandler.
 
-#if 0
+#ifdef TO_BE_REMOVED
 int pqipersongrp::tickServiceSend()
 {
         RsRawItem *pqi = NULL;
@@ -160,18 +161,14 @@ int	pqipersongrp::tick()
 
 	int i = 0;
 
-#if 0
-	if (tickServiceSend())
+#ifdef TO_BE_REMOVED
+    if (tickServiceSend())
 	{
 		i = 1;
 #ifdef PGRP_DEBUG
                 std::cerr << "pqipersongrp::tick() moreToTick from tickServiceSend()" << std::endl;
 #endif
 	}
-#endif
-
-
-#if 0
 	if (pqihandler::tick()) /* does Send/Recv */
 	{
 		i = 1;
@@ -179,29 +176,15 @@ int	pqipersongrp::tick()
                 std::cerr << "pqipersongrp::tick() moreToTick from pqihandler::tick()" << std::endl;
 #endif
 	}
-#endif
-
-
 	if (tickServiceRecv())
 	{
 		i = 1;
 #ifdef PGRP_DEBUG
                 std::cerr << "pqipersongrp::tick() moreToTick from tickServiceRecv()" << std::endl;
 #endif
-	}
-
-	p3ServiceServer::tick(); 
-
-#if 1
-	if (pqihandler::tick()) /* does Send/Recv */
-	{
-		i = 1;
-#ifdef PGRP_DEBUG
-                std::cerr << "pqipersongrp::tick() moreToTick from pqihandler::tick()" << std::endl;
-#endif
-	}
-
+    }
 #endif
+    p3ServiceServer::tick();
 
 	return i;
 }

libretroshare/src/pqi/pqipersongrp.h

@@ -119,7 +119,7 @@ virtual int checkOutgoingRsItem(RsItem *item, int global)
 	private:
 
 	// The serviceserver operation.
-	int tickServiceRecv();
+    //int tickServiceRecv();
 	//int tickServiceSend();
 
 	pqilistener *pqil;