X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/e88ba3953d4dea83f2699669a73ce48b2e573227..37ee990eab0e60fadbc1555d3f4a7e85d2026297:/aim_txqueue.c

diff --git a/aim_txqueue.c b/aim_txqueue.c
index 8c3a9fb..3a12757 100644
--- a/aim_txqueue.c
+++ b/aim_txqueue.c
@@ -5,8 +5,13 @@
  *
  */
 
+#define FAIM_INTERNAL
 #include <faim/aim.h>
 
+#ifndef _WIN32
+#include <sys/socket.h>
+#endif
+
 /*
  * Allocate a new tx frame.
  *
@@ -14,30 +19,44 @@
  *
  * Right now, that is.  If/when we implement a pool of transmit
  * frames, this will become the request-an-unused-frame part.
+ *
+ * framing = AIM_FRAMETYPE_OFT/OSCAR
+ * chan = channel for OSCAR, hdrtype for OFT
+ *
  */
-struct command_tx_struct *aim_tx_new(int chan, struct aim_conn_t *conn, int datalen)
+faim_internal struct command_tx_struct *aim_tx_new(unsigned char framing, int chan, struct aim_conn_t *conn, int datalen)
 {
-  struct command_tx_struct *new;
+  struct command_tx_struct *newtx;
 
   if (!conn) {
     printf("aim_tx_new: ERROR: no connection specified\n");
     return NULL;
   }
 
-  new = (struct command_tx_struct *)malloc(sizeof(struct command_tx_struct));
-  if (!new)
+  newtx = (struct command_tx_struct *)malloc(sizeof(struct command_tx_struct));
+  if (!newtx)
     return NULL;
-  memset(new, 0, sizeof(struct command_tx_struct));
+  memset(newtx, 0, sizeof(struct command_tx_struct));
 
-  new->conn = conn; 
-  new->type = chan;
+  newtx->conn = conn; 
 
   if(datalen) {
-    new->data = (u_char *)malloc(datalen);
-    new->commandlen = datalen;
+    newtx->data = (unsigned char *)malloc(datalen);
+    newtx->commandlen = datalen;
+  } else
+    newtx->data = NULL;
+
+  newtx->hdrtype = framing;
+  if (newtx->hdrtype == AIM_FRAMETYPE_OSCAR) {
+    newtx->hdr.oscar.type = chan;
+  } else if (newtx->hdrtype == AIM_FRAMETYPE_OFT) {
+    newtx->hdr.oft.type = chan;
+    newtx->hdr.oft.hdr2len = 0; /* this will get setup by caller */
+  } else { 
+    printf("tx_new: unknown framing\n");
   }
 
-  return new;
+  return newtx;
 }
 
 /*
@@ -56,8 +75,8 @@ struct command_tx_struct *aim_tx_new(int chan, struct aim_conn_t *conn, int data
  * that is, when sess->tx_enqueue is set to &aim_tx_enqueue__queuebased.
  *
  */
