Changeset 9fae35c for protocols/oscar

Timestamp:

2006-01-23T23:28:13Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

ec3e411

Parents:

7308b63 (diff), 68c7c14 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from Wilmer

Location:

protocols/oscar

Files:

• oscar.c (modified) (3 diffs)
• rxqueue.c (modified) (1 diff)
• service.c (modified) (1 diff)

protocols/oscar/oscar.c

@@ -21 +21 @@
  */
 
-#include "sock.h"
 #include <errno.h>
 #include <ctype.h>
@@ -33 +32 @@
 #include "bitlbee.h"
 #include "proxy.h"
+#include "sock.h"
 
 #include "aim.h"
@@ -608 +608 @@
                 return;
         }
+        /* [WvG] Wheeeee! Who needs error checking anyway? ;-) */
         read(pos->fd, m, 16);
         m[16] = '\0';

protocols/oscar/rxqueue.c

@@ -353 +353 @@
                 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)

protocols/oscar/service.c

@@ -736 +736 @@
 
         tlvlen = aim_addtlvtochain32(&tl, 0x0006, data);
-
-        printf("%d\n", tlvlen);
 
         if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 8)))