Changeset 862371b for libfaim/conn.c

Timestamp:

Jun 29, 2003, 1:47:04 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

e016fc2

Parents:

03ad7b2

Message:

*** empty log message ***

File:

• libfaim/conn.c (modified) (13 diffs)

libfaim/conn.c

@@ -1 @@
-
 /*
  * conn.c
@@ -15 +14 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
+#endif
+
+#ifdef _WIN32
+#include "win32dep.h"
 #endif
 
@@ -446 +449 @@
                         i = 3;
                 }
-
                 if (write(fd, buf, i) < i) {
                         *statusret = errno;
@@ -452 +454 @@
                         return -1;
                 }
-
                 if (read(fd, buf, 2) < 2) {
                         *statusret = errno;
@@ -502 +503 @@
                         return -1;
                 }
+
                 if (read(fd, buf, 10) < 10) {
                         *statusret = errno;
@@ -877 +879 @@
         sess->modlistv = NULL;
 
+        sess->ssi.received_data = 0;
+        sess->ssi.waiting_for_ack = 0;
+        sess->ssi.holding_queue = NULL;
+        sess->ssi.revision = 0;
+        sess->ssi.items = NULL;
+        sess->ssi.timestamp = (time_t)0;
+
+        sess->emailinfo = NULL;
+
         /*
          * Default to SNAC login unless XORLOGIN is explicitly set.
@@ -909 +920 @@
         aim__registermodule(sess, chatnav_modfirst);
         aim__registermodule(sess, chat_modfirst);
-        /* missing 0x0f - 0x12 */
+        aim__registermodule(sess, newsearch_modfirst);
+        /* missing 0x10 - 0x12 */
         aim__registermodule(sess, ssi_modfirst);
         /* missing 0x14 */
-        aim__registermodule(sess, icq_modfirst);
+        aim__registermodule(sess, icq_modfirst); /* XXX - Make sure this isn't sent for AIM */
         /* missing 0x16 */
         aim__registermodule(sess, auth_modfirst);
+        aim__registermodule(sess, email_modfirst);
 
         return;
@@ -981 +994 @@
         fd_set fds, wfds;
         struct timeval tv;
-        int res, error = ETIMEDOUT;
+        int res;
+        int error = ETIMEDOUT;
+
         aim_rxcallback_t userfunc;
 
@@ -1009 +1024 @@
         if (FD_ISSET(conn->fd, &fds) || FD_ISSET(conn->fd, &wfds)) {
                 int len = sizeof(error);
-
                 if (getsockopt(conn->fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0)
                         error = errno;
@@ -1019 +1033 @@
                 return -1;
         }
-
         fcntl(conn->fd, F_SETFL, 0); /* XXX should restore original flags */
 
@@ -1054 +1067 @@
 
         return 0;
-
 }
 
@@ -1061 +1073 @@
  *
  * No-op.  WinAIM 4.x sends these _every minute_ to keep
- * the connection alive.  
+ * the connection alive.
  */
 faim_export int aim_flap_nop(aim_session_t *sess, aim_conn_t *conn)
@@ -1074 +1086 @@
         return 0;
 }
-
-