Merged changes from github.

Signed-off-by: Jan Vidar Krey <janvidar@extatic.org>
This commit is contained in:
Jan Vidar Krey
2009-03-13 16:54:39 +01:00
20 changed files with 195 additions and 121 deletions

View File

@@ -79,7 +79,7 @@ void net_on_read(int fd, short ev, void *arg)
while ((pos = strchr(start, '\n')))
{
pos[0] = '\0';
if (strlen(start) > 0 && strlen(start) < user->hub->config->max_recv_buffer)
if (*start && strlen(start) < user->hub->config->max_recv_buffer)
{
if (hub_handle_message(user, start, &pos[0]-&start[0]) == -1)
{
@@ -176,6 +176,10 @@ void net_on_write(int fd, short ev, void *arg)
{
user->send_queue_size -= ret;
user->send_queue_offset = 0;
assert(user->send_queue_size >= 0);
assert(user->send_queue_offset >= 0);
list_remove(user->send_queue, msg);
if (user_flag_get(user, flag_user_list) && (msg == user->info || user->send_queue_size == 0))
@@ -193,6 +197,9 @@ void net_on_write(int fd, short ev, void *arg)
{
user->send_queue_size -= ret;
user->send_queue_offset += ret;
assert(user->send_queue_size >= 0);
assert(user->send_queue_offset >= 0);
break;
}
}