[GNUnet-SVN] r1117 - in GNUnet/src: applications/topology_default include server

[grothoff]

Author: grothoff
Date: 2005-06-28 13:11:49 -0700 (Tue, 28 Jun 2005)
New Revision: 1117

Modified:
   GNUnet/src/applications/topology_default/topology.c
   GNUnet/src/include/gnunet_protocols.h
   GNUnet/src/server/connection.c
Log:
merge

Modified: GNUnet/src/applications/topology_default/topology.c
===================================================================
--- GNUnet/src/applications/topology_default/topology.c 2005-06-28 19:52:32 UTC 
(rev 1116)
+++ GNUnet/src/applications/topology_default/topology.c 2005-06-28 20:11:49 UTC 
(rev 1117)
@@ -61,7 +61,7 @@
  * Value < 1 that determines the chance (1:(1/LPE)) that the cron job
  * actually tries to ping a peer that is about to time-out.
  */
-#define LIVE_PING_EFFECTIVENESS 0.01
+#define LIVE_PING_EFFECTIVENESS 0.05
 
 static CoreAPIForApplication * coreAPI;
 

Modified: GNUnet/src/include/gnunet_protocols.h
===================================================================
--- GNUnet/src/include/gnunet_protocols.h       2005-06-28 19:52:32 UTC (rev 
1116)
+++ GNUnet/src/include/gnunet_protocols.h       2005-06-28 20:11:49 UTC (rev 
1117)
@@ -85,8 +85,11 @@
  */
 #define SMTP_PROTOCOL_NUMBER 25
 
+/**
+ * Largest protocol number.
+ */
+#define MAX_PROTOCOL_NUMBER 26
 
-
 /* ********* client-server protocol (over TCP) ********** */
 /* ********* CS CORE messages ********** */
 

Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c      2005-06-28 19:52:32 UTC (rev 1116)
+++ GNUnet/src/server/connection.c      2005-06-28 20:11:49 UTC (rev 1117)
@@ -2107,24 +2107,26 @@
     if ( ( (be->status & STAT_SKEY_SENT) > 0) &&
         ( (be->status & STAT_SKEY_RECEIVED) > 0) ) {
       if (be->session.tsession == NULL) {
+       int i;
        HELO_Message * helo;
-       helo = NULL;
-       if (OK ==
-           identity->identity2Helo(&be->session.sender,
-                                   ANY_PROTOCOL_NUMBER,
-                                   NO,
-                                   &helo)) {
+
+       i = 0;
+       while (i < MAX_PROTOCOL_NUMBER) {
+         helo = NULL;
          if (OK ==
              transport->connect(helo,
                                 &be->session.tsession)) {
            be->session.mtu
              = transport->getMTU(be->session.tsession->ttype); 
-         } else {
-           LOG(LOG_WARNING,
-               _("Session confirmed, but cannot connect! (bug?)\n"));
-           FREE(helo);
+           break;
          }
+         FREE(helo);    
+         i++;
        }
+       if (i == MAX_PROTOCOL_NUMBER) {
+         LOG(LOG_WARNING,
+             _("Session confirmed, but cannot connect! (bug?)"));
+       }
       }
       if (be->session.tsession != NULL) {
        if (be->status != STAT_UP) {