Sun, 15 Apr 2007 02:10:37 +0000
propagate from branch 'im.pidgin.gaim' (head b2836a24d81e7a1bd1d21b3aea8794b094391344)
to branch 'im.pidgin.rlaager.merging.soc-msnp13-to-svn18164' (head 463b4fa9f067b279f843520d95a822adc86a0a1b)
| 10392 | 1 | /* |
| 2 | * gaim | |
| 3 | * | |
| 4 | * Gaim is the legal property of its developers, whose names are too numerous | |
| 5 | * to list here. Please refer to the COPYRIGHT file distributed with this | |
| 6 | * source distribution. | |
| 7 | * | |
| 8 | * This program is free software; you can redistribute it and/or modify | |
| 9 | * it under the terms of the GNU General Public License as published by | |
| 10 | * the Free Software Foundation; either version 2 of the License, or | |
| 11 | * (at your option) any later version. | |
| 12 | * | |
| 13 | * This program is distributed in the hope that it will be useful, | |
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 16 | * GNU General Public License for more details. | |
| 17 | * | |
| 18 | * You should have received a copy of the GNU General Public License | |
| 19 | * along with this program; if not, write to the Free Software | |
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 21 | * | |
| 22 | */ | |
| 23 | ||
| 24 | #include "internal.h" | |
| 25 | #include "debug.h" | |
| 26 | ||
| 27 | #include "yahoo.h" | |
| 28 | #include "yahoo_packet.h" | |
| 29 | ||
| 30 | struct yahoo_packet *yahoo_packet_new(enum yahoo_service service, enum yahoo_status status, int id) | |
| 31 | { | |
| 32 | struct yahoo_packet *pkt = g_new0(struct yahoo_packet, 1); | |
| 33 | ||
| 34 | pkt->service = service; | |
| 35 | pkt->status = status; | |
| 36 | pkt->id = id; | |
| 37 | ||
| 38 | return pkt; | |
| 39 | } | |
| 40 | ||
| 10394 | 41 | void yahoo_packet_hash_str(struct yahoo_packet *pkt, int key, const char *value) |
| 10392 | 42 | { |
|
14204
6ee6b82a7c49
[gaim-migrate @ 16784]
Mark Doliner <markdoliner@pidgin.im>
parents:
14095
diff
changeset
|
43 | struct yahoo_pair *pair; |
|
6ee6b82a7c49
[gaim-migrate @ 16784]
Mark Doliner <markdoliner@pidgin.im>
parents:
14095
diff
changeset
|
44 | |
|
6ee6b82a7c49
[gaim-migrate @ 16784]
Mark Doliner <markdoliner@pidgin.im>
parents:
14095
diff
changeset
|
45 | g_return_if_fail(value != NULL); |
|
6ee6b82a7c49
[gaim-migrate @ 16784]
Mark Doliner <markdoliner@pidgin.im>
parents:
14095
diff
changeset
|
46 | |
|
6ee6b82a7c49
[gaim-migrate @ 16784]
Mark Doliner <markdoliner@pidgin.im>
parents:
14095
diff
changeset
|
47 | pair = g_new0(struct yahoo_pair, 1); |
| 10392 | 48 | pair->key = key; |
| 49 | pair->value = g_strdup(value); | |
|
14095
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
50 | pkt->hash = g_slist_prepend(pkt->hash, pair); |
| 10392 | 51 | } |
| 52 | ||
| 10394 | 53 | void yahoo_packet_hash_int(struct yahoo_packet *pkt, int key, int value) |
| 54 | { | |
|
14204
6ee6b82a7c49
[gaim-migrate @ 16784]
Mark Doliner <markdoliner@pidgin.im>
parents:
14095
diff
changeset
|
55 | struct yahoo_pair *pair; |
| 10394 | 56 | |
|
14204
6ee6b82a7c49
[gaim-migrate @ 16784]
Mark Doliner <markdoliner@pidgin.im>
parents:
14095
diff
changeset
|
57 | pair = g_new0(struct yahoo_pair, 1); |
| 10394 | 58 | pair->key = key; |
| 59 | pair->value = g_strdup_printf("%d", value); | |
|
14095
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
60 | pkt->hash = g_slist_prepend(pkt->hash, pair); |
| 10394 | 61 | } |
| 62 | ||
| 63 | void yahoo_packet_hash(struct yahoo_packet *pkt, const char *fmt, ...) | |
| 64 | { | |
| 65 | char *strval; | |
| 66 | int key, intval; | |
| 67 | const char *cur; | |
| 68 | va_list ap; | |
| 69 | ||
| 70 | va_start(ap, fmt); | |
| 71 | for (cur = fmt; *cur; cur++) { | |
| 72 | key = va_arg(ap, int); | |
| 73 | switch (*cur) { | |
| 74 | case 'i': | |
| 75 | intval = va_arg(ap, int); | |
| 76 | yahoo_packet_hash_int(pkt, key, intval); | |
| 77 | break; | |
| 78 | case 's': | |
| 79 | strval = va_arg(ap, char *); | |
| 80 | yahoo_packet_hash_str(pkt, key, strval); | |
| 81 | break; | |
| 82 | default: | |
| 83 | gaim_debug_error("yahoo", "Invalid format character '%c'\n", *cur); | |
| 84 | break; | |
| 85 | } | |
| 86 | } | |
| 87 | va_end(ap); | |
| 88 | } | |
| 89 | ||
|
13277
c8a85dd74704
[gaim-migrate @ 15642]
Richard Laager <rlaager@pidgin.im>
parents:
13276
diff
changeset
|
90 | size_t yahoo_packet_length(struct yahoo_packet *pkt) |
| 10392 | 91 | { |
| 92 | GSList *l; | |
| 93 | ||
|
13277
c8a85dd74704
[gaim-migrate @ 15642]
Richard Laager <rlaager@pidgin.im>
parents:
13276
diff
changeset
|
94 | size_t len = 0; |
| 10392 | 95 | |
| 96 | l = pkt->hash; | |
| 97 | while (l) { | |
| 98 | struct yahoo_pair *pair = l->data; | |
| 99 | int tmp = pair->key; | |
| 100 | do { | |
| 101 | tmp /= 10; | |
| 102 | len++; | |
| 103 | } while (tmp); | |
| 104 | len += 2; | |
| 105 | len += strlen(pair->value); | |
| 106 | len += 2; | |
| 107 | l = l->next; | |
| 108 | } | |
| 109 | ||
| 110 | return len; | |
| 111 | } | |
| 112 | ||
|
14095
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
113 | void yahoo_packet_read(struct yahoo_packet *pkt, const guchar *data, int len) |
| 10392 | 114 | { |
| 115 | int pos = 0; | |
|
14322
662704dffc4d
[gaim-migrate @ 16942]
Mark Doliner <markdoliner@pidgin.im>
parents:
14321
diff
changeset
|
116 | char key[64]; |
|
662704dffc4d
[gaim-migrate @ 16942]
Mark Doliner <markdoliner@pidgin.im>
parents:
14321
diff
changeset
|
117 | const guchar *delimiter; |
|
14095
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
118 | gboolean accept; |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
119 | int x; |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
120 | struct yahoo_pair *pair; |
| 10392 | 121 | |
|
14095
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
122 | while (pos + 1 < len) |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
123 | { |
|
13829
ac73840b2117
[gaim-migrate @ 16271]
Mark Doliner <markdoliner@pidgin.im>
parents:
13277
diff
changeset
|
124 | /* this is weird, and in one of the chat packets, and causes us to |
| 10392 | 125 | * think all the values are keys and all the keys are values after |
| 126 | * this point if we don't handle it */ | |
| 127 | if (data[pos] == '\0') { | |
| 128 | while (pos + 1 < len) { | |
| 129 | if (data[pos] == 0xc0 && data[pos + 1] == 0x80) | |
| 130 | break; | |
| 131 | pos++; | |
| 132 | } | |
| 133 | pos += 2; | |
| 134 | continue; | |
| 135 | } | |
| 136 | ||
|
14095
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
137 | pair = g_new0(struct yahoo_pair, 1); |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
138 | |
| 10392 | 139 | x = 0; |
| 140 | while (pos + 1 < len) { | |
| 141 | if (data[pos] == 0xc0 && data[pos + 1] == 0x80) | |
| 142 | break; | |
| 143 | if (x >= sizeof(key)-1) { | |
| 144 | x++; | |
| 145 | pos++; | |
| 146 | continue; | |
| 147 | } | |
| 148 | key[x++] = data[pos++]; | |
| 149 | } | |
| 150 | if (x >= sizeof(key)-1) { | |
| 151 | x = 0; | |
| 152 | } | |
| 153 | key[x] = 0; | |
| 154 | pos += 2; | |
| 155 | pair->key = strtol(key, NULL, 10); | |
| 156 | accept = x; /* if x is 0 there was no key, so don't accept it */ | |
| 157 | ||
|
15283
efefd3bf8b81
[gaim-migrate @ 18011]
Mark Doliner <markdoliner@pidgin.im>
parents:
15276
diff
changeset
|
158 | if (pos + 1 > len) { |
|
efefd3bf8b81
[gaim-migrate @ 18011]
Mark Doliner <markdoliner@pidgin.im>
parents:
15276
diff
changeset
|
159 | /* Malformed packet! (Truncated--garbage or something) */ |
|
14095
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
160 | accept = FALSE; |
| 10392 | 161 | } |
| 162 | ||
| 163 | if (accept) { | |
|
14322
662704dffc4d
[gaim-migrate @ 16942]
Mark Doliner <markdoliner@pidgin.im>
parents:
14321
diff
changeset
|
164 | delimiter = (const guchar *)strstr((char *)&data[pos], "\xc0\x80"); |
|
14095
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
165 | if (delimiter == NULL) |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
166 | { |
|
15283
efefd3bf8b81
[gaim-migrate @ 18011]
Mark Doliner <markdoliner@pidgin.im>
parents:
15276
diff
changeset
|
167 | /* Malformed packet! (It doesn't end in 0xc0 0x80) */ |
|
14095
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
168 | g_free(pair); |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
169 | pos = len; |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
170 | continue; |
| 10392 | 171 | } |
|
14322
662704dffc4d
[gaim-migrate @ 16942]
Mark Doliner <markdoliner@pidgin.im>
parents:
14321
diff
changeset
|
172 | x = delimiter - data; |
|
14095
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
173 | pair->value = g_strndup((const gchar *)&data[pos], x - pos); |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
174 | pos = x; |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
175 | pkt->hash = g_slist_prepend(pkt->hash, pair); |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
176 | |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
177 | #ifdef DEBUG |
| 14321 | 178 | { |
| 179 | char *esc; | |
| 180 | esc = g_strescape(pair->value, NULL); | |
| 181 | gaim_debug(GAIM_DEBUG_MISC, "yahoo", | |
| 182 | "Key: %d \tValue: %s\n", pair->key, esc); | |
| 183 | g_free(esc); | |
| 184 | } | |
|
14095
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
185 | #endif |
| 10392 | 186 | } else { |
| 187 | g_free(pair); | |
| 188 | } | |
| 189 | pos += 2; | |
| 190 | ||
| 191 | /* Skip over garbage we've noticed in the mail notifications */ | |
| 192 | if (data[0] == '9' && data[pos] == 0x01) | |
| 193 | pos++; | |
| 194 | } | |
|
14095
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
195 | |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
196 | /* |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
197 | * Originally this function used g_slist_append(). I changed |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
198 | * it to use g_slist_prepend() for improved performance. |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
199 | * Ideally the Yahoo! PRPL code would be indifferent to the |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
200 | * order of the key/value pairs, but I don't know if this is |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
201 | * the case for all incoming messages. To be on the safe side |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
202 | * we reverse the list. |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
203 | */ |
|
125eacb85b5f
[gaim-migrate @ 16635]
Mark Doliner <markdoliner@pidgin.im>
parents:
13829
diff
changeset
|
204 | pkt->hash = g_slist_reverse(pkt->hash); |
| 10392 | 205 | } |
| 206 | ||
| 207 | void yahoo_packet_write(struct yahoo_packet *pkt, guchar *data) | |
| 208 | { | |
| 209 | GSList *l = pkt->hash; | |
| 210 | int pos = 0; | |
| 211 | ||
| 212 | while (l) { | |
| 213 | struct yahoo_pair *pair = l->data; | |
|
11161
f9272f277000
[gaim-migrate @ 13249]
Mark Doliner <markdoliner@pidgin.im>
parents:
10394
diff
changeset
|
214 | gchar buf[100]; |
| 10392 | 215 | |
| 216 | g_snprintf(buf, sizeof(buf), "%d", pair->key); | |
|
11161
f9272f277000
[gaim-migrate @ 13249]
Mark Doliner <markdoliner@pidgin.im>
parents:
10394
diff
changeset
|
217 | strcpy((char *)&data[pos], buf); |
| 10392 | 218 | pos += strlen(buf); |
| 219 | data[pos++] = 0xc0; | |
| 220 | data[pos++] = 0x80; | |
| 221 | ||
|
11161
f9272f277000
[gaim-migrate @ 13249]
Mark Doliner <markdoliner@pidgin.im>
parents:
10394
diff
changeset
|
222 | strcpy((char *)&data[pos], pair->value); |
| 10392 | 223 | pos += strlen(pair->value); |
| 224 | data[pos++] = 0xc0; | |
| 225 | data[pos++] = 0x80; | |
| 226 | ||
| 227 | l = l->next; | |
| 228 | } | |
| 229 | } | |
| 230 | ||
| 231 | void yahoo_packet_dump(guchar *data, int len) | |
| 232 | { | |
| 233 | #ifdef YAHOO_DEBUG | |
| 234 | int i; | |
| 235 | ||
| 236 | gaim_debug(GAIM_DEBUG_MISC, "yahoo", ""); | |
| 237 | ||
| 238 | for (i = 0; i + 1 < len; i += 2) { | |
| 239 | if ((i % 16 == 0) && i) { | |
| 240 | gaim_debug(GAIM_DEBUG_MISC, NULL, "\n"); | |
| 241 | gaim_debug(GAIM_DEBUG_MISC, "yahoo", ""); | |
| 242 | } | |
| 243 | ||
| 244 | gaim_debug(GAIM_DEBUG_MISC, NULL, "%02x%02x ", data[i], data[i + 1]); | |
| 245 | } | |
| 246 | if (i < len) | |
| 247 | gaim_debug(GAIM_DEBUG_MISC, NULL, "%02x", data[i]); | |
| 248 | ||
| 249 | gaim_debug(GAIM_DEBUG_MISC, NULL, "\n"); | |
| 250 | gaim_debug(GAIM_DEBUG_MISC, "yahoo", ""); | |
| 251 | ||
| 252 | for (i = 0; i < len; i++) { | |
| 253 | if ((i % 16 == 0) && i) { | |
| 254 | gaim_debug(GAIM_DEBUG_MISC, NULL, "\n"); | |
| 255 | gaim_debug(GAIM_DEBUG_MISC, "yahoo", ""); | |
| 256 | } | |
| 257 | ||
| 258 | if (g_ascii_isprint(data[i])) | |
| 259 | gaim_debug(GAIM_DEBUG_MISC, NULL, "%c ", data[i]); | |
| 260 | else | |
| 261 | gaim_debug(GAIM_DEBUG_MISC, NULL, ". "); | |
| 262 | } | |
| 263 | ||
| 264 | gaim_debug(GAIM_DEBUG_MISC, NULL, "\n"); | |
| 265 | #endif | |
| 266 | } | |
| 267 | ||
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
268 | static void |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
269 | yahoo_packet_send_can_write(gpointer data, gint source, GaimInputCondition cond) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
270 | { |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
271 | struct yahoo_data *yd = data; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
272 | int ret, writelen; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
273 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
274 | writelen = gaim_circ_buffer_get_max_read(yd->txbuf); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
275 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
276 | if (writelen == 0) { |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
277 | gaim_input_remove(yd->txhandler); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
278 | yd->txhandler = -1; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
279 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
280 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
281 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
282 | ret = write(yd->fd, yd->txbuf->outptr, writelen); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
283 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
284 | if (ret < 0 && errno == EAGAIN) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
285 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
286 | else if (ret < 0) { |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
287 | /* TODO: what to do here - do we really have to disconnect? */ |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
288 | gaim_connection_error(yd->gc, _("Write Error")); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
289 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
290 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
291 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
292 | gaim_circ_buffer_mark_read(yd->txbuf, ret); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
293 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
294 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
295 | |
|
13277
c8a85dd74704
[gaim-migrate @ 15642]
Richard Laager <rlaager@pidgin.im>
parents:
13276
diff
changeset
|
296 | size_t yahoo_packet_build(struct yahoo_packet *pkt, int pad, gboolean wm, |
|
14508
02d80a119d80
[gaim-migrate @ 17160]
Evan Schoenberg <evands@pidgin.im>
parents:
14322
diff
changeset
|
297 | gboolean jp, guchar **buf) |
| 10392 | 298 | { |
|
13277
c8a85dd74704
[gaim-migrate @ 15642]
Richard Laager <rlaager@pidgin.im>
parents:
13276
diff
changeset
|
299 | size_t pktlen = yahoo_packet_length(pkt); |
|
c8a85dd74704
[gaim-migrate @ 15642]
Richard Laager <rlaager@pidgin.im>
parents:
13276
diff
changeset
|
300 | size_t len = YAHOO_PACKET_HDRLEN + pktlen; |
| 10392 | 301 | guchar *data; |
| 302 | int pos = 0; | |
| 303 | ||
| 304 | data = g_malloc0(len + 1); | |
| 305 | ||
| 306 | memcpy(data + pos, "YMSG", 4); pos += 4; | |
| 307 | ||
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
308 | if (wm) |
| 10392 | 309 | pos += yahoo_put16(data + pos, YAHOO_WEBMESSENGER_PROTO_VER); |
|
14508
02d80a119d80
[gaim-migrate @ 17160]
Evan Schoenberg <evands@pidgin.im>
parents:
14322
diff
changeset
|
310 | else if (jp) |
|
02d80a119d80
[gaim-migrate @ 17160]
Evan Schoenberg <evands@pidgin.im>
parents:
14322
diff
changeset
|
311 | pos += yahoo_put16(data + pos, YAHOO_PROTO_VER_JAPAN); |
| 10392 | 312 | else |
| 313 | pos += yahoo_put16(data + pos, YAHOO_PROTO_VER); | |
| 314 | pos += yahoo_put16(data + pos, 0x0000); | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
315 | pos += yahoo_put16(data + pos, pktlen + pad); |
| 10392 | 316 | pos += yahoo_put16(data + pos, pkt->service); |
| 317 | pos += yahoo_put32(data + pos, pkt->status); | |
| 318 | pos += yahoo_put32(data + pos, pkt->id); | |
| 319 | ||
| 320 | yahoo_packet_write(pkt, data + pos); | |
| 321 | ||
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
322 | *buf = data; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
323 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
324 | return len; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
325 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
326 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
327 | int yahoo_packet_send(struct yahoo_packet *pkt, struct yahoo_data *yd) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
328 | { |
|
13277
c8a85dd74704
[gaim-migrate @ 15642]
Richard Laager <rlaager@pidgin.im>
parents:
13276
diff
changeset
|
329 | size_t len; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
330 | int ret; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
331 | guchar *data; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
332 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
333 | if (yd->fd < 0) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
334 | return -1; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
335 | |
|
14508
02d80a119d80
[gaim-migrate @ 17160]
Evan Schoenberg <evands@pidgin.im>
parents:
14322
diff
changeset
|
336 | len = yahoo_packet_build(pkt, 0, yd->wm, yd->jp, &data); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
337 | |
| 10392 | 338 | yahoo_packet_dump(data, len); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
339 | if (yd->txhandler == -1) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
340 | ret = write(yd->fd, data, len); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
341 | else { |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
342 | ret = -1; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
343 | errno = EAGAIN; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
344 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
345 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
346 | if (ret < 0 && errno == EAGAIN) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
347 | ret = 0; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
348 | else if (ret <= 0) { |
| 10392 | 349 | gaim_debug_warning("yahoo", "Only wrote %d of %d bytes!", ret, len); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
350 | g_free(data); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
351 | return ret; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
352 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
353 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
354 | if (ret < len) { |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
355 | if (yd->txhandler == -1) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
356 | yd->txhandler = gaim_input_add(yd->fd, GAIM_INPUT_WRITE, |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
357 | yahoo_packet_send_can_write, yd); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
358 | gaim_circ_buffer_append(yd->txbuf, data + ret, len - ret); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
359 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
11644
diff
changeset
|
360 | |
| 10392 | 361 | g_free(data); |
| 362 | ||
| 363 | return ret; | |
| 364 | } | |
| 365 | ||
| 366 | int yahoo_packet_send_and_free(struct yahoo_packet *pkt, struct yahoo_data *yd) | |
| 367 | { | |
| 368 | int ret; | |
|
11644
939411169d01
[gaim-migrate @ 13922]
Peter Lawler <pidgin@bleeter.id.au>
parents:
11161
diff
changeset
|
369 | |
| 10392 | 370 | ret = yahoo_packet_send(pkt, yd); |
| 371 | yahoo_packet_free(pkt); | |
| 372 | return ret; | |
| 373 | } | |
| 374 | ||
| 375 | void yahoo_packet_free(struct yahoo_packet *pkt) | |
| 376 | { | |
| 377 | while (pkt->hash) { | |
| 378 | struct yahoo_pair *pair = pkt->hash->data; | |
| 379 | g_free(pair->value); | |
| 380 | g_free(pair); | |
| 381 | pkt->hash = g_slist_remove(pkt->hash, pair); | |
| 382 | } | |
| 383 | g_free(pkt); | |
| 384 | } |