diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-06-23 15:55:27 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-06-23 15:55:27 +0000 |
commit | ed2abd824bb7ee24fa3e8978e7ed400f5c6aa155 (patch) | |
tree | 7332b6625e20e498df654baffe3d8e1932830eb0 | |
parent | 5ae985135268e8fe5a731f877ad5ddb3c854a708 (diff) | |
download | gnunet-ed2abd824bb7ee24fa3e8978e7ed400f5c6aa155.tar.gz gnunet-ed2abd824bb7ee24fa3e8978e7ed400f5c6aa155.zip |
extra check for blacklist, spelling
-rw-r--r-- | src/transport/gnunet-service-transport.c | 7 | ||||
-rw-r--r-- | src/transport/plugin_transport_tcp.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index f3fc93a7a..056b7a013 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -1073,7 +1073,7 @@ read_blacklist_file (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
1073 | continue; | 1073 | continue; |
1074 | } | 1074 | } |
1075 | tsize = colon_pos - pos; | 1075 | tsize = colon_pos - pos; |
1076 | if ((pos >= frstat.st_size) || (pos + tsize >= frstat.st_size)) | 1076 | if ((pos >= frstat.st_size) || (pos + tsize >= frstat.st_size) || (tsize == 0)) |
1077 | { | 1077 | { |
1078 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 1078 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
1079 | _("Syntax error in blacklist file at offset %llu, giving up!\n"), | 1079 | _("Syntax error in blacklist file at offset %llu, giving up!\n"), |
@@ -3552,6 +3552,7 @@ transmit_hello_and_ping (void *cls, | |||
3552 | "HELLO", hello_size, | 3552 | "HELLO", hello_size, |
3553 | "PING", sizeof (struct TransportPingMessage)); | 3553 | "PING", sizeof (struct TransportPingMessage)); |
3554 | #endif | 3554 | #endif |
3555 | |||
3555 | GNUNET_STATISTICS_update (stats, | 3556 | GNUNET_STATISTICS_update (stats, |
3556 | gettext_noop ("# PING messages sent for initial validation"), | 3557 | gettext_noop ("# PING messages sent for initial validation"), |
3557 | 1, | 3558 | 1, |
@@ -3593,6 +3594,7 @@ run_validation (void *cls, | |||
3593 | struct OwnAddressList *oal; | 3594 | struct OwnAddressList *oal; |
3594 | 3595 | ||
3595 | GNUNET_assert (addr != NULL); | 3596 | GNUNET_assert (addr != NULL); |
3597 | |||
3596 | GNUNET_STATISTICS_update (stats, | 3598 | GNUNET_STATISTICS_update (stats, |
3597 | gettext_noop ("# peer addresses scheduled for validation"), | 3599 | gettext_noop ("# peer addresses scheduled for validation"), |
3598 | 1, | 3600 | 1, |
@@ -4554,7 +4556,7 @@ handle_set_quota (void *cls, | |||
4554 | 4556 | ||
4555 | 4557 | ||
4556 | /** | 4558 | /** |
4557 | * Take the given address and append it to the set of results send back to | 4559 | * Take the given address and append it to the set of results sent back to |
4558 | * the client. | 4560 | * the client. |
4559 | * | 4561 | * |
4560 | * @param cls the transmission context used ('struct GNUNET_SERVER_TransmitContext*') | 4562 | * @param cls the transmission context used ('struct GNUNET_SERVER_TransmitContext*') |
@@ -4570,6 +4572,7 @@ transmit_address_to_client (void *cls, const char *address) | |||
4570 | slen = 0; | 4572 | slen = 0; |
4571 | else | 4573 | else |
4572 | slen = strlen (address) + 1; | 4574 | slen = strlen (address) + 1; |
4575 | |||
4573 | GNUNET_SERVER_transmit_context_append_data (tc, address, slen, | 4576 | GNUNET_SERVER_transmit_context_append_data (tc, address, slen, |
4574 | GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_REPLY); | 4577 | GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_REPLY); |
4575 | if (NULL == address) | 4578 | if (NULL == address) |
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index 5896461f5..dec803885 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c | |||
@@ -438,7 +438,7 @@ tcp_address_to_string (void *cls, | |||
438 | { | 438 | { |
439 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, | 439 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, |
440 | "tcp", | 440 | "tcp", |
441 | _("Unexected address length: %u\n"), | 441 | _("Unexpected address length: %u\n"), |
442 | addrlen); | 442 | addrlen); |
443 | GNUNET_break (0); | 443 | GNUNET_break (0); |
444 | return NULL; | 444 | return NULL; |