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

Fix ADC client send queue.

Browse Source
This commit is contained in:
Jan Vidar Krey
2012-10-02 22:38:51 +02:00
parent e95a892fb7
commit 089966d918
6 changed files with 174 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/ioqueue.c
View File

@@ -141,13 +141,13 @@ void ioq_send_remove(struct ioq_send* q, struct adc_message* msg)
q->offset = 0;
}
int ioq_send_send(struct ioq_send* q, struct hub_user* user)
int ioq_send_send(struct ioq_send* q, struct net_connection* con)
{
int ret;
struct adc_message* msg = list_get_first(q->queue);
if (!msg) return 0;
uhub_assert(msg->cache && *msg->cache);
ret = net_con_send(user->connection, msg->cache + q->offset, msg->length - q->offset);
ret = net_con_send(con, msg->cache + q->offset, msg->length - q->offset);
if (ret > 0)
{

2
src/core/ioqueue.h
View File

@@ -60,7 +60,7 @@ extern void ioq_send_add(struct ioq_send*, struct adc_message* msg);
* Process the send queue, and send as many messages as possible.
* @returns -1 on error, 0 if unable to send more, 1 if more can be sent.
*/
extern int ioq_send_send(struct ioq_send*, struct hub_user*);
extern int ioq_send_send(struct ioq_send*, struct net_connection* con);
/**
* @returns 1 if send queue is empty, 0 otherwise.

2
src/core/netevent.c
View File

@@ -109,7 +109,7 @@ int handle_net_write(struct hub_user* user)
int ret = 0;
while (ioq_send_get_bytes(user->send_queue))
{
ret = ioq_send_send(user->send_queue, user);
ret = ioq_send_send(user->send_queue, user->connection);
if (ret <= 0)
break;
}