external/uhub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed bug #1: Excessive send queue bug (corruption of the offset variable).

Browse Source 
Low priority messages are not relayed if soft limit send queue is reached.

Signed-off-by: Jan Vidar Krey <janvidar@extatic.org>
This commit is contained in:
Jan Vidar Krey
2009-03-16 12:28:58 +01:00
parent 4797d5ee90
commit 58e2982675
4 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/netevent.c
View File

@@ -147,7 +147,6 @@ void net_on_read(int fd, short ev, void *arg)
}
}
#define DEBUG_SENDQ
void net_on_write(int fd, short ev, void *arg)
{
@@ -176,15 +175,17 @@ void net_on_write(int fd, short ev, void *arg)
if (ret == length)
{
#ifdef DEBUG_SENDQ
hub_log(log_error, "SENDQ: sent=%d bytes/%d (all), send_queue_size=%d, offset=%d\n", ret, (int) msg->length, user->send_queue_size, user->send_queue_offset);
hub_log(log_error, "SENDQ: sent=%d bytes/%d (all), send_queue_size=%d, offset=%d", ret, (int) msg->length, user->send_queue_size, user->send_queue_offset);
#endif
user->send_queue_size -= ret;
user->send_queue_offset = 0;
#ifdef DEBUG_SENDQ
if ((user->send_queue_size < 0) || (user->send_queue_offset < 0))
{
hub_log(log_error, "INVALID: send_queue_size=%d, send_queue_offset=%d", user->send_queue_size, user->send_queue_offset);
}
#endif DEBUG_SENDQ
list_remove(user->send_queue, msg);
@@ -202,16 +203,17 @@ void net_on_write(int fd, short ev, void *arg)
else
{
#ifdef DEBUG_SENDQ
hub_log(log_error, "SENDQ: sent=%d bytes/%d (part), send_queue_size=%d, offset=%d\n", ret, (int) msg->length, user->send_queue_size, user->send_queue_offset);
hub_log(log_error, "SENDQ: sent=%d bytes/%d (part), send_queue_size=%d, offset=%d", ret, (int) msg->length, user->send_queue_size, user->send_queue_offset);
#endif
user->send_queue_size -= ret;
user->send_queue_offset += ret;
#ifdef DEBUG_SENDQ
if ((user->send_queue_size < 0) || (user->send_queue_offset < 0) || (user->send_queue_offset > msg->length))
{
hub_log(log_error, "INVALID: send_queue_size=%d, send_queue_offset=%d", user->send_queue_size, user->send_queue_offset);
}
#endif
break;
}
}