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

Merge branch 'master' of github.com:janvidar/uhub into sans_libevent

Browse Source
This commit is contained in:
Jan Vidar Krey
2010-01-19 19:35:20 +01:00
parent f84073f7cc eb5d3936a9
commit f84f3b1fff
6 changed files with 148 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/hub.c
View File

@@ -183,7 +183,10 @@ int hub_handle_chat_message(struct hub_info* hub, struct hub_user* u, struct adc
char* message = adc_msg_get_argument(cmd, 0);
int ret = 0;
int relay = 1;
if (!message || !user_is_logged_in(u))
return 0;
if ((cmd->cache[0] == 'B') && (message[0] == '!' || message[0] == '+'))
{
/*
@@ -208,7 +211,7 @@ int hub_handle_chat_message(struct hub_info* hub, struct hub_user* u, struct adc
relay = 0;
}
if (relay && user_is_logged_in(u))
if (relay)
{
/* adc_msg_remove_named_argument(cmd, "PM"); */
if (cmd->cache[0] == 'B')

4
src/core/netevent.c
View File

@@ -111,11 +111,11 @@ int handle_net_read(struct hub_user* user)
start = pos;
}
if (lastPos)
if (lastPos || remaining)
{
if (remaining < g_hub->config->max_recv_buffer)
{
hub_recvq_set(q, lastPos, remaining);
hub_recvq_set(q, lastPos ? lastPos : buf, remaining);
}
else
{