Thu, 09 Aug 2007 18:58:07 +0000
Fix uninitialized variable access.
| 2086 | 1 | /* |
| 15884 | 2 | * purple - Jabber Protocol Plugin |
| 2086 | 3 | * |
| 7014 | 4 | * Copyright (C) 2003, Nathan Walp <faceprint@faceprint.com> |
| 2086 | 5 | * |
| 6 | * This program is free software; you can redistribute it and/or modify | |
| 7 | * it under the terms of the GNU General Public License as published by | |
| 8 | * the Free Software Foundation; either version 2 of the License, or | |
| 9 | * (at your option) any later version. | |
| 7014 | 10 | * |
| 2086 | 11 | * This program is distributed in the hope that it will be useful, |
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 | * GNU General Public License for more details. | |
| 15 | * | |
| 16 | * You should have received a copy of the GNU General Public License | |
| 17 | * along with this program; if not, write to the Free Software | |
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 19 | * | |
| 20 | */ | |
|
5872
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5685
diff
changeset
|
21 | #include "internal.h" |
|
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5685
diff
changeset
|
22 | |
| 7014 | 23 | #include "account.h" |
| 24 | #include "accountopt.h" | |
|
9030
7b574a641391
[gaim-migrate @ 9806]
Mark Doliner <markdoliner@pidgin.im>
parents:
9015
diff
changeset
|
25 | #include "blist.h" |
| 9130 | 26 | #include "cmds.h" |
|
10740
a1cb6b819a21
[gaim-migrate @ 12342]
Mark Doliner <markdoliner@pidgin.im>
parents:
10504
diff
changeset
|
27 | #include "connection.h" |
|
15952
c087855dc551
Re-arrange #includes so 'make check' stands a chance of passing during
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
28 | #include "conversation.h" |
| 7014 | 29 | #include "debug.h" |
| 11387 | 30 | #include "dnssrv.h" |
| 7014 | 31 | #include "message.h" |
| 7072 | 32 | #include "notify.h" |
| 8713 | 33 | #include "pluginpref.h" |
|
14175
2bc5a80c5071
[gaim-migrate @ 16747]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
34 | #include "proxy.h" |
| 7014 | 35 | #include "prpl.h" |
| 7072 | 36 | #include "request.h" |
| 7014 | 37 | #include "server.h" |
|
7095
17d2b54254f8
[gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents:
7072
diff
changeset
|
38 | #include "util.h" |
| 9943 | 39 | #include "version.h" |
|
15952
c087855dc551
Re-arrange #includes so 'make check' stands a chance of passing during
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
15884
diff
changeset
|
40 | #include "xmlnode.h" |
|
5872
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5685
diff
changeset
|
41 | |
| 7014 | 42 | #include "auth.h" |
| 43 | #include "buddy.h" | |
| 44 | #include "chat.h" | |
| 8312 | 45 | #include "disco.h" |
| 15265 | 46 | #include "google.h" |
| 7014 | 47 | #include "iq.h" |
| 48 | #include "jutil.h" | |
| 49 | #include "message.h" | |
| 50 | #include "parser.h" | |
| 51 | #include "presence.h" | |
| 52 | #include "jabber.h" | |
| 53 | #include "roster.h" | |
|
9466
b6425eab60ca
[gaim-migrate @ 10291]
Daniel Atallah <datallah@pidgin.im>
parents:
9414
diff
changeset
|
54 | #include "si.h" |
| 7923 | 55 | #include "xdata.h" |
|
5872
754c63f29b77
[gaim-migrate @ 6304]
Christian Hammond <chipx86@chipx86.com>
parents:
5685
diff
changeset
|
56 | |
| 7014 | 57 | #define JABBER_CONNECT_STEPS (js->gsc ? 8 : 5) |
| 2086 | 58 | |
| 15884 | 59 | static PurplePlugin *my_protocol = NULL; |
|
4249
62583b5d3663
[gaim-migrate @ 4499]
Robert McQueen <robot101@debian.org>
parents:
4245
diff
changeset
|
60 | |
| 7014 | 61 | static void jabber_stream_init(JabberStream *js) |
| 62 | { | |
| 63 | char *open_stream; | |
|
3340
7e59a209931d
[gaim-migrate @ 3359]
Jim Seymour <jseymour@users.sourceforge.net>
parents:
3337
diff
changeset
|
64 | |
| 7014 | 65 | open_stream = g_strdup_printf("<stream:stream to='%s' " |
| 66 | "xmlns='jabber:client' " | |
| 7395 | 67 | "xmlns:stream='http://etherx.jabber.org/streams' " |
| 68 | "version='1.0'>", | |
| 7291 | 69 | js->user->domain); |
| 13808 | 70 | /* setup the parser fresh for each stream */ |
| 71 | jabber_parser_setup(js); | |
| 7642 | 72 | jabber_send_raw(js, open_stream, -1); |
| 14062 | 73 | js->reinit = FALSE; |
| 7014 | 74 | g_free(open_stream); |
| 2086 | 75 | } |
| 76 | ||
| 7395 | 77 | static void |
| 78 | jabber_session_initialized_cb(JabberStream *js, xmlnode *packet, gpointer data) | |
| 3311 | 79 | { |
| 7014 | 80 | const char *type = xmlnode_get_attrib(packet, "type"); |
| 81 | if(type && !strcmp(type, "result")) { | |
| 82 | jabber_stream_set_state(js, JABBER_STREAM_CONNECTED); | |
| 83 | } else { | |
| 15884 | 84 | purple_connection_error(js->gc, _("Error initializing session")); |
| 3311 | 85 | } |
| 86 | } | |
| 87 | ||
| 7014 | 88 | static void jabber_session_init(JabberStream *js) |
| 3311 | 89 | { |
| 7014 | 90 | JabberIq *iq = jabber_iq_new(js, JABBER_IQ_SET); |
| 91 | xmlnode *session; | |
| 3311 | 92 | |
| 7395 | 93 | jabber_iq_set_callback(iq, jabber_session_initialized_cb, NULL); |
| 3311 | 94 | |
| 7014 | 95 | session = xmlnode_new_child(iq->node, "session"); |
| 13808 | 96 | xmlnode_set_namespace(session, "urn:ietf:params:xml:ns:xmpp-session"); |
| 3311 | 97 | |
| 7014 | 98 | jabber_iq_send(iq); |
| 3311 | 99 | } |
| 100 | ||
| 7395 | 101 | static void jabber_bind_result_cb(JabberStream *js, xmlnode *packet, |
| 102 | gpointer data) | |
| 103 | { | |
| 8401 | 104 | const char *type = xmlnode_get_attrib(packet, "type"); |
| 105 | xmlnode *bind; | |
| 106 | ||
| 107 | if(type && !strcmp(type, "result") && | |
| 108 | (bind = xmlnode_get_child_with_namespace(packet, "bind", "urn:ietf:params:xml:ns:xmpp-bind"))) { | |
| 109 | xmlnode *jid; | |
| 110 | char *full_jid; | |
| 111 | if((jid = xmlnode_get_child(bind, "jid")) && (full_jid = xmlnode_get_data(jid))) { | |
| 10289 | 112 | JabberBuddy *my_jb = NULL; |
| 8401 | 113 | jabber_id_free(js->user); |
| 114 | if(!(js->user = jabber_id_new(full_jid))) { | |
| 15884 | 115 | purple_connection_error(js->gc, _("Invalid response from server.")); |
| 8401 | 116 | } |
| 10289 | 117 | if((my_jb = jabber_buddy_find(js, full_jid, TRUE))) |
| 118 | my_jb->subscription |= JABBER_SUB_BOTH; | |
|
10504
eae130eefbfe
[gaim-migrate @ 11796]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10490
diff
changeset
|
119 | g_free(full_jid); |
| 8401 | 120 | } |
| 121 | } else { | |
| 122 | char *msg = jabber_parse_error(js, packet); | |
| 15884 | 123 | purple_connection_error(js->gc, msg); |
| 8401 | 124 | g_free(msg); |
| 125 | } | |
| 7395 | 126 | |
| 127 | jabber_session_init(js); | |
| 128 | } | |
| 129 | ||
| 130 | static void jabber_stream_features_parse(JabberStream *js, xmlnode *packet) | |
| 131 | { | |
| 8296 | 132 | if(xmlnode_get_child(packet, "starttls")) { |
| 133 | if(jabber_process_starttls(js, packet)) | |
| 134 | return; | |
| 135 | } | |
| 136 | ||
| 10988 | 137 | if(js->registration) { |
| 138 | jabber_register_start(js); | |
| 139 | } else if(xmlnode_get_child(packet, "mechanisms")) { | |
| 7395 | 140 | jabber_auth_start(js, packet); |
| 141 | } else if(xmlnode_get_child(packet, "bind")) { | |
| 142 | xmlnode *bind, *resource; | |
| 143 | JabberIq *iq = jabber_iq_new(js, JABBER_IQ_SET); | |
| 144 | bind = xmlnode_new_child(iq->node, "bind"); | |
| 13808 | 145 | xmlnode_set_namespace(bind, "urn:ietf:params:xml:ns:xmpp-bind"); |
| 7395 | 146 | resource = xmlnode_new_child(bind, "resource"); |
| 147 | xmlnode_insert_data(resource, js->user->resource, -1); | |
| 148 | ||
| 149 | jabber_iq_set_callback(iq, jabber_bind_result_cb, NULL); | |
| 150 | ||
| 151 | jabber_iq_send(iq); | |
| 8296 | 152 | } else /* if(xmlnode_get_child_with_namespace(packet, "auth")) */ { |
| 153 | /* If we get an empty stream:features packet, or we explicitly get | |
| 154 | * an auth feature with namespace http://jabber.org/features/iq-auth | |
| 155 | * we should revert back to iq:auth authentication, even though we're | |
| 156 | * connecting to an XMPP server. */ | |
| 157 | js->auth_type = JABBER_AUTH_IQ_AUTH; | |
| 158 | jabber_stream_set_state(js, JABBER_STREAM_AUTHENTICATING); | |
| 7395 | 159 | } |
| 160 | } | |
| 161 | ||
| 7014 | 162 | static void jabber_stream_handle_error(JabberStream *js, xmlnode *packet) |
| 3311 | 163 | { |
| 8401 | 164 | char *msg = jabber_parse_error(js, packet); |
| 3311 | 165 | |
| 15884 | 166 | purple_connection_error(js->gc, msg); |
| 8401 | 167 | g_free(msg); |
| 2086 | 168 | } |
| 169 | ||
| 7014 | 170 | static void tls_init(JabberStream *js); |
| 2086 | 171 | |
| 7014 | 172 | void jabber_process_packet(JabberStream *js, xmlnode *packet) |
| 2086 | 173 | { |
| 15980 | 174 | const char *xmlns; |
| 175 | ||
| 15884 | 176 | purple_signal_emit(my_protocol, "jabber-receiving-xmlnode", js->gc, &packet); |
| 14358 | 177 | |
| 178 | /* if the signal leaves us with a null packet, we're done */ | |
| 179 | if(NULL == packet) | |
| 180 | return; | |
| 181 | ||
| 15980 | 182 | xmlns = xmlnode_get_namespace(packet); |
| 183 | ||
| 7014 | 184 | if(!strcmp(packet->name, "iq")) { |
| 7395 | 185 | jabber_iq_parse(js, packet); |
| 7014 | 186 | } else if(!strcmp(packet->name, "presence")) { |
| 187 | jabber_presence_parse(js, packet); | |
| 188 | } else if(!strcmp(packet->name, "message")) { | |
| 189 | jabber_message_parse(js, packet); | |
| 190 | } else if(!strcmp(packet->name, "stream:features")) { | |
| 7395 | 191 | jabber_stream_features_parse(js, packet); |
| 15980 | 192 | } else if (!strcmp(packet->name, "features") && |
| 193 | !strcmp(xmlns, "http://etherx.jabber.org/streams")) { | |
| 13808 | 194 | jabber_stream_features_parse(js, packet); |
| 15980 | 195 | } else if(!strcmp(packet->name, "stream:error") || |
| 196 | (!strcmp(packet->name, "error") && | |
| 197 | !strcmp(xmlns, "http://etherx.jabber.org/streams"))) | |
| 198 | { | |
| 13808 | 199 | jabber_stream_handle_error(js, packet); |
| 7014 | 200 | } else if(!strcmp(packet->name, "challenge")) { |
| 201 | if(js->state == JABBER_STREAM_AUTHENTICATING) | |
| 202 | jabber_auth_handle_challenge(js, packet); | |
| 203 | } else if(!strcmp(packet->name, "success")) { | |
| 204 | if(js->state == JABBER_STREAM_AUTHENTICATING) | |
| 205 | jabber_auth_handle_success(js, packet); | |
| 206 | } else if(!strcmp(packet->name, "failure")) { | |
| 207 | if(js->state == JABBER_STREAM_AUTHENTICATING) | |
| 208 | jabber_auth_handle_failure(js, packet); | |
| 209 | } else if(!strcmp(packet->name, "proceed")) { | |
| 210 | if(js->state == JABBER_STREAM_AUTHENTICATING && !js->gsc) | |
| 211 | tls_init(js); | |
| 212 | } else { | |
| 15884 | 213 | purple_debug(PURPLE_DEBUG_WARNING, "jabber", "Unknown packet: %s\n", |
| 7014 | 214 | packet->name); |
| 2086 | 215 | } |
| 216 | } | |
| 217 | ||
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
218 | static int jabber_do_send(JabberStream *js, const char *data, int len) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
219 | { |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
220 | int ret; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
221 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
222 | if (js->gsc) |
| 15884 | 223 | ret = purple_ssl_write(js->gsc, data, len); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
224 | else |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
225 | ret = write(js->fd, data, len); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
226 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
227 | return ret; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
228 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
229 | |
| 15884 | 230 | static void jabber_send_cb(gpointer data, gint source, PurpleInputCondition cond) |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
231 | { |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
232 | JabberStream *js = data; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
233 | int ret, writelen; |
| 15884 | 234 | writelen = purple_circ_buffer_get_max_read(js->write_buffer); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
235 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
236 | if (writelen == 0) { |
| 15884 | 237 | purple_input_remove(js->writeh); |
|
13746
790924f38349
[gaim-migrate @ 16155]
Mark Doliner <markdoliner@pidgin.im>
parents:
13546
diff
changeset
|
238 | js->writeh = 0; |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
239 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
240 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
241 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
242 | ret = jabber_do_send(js, js->write_buffer->outptr, writelen); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
243 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
244 | if (ret < 0 && errno == EAGAIN) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
245 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
246 | else if (ret <= 0) { |
| 15884 | 247 | purple_connection_error(js->gc, _("Write error")); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
248 | return; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
249 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
250 | |
| 15884 | 251 | purple_circ_buffer_mark_read(js->write_buffer, ret); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
252 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
253 | |
| 7642 | 254 | void jabber_send_raw(JabberStream *js, const char *data, int len) |
| 2086 | 255 | { |
| 7014 | 256 | int ret; |
| 2086 | 257 | |
| 7014 | 258 | /* because printing a tab to debug every minute gets old */ |
| 259 | if(strcmp(data, "\t")) | |
| 15884 | 260 | purple_debug(PURPLE_DEBUG_MISC, "jabber", "Sending%s: %s\n", |
| 7014 | 261 | js->gsc ? " (ssl)" : "", data); |
| 2086 | 262 | |
| 12508 | 263 | /* If we've got a security layer, we need to encode the data, |
| 264 | * splitting it on the maximum buffer length negotiated */ | |
| 14668 | 265 | |
| 15884 | 266 | purple_signal_emit(my_protocol, "jabber-sending-text", js->gc, &data); |
| 15412 | 267 | if (data == NULL) |
| 268 | return; | |
| 14668 | 269 | |
| 12508 | 270 | #ifdef HAVE_CYRUS_SASL |
| 271 | if (js->sasl_maxbuf>0) { | |
| 272 | int pos; | |
| 273 | ||
| 274 | if (!js->gsc && js->fd<0) | |
| 275 | return; | |
| 276 | pos = 0; | |
| 277 | if (len == -1) | |
| 278 | len = strlen(data); | |
| 279 | while (pos < len) { | |
| 280 | int towrite; | |
| 281 | const char *out; | |
| 282 | unsigned olen; | |
| 283 | ||
| 284 | if ((len - pos) < js->sasl_maxbuf) | |
| 285 | towrite = len - pos; | |
| 286 | else | |
| 287 | towrite = js->sasl_maxbuf; | |
| 288 | ||
| 289 | sasl_encode(js->sasl, &data[pos], towrite, &out, &olen); | |
| 290 | pos += towrite; | |
| 291 | ||
|
15783
e2f6e431f5a6
Simon Wilkinson noticed that this check was invalid and caused authentications to hang.
Daniel Atallah <datallah@pidgin.im>
parents:
15709
diff
changeset
|
292 | if (js->writeh == 0) |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
293 | ret = jabber_do_send(js, out, olen); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
294 | else { |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
295 | ret = -1; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
296 | errno = EAGAIN; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
297 | } |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
298 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
299 | if (ret < 0 && errno != EAGAIN) |
| 15884 | 300 | purple_connection_error(js->gc, _("Write error")); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
301 | else if (ret < olen) { |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
302 | if (ret < 0) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
303 | ret = 0; |
|
13746
790924f38349
[gaim-migrate @ 16155]
Mark Doliner <markdoliner@pidgin.im>
parents:
13546
diff
changeset
|
304 | if (js->writeh == 0) |
| 15884 | 305 | js->writeh = purple_input_add( |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
306 | js->gsc ? js->gsc->fd : js->fd, |
| 15884 | 307 | PURPLE_INPUT_WRITE, |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
308 | jabber_send_cb, js); |
| 15884 | 309 | purple_circ_buffer_append(js->write_buffer, |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
310 | out + ret, olen - ret); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
311 | } |
| 12508 | 312 | } |
| 313 | return; | |
| 314 | } | |
| 315 | #endif | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
316 | |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
317 | if (len == -1) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
318 | len = strlen(data); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
319 | |
|
13746
790924f38349
[gaim-migrate @ 16155]
Mark Doliner <markdoliner@pidgin.im>
parents:
13546
diff
changeset
|
320 | if (js->writeh == 0) |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
321 | ret = jabber_do_send(js, data, len); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
322 | else { |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
323 | ret = -1; |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
324 | errno = EAGAIN; |
|
2814
91cc1a0cdee0
[gaim-migrate @ 2827]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2800
diff
changeset
|
325 | } |
|
91cc1a0cdee0
[gaim-migrate @ 2827]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2800
diff
changeset
|
326 | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
327 | if (ret < 0 && errno != EAGAIN) |
| 15884 | 328 | purple_connection_error(js->gc, _("Write error")); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
329 | else if (ret < len) { |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
330 | if (ret < 0) |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
331 | ret = 0; |
|
13746
790924f38349
[gaim-migrate @ 16155]
Mark Doliner <markdoliner@pidgin.im>
parents:
13546
diff
changeset
|
332 | if (js->writeh == 0) |
| 15884 | 333 | js->writeh = purple_input_add( |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
334 | js->gsc ? js->gsc->fd : js->fd, |
| 15884 | 335 | PURPLE_INPUT_WRITE, jabber_send_cb, js); |
| 336 | purple_circ_buffer_append(js->write_buffer, | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
337 | data + ret, len - ret); |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
338 | } |
| 14604 | 339 | return; |
| 340 | } | |
| 7014 | 341 | |
|
16302
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
342 | int jabber_prpl_send_raw(PurpleConnection *gc, const char *buf, int len) |
| 14604 | 343 | { |
| 344 | JabberStream *js = (JabberStream*)gc->proto_data; | |
| 345 | jabber_send_raw(js, buf, len); | |
| 346 | return len; | |
|
2814
91cc1a0cdee0
[gaim-migrate @ 2827]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2800
diff
changeset
|
347 | } |
|
91cc1a0cdee0
[gaim-migrate @ 2827]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2800
diff
changeset
|
348 | |
| 7014 | 349 | void jabber_send(JabberStream *js, xmlnode *packet) |
| 2086 | 350 | { |
| 7014 | 351 | char *txt; |
| 7642 | 352 | int len; |
| 2086 | 353 | |
| 15884 | 354 | purple_signal_emit(my_protocol, "jabber-sending-xmlnode", js->gc, &packet); |
| 14358 | 355 | |
| 356 | /* if we get NULL back, we're done processing */ | |
| 357 | if(NULL == packet) | |
| 358 | return; | |
| 359 | ||
| 7642 | 360 | txt = xmlnode_to_str(packet, &len); |
| 361 | jabber_send_raw(js, txt, len); | |
| 7014 | 362 | g_free(txt); |
| 2086 | 363 | } |
| 364 | ||
|
16302
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
365 | void jabber_keepalive(PurpleConnection *gc) |
| 2086 | 366 | { |
| 7642 | 367 | jabber_send_raw(gc->proto_data, "\t", -1); |
| 2086 | 368 | } |
| 369 | ||
| 7014 | 370 | static void |
| 15884 | 371 | jabber_recv_cb_ssl(gpointer data, PurpleSslConnection *gsc, |
| 372 | PurpleInputCondition cond) | |
| 6764 | 373 | { |
| 15884 | 374 | PurpleConnection *gc = data; |
| 7014 | 375 | JabberStream *js = gc->proto_data; |
| 6764 | 376 | int len; |
| 7014 | 377 | static char buf[4096]; |
| 6768 | 378 | |
|
14030
23144f1dc950
[gaim-migrate @ 16525]
Mark Doliner <markdoliner@pidgin.im>
parents:
14004
diff
changeset
|
379 | /* TODO: It should be possible to make this check unnecessary */ |
| 15884 | 380 | if(!PURPLE_CONNECTION_IS_VALID(gc)) { |
| 381 | purple_ssl_close(gsc); | |
| 6768 | 382 | return; |
| 383 | } | |
| 384 | ||
| 15884 | 385 | while((len = purple_ssl_read(gsc, buf, sizeof(buf) - 1)) > 0) { |
| 6764 | 386 | buf[len] = '\0'; |
| 15884 | 387 | purple_debug(PURPLE_DEBUG_INFO, "jabber", "Recv (ssl)(%d): %s\n", len, buf); |
| 7014 | 388 | jabber_parser_process(js, buf, len); |
| 14062 | 389 | if(js->reinit) |
| 390 | jabber_stream_init(js); | |
| 13280 | 391 | } |
| 392 | ||
| 393 | if(errno == EAGAIN) | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
394 | return; |
| 13280 | 395 | else |
| 15884 | 396 | purple_connection_error(gc, _("Read Error")); |
| 2086 | 397 | } |
| 398 | ||
| 7014 | 399 | static void |
| 15884 | 400 | jabber_recv_cb(gpointer data, gint source, PurpleInputCondition condition) |
| 2086 | 401 | { |
| 15884 | 402 | PurpleConnection *gc = data; |
| 7014 | 403 | JabberStream *js = gc->proto_data; |
| 404 | int len; | |
| 405 | static char buf[4096]; | |
| 2086 | 406 | |
| 15884 | 407 | if(!PURPLE_CONNECTION_IS_VALID(gc)) |
| 7014 | 408 | return; |
| 2956 | 409 | |
| 7014 | 410 | if((len = read(js->fd, buf, sizeof(buf) - 1)) > 0) { |
| 12508 | 411 | #ifdef HAVE_CYRUS_SASL |
| 412 | if (js->sasl_maxbuf>0) { | |
| 413 | const char *out; | |
|
14697
518c0fae208e
[gaim-migrate @ 17381]
Daniel Atallah <datallah@pidgin.im>
parents:
14668
diff
changeset
|
414 | unsigned int olen; |
| 12508 | 415 | sasl_decode(js->sasl, buf, len, &out, &olen); |
| 416 | if (olen>0) { | |
| 15884 | 417 | purple_debug(PURPLE_DEBUG_INFO, "jabber", "RecvSASL (%u): %s\n", olen, out); |
| 12508 | 418 | jabber_parser_process(js,out,olen); |
| 14700 | 419 | if(js->reinit) |
| 420 | jabber_stream_init(js); | |
| 12508 | 421 | } |
| 422 | return; | |
| 423 | } | |
| 424 | #endif | |
| 7014 | 425 | buf[len] = '\0'; |
| 15884 | 426 | purple_debug(PURPLE_DEBUG_INFO, "jabber", "Recv (%d): %s\n", len, buf); |
| 7014 | 427 | jabber_parser_process(js, buf, len); |
| 14700 | 428 | if(js->reinit) |
| 429 | jabber_stream_init(js); | |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
430 | } else if(errno == EAGAIN) { |
|
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
431 | return; |
| 7177 | 432 | } else { |
| 15884 | 433 | purple_connection_error(gc, _("Read Error")); |
| 7014 | 434 | } |
| 2086 | 435 | } |
| 436 | ||
| 7014 | 437 | static void |
| 15884 | 438 | jabber_login_callback_ssl(gpointer data, PurpleSslConnection *gsc, |
| 439 | PurpleInputCondition cond) | |
| 6764 | 440 | { |
| 15884 | 441 | PurpleConnection *gc = data; |
|
15023
c38f385a128a
[gaim-migrate @ 17740]
Evan Schoenberg <evands@pidgin.im>
parents:
14899
diff
changeset
|
442 | JabberStream *js; |
|
c38f385a128a
[gaim-migrate @ 17740]
Evan Schoenberg <evands@pidgin.im>
parents:
14899
diff
changeset
|
443 | |
|
c38f385a128a
[gaim-migrate @ 17740]
Evan Schoenberg <evands@pidgin.im>
parents:
14899
diff
changeset
|
444 | /* TODO: It should be possible to make this check unnecessary */ |
| 15884 | 445 | if(!PURPLE_CONNECTION_IS_VALID(gc)) { |
| 446 | purple_ssl_close(gsc); | |
|
15023
c38f385a128a
[gaim-migrate @ 17740]
Evan Schoenberg <evands@pidgin.im>
parents:
14899
diff
changeset
|
447 | return; |
|
c38f385a128a
[gaim-migrate @ 17740]
Evan Schoenberg <evands@pidgin.im>
parents:
14899
diff
changeset
|
448 | } |
|
c38f385a128a
[gaim-migrate @ 17740]
Evan Schoenberg <evands@pidgin.im>
parents:
14899
diff
changeset
|
449 | |
|
c38f385a128a
[gaim-migrate @ 17740]
Evan Schoenberg <evands@pidgin.im>
parents:
14899
diff
changeset
|
450 | js = gc->proto_data; |
| 6764 | 451 | |
| 7014 | 452 | if(js->state == JABBER_STREAM_CONNECTING) |
| 7642 | 453 | jabber_send_raw(js, "<?xml version='1.0' ?>", -1); |
| 7014 | 454 | jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING); |
| 15884 | 455 | purple_ssl_input_add(gsc, jabber_recv_cb_ssl, gc); |
| 6764 | 456 | } |
| 457 | ||
| 7014 | 458 | |
| 459 | static void | |
|
14175
2bc5a80c5071
[gaim-migrate @ 16747]
Mark Doliner <markdoliner@pidgin.im>
parents:
14170
diff
changeset
|
460 | jabber_login_callback(gpointer data, gint source, const gchar *error) |
| 6764 | 461 | { |
| 15884 | 462 | PurpleConnection *gc = data; |
| 7014 | 463 | JabberStream *js = gc->proto_data; |
| 2086 | 464 | |
|
8783
7be6da5bc279
[gaim-migrate @ 9545]
Mark Doliner <markdoliner@pidgin.im>
parents:
8778
diff
changeset
|
465 | if (source < 0) { |
|
17643
870d08f93965
Better error message for when a Jabber connection fails
Mark Doliner <markdoliner@pidgin.im>
parents:
17052
diff
changeset
|
466 | gchar *tmp; |
|
870d08f93965
Better error message for when a Jabber connection fails
Mark Doliner <markdoliner@pidgin.im>
parents:
17052
diff
changeset
|
467 | tmp = g_strdup_printf(_("Could not establish a connection with the server:\n%s"), |
|
870d08f93965
Better error message for when a Jabber connection fails
Mark Doliner <markdoliner@pidgin.im>
parents:
17052
diff
changeset
|
468 | error); |
|
870d08f93965
Better error message for when a Jabber connection fails
Mark Doliner <markdoliner@pidgin.im>
parents:
17052
diff
changeset
|
469 | purple_connection_error(gc, tmp); |
|
870d08f93965
Better error message for when a Jabber connection fails
Mark Doliner <markdoliner@pidgin.im>
parents:
17052
diff
changeset
|
470 | g_free(tmp); |
|
8783
7be6da5bc279
[gaim-migrate @ 9545]
Mark Doliner <markdoliner@pidgin.im>
parents:
8778
diff
changeset
|
471 | return; |
|
7be6da5bc279
[gaim-migrate @ 9545]
Mark Doliner <markdoliner@pidgin.im>
parents:
8778
diff
changeset
|
472 | } |
|
7be6da5bc279
[gaim-migrate @ 9545]
Mark Doliner <markdoliner@pidgin.im>
parents:
8778
diff
changeset
|
473 | |
| 7014 | 474 | js->fd = source; |
| 2956 | 475 | |
| 7014 | 476 | if(js->state == JABBER_STREAM_CONNECTING) |
| 7642 | 477 | jabber_send_raw(js, "<?xml version='1.0' ?>", -1); |
|
2300
06a3c10f4918
[gaim-migrate @ 2310]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2289
diff
changeset
|
478 | |
| 7014 | 479 | jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING); |
| 15884 | 480 | gc->inpa = purple_input_add(js->fd, PURPLE_INPUT_READ, jabber_recv_cb, gc); |
| 7014 | 481 | } |
| 2086 | 482 | |
| 7014 | 483 | static void |
| 15884 | 484 | jabber_ssl_connect_failure(PurpleSslConnection *gsc, PurpleSslErrorType error, |
| 7426 | 485 | gpointer data) |
| 486 | { | |
| 15884 | 487 | PurpleConnection *gc = data; |
|
15668
c8831ae23d4c
If jabber_ssl_connect_failure() is called because a connect attempt fails, but the user has already canceled the attempt by signing the account offline, this would previously crash. It now does not.
Evan Schoenberg <evands@pidgin.im>
parents:
15558
diff
changeset
|
488 | JabberStream *js; |
| 7426 | 489 | |
|
15668
c8831ae23d4c
If jabber_ssl_connect_failure() is called because a connect attempt fails, but the user has already canceled the attempt by signing the account offline, this would previously crash. It now does not.
Evan Schoenberg <evands@pidgin.im>
parents:
15558
diff
changeset
|
490 | /* If the connection is already disconnected, we don't need to do anything else */ |
| 15884 | 491 | if(!PURPLE_CONNECTION_IS_VALID(gc)) |
|
15668
c8831ae23d4c
If jabber_ssl_connect_failure() is called because a connect attempt fails, but the user has already canceled the attempt by signing the account offline, this would previously crash. It now does not.
Evan Schoenberg <evands@pidgin.im>
parents:
15558
diff
changeset
|
492 | return; |
|
c8831ae23d4c
If jabber_ssl_connect_failure() is called because a connect attempt fails, but the user has already canceled the attempt by signing the account offline, this would previously crash. It now does not.
Evan Schoenberg <evands@pidgin.im>
parents:
15558
diff
changeset
|
493 | |
|
c8831ae23d4c
If jabber_ssl_connect_failure() is called because a connect attempt fails, but the user has already canceled the attempt by signing the account offline, this would previously crash. It now does not.
Evan Schoenberg <evands@pidgin.im>
parents:
15558
diff
changeset
|
494 | js = gc->proto_data; |
|
14312
6ce4512aa9a8
[gaim-migrate @ 16932]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
495 | js->gsc = NULL; |
|
6ce4512aa9a8
[gaim-migrate @ 16932]
Mark Doliner <markdoliner@pidgin.im>
parents:
14254
diff
changeset
|
496 | |
| 7426 | 497 | switch(error) { |
| 15884 | 498 | case PURPLE_SSL_CONNECT_FAILED: |
| 499 | purple_connection_error(gc, _("Connection Failed")); | |
| 8362 | 500 | break; |
| 15884 | 501 | case PURPLE_SSL_HANDSHAKE_FAILED: |
| 502 | purple_connection_error(gc, _("SSL Handshake Failed")); | |
| 7426 | 503 | break; |
| 504 | } | |
| 505 | } | |
| 506 | ||
| 7427 | 507 | static void tls_init(JabberStream *js) |
| 508 | { | |
| 15884 | 509 | purple_input_remove(js->gc->inpa); |
| 7427 | 510 | js->gc->inpa = 0; |
| 15884 | 511 | js->gsc = purple_ssl_connect_fd(js->gc->account, js->fd, |
| 7427 | 512 | jabber_login_callback_ssl, jabber_ssl_connect_failure, js->gc); |
| 513 | } | |
| 514 | ||
| 17052 | 515 | static void jabber_login_connect(JabberStream *js, const char *fqdn, const char *host, int port) |
| 11387 | 516 | { |
|
15800
2d0ec4fe2681
pass the correct domain to cyrus sasl (sf patch 1663064)
Nathan Walp <nwalp@pidgin.im>
parents:
15783
diff
changeset
|
517 | #ifdef HAVE_CYRUS_SASL |
| 17052 | 518 | js->serverFQDN = g_strdup(fqdn); |
|
15800
2d0ec4fe2681
pass the correct domain to cyrus sasl (sf patch 1663064)
Nathan Walp <nwalp@pidgin.im>
parents:
15783
diff
changeset
|
519 | #endif |
|
2d0ec4fe2681
pass the correct domain to cyrus sasl (sf patch 1663064)
Nathan Walp <nwalp@pidgin.im>
parents:
15783
diff
changeset
|
520 | |
| 17052 | 521 | if (purple_proxy_connect(js->gc, js->gc->account, host, |
|
14899
c65f0b4fb351
[gaim-migrate @ 17606]
Mark Doliner <markdoliner@pidgin.im>
parents:
14700
diff
changeset
|
522 | port, jabber_login_callback, js->gc) == NULL) |
| 15884 | 523 | purple_connection_error(js->gc, _("Unable to create socket")); |
| 11387 | 524 | } |
| 525 | ||
| 15884 | 526 | static void srv_resolved_cb(PurpleSrvResponse *resp, int results, gpointer data) |
| 11387 | 527 | { |
|
13956
c3001d55c88f
[gaim-migrate @ 16377]
Mark Doliner <markdoliner@pidgin.im>
parents:
13808
diff
changeset
|
528 | JabberStream *js; |
|
c3001d55c88f
[gaim-migrate @ 16377]
Mark Doliner <markdoliner@pidgin.im>
parents:
13808
diff
changeset
|
529 | |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14358
diff
changeset
|
530 | js = data; |
|
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14358
diff
changeset
|
531 | js->srv_query_data = NULL; |
| 11387 | 532 | |
| 533 | if(results) { | |
| 17052 | 534 | jabber_login_connect(js, resp->hostname, resp->hostname, resp->port); |
| 11387 | 535 | g_free(resp); |
| 536 | } else { | |
| 17052 | 537 | jabber_login_connect(js, js->user->domain, js->user->domain, |
| 15884 | 538 | purple_account_get_int(js->gc->account, "port", 5222)); |
| 11387 | 539 | } |
| 540 | } | |
| 541 | ||
|
16302
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
542 | void |
| 15884 | 543 | jabber_login(PurpleAccount *account) |
| 2086 | 544 | { |
| 15884 | 545 | PurpleConnection *gc = purple_account_get_connection(account); |
| 546 | const char *connect_server = purple_account_get_string(account, | |
| 7014 | 547 | "connect_server", ""); |
| 548 | JabberStream *js; | |
| 10289 | 549 | JabberBuddy *my_jb = NULL; |
| 2086 | 550 | |
| 15884 | 551 | gc->flags |= PURPLE_CONNECTION_HTML; |
| 7014 | 552 | js = gc->proto_data = g_new0(JabberStream, 1); |
| 553 | js->gc = gc; | |
|
8013
03f5b77cdaf0
[gaim-migrate @ 8693]
Olivier Blin <blino@users.sourceforge.net>
parents:
8011
diff
changeset
|
554 | js->fd = -1; |
| 8312 | 555 | js->iq_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, |
| 556 | g_free, g_free); | |
| 557 | js->disco_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, | |
| 7395 | 558 | g_free, g_free); |
| 7014 | 559 | js->buddies = g_hash_table_new_full(g_str_hash, g_str_equal, |
| 7116 | 560 | g_free, (GDestroyNotify)jabber_buddy_free); |
| 7014 | 561 | js->chats = g_hash_table_new_full(g_str_hash, g_str_equal, |
| 8396 | 562 | g_free, (GDestroyNotify)jabber_chat_free); |
| 15884 | 563 | js->user = jabber_id_new(purple_account_get_username(account)); |
| 7322 | 564 | js->next_id = g_random_int(); |
| 15884 | 565 | js->write_buffer = purple_circ_buffer_new(512); |
| 5613 | 566 | |
| 7310 | 567 | if(!js->user) { |
|
16961
b6955f946f8f
s/Jabber/XMPP in user-visible places.
Richard Laager <rlaager@pidgin.im>
parents:
16847
diff
changeset
|
568 | purple_connection_error(gc, _("Invalid XMPP ID")); |
| 7310 | 569 | return; |
| 570 | } | |
|
17008
502623177086
Handle people forgetting to enter a domain. Also, change 'server,' in the account options to 'domain,' which is its proper name, and hopefully less confusion
Sean Egan <seanegan@pidgin.im>
parents:
17007
diff
changeset
|
571 | |
|
502623177086
Handle people forgetting to enter a domain. Also, change 'server,' in the account options to 'domain,' which is its proper name, and hopefully less confusion
Sean Egan <seanegan@pidgin.im>
parents:
17007
diff
changeset
|
572 | if (!js->user->domain || *(js->user->domain) == '\0') { |
|
502623177086
Handle people forgetting to enter a domain. Also, change 'server,' in the account options to 'domain,' which is its proper name, and hopefully less confusion
Sean Egan <seanegan@pidgin.im>
parents:
17007
diff
changeset
|
573 | purple_connection_error(gc, _("Invalid XMPP ID. Domain must be set.")); |
|
502623177086
Handle people forgetting to enter a domain. Also, change 'server,' in the account options to 'domain,' which is its proper name, and hopefully less confusion
Sean Egan <seanegan@pidgin.im>
parents:
17007
diff
changeset
|
574 | return; |
|
502623177086
Handle people forgetting to enter a domain. Also, change 'server,' in the account options to 'domain,' which is its proper name, and hopefully less confusion
Sean Egan <seanegan@pidgin.im>
parents:
17007
diff
changeset
|
575 | } |
|
502623177086
Handle people forgetting to enter a domain. Also, change 'server,' in the account options to 'domain,' which is its proper name, and hopefully less confusion
Sean Egan <seanegan@pidgin.im>
parents:
17007
diff
changeset
|
576 | |
| 7147 | 577 | if(!js->user->resource) { |
| 578 | char *me; | |
| 11939 | 579 | js->user->resource = g_strdup("Home"); |
| 7147 | 580 | if(!js->user->node) { |
| 581 | js->user->node = js->user->domain; | |
| 582 | js->user->domain = g_strdup("jabber.org"); | |
| 583 | } | |
| 584 | me = g_strdup_printf("%s@%s/%s", js->user->node, js->user->domain, | |
| 585 | js->user->resource); | |
| 15884 | 586 | purple_account_set_username(account, me); |
| 7147 | 587 | g_free(me); |
| 7145 | 588 | } |
| 589 | ||
| 15884 | 590 | if((my_jb = jabber_buddy_find(js, purple_account_get_username(account), TRUE))) |
| 10289 | 591 | my_jb->subscription |= JABBER_SUB_BOTH; |
| 592 | ||
| 7014 | 593 | jabber_stream_set_state(js, JABBER_STREAM_CONNECTING); |
| 2956 | 594 | |
| 11387 | 595 | /* if they've got old-ssl mode going, we probably want to ignore SRV lookups */ |
| 15884 | 596 | if(purple_account_get_bool(js->gc->account, "old_ssl", FALSE)) { |
| 597 | if(purple_ssl_is_supported()) { | |
| 598 | js->gsc = purple_ssl_connect(js->gc->account, | |
| 11387 | 599 | connect_server[0] ? connect_server : js->user->domain, |
| 15884 | 600 | purple_account_get_int(account, "port", 5223), jabber_login_callback_ssl, |
| 11387 | 601 | jabber_ssl_connect_failure, js->gc); |
| 7630 | 602 | } else { |
| 15884 | 603 | purple_connection_error(js->gc, _("SSL support unavailable")); |
| 7630 | 604 | } |
| 3311 | 605 | } |
| 3770 | 606 | |
| 11387 | 607 | /* no old-ssl, so if they've specified a connect server, we'll use that, otherwise we'll |
| 608 | * invoke the magic of SRV lookups, to figure out host and port */ | |
| 7014 | 609 | if(!js->gsc) { |
| 11387 | 610 | if(connect_server[0]) { |
| 17052 | 611 | jabber_login_connect(js, js->user->domain, connect_server, purple_account_get_int(account, "port", 5222)); |
| 11387 | 612 | } else { |
| 15884 | 613 | js->srv_query_data = purple_srv_resolve("xmpp-client", |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14358
diff
changeset
|
614 | "tcp", js->user->domain, srv_resolved_cb, js); |
| 11387 | 615 | } |
| 2956 | 616 | } |
| 2086 | 617 | } |
| 618 | ||
| 11387 | 619 | |
| 7072 | 620 | static gboolean |
| 621 | conn_close_cb(gpointer data) | |
| 622 | { | |
| 623 | JabberStream *js = data; | |
| 15884 | 624 | PurpleAccount *account = purple_connection_get_account(js->gc); |
|
10740
a1cb6b819a21
[gaim-migrate @ 12342]
Mark Doliner <markdoliner@pidgin.im>
parents:
10504
diff
changeset
|
625 | |
| 15884 | 626 | purple_account_disconnect(account); |
|
10740
a1cb6b819a21
[gaim-migrate @ 12342]
Mark Doliner <markdoliner@pidgin.im>
parents:
10504
diff
changeset
|
627 | |
| 7072 | 628 | return FALSE; |
| 629 | } | |
| 630 | ||
| 631 | static void | |
| 632 | jabber_connection_schedule_close(JabberStream *js) | |
| 633 | { | |
| 15884 | 634 | purple_timeout_add(0, conn_close_cb, js); |
| 7072 | 635 | } |
| 636 | ||
| 637 | static void | |
| 7395 | 638 | jabber_registration_result_cb(JabberStream *js, xmlnode *packet, gpointer data) |
| 7072 | 639 | { |
| 640 | const char *type = xmlnode_get_attrib(packet, "type"); | |
| 641 | char *buf; | |
| 642 | ||
| 643 | if(!strcmp(type, "result")) { | |
| 644 | buf = g_strdup_printf(_("Registration of %s@%s successful"), | |
| 645 | js->user->node, js->user->domain); | |
| 15884 | 646 | purple_notify_info(NULL, _("Registration Successful"), |
| 7072 | 647 | _("Registration Successful"), buf); |
| 648 | g_free(buf); | |
| 649 | } else { | |
| 8401 | 650 | char *msg = jabber_parse_error(js, packet); |
| 7072 | 651 | |
| 8401 | 652 | if(!msg) |
| 653 | msg = g_strdup(_("Unknown Error")); | |
| 7072 | 654 | |
| 15884 | 655 | purple_notify_error(NULL, _("Registration Failed"), |
| 8401 | 656 | _("Registration Failed"), msg); |
| 657 | g_free(msg); | |
| 7072 | 658 | } |
| 659 | jabber_connection_schedule_close(js); | |
| 660 | } | |
| 661 | ||
| 662 | static void | |
| 15884 | 663 | jabber_register_cb(JabberStream *js, PurpleRequestFields *fields) |
| 7072 | 664 | { |
| 665 | GList *groups, *flds; | |
| 666 | xmlnode *query, *y; | |
| 667 | JabberIq *iq; | |
| 7264 | 668 | char *username; |
| 7072 | 669 | |
| 670 | iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:register"); | |
| 671 | query = xmlnode_get_child(iq->node, "query"); | |
| 672 | ||
| 15884 | 673 | for(groups = purple_request_fields_get_groups(fields); groups; |
| 7072 | 674 | groups = groups->next) { |
| 15884 | 675 | for(flds = purple_request_field_group_get_fields(groups->data); |
| 7072 | 676 | flds; flds = flds->next) { |
| 15884 | 677 | PurpleRequestField *field = flds->data; |
| 678 | const char *id = purple_request_field_get_id(field); | |
| 679 | const char *value = purple_request_field_string_get_value(field); | |
| 7072 | 680 | |
| 681 | if(!strcmp(id, "username")) { | |
| 682 | y = xmlnode_new_child(query, "username"); | |
| 683 | } else if(!strcmp(id, "password")) { | |
| 684 | y = xmlnode_new_child(query, "password"); | |
| 685 | } else if(!strcmp(id, "name")) { | |
| 686 | y = xmlnode_new_child(query, "name"); | |
| 687 | } else if(!strcmp(id, "email")) { | |
| 688 | y = xmlnode_new_child(query, "email"); | |
| 689 | } else if(!strcmp(id, "nick")) { | |
| 690 | y = xmlnode_new_child(query, "nick"); | |
| 691 | } else if(!strcmp(id, "first")) { | |
| 692 | y = xmlnode_new_child(query, "first"); | |
| 693 | } else if(!strcmp(id, "last")) { | |
| 694 | y = xmlnode_new_child(query, "last"); | |
| 695 | } else if(!strcmp(id, "address")) { | |
| 696 | y = xmlnode_new_child(query, "address"); | |
| 697 | } else if(!strcmp(id, "city")) { | |
| 698 | y = xmlnode_new_child(query, "city"); | |
| 699 | } else if(!strcmp(id, "state")) { | |
| 700 | y = xmlnode_new_child(query, "state"); | |
| 701 | } else if(!strcmp(id, "zip")) { | |
| 702 | y = xmlnode_new_child(query, "zip"); | |
| 703 | } else if(!strcmp(id, "phone")) { | |
| 704 | y = xmlnode_new_child(query, "phone"); | |
| 705 | } else if(!strcmp(id, "url")) { | |
| 706 | y = xmlnode_new_child(query, "url"); | |
| 707 | } else if(!strcmp(id, "date")) { | |
| 708 | y = xmlnode_new_child(query, "date"); | |
| 709 | } else { | |
| 710 | continue; | |
| 711 | } | |
| 712 | xmlnode_insert_data(y, value, -1); | |
| 7264 | 713 | if(!strcmp(id, "username")) { |
| 714 | if(js->user->node) | |
| 715 | g_free(js->user->node); | |
| 716 | js->user->node = g_strdup(value); | |
| 717 | } | |
| 7072 | 718 | } |
| 719 | } | |
| 720 | ||
| 7264 | 721 | username = g_strdup_printf("%s@%s/%s", js->user->node, js->user->domain, |
| 722 | js->user->resource); | |
| 15884 | 723 | purple_account_set_username(js->gc->account, username); |
| 7264 | 724 | g_free(username); |
| 725 | ||
| 7395 | 726 | jabber_iq_set_callback(iq, jabber_registration_result_cb, NULL); |
| 7072 | 727 | |
| 728 | jabber_iq_send(iq); | |
| 729 | ||
| 730 | } | |
| 731 | ||
| 732 | static void | |
| 15884 | 733 | jabber_register_cancel_cb(JabberStream *js, PurpleRequestFields *fields) |
| 7072 | 734 | { |
| 735 | jabber_connection_schedule_close(js); | |
| 736 | } | |
| 737 | ||
| 7923 | 738 | static void jabber_register_x_data_cb(JabberStream *js, xmlnode *result, gpointer data) |
| 739 | { | |
| 740 | xmlnode *query; | |
| 741 | JabberIq *iq; | |
| 742 | ||
| 743 | iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:register"); | |
| 744 | query = xmlnode_get_child(iq->node, "query"); | |
| 745 | ||
| 746 | xmlnode_insert_child(query, result); | |
| 747 | ||
| 748 | jabber_iq_set_callback(iq, jabber_registration_result_cb, NULL); | |
| 749 | jabber_iq_send(iq); | |
| 750 | } | |
| 751 | ||
| 7072 | 752 | void jabber_register_parse(JabberStream *js, xmlnode *packet) |
| 753 | { | |
| 14356 | 754 | const char *type; |
| 755 | if(!(type = xmlnode_get_attrib(packet, "type")) || strcmp(type, "result")) | |
| 756 | return; | |
| 757 | ||
| 7072 | 758 | if(js->registration) { |
| 15884 | 759 | PurpleRequestFields *fields; |
| 760 | PurpleRequestFieldGroup *group; | |
| 761 | PurpleRequestField *field; | |
| 7923 | 762 | xmlnode *query, *x, *y; |
| 7072 | 763 | char *instructions; |
| 764 | ||
| 765 | /* get rid of the login thingy */ | |
| 15884 | 766 | purple_connection_set_state(js->gc, PURPLE_CONNECTED); |
| 7072 | 767 | |
| 768 | query = xmlnode_get_child(packet, "query"); | |
| 769 | ||
| 770 | if(xmlnode_get_child(query, "registered")) { | |
| 15884 | 771 | purple_notify_error(NULL, _("Already Registered"), |
| 7072 | 772 | _("Already Registered"), NULL); |
| 773 | jabber_connection_schedule_close(js); | |
| 774 | return; | |
| 775 | } | |
| 776 | ||
| 8398 | 777 | if((x = xmlnode_get_child_with_namespace(packet, "x", |
| 778 | "jabber:x:data"))) { | |
| 779 | jabber_x_data_request(js, x, jabber_register_x_data_cb, NULL); | |
| 780 | return; | |
| 781 | } else if((x = xmlnode_get_child_with_namespace(packet, "x", | |
| 782 | "jabber:x:oob"))) { | |
| 783 | xmlnode *url; | |
| 7923 | 784 | |
| 8398 | 785 | if((url = xmlnode_get_child(x, "url"))) { |
| 786 | char *href; | |
| 787 | if((href = xmlnode_get_data(url))) { | |
| 15884 | 788 | purple_notify_uri(NULL, href); |
| 8398 | 789 | g_free(href); |
| 790 | js->gc->wants_to_die = TRUE; | |
| 791 | jabber_connection_schedule_close(js); | |
| 792 | return; | |
| 793 | } | |
| 7923 | 794 | } |
| 795 | } | |
| 796 | ||
| 797 | /* as a last resort, use the old jabber:iq:register syntax */ | |
| 798 | ||
| 15884 | 799 | fields = purple_request_fields_new(); |
| 800 | group = purple_request_field_group_new(NULL); | |
| 801 | purple_request_fields_add_group(fields, group); | |
| 7072 | 802 | |
| 15884 | 803 | field = purple_request_field_string_new("username", _("Username"), |
| 7072 | 804 | js->user->node, FALSE); |
| 15884 | 805 | purple_request_field_group_add_field(group, field); |
| 7072 | 806 | |
| 15884 | 807 | field = purple_request_field_string_new("password", _("Password"), |
| 808 | purple_connection_get_password(js->gc), FALSE); | |
| 809 | purple_request_field_string_set_masked(field, TRUE); | |
| 810 | purple_request_field_group_add_field(group, field); | |
| 7072 | 811 | |
| 812 | if(xmlnode_get_child(query, "name")) { | |
| 15884 | 813 | field = purple_request_field_string_new("name", _("Name"), |
| 814 | purple_account_get_alias(js->gc->account), FALSE); | |
| 815 | purple_request_field_group_add_field(group, field); | |
| 7072 | 816 | } |
| 817 | if(xmlnode_get_child(query, "email")) { | |
| 15884 | 818 | field = purple_request_field_string_new("email", _("E-mail"), |
| 7072 | 819 | NULL, FALSE); |
| 15884 | 820 | purple_request_field_group_add_field(group, field); |
| 7072 | 821 | } |
| 822 | if(xmlnode_get_child(query, "nick")) { | |
| 15884 | 823 | field = purple_request_field_string_new("nick", _("Nickname"), |
| 7072 | 824 | NULL, FALSE); |
| 15884 | 825 | purple_request_field_group_add_field(group, field); |
| 7072 | 826 | } |
| 827 | if(xmlnode_get_child(query, "first")) { | |
| 15884 | 828 | field = purple_request_field_string_new("first", _("First name"), |
| 7072 | 829 | NULL, FALSE); |
| 15884 | 830 | purple_request_field_group_add_field(group, field); |
| 7072 | 831 | } |
| 832 | if(xmlnode_get_child(query, "last")) { | |
| 15884 | 833 | field = purple_request_field_string_new("last", _("Last name"), |
| 7072 | 834 | NULL, FALSE); |
| 15884 | 835 | purple_request_field_group_add_field(group, field); |
| 7072 | 836 | } |
| 837 | if(xmlnode_get_child(query, "address")) { | |
| 15884 | 838 | field = purple_request_field_string_new("address", _("Address"), |
| 7072 | 839 | NULL, FALSE); |
| 15884 | 840 | purple_request_field_group_add_field(group, field); |
| 7072 | 841 | } |
| 842 | if(xmlnode_get_child(query, "city")) { | |
| 15884 | 843 | field = purple_request_field_string_new("city", _("City"), |
| 7072 | 844 | NULL, FALSE); |
| 15884 | 845 | purple_request_field_group_add_field(group, field); |
| 7072 | 846 | } |
| 847 | if(xmlnode_get_child(query, "state")) { | |
| 15884 | 848 | field = purple_request_field_string_new("state", _("State"), |
| 7072 | 849 | NULL, FALSE); |
| 15884 | 850 | purple_request_field_group_add_field(group, field); |
| 7072 | 851 | } |
| 852 | if(xmlnode_get_child(query, "zip")) { | |
| 15884 | 853 | field = purple_request_field_string_new("zip", _("Postal code"), |
| 7072 | 854 | NULL, FALSE); |
| 15884 | 855 | purple_request_field_group_add_field(group, field); |
| 7072 | 856 | } |
| 857 | if(xmlnode_get_child(query, "phone")) { | |
| 15884 | 858 | field = purple_request_field_string_new("phone", _("Phone"), |
| 7072 | 859 | NULL, FALSE); |
| 15884 | 860 | purple_request_field_group_add_field(group, field); |
| 7072 | 861 | } |
| 862 | if(xmlnode_get_child(query, "url")) { | |
| 15884 | 863 | field = purple_request_field_string_new("url", _("URL"), |
| 7072 | 864 | NULL, FALSE); |
| 15884 | 865 | purple_request_field_group_add_field(group, field); |
| 7072 | 866 | } |
| 867 | if(xmlnode_get_child(query, "date")) { | |
| 15884 | 868 | field = purple_request_field_string_new("date", _("Date"), |
| 7072 | 869 | NULL, FALSE); |
| 15884 | 870 | purple_request_field_group_add_field(group, field); |
| 7072 | 871 | } |
| 872 | ||
| 873 | if((y = xmlnode_get_child(query, "instructions"))) | |
| 874 | instructions = xmlnode_get_data(y); | |
| 875 | else | |
| 876 | instructions = g_strdup(_("Please fill out the information below " | |
| 877 | "to register your new account.")); | |
| 878 | ||
|
16961
b6955f946f8f
s/Jabber/XMPP in user-visible places.
Richard Laager <rlaager@pidgin.im>
parents:
16847
diff
changeset
|
879 | purple_request_fields(js->gc, _("Register New XMPP Account"), |
|
b6955f946f8f
s/Jabber/XMPP in user-visible places.
Richard Laager <rlaager@pidgin.im>
parents:
16847
diff
changeset
|
880 | _("Register New XMPP Account"), instructions, fields, |
| 7072 | 881 | _("Register"), G_CALLBACK(jabber_register_cb), |
|
16490
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
16302
diff
changeset
|
882 | _("Cancel"), G_CALLBACK(jabber_register_cancel_cb), |
|
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
16302
diff
changeset
|
883 | purple_connection_get_account(js->gc), NULL, NULL, |
|
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
16302
diff
changeset
|
884 | js); |
|
14140
fcb570e0b2db
[gaim-migrate @ 16699]
Daniel Atallah <datallah@pidgin.im>
parents:
14115
diff
changeset
|
885 | |
|
fcb570e0b2db
[gaim-migrate @ 16699]
Daniel Atallah <datallah@pidgin.im>
parents:
14115
diff
changeset
|
886 | g_free(instructions); |
| 7072 | 887 | } |
| 888 | } | |
| 889 | ||
| 8016 | 890 | void jabber_register_start(JabberStream *js) |
| 7072 | 891 | { |
| 892 | JabberIq *iq; | |
| 893 | ||
| 894 | iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:register"); | |
| 895 | jabber_iq_send(iq); | |
| 896 | } | |
| 897 | ||
|
16302
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
898 | void jabber_register_account(PurpleAccount *account) |
| 7072 | 899 | { |
| 15884 | 900 | PurpleConnection *gc = purple_account_get_connection(account); |
| 7072 | 901 | JabberStream *js; |
| 10289 | 902 | JabberBuddy *my_jb = NULL; |
| 15884 | 903 | const char *connect_server = purple_account_get_string(account, |
| 7072 | 904 | "connect_server", ""); |
| 905 | const char *server; | |
| 906 | ||
| 907 | js = gc->proto_data = g_new0(JabberStream, 1); | |
| 908 | js->gc = gc; | |
| 909 | js->registration = TRUE; | |
| 8312 | 910 | js->iq_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, |
| 911 | g_free, g_free); | |
| 912 | js->disco_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, | |
| 7395 | 913 | g_free, g_free); |
| 15884 | 914 | js->user = jabber_id_new(purple_account_get_username(account)); |
| 7322 | 915 | js->next_id = g_random_int(); |
| 7072 | 916 | |
| 7310 | 917 | if(!js->user) { |
|
16961
b6955f946f8f
s/Jabber/XMPP in user-visible places.
Richard Laager <rlaager@pidgin.im>
parents:
16847
diff
changeset
|
918 | purple_connection_error(gc, _("Invalid XMPP ID")); |
| 7310 | 919 | return; |
| 920 | } | |
| 921 | ||
| 15884 | 922 | js->write_buffer = purple_circ_buffer_new(512); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
923 | |
| 7147 | 924 | if(!js->user->resource) { |
| 925 | char *me; | |
| 11939 | 926 | js->user->resource = g_strdup("Home"); |
| 7147 | 927 | if(!js->user->node) { |
| 928 | js->user->node = js->user->domain; | |
| 929 | js->user->domain = g_strdup("jabber.org"); | |
| 930 | } | |
| 931 | me = g_strdup_printf("%s@%s/%s", js->user->node, js->user->domain, | |
| 932 | js->user->resource); | |
| 15884 | 933 | purple_account_set_username(account, me); |
| 7147 | 934 | g_free(me); |
| 935 | } | |
| 936 | ||
| 15884 | 937 | if((my_jb = jabber_buddy_find(js, purple_account_get_username(account), TRUE))) |
| 10289 | 938 | my_jb->subscription |= JABBER_SUB_BOTH; |
| 939 | ||
| 7072 | 940 | server = connect_server[0] ? connect_server : js->user->domain; |
| 941 | ||
| 942 | jabber_stream_set_state(js, JABBER_STREAM_CONNECTING); | |
| 943 | ||
| 15884 | 944 | if(purple_account_get_bool(account, "old_ssl", FALSE)) { |
| 945 | if(purple_ssl_is_supported()) { | |
| 946 | js->gsc = purple_ssl_connect(account, server, | |
| 947 | purple_account_get_int(account, "port", 5222), | |
| 7630 | 948 | jabber_login_callback_ssl, jabber_ssl_connect_failure, gc); |
| 949 | } else { | |
| 15884 | 950 | purple_connection_error(gc, _("SSL support unavailable")); |
| 7630 | 951 | } |
| 7072 | 952 | } |
| 953 | ||
| 954 | if(!js->gsc) { | |
| 15069 | 955 | if (connect_server[0]) { |
| 17052 | 956 | jabber_login_connect(js, js->user->domain, server, |
| 15884 | 957 | purple_account_get_int(account, |
| 15069 | 958 | "port", 5222)); |
| 959 | } else { | |
| 15884 | 960 | js->srv_query_data = purple_srv_resolve("xmpp-client", |
| 15069 | 961 | "tcp", |
| 962 | js->user->domain, | |
| 963 | srv_resolved_cb, | |
| 964 | js); | |
| 965 | } | |
| 7072 | 966 | } |
| 967 | } | |
| 968 | ||
|
16302
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
969 | void jabber_close(PurpleConnection *gc) |
| 2086 | 970 | { |
| 7014 | 971 | JabberStream *js = gc->proto_data; |
| 2956 | 972 | |
| 14004 | 973 | /* Don't perform any actions on the ssl connection |
| 974 | * if we were forcibly disconnected because it will crash | |
| 975 | * on some SSL backends. | |
|
13154
1a93fddf2a9a
[gaim-migrate @ 15516]
Evan Schoenberg <evands@pidgin.im>
parents:
13051
diff
changeset
|
976 | */ |
|
1a93fddf2a9a
[gaim-migrate @ 15516]
Evan Schoenberg <evands@pidgin.im>
parents:
13051
diff
changeset
|
977 | if (!gc->disconnect_timeout) |
| 14003 | 978 | jabber_send_raw(js, "</stream:stream>", -1); |
| 3311 | 979 | |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14358
diff
changeset
|
980 | if (js->srv_query_data) |
| 15884 | 981 | purple_srv_cancel(js->srv_query_data); |
|
14370
12ef3d4096ee
[gaim-migrate @ 16998]
Mark Doliner <markdoliner@pidgin.im>
parents:
14358
diff
changeset
|
982 | |
| 7014 | 983 | if(js->gsc) { |
|
13243
5a127fc7db90
[gaim-migrate @ 15608]
Evan Schoenberg <evands@pidgin.im>
parents:
13238
diff
changeset
|
984 | #ifdef HAVE_OPENSSL |
|
5a127fc7db90
[gaim-migrate @ 15608]
Evan Schoenberg <evands@pidgin.im>
parents:
13238
diff
changeset
|
985 | if (!gc->disconnect_timeout) |
| 13385 | 986 | #endif |
| 15884 | 987 | purple_ssl_close(js->gsc); |
| 8360 | 988 | } else if (js->fd > 0) { |
| 7072 | 989 | if(js->gc->inpa) |
| 15884 | 990 | purple_input_remove(js->gc->inpa); |
| 7014 | 991 | close(js->fd); |
| 992 | } | |
|
15363
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15344
diff
changeset
|
993 | |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15344
diff
changeset
|
994 | jabber_buddy_remove_all_pending_buddy_info_requests(js); |
|
f6b9d1e3d0cb
[gaim-migrate @ 18092]
Evan Schoenberg <evands@pidgin.im>
parents:
15344
diff
changeset
|
995 | |
| 8312 | 996 | if(js->iq_callbacks) |
| 997 | g_hash_table_destroy(js->iq_callbacks); | |
| 998 | if(js->disco_callbacks) | |
| 999 | g_hash_table_destroy(js->disco_callbacks); | |
| 7072 | 1000 | if(js->buddies) |
| 1001 | g_hash_table_destroy(js->buddies); | |
| 1002 | if(js->chats) | |
| 1003 | g_hash_table_destroy(js->chats); | |
| 8043 | 1004 | while(js->chat_servers) { |
| 1005 | g_free(js->chat_servers->data); | |
| 1006 | js->chat_servers = g_list_delete_link(js->chat_servers, js->chat_servers); | |
| 1007 | } | |
| 11675 | 1008 | while(js->user_directories) { |
| 1009 | g_free(js->user_directories->data); | |
| 1010 | js->user_directories = g_list_delete_link(js->user_directories, js->user_directories); | |
| 1011 | } | |
| 7014 | 1012 | if(js->stream_id) |
| 1013 | g_free(js->stream_id); | |
| 7587 | 1014 | if(js->user) |
| 1015 | jabber_id_free(js->user); | |
| 10189 | 1016 | if(js->avatar_hash) |
| 1017 | g_free(js->avatar_hash); | |
| 15884 | 1018 | purple_circ_buffer_destroy(js->write_buffer); |
|
13201
8c224ef70efa
[gaim-migrate @ 15563]
Daniel Atallah <datallah@pidgin.im>
parents:
13154
diff
changeset
|
1019 | if(js->writeh) |
| 15884 | 1020 | purple_input_remove(js->writeh); |
| 12508 | 1021 | #ifdef HAVE_CYRUS_SASL |
| 1022 | if(js->sasl) | |
| 1023 | sasl_dispose(&js->sasl); | |
| 1024 | if(js->sasl_mechs) | |
| 1025 | g_string_free(js->sasl_mechs, TRUE); | |
| 1026 | if(js->sasl_cb) | |
| 1027 | g_free(js->sasl_cb); | |
|
15800
2d0ec4fe2681
pass the correct domain to cyrus sasl (sf patch 1663064)
Nathan Walp <nwalp@pidgin.im>
parents:
15783
diff
changeset
|
1028 | if(js->serverFQDN) |
|
2d0ec4fe2681
pass the correct domain to cyrus sasl (sf patch 1663064)
Nathan Walp <nwalp@pidgin.im>
parents:
15783
diff
changeset
|
1029 | g_free(js->serverFQDN); |
| 12508 | 1030 | #endif |
| 15198 | 1031 | g_free(js->server_name); |
| 15225 | 1032 | g_free(js->gmail_last_time); |
| 1033 | g_free(js->gmail_last_tid); | |
| 7014 | 1034 | g_free(js); |
|
11389
c1e05b75b0b0
[gaim-migrate @ 13617]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
11387
diff
changeset
|
1035 | |
|
c1e05b75b0b0
[gaim-migrate @ 13617]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
11387
diff
changeset
|
1036 | gc->proto_data = NULL; |
| 5093 | 1037 | } |
| 1038 | ||
| 7014 | 1039 | void jabber_stream_set_state(JabberStream *js, JabberStreamState state) |
|
3105
8c23b0ec1036
[gaim-migrate @ 3119]
Jim Seymour <jseymour@users.sourceforge.net>
parents:
3074
diff
changeset
|
1040 | { |
| 7014 | 1041 | js->state = state; |
| 1042 | switch(state) { | |
| 1043 | case JABBER_STREAM_OFFLINE: | |
| 1044 | break; | |
| 1045 | case JABBER_STREAM_CONNECTING: | |
| 15884 | 1046 | purple_connection_update_progress(js->gc, _("Connecting"), 1, |
| 7014 | 1047 | JABBER_CONNECT_STEPS); |
| 1048 | break; | |
| 1049 | case JABBER_STREAM_INITIALIZING: | |
| 15884 | 1050 | purple_connection_update_progress(js->gc, _("Initializing Stream"), |
| 7014 | 1051 | js->gsc ? 5 : 2, JABBER_CONNECT_STEPS); |
| 1052 | jabber_stream_init(js); | |
| 1053 | break; | |
| 1054 | case JABBER_STREAM_AUTHENTICATING: | |
| 15884 | 1055 | purple_connection_update_progress(js->gc, _("Authenticating"), |
| 7014 | 1056 | js->gsc ? 6 : 3, JABBER_CONNECT_STEPS); |
| 8296 | 1057 | if(js->protocol_version == JABBER_PROTO_0_9 && js->registration) { |
| 1058 | jabber_register_start(js); | |
| 1059 | } else if(js->auth_type == JABBER_AUTH_IQ_AUTH) { | |
| 1060 | jabber_auth_start_old(js); | |
| 8016 | 1061 | } |
| 7014 | 1062 | break; |
| 1063 | case JABBER_STREAM_REINITIALIZING: | |
| 15884 | 1064 | purple_connection_update_progress(js->gc, _("Re-initializing Stream"), |
|
14115
a90fe6e83527
[gaim-migrate @ 16666]
Evan Schoenberg <evands@pidgin.im>
parents:
14062
diff
changeset
|
1065 | (js->gsc ? 7 : 4), JABBER_CONNECT_STEPS); |
|
16847
cd87fc9c6856
this should fix jabber buddy icons (but it will re-introduce the behavior of overwriting your vCard whenever you sign in).
Nathan Walp <nwalp@pidgin.im>
parents:
16799
diff
changeset
|
1066 | |
| 14700 | 1067 | /* The stream will be reinitialized later, in jabber_recv_cb_ssl() */ |
| 1068 | js->reinit = TRUE; | |
|
16847
cd87fc9c6856
this should fix jabber buddy icons (but it will re-introduce the behavior of overwriting your vCard whenever you sign in).
Nathan Walp <nwalp@pidgin.im>
parents:
16799
diff
changeset
|
1069 | |
| 7014 | 1070 | break; |
| 1071 | case JABBER_STREAM_CONNECTED: | |
|
16847
cd87fc9c6856
this should fix jabber buddy icons (but it will re-introduce the behavior of overwriting your vCard whenever you sign in).
Nathan Walp <nwalp@pidgin.im>
parents:
16799
diff
changeset
|
1072 | /* now we can alert the core that we're ready to send status */ |
| 15884 | 1073 | purple_connection_set_state(js->gc, PURPLE_CONNECTED); |
| 8312 | 1074 | jabber_disco_items_server(js); |
| 7014 | 1075 | break; |
|
3105
8c23b0ec1036
[gaim-migrate @ 3119]
Jim Seymour <jseymour@users.sourceforge.net>
parents:
3074
diff
changeset
|
1076 | } |
|
8c23b0ec1036
[gaim-migrate @ 3119]
Jim Seymour <jseymour@users.sourceforge.net>
parents:
3074
diff
changeset
|
1077 | } |
|
8c23b0ec1036
[gaim-migrate @ 3119]
Jim Seymour <jseymour@users.sourceforge.net>
parents:
3074
diff
changeset
|
1078 | |
| 7014 | 1079 | char *jabber_get_next_id(JabberStream *js) |
| 2086 | 1080 | { |
| 15884 | 1081 | return g_strdup_printf("purple%x", js->next_id++); |
| 2086 | 1082 | } |
| 1083 | ||
|
14453
1cc75906700c
[gaim-migrate @ 17098]
Mark Doliner <markdoliner@pidgin.im>
parents:
14375
diff
changeset
|
1084 | |
|
16302
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
1085 | void jabber_idle_set(PurpleConnection *gc, int idle) |
|
3340
7e59a209931d
[gaim-migrate @ 3359]
Jim Seymour <jseymour@users.sourceforge.net>
parents:
3337
diff
changeset
|
1086 | { |
| 7014 | 1087 | JabberStream *js = gc->proto_data; |
|
3340
7e59a209931d
[gaim-migrate @ 3359]
Jim Seymour <jseymour@users.sourceforge.net>
parents:
3337
diff
changeset
|
1088 | |
| 7014 | 1089 | js->idle = idle ? time(NULL) - idle : idle; |
|
3314
12fa45677717
[gaim-migrate @ 3332]
Jim Seymour <jseymour@users.sourceforge.net>
parents:
3311
diff
changeset
|
1090 | } |
|
12fa45677717
[gaim-migrate @ 3332]
Jim Seymour <jseymour@users.sourceforge.net>
parents:
3311
diff
changeset
|
1091 | |
|
16302
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
1092 | const char *jabber_list_icon(PurpleAccount *a, PurpleBuddy *b) |
| 2086 | 1093 | { |
| 4687 | 1094 | return "jabber"; |
| 1095 | } | |
| 4916 | 1096 | |
|
16302
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
1097 | const char* jabber_list_emblem(PurpleBuddy *b) |
| 4916 | 1098 | { |
| 7014 | 1099 | JabberStream *js; |
|
13486
4ea1a712aaa3
[gaim-migrate @ 15861]
Daniel Atallah <datallah@pidgin.im>
parents:
13385
diff
changeset
|
1100 | JabberBuddy *jb = NULL; |
| 7014 | 1101 | |
| 1102 | if(!b->account->gc) | |
|
15558
6fb7a0ad8a0b
clean up some compile warnings
Nathan Walp <nwalp@pidgin.im>
parents:
15524
diff
changeset
|
1103 | return NULL; |
|
6fb7a0ad8a0b
clean up some compile warnings
Nathan Walp <nwalp@pidgin.im>
parents:
15524
diff
changeset
|
1104 | |
| 7014 | 1105 | js = b->account->gc->proto_data; |
|
13486
4ea1a712aaa3
[gaim-migrate @ 15861]
Daniel Atallah <datallah@pidgin.im>
parents:
13385
diff
changeset
|
1106 | if(js) |
|
4ea1a712aaa3
[gaim-migrate @ 15861]
Daniel Atallah <datallah@pidgin.im>
parents:
13385
diff
changeset
|
1107 | jb = jabber_buddy_find(js, b->name, FALSE); |
| 5135 | 1108 | |
| 15884 | 1109 | if(!PURPLE_BUDDY_IS_ONLINE(b)) { |
| 7014 | 1110 | if(jb && (jb->subscription & JABBER_SUB_PENDING || |
| 1111 | !(jb->subscription & JABBER_SUB_TO))) | |
| 15524 | 1112 | return "not-authorized"; |
| 2086 | 1113 | } |
| 15524 | 1114 | return NULL; |
| 4916 | 1115 | } |
| 2086 | 1116 | |
|
16302
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
1117 | char *jabber_status_text(PurpleBuddy *b) |
|
2205
68c42ce8eba6
[gaim-migrate @ 2215]
Eric Warmenhoven <warmenhoven@yahoo.com>
parents:
2170
diff
changeset
|
1118 | { |
| 7014 | 1119 | char *ret = NULL; |
|
18310
dbc5240f6bf5
Fix a crash when you have an IM window open on a jabber account and the
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
18235
diff
changeset
|
1120 | JabberBuddy *jb = NULL; |
|
dbc5240f6bf5
Fix a crash when you have an IM window open on a jabber account and the
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
18235
diff
changeset
|
1121 | |
|
dbc5240f6bf5
Fix a crash when you have an IM window open on a jabber account and the
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
18235
diff
changeset
|
1122 | if (b->account->gc && b->account->gc->proto_data) |
|
dbc5240f6bf5
Fix a crash when you have an IM window open on a jabber account and the
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
18235
diff
changeset
|
1123 | jb = jabber_buddy_find(b->account->gc->proto_data, b->name, FALSE); |
| 5234 | 1124 | |
| 15884 | 1125 | if(jb && !PURPLE_BUDDY_IS_ONLINE(b) && (jb->subscription & JABBER_SUB_PENDING || !(jb->subscription & JABBER_SUB_TO))) { |
| 7014 | 1126 | ret = g_strdup(_("Not Authorized")); |
| 15884 | 1127 | } else if(jb && !PURPLE_BUDDY_IS_ONLINE(b) && jb->error_msg) { |
| 7014 | 1128 | ret = g_strdup(jb->error_msg); |
| 2956 | 1129 | } else { |
|
7095
17d2b54254f8
[gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents:
7072
diff
changeset
|
1130 | char *stripped; |
|
17d2b54254f8
[gaim-migrate @ 7660]
Christian Hammond <chipx86@chipx86.com>
parents:
7072
diff
changeset
|
1131 | |
| 15884 | 1132 | if(!(stripped = purple_markup_strip_html(jabber_buddy_get_status_msg(jb)))) { |
| 1133 | PurpleStatus *status = purple_presence_get_active_status(purple_buddy_get_presence(b)); | |
| 2956 | 1134 | |
| 15884 | 1135 | if(!purple_status_is_available(status)) |
| 1136 | stripped = g_strdup(purple_status_get_name(status)); | |
| 9954 | 1137 | } |
| 2086 | 1138 | |
| 7014 | 1139 | if(stripped) { |
| 1140 | ret = g_markup_escape_text(stripped, -1); | |
| 1141 | g_free(stripped); | |
| 1142 | } | |
| 2086 | 1143 | } |
| 1144 | ||
| 7014 | 1145 | return ret; |
| 2956 | 1146 | } |
| 1147 | ||
|
16302
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
1148 | void jabber_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full) |
| 4744 | 1149 | { |
| 11609 | 1150 | JabberBuddy *jb; |
| 1151 | ||
|
12970
c2f3b4dcf711
[gaim-migrate @ 15323]
Richard Laager <rlaager@pidgin.im>
parents:
12948
diff
changeset
|
1152 | g_return_if_fail(b != NULL); |
|
c2f3b4dcf711
[gaim-migrate @ 15323]
Richard Laager <rlaager@pidgin.im>
parents:
12948
diff
changeset
|
1153 | g_return_if_fail(b->account != NULL); |
|
c2f3b4dcf711
[gaim-migrate @ 15323]
Richard Laager <rlaager@pidgin.im>
parents:
12948
diff
changeset
|
1154 | g_return_if_fail(b->account->gc != NULL); |
|
c2f3b4dcf711
[gaim-migrate @ 15323]
Richard Laager <rlaager@pidgin.im>
parents:
12948
diff
changeset
|
1155 | g_return_if_fail(b->account->gc->proto_data != NULL); |
| 11609 | 1156 | |
| 1157 | jb = jabber_buddy_find(b->account->gc->proto_data, b->name, | |
| 7014 | 1158 | FALSE); |
| 1159 | ||
| 8194 | 1160 | if(jb) { |
| 11609 | 1161 | JabberBuddyResource *jbr = NULL; |
| 8194 | 1162 | const char *sub; |
| 11609 | 1163 | GList *l; |
| 1164 | ||
|
12948
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12944
diff
changeset
|
1165 | if (full) { |
|
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12944
diff
changeset
|
1166 | if(jb->subscription & JABBER_SUB_FROM) { |
|
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12944
diff
changeset
|
1167 | if(jb->subscription & JABBER_SUB_TO) |
|
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12944
diff
changeset
|
1168 | sub = _("Both"); |
|
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12944
diff
changeset
|
1169 | else if(jb->subscription & JABBER_SUB_PENDING) |
|
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12944
diff
changeset
|
1170 | sub = _("From (To pending)"); |
|
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12944
diff
changeset
|
1171 | else |
|
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12944
diff
changeset
|
1172 | sub = _("From"); |
|
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12944
diff
changeset
|
1173 | } else { |
|
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12944
diff
changeset
|
1174 | if(jb->subscription & JABBER_SUB_TO) |
|
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12944
diff
changeset
|
1175 | sub = _("To"); |
|
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12944
diff
changeset
|
1176 | else if(jb->subscription & JABBER_SUB_PENDING) |
|
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12944
diff
changeset
|
1177 | sub = _("None (To pending)"); |
|
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12944
diff
changeset
|
1178 | else |
|
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12944
diff
changeset
|
1179 | sub = _("None"); |
|
0867a553ed26
[gaim-migrate @ 15301]
Richard Laager <rlaager@pidgin.im>
parents:
12944
diff
changeset
|
1180 | } |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15198
diff
changeset
|
1181 | |
| 15884 | 1182 | purple_notify_user_info_add_pair(user_info, _("Subscription"), sub); |
| 8194 | 1183 | } |
| 1184 | ||
| 11609 | 1185 | for(l=jb->resources; l; l = l->next) { |
| 8194 | 1186 | char *text = NULL; |
| 11609 | 1187 | char *res = NULL; |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15198
diff
changeset
|
1188 | char *label, *value; |
|
12944
da8f60d43d88
[gaim-migrate @ 15297]
Richard Laager <rlaager@pidgin.im>
parents:
12943
diff
changeset
|
1189 | const char *state; |
| 11609 | 1190 | |
| 1191 | jbr = l->data; | |
| 1192 | ||
| 8194 | 1193 | if(jbr->status) { |
| 11646 | 1194 | char *tmp; |
| 15884 | 1195 | text = purple_strreplace(jbr->status, "\n", "<br />\n"); |
| 1196 | tmp = purple_markup_strip_html(text); | |
| 11646 | 1197 | g_free(text); |
| 1198 | text = g_markup_escape_text(tmp, -1); | |
| 1199 | g_free(tmp); | |
| 8194 | 1200 | } |
| 1201 | ||
| 11609 | 1202 | if(jbr->name) |
| 11610 | 1203 | res = g_strdup_printf(" (%s)", jbr->name); |
| 11609 | 1204 | |
|
12944
da8f60d43d88
[gaim-migrate @ 15297]
Richard Laager <rlaager@pidgin.im>
parents:
12943
diff
changeset
|
1205 | state = jabber_buddy_state_get_name(jbr->state); |
| 15884 | 1206 | if (text != NULL && !purple_utf8_strcasecmp(state, text)) { |
|
12944
da8f60d43d88
[gaim-migrate @ 15297]
Richard Laager <rlaager@pidgin.im>
parents:
12943
diff
changeset
|
1207 | g_free(text); |
|
da8f60d43d88
[gaim-migrate @ 15297]
Richard Laager <rlaager@pidgin.im>
parents:
12943
diff
changeset
|
1208 | text = NULL; |
|
da8f60d43d88
[gaim-migrate @ 15297]
Richard Laager <rlaager@pidgin.im>
parents:
12943
diff
changeset
|
1209 | } |
|
da8f60d43d88
[gaim-migrate @ 15297]
Richard Laager <rlaager@pidgin.im>
parents:
12943
diff
changeset
|
1210 | |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15198
diff
changeset
|
1211 | label = g_strdup_printf("%s%s", |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15198
diff
changeset
|
1212 | _("Status"), (res ? res : "")); |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15198
diff
changeset
|
1213 | value = g_strdup_printf("%s%s%s", |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15198
diff
changeset
|
1214 | state, |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15198
diff
changeset
|
1215 | (text ? ": " : ""), |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15198
diff
changeset
|
1216 | (text ? text : "")); |
|
12944
da8f60d43d88
[gaim-migrate @ 15297]
Richard Laager <rlaager@pidgin.im>
parents:
12943
diff
changeset
|
1217 | |
| 15884 | 1218 | purple_notify_user_info_add_pair(user_info, label, value); |
|
15205
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15198
diff
changeset
|
1219 | |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15198
diff
changeset
|
1220 | g_free(label); |
|
f642029b2f97
[gaim-migrate @ 17929]
Evan Schoenberg <evands@pidgin.im>
parents:
15198
diff
changeset
|
1221 | g_free(value); |
|
12944
da8f60d43d88
[gaim-migrate @ 15297]
Richard Laager <rlaager@pidgin.im>
parents:
12943
diff
changeset
|
1222 | g_free(text); |
|
da8f60d43d88
[gaim-migrate @ 15297]
Richard Laager <rlaager@pidgin.im>
parents:
12943
diff
changeset
|
1223 | g_free(res); |
| 11609 | 1224 | } |
| 1225 | ||
| 15884 | 1226 | if(!PURPLE_BUDDY_IS_ONLINE(b) && jb->error_msg) { |
| 1227 | purple_notify_user_info_add_pair(user_info, _("Error"), jb->error_msg); | |
| 8194 | 1228 | } |
| 4745 | 1229 | } |
| 4732 | 1230 | } |
| 1231 | ||
|
16302
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
1232 | GList *jabber_status_types(PurpleAccount *account) |
| 7014 | 1233 | { |
| 15884 | 1234 | PurpleStatusType *type; |
| 9954 | 1235 | GList *types = NULL; |
| 15884 | 1236 | PurpleValue *priority_value; |
| 9954 | 1237 | |
| 15884 | 1238 | priority_value = purple_value_new(PURPLE_TYPE_INT); |
| 1239 | purple_value_set_int(priority_value, 1); | |
| 1240 | type = purple_status_type_new_with_attrs(PURPLE_STATUS_AVAILABLE, | |
|
12595
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1241 | jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_ONLINE), |
|
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1242 | NULL, TRUE, TRUE, FALSE, |
|
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1243 | "priority", _("Priority"), priority_value, |
| 15884 | 1244 | "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
|
12595
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1245 | NULL); |
| 9980 | 1246 | types = g_list_append(types, type); |
| 1247 | ||
| 15884 | 1248 | priority_value = purple_value_new(PURPLE_TYPE_INT); |
| 1249 | purple_value_set_int(priority_value, 1); | |
| 1250 | type = purple_status_type_new_with_attrs(PURPLE_STATUS_AVAILABLE, | |
|
12595
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1251 | jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_CHAT), |
|
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1252 | _("Chatty"), TRUE, TRUE, FALSE, |
|
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1253 | "priority", _("Priority"), priority_value, |
| 15884 | 1254 | "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
|
12595
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1255 | NULL); |
| 9954 | 1256 | types = g_list_append(types, type); |
| 2086 | 1257 | |
| 15884 | 1258 | priority_value = purple_value_new(PURPLE_TYPE_INT); |
| 1259 | purple_value_set_int(priority_value, 0); | |
| 1260 | type = purple_status_type_new_with_attrs(PURPLE_STATUS_AWAY, | |
|
12595
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1261 | jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_AWAY), |
|
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1262 | NULL, TRUE, TRUE, FALSE, |
|
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1263 | "priority", _("Priority"), priority_value, |
| 15884 | 1264 | "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
|
12595
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1265 | NULL); |
| 9954 | 1266 | types = g_list_append(types, type); |
| 1267 | ||
| 15884 | 1268 | priority_value = purple_value_new(PURPLE_TYPE_INT); |
| 1269 | purple_value_set_int(priority_value, 0); | |
| 1270 | type = purple_status_type_new_with_attrs(PURPLE_STATUS_EXTENDED_AWAY, | |
|
12595
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1271 | jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_XA), |
|
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1272 | NULL, TRUE, TRUE, FALSE, |
|
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1273 | "priority", _("Priority"), priority_value, |
| 15884 | 1274 | "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
|
12595
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1275 | NULL); |
| 9954 | 1276 | types = g_list_append(types, type); |
| 1277 | ||
| 15884 | 1278 | priority_value = purple_value_new(PURPLE_TYPE_INT); |
| 1279 | purple_value_set_int(priority_value, 0); | |
| 1280 | type = purple_status_type_new_with_attrs(PURPLE_STATUS_UNAVAILABLE, | |
|
12595
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1281 | jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_DND), |
|
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1282 | _("Do Not Disturb"), TRUE, TRUE, FALSE, |
|
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1283 | "priority", _("Priority"), priority_value, |
| 15884 | 1284 | "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
|
12595
8108c22aa723
[gaim-migrate @ 14925]
Richard Laager <rlaager@pidgin.im>
parents:
12554
diff
changeset
|
1285 | NULL); |
| 9954 | 1286 | types = g_list_append(types, type); |
| 1287 | ||
| 1288 | /* | |
| 8166 | 1289 | if(js->protocol_version == JABBER_PROTO_0_9) |
| 1290 | m = g_list_append(m, _("Invisible")); | |
|
10009
8a4fcc043f47
[gaim-migrate @ 10926]
Mark Doliner <markdoliner@pidgin.im>
parents:
9980
diff
changeset
|
1291 | */ |
| 2086 | 1292 | |
| 15884 | 1293 | type = purple_status_type_new_with_attrs(PURPLE_STATUS_OFFLINE, |
|
12658
4aa7a873628d
[gaim-migrate @ 15001]
Mark Doliner <markdoliner@pidgin.im>
parents:
12646
diff
changeset
|
1294 | jabber_buddy_state_get_status_id(JABBER_BUDDY_STATE_UNAVAILABLE), |
|
4aa7a873628d
[gaim-migrate @ 15001]
Mark Doliner <markdoliner@pidgin.im>
parents:
12646
diff
changeset
|
1295 | NULL, FALSE, TRUE, FALSE, |
| 15884 | 1296 | "message", _("Message"), purple_value_new(PURPLE_TYPE_STRING), |
|
12658
4aa7a873628d
[gaim-migrate @ 15001]
Mark Doliner <markdoliner@pidgin.im>
parents:
12646
diff
changeset
|
1297 | NULL); |
|
4aa7a873628d
[gaim-migrate @ 15001]
Mark Doliner <markdoliner@pidgin.im>
parents:
12646
diff
changeset
|
1298 | types = g_list_append(types, type); |
|
4aa7a873628d
[gaim-migrate @ 15001]
Mark Doliner <markdoliner@pidgin.im>
parents:
12646
diff
changeset
|
1299 | |
| 9954 | 1300 | return types; |
| 2086 | 1301 | } |
| 1302 | ||
| 7395 | 1303 | static void |
| 1304 | jabber_password_change_result_cb(JabberStream *js, xmlnode *packet, | |
| 1305 | gpointer data) | |
| 7124 | 1306 | { |
| 1307 | const char *type; | |
| 1308 | ||
| 1309 | type = xmlnode_get_attrib(packet, "type"); | |
| 1310 | ||
| 9414 | 1311 | if(type && !strcmp(type, "result")) { |
| 15884 | 1312 | purple_notify_info(js->gc, _("Password Changed"), _("Password Changed"), |
| 7124 | 1313 | _("Your password has been changed.")); |
| 1314 | } else { | |
| 8401 | 1315 | char *msg = jabber_parse_error(js, packet); |
| 7124 | 1316 | |
| 15884 | 1317 | purple_notify_error(js->gc, _("Error changing password"), |
| 8401 | 1318 | _("Error changing password"), msg); |
| 1319 | g_free(msg); | |
| 7124 | 1320 | } |
| 1321 | } | |
| 1322 | ||
| 1323 | static void jabber_password_change_cb(JabberStream *js, | |
| 15884 | 1324 | PurpleRequestFields *fields) |
| 7124 | 1325 | { |
| 1326 | const char *p1, *p2; | |
| 1327 | JabberIq *iq; | |
| 1328 | xmlnode *query, *y; | |
| 1329 | ||
| 15884 | 1330 | p1 = purple_request_fields_get_string(fields, "password1"); |
| 1331 | p2 = purple_request_fields_get_string(fields, "password2"); | |
| 7124 | 1332 | |
| 1333 | if(strcmp(p1, p2)) { | |
| 15884 | 1334 | purple_notify_error(js->gc, NULL, _("New passwords do not match."), NULL); |
| 7124 | 1335 | return; |
| 1336 | } | |
| 1337 | ||
| 1338 | iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:register"); | |
| 1339 | ||
| 1340 | xmlnode_set_attrib(iq->node, "to", js->user->domain); | |
| 1341 | ||
| 1342 | query = xmlnode_get_child(iq->node, "query"); | |
| 1343 | ||
| 1344 | y = xmlnode_new_child(query, "username"); | |
| 1345 | xmlnode_insert_data(y, js->user->node, -1); | |
| 1346 | y = xmlnode_new_child(query, "password"); | |
| 1347 | xmlnode_insert_data(y, p1, -1); | |
| 1348 | ||
| 7395 | 1349 | jabber_iq_set_callback(iq, jabber_password_change_result_cb, NULL); |
| 7124 | 1350 | |
| 1351 | jabber_iq_send(iq); | |
| 1352 | ||
| 15884 | 1353 | purple_account_set_password(js->gc->account, p1); |
| 7124 | 1354 | } |
| 1355 | ||
| 15884 | 1356 | static void jabber_password_change(PurplePluginAction *action) |
| 7124 | 1357 | { |
|
9015
3c27e9074fa2
[gaim-migrate @ 9791]
Christopher O'Brien <siege@pidgin.im>
parents:
8993
diff
changeset
|
1358 | |
| 15884 | 1359 | PurpleConnection *gc = (PurpleConnection *) action->context; |
| 7124 | 1360 | JabberStream *js = gc->proto_data; |
| 15884 | 1361 | PurpleRequestFields *fields; |
| 1362 | PurpleRequestFieldGroup *group; | |
| 1363 | PurpleRequestField *field; | |
| 7124 | 1364 | |
| 15884 | 1365 | fields = purple_request_fields_new(); |
| 1366 | group = purple_request_field_group_new(NULL); | |
| 1367 | purple_request_fields_add_group(fields, group); | |
| 7124 | 1368 | |
| 15884 | 1369 | field = purple_request_field_string_new("password1", _("Password"), |
| 7124 | 1370 | "", FALSE); |
| 15884 | 1371 | purple_request_field_string_set_masked(field, TRUE); |
|
18381
8192b072afa6
Make password fileds in Jabber's Change Password dialog required. Fixes #1907
Sean Egan <seanegan@pidgin.im>
parents:
18310
diff
changeset
|
1372 | purple_request_field_set_required(field, TRUE); |
| 15884 | 1373 | purple_request_field_group_add_field(group, field); |
| 7124 | 1374 | |
| 15884 | 1375 | field = purple_request_field_string_new("password2", _("Password (again)"), |
| 7124 | 1376 | "", FALSE); |
| 15884 | 1377 | purple_request_field_string_set_masked(field, TRUE); |
|
18381
8192b072afa6
Make password fileds in Jabber's Change Password dialog required. Fixes #1907
Sean Egan <seanegan@pidgin.im>
parents:
18310
diff
changeset
|
1378 | purple_request_field_set_required(field, TRUE); |
| 15884 | 1379 | purple_request_field_group_add_field(group, field); |
| 7124 | 1380 | |
|
16961
b6955f946f8f
s/Jabber/XMPP in user-visible places.
Richard Laager <rlaager@pidgin.im>
parents:
16847
diff
changeset
|
1381 | purple_request_fields(js->gc, _("Change XMPP Password"), |
|
b6955f946f8f
s/Jabber/XMPP in user-visible places.
Richard Laager <rlaager@pidgin.im>
parents:
16847
diff
changeset
|
1382 | _("Change XMPP Password"), _("Please enter your new password"), |
| 7124 | 1383 | fields, _("OK"), G_CALLBACK(jabber_password_change_cb), |
|
16490
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
16302
diff
changeset
|
1384 | _("Cancel"), NULL, |
|
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
16302
diff
changeset
|
1385 | purple_connection_get_account(gc), NULL, NULL, |
|
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
16302
diff
changeset
|
1386 | js); |
| 7124 | 1387 | } |
| 1388 | ||
|
16302
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
1389 | GList *jabber_actions(PurplePlugin *plugin, gpointer context) |
| 2956 | 1390 | { |
| 1391 | GList *m = NULL; | |
| 15884 | 1392 | PurplePluginAction *act; |
|
4333
f4c095774bc2
[gaim-migrate @ 4597]
Mark Doliner <markdoliner@pidgin.im>
parents:
4316
diff
changeset
|
1393 | |
| 15884 | 1394 | act = purple_plugin_action_new(_("Set User Info..."), |
| 12286 | 1395 | jabber_setup_set_info); |
|
9015
3c27e9074fa2
[gaim-migrate @ 9791]
Christopher O'Brien <siege@pidgin.im>
parents:
8993
diff
changeset
|
1396 | m = g_list_append(m, act); |
|
4333
f4c095774bc2
[gaim-migrate @ 4597]
Mark Doliner <markdoliner@pidgin.im>
parents:
4316
diff
changeset
|
1397 | |
| 8296 | 1398 | /* if (js->protocol_options & CHANGE_PASSWORD) { */ |
| 15884 | 1399 | act = purple_plugin_action_new(_("Change Password..."), |
| 12286 | 1400 | jabber_password_change); |
|
9015
3c27e9074fa2
[gaim-migrate @ 9791]
Christopher O'Brien <siege@pidgin.im>
parents:
8993
diff
changeset
|
1401 | m = g_list_append(m, act); |
| 8296 | 1402 | /* } */ |
| 2956 | 1403 | |
| 15884 | 1404 | act = purple_plugin_action_new(_("Search for Users..."), |
| 12286 | 1405 | jabber_user_search_begin); |
| 11675 | 1406 | m = g_list_append(m, act); |
| 1407 | ||
| 2956 | 1408 | return m; |
| 1409 | } | |
| 1410 | ||
|
16302
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
1411 | PurpleChat *jabber_find_blist_chat(PurpleAccount *account, const char *name) |
| 7999 | 1412 | { |
| 15884 | 1413 | PurpleBlistNode *gnode, *cnode; |
| 7999 | 1414 | JabberID *jid; |
| 1415 | ||
| 1416 | if(!(jid = jabber_id_new(name))) | |
| 1417 | return NULL; | |
| 1418 | ||
| 15884 | 1419 | for(gnode = purple_get_blist()->root; gnode; gnode = gnode->next) { |
| 7999 | 1420 | for(cnode = gnode->child; cnode; cnode = cnode->next) { |
| 15884 | 1421 | PurpleChat *chat = (PurpleChat*)cnode; |
| 7999 | 1422 | const char *room, *server; |
| 15884 | 1423 | if(!PURPLE_BLIST_NODE_IS_CHAT(cnode)) |
| 7999 | 1424 | continue; |
| 1425 | ||
| 1426 | if(chat->account != account) | |
| 8011 | 1427 | continue; |
| 7999 | 1428 | |
| 1429 | if(!(room = g_hash_table_lookup(chat->components, "room"))) | |
| 1430 | continue; | |
| 1431 | if(!(server = g_hash_table_lookup(chat->components, "server"))) | |
| 1432 | continue; | |
| 1433 | ||
| 8158 | 1434 | if(jid->node && jid->domain && |
| 1435 | !g_utf8_collate(room, jid->node) && !g_utf8_collate(server, jid->domain)) { | |
| 7999 | 1436 | jabber_id_free(jid); |
| 1437 | return chat; | |
| 1438 | } | |
| 1439 | } | |
| 1440 | } | |
| 1441 | jabber_id_free(jid); | |
| 1442 | return NULL; | |
| 1443 | } | |
| 1444 | ||
|
16302
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
1445 | void jabber_convo_closed(PurpleConnection *gc, const char *who) |
| 8400 | 1446 | { |
| 1447 | JabberStream *js = gc->proto_data; | |
| 1448 | JabberID *jid; | |
| 1449 | JabberBuddy *jb; | |
| 1450 | JabberBuddyResource *jbr; | |
| 1451 | ||
| 1452 | if(!(jid = jabber_id_new(who))) | |
| 1453 | return; | |
| 1454 | ||
| 1455 | if((jb = jabber_buddy_find(js, who, TRUE)) && | |
| 1456 | (jbr = jabber_buddy_find_resource(jb, jid->resource))) { | |
| 1457 | if(jbr->thread_id) { | |
| 1458 | g_free(jbr->thread_id); | |
| 1459 | jbr->thread_id = NULL; | |
| 1460 | } | |
|
15709
b58646e3ce63
Sending XEP 85 'gone' messages
Sean Egan <seanegan@pidgin.im>
parents:
15668
diff
changeset
|
1461 | if(jbr->chat_states == JABBER_CHAT_STATES_SUPPORTED) |
|
b58646e3ce63
Sending XEP 85 'gone' messages
Sean Egan <seanegan@pidgin.im>
parents:
15668
diff
changeset
|
1462 | jabber_message_conv_closed(js, who); |
| 8400 | 1463 | } |
| 1464 | ||
| 1465 | jabber_id_free(jid); | |
| 1466 | } | |
| 1467 | ||
| 8401 | 1468 | |
| 1469 | char *jabber_parse_error(JabberStream *js, xmlnode *packet) | |
| 1470 | { | |
| 1471 | xmlnode *error; | |
| 1472 | const char *code = NULL, *text = NULL; | |
| 13808 | 1473 | const char *xmlns = xmlnode_get_namespace(packet); |
| 8401 | 1474 | char *cdata = NULL; |
| 1475 | ||
| 1476 | if((error = xmlnode_get_child(packet, "error"))) { | |
| 1477 | cdata = xmlnode_get_data(error); | |
| 1478 | code = xmlnode_get_attrib(error, "code"); | |
| 1479 | ||
| 1480 | /* Stanza errors */ | |
| 1481 | if(xmlnode_get_child(error, "bad-request")) { | |
| 1482 | text = _("Bad Request"); | |
| 1483 | } else if(xmlnode_get_child(error, "conflict")) { | |
| 1484 | text = _("Conflict"); | |
| 1485 | } else if(xmlnode_get_child(error, "feature-not-implemented")) { | |
| 1486 | text = _("Feature Not Implemented"); | |
| 1487 | } else if(xmlnode_get_child(error, "forbidden")) { | |
| 1488 | text = _("Forbidden"); | |
| 1489 | } else if(xmlnode_get_child(error, "gone")) { | |
| 1490 | text = _("Gone"); | |
| 1491 | } else if(xmlnode_get_child(error, "internal-server-error")) { | |
| 1492 | text = _("Internal Server Error"); | |
| 1493 | } else if(xmlnode_get_child(error, "item-not-found")) { | |
| 1494 | text = _("Item Not Found"); | |
| 1495 | } else if(xmlnode_get_child(error, "jid-malformed")) { | |
|
16961
b6955f946f8f
s/Jabber/XMPP in user-visible places.
Richard Laager <rlaager@pidgin.im>
parents:
16847
diff
changeset
|
1496 | text = _("Malformed XMPP ID"); |
| 8401 | 1497 | } else if(xmlnode_get_child(error, "not-acceptable")) { |
| 1498 | text = _("Not Acceptable"); | |
| 1499 | } else if(xmlnode_get_child(error, "not-allowed")) { | |
| 1500 | text = _("Not Allowed"); | |
| 1501 | } else if(xmlnode_get_child(error, "not-authorized")) { | |
| 1502 | text = _("Not Authorized"); | |
| 1503 | } else if(xmlnode_get_child(error, "payment-required")) { | |
| 1504 | text = _("Payment Required"); | |
| 1505 | } else if(xmlnode_get_child(error, "recipient-unavailable")) { | |
| 1506 | text = _("Recipient Unavailable"); | |
| 1507 | } else if(xmlnode_get_child(error, "redirect")) { | |
| 1508 | /* XXX */ | |
| 1509 | } else if(xmlnode_get_child(error, "registration-required")) { | |
| 1510 | text = _("Registration Required"); | |
| 1511 | } else if(xmlnode_get_child(error, "remote-server-not-found")) { | |
| 1512 | text = _("Remote Server Not Found"); | |
| 1513 | } else if(xmlnode_get_child(error, "remote-server-timeout")) { | |
| 1514 | text = _("Remote Server Timeout"); | |
| 1515 | } else if(xmlnode_get_child(error, "resource-constraint")) { | |
| 1516 | text = _("Server Overloaded"); | |
| 1517 | } else if(xmlnode_get_child(error, "service-unavailable")) { | |
| 1518 | text = _("Service Unavailable"); | |
| 1519 | } else if(xmlnode_get_child(error, "subscription-required")) { | |
| 1520 | text = _("Subscription Required"); | |
| 1521 | } else if(xmlnode_get_child(error, "unexpected-request")) { | |
| 1522 | text = _("Unexpected Request"); | |
| 1523 | } else if(xmlnode_get_child(error, "undefined-condition")) { | |
| 1524 | text = _("Unknown Error"); | |
| 1525 | } | |
| 1526 | } else if(xmlns && !strcmp(xmlns, "urn:ietf:params:xml:ns:xmpp-sasl")) { | |
| 1527 | if(xmlnode_get_child(packet, "aborted")) { | |
| 1528 | js->gc->wants_to_die = TRUE; | |
| 1529 | text = _("Authorization Aborted"); | |
| 13806 | 1530 | } else if(xmlnode_get_child(packet, "incorrect-encoding")) { |
| 8401 | 1531 | text = _("Incorrect encoding in authorization"); |
| 13806 | 1532 | } else if(xmlnode_get_child(packet, "invalid-authzid")) { |
| 8401 | 1533 | js->gc->wants_to_die = TRUE; |
| 1534 | text = _("Invalid authzid"); | |
| 13806 | 1535 | } else if(xmlnode_get_child(packet, "invalid-mechanism")) { |
| 8401 | 1536 | js->gc->wants_to_die = TRUE; |
| 1537 | text = _("Invalid Authorization Mechanism"); | |
| 13806 | 1538 | } else if(xmlnode_get_child(packet, "mechanism-too-weak")) { |
| 8401 | 1539 | js->gc->wants_to_die = TRUE; |
| 1540 | text = _("Authorization mechanism too weak"); | |
| 13806 | 1541 | } else if(xmlnode_get_child(packet, "not-authorized")) { |
| 8401 | 1542 | js->gc->wants_to_die = TRUE; |
| 1543 | text = _("Not Authorized"); | |
| 13806 | 1544 | } else if(xmlnode_get_child(packet, "temporary-auth-failure")) { |
| 8401 | 1545 | text = _("Temporary Authentication Failure"); |
| 1546 | } else { | |
| 13051 | 1547 | js->gc->wants_to_die = TRUE; |
| 8401 | 1548 | text = _("Authentication Failure"); |
| 1549 | } | |
|
15979
acfbd09bc217
Correctly handle the Jabber disconnection error for signing onto the
Mark Doliner <markdoliner@pidgin.im>
parents:
15977
diff
changeset
|
1550 | } else if(!strcmp(packet->name, "stream:error") || |
|
acfbd09bc217
Correctly handle the Jabber disconnection error for signing onto the
Mark Doliner <markdoliner@pidgin.im>
parents:
15977
diff
changeset
|
1551 | (!strcmp(packet->name, "error") && |
| 15980 | 1552 | !strcmp(xmlns, "http://etherx.jabber.org/streams"))) { |
| 8402 | 1553 | if(xmlnode_get_child(packet, "bad-format")) { |
| 1554 | text = _("Bad Format"); | |
| 1555 | } else if(xmlnode_get_child(packet, "bad-namespace-prefix")) { | |
| 1556 | text = _("Bad Namespace Prefix"); | |
| 1557 | } else if(xmlnode_get_child(packet, "conflict")) { | |
| 1558 | js->gc->wants_to_die = TRUE; | |
| 1559 | text = _("Resource Conflict"); | |
| 1560 | } else if(xmlnode_get_child(packet, "connection-timeout")) { | |
| 1561 | text = _("Connection Timeout"); | |
| 1562 | } else if(xmlnode_get_child(packet, "host-gone")) { | |
| 1563 | text = _("Host Gone"); | |
| 1564 | } else if(xmlnode_get_child(packet, "host-unknown")) { | |
| 1565 | text = _("Host Unknown"); | |
| 1566 | } else if(xmlnode_get_child(packet, "improper-addressing")) { | |
| 1567 | text = _("Improper Addressing"); | |
| 1568 | } else if(xmlnode_get_child(packet, "internal-server-error")) { | |
| 1569 | text = _("Internal Server Error"); | |
| 1570 | } else if(xmlnode_get_child(packet, "invalid-id")) { | |
| 1571 | text = _("Invalid ID"); | |
| 1572 | } else if(xmlnode_get_child(packet, "invalid-namespace")) { | |
| 1573 | text = _("Invalid Namespace"); | |
| 1574 | } else if(xmlnode_get_child(packet, "invalid-xml")) { | |
| 1575 | text = _("Invalid XML"); | |
| 1576 | } else if(xmlnode_get_child(packet, "nonmatching-hosts")) { | |
| 1577 | text = _("Non-matching Hosts"); | |
| 1578 | } else if(xmlnode_get_child(packet, "not-authorized")) { | |
| 1579 | text = _("Not Authorized"); | |
| 1580 | } else if(xmlnode_get_child(packet, "policy-violation")) { | |
| 1581 | text = _("Policy Violation"); | |
| 1582 | } else if(xmlnode_get_child(packet, "remote-connection-failed")) { | |
| 1583 | text = _("Remote Connection Failed"); | |
| 1584 | } else if(xmlnode_get_child(packet, "resource-constraint")) { | |
| 1585 | text = _("Resource Constraint"); | |
| 1586 | } else if(xmlnode_get_child(packet, "restricted-xml")) { | |
| 1587 | text = _("Restricted XML"); | |
| 1588 | } else if(xmlnode_get_child(packet, "see-other-host")) { | |
| 1589 | text = _("See Other Host"); | |
| 1590 | } else if(xmlnode_get_child(packet, "system-shutdown")) { | |
| 1591 | text = _("System Shutdown"); | |
| 1592 | } else if(xmlnode_get_child(packet, "undefined-condition")) { | |
| 1593 | text = _("Undefined Condition"); | |
| 1594 | } else if(xmlnode_get_child(packet, "unsupported-encoding")) { | |
| 1595 | text = _("Unsupported Encoding"); | |
| 1596 | } else if(xmlnode_get_child(packet, "unsupported-stanza-type")) { | |
| 1597 | text = _("Unsupported Stanza Type"); | |
| 1598 | } else if(xmlnode_get_child(packet, "unsupported-version")) { | |
| 1599 | text = _("Unsupported Version"); | |
| 1600 | } else if(xmlnode_get_child(packet, "xml-not-well-formed")) { | |
| 1601 | text = _("XML Not Well Formed"); | |
| 1602 | } else { | |
| 1603 | text = _("Stream Error"); | |
| 1604 | } | |
| 8401 | 1605 | } |
| 1606 | ||
| 1607 | if(text || cdata) { | |
| 1608 | char *ret = g_strdup_printf("%s%s%s", code ? code : "", | |
| 1609 | code ? ": " : "", text ? text : cdata); | |
| 1610 | g_free(cdata); | |
| 1611 | return ret; | |
| 1612 | } else { | |
| 1613 | return NULL; | |
| 1614 | } | |
| 1615 | } | |
| 1616 | ||
| 15884 | 1617 | static PurpleCmdRet jabber_cmd_chat_config(PurpleConversation *conv, |
| 9597 | 1618 | const char *cmd, char **args, char **error, void *data) |
| 9130 | 1619 | { |
| 1620 | JabberChat *chat = jabber_chat_find_by_conv(conv); | |
|
18986
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1621 | |
|
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1622 | if (!chat) |
|
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1623 | return PURPLE_CMD_RET_FAILED; |
|
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1624 | |
| 9130 | 1625 | jabber_chat_request_room_configure(chat); |
| 15884 | 1626 | return PURPLE_CMD_RET_OK; |
| 9130 | 1627 | } |
| 1628 | ||
| 15884 | 1629 | static PurpleCmdRet jabber_cmd_chat_register(PurpleConversation *conv, |
| 9597 | 1630 | const char *cmd, char **args, char **error, void *data) |
| 9130 | 1631 | { |
| 1632 | JabberChat *chat = jabber_chat_find_by_conv(conv); | |
|
18986
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1633 | |
|
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1634 | if (!chat) |
|
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1635 | return PURPLE_CMD_RET_FAILED; |
|
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1636 | |
| 9130 | 1637 | jabber_chat_register(chat); |
| 15884 | 1638 | return PURPLE_CMD_RET_OK; |
| 9130 | 1639 | } |
| 1640 | ||
| 15884 | 1641 | static PurpleCmdRet jabber_cmd_chat_topic(PurpleConversation *conv, |
| 9597 | 1642 | const char *cmd, char **args, char **error, void *data) |
| 9130 | 1643 | { |
| 1644 | JabberChat *chat = jabber_chat_find_by_conv(conv); | |
|
18986
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1645 | |
|
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1646 | if (!chat) |
|
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1647 | return PURPLE_CMD_RET_FAILED; |
|
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1648 | |
| 9130 | 1649 | jabber_chat_change_topic(chat, args ? args[0] : NULL); |
| 15884 | 1650 | return PURPLE_CMD_RET_OK; |
| 9130 | 1651 | } |
| 1652 | ||
| 15884 | 1653 | static PurpleCmdRet jabber_cmd_chat_nick(PurpleConversation *conv, |
| 9597 | 1654 | const char *cmd, char **args, char **error, void *data) |
| 9130 | 1655 | { |
| 1656 | JabberChat *chat = jabber_chat_find_by_conv(conv); | |
| 1657 | ||
|
18986
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1658 | if(!chat || !args || !args[0]) |
| 15884 | 1659 | return PURPLE_CMD_RET_FAILED; |
| 9130 | 1660 | |
| 1661 | jabber_chat_change_nick(chat, args[0]); | |
| 15884 | 1662 | return PURPLE_CMD_RET_OK; |
| 9130 | 1663 | } |
| 1664 | ||
| 15884 | 1665 | static PurpleCmdRet jabber_cmd_chat_part(PurpleConversation *conv, |
| 9597 | 1666 | const char *cmd, char **args, char **error, void *data) |
| 9130 | 1667 | { |
| 1668 | JabberChat *chat = jabber_chat_find_by_conv(conv); | |
|
18986
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1669 | |
|
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1670 | if (!chat) |
|
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1671 | return PURPLE_CMD_RET_FAILED; |
|
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1672 | |
| 9130 | 1673 | jabber_chat_part(chat, args ? args[0] : NULL); |
| 15884 | 1674 | return PURPLE_CMD_RET_OK; |
| 9130 | 1675 | } |
| 1676 | ||
| 15884 | 1677 | static PurpleCmdRet jabber_cmd_chat_ban(PurpleConversation *conv, |
| 9597 | 1678 | const char *cmd, char **args, char **error, void *data) |
| 9152 | 1679 | { |
| 1680 | JabberChat *chat = jabber_chat_find_by_conv(conv); | |
| 1681 | ||
|
18986
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1682 | if(!chat || !args || !args[0]) |
| 15884 | 1683 | return PURPLE_CMD_RET_FAILED; |
| 9152 | 1684 | |
| 1685 | if(!jabber_chat_ban_user(chat, args[0], args[1])) { | |
| 1686 | *error = g_strdup_printf(_("Unable to ban user %s"), args[0]); | |
| 15884 | 1687 | return PURPLE_CMD_RET_FAILED; |
| 9152 | 1688 | } |
| 1689 | ||
| 15884 | 1690 | return PURPLE_CMD_RET_OK; |
| 9152 | 1691 | } |
| 1692 | ||
| 15884 | 1693 | static PurpleCmdRet jabber_cmd_chat_affiliate(PurpleConversation *conv, |
| 11393 | 1694 | const char *cmd, char **args, char **error, void *data) |
| 1695 | { | |
| 1696 | JabberChat *chat = jabber_chat_find_by_conv(conv); | |
| 1697 | ||
|
18986
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1698 | if (!chat || !args || !args[0] || !args[1]) |
| 15884 | 1699 | return PURPLE_CMD_RET_FAILED; |
| 11393 | 1700 | |
|
13238
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1701 | if (strcmp(args[1], "owner") != 0 && |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1702 | strcmp(args[1], "admin") != 0 && |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1703 | strcmp(args[1], "member") != 0 && |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1704 | strcmp(args[1], "outcast") != 0 && |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1705 | strcmp(args[1], "none") != 0) { |
| 11393 | 1706 | *error = g_strdup_printf(_("Unknown affiliation: \"%s\""), args[1]); |
| 15884 | 1707 | return PURPLE_CMD_RET_FAILED; |
| 11393 | 1708 | } |
| 1709 | ||
| 1710 | if (!jabber_chat_affiliate_user(chat, args[0], args[1])) { | |
| 1711 | *error = g_strdup_printf(_("Unable to affiliate user %s as \"%s\""), args[0], args[1]); | |
| 15884 | 1712 | return PURPLE_CMD_RET_FAILED; |
| 11393 | 1713 | } |
| 1714 | ||
| 15884 | 1715 | return PURPLE_CMD_RET_OK; |
| 11393 | 1716 | } |
| 1717 | ||
| 15884 | 1718 | static PurpleCmdRet jabber_cmd_chat_role(PurpleConversation *conv, |
|
13238
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1719 | const char *cmd, char **args, char **error, void *data) |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1720 | { |
|
19217
ee1aa7e4c462
Fix uninitialized variable access.
Daniel Atallah <datallah@pidgin.im>
parents:
18986
diff
changeset
|
1721 | JabberChat *chat = jabber_chat_find_by_conv(conv); |
|
13238
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1722 | |
|
18986
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1723 | if (!chat || !args || !args[0] || !args[1]) |
| 15884 | 1724 | return PURPLE_CMD_RET_FAILED; |
|
13238
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1725 | |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1726 | if (strcmp(args[1], "moderator") != 0 && |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1727 | strcmp(args[1], "participant") != 0 && |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1728 | strcmp(args[1], "visitor") != 0 && |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1729 | strcmp(args[1], "none") != 0) { |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1730 | *error = g_strdup_printf(_("Unknown role: \"%s\""), args[1]); |
| 15884 | 1731 | return PURPLE_CMD_RET_FAILED; |
|
13238
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1732 | } |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1733 | |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1734 | if (!jabber_chat_role_user(chat, args[0], args[1])) { |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1735 | *error = g_strdup_printf(_("Unable to set role \"%s\" for user: %s"), |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1736 | args[1], args[0]); |
| 15884 | 1737 | return PURPLE_CMD_RET_FAILED; |
|
13238
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1738 | } |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1739 | |
| 15884 | 1740 | return PURPLE_CMD_RET_OK; |
|
13238
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1741 | } |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1742 | |
| 15884 | 1743 | static PurpleCmdRet jabber_cmd_chat_invite(PurpleConversation *conv, |
| 9597 | 1744 | const char *cmd, char **args, char **error, void *data) |
| 9152 | 1745 | { |
| 1746 | if(!args || !args[0]) | |
| 15884 | 1747 | return PURPLE_CMD_RET_FAILED; |
| 9152 | 1748 | |
| 15884 | 1749 | jabber_chat_invite(purple_conversation_get_gc(conv), |
| 1750 | purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)), args[1] ? args[1] : "", | |
| 9152 | 1751 | args[0]); |
| 1752 | ||
| 15884 | 1753 | return PURPLE_CMD_RET_OK; |
| 9152 | 1754 | } |
| 1755 | ||
| 15884 | 1756 | static PurpleCmdRet jabber_cmd_chat_join(PurpleConversation *conv, |
| 9597 | 1757 | const char *cmd, char **args, char **error, void *data) |
| 9152 | 1758 | { |
| 1759 | JabberChat *chat = jabber_chat_find_by_conv(conv); | |
| 1760 | GHashTable *components; | |
| 1761 | ||
|
18986
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1762 | if(!chat || !args || !args[0]) |
| 15884 | 1763 | return PURPLE_CMD_RET_FAILED; |
| 9152 | 1764 | |
| 1765 | components = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL); | |
| 1766 | ||
| 1767 | g_hash_table_replace(components, "room", args[0]); | |
| 1768 | g_hash_table_replace(components, "server", chat->server); | |
| 1769 | g_hash_table_replace(components, "handle", chat->handle); | |
| 1770 | if(args[1]) | |
| 1771 | g_hash_table_replace(components, "password", args[1]); | |
| 1772 | ||
| 15884 | 1773 | jabber_chat_join(purple_conversation_get_gc(conv), components); |
| 9152 | 1774 | |
| 1775 | g_hash_table_destroy(components); | |
| 15884 | 1776 | return PURPLE_CMD_RET_OK; |
| 9152 | 1777 | } |
| 1778 | ||
| 15884 | 1779 | static PurpleCmdRet jabber_cmd_chat_kick(PurpleConversation *conv, |
| 9597 | 1780 | const char *cmd, char **args, char **error, void *data) |
| 9152 | 1781 | { |
| 1782 | JabberChat *chat = jabber_chat_find_by_conv(conv); | |
| 1783 | ||
|
18986
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1784 | if(!chat || !args || !args[0]) |
| 15884 | 1785 | return PURPLE_CMD_RET_FAILED; |
| 9152 | 1786 | |
| 1787 | if(!jabber_chat_kick_user(chat, args[0], args[1])) { | |
| 1788 | *error = g_strdup_printf(_("Unable to kick user %s"), args[0]); | |
| 15884 | 1789 | return PURPLE_CMD_RET_FAILED; |
| 9152 | 1790 | } |
| 1791 | ||
| 15884 | 1792 | return PURPLE_CMD_RET_OK; |
| 9152 | 1793 | } |
| 1794 | ||
| 15884 | 1795 | static PurpleCmdRet jabber_cmd_chat_msg(PurpleConversation *conv, |
| 9597 | 1796 | const char *cmd, char **args, char **error, void *data) |
| 9152 | 1797 | { |
| 1798 | JabberChat *chat = jabber_chat_find_by_conv(conv); | |
| 1799 | char *who; | |
| 1800 | ||
|
18986
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1801 | if (!chat) |
|
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1802 | return PURPLE_CMD_RET_FAILED; |
|
5542a465de12
Fix a bunch of possible crashes in jabber when using slash commands in
Mark Doliner <markdoliner@pidgin.im>
parents:
18381
diff
changeset
|
1803 | |
| 9152 | 1804 | who = g_strdup_printf("%s@%s/%s", chat->room, chat->server, args[0]); |
| 1805 | ||
| 15884 | 1806 | jabber_message_send_im(purple_conversation_get_gc(conv), who, args[1], 0); |
| 9152 | 1807 | |
| 1808 | g_free(who); | |
| 15884 | 1809 | return PURPLE_CMD_RET_OK; |
| 9152 | 1810 | } |
| 1811 | ||
|
16302
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
1812 | gboolean jabber_offline_message(const PurpleBuddy *buddy) |
|
12645
a907ba243930
[gaim-migrate @ 14983]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12600
diff
changeset
|
1813 | { |
|
a907ba243930
[gaim-migrate @ 14983]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12600
diff
changeset
|
1814 | return TRUE; |
|
a907ba243930
[gaim-migrate @ 14983]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12600
diff
changeset
|
1815 | } |
|
a907ba243930
[gaim-migrate @ 14983]
Sadrul Habib Chowdhury <sadrul@pidgin.im>
parents:
12600
diff
changeset
|
1816 | |
|
16302
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
1817 | void jabber_register_commands(void) |
| 9130 | 1818 | { |
| 15884 | 1819 | purple_cmd_register("config", "", PURPLE_CMD_P_PRPL, |
| 1820 | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, | |
| 9597 | 1821 | "prpl-jabber", jabber_cmd_chat_config, |
| 1822 | _("config: Configure a chat room."), NULL); | |
| 15884 | 1823 | purple_cmd_register("configure", "", PURPLE_CMD_P_PRPL, |
| 1824 | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, | |
| 9597 | 1825 | "prpl-jabber", jabber_cmd_chat_config, |
| 1826 | _("configure: Configure a chat room."), NULL); | |
| 15884 | 1827 | purple_cmd_register("nick", "s", PURPLE_CMD_P_PRPL, |
| 1828 | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, | |
| 9597 | 1829 | "prpl-jabber", jabber_cmd_chat_nick, |
| 1830 | _("nick <new nickname>: Change your nickname."), | |
| 1831 | NULL); | |
| 15884 | 1832 | purple_cmd_register("part", "s", PURPLE_CMD_P_PRPL, |
| 1833 | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | | |
| 1834 | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", | |
| 9597 | 1835 | jabber_cmd_chat_part, _("part [room]: Leave the room."), |
| 1836 | NULL); | |
| 15884 | 1837 | purple_cmd_register("register", "", PURPLE_CMD_P_PRPL, |
| 1838 | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, | |
| 9597 | 1839 | "prpl-jabber", jabber_cmd_chat_register, |
| 1840 | _("register: Register with a chat room."), NULL); | |
| 9130 | 1841 | /* XXX: there needs to be a core /topic cmd, methinks */ |
| 15884 | 1842 | purple_cmd_register("topic", "s", PURPLE_CMD_P_PRPL, |
| 1843 | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | | |
| 1844 | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", | |
| 9597 | 1845 | jabber_cmd_chat_topic, |
| 1846 | _("topic [new topic]: View or change the topic."), | |
| 1847 | NULL); | |
| 15884 | 1848 | purple_cmd_register("ban", "ws", PURPLE_CMD_P_PRPL, |
| 1849 | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | | |
| 1850 | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", | |
| 9597 | 1851 | jabber_cmd_chat_ban, |
| 1852 | _("ban <user> [room]: Ban a user from the room."), | |
| 1853 | NULL); | |
| 15884 | 1854 | purple_cmd_register("affiliate", "ws", PURPLE_CMD_P_PRPL, |
| 1855 | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | | |
| 1856 | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", | |
|
13238
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1857 | jabber_cmd_chat_affiliate, |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1858 | _("affiliate <user> <owner|admin|member|outcast|none>: Set a user's affiliation with the room."), |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1859 | NULL); |
| 15884 | 1860 | purple_cmd_register("role", "ws", PURPLE_CMD_P_PRPL, |
| 1861 | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | | |
| 1862 | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", | |
|
13238
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1863 | jabber_cmd_chat_role, |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1864 | _("role <user> <moderator|participant|visitor|none>: Set a user's role in the room."), |
|
b98439d90903
[gaim-migrate @ 15603]
Andrej Krivulčík <thefox692@users.sourceforge.net>
parents:
13201
diff
changeset
|
1865 | NULL); |
| 15884 | 1866 | purple_cmd_register("invite", "ws", PURPLE_CMD_P_PRPL, |
| 1867 | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | | |
| 1868 | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", | |
| 9597 | 1869 | jabber_cmd_chat_invite, |
| 11158 | 1870 | _("invite <user> [message]: Invite a user to the room."), |
| 9597 | 1871 | NULL); |
| 15884 | 1872 | purple_cmd_register("join", "ws", PURPLE_CMD_P_PRPL, |
| 1873 | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | | |
| 1874 | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", | |
| 9597 | 1875 | jabber_cmd_chat_join, |
| 1876 | _("join: <room> [server]: Join a chat on this server."), | |
| 1877 | NULL); | |
| 15884 | 1878 | purple_cmd_register("kick", "ws", PURPLE_CMD_P_PRPL, |
| 1879 | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | | |
| 1880 | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", | |
| 9597 | 1881 | jabber_cmd_chat_kick, |
| 1882 | _("kick <user> [room]: Kick a user from the room."), | |
| 1883 | NULL); | |
| 15884 | 1884 | purple_cmd_register("msg", "ws", PURPLE_CMD_P_PRPL, |
| 1885 | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, | |
| 9597 | 1886 | "prpl-jabber", jabber_cmd_chat_msg, |
| 1887 | _("msg <user> <message>: Send a private message to another user."), | |
| 1888 | NULL); | |
| 9130 | 1889 | } |
| 1890 | ||
|
16302
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
1891 | void |
|
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
1892 | jabber_init_plugin(PurplePlugin *plugin) |
| 14358 | 1893 | { |
|
16302
eb633ebf84f2
This does the ol' AIM/ICQ split trick on Jabber, creating an XMPP prpl. This can be used, later, to create a Bonjour plugin that reuses libjabber
Sean Egan <seanegan@pidgin.im>
parents:
16180
diff
changeset
|
1894 | my_protocol = plugin; |
| 14358 | 1895 | } |