diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-09-12 09:28:35 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-09-12 09:28:35 +0000 |
commit | 7963113fccb453419ce2a7df6677041dcd814961 (patch) | |
tree | dae69f242da736801997b530a229eb1e965453fe /src/transport/gnunet-service-transport_neighbours.c | |
parent | 61fb942d84db31829ff44f85f935429f31018b2b (diff) | |
download | gnunet-7963113fccb453419ce2a7df6677041dcd814961.tar.gz gnunet-7963113fccb453419ce2a7df6677041dcd814961.zip |
important messages are info
ATS timeout was breaking tests /w valgrind
Diffstat (limited to 'src/transport/gnunet-service-transport_neighbours.c')
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index f09641506..e04407f02 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c | |||
@@ -70,7 +70,7 @@ | |||
70 | /** | 70 | /** |
71 | * How long are we willing to wait for a response from ATS before timing out? | 71 | * How long are we willing to wait for a response from ATS before timing out? |
72 | */ | 72 | */ |
73 | #define ATS_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 500) | 73 | #define ATS_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 5000) |
74 | 74 | ||
75 | /** | 75 | /** |
76 | * How long are we willing to wait for an ACK from the other peer before | 76 | * How long are we willing to wait for an ACK from the other peer before |
@@ -1849,14 +1849,14 @@ GST_neighbours_try_connect (const struct GNUNET_PeerIdentity *target) | |||
1849 | GNUNET_i2s (target)); | 1849 | GNUNET_i2s (target)); |
1850 | return; /* during shutdown, do nothing */ | 1850 | return; /* during shutdown, do nothing */ |
1851 | } | 1851 | } |
1852 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1852 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
1853 | "Asked to connect to peer `%s'\n", | 1853 | "Asked to connect to peer `%s'\n", |
1854 | GNUNET_i2s (target)); | 1854 | GNUNET_i2s (target)); |
1855 | if (0 == memcmp (target, &GST_my_identity, sizeof (struct GNUNET_PeerIdentity))) | 1855 | if (0 == memcmp (target, &GST_my_identity, sizeof (struct GNUNET_PeerIdentity))) |
1856 | { | 1856 | { |
1857 | /* refuse to connect to myself */ | 1857 | /* refuse to connect to myself */ |
1858 | /* FIXME: can this happen? Is this not an API violation? */ | 1858 | /* FIXME: can this happen? Is this not an API violation? */ |
1859 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1859 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
1860 | "Refusing to try to connect to myself.\n"); | 1860 | "Refusing to try to connect to myself.\n"); |
1861 | return; | 1861 | return; |
1862 | } | 1862 | } |
@@ -1877,8 +1877,8 @@ GST_neighbours_try_connect (const struct GNUNET_PeerIdentity *target) | |||
1877 | case S_CONNECT_RECV_ATS: | 1877 | case S_CONNECT_RECV_ATS: |
1878 | case S_CONNECT_RECV_BLACKLIST: | 1878 | case S_CONNECT_RECV_BLACKLIST: |
1879 | case S_CONNECT_RECV_ACK: | 1879 | case S_CONNECT_RECV_ACK: |
1880 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1880 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
1881 | "Ignoring request to try to connect to `%s', already trying!\n", | 1881 | "Ignoring request to try to connect to `%s', already trying!\n", |
1882 | GNUNET_i2s (target)); | 1882 | GNUNET_i2s (target)); |
1883 | return; /* already trying */ | 1883 | return; /* already trying */ |
1884 | case S_CONNECTED: | 1884 | case S_CONNECTED: |
@@ -1887,8 +1887,8 @@ GST_neighbours_try_connect (const struct GNUNET_PeerIdentity *target) | |||
1887 | case S_RECONNECT_SENT: | 1887 | case S_RECONNECT_SENT: |
1888 | case S_CONNECTED_SWITCHING_BLACKLIST: | 1888 | case S_CONNECTED_SWITCHING_BLACKLIST: |
1889 | case S_CONNECTED_SWITCHING_CONNECT_SENT: | 1889 | case S_CONNECTED_SWITCHING_CONNECT_SENT: |
1890 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1890 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
1891 | "Ignoring request to try to connect, already connected to `%s'!\n", | 1891 | "Ignoring request to try to connect, already connected to `%s'!\n", |
1892 | GNUNET_i2s (target)); | 1892 | GNUNET_i2s (target)); |
1893 | return; /* already connected */ | 1893 | return; /* already connected */ |
1894 | case S_DISCONNECT: | 1894 | case S_DISCONNECT: |
@@ -2332,7 +2332,7 @@ GST_neighbours_switch_to_address (const struct GNUNET_PeerIdentity *peer, | |||
2332 | return; | 2332 | return; |
2333 | } | 2333 | } |
2334 | 2334 | ||
2335 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2335 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
2336 | "ATS tells us to switch to address '%s' session %p for " | 2336 | "ATS tells us to switch to address '%s' session %p for " |
2337 | "peer `%s' in state %s (quota in/out %u %u )\n", | 2337 | "peer `%s' in state %s (quota in/out %u %u )\n", |
2338 | (address->address_length != 0) ? GST_plugins_a2s (address): "<inbound>", | 2338 | (address->address_length != 0) ? GST_plugins_a2s (address): "<inbound>", |