*/
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;
}
/*
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()
*
} 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);
/* 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.