diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-08-19 13:13:45 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-08-19 13:13:45 +0000 |
commit | 86290d22b2632f1cddeb5ae5756574d7f5dcae83 (patch) | |
tree | d53b2a4c220e3d6b9910eec0d368a1a61710d4bc /src/util/connection.c | |
parent | 00eaae88081a097b4e544a777d600089f4c5389b (diff) | |
download | gnunet-86290d22b2632f1cddeb5ae5756574d7f5dcae83.tar.gz gnunet-86290d22b2632f1cddeb5ae5756574d7f5dcae83.zip |
fixing fun bug
Diffstat (limited to 'src/util/connection.c')
-rw-r--r-- | src/util/connection.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/util/connection.c b/src/util/connection.c index eb4fe99c2..9e789eb58 100644 --- a/src/util/connection.c +++ b/src/util/connection.c | |||
@@ -1504,6 +1504,13 @@ transmit_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1504 | return; /* connect failed for good, we're finished */ | 1504 | return; /* connect failed for good, we're finished */ |
1505 | } | 1505 | } |
1506 | GNUNET_assert (sock->write_buffer_off >= sock->write_buffer_pos); | 1506 | GNUNET_assert (sock->write_buffer_off >= sock->write_buffer_pos); |
1507 | if ( (sock->nth.notify_ready != NULL) && | ||
1508 | (sock->write_buffer_size < sock->nth.notify_size) ) | ||
1509 | { | ||
1510 | sock->write_buffer = GNUNET_realloc(sock->write_buffer, | ||
1511 | sock->nth.notify_size); | ||
1512 | sock->write_buffer_size = sock->nth.notify_size; | ||
1513 | } | ||
1507 | process_notify (sock); | 1514 | process_notify (sock); |
1508 | have = sock->write_buffer_off - sock->write_buffer_pos; | 1515 | have = sock->write_buffer_off - sock->write_buffer_pos; |
1509 | if (have == 0) | 1516 | if (have == 0) |
@@ -1592,12 +1599,6 @@ GNUNET_CONNECTION_notify_transmit_ready (struct GNUNET_CONNECTION_Handle | |||
1592 | return NULL; | 1599 | return NULL; |
1593 | GNUNET_assert (notify != NULL); | 1600 | GNUNET_assert (notify != NULL); |
1594 | GNUNET_assert (size < GNUNET_SERVER_MAX_MESSAGE_SIZE); | 1601 | GNUNET_assert (size < GNUNET_SERVER_MAX_MESSAGE_SIZE); |
1595 | if (sock->write_buffer_size < size) | ||
1596 | { | ||
1597 | sock->write_buffer = GNUNET_realloc(sock->write_buffer, size); | ||
1598 | sock->write_buffer_size = size; | ||
1599 | } | ||
1600 | GNUNET_assert (sock->write_buffer_size >= size); | ||
1601 | GNUNET_assert (sock->write_buffer_off <= sock->write_buffer_size); | 1602 | GNUNET_assert (sock->write_buffer_off <= sock->write_buffer_size); |
1602 | GNUNET_assert (sock->write_buffer_pos <= sock->write_buffer_size); | 1603 | GNUNET_assert (sock->write_buffer_pos <= sock->write_buffer_size); |
1603 | GNUNET_assert (sock->write_buffer_pos <= sock->write_buffer_off); | 1604 | GNUNET_assert (sock->write_buffer_pos <= sock->write_buffer_off); |