- Mon Sep 10 06:15:43 PDT 2001

[libfaim.git] / src / txqueue.c

diff --git a/src/txqueue.c b/src/txqueue.c
index 0d28b0e6e66a2f4897beb4b8b9ac678c308e2eb5..8b17863c7b1258b1d08d5e2b74407835cc0484d8 100644 (file)
--- a/src/txqueue.c
+++ b/src/txqueue.c
@@ -202,9 +202,7 @@ faim_internal flap_seqnum_t aim_get_next_txseqnum(aim_conn_t *conn)
 {
        flap_seqnum_t ret;
        
-       faim_mutex_lock(&conn->seqnum_lock);
        ret = ++conn->seqnum;
-       faim_mutex_unlock(&conn->seqnum_lock);
 
        return ret;
 }
@@ -317,10 +315,12 @@ static int sendframe_oft(aim_session_t *sess, aim_frame_t *fr)
        aimbs_put16(&hbs, fr->hdr.oft.type);
        aimbs_putraw(&hbs, fr->hdr.oft.hdr2, fr->hdr.oft.hdr2len);
 
+       aim_bstream_rewind(&hbs);
+       
        if (aim_bstream_send(&hbs, fr->conn, hbslen) != hbslen) {
 
                err = -errno;
-
+               
        } else if (aim_bstream_curpos(&fr->data)) {
                int len;
 
@@ -336,6 +336,7 @@ static int sendframe_oft(aim_session_t *sess, aim_frame_t *fr)
        fr->handled = 1;
        fr->conn->lastactivity = time(NULL);
 
+
        return err;
 }