X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/blobdiff_plain/68ac63c2c144fc0151820d3c6feb1e3f78bba24b..9dbda50b270a3c43faabc65753a1b2d26e628efc:/aim_txqueue.c diff --git a/aim_txqueue.c b/aim_txqueue.c index 7c2da33..bc5eab3 100644 --- a/aim_txqueue.c +++ b/aim_txqueue.c @@ -7,6 +7,10 @@ #include +#ifndef _WIN32 +#include +#endif + /* * Allocate a new tx frame. * @@ -19,39 +23,39 @@ * chan = channel for OSCAR, hdrtype for OFT * */ -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; } /* @@ -70,8 +74,8 @@ struct command_tx_struct *aim_tx_new(unsigned short framing, int chan, struct ai * 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; @@ -122,7 +126,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"); @@ -147,6 +151,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() * @@ -156,7 +173,7 @@ 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) { u_int ret; @@ -175,7 +192,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; @@ -225,7 +242,7 @@ 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 aim_session_t *sess, struct command_tx_struct *cur) +faim_internal int aim_tx_sendframe(struct aim_session_t *sess, struct command_tx_struct *cur) { int buflen = 0; unsigned char *curPacket; @@ -269,10 +286,10 @@ int aim_tx_sendframe(struct aim_session_t *sess, struct command_tx_struct *cur) } 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); @@ -286,15 +303,15 @@ int aim_tx_sendframe(struct aim_session_t *sess, struct command_tx_struct *cur) * 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) { + 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. @@ -327,7 +344,7 @@ int aim_tx_sendframe(struct aim_session_t *sess, 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; @@ -343,6 +360,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. @@ -371,7 +391,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;