Removing all the tests for the bluetooth transport plugin.

[oweals/gnunet.git] / src / transport / gnunet-service-transport_neighbours.c

diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index f096415068370040feeee45bbe74ea4d5174d0ff..1a6a87853a42bfc5e280dc0c1724f995127bcfea 100644 (file)
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -70,7 +70,7 @@
 /**
  * How long are we willing to wait for a response from ATS before timing out?
  */
-#define ATS_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 500)
+#define ATS_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 5000)
 
 /**
  * How long are we willing to wait for an ACK from the other peer before
@@ -329,7 +329,7 @@ struct SessionDisconnectMessage
   /**
    * Public key of the sender.
    */
-  struct GNUNET_CRYPTO_EccPublicKey public_key;
+  struct GNUNET_CRYPTO_EccPublicSignKey public_key;
 
   /**
    * Signature of the peer that sends us the disconnect.  Only
@@ -1195,7 +1195,7 @@ send_disconnect (struct NeighbourMapEntry *n)
   disconnect_msg.reserved = htonl (0);
   disconnect_msg.purpose.size =
       htonl (sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) +
-             sizeof (struct GNUNET_CRYPTO_EccPublicKey) +
+             sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) +
              sizeof (struct GNUNET_TIME_AbsoluteNBO));
   disconnect_msg.purpose.purpose =
       htonl (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT);
@@ -1849,14 +1849,14 @@ GST_neighbours_try_connect (const struct GNUNET_PeerIdentity *target)
                      GNUNET_i2s (target));
                return; /* during shutdown, do nothing */
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
              "Asked to connect to peer `%s'\n",
               GNUNET_i2s (target));
   if (0 == memcmp (target, &GST_my_identity, sizeof (struct GNUNET_PeerIdentity)))
   {
     /* refuse to connect to myself */
     /* FIXME: can this happen? Is this not an API violation? */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                "Refusing to try to connect to myself.\n");
     return;
   }
@@ -1877,8 +1877,8 @@ GST_neighbours_try_connect (const struct GNUNET_PeerIdentity *target)
     case S_CONNECT_RECV_ATS:
     case S_CONNECT_RECV_BLACKLIST:
     case S_CONNECT_RECV_ACK:
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "Ignoring request to try to connect to `%s', already trying!\n",
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+               "Ignoring request to try to connect to `%s', already trying!\n",
                  GNUNET_i2s (target));
       return; /* already trying */
     case S_CONNECTED:      
@@ -1887,8 +1887,8 @@ GST_neighbours_try_connect (const struct GNUNET_PeerIdentity *target)
     case S_RECONNECT_SENT:
     case S_CONNECTED_SWITCHING_BLACKLIST:
     case S_CONNECTED_SWITCHING_CONNECT_SENT:
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "Ignoring request to try to connect, already connected to `%s'!\n",
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+               "Ignoring request to try to connect, already connected to `%s'!\n",
                  GNUNET_i2s (target));
       return; /* already connected */
     case S_DISCONNECT:
@@ -2294,8 +2294,10 @@ GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message,
  * @param session session to use (or NULL)
  * @param ats performance data
  * @param ats_count number of entries in ats
- * @param bandwidth_in inbound quota to be used when connection is up
- * @param bandwidth_out outbound quota to be used when connection is up
+ * @param bandwidth_in inbound quota to be used when connection is up,
+ *     0 to disconnect from peer
+ * @param bandwidth_out outbound quota to be used when connection is up,
+ *     0 to disconnect from peer
  */
 void
 GST_neighbours_switch_to_address (const struct GNUNET_PeerIdentity *peer,
@@ -2332,7 +2334,7 @@ GST_neighbours_switch_to_address (const struct GNUNET_PeerIdentity *peer,
     return;
   }
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "ATS tells us to switch to address '%s' session %p for "
               "peer `%s' in state %s (quota in/out %u %u )\n",
               (address->address_length != 0) ? GST_plugins_a2s (address): "<inbound>",
@@ -3155,7 +3157,7 @@ GST_neighbours_handle_disconnect_message (const struct GNUNET_PeerIdentity
     return;
   }
   GNUNET_CRYPTO_hash (&sdm->public_key,
-                      sizeof (struct GNUNET_CRYPTO_EccPublicKey),
+                      sizeof (struct GNUNET_CRYPTO_EccPublicSignKey),
                       &hc);
   if (0 != memcmp (peer, &hc, sizeof (struct GNUNET_PeerIdentity)))
   {
@@ -3164,7 +3166,7 @@ GST_neighbours_handle_disconnect_message (const struct GNUNET_PeerIdentity
   }
   if (ntohl (sdm->purpose.size) !=
       sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) +
-      sizeof (struct GNUNET_CRYPTO_EccPublicKey) +
+      sizeof (struct GNUNET_CRYPTO_EccPublicSignKey) +
       sizeof (struct GNUNET_TIME_AbsoluteNBO))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,