Tue, 10 Oct 2000 00:02:02 +0000
[gaim-migrate @ 970]
*** MULTIPLE-CONNECTIONS ***
| 2 | 1 | /* |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
2 | * aim_txqueue.c |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
3 | * |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
4 | * Herein lies all the mangement routines for the transmit (Tx) queue. |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
5 | * |
| 2 | 6 | */ |
| 7 | ||
|
283
dbf3342692e9
[gaim-migrate @ 293]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
281
diff
changeset
|
8 | #include <faim/aim.h> |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
9 | |
|
889
070eb1c6db95
[gaim-migrate @ 899]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
840
diff
changeset
|
10 | #ifndef _WIN32 |
|
070eb1c6db95
[gaim-migrate @ 899]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
840
diff
changeset
|
11 | #include <sys/socket.h> |
|
070eb1c6db95
[gaim-migrate @ 899]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
840
diff
changeset
|
12 | #endif |
|
070eb1c6db95
[gaim-migrate @ 899]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
840
diff
changeset
|
13 | |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
14 | /* |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
15 | * Allocate a new tx frame. |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
16 | * |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
17 | * This is more for looks than anything else. |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
18 | * |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
19 | * Right now, that is. If/when we implement a pool of transmit |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
20 | * frames, this will become the request-an-unused-frame part. |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
21 | * |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
22 | * framing = AIM_FRAMETYPE_OFT/OSCAR |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
23 | * chan = channel for OSCAR, hdrtype for OFT |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
24 | * |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
25 | */ |
|
889
070eb1c6db95
[gaim-migrate @ 899]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
840
diff
changeset
|
26 | faim_internal struct command_tx_struct *aim_tx_new(unsigned char framing, int chan, struct aim_conn_t *conn, int datalen) |
| 2 | 27 | { |
|
900
c560f793f30c
[gaim-migrate @ 910]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
889
diff
changeset
|
28 | struct command_tx_struct *newtx; |
| 2 | 29 | |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
30 | if (!conn) { |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
31 | printf("aim_tx_new: ERROR: no connection specified\n"); |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
32 | return NULL; |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
33 | } |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
34 | |
|
900
c560f793f30c
[gaim-migrate @ 910]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
889
diff
changeset
|
35 | newtx = (struct command_tx_struct *)malloc(sizeof(struct command_tx_struct)); |
|
c560f793f30c
[gaim-migrate @ 910]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
889
diff
changeset
|
36 | if (!newtx) |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
37 | return NULL; |
|
900
c560f793f30c
[gaim-migrate @ 910]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
889
diff
changeset
|
38 | memset(newtx, 0, sizeof(struct command_tx_struct)); |
| 2 | 39 | |
|
900
c560f793f30c
[gaim-migrate @ 910]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
889
diff
changeset
|
40 | newtx->conn = conn; |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
41 | |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
42 | if(datalen) { |
|
900
c560f793f30c
[gaim-migrate @ 910]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
889
diff
changeset
|
43 | newtx->data = (unsigned char *)malloc(datalen); |
|
c560f793f30c
[gaim-migrate @ 910]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
889
diff
changeset
|
44 | newtx->commandlen = datalen; |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
45 | } else |
|
900
c560f793f30c
[gaim-migrate @ 910]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
889
diff
changeset
|
46 | newtx->data = NULL; |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
47 | |
|
900
c560f793f30c
[gaim-migrate @ 910]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
889
diff
changeset
|
48 | newtx->hdrtype = framing; |
|
c560f793f30c
[gaim-migrate @ 910]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
889
diff
changeset
|
49 | if (newtx->hdrtype == AIM_FRAMETYPE_OSCAR) { |
|
c560f793f30c
[gaim-migrate @ 910]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
889
diff
changeset
|
50 | newtx->hdr.oscar.type = chan; |
|
c560f793f30c
[gaim-migrate @ 910]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
889
diff
changeset
|
51 | } else if (newtx->hdrtype == AIM_FRAMETYPE_OFT) { |
|
c560f793f30c
[gaim-migrate @ 910]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
889
diff
changeset
|
52 | newtx->hdr.oft.type = chan; |
|
c560f793f30c
[gaim-migrate @ 910]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
889
diff
changeset
|
53 | newtx->hdr.oft.hdr2len = 0; /* this will get setup by caller */ |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
54 | } else { |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
55 | printf("tx_new: unknown framing\n"); |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
56 | } |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
57 | |
|
900
c560f793f30c
[gaim-migrate @ 910]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
889
diff
changeset
|
58 | return newtx; |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
59 | } |
| 2 | 60 | |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
61 | /* |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
62 | * aim_tx_enqeue__queuebased() |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
63 | * |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
64 | * The overall purpose here is to enqueue the passed in command struct |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
65 | * into the outgoing (tx) queue. Basically... |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
66 | * 1) Make a scope-irrelevent copy of the struct |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
67 | * 2) Lock the struct |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
68 | * 3) Mark as not-sent-yet |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
69 | * 4) Enqueue the struct into the list |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
70 | * 5) Unlock the struct once it's linked in |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
71 | * 6) Return |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
72 | * |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
73 | * Note that this is only used when doing queue-based transmitting; |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
74 | * that is, when sess->tx_enqueue is set to &aim_tx_enqueue__queuebased. |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
75 | * |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
76 | */ |
|
840
b80a628d935f
[gaim-migrate @ 850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
445
diff
changeset
|
77 | faim_internal int aim_tx_enqueue__queuebased(struct aim_session_t *sess, |
|
b80a628d935f
[gaim-migrate @ 850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
445
diff
changeset
|
78 | struct command_tx_struct *newpacket) |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
79 | { |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
80 | struct command_tx_struct *cur; |
| 2 | 81 | |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
82 | if (newpacket->conn == NULL) { |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
83 | faimdprintf(1, "aim_tx_enqueue: WARNING: enqueueing packet with no connecetion\n"); |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
84 | newpacket->conn = aim_getconn_type(sess, AIM_CONN_TYPE_BOS); |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
85 | } |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
86 | |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
87 | if (newpacket->hdrtype == AIM_FRAMETYPE_OSCAR) { |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
88 | /* assign seqnum */ |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
89 | newpacket->hdr.oscar.seqnum = aim_get_next_txseqnum(newpacket->conn); |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
90 | } |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
91 | /* set some more fields */ |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
92 | newpacket->lock = 1; /* lock */ |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
93 | newpacket->sent = 0; /* not sent yet */ |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
94 | newpacket->next = NULL; /* always last */ |
| 2 | 95 | |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
96 | /* see overhead note in aim_rxqueue counterpart */ |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
97 | if (sess->queue_outgoing == NULL) { |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
98 | sess->queue_outgoing = newpacket; |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
99 | } else { |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
100 | for (cur = sess->queue_outgoing; |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
101 | cur->next; |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
102 | cur = cur->next) |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
103 | ; |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
104 | cur->next = newpacket; |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
105 | } |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
106 | |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
107 | newpacket->lock = 0; /* unlock so it can be sent */ |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
108 | |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
109 | #if debug == 2 |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
110 | faimdprintf(2, "calling aim_tx_printqueue()\n"); |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
111 | aim_tx_printqueue(sess); |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
112 | faimdprintf(2, "back from aim_tx_printqueue()\n"); |
| 2 | 113 | #endif |
| 114 | ||
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
115 | return 0; |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
116 | } |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
117 | |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
118 | /* |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
119 | * aim_tx_enqueue__immediate() |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
120 | * |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
121 | * Parallel to aim_tx_enqueue__queuebased, however, this bypasses |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
122 | * the whole queue mess when you want immediate writes to happen. |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
123 | * |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
124 | * Basically the same as its __queuebased couterpart, however |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
125 | * instead of doing a list append, it just calls aim_tx_sendframe() |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
126 | * right here. |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
127 | * |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
128 | */ |
|
840
b80a628d935f
[gaim-migrate @ 850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
445
diff
changeset
|
129 | faim_internal int aim_tx_enqueue__immediate(struct aim_session_t *sess, struct command_tx_struct *newpacket) |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
130 | { |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
131 | if (newpacket->conn == NULL) { |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
132 | faimdprintf(1, "aim_tx_enqueue: ERROR: packet has no connection\n"); |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
133 | if (newpacket->data) |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
134 | free(newpacket->data); |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
135 | free(newpacket); |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
136 | return -1; |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
137 | } |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
138 | |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
139 | if (newpacket->hdrtype == AIM_FRAMETYPE_OSCAR) |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
140 | newpacket->hdr.oscar.seqnum = aim_get_next_txseqnum(newpacket->conn); |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
141 | |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
142 | newpacket->lock = 1; /* lock */ |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
143 | newpacket->sent = 0; /* not sent yet */ |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
144 | |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
145 | aim_tx_sendframe(sess, newpacket); |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
146 | |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
147 | if (newpacket->data) |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
148 | free(newpacket->data); |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
149 | free(newpacket); |
|
270
d1f575a953a3
[gaim-migrate @ 280]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
237
diff
changeset
|
150 | |
| 2 | 151 | return 0; |
| 152 | } | |
| 153 | ||
| 154 | /* | |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
155 | * aim_get_next_txseqnum() |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
156 | * |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
157 | * This increments the tx command count, and returns the seqnum |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
158 | * that should be stamped on the next FLAP packet sent. This is |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
159 | * normally called during the final step of packet preparation |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
160 | * before enqueuement (in aim_tx_enqueue()). |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
161 | * |
| 2 | 162 | */ |
|
840
b80a628d935f
[gaim-migrate @ 850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
445
diff
changeset
|
163 | faim_internal unsigned int aim_get_next_txseqnum(struct aim_conn_t *conn) |
| 2 | 164 | { |
|
281
fe895b9b04c1
[gaim-migrate @ 291]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
279
diff
changeset
|
165 | u_int ret; |
|
fe895b9b04c1
[gaim-migrate @ 291]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
279
diff
changeset
|
166 | |
|
fe895b9b04c1
[gaim-migrate @ 291]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
279
diff
changeset
|
167 | faim_mutex_lock(&conn->seqnum_lock); |
|
fe895b9b04c1
[gaim-migrate @ 291]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
279
diff
changeset
|
168 | ret = ++conn->seqnum; |
|
fe895b9b04c1
[gaim-migrate @ 291]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
279
diff
changeset
|
169 | faim_mutex_unlock(&conn->seqnum_lock); |
|
fe895b9b04c1
[gaim-migrate @ 291]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
279
diff
changeset
|
170 | return ret; |
| 2 | 171 | } |
| 172 | ||
| 173 | /* | |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
174 | * aim_tx_printqueue() |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
175 | * |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
176 | * This is basically for debuging purposes only. It dumps all the |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
177 | * records in the tx queue and their current status. Very helpful |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
178 | * if the queue isn't working quite right. |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
179 | * |
| 2 | 180 | */ |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
181 | #if debug == 2 |
|
840
b80a628d935f
[gaim-migrate @ 850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
445
diff
changeset
|
182 | faim_internal int aim_tx_printqueue(struct aim_session_t *sess) |
| 2 | 183 | { |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
184 | struct command_tx_struct *cur; |
| 2 | 185 | |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
186 | faimdprintf(2, "\ncurrent aim_queue_outgoing...\n"); |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
187 | faimdprintf(2, "\ttype seqnum len lock sent\n"); |
| 2 | 188 | |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
189 | if (sess->queue_outgoing == NULL) |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
190 | faimdprintf(2, "aim_tx_flushqueue(): queue empty"); |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
191 | else { |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
192 | for (cur = sess->queue_outgoing; cur; cur = cur->next) { |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
193 | faimdprintf(2, "\t %2x %2x %4x %4x %1d %1d\n", |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
194 | cur->hdrtype, |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
195 | (cur->hdrtype==AIM_FRAMETYPE_OFT)?cur->hdr.oft.type:cur->hdr.oscar.type, |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
196 | (cur->hdrtype==AIM_FRAMETYPE_OSCAR)?cur->seqnum:0, |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
197 | cur->commandlen, cur->lock, |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
198 | cur->sent); |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
199 | } |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
200 | } |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
201 | |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
202 | faimdprintf(2, "\n(done printing queue)\n"); |
| 2 | 203 | |
| 204 | return 0; | |
| 205 | } | |
| 206 | #endif | |
| 207 | ||
| 208 | /* | |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
209 | * aim_tx_flushqueue() |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
210 | * |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
211 | * This the function is responsable for putting the queued commands |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
212 | * onto the wire. This function is critical to the operation of |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
213 | * the queue and therefore is the most prone to brokenness. It |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
214 | * seems to be working quite well at this point. |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
215 | * |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
216 | * Procedure: |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
217 | * 1) Traverse the list, only operate on commands that are unlocked |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
218 | * and haven't been sent yet. |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
219 | * 2) Lock the struct |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
220 | * 3) Allocate a temporary buffer to store the finished, fully |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
221 | * processed packet in. |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
222 | * 4) Build the packet from the command_tx_struct data. |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
223 | * 5) Write the packet to the socket. |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
224 | * 6) If success, mark the packet sent, if fail report failure, do NOT |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
225 | * mark the packet sent (so it will not get purged and therefore |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
226 | * be attempted again on next call). |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
227 | * 7) Unlock the struct. |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
228 | * 8) Free the temp buffer |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
229 | * 9) Step to next struct in list and go back to 1. |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
230 | * |
| 2 | 231 | */ |
|
840
b80a628d935f
[gaim-migrate @ 850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
445
diff
changeset
|
232 | faim_internal int aim_tx_sendframe(struct aim_session_t *sess, struct command_tx_struct *cur) |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
233 | { |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
234 | int buflen = 0; |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
235 | unsigned char *curPacket; |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
236 | |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
237 | if (!cur) |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
238 | return -1; /* fatal */ |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
239 | |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
240 | cur->lock = 1; /* lock the struct */ |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
241 | |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
242 | if (cur->hdrtype == AIM_FRAMETYPE_OSCAR) |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
243 | buflen = cur->commandlen + 6; |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
244 | else if (cur->hdrtype == AIM_FRAMETYPE_OFT) |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
245 | buflen = cur->hdr.oft.hdr2len + 8; |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
246 | else { |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
247 | cur->lock = 0; |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
248 | return -1; |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
249 | } |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
250 | |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
251 | /* allocate full-packet buffer */ |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
252 | if (!(curPacket = (unsigned char *) malloc(buflen))) { |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
253 | cur->lock = 0; |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
254 | return -1; |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
255 | } |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
256 | |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
257 | if (cur->hdrtype == AIM_FRAMETYPE_OSCAR) { |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
258 | /* command byte */ |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
259 | curPacket[0] = 0x2a; |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
260 | |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
261 | /* type/family byte */ |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
262 | curPacket[1] = cur->hdr.oscar.type; |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
263 | |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
264 | /* bytes 3+4: word: FLAP sequence number */ |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
265 | aimutil_put16(curPacket+2, cur->hdr.oscar.seqnum); |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
266 | |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
267 | /* bytes 5+6: word: SNAC len */ |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
268 | aimutil_put16(curPacket+4, cur->commandlen); |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
269 | |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
270 | /* bytes 7 and on: raw: SNAC data */ /* XXX: ye gods! get rid of this! */ |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
271 | memcpy(&(curPacket[6]), cur->data, cur->commandlen); |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
272 | |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
273 | } else if (cur->hdrtype == AIM_FRAMETYPE_OFT) { |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
274 | int z = 0; |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
275 | |
|
960
c4012584334f
[gaim-migrate @ 970]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
900
diff
changeset
|
276 | z += aimutil_put8(curPacket+z, cur->hdr.oft.magic[0]); |
|
c4012584334f
[gaim-migrate @ 970]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
900
diff
changeset
|
277 | z += aimutil_put8(curPacket+z, cur->hdr.oft.magic[1]); |
|
c4012584334f
[gaim-migrate @ 970]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
900
diff
changeset
|
278 | z += aimutil_put8(curPacket+z, cur->hdr.oft.magic[2]); |
|
c4012584334f
[gaim-migrate @ 970]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
900
diff
changeset
|
279 | z += aimutil_put8(curPacket+z, cur->hdr.oft.magic[3]); |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
280 | |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
281 | z += aimutil_put16(curPacket+z, cur->hdr.oft.hdr2len + 8); |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
282 | z += aimutil_put16(curPacket+z, cur->hdr.oft.type); |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
283 | |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
284 | memcpy(curPacket+z, cur->hdr.oft.hdr2, cur->hdr.oft.hdr2len); |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
285 | } |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
286 | |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
287 | /* |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
288 | * For OSCAR, a full image of the raw packet data now in curPacket. |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
289 | * For OFT, an image of just the bloated header is in curPacket, |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
290 | * since OFT allows us to do the data in a different write (yay!). |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
291 | */ |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
292 | faim_mutex_lock(&cur->conn->active); |
|
889
070eb1c6db95
[gaim-migrate @ 899]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
840
diff
changeset
|
293 | if (send(cur->conn->fd, curPacket, buflen, 0) != buflen) { |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
294 | faim_mutex_unlock(&cur->conn->active); |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
295 | cur->sent = 1; |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
296 | aim_conn_kill(sess, &cur->conn); |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
297 | return 0; /* bail out */ |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
298 | } |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
299 | |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
300 | if ((cur->hdrtype == AIM_FRAMETYPE_OFT) && cur->commandlen) { |
|
889
070eb1c6db95
[gaim-migrate @ 899]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
840
diff
changeset
|
301 | if (send(cur->conn->fd, cur->data, cur->commandlen, 0) != (int)cur->commandlen) { |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
302 | /* |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
303 | * Theres nothing we can do about this since we've already sent the |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
304 | * header! The connection is unstable. |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
305 | */ |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
306 | } |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
307 | } |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
308 | |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
309 | cur->sent = 1; /* mark the struct as sent */ |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
310 | cur->conn->lastactivity = time(NULL); |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
311 | |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
312 | faim_mutex_unlock(&cur->conn->active); |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
313 | |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
314 | #if debug > 2 |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
315 | faimdprintf(2, "\nPacket:"); |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
316 | for (i = 0; i < (cur->commandlen + 6); i++) { |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
317 | if ((i % 8) == 0) { |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
318 | faimdprintf(2, "\n\t"); |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
319 | } |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
320 | if (curPacket[i] >= ' ' && curPacket[i]<127) { |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
321 | faimdprintf(2, "%c=%02x ", curPacket[i], curPacket[i]); |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
322 | } else { |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
323 | faimdprintf(2, "0x%2x ", curPacket[i]); |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
324 | } |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
325 | } |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
326 | faimdprintf(2, "\n"); |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
327 | #endif |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
328 | cur->lock = 0; /* unlock the struct */ |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
329 | free(curPacket); /* free up full-packet buffer */ |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
330 | |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
331 | return 1; /* success */ |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
332 | } |
|
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
333 | |
|
840
b80a628d935f
[gaim-migrate @ 850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
445
diff
changeset
|
334 | faim_export int aim_tx_flushqueue(struct aim_session_t *sess) |
| 2 | 335 | { |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
336 | struct command_tx_struct *cur; |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
337 | |
| 2 | 338 | #if debug > 1 |
| 339 | int i = 0; | |
| 340 | #endif | |
| 341 | ||
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
342 | if (sess->queue_outgoing == NULL) |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
343 | return 0; |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
344 | |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
345 | faimdprintf(2, "beginning txflush...\n"); |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
346 | for (cur = sess->queue_outgoing; cur; cur = cur->next) { |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
347 | /* only process if its unlocked and unsent */ |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
348 | if (!cur->lock && !cur->sent) { |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
349 | |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
350 | /* |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
351 | * And now for the meager attempt to force transmit |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
352 | * latency and avoid missed messages. |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
353 | */ |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
354 | if ((cur->conn->lastactivity + cur->conn->forcedlatency) >= time(NULL)) { |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
355 | /* FIXME FIXME -- should be a break! we dont want to block the upper layers */ |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
356 | sleep((cur->conn->lastactivity + cur->conn->forcedlatency) - time(NULL)); |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
357 | } |
| 2 | 358 | |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
359 | if (aim_tx_sendframe(sess, cur) == -1) |
|
279
7d5f28322c6a
[gaim-migrate @ 289]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
270
diff
changeset
|
360 | break; |
| 2 | 361 | } |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
362 | } |
| 2 | 363 | |
| 364 | /* purge sent commands from queue */ | |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
365 | aim_tx_purgequeue(sess); |
| 2 | 366 | |
| 367 | return 0; | |
| 368 | } | |
| 369 | ||
| 370 | /* | |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
371 | * aim_tx_purgequeue() |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
372 | * |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
373 | * This is responsable for removing sent commands from the transmit |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
374 | * queue. This is not a required operation, but it of course helps |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
375 | * reduce memory footprint at run time! |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
376 | * |
| 2 | 377 | */ |
|
840
b80a628d935f
[gaim-migrate @ 850]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
445
diff
changeset
|
378 | faim_export void aim_tx_purgequeue(struct aim_session_t *sess) |
| 2 | 379 | { |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
380 | struct command_tx_struct *cur = NULL; |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
381 | struct command_tx_struct *tmp; |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
382 | |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
383 | if (sess->queue_outgoing == NULL) |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
384 | return; |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
385 | |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
386 | if (sess->queue_outgoing->next == NULL) { |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
387 | if (!sess->queue_outgoing->lock && sess->queue_outgoing->sent) { |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
388 | tmp = sess->queue_outgoing; |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
389 | sess->queue_outgoing = NULL; |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
390 | if (tmp->hdrtype == AIM_FRAMETYPE_OFT) |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
391 | free(tmp->hdr.oft.hdr2); |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
392 | free(tmp->data); |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
393 | free(tmp); |
| 2 | 394 | } |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
395 | return; |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
396 | } |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
397 | |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
398 | for(cur = sess->queue_outgoing; cur->next != NULL; ) { |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
399 | if (!cur->next->lock && cur->next->sent) { |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
400 | tmp = cur->next; |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
401 | cur->next = tmp->next; |
|
445
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
402 | if (tmp->hdrtype == AIM_FRAMETYPE_OFT) |
|
f7ef3b61a842
[gaim-migrate @ 455]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
283
diff
changeset
|
403 | free(tmp->hdr.oft.hdr2); |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
404 | free(tmp->data); |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
405 | free(tmp); |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
406 | } |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
407 | cur = cur->next; |
| 2 | 408 | |
|
237
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
409 | /* |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
410 | * Be careful here. Because of the way we just |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
411 | * manipulated the pointer, cur may be NULL and |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
412 | * the for() will segfault doing the check unless |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
413 | * we find this case first. |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
414 | */ |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
415 | if (cur == NULL) |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
416 | break; |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
417 | } |
|
83ff5f92ee7e
[gaim-migrate @ 247]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2
diff
changeset
|
418 | return; |
| 2 | 419 | } |