Changeset cf02dd6 for libfaim/conn.c

Timestamp:

Dec 10, 2003, 3:20:45 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:

b1fe407

Parents:

8c46404

Message:

*** empty log message ***

File:

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

libfaim/conn.c

@@ -192 +192 @@
 
 /**
- * aim_connrst - Clears out connection list, killing remaining connections.
- * @sess: Session to be cleared
- *
- * Clears out the connection list and kills any connections left.
- *
+ * Clears out connection list, killing remaining connections.
+ *
+ * @param sess Session to be cleared
  */
 static void aim_connrst(aim_session_t *sess)
@@ -218 +216 @@
 
 /**
- * aim_conn_init - Reset a connection to default values.
- * @deadconn: Connection to be reset
- *
+ * Reset a connection to default values.
  * Initializes and/or resets a connection structure.
  *
+ * @param deadconn Connection to be reset
  */
 static void aim_conn_init(aim_conn_t *deadconn)
@@ -533 +530 @@
                 fd = socket(hp->h_addrtype, SOCK_STREAM, 0);
 
-                if (sess->flags & AIM_SESS_FLAGS_NONBLOCKCONNECT)
+                if (sess->nonblocking)
                         fcntl(fd, F_SETFL, O_NONBLOCK); /* XXX save flags */
 
                 if (connect(fd, (struct sockaddr *)&sa, sizeof(struct sockaddr_in)) < 0) {
-                        if (sess->flags & AIM_SESS_FLAGS_NONBLOCKCONNECT) {
+                        if (sess->nonblocking) {
                                 if ((errno == EINPROGRESS) || (errno == EINTR)) {
                                         if (statusret)
@@ -853 +850 @@
 
 /**
- * aim_session_init - Initializes a session structure
- * @sess: Session to initialize
- * @flags: Flags to use. Any of %AIM_SESS_FLAGS %OR'd together.
- * @debuglevel: Level of debugging output (zero is least)
- *
- * Sets up the initial values for a session.
- *
- */
-faim_export void aim_session_init(aim_session_t *sess, fu32_t flags, int debuglevel)
+ * Initializes a session structure by setting the initial values 
+ * stuff in the aim_session_t struct.
+ *
+ * @param sess Session to initialize.
+ * @param nonblocking Set to true if you want connections to be non-blocking.
+ * @param debuglevel Level of debugging output (zero is least).
+ */
+faim_export void aim_session_init(aim_session_t *sess, bool nonblocking, int debuglevel)
 {
 
@@ -873 +869 @@
         aim_initsnachash(sess);
         sess->msgcookies = NULL;
-        sess->icq_info = NULL;
-        sess->oft_info = NULL;
-        sess->snacid_next = 0x00000001;
-
-        sess->flags = 0;
+        sess->nonblocking = nonblocking;
         sess->debug = debuglevel;
         sess->debugcb = defaultdebugcb;
-
         sess->modlistv = NULL;
-
+        sess->snacid_next = 0x00000001;
+
+        sess->locate.userinfo = NULL;
+        sess->locate.torequest = NULL;
+        sess->locate.requested = NULL;
+        sess->locate.waiting_for_response = FALSE;
         sess->ssi.received_data = 0;
         sess->ssi.numitems = 0;
@@ -890 +886 @@
         sess->ssi.timestamp = (time_t)0;
         sess->ssi.waiting_for_ack = 0;
-
+        sess->icq_info = NULL;
         sess->authinfo = NULL;
         sess->emailinfo = NULL;
-
-        /*
-         * Default to SNAC login unless XORLOGIN is explicitly set.
-         */
-        if (!(flags & AIM_SESS_FLAGS_XORLOGIN))
-                sess->flags |= AIM_SESS_FLAGS_SNACLOGIN;
-        sess->flags |= flags;
+        sess->oft_info = NULL;
 
         /*
@@ -907 +897 @@
         aim_tx_setenqueue(sess, AIM_TX_QUEUED, NULL);
 
-
         /*
          * Register all the modules for this session...
          */
         aim__registermodule(sess, misc_modfirst); /* load the catch-all first */
-        aim__registermodule(sess, general_modfirst);
+        aim__registermodule(sess, service_modfirst);
         aim__registermodule(sess, locate_modfirst);
         aim__registermodule(sess, buddylist_modfirst);
@@ -926 +915 @@
         aim__registermodule(sess, chatnav_modfirst);
         aim__registermodule(sess, chat_modfirst);
-        /*      aim__registermodule(sess, odir_modfirst); */ /* kretch */
-        /*      aim__registermodule(sess, bart_modfirst); */ /* kretch */
+        aim__registermodule(sess, odir_modfirst);
+        aim__registermodule(sess, bart_modfirst);
         /* missing 0x11 - 0x12 */
         aim__registermodule(sess, ssi_modfirst);
@@ -1058 +1047 @@
         aim_tx_enqueue(sess, fr);
 
+        /* clean out SNACs over 60sec old */
+        aim_cleansnacs(sess, 60);
+
         return 0;
 }