* 6) Return
*
*/
-
int aim_tx_enqueue(struct aim_session_t *sess,
struct command_tx_struct *newpacket)
{
- struct command_tx_struct *workingPtr = NULL;
+ struct command_tx_struct *cur;
struct command_tx_struct *newpacket_copy = NULL;
- if (newpacket->conn == NULL)
- {
- printf("aim_tx_enqueue: WARNING: enqueueing packet with no connecetion, defaulting to BOS\n");
+ if (newpacket->conn == NULL) {
+ faimdprintf(1, "aim_tx_enqueue: WARNING: enqueueing packet with no connecetion, defaulting to BOS\n");
newpacket->conn = aim_getconn_type(sess, AIM_CONN_TYPE_BOS);
- }
+ }
newpacket_copy = (struct command_tx_struct *) malloc (sizeof(struct command_tx_struct));
memcpy(newpacket_copy, newpacket, sizeof(struct command_tx_struct));
newpacket_copy->sent = 0; /* not sent yet */
newpacket_copy->next = NULL; /* always last */
- if (sess->queue_outgoing == NULL)
- {
- sess->queue_outgoing = newpacket_copy;
- }
- else
- {
- workingPtr = sess->queue_outgoing;
- while (workingPtr->next != NULL)
- workingPtr = workingPtr->next;
- workingPtr->next = newpacket_copy;
- }
+ /* see overhead note in aim_rxqueue counterpart */
+ if (sess->queue_outgoing == NULL) {
+ sess->queue_outgoing = newpacket_copy;
+ } else {
+ for (cur = sess->queue_outgoing;
+ cur->next;
+ cur = cur->next)
+ ;
+ cur->next = newpacket_copy;
+ }
newpacket_copy->lock = 0; /* unlock so it can be sent */
-#if debug > 2
- printf("calling aim_tx_printqueue()\n");
+#if debug == 2
+ faimdprintf(2, "calling aim_tx_printqueue()\n");
aim_tx_printqueue(sess);
- printf("back from aim_tx_printqueue()\n");
-#endif
-
- /* we'll force a flush for now -- this behavior probably will change */
-#if debug > 1
- printf("calling aim_tx_flushqueue()\n");
-#endif
- aim_tx_flushqueue(sess);
-#if debug > 1
- printf("back from aim_tx_flushqueue()\n");
+ faimdprintf(2, "back from aim_tx_printqueue()\n");
#endif
return 0;
* if the queue isn't working quite right.
*
*/
-#if debug > 2
+#if debug == 2
int aim_tx_printqueue(struct aim_session_t *sess)
{
- struct command_tx_struct *workingPtr = NULL;
+ struct command_tx_struct *cur;
- workingPtr = sess->queue_outgoing;
-#if debug > 2
- printf("\ncurrent aim_queue_outgoing...\n");
- printf("\ttype seqnum len lock sent\n");
-#endif
- if (workingPtr == NULL)
- printf("aim_tx_flushqueue(): queue empty");
- else
- {
- while (workingPtr != NULL)
- {
- printf("\t %2x %4x %4x %1d %1d\n", workingPtr->type, workingPtr->seqnum, workingPtr->commandlen, workingPtr->lock, workingPtr->sent);
-
- workingPtr = workingPtr->next;
- }
- }
+ faimdprintf(2, "\ncurrent aim_queue_outgoing...\n");
+ faimdprintf(2, "\ttype seqnum len lock sent\n");
+
+ if (sess->queue_outgoing == NULL)
+ 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,
+ cur->commandlen, cur->lock,
+ cur->sent);
+ }
+ }
- printf("\n(done printing queue)\n");
+ faimdprintf(2, "\n(done printing queue)\n");
return 0;
}
*/
int aim_tx_flushqueue(struct aim_session_t *sess)
{
- struct command_tx_struct *workingPtr = NULL;
+ struct command_tx_struct *cur;
u_char *curPacket = NULL;
#if debug > 1
int i = 0;
#endif
- workingPtr = sess->queue_outgoing;
-#if debug > 1
- printf("beginning txflush...\n");
-#endif
- while (workingPtr != NULL)
- {
- /* only process if its unlocked and unsent */
- if ( (workingPtr->lock == 0) &&
- (workingPtr->sent == 0) )
- {
-
- /*
- * And now for the meager attempt to force transmit
- * latency and avoid missed messages.
- */
- if ((workingPtr->conn->lastactivity + workingPtr->conn->forcedlatency)
- >= time(NULL))
- {
- /* FIXME FIXME -- should be a break! we dont want to block the upper layers */
- sleep((workingPtr->conn->lastactivity + workingPtr->conn->forcedlatency) - time(NULL));
- }
-
- workingPtr->lock = 1; /* lock the struct */
-
- /* allocate full-packet buffer */
- curPacket = (char *) malloc(workingPtr->commandlen + 6);
-
- /* command byte */
- curPacket[0] = 0x2a;
+ if (sess->queue_outgoing == NULL)
+ return 0;
- /* type/family byte */
- curPacket[1] = workingPtr->type;
+ faimdprintf(2, "beginning txflush...\n");
+ for (cur = sess->queue_outgoing; cur; cur = cur->next) {
+ /* only process if its unlocked and unsent */
+ if (!cur->lock && !cur->sent) {
- /* bytes 3+4: word: FLAP sequence number */
- aimutil_put16(curPacket+2, workingPtr->seqnum);
+ /*
+ * And now for the meager attempt to force transmit
+ * latency and avoid missed messages.
+ */
+ if ((cur->conn->lastactivity + cur->conn->forcedlatency) >= time(NULL)) {
+ /* FIXME FIXME -- should be a break! we dont want to block the upper layers */
+ sleep((cur->conn->lastactivity + cur->conn->forcedlatency) - time(NULL));
+ }
+
+ cur->lock = 1; /* lock the struct */
+
+ /* allocate full-packet buffer */
+ curPacket = (char *) malloc(cur->commandlen + 6);
+
+ /* command byte */
+ curPacket[0] = 0x2a;
+
+ /* type/family byte */
+ curPacket[1] = cur->type;
+
+ /* bytes 3+4: word: FLAP sequence number */
+ aimutil_put16(curPacket+2, cur->seqnum);
- /* bytes 5+6: word: SNAC len */
- aimutil_put16(curPacket+4, workingPtr->commandlen);
+ /* bytes 5+6: word: SNAC len */
+ aimutil_put16(curPacket+4, cur->commandlen);
+
+ /* bytes 7 and on: raw: SNAC data */
+ memcpy(&(curPacket[6]), cur->data, cur->commandlen);
+
+ /* full image of raw packet data now in curPacket */
+ if ( (u_int)write(cur->conn->fd, curPacket, (cur->commandlen + 6)) != (cur->commandlen + 6)) {
+ printf("\nWARNING: Error in sending packet 0x%4x -- will try again next time\n\n", cur->seqnum);
+ cur->sent = 0; /* mark it unsent */
+ continue; /* bail out */
+ } else {
+ faimdprintf(2, "\nSENT 0x%4x\n\n", cur->seqnum);
- /* bytes 7 and on: raw: SNAC data */
- memcpy(&(curPacket[6]), workingPtr->data, workingPtr->commandlen);
-
- /* full image of raw packet data now in curPacket */
- if ( (u_int)write(workingPtr->conn->fd, curPacket, (workingPtr->commandlen + 6)) != (workingPtr->commandlen + 6))
- {
- printf("\nWARNING: Error in sending packet 0x%4x -- will try again next time\n\n", workingPtr->seqnum);
- workingPtr->sent = 0; /* mark it unsent */
- return -1; /* bail out */
- }
- else
- {
-#if debug > 2
- printf("\nSENT 0x%4x\n\n", workingPtr->seqnum);
-#endif
- workingPtr->sent = 1; /* mark the struct as sent */
- workingPtr->conn->lastactivity = time(NULL);
- }
+ cur->sent = 1; /* mark the struct as sent */
+ cur->conn->lastactivity = time(NULL);
+ }
#if debug > 2
- printf("\nPacket:");
- for (i = 0; i < (workingPtr->commandlen + 6); i++)
- {
- if ((i % 8) == 0)
- printf("\n\t");
- if (curPacket[i] >= ' ' && curPacket[i]<127)
- printf("%c=%02x ",curPacket[i], curPacket[i]);
- else
- printf("0x%2x ", curPacket[i]);
- }
- printf("\n");
-#endif
- workingPtr->lock = 0; /* unlock the struct */
- free(curPacket); /* free up full-packet buffer */
+ faimdprintf(2, "\nPacket:");
+ for (i = 0; i < (cur->commandlen + 6); i++) {
+ if ((i % 8) == 0) {
+ faimdprintf(2, "\n\t");
+ }
+ if (curPacket[i] >= ' ' && curPacket[i]<127) {
+ faimdprintf(2, "%c=%02x ", curPacket[i], curPacket[i]);
+ } else {
+ faimdprintf(2, "0x%2x ", curPacket[i]);
}
- workingPtr = workingPtr->next;
+ }
+ faimdprintf(2, "\n");
+#endif
+ cur->lock = 0; /* unlock the struct */
+ free(curPacket); /* free up full-packet buffer */
}
+ }
/* purge sent commands from queue */
- /* this may not always occur explicitly--i may put this on a timer later */
-#if debug > 1
- printf("calling aim_tx_purgequeue()\n");
-#endif
aim_tx_purgequeue(sess);
-#if debug > 1
- printf("back from aim_tx_purgequeu() [you must be a lucky one]\n");
-#endif
return 0;
}
* reduce memory footprint at run time!
*
*/
-int aim_tx_purgequeue(struct aim_session_t *sess)
+void aim_tx_purgequeue(struct aim_session_t *sess)
{
- struct command_tx_struct *workingPtr = NULL;
- struct command_tx_struct *workingPtr2 = NULL;
-#if debug > 1
- printf("purgequeue(): starting purge\n");
-#endif
- /* Empty queue: nothing to do */
+ struct command_tx_struct *cur = NULL;
+ struct command_tx_struct *tmp;
+
if (sess->queue_outgoing == NULL)
- {
-#if debug > 1
- printf("purgequeue(): purge done (len=0)\n");
-#endif
- return 0;
- }
- /* One Node queue: free node and return */
- else if (sess->queue_outgoing->next == NULL)
- {
-#if debug > 1
- printf("purgequeue(): entered case len=1\n");
-#endif
- /* only free if sent AND unlocked -- dont assume sent structs are done */
- if ( (sess->queue_outgoing->lock == 0) &&
- (sess->queue_outgoing->sent == 1) )
- {
-#if debug > 1
- printf("purgequeue(): purging seqnum 0x%04x\n", sess->queue_outgoing->seqnum);
-#endif
- workingPtr2 = sess->queue_outgoing;
- sess->queue_outgoing = NULL;
- free(workingPtr2->data);
- free(workingPtr2);
- }
-#if debug > 1
- printf("purgequeue(): purge done (len=1)\n");
-#endif
- return 0;
- }
- else
- {
-#if debug > 1
- printf("purgequeue(): entering case len>1\n");
-#endif
- while(workingPtr->next != NULL)
- {
- if ( (workingPtr->next->lock == 0) &&
- (workingPtr->next->sent == 1) )
- {
-#if debug > 1
- printf("purgequeue(): purging seqnum 0x%04x\n", workingPtr->next->seqnum);
-#endif
- workingPtr2 = workingPtr->next;
- workingPtr->next = workingPtr2->next;
- free(workingPtr2->data);
- free(workingPtr2);
- }
- }
-#if debug > 1
- printf("purgequeue(): purge done (len>1)\n");
-#endif
- return 0;
+ return;
+
+ if (sess->queue_outgoing->next == NULL) {
+ if (!sess->queue_outgoing->lock && sess->queue_outgoing->sent) {
+ tmp = sess->queue_outgoing;
+ sess->queue_outgoing = NULL;
+ free(tmp->data);
+ free(tmp);
}
+ return;
+ }
+
+ for(cur = sess->queue_outgoing; cur->next != NULL; ) {
+ if (!cur->next->lock && cur->next->sent) {
+ tmp = cur->next;
+ cur->next = tmp->next;
+ free(tmp->data);
+ free(tmp);
+ }
+ cur = cur->next;
- /* no reach */
+ /*
+ * Be careful here. Because of the way we just
+ * manipulated the pointer, cur may be NULL and
+ * the for() will segfault doing the check unless
+ * we find this case first.
+ */
+ if (cur == NULL)
+ break;
+ }
+ return;
}
andersk / libfaim.git / blobdiff