*
*/
+#define FAIM_INTERNAL
#include <faim/aim.h>
+#ifndef _WIN32
+#include <sys/socket.h>
+#endif
+
/*
* Allocate a new tx frame.
*
* chan = channel for OSCAR, hdrtype for OFT
*
*/
-faim_internal struct command_tx_struct *aim_tx_new(unsigned short framing, 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;
+ newtx->conn = conn;
if(datalen) {
- new->data = (u_char *)malloc(datalen);
- new->commandlen = datalen;
+ newtx->data = (unsigned char *)malloc(datalen);
+ newtx->commandlen = datalen;
} else
- new->data = NULL;
-
- new->hdrtype = framing;
- if (new->hdrtype == AIM_FRAMETYPE_OSCAR) {
- new->hdr.oscar.type = chan;
- } else if (new->hdrtype == AIM_FRAMETYPE_OFT) {
- new->hdr.oft.type = chan;
- new->hdr.oft.hdr2len = 0; /* this will get setup by caller */
+ 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;
}
/*
* that is, when sess->tx_enqueue is set to &aim_tx_enqueue__queuebased.
*
*/
-faim_internal int aim_tx_enqueue__queuebased(struct aim_session_t *sess,
- struct command_tx_struct *newpacket)
+static int aim_tx_enqueue__queuebased(struct aim_session_t *sess, struct command_tx_struct *newpacket)
{
struct command_tx_struct *cur;
* right here.
*
*/
-faim_internal int aim_tx_enqueue__immediate(struct aim_session_t *sess, struct command_tx_struct *newpacket)
+static 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");
return 0;
}
+faim_export int aim_tx_setenqueue(struct aim_session_t *sess, int what, int (*func)(struct aim_session_t *, struct command_tx_struct *))
+{
+ if (!sess)
+ return -1;
+
+ if (what == AIM_TX_QUEUED)
+ sess->tx_enqueue = &aim_tx_enqueue__queuebased;
+ else if (what == AIM_TX_IMMEDIATE)
+ sess->tx_enqueue = &aim_tx_enqueue__immediate;
+ else if (what == AIM_TX_USER) {
+ if (!func)
+ return -1;
+ sess->tx_enqueue = func;
+ } else
+ return -1; /* unknown action */
+
+ 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()
*
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->seqnum:0,
+ (cur->hdrtype==AIM_FRAMETYPE_OSCAR)?cur->hdr.oscar.seqnum:0,
cur->commandlen, cur->lock,
cur->sent);
}
} else if (cur->hdrtype == AIM_FRAMETYPE_OFT) {
int z = 0;
- z += aimutil_put8(curPacket+z, 0x4f);
- z += aimutil_put8(curPacket+z, 0x44);
- z += aimutil_put8(curPacket+z, 0x43);
- z += aimutil_put8(curPacket+z, 0x32);
+ 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);
* 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, buflen) != buflen) {
+ if (send(cur->conn->fd, curPacket, buflen, 0) != buflen) {
faim_mutex_unlock(&cur->conn->active);
cur->sent = 1;
- aim_conn_kill(sess, &cur->conn);
+ aim_conn_close(cur->conn);
return 0; /* bail out */
}
if ((cur->hdrtype == AIM_FRAMETYPE_OFT) && cur->commandlen) {
- if (write(cur->conn->fd, cur->data, cur->commandlen) != 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 */
{
struct command_tx_struct *cur;
-#if debug > 1
- int i = 0;
-#endif
-
if (sess->queue_outgoing == NULL)
return 0;
/* 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.
sleep((cur->conn->lastactivity + cur->conn->forcedlatency) - time(NULL));
}
+ /* XXX XXX XXX this should call the custom "queuing" function!! */
if (aim_tx_sendframe(sess, cur) == -1)
break;
}