Fri, 23 Dec 2005 19:26:04 +0000
[gaim-migrate @ 14983]
SF Patch #1314512 from Sadrul (who has a patch for everything)
"This patch introduces a flag for protocol plugins that
support offline messages (like Y!M and ICQ). This was
encouraged by the following conversation:
<sadrul> should offline buddies be listed/enabled in
the send-to menu?
<rekkanoryo> i would think only for protocols that
support offline messaging, if it's indicated that the
buddy is offline
-- <snip> --
<Bleeter> sadrul: personally, I'd like to see a
'supports offline' flag of some description
<Bleeter> one could then redirect (via plugins) through
email or alternative methods
<Bleeter> just a thought
<Paco-Paco> yeah, that sounds like a reasonble thing to have
This patch uses this flag to disable the buddies in the
send-to menu who are offline and the protocol doesn't
support offline messages."
I made this make the label insensitive instead of the whole menuitem. This
should address SimGuy's concerns about inconsistency (i.e. you could create a
conversation with someone via the buddy list that you couldn't create via the
Send To menu). I also hacked up some voodoo to show the label as sensitive when
moused-over, as that looks better (given the label-insensitive thing is itself a
hack). I think this works quite well.
BUG NOTE:
This makes more obvious an existing bug. The Send To menu isn't updated when
buddies sign on or off or change status (at least under some circumstances).
We need to fix that anyway, so I'm not going to let it hold up this commit.
Switching tabs will clear it up. I'm thinking we just might want to build the
contents of that menu when it is selected. That would save us a mess of
inefficient signal callbacks that update the Send To menus in open windows all
the time.
AIM NOTE:
This assumes that AIM can't offline message. That's not strictly true. You can
message invisible users on AIM. However, by design, we can't tell when a user
is invisible without resorting to dirty hackery. In practice, this isn't a
problem, as you can still select the AIM user from the menu. And really, how
often will you be choosing the Invisible contact, rather than the user going
Invisible in the middle of a conversation or IMing you while they're Invisible?
JABBER NOTE:
This assumes that Jabber can always offline message. This isn't strictly true.
Sadrul said:
I have updated Jabber according to this link which seems to
talk about how to determine the existence offline-message
support in a server:
http://www.jabber.org/jeps/jep-0013.html#discover
However, jabber.org doesn't seem to send the required
info. So I am not sure about it.
He later said:
I talked to Nathan and he said offline message support is
mostly assumed for most jabber servers. GTalk doesn't yet
support it, but they are working on it. So I have made
jabber to always return TRUE.
If there is truly no way to detect offline messaging capability, then this is
an acceptable solution. We could special case Google Talk because of its
popularity, and remove that later. It's probably not worth it though.
MSN NOTE:
This assumes that MSN can never offline message. That's effectively true, but
to be technically correct, MSN can offline message if there's already a
switchboard conversation open with a user. We could write an offline_message
function in the MSN prpl to detect that, but it'd be of limited usefulness,
especially given that under most circumstances (where this might matter), the
switchboard connection will be closed almost immediately.
CVS NOTE:
I'm writing to share a tragic little story.
I have a PC that I use for Gaim development. One day, I was writing a commit
message on it, when all of a suddent it went berserk. The screen started
flashing, and the whole commit message just disappeared. All of it. And it was
a good commit message! I had to cram and rewrite it really quickly. Needless to
say, my rushed commit message wasn't nearly as good, and I blame the PC for that.
Seriously, though, what kind of version control system loses your commit
message on a broken connection to the server? Stupid!
committer: Richard Laager <rlaager@pidgin.im>
| 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 | { |
| 43 | struct yahoo_pair *pair = g_new0(struct yahoo_pair, 1); | |
| 44 | pair->key = key; | |
| 45 | pair->value = g_strdup(value); | |
| 46 | pkt->hash = g_slist_append(pkt->hash, pair); | |
| 47 | } | |
| 48 | ||
| 10394 | 49 | void yahoo_packet_hash_int(struct yahoo_packet *pkt, int key, int value) |
| 50 | { | |
| 51 | struct yahoo_pair *pair = g_new0(struct yahoo_pair, 1); | |
| 52 | ||
| 53 | pair->key = key; | |
| 54 | pair->value = g_strdup_printf("%d", value); | |
| 55 | pkt->hash = g_slist_append(pkt->hash, pair); | |
| 56 | } | |
| 57 | ||
| 58 | void yahoo_packet_hash(struct yahoo_packet *pkt, const char *fmt, ...) | |
| 59 | { | |
| 60 | char *strval; | |
| 61 | int key, intval; | |
| 62 | const char *cur; | |
| 63 | va_list ap; | |
| 64 | ||
| 65 | va_start(ap, fmt); | |
| 66 | for (cur = fmt; *cur; cur++) { | |
| 67 | key = va_arg(ap, int); | |
| 68 | switch (*cur) { | |
| 69 | case 'i': | |
| 70 | intval = va_arg(ap, int); | |
| 71 | yahoo_packet_hash_int(pkt, key, intval); | |
| 72 | break; | |
| 73 | case 's': | |
| 74 | strval = va_arg(ap, char *); | |
| 75 | yahoo_packet_hash_str(pkt, key, strval); | |
| 76 | break; | |
| 77 | default: | |
| 78 | gaim_debug_error("yahoo", "Invalid format character '%c'\n", *cur); | |
| 79 | break; | |
| 80 | } | |
| 81 | } | |
| 82 | va_end(ap); | |
| 83 | } | |
| 84 | ||
| 10392 | 85 | int yahoo_packet_length(struct yahoo_packet *pkt) |
| 86 | { | |
| 87 | GSList *l; | |
| 88 | ||
| 89 | int len = 0; | |
| 90 | ||
| 91 | l = pkt->hash; | |
| 92 | while (l) { | |
| 93 | struct yahoo_pair *pair = l->data; | |
| 94 | int tmp = pair->key; | |
| 95 | do { | |
| 96 | tmp /= 10; | |
| 97 | len++; | |
| 98 | } while (tmp); | |
| 99 | len += 2; | |
| 100 | len += strlen(pair->value); | |
| 101 | len += 2; | |
| 102 | l = l->next; | |
| 103 | } | |
| 104 | ||
| 105 | return len; | |
| 106 | } | |
| 107 | ||
| 108 | void yahoo_packet_read(struct yahoo_packet *pkt, guchar *data, int len) | |
| 109 | { | |
| 110 | int pos = 0; | |
| 111 | ||
| 112 | while (pos + 1 < len) { | |
| 113 | char key[64], *value = NULL, *esc; | |
| 114 | int accept; | |
| 115 | int x; | |
| 116 | ||
| 117 | struct yahoo_pair *pair = g_new0(struct yahoo_pair, 1); | |
| 118 | ||
| 119 | /* this is weird, and in one of the chat packets, and causes us | |
| 120 | * think all the values are keys and all the keys are values after | |
| 121 | * this point if we don't handle it */ | |
| 122 | if (data[pos] == '\0') { | |
| 123 | while (pos + 1 < len) { | |
| 124 | if (data[pos] == 0xc0 && data[pos + 1] == 0x80) | |
| 125 | break; | |
| 126 | pos++; | |
| 127 | } | |
| 128 | pos += 2; | |
| 129 | g_free(pair); | |
| 130 | continue; | |
| 131 | } | |
| 132 | ||
| 133 | x = 0; | |
| 134 | while (pos + 1 < len) { | |
| 135 | if (data[pos] == 0xc0 && data[pos + 1] == 0x80) | |
| 136 | break; | |
| 137 | if (x >= sizeof(key)-1) { | |
| 138 | x++; | |
| 139 | pos++; | |
| 140 | continue; | |
| 141 | } | |
| 142 | key[x++] = data[pos++]; | |
| 143 | } | |
| 144 | if (x >= sizeof(key)-1) { | |
| 145 | x = 0; | |
| 146 | } | |
| 147 | key[x] = 0; | |
| 148 | pos += 2; | |
| 149 | pair->key = strtol(key, NULL, 10); | |
| 150 | accept = x; /* if x is 0 there was no key, so don't accept it */ | |
| 151 | ||
| 152 | if (len - pos + 1 <= 0) { | |
| 153 | /* Truncated. Garbage or something. */ | |
| 154 | accept = 0; | |
| 155 | } | |
| 156 | ||
| 157 | if (accept) { | |
| 158 | value = g_malloc(len - pos + 1); | |
| 159 | x = 0; | |
| 160 | while (pos + 1 < len) { | |
| 161 | if (data[pos] == 0xc0 && data[pos + 1] == 0x80) | |
| 162 | break; | |
| 163 | value[x++] = data[pos++]; | |
| 164 | } | |
| 165 | value[x] = 0; | |
| 166 | pair->value = g_strdup(value); | |
| 167 | g_free(value); | |
| 168 | pkt->hash = g_slist_append(pkt->hash, pair); | |
| 169 | esc = g_strescape(pair->value, NULL); | |
| 170 | gaim_debug(GAIM_DEBUG_MISC, "yahoo", | |
| 171 | "Key: %d \tValue: %s\n", pair->key, esc); | |
| 172 | g_free(esc); | |
| 173 | } else { | |
| 174 | g_free(pair); | |
| 175 | } | |
| 176 | pos += 2; | |
| 177 | ||
| 178 | /* Skip over garbage we've noticed in the mail notifications */ | |
| 179 | if (data[0] == '9' && data[pos] == 0x01) | |
| 180 | pos++; | |
| 181 | } | |
| 182 | } | |
| 183 | ||
| 184 | void yahoo_packet_write(struct yahoo_packet *pkt, guchar *data) | |
| 185 | { | |
| 186 | GSList *l = pkt->hash; | |
| 187 | int pos = 0; | |
| 188 | ||
| 189 | while (l) { | |
| 190 | struct yahoo_pair *pair = l->data; | |
|
11161
f9272f277000
[gaim-migrate @ 13249]
Mark Doliner <markdoliner@pidgin.im>
parents:
10394
diff
changeset
|
191 | gchar buf[100]; |
| 10392 | 192 | |
| 193 | g_snprintf(buf, sizeof(buf), "%d", pair->key); | |
|
11161
f9272f277000
[gaim-migrate @ 13249]
Mark Doliner <markdoliner@pidgin.im>
parents:
10394
diff
changeset
|
194 | strcpy((char *)&data[pos], buf); |
| 10392 | 195 | pos += strlen(buf); |
| 196 | data[pos++] = 0xc0; | |
| 197 | data[pos++] = 0x80; | |
| 198 | ||
|
11161
f9272f277000
[gaim-migrate @ 13249]
Mark Doliner <markdoliner@pidgin.im>
parents:
10394
diff
changeset
|
199 | strcpy((char *)&data[pos], pair->value); |
| 10392 | 200 | pos += strlen(pair->value); |
| 201 | data[pos++] = 0xc0; | |
| 202 | data[pos++] = 0x80; | |
| 203 | ||
| 204 | l = l->next; | |
| 205 | } | |
| 206 | } | |
| 207 | ||
| 208 | void yahoo_packet_dump(guchar *data, int len) | |
| 209 | { | |
| 210 | #ifdef YAHOO_DEBUG | |
| 211 | int i; | |
| 212 | ||
| 213 | gaim_debug(GAIM_DEBUG_MISC, "yahoo", ""); | |
| 214 | ||
| 215 | for (i = 0; i + 1 < len; i += 2) { | |
| 216 | if ((i % 16 == 0) && i) { | |
| 217 | gaim_debug(GAIM_DEBUG_MISC, NULL, "\n"); | |
| 218 | gaim_debug(GAIM_DEBUG_MISC, "yahoo", ""); | |
| 219 | } | |
| 220 | ||
| 221 | gaim_debug(GAIM_DEBUG_MISC, NULL, "%02x%02x ", data[i], data[i + 1]); | |
| 222 | } | |
| 223 | if (i < len) | |
| 224 | gaim_debug(GAIM_DEBUG_MISC, NULL, "%02x", data[i]); | |
| 225 | ||
| 226 | gaim_debug(GAIM_DEBUG_MISC, NULL, "\n"); | |
| 227 | gaim_debug(GAIM_DEBUG_MISC, "yahoo", ""); | |
| 228 | ||
| 229 | for (i = 0; i < len; i++) { | |
| 230 | if ((i % 16 == 0) && i) { | |
| 231 | gaim_debug(GAIM_DEBUG_MISC, NULL, "\n"); | |
| 232 | gaim_debug(GAIM_DEBUG_MISC, "yahoo", ""); | |
| 233 | } | |
| 234 | ||
| 235 | if (g_ascii_isprint(data[i])) | |
| 236 | gaim_debug(GAIM_DEBUG_MISC, NULL, "%c ", data[i]); | |
| 237 | else | |
| 238 | gaim_debug(GAIM_DEBUG_MISC, NULL, ". "); | |
| 239 | } | |
| 240 | ||
| 241 | gaim_debug(GAIM_DEBUG_MISC, NULL, "\n"); | |
| 242 | #endif | |
| 243 | } | |
| 244 | ||
| 245 | int yahoo_packet_send(struct yahoo_packet *pkt, struct yahoo_data *yd) | |
| 246 | { | |
| 247 | int pktlen = yahoo_packet_length(pkt); | |
| 248 | int len = YAHOO_PACKET_HDRLEN + pktlen; | |
| 249 | int ret; | |
| 250 | ||
| 251 | guchar *data; | |
| 252 | int pos = 0; | |
| 253 | ||
| 254 | if (yd->fd < 0) | |
| 255 | return -1; | |
| 256 | ||
| 257 | data = g_malloc0(len + 1); | |
| 258 | ||
| 259 | memcpy(data + pos, "YMSG", 4); pos += 4; | |
| 260 | ||
| 261 | if (yd->wm) | |
| 262 | pos += yahoo_put16(data + pos, YAHOO_WEBMESSENGER_PROTO_VER); | |
| 263 | else | |
| 264 | pos += yahoo_put16(data + pos, YAHOO_PROTO_VER); | |
| 265 | ||
| 266 | pos += yahoo_put16(data + pos, 0x0000); | |
| 267 | pos += yahoo_put16(data + pos, pktlen); | |
| 268 | pos += yahoo_put16(data + pos, pkt->service); | |
| 269 | pos += yahoo_put32(data + pos, pkt->status); | |
| 270 | pos += yahoo_put32(data + pos, pkt->id); | |
| 271 | ||
| 272 | yahoo_packet_write(pkt, data + pos); | |
| 273 | ||
| 274 | yahoo_packet_dump(data, len); | |
| 275 | ret = write(yd->fd, data, len); | |
| 276 | if (ret != len) | |
| 277 | gaim_debug_warning("yahoo", "Only wrote %d of %d bytes!", ret, len); | |
| 278 | g_free(data); | |
| 279 | ||
| 280 | return ret; | |
| 281 | } | |
| 282 | ||
| 283 | int yahoo_packet_send_and_free(struct yahoo_packet *pkt, struct yahoo_data *yd) | |
| 284 | { | |
| 285 | int ret; | |
|
11644
939411169d01
[gaim-migrate @ 13922]
Peter Lawler <pidgin@bleeter.id.au>
parents:
11161
diff
changeset
|
286 | |
| 10392 | 287 | ret = yahoo_packet_send(pkt, yd); |
| 288 | yahoo_packet_free(pkt); | |
| 289 | return ret; | |
| 290 | } | |
| 291 | ||
| 292 | int yahoo_packet_send_special(struct yahoo_packet *pkt, int fd, int pad) | |
| 293 | { | |
| 294 | int pktlen = yahoo_packet_length(pkt); | |
| 295 | int len = YAHOO_PACKET_HDRLEN + pktlen; | |
| 296 | int ret; | |
| 297 | ||
| 298 | guchar *data; | |
| 299 | int pos = 0; | |
| 300 | ||
| 301 | if (fd < 0) | |
| 302 | return -1; | |
| 303 | ||
| 304 | data = g_malloc0(len + 1); | |
| 305 | ||
| 306 | memcpy(data + pos, "YMSG", 4); pos += 4; | |
| 307 | ||
| 308 | pos += yahoo_put16(data + pos, YAHOO_PROTO_VER); | |
| 309 | pos += yahoo_put16(data + pos, 0x0000); | |
| 310 | pos += yahoo_put16(data + pos, pktlen + pad); | |
| 311 | pos += yahoo_put16(data + pos, pkt->service); | |
| 312 | pos += yahoo_put32(data + pos, pkt->status); | |
| 313 | pos += yahoo_put32(data + pos, pkt->id); | |
| 314 | ||
| 315 | yahoo_packet_write(pkt, data + pos); | |
| 316 | ||
| 317 | ret = write(fd, data, len); | |
| 318 | g_free(data); | |
| 319 | ||
| 320 | return ret; | |
| 321 | } | |
| 322 | ||
| 323 | void yahoo_packet_free(struct yahoo_packet *pkt) | |
| 324 | { | |
| 325 | while (pkt->hash) { | |
| 326 | struct yahoo_pair *pair = pkt->hash->data; | |
| 327 | g_free(pair->value); | |
| 328 | g_free(pair); | |
| 329 | pkt->hash = g_slist_remove(pkt->hash, pair); | |
| 330 | } | |
| 331 | g_free(pkt); | |
| 332 | } |