diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-12-13 15:58:23 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-12-13 15:58:23 +0000 |
commit | 036b44f7d4a27598f21ff8d67f92c36ca58721c1 (patch) | |
tree | 1e807e3d064419149808ccc58c49c99dee506e98 /src/ats/gnunet-service-ats_addresses.c | |
parent | e03e468931f18fceed2a7bbcbe258b865c26ed26 (diff) | |
download | gnunet-036b44f7d4a27598f21ff8d67f92c36ca58721c1.tar.gz gnunet-036b44f7d4a27598f21ff8d67f92c36ca58721c1.zip |
accept all requests, reduce log level
Diffstat (limited to 'src/ats/gnunet-service-ats_addresses.c')
-rw-r--r-- | src/ats/gnunet-service-ats_addresses.c | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index 30045ba2f..865a20a03 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c | |||
@@ -773,7 +773,9 @@ GAS_addresses_add (struct GAS_Addresses_Handle *handle, | |||
773 | 773 | ||
774 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, | 774 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, |
775 | "Adding new address %p for peer `%s', length %u, session id %u, %s\n", | 775 | "Adding new address %p for peer `%s', length %u, session id %u, %s\n", |
776 | new_address, GNUNET_i2s (peer), plugin_addr_len, session_id, | 776 | new_address, |
777 | GNUNET_i2s (peer), | ||
778 | plugin_addr_len, session_id, | ||
777 | GNUNET_ATS_print_network_type (addr_net)); | 779 | GNUNET_ATS_print_network_type (addr_net)); |
778 | 780 | ||
779 | /* Tell solver about new address */ | 781 | /* Tell solver about new address */ |
@@ -833,7 +835,7 @@ GAS_addresses_add (struct GAS_Addresses_Handle *handle, | |||
833 | && (addr_net != ntohl (atsi_delta[c1].value))) | 835 | && (addr_net != ntohl (atsi_delta[c1].value))) |
834 | { | 836 | { |
835 | /* Network type changed */ | 837 | /* Network type changed */ |
836 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, | 838 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
837 | "Address for peer `%s' %p changed from network %s to %s\n", | 839 | "Address for peer `%s' %p changed from network %s to %s\n", |
838 | GNUNET_i2s (peer), existing_address, | 840 | GNUNET_i2s (peer), existing_address, |
839 | GNUNET_ATS_print_network_type (addr_net), | 841 | GNUNET_ATS_print_network_type (addr_net), |
@@ -904,20 +906,9 @@ GAS_addresses_update (struct GAS_Addresses_Handle *handle, | |||
904 | aa = find_exact_address (handle, peer, plugin_name, plugin_addr, | 906 | aa = find_exact_address (handle, peer, plugin_name, plugin_addr, |
905 | plugin_addr_len, session_id); | 907 | plugin_addr_len, session_id); |
906 | if (aa == NULL ) | 908 | if (aa == NULL ) |
907 | { | ||
908 | /* GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Tried to update unknown address for peer `%s' `%s' session id %u\n", */ | ||
909 | /* GNUNET_i2s (peer), plugin_name, session_id); */ | ||
910 | /* GNUNET_break (0); */ | ||
911 | return; | 909 | return; |
912 | } | ||
913 | |||
914 | if (NULL == aa->solver_information) | 910 | if (NULL == aa->solver_information) |
915 | { | ||
916 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, | ||
917 | "Tried to update unknown address for peer `%s' `%s' session id %u\n", | ||
918 | GNUNET_i2s (peer), plugin_name, session_id); | ||
919 | return; | 911 | return; |
920 | } | ||
921 | 912 | ||
922 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Received `%s' for peer `%s' address \n", | 913 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Received `%s' for peer `%s' address \n", |
923 | "ADDRESS UPDATE", GNUNET_i2s (peer), aa); | 914 | "ADDRESS UPDATE", GNUNET_i2s (peer), aa); |
@@ -1097,13 +1088,13 @@ GAS_addresses_destroy (struct GAS_Addresses_Handle *handle, | |||
1097 | plugin_addr_len, session_id); | 1088 | plugin_addr_len, session_id); |
1098 | if (ea == NULL ) | 1089 | if (ea == NULL ) |
1099 | { | 1090 | { |
1100 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, | 1091 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
1101 | "Tried to destroy unknown address for peer `%s' `%s' session id %u\n", | 1092 | "Tried to destroy unknown address for peer `%s' `%s' session id %u\n", |
1102 | GNUNET_i2s (peer), plugin_name, session_id); | 1093 | GNUNET_i2s (peer), plugin_name, session_id); |
1103 | return; | 1094 | return; |
1104 | } | 1095 | } |
1105 | 1096 | ||
1106 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, | 1097 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
1107 | "Received `%s' for peer `%s' address %p session %u\n", "ADDRESS DESTROY", | 1098 | "Received `%s' for peer `%s' address %p session %u\n", "ADDRESS DESTROY", |
1108 | GNUNET_i2s (peer), ea, session_id); | 1099 | GNUNET_i2s (peer), ea, session_id); |
1109 | 1100 | ||
@@ -1156,7 +1147,7 @@ GAS_addresses_in_use (struct GAS_Addresses_Handle *handle, | |||
1156 | plugin_addr_len, session_id); | 1147 | plugin_addr_len, session_id); |
1157 | if (NULL == ea) | 1148 | if (NULL == ea) |
1158 | { | 1149 | { |
1159 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, | 1150 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, |
1160 | "Trying to set unknown address `%s' `%s' `%u' to %s \n", | 1151 | "Trying to set unknown address `%s' `%s' `%u' to %s \n", |
1161 | GNUNET_i2s (peer), plugin_name, session_id, | 1152 | GNUNET_i2s (peer), plugin_name, session_id, |
1162 | (GNUNET_NO == in_use) ? "NO" : "YES"); | 1153 | (GNUNET_NO == in_use) ? "NO" : "YES"); |
@@ -1166,7 +1157,7 @@ GAS_addresses_in_use (struct GAS_Addresses_Handle *handle, | |||
1166 | if (ea->used == in_use) | 1157 | if (ea->used == in_use) |
1167 | { | 1158 | { |
1168 | GNUNET_break(0); | 1159 | GNUNET_break(0); |
1169 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, | 1160 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, |
1170 | "Address in use called multiple times for peer `%s': %s -> %s \n", | 1161 | "Address in use called multiple times for peer `%s': %s -> %s \n", |
1171 | GNUNET_i2s (peer), (GNUNET_NO == ea->used) ? "NO" : "YES", | 1162 | GNUNET_i2s (peer), (GNUNET_NO == ea->used) ? "NO" : "YES", |
1172 | (GNUNET_NO == in_use) ? "NO" : "YES"); | 1163 | (GNUNET_NO == in_use) ? "NO" : "YES"); |
@@ -1203,7 +1194,7 @@ GAS_addresses_request_address_cancel (struct GAS_Addresses_Handle *handle, | |||
1203 | 1194 | ||
1204 | if (NULL == cur) | 1195 | if (NULL == cur) |
1205 | { | 1196 | { |
1206 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, | 1197 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
1207 | "No address requests pending for peer `%s', cannot remove!\n", | 1198 | "No address requests pending for peer `%s', cannot remove!\n", |
1208 | GNUNET_i2s (peer)); | 1199 | GNUNET_i2s (peer)); |
1209 | return; | 1200 | return; |
@@ -1230,7 +1221,7 @@ GAS_addresses_request_address (struct GAS_Addresses_Handle *handle, | |||
1230 | struct GAS_Addresses_Suggestion_Requests *cur = handle->pending_requests_head; | 1221 | struct GAS_Addresses_Suggestion_Requests *cur = handle->pending_requests_head; |
1231 | struct ATS_Address *aa; | 1222 | struct ATS_Address *aa; |
1232 | 1223 | ||
1233 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Received `%s' for peer `%s'\n", | 1224 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Received `%s' for peer `%s'\n", |
1234 | "REQUEST ADDRESS", GNUNET_i2s (peer)); | 1225 | "REQUEST ADDRESS", GNUNET_i2s (peer)); |
1235 | 1226 | ||
1236 | if (GNUNET_NO == handle->running) | 1227 | if (GNUNET_NO == handle->running) |
@@ -1831,7 +1822,7 @@ GAS_addresses_preference_change (struct GAS_Addresses_Handle *handle, | |||
1831 | GNUNET_CONTAINER_multipeermap_contains (handle->addresses, | 1822 | GNUNET_CONTAINER_multipeermap_contains (handle->addresses, |
1832 | peer)) | 1823 | peer)) |
1833 | { | 1824 | { |
1834 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, | 1825 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
1835 | "Received `%s' for unknown peer `%s' from client %p\n", | 1826 | "Received `%s' for unknown peer `%s' from client %p\n", |
1836 | "CHANGE PREFERENCE", GNUNET_i2s (peer), client); | 1827 | "CHANGE PREFERENCE", GNUNET_i2s (peer), client); |
1837 | return; | 1828 | return; |
@@ -1880,7 +1871,7 @@ GAS_addresses_preference_feedback (struct GAS_Addresses_Handle *handle, | |||
1880 | GNUNET_CONTAINER_multipeermap_contains (handle->addresses, | 1871 | GNUNET_CONTAINER_multipeermap_contains (handle->addresses, |
1881 | peer)) | 1872 | peer)) |
1882 | { | 1873 | { |
1883 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, | 1874 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
1884 | "Received `%s' for unknown peer `%s' from client %p\n", | 1875 | "Received `%s' for unknown peer `%s' from client %p\n", |
1885 | "PREFERENCE FEEDBACK", GNUNET_i2s (peer), application); | 1876 | "PREFERENCE FEEDBACK", GNUNET_i2s (peer), application); |
1886 | return; | 1877 | return; |