Changeset e374dee for libfaim/conn.c

Timestamp:

Oct 10, 2003, 5:12:30 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:

fe6f1d3

Parents:

f4d0975

Message:

*** empty log message ***

File:

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

libfaim/conn.c

@@ -173 +173 @@
          * This will free ->internal if it necessary...
          */
-        if ((*deadconn)->type == AIM_CONN_TYPE_RENDEZVOUS)
-                aim_conn_kill_rend(sess, *deadconn);
-        else if ((*deadconn)->type == AIM_CONN_TYPE_CHAT)
+        if ((*deadconn)->type == AIM_CONN_TYPE_CHAT)
                 aim_conn_kill_chat(sess, *deadconn);
 
@@ -319 +317 @@
 faim_export void aim_conn_close(aim_conn_t *deadconn)
 {
+        aim_rxcallback_t userfunc;
 
         if (deadconn->fd >= 3)
                 close(deadconn->fd);
+
         deadconn->fd = -1;
+
+        if ((userfunc = aim_callhandler(deadconn->sessv, deadconn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_CONNDEAD)))
+                userfunc(deadconn->sessv, NULL, deadconn);
+
         if (deadconn->handlerlist)
                 aim_clearhandlers(deadconn);
-        if (deadconn->type == AIM_CONN_TYPE_RENDEZVOUS)
-                aim_conn_close_rend((aim_session_t *)deadconn->sessv, deadconn);
 
         return;
@@ -871 +873 @@
         aim_initsnachash(sess);
         sess->msgcookies = NULL;
+        sess->icq_info = NULL;
+        sess->oft_info = NULL;
         sess->snacid_next = 0x00000001;
 
@@ -880 +884 @@
 
         sess->ssi.received_data = 0;
+        sess->ssi.numitems = 0;
+        sess->ssi.official = NULL;
+        sess->ssi.local = NULL;
+        sess->ssi.pending = NULL;
+        sess->ssi.timestamp = (time_t)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->authinfo = NULL;
         sess->emailinfo = NULL;
 
@@ -920 +926 @@
         aim__registermodule(sess, chatnav_modfirst);
         aim__registermodule(sess, chat_modfirst);
-        aim__registermodule(sess, newsearch_modfirst);
-        /* missing 0x10 - 0x12 */
+        /*      aim__registermodule(sess, odir_modfirst); */ /* kretch */
+        /*      aim__registermodule(sess, bart_modfirst); */ /* kretch */
+        /* missing 0x11 - 0x12 */
         aim__registermodule(sess, ssi_modfirst);
         /* missing 0x14 */
@@ -992 +999 @@
 faim_export int aim_conn_completeconnect(aim_session_t *sess, aim_conn_t *conn)
 {
-        fd_set fds, wfds;
-        struct timeval tv;
-        int res;
-        int error = ETIMEDOUT;
-
         aim_rxcallback_t userfunc;
 
@@ -1005 +1007 @@
                 return -1;
 
-        FD_ZERO(&fds);
-        FD_SET(conn->fd, &fds);
-        FD_ZERO(&wfds);
-        FD_SET(conn->fd, &wfds);
-        tv.tv_sec = 0;
-        tv.tv_usec = 0;
-
-        if ((res = select(conn->fd+1, &fds, &wfds, NULL, &tv)) == -1) {
-                error = errno;
-                aim_conn_close(conn);
-                errno = error;
-                return -1;
-        } else if (res == 0) {
-                faimdprintf(sess, 0, "aim_conn_completeconnect: false alarm on %d\n", conn->fd);
-                return 0; /* hasn't really completed yet... */
-        } 
-
-        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;
-        }
-
-        if (error) {
-                aim_conn_close(conn);
-                errno = error;
-                return -1;
-        }
-        fcntl(conn->fd, F_SETFL, 0); /* XXX should restore original flags */
+        fcntl(conn->fd, F_SETFL, 0);
 
         conn->status &= ~AIM_CONN_STATUS_INPROGRESS;