diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/include/gnunet_common.h | 6 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport.c | 6 | ||||
-rw-r--r-- | src/transport/plugin_transport_tcp.c | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h index dddee068a..73945a809 100644 --- a/src/include/gnunet_common.h +++ b/src/include/gnunet_common.h | |||
@@ -147,6 +147,7 @@ enum GNUNET_ErrorType | |||
147 | GNUNET_ERROR_TYPE_BULK = 32 | 147 | GNUNET_ERROR_TYPE_BULK = 32 |
148 | }; | 148 | }; |
149 | 149 | ||
150 | |||
150 | /** | 151 | /** |
151 | * User-defined handler for log messages. | 152 | * User-defined handler for log messages. |
152 | * | 153 | * |
@@ -208,6 +209,7 @@ int | |||
208 | GNUNET_log_setup (const char *comp, | 209 | GNUNET_log_setup (const char *comp, |
209 | const char *loglevel, const char *logfile); | 210 | const char *loglevel, const char *logfile); |
210 | 211 | ||
212 | |||
211 | /** | 213 | /** |
212 | * Add a custom logger. | 214 | * Add a custom logger. |
213 | * | 215 | * |
@@ -216,6 +218,7 @@ GNUNET_log_setup (const char *comp, | |||
216 | */ | 218 | */ |
217 | void GNUNET_logger_add (GNUNET_Logger logger, void *logger_cls); | 219 | void GNUNET_logger_add (GNUNET_Logger logger, void *logger_cls); |
218 | 220 | ||
221 | |||
219 | /** | 222 | /** |
220 | * Remove a custom logger. | 223 | * Remove a custom logger. |
221 | * | 224 | * |
@@ -235,6 +238,7 @@ void GNUNET_logger_remove (GNUNET_Logger logger, void *logger_cls); | |||
235 | */ | 238 | */ |
236 | const char *GNUNET_h2s (const GNUNET_HashCode *hc); | 239 | const char *GNUNET_h2s (const GNUNET_HashCode *hc); |
237 | 240 | ||
241 | |||
238 | /** | 242 | /** |
239 | * Convert a hash value to a string (for printing debug messages). | 243 | * Convert a hash value to a string (for printing debug messages). |
240 | * This prints all 104 characters of a hashcode! | 244 | * This prints all 104 characters of a hashcode! |
@@ -246,6 +250,7 @@ const char *GNUNET_h2s (const GNUNET_HashCode *hc); | |||
246 | */ | 250 | */ |
247 | const char *GNUNET_h2s_full (const GNUNET_HashCode *hc); | 251 | const char *GNUNET_h2s_full (const GNUNET_HashCode *hc); |
248 | 252 | ||
253 | |||
249 | /** | 254 | /** |
250 | * Convert a peer identity to a string (for printing debug messages). | 255 | * Convert a peer identity to a string (for printing debug messages). |
251 | * This is one of the very few calls in the entire API that is | 256 | * This is one of the very few calls in the entire API that is |
@@ -279,6 +284,7 @@ const char *GNUNET_a2s (const struct sockaddr *addr, | |||
279 | */ | 284 | */ |
280 | const char *GNUNET_error_type_to_string (enum GNUNET_ErrorType kind); | 285 | const char *GNUNET_error_type_to_string (enum GNUNET_ErrorType kind); |
281 | 286 | ||
287 | |||
282 | /** | 288 | /** |
283 | * Use this for fatal errors that cannot be handled | 289 | * Use this for fatal errors that cannot be handled |
284 | */ | 290 | */ |
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 0d54d509e..de61b2199 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -1034,7 +1034,7 @@ read_blacklist_file (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
1034 | { | 1034 | { |
1035 | #if DEBUG_TRANSPORT | 1035 | #if DEBUG_TRANSPORT |
1036 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1036 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1037 | _("Option `%s' in section `%s' not specified!\n"), | 1037 | "Option `%s' in section `%s' not specified!\n", |
1038 | "BLACKLIST_FILE", | 1038 | "BLACKLIST_FILE", |
1039 | "TRANSPORT"); | 1039 | "TRANSPORT"); |
1040 | #endif | 1040 | #endif |
@@ -1122,7 +1122,7 @@ read_blacklist_file (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
1122 | pos = colon_pos + 1; | 1122 | pos = colon_pos + 1; |
1123 | #if DEBUG_TRANSPORT | 1123 | #if DEBUG_TRANSPORT |
1124 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1124 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1125 | _("Read transport name %s in blacklist file.\n"), | 1125 | "Read transport name %s in blacklist file.\n", |
1126 | transport_name); | 1126 | transport_name); |
1127 | #endif | 1127 | #endif |
1128 | memcpy (&enc, &data[pos], sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)); | 1128 | memcpy (&enc, &data[pos], sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)); |
@@ -1196,8 +1196,10 @@ transmit_to_client_callback (void *cls, size_t size, void *buf) | |||
1196 | client->th = NULL; | 1196 | client->th = NULL; |
1197 | if (buf == NULL) | 1197 | if (buf == NULL) |
1198 | { | 1198 | { |
1199 | #if DEBUG_TRANSPORT | ||
1199 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1200 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1200 | "Transmission to client failed, closing connection.\n"); | 1201 | "Transmission to client failed, closing connection.\n"); |
1202 | #endif | ||
1201 | /* fatal error with client, free message queue! */ | 1203 | /* fatal error with client, free message queue! */ |
1202 | while (NULL != (q = client->message_queue_head)) | 1204 | while (NULL != (q = client->message_queue_head)) |
1203 | { | 1205 | { |
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index 6110af96a..fb65e1eb2 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c | |||
@@ -2350,6 +2350,7 @@ tcp_plugin_server_read (void *cls, | |||
2350 | "Finished reading from server stdout with code: %d\n", | 2350 | "Finished reading from server stdout with code: %d\n", |
2351 | bytes); | 2351 | bytes); |
2352 | #endif | 2352 | #endif |
2353 | /* FIXME: consider process_wait here? */ | ||
2353 | return; | 2354 | return; |
2354 | } | 2355 | } |
2355 | 2356 | ||