Changeset 862371b for libfaim/txqueue.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/txqueue.c (modified) (11 diffs)

libfaim/txqueue.c

@@ -1 +1 @@
 /*
- *  aim_txqueue.c
+ * txqueue.c
  *
  * Herein lies all the mangement routines for the transmit (Tx) queue.
@@ -11 +11 @@
 #ifndef _WIN32
 #include <sys/socket.h>
+#else
+#include "win32dep.h"
 #endif
 
@@ -25 +27 @@
  *
  */
-faim_internal aim_frame_t *aim_tx_new(aim_session_t *sess, aim_conn_t *conn, fu8_t framing, fu8_t chan, int datalen)
+faim_internal aim_frame_t *aim_tx_new(aim_session_t *sess, aim_conn_t *conn, fu8_t framing, fu16_t chan, int datalen)
 {
         aim_frame_t *fr;
@@ -62 +64 @@
         } else if (fr->hdrtype == AIM_FRAMETYPE_OFT) {
 
-                fr->hdr.oft.type = chan;
-                fr->hdr.oft.hdr2len = 0; /* this will get setup by caller */
+                fr->hdr.rend.type = chan;
 
         } else 
@@ -231 +232 @@
 {
         int wrote = 0;
-
         if (!bs || !conn || (count < 0))
                 return -EINVAL;
@@ -238 +238 @@
                 count = aim_bstream_empty(bs); /* truncate to remaining space */
 
-        if (count)
-                wrote = aim_send(conn->fd, bs->data + bs->offset, count);
+        if (count) {
+                if ((conn->type == AIM_CONN_TYPE_RENDEZVOUS) && 
+                    (conn->subtype == AIM_CONN_SUBTYPE_OFT_DIRECTIM)) {
+                        /* I strongly suspect that this is a horrible thing to do
+                         * and I feel really guilty doing it. */
+                        const char *sn = aim_directim_getsn(conn);
+                        aim_rxcallback_t userfunc;
+                        while (count - wrote > 1024) {
+                                wrote = wrote + aim_send(conn->fd, bs->data + bs->offset + wrote, 1024);
+                                if ((userfunc=aim_callhandler(conn->sessv, conn, 
+                                                              AIM_CB_FAM_SPECIAL, 
+                                                              AIM_CB_SPECIAL_IMAGETRANSFER)))
+                                  userfunc(conn->sessv, NULL, sn, 
+                                           count-wrote>1024 ? ((double)wrote / count) : 1);
+                        }
+                }
+                if (count - wrote) {
+                        wrote = wrote + aim_send(conn->fd, bs->data + bs->offset + wrote, count - wrote);
+                }
+                
+        }
+        
 
         if (((aim_session_t *)conn->sessv)->debug >= 2) {
@@ -285 +305 @@
         obslen = aim_bstream_curpos(&obs);
         aim_bstream_rewind(&obs);
-
         if (aim_bstream_send(&obs, fr->conn, obslen) != obslen)
                 err = -errno;
@@ -297 +316 @@
 }
 
-static int sendframe_oft(aim_session_t *sess, aim_frame_t *fr)
-{
-        aim_bstream_t hbs;
-        fu8_t *hbs_raw;
-        int hbslen;
+static int sendframe_rendezvous(aim_session_t *sess, aim_frame_t *fr)
+{
+        aim_bstream_t bs;
+        fu8_t *bs_raw;
         int err = 0;
-
-        hbslen = 8 + fr->hdr.oft.hdr2len;
-
-        if (!(hbs_raw = malloc(hbslen)))
+        int totlen = 8 + aim_bstream_curpos(&fr->data);
+
+        if (!(bs_raw = malloc(totlen)))
                 return -1;
 
-        aim_bstream_init(&hbs, hbs_raw, hbslen);
-
-        aimbs_putraw(&hbs, fr->hdr.oft.magic, 4);
-        aimbs_put16(&hbs, fr->hdr.oft.hdr2len + 8);
-        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) {
-
+        aim_bstream_init(&bs, bs_raw, totlen);
+
+        aimbs_putraw(&bs, fr->hdr.rend.magic, 4);
+        aimbs_put16(&bs, 8 + fr->hdr.rend.hdrlen);
+        aimbs_put16(&bs, fr->hdr.rend.type);
+
+        /* payload */
+        aim_bstream_rewind(&fr->data);
+        aimbs_putbs(&bs, &fr->data, totlen - 8);
+
+        aim_bstream_rewind(&bs);
+
+        if (aim_bstream_send(&bs, fr->conn, totlen) != totlen)
                 err = -errno;
-                
-        } else if (aim_bstream_curpos(&fr->data)) {
-                int len;
-
-                len = aim_bstream_curpos(&fr->data);
-                aim_bstream_rewind(&fr->data);
-                
-                if (aim_bstream_send(&fr->data, fr->conn, len) != len)
-                        err = -errno;
-        }
-
-        free(hbs_raw); /* XXX aim_bstream_free */
+
+        free(bs_raw); /* XXX aim_bstream_free */
 
         fr->handled = 1;
         fr->conn->lastactivity = time(NULL);
-
 
         return err;
@@ -346 +354 @@
                 return sendframe_flap(sess, fr);
         else if (fr->hdrtype == AIM_FRAMETYPE_OFT)
-                return sendframe_oft(sess, fr);
+                return sendframe_rendezvous(sess, fr);
         return -1;
 }
@@ -422 +430 @@
  *
  */
-faim_export void aim_tx_cleanqueue(aim_session_t *sess, aim_conn_t *conn)
+faim_internal void aim_tx_cleanqueue(aim_session_t *sess, aim_conn_t *conn)
 {
         aim_frame_t *cur;
@@ -433 +441 @@
         return;
 }
-
-