Small fixes.

[libfaim.git] / aim_conn.c

diff --git a/aim_conn.c b/aim_conn.c
index a815e332aa621bbafc234e7c8254fcb80746ed8e..7caef93665d9f893aa9f591e08d46a1999020c53 100644 (file)
--- a/aim_conn.c
+++ b/aim_conn.c
@@ -13,7 +13,7 @@
  */
 void aim_connrst(struct aim_session_t *sess)
 {
-  faim_mutex_init(&sess->connlistlock, NULL);
+  faim_mutex_init(&sess->connlistlock);
   if (sess->connlist) {
     struct aim_conn_t *cur = sess->connlist, *tmp;
 
@@ -68,8 +68,8 @@ static void aim_conn_init(struct aim_conn_t *deadconn)
   deadconn->forcedlatency = 0;
   deadconn->handlerlist = NULL;
   deadconn->priv = NULL;
-  faim_mutex_init(&deadconn->active, NULL);
-  faim_mutex_init(&deadconn->seqnum_lock, NULL);
+  faim_mutex_init(&deadconn->active);
+  faim_mutex_init(&deadconn->seqnum_lock);
   
   return;
 }
@@ -102,7 +102,9 @@ void aim_conn_kill(struct aim_session_t *sess, struct aim_conn_t **deadconn)
   /* XXX: do we need this for txqueue too? */
   aim_rxqueue_cleanbyconn(sess, *deadconn);
 
-  aim_conn_init(*deadconn);
+  aim_conn_close(*deadconn);
+  if ((*deadconn)->priv)
+    free((*deadconn)->priv);
   free(*deadconn);
   deadconn = NULL;
 
@@ -371,7 +373,7 @@ void aim_session_init(struct aim_session_t *sess)
   sess->queue_outgoing = NULL;
   sess->queue_incoming = NULL;
   sess->pendingjoin = NULL;
-  sess->outstanding_snacs = NULL;
+  aim_initsnachash(sess);
   sess->snac_nextid = 0x00000001;
 
   /*