aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/oscar/rxqueue.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-01-24 12:28:13 +1300
committerJelmer Vernooij <jelmer@samba.org>2006-01-24 12:28:13 +1300
commit9fae35c9cf2d5a319623946705e5d7179ea5c338 (patch)
treec489bfe332588c4fb918b4759c3f89f8b4c0a75f /protocols/oscar/rxqueue.c
parent7308b63f3300d5b2a326edfde6c50a18bc05e3e5 (diff)
parent68c7c145c281fe3ae734b345bf133d70d1ef8652 (diff)
Merge from Wilmer
Diffstat (limited to 'protocols/oscar/rxqueue.c')
-rw-r--r--protocols/oscar/rxqueue.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/protocols/oscar/rxqueue.c b/protocols/oscar/rxqueue.c
index d8adaa73..6e8dd29c 100644
--- a/protocols/oscar/rxqueue.c
+++ b/protocols/oscar/rxqueue.c
@@ -352,8 +352,15 @@ int aim_get_command(aim_session_t *sess, aim_conn_t *conn)
if (conn->fd == -1)
return -1; /* its a aim_conn_close()'d connection */
- if (conn->fd < 3) /* can happen when people abuse the interface */
+ /* KIDS, THIS IS WHAT HAPPENS IF YOU USE CODE WRITTEN FOR GUIS IN A DAEMON!
+
+ And wouldn't it make sense to return something that prevents this function
+ from being called again IMMEDIATELY (and making the program suck up all
+ CPU time)?...
+
+ if (conn->fd < 3)
return 0;
+ */
if (conn->status & AIM_CONN_STATUS_INPROGRESS)
return aim_conn_completeconnect(sess, conn);