-int aim_tx_enqueue__queuebased(struct aim_session_t *sess,
-			       struct command_tx_struct *newpacket)
+faim_internal int aim_tx_enqueue__queuebased(struct aim_session_t *sess,
+					     struct command_tx_struct *newpacket)
 {
   struct command_tx_struct *cur;
 
@@ -66,8 +85,10 @@ int aim_tx_enqueue__queuebased(struct aim_session_t *sess,
       newpacket->conn = aim_getconn_type(sess, AIM_CONN_TYPE_BOS);
   }
  
-  /* assign seqnum */
-  newpacket->seqnum = aim_get_next_txseqnum(newpacket->conn);
+  if (newpacket->hdrtype == AIM_FRAMETYPE_OSCAR) {
+    /* assign seqnum */
+    newpacket->hdr.oscar.seqnum = aim_get_next_txseqnum(newpacket->conn);
+  }
   /* set some more fields */
   newpacket->lock = 1; /* lock */
   newpacket->sent = 0; /* not sent yet */
@@ -106,7 +127,7 @@ int aim_tx_enqueue__queuebased(struct aim_session_t *sess,
  * right here. 
  * 
  */
-int aim_tx_enqueue__immediate(struct aim_session_t *sess, struct command_tx_struct *newpacket)
+faim_internal int aim_tx_enqueue__immediate(struct aim_session_t *sess, struct command_tx_struct *newpacket)
 {
   if (newpacket->conn == NULL) {
     faimdprintf(1, "aim_tx_enqueue: ERROR: packet has no connection\n");
@@ -116,12 +137,13 @@ int aim_tx_enqueue__immediate(struct aim_session_t *sess, struct command_tx_stru
     return -1;
   }
 
-  newpacket->seqnum = aim_get_next_txseqnum(newpacket->conn);
+  if (newpacket->hdrtype == AIM_FRAMETYPE_OSCAR)
+    newpacket->hdr.oscar.seqnum = aim_get_next_txseqnum(newpacket->conn);
 
   newpacket->lock = 1; /* lock */
   newpacket->sent = 0; /* not sent yet */
 
-  aim_tx_sendframe(newpacket);
+  aim_tx_sendframe(sess, newpacket);
 
   if (newpacket->data)
     free(newpacket->data);
@@ -130,6 +152,19 @@ int aim_tx_enqueue__immediate(struct aim_session_t *sess, struct command_tx_stru
   return 0;
 }
 
+faim_internal int aim_tx_enqueue(struct aim_session_t *sess, struct command_tx_struct *command)
+{
+  /*
+   * If we want to send a connection thats inprogress, we have to force
+   * them to use the queue based version. Otherwise, use whatever they
+   * want.
+   */
+  if (command && command->conn && (command->conn->status & AIM_CONN_STATUS_INPROGRESS)) {
+    return aim_tx_enqueue__queuebased(sess, command);
+  }
+  return (*sess->tx_enqueue)(sess, command);
+}
+
 /* 
  *  aim_get_next_txseqnum()
  *
@@ -139,9 +174,14 @@ int aim_tx_enqueue__immediate(struct aim_session_t *sess, struct command_tx_stru
  *   before enqueuement (in aim_tx_enqueue()).
  *
  */
-u_int aim_get_next_txseqnum(struct aim_conn_t *conn)
+faim_internal unsigned int aim_get_next_txseqnum(struct aim_conn_t *conn)
 {
-  return ( ++conn->seqnum );
+  u_int ret;
+  
+  faim_mutex_lock(&conn->seqnum_lock);
+  ret = ++conn->seqnum;
+  faim_mutex_unlock(&conn->seqnum_lock);
+  return ret;
 }
 
 /*
@@ -153,7 +193,7 @@ u_int aim_get_next_txseqnum(struct aim_conn_t *conn)
  *
  */
 #if debug == 2
-int aim_tx_printqueue(struct aim_session_t *sess)
+faim_internal int aim_tx_printqueue(struct aim_session_t *sess)
 {
   struct command_tx_struct *cur;
 
@@ -164,8 +204,10 @@ int aim_tx_printqueue(struct aim_session_t *sess)
     faimdprintf(2, "aim_tx_flushqueue(): queue empty");
   else {
       for (cur = sess->queue_outgoing; cur; cur = cur->next) {
-	  faimdprintf(2, "\t  %2x   %4x %4x   %1d    %1d\n", 
-		      cur->type, cur->seqnum, 
+	  faimdprintf(2, "\t  %2x  %2x   %4x %4x   %1d    %1d\n", 
+		      cur->hdrtype,
+		      (cur->hdrtype==AIM_FRAMETYPE_OFT)?cur->hdr.oft.type:cur->hdr.oscar.type, 
+		      (cur->hdrtype==AIM_FRAMETYPE_OSCAR)?cur->hdr.oscar.seqnum:0, 
 		      cur->commandlen, cur->lock, 
 		      cur->sent);
       }
@@ -201,46 +243,95 @@ int aim_tx_printqueue(struct aim_session_t *sess)
  *    9) Step to next struct in list and go back to 1.
  *
  */
-int aim_tx_sendframe(struct command_tx_struct *cur)
+faim_internal int aim_tx_sendframe(struct aim_session_t *sess, struct command_tx_struct *cur)
 {
-  u_char *curPacket;
+  int buflen = 0;
+  unsigned char *curPacket;
 
   if (!cur)
     return -1; /* fatal */
 
   cur->lock = 1; /* lock the struct */
 
+  if (cur->hdrtype == AIM_FRAMETYPE_OSCAR)
+    buflen = cur->commandlen + 6;
+  else if (cur->hdrtype == AIM_FRAMETYPE_OFT)
+    buflen = cur->hdr.oft.hdr2len + 8;
+  else {
+    cur->lock = 0;
+    return -1;
+  }
+
   /* allocate full-packet buffer */
-  curPacket = (char *) malloc(cur->commandlen + 6);
+  if (!(curPacket = (unsigned char *) malloc(buflen))) {
+    cur->lock = 0;
+    return -1;
+  }
       
-  /* command byte */
-  curPacket[0] = 0x2a;
+  if (cur->hdrtype == AIM_FRAMETYPE_OSCAR) {
+    /* command byte */
+    curPacket[0] = 0x2a;
       
-  /* type/family byte */
-  curPacket[1] = cur->type;
+    /* type/family byte */
+    curPacket[1] = cur->hdr.oscar.type;
       
-  /* bytes 3+4: word: FLAP sequence number */
-  aimutil_put16(curPacket+2, cur->seqnum);
+    /* bytes 3+4: word: FLAP sequence number */
+    aimutil_put16(curPacket+2, cur->hdr.oscar.seqnum);
 
-  /* bytes 5+6: word: SNAC len */
-  aimutil_put16(curPacket+4, cur->commandlen);
+    /* bytes 5+6: word: SNAC len */
+    aimutil_put16(curPacket+4, cur->commandlen);
       
-  /* bytes 7 and on: raw: SNAC data */  /* XXX: ye gods! get rid of this! */
-  memcpy(&(curPacket[6]), cur->data, cur->commandlen);
-      
-  /* full image of raw packet data now in curPacket */
+    /* bytes 7 and on: raw: SNAC data */  /* XXX: ye gods! get rid of this! */
+    memcpy(&(curPacket[6]), cur->data, cur->commandlen);
+
+  } else if (cur->hdrtype == AIM_FRAMETYPE_OFT) {
+    int z = 0;
+
+    z += aimutil_put8(curPacket+z, cur->hdr.oft.magic[0]);
+    z += aimutil_put8(curPacket+z, cur->hdr.oft.magic[1]);
+    z += aimutil_put8(curPacket+z, cur->hdr.oft.magic[2]);
+    z += aimutil_put8(curPacket+z, cur->hdr.oft.magic[3]);
+
+    z += aimutil_put16(curPacket+z, cur->hdr.oft.hdr2len + 8);
+    z += aimutil_put16(curPacket+z, cur->hdr.oft.type);
+
+    memcpy(curPacket+z, cur->hdr.oft.hdr2, cur->hdr.oft.hdr2len);
+  }
+
+  /* 
+   * For OSCAR, a full image of the raw packet data now in curPacket.
+   * For OFT, an image of just the bloated header is in curPacket, 
+   * since OFT allows us to do the data in a different write (yay!).
+   */
   faim_mutex_lock(&cur->conn->active);
-  if ( (u_int)write(cur->conn->fd, curPacket, (cur->commandlen + 6)) != (cur->commandlen + 6)) {
+  if (send(cur->conn->fd, curPacket, buflen, 0) != buflen) {
     faim_mutex_unlock(&cur->conn->active);
-    printf("\nWARNING: Error in sending packet 0x%4x -- will try again next time\n\n", cur->seqnum);
-    cur->sent = 0; /* mark it unsent */
-    return 0; /* bail out -- continuable error */
-  } else {
-    faimdprintf(2, "\nSENT 0x%4x\n\n", cur->seqnum);
-    
-    cur->sent = 1; /* mark the struct as sent */
-    cur->conn->lastactivity = time(NULL);
+    cur->sent = 1;
+    aim_conn_close(cur->conn);
+    return 0; /* bail out */
   }
+
+  if ((cur->hdrtype == AIM_FRAMETYPE_OFT) && cur->commandlen) {
+    int curposi;
+    for(curposi = 0; curposi < cur->commandlen; curposi++)
+      printf("%02x ", cur->data[curposi]);
+
+    if (send(cur->conn->fd, cur->data, cur->commandlen, 0) != (int)cur->commandlen) {
+      /* 
+       * Theres nothing we can do about this since we've already sent the 
+       * header!  The connection is unstable.
+       */
+      faim_mutex_unlock(&cur->conn->active);
+      cur->sent = 1;
+      aim_conn_close(cur->conn);
+      return 0; /* bail out */
+    }
+
+  }
+
+  cur->sent = 1; /* mark the struct as sent */
+  cur->conn->lastactivity = time(NULL);
+
   faim_mutex_unlock(&cur->conn->active);
 
 #if debug > 2
@@ -263,14 +354,10 @@ int aim_tx_sendframe(struct command_tx_struct *cur)
   return 1; /* success */
 }
 
-int aim_tx_flushqueue(struct aim_session_t *sess)
+faim_export int aim_tx_flushqueue(struct aim_session_t *sess)
 {
   struct command_tx_struct *cur;
    
-#if debug > 1
-  int i = 0;
-#endif
-
   if (sess->queue_outgoing == NULL)
     return 0;
 
@@ -279,6 +366,9 @@ int aim_tx_flushqueue(struct aim_session_t *sess)
     /* only process if its unlocked and unsent */
     if (!cur->lock && !cur->sent) {
 
+      if (cur->conn && (cur->conn->status & AIM_CONN_STATUS_INPROGRESS))
+	continue;
+
       /*
        * And now for the meager attempt to force transmit
        * latency and avoid missed messages.
@@ -288,7 +378,8 @@ int aim_tx_flushqueue(struct aim_session_t *sess)
 	sleep((cur->conn->lastactivity + cur->conn->forcedlatency) - time(NULL));
       }
 
-      if (aim_tx_sendframe(cur) == -1)
+      /* XXX XXX XXX this should call the custom "queuing" function!! */
+      if (aim_tx_sendframe(sess, cur) == -1)
 	break;
     }
   }
@@ -307,7 +398,7 @@ int aim_tx_flushqueue(struct aim_session_t *sess)
  *  reduce memory footprint at run time!  
  *
  */
-void aim_tx_purgequeue(struct aim_session_t *sess)
+faim_export void aim_tx_purgequeue(struct aim_session_t *sess)
 {
   struct command_tx_struct *cur = NULL;
   struct command_tx_struct *tmp;
@@ -319,6 +410,8 @@ void aim_tx_purgequeue(struct aim_session_t *sess)
     if (!sess->queue_outgoing->lock && sess->queue_outgoing->sent) {
       tmp = sess->queue_outgoing;
       sess->queue_outgoing = NULL;
+      if (tmp->hdrtype == AIM_FRAMETYPE_OFT)
+	free(tmp->hdr.oft.hdr2);
       free(tmp->data);
       free(tmp);
     }
@@ -329,6 +422,8 @@ void aim_tx_purgequeue(struct aim_session_t *sess)
     if (!cur->next->lock && cur->next->sent) {
       tmp = cur->next;
       cur->next = tmp->next;
+      if (tmp->hdrtype == AIM_FRAMETYPE_OFT)
+	free(tmp->hdr.oft.hdr2);
       free(tmp->data);
       free(tmp);
     }