Mercurial > ~mikael > mcabber > hg
annotate mcabber/mcabber/xmpp_iqrequest.c @ 1703:65ba89949252
Improve error checks in received IQ responses
| author | Mikael Berthe <mikael@lilotux.net> |
|---|---|
| date | Mon, 08 Feb 2010 19:15:55 +0100 |
| parents | 527c965b45c5 |
| children | ac881b5f9248 |
| rev | line source |
|---|---|
| 1599 | 1 /* |
| 2 * xmpp_iqrequest.c -- Jabber IQ request handling | |
| 3 * | |
| 4 * Copyright (C) 2008-2009 Frank Zschockelt <mcabber@freakysoft.de> | |
| 5 * Copyright (C) 2005-2009 Mikael Berthe <mikael@lilotux.net> | |
| 6 * | |
| 7 * This program is free software; you can redistribute it and/or modify | |
| 8 * it under the terms of the GNU General Public License as published by | |
| 9 * the Free Software Foundation; either version 2 of the License, or (at | |
| 10 * your option) any later version. | |
| 11 * | |
| 12 * This program is distributed in the hope that it will be useful, but | |
| 13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 15 * General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU General Public License | |
| 18 * along with this program; if not, write to the Free Software | |
| 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 | |
| 20 * USA | |
| 21 */ | |
| 1598 | 22 |
|
1604
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1599
diff
changeset
|
23 #include <string.h> |
|
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1599
diff
changeset
|
24 #include <stdlib.h> |
|
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1599
diff
changeset
|
25 |
|
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1599
diff
changeset
|
26 #include "xmpp_helper.h" |
|
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1599
diff
changeset
|
27 #include "xmpp_iq.h" |
|
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1599
diff
changeset
|
28 #include "screen.h" |
|
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1599
diff
changeset
|
29 #include "utils.h" |
|
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1599
diff
changeset
|
30 #include "settings.h" |
|
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1599
diff
changeset
|
31 #include "hooks.h" |
|
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1599
diff
changeset
|
32 #include "hbuf.h" |
|
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1599
diff
changeset
|
33 |
|
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1599
diff
changeset
|
34 extern LmMessageNode *bookmarks; |
|
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1599
diff
changeset
|
35 extern LmMessageNode *rosternotes; |
|
351427ef0b4b
Remove #include's of C files
Mikael Berthe <mikael@lilotux.net>
parents:
1599
diff
changeset
|
36 |
| 1598 | 37 static LmHandlerResult cb_roster(LmMessageHandler *h, LmConnection *c, |
| 38 LmMessage *m, gpointer user_data); | |
| 39 static LmHandlerResult cb_version(LmMessageHandler *h, LmConnection *c, | |
| 40 LmMessage *m, gpointer user_data); | |
| 41 static LmHandlerResult cb_time(LmMessageHandler *h, LmConnection *c, | |
| 42 LmMessage *m, gpointer user_data); | |
| 43 static LmHandlerResult cb_last(LmMessageHandler *h, LmConnection *c, | |
| 44 LmMessage *m, gpointer user_data); | |
| 45 static LmHandlerResult cb_vcard(LmMessageHandler *h, LmConnection *c, | |
| 46 LmMessage *m, gpointer user_data); | |
| 29 | 47 |
| 1598 | 48 static struct IqRequestHandlers |
| 49 { | |
| 50 const gchar *xmlns; | |
| 51 const gchar *querytag; | |
| 52 LmHandleMessageFunction handler; | |
| 53 } iq_request_handlers[] = { | |
| 54 {NS_ROSTER, "query", &cb_roster}, | |
| 55 {NS_VERSION,"query", &cb_version}, | |
| 56 {NS_TIME, "query", &cb_time}, | |
| 57 {NS_LAST, "query", &cb_last}, | |
| 58 {NS_VCARD, "vCard", &cb_vcard}, | |
| 59 {NULL, NULL, NULL} | |
| 60 }; | |
|
1254
401639413340
More jabber:iq:last support... (misc)
Mikael Berthe <mikael@lilotux.net>
parents:
1224
diff
changeset
|
61 |
| 1006 | 62 // Enum for vCard attributes |
| 63 enum vcard_attr { | |
| 64 vcard_home = 1<<0, | |
| 65 vcard_work = 1<<1, | |
| 66 vcard_postal = 1<<2, | |
| 67 vcard_voice = 1<<3, | |
| 68 vcard_fax = 1<<4, | |
| 69 vcard_cell = 1<<5, | |
| 70 vcard_inet = 1<<6, | |
| 71 vcard_pref = 1<<7, | |
| 72 }; | |
| 683 | 73 |
| 1598 | 74 // xmlns has to be a namespace from iq_request_handlers[].xmlns |
| 75 void xmpp_iq_request(const char *fulljid, const char *xmlns) | |
|
1215
80c095886fb5
Entity Capabilities support (XEP-0115)
Mikael Berthe <mikael@lilotux.net>
parents:
1213
diff
changeset
|
76 { |
| 1598 | 77 LmMessage *iq; |
| 78 LmMessageNode *query; | |
| 79 LmMessageHandler *handler; | |
| 80 int i; | |
| 683 | 81 |
| 1598 | 82 iq = lm_message_new_with_sub_type(fulljid, LM_MESSAGE_TYPE_IQ, |
| 83 LM_MESSAGE_SUB_TYPE_GET); | |
| 84 for (i = 0; strcmp(iq_request_handlers[i].xmlns, xmlns) != 0 ; ++i) | |
| 85 ; | |
| 86 query = lm_message_node_add_child(iq->node, | |
| 87 iq_request_handlers[i].querytag, | |
| 88 NULL); | |
| 89 lm_message_node_set_attribute(query, "xmlns", xmlns); | |
| 90 handler = lm_message_handler_new(iq_request_handlers[i].handler, | |
| 91 NULL, FALSE); | |
| 92 lm_connection_send_with_reply(lconnection, iq, handler, NULL); | |
| 93 lm_message_handler_unref(handler); | |
| 94 lm_message_unref(iq); | |
|
577
5c6d364130ee
Move IQ Jabber stuff to a separate file
Mikael Berthe <mikael@lilotux.net>
parents:
576
diff
changeset
|
95 } |
| 29 | 96 |
|
1353
7caedca15e50
Add post-connect internal hook
Mikael Berthe <mikael@lilotux.net>
parents:
1348
diff
changeset
|
97 // This callback is reached when mcabber receives the first roster update |
|
7caedca15e50
Add post-connect internal hook
Mikael Berthe <mikael@lilotux.net>
parents:
1348
diff
changeset
|
98 // after the connection. |
| 1598 | 99 static LmHandlerResult cb_roster(LmMessageHandler *h, LmConnection *c, |
| 100 LmMessage *m, gpointer user_data) | |
|
1353
7caedca15e50
Add post-connect internal hook
Mikael Berthe <mikael@lilotux.net>
parents:
1348
diff
changeset
|
101 { |
| 1598 | 102 LmMessageNode *x; |
| 103 const char *ns; | |
|
1353
7caedca15e50
Add post-connect internal hook
Mikael Berthe <mikael@lilotux.net>
parents:
1348
diff
changeset
|
104 |
|
7caedca15e50
Add post-connect internal hook
Mikael Berthe <mikael@lilotux.net>
parents:
1348
diff
changeset
|
105 // Only execute the hook if the roster has been successfully retrieved |
| 1598 | 106 if (lm_message_get_sub_type(m) != LM_MESSAGE_SUB_TYPE_RESULT) |
| 107 return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; | |
|
1353
7caedca15e50
Add post-connect internal hook
Mikael Berthe <mikael@lilotux.net>
parents:
1348
diff
changeset
|
108 |
| 1598 | 109 x = lm_message_node_find_child(m->node, "query"); |
|
1353
7caedca15e50
Add post-connect internal hook
Mikael Berthe <mikael@lilotux.net>
parents:
1348
diff
changeset
|
110 if (!x) |
| 1598 | 111 return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; |
| 1365 | 112 |
| 1598 | 113 ns = lm_message_node_get_attribute(x, "xmlns"); |
| 1365 | 114 if (ns && !strcmp(ns, NS_ROSTER)) |
| 1598 | 115 handle_iq_roster(NULL, c, m, user_data); |
|
1353
7caedca15e50
Add post-connect internal hook
Mikael Berthe <mikael@lilotux.net>
parents:
1348
diff
changeset
|
116 |
|
7caedca15e50
Add post-connect internal hook
Mikael Berthe <mikael@lilotux.net>
parents:
1348
diff
changeset
|
117 // Post-login stuff |
|
1683
b09f82f61745
Split HOOK_INTERNAL
Myhailo Danylenko <isbear@ukrpost.net>
parents:
1668
diff
changeset
|
118 hk_postconnect(); |
|
1353
7caedca15e50
Add post-connect internal hook
Mikael Berthe <mikael@lilotux.net>
parents:
1348
diff
changeset
|
119 |
| 1598 | 120 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
1353
7caedca15e50
Add post-connect internal hook
Mikael Berthe <mikael@lilotux.net>
parents:
1348
diff
changeset
|
121 } |
|
7caedca15e50
Add post-connect internal hook
Mikael Berthe <mikael@lilotux.net>
parents:
1348
diff
changeset
|
122 |
| 1598 | 123 static LmHandlerResult cb_version(LmMessageHandler *h, LmConnection *c, |
| 124 LmMessage *m, gpointer user_data) | |
|
1353
7caedca15e50
Add post-connect internal hook
Mikael Berthe <mikael@lilotux.net>
parents:
1348
diff
changeset
|
125 { |
| 1598 | 126 LmMessageNode *ansqry; |
| 127 const char *p, *bjid; | |
|
1703
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
128 char *buf, *tmp; |
|
690
3e965a1186c7
Implement IQ:version requests
Mikael Berthe <mikael@lilotux.net>
parents:
689
diff
changeset
|
129 |
|
1703
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
130 // Check IQ result sender |
|
1698
e67bdd863638
Handle IQ responses with no "from"
Mikael Berthe <mikael@lilotux.net>
parents:
1683
diff
changeset
|
131 bjid = lm_message_get_from(m); |
|
e67bdd863638
Handle IQ responses with no "from"
Mikael Berthe <mikael@lilotux.net>
parents:
1683
diff
changeset
|
132 if (!bjid) |
|
1699
527c965b45c5
Add small comment in previous change
Mikael Berthe <mikael@lilotux.net>
parents:
1698
diff
changeset
|
133 bjid = lm_connection_get_jid(lconnection); // No from means our JID... |
|
1698
e67bdd863638
Handle IQ responses with no "from"
Mikael Berthe <mikael@lilotux.net>
parents:
1683
diff
changeset
|
134 if (!bjid) { |
|
690
3e965a1186c7
Implement IQ:version requests
Mikael Berthe <mikael@lilotux.net>
parents:
689
diff
changeset
|
135 scr_LogPrint(LPRINT_LOGNORM, "Invalid IQ:version result (no sender name)."); |
|
1698
e67bdd863638
Handle IQ responses with no "from"
Mikael Berthe <mikael@lilotux.net>
parents:
1683
diff
changeset
|
136 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
690
3e965a1186c7
Implement IQ:version requests
Mikael Berthe <mikael@lilotux.net>
parents:
689
diff
changeset
|
137 } |
|
704
4118a66f2c02
Display IQ results (time, version) in the chat window
Mikael Berthe <mikael@lilotux.net>
parents:
703
diff
changeset
|
138 |
|
1703
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
139 // Check for error message |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
140 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) { |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
141 scr_LogPrint(LPRINT_LOGNORM, "Received error IQ message (%s)", bjid); |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
142 display_server_error(lm_message_node_get_child(m->node, "error")); |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
143 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
144 } |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
145 |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
146 // Check message contents |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
147 ansqry = lm_message_node_get_child(m->node, "query"); |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
148 if (!ansqry) { |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
149 scr_LogPrint(LPRINT_LOGNORM, "Invalid IQ:version result from <%s>!", bjid); |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
150 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
151 } |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
152 |
|
782
19121d9f4aa2
Nicer message when receiving IQ result packet
Mikael Berthe <mikael@lilotux.net>
parents:
776
diff
changeset
|
153 buf = g_strdup_printf("Received IQ:version result from <%s>", bjid); |
|
704
4118a66f2c02
Display IQ results (time, version) in the chat window
Mikael Berthe <mikael@lilotux.net>
parents:
703
diff
changeset
|
154 scr_LogPrint(LPRINT_LOGNORM, "%s", buf); |
|
4118a66f2c02
Display IQ results (time, version) in the chat window
Mikael Berthe <mikael@lilotux.net>
parents:
703
diff
changeset
|
155 |
|
4118a66f2c02
Display IQ results (time, version) in the chat window
Mikael Berthe <mikael@lilotux.net>
parents:
703
diff
changeset
|
156 // bjid should now really be the "bare JID", let's strip the resource |
| 1598 | 157 tmp = strchr(bjid, JID_RESOURCE_SEPARATOR); |
| 158 if (tmp) *tmp = '\0'; | |
|
704
4118a66f2c02
Display IQ results (time, version) in the chat window
Mikael Berthe <mikael@lilotux.net>
parents:
703
diff
changeset
|
159 |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1283
diff
changeset
|
160 scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_INFO, 0); |
|
704
4118a66f2c02
Display IQ results (time, version) in the chat window
Mikael Berthe <mikael@lilotux.net>
parents:
703
diff
changeset
|
161 g_free(buf); |
|
4118a66f2c02
Display IQ results (time, version) in the chat window
Mikael Berthe <mikael@lilotux.net>
parents:
703
diff
changeset
|
162 |
|
690
3e965a1186c7
Implement IQ:version requests
Mikael Berthe <mikael@lilotux.net>
parents:
689
diff
changeset
|
163 // Get result data... |
| 1598 | 164 p = lm_message_node_get_child_value(ansqry, "name"); |
|
690
3e965a1186c7
Implement IQ:version requests
Mikael Berthe <mikael@lilotux.net>
parents:
689
diff
changeset
|
165 if (p) { |
|
1030
923cf5a92b44
[BP-dd9e7eb5f8a8] Remove old UTF-8 conversions
Mikael Berthe <mikael@lilotux.net>
parents:
965
diff
changeset
|
166 buf = g_strdup_printf("Name: %s", p); |
|
1333
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1310
diff
changeset
|
167 scr_WriteIncomingMessage(bjid, buf, |
|
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1310
diff
changeset
|
168 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
|
1030
923cf5a92b44
[BP-dd9e7eb5f8a8] Remove old UTF-8 conversions
Mikael Berthe <mikael@lilotux.net>
parents:
965
diff
changeset
|
169 g_free(buf); |
|
690
3e965a1186c7
Implement IQ:version requests
Mikael Berthe <mikael@lilotux.net>
parents:
689
diff
changeset
|
170 } |
| 1598 | 171 p = lm_message_node_get_child_value(ansqry, "version"); |
|
690
3e965a1186c7
Implement IQ:version requests
Mikael Berthe <mikael@lilotux.net>
parents:
689
diff
changeset
|
172 if (p) { |
|
1030
923cf5a92b44
[BP-dd9e7eb5f8a8] Remove old UTF-8 conversions
Mikael Berthe <mikael@lilotux.net>
parents:
965
diff
changeset
|
173 buf = g_strdup_printf("Version: %s", p); |
|
1333
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1310
diff
changeset
|
174 scr_WriteIncomingMessage(bjid, buf, |
|
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1310
diff
changeset
|
175 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
|
1030
923cf5a92b44
[BP-dd9e7eb5f8a8] Remove old UTF-8 conversions
Mikael Berthe <mikael@lilotux.net>
parents:
965
diff
changeset
|
176 g_free(buf); |
|
690
3e965a1186c7
Implement IQ:version requests
Mikael Berthe <mikael@lilotux.net>
parents:
689
diff
changeset
|
177 } |
| 1598 | 178 p = lm_message_node_get_child_value(ansqry, "os"); |
|
690
3e965a1186c7
Implement IQ:version requests
Mikael Berthe <mikael@lilotux.net>
parents:
689
diff
changeset
|
179 if (p) { |
|
1030
923cf5a92b44
[BP-dd9e7eb5f8a8] Remove old UTF-8 conversions
Mikael Berthe <mikael@lilotux.net>
parents:
965
diff
changeset
|
180 buf = g_strdup_printf("OS: %s", p); |
|
1333
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1310
diff
changeset
|
181 scr_WriteIncomingMessage(bjid, buf, |
|
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1310
diff
changeset
|
182 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
|
1030
923cf5a92b44
[BP-dd9e7eb5f8a8] Remove old UTF-8 conversions
Mikael Berthe <mikael@lilotux.net>
parents:
965
diff
changeset
|
183 g_free(buf); |
|
690
3e965a1186c7
Implement IQ:version requests
Mikael Berthe <mikael@lilotux.net>
parents:
689
diff
changeset
|
184 } |
| 1598 | 185 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
690
3e965a1186c7
Implement IQ:version requests
Mikael Berthe <mikael@lilotux.net>
parents:
689
diff
changeset
|
186 } |
|
3e965a1186c7
Implement IQ:version requests
Mikael Berthe <mikael@lilotux.net>
parents:
689
diff
changeset
|
187 |
| 1598 | 188 static LmHandlerResult cb_time(LmMessageHandler *h, LmConnection *c, |
| 189 LmMessage *m, gpointer user_data) | |
|
691
3c0a0a993de8
Implement IQ:time requests
Mikael Berthe <mikael@lilotux.net>
parents:
690
diff
changeset
|
190 { |
| 1598 | 191 LmMessageNode *ansqry; |
| 192 const char *p, *bjid; | |
|
1703
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
193 char *buf, *tmp; |
|
691
3c0a0a993de8
Implement IQ:time requests
Mikael Berthe <mikael@lilotux.net>
parents:
690
diff
changeset
|
194 |
|
1703
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
195 // Check IQ result sender |
|
1698
e67bdd863638
Handle IQ responses with no "from"
Mikael Berthe <mikael@lilotux.net>
parents:
1683
diff
changeset
|
196 bjid = lm_message_get_from(m); |
|
e67bdd863638
Handle IQ responses with no "from"
Mikael Berthe <mikael@lilotux.net>
parents:
1683
diff
changeset
|
197 if (!bjid) |
|
1699
527c965b45c5
Add small comment in previous change
Mikael Berthe <mikael@lilotux.net>
parents:
1698
diff
changeset
|
198 bjid = lm_connection_get_jid(lconnection); // No from means our JID... |
|
1698
e67bdd863638
Handle IQ responses with no "from"
Mikael Berthe <mikael@lilotux.net>
parents:
1683
diff
changeset
|
199 if (!bjid) { |
|
1703
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
200 scr_LogPrint(LPRINT_LOGNORM, "Invalid IQ:time result (no sender name)."); |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
201 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
202 } |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
203 |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
204 // Check for error message |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
205 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) { |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
206 scr_LogPrint(LPRINT_LOGNORM, "Received error IQ message (%s)", bjid); |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
207 display_server_error(lm_message_node_get_child(m->node, "error")); |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
208 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
209 } |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
210 |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
211 // Check message contents |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
212 ansqry = lm_message_node_get_child(m->node, "query"); |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
213 if (!ansqry) { |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
214 scr_LogPrint(LPRINT_LOGNORM, "Invalid IQ:time result from <%s>!", bjid); |
|
1698
e67bdd863638
Handle IQ responses with no "from"
Mikael Berthe <mikael@lilotux.net>
parents:
1683
diff
changeset
|
215 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
691
3c0a0a993de8
Implement IQ:time requests
Mikael Berthe <mikael@lilotux.net>
parents:
690
diff
changeset
|
216 } |
|
704
4118a66f2c02
Display IQ results (time, version) in the chat window
Mikael Berthe <mikael@lilotux.net>
parents:
703
diff
changeset
|
217 |
|
782
19121d9f4aa2
Nicer message when receiving IQ result packet
Mikael Berthe <mikael@lilotux.net>
parents:
776
diff
changeset
|
218 buf = g_strdup_printf("Received IQ:time result from <%s>", bjid); |
|
704
4118a66f2c02
Display IQ results (time, version) in the chat window
Mikael Berthe <mikael@lilotux.net>
parents:
703
diff
changeset
|
219 scr_LogPrint(LPRINT_LOGNORM, "%s", buf); |
|
4118a66f2c02
Display IQ results (time, version) in the chat window
Mikael Berthe <mikael@lilotux.net>
parents:
703
diff
changeset
|
220 |
|
4118a66f2c02
Display IQ results (time, version) in the chat window
Mikael Berthe <mikael@lilotux.net>
parents:
703
diff
changeset
|
221 // bjid should now really be the "bare JID", let's strip the resource |
| 1598 | 222 tmp = strchr(bjid, JID_RESOURCE_SEPARATOR); |
| 223 if (tmp) *tmp = '\0'; | |
|
704
4118a66f2c02
Display IQ results (time, version) in the chat window
Mikael Berthe <mikael@lilotux.net>
parents:
703
diff
changeset
|
224 |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1283
diff
changeset
|
225 scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_INFO, 0); |
|
704
4118a66f2c02
Display IQ results (time, version) in the chat window
Mikael Berthe <mikael@lilotux.net>
parents:
703
diff
changeset
|
226 g_free(buf); |
|
4118a66f2c02
Display IQ results (time, version) in the chat window
Mikael Berthe <mikael@lilotux.net>
parents:
703
diff
changeset
|
227 |
|
691
3c0a0a993de8
Implement IQ:time requests
Mikael Berthe <mikael@lilotux.net>
parents:
690
diff
changeset
|
228 // Get result data... |
| 1598 | 229 p = lm_message_node_get_child_value(ansqry, "utc"); |
|
691
3c0a0a993de8
Implement IQ:time requests
Mikael Berthe <mikael@lilotux.net>
parents:
690
diff
changeset
|
230 if (p) { |
|
1030
923cf5a92b44
[BP-dd9e7eb5f8a8] Remove old UTF-8 conversions
Mikael Berthe <mikael@lilotux.net>
parents:
965
diff
changeset
|
231 buf = g_strdup_printf("UTC: %s", p); |
|
1333
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1310
diff
changeset
|
232 scr_WriteIncomingMessage(bjid, buf, |
|
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1310
diff
changeset
|
233 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
|
1030
923cf5a92b44
[BP-dd9e7eb5f8a8] Remove old UTF-8 conversions
Mikael Berthe <mikael@lilotux.net>
parents:
965
diff
changeset
|
234 g_free(buf); |
|
691
3c0a0a993de8
Implement IQ:time requests
Mikael Berthe <mikael@lilotux.net>
parents:
690
diff
changeset
|
235 } |
| 1598 | 236 p = lm_message_node_get_child_value(ansqry, "tz"); |
|
691
3c0a0a993de8
Implement IQ:time requests
Mikael Berthe <mikael@lilotux.net>
parents:
690
diff
changeset
|
237 if (p) { |
|
1030
923cf5a92b44
[BP-dd9e7eb5f8a8] Remove old UTF-8 conversions
Mikael Berthe <mikael@lilotux.net>
parents:
965
diff
changeset
|
238 buf = g_strdup_printf("TZ: %s", p); |
|
1333
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1310
diff
changeset
|
239 scr_WriteIncomingMessage(bjid, buf, |
|
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1310
diff
changeset
|
240 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
|
1030
923cf5a92b44
[BP-dd9e7eb5f8a8] Remove old UTF-8 conversions
Mikael Berthe <mikael@lilotux.net>
parents:
965
diff
changeset
|
241 g_free(buf); |
|
691
3c0a0a993de8
Implement IQ:time requests
Mikael Berthe <mikael@lilotux.net>
parents:
690
diff
changeset
|
242 } |
| 1598 | 243 p = lm_message_node_get_child_value(ansqry, "display"); |
|
691
3c0a0a993de8
Implement IQ:time requests
Mikael Berthe <mikael@lilotux.net>
parents:
690
diff
changeset
|
244 if (p) { |
|
1030
923cf5a92b44
[BP-dd9e7eb5f8a8] Remove old UTF-8 conversions
Mikael Berthe <mikael@lilotux.net>
parents:
965
diff
changeset
|
245 buf = g_strdup_printf("Time: %s", p); |
|
1333
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1310
diff
changeset
|
246 scr_WriteIncomingMessage(bjid, buf, |
|
e30a9d907105
Minor coding style adjustments
Mikael Berthe <mikael@lilotux.net>
parents:
1310
diff
changeset
|
247 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
|
1030
923cf5a92b44
[BP-dd9e7eb5f8a8] Remove old UTF-8 conversions
Mikael Berthe <mikael@lilotux.net>
parents:
965
diff
changeset
|
248 g_free(buf); |
|
691
3c0a0a993de8
Implement IQ:time requests
Mikael Berthe <mikael@lilotux.net>
parents:
690
diff
changeset
|
249 } |
| 1598 | 250 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
691
3c0a0a993de8
Implement IQ:time requests
Mikael Berthe <mikael@lilotux.net>
parents:
690
diff
changeset
|
251 } |
|
3c0a0a993de8
Implement IQ:time requests
Mikael Berthe <mikael@lilotux.net>
parents:
690
diff
changeset
|
252 |
| 1598 | 253 static LmHandlerResult cb_last(LmMessageHandler *h, LmConnection *c, |
| 254 LmMessage *m, gpointer user_data) | |
| 1015 | 255 { |
| 1598 | 256 LmMessageNode *ansqry; |
| 257 const char *p, *bjid; | |
| 258 char *buf, *tmp; | |
| 1015 | 259 |
|
1703
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
260 // Check IQ result sender |
|
1698
e67bdd863638
Handle IQ responses with no "from"
Mikael Berthe <mikael@lilotux.net>
parents:
1683
diff
changeset
|
261 bjid = lm_message_get_from(m); |
|
e67bdd863638
Handle IQ responses with no "from"
Mikael Berthe <mikael@lilotux.net>
parents:
1683
diff
changeset
|
262 if (!bjid) |
|
1699
527c965b45c5
Add small comment in previous change
Mikael Berthe <mikael@lilotux.net>
parents:
1698
diff
changeset
|
263 bjid = lm_connection_get_jid(lconnection); // No from means our JID... |
|
1698
e67bdd863638
Handle IQ responses with no "from"
Mikael Berthe <mikael@lilotux.net>
parents:
1683
diff
changeset
|
264 if (!bjid) { |
|
1703
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
265 scr_LogPrint(LPRINT_LOGNORM, "Invalid IQ:last result (no sender name)."); |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
266 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
267 } |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
268 |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
269 // Check for error message |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
270 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) { |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
271 scr_LogPrint(LPRINT_LOGNORM, "Received error IQ message (%s)", bjid); |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
272 display_server_error(lm_message_node_get_child(m->node, "error")); |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
273 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
274 } |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
275 |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
276 // Check message contents |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
277 ansqry = lm_message_node_get_child(m->node, "query"); |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
278 if (!ansqry) { |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
279 scr_LogPrint(LPRINT_LOGNORM, "Invalid IQ:version result from <%s>!", bjid); |
|
1698
e67bdd863638
Handle IQ responses with no "from"
Mikael Berthe <mikael@lilotux.net>
parents:
1683
diff
changeset
|
280 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
| 1015 | 281 } |
| 282 | |
| 283 buf = g_strdup_printf("Received IQ:last result from <%s>", bjid); | |
| 284 scr_LogPrint(LPRINT_LOGNORM, "%s", buf); | |
| 285 | |
| 286 // bjid should now really be the "bare JID", let's strip the resource | |
| 1598 | 287 tmp = strchr(bjid, JID_RESOURCE_SEPARATOR); |
| 288 if (tmp) *tmp = '\0'; | |
| 1015 | 289 |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1283
diff
changeset
|
290 scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_INFO, 0); |
| 1015 | 291 g_free(buf); |
| 292 | |
| 293 // Get result data... | |
| 1598 | 294 p = lm_message_node_get_attribute(ansqry, "seconds"); |
| 1015 | 295 if (p) { |
| 296 long int s; | |
| 297 GString *sbuf; | |
| 298 sbuf = g_string_new("Idle time: "); | |
| 299 s = atol(p); | |
| 300 // Days | |
| 301 if (s > 86400L) { | |
| 302 g_string_append_printf(sbuf, "%ldd ", s/86400L); | |
| 303 s %= 86400L; | |
| 304 } | |
| 305 // hh:mm:ss | |
| 306 g_string_append_printf(sbuf, "%02ld:", s/3600L); | |
| 307 s %= 3600L; | |
| 308 g_string_append_printf(sbuf, "%02ld:%02ld", s/60L, s%60L); | |
|
1268
dbc907b2d92f
Add configurable colors for info and incoming messages (Michal 'vorner' Vaner)
Mikael Berthe <mikael@lilotux.net>
parents:
1261
diff
changeset
|
309 scr_WriteIncomingMessage(bjid, sbuf->str, |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1283
diff
changeset
|
310 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
| 1015 | 311 g_string_free(sbuf, TRUE); |
| 312 } else { | |
| 313 scr_WriteIncomingMessage(bjid, "No idle time reported.", | |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1283
diff
changeset
|
314 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
| 1015 | 315 } |
| 1598 | 316 p = lm_message_node_get_value(ansqry); |
| 1015 | 317 if (p) { |
| 318 buf = g_strdup_printf("Status message: %s", p); | |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1283
diff
changeset
|
319 scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_INFO, 0); |
| 1015 | 320 g_free(buf); |
| 321 } | |
| 1598 | 322 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
| 1015 | 323 } |
| 324 | |
| 1006 | 325 static void display_vcard_item(const char *bjid, const char *label, |
| 326 enum vcard_attr vcard_attrib, const char *text) | |
| 327 { | |
| 328 char *buf; | |
| 329 | |
| 330 if (!text || !bjid || !label) | |
| 331 return; | |
| 332 | |
| 333 buf = g_strdup_printf("%s: %s%s%s%s%s%s%s%s%s%s", label, | |
| 334 (vcard_attrib & vcard_home ? "[home]" : ""), | |
| 335 (vcard_attrib & vcard_work ? "[work]" : ""), | |
| 336 (vcard_attrib & vcard_postal ? "[postal]" : ""), | |
| 337 (vcard_attrib & vcard_voice ? "[voice]" : ""), | |
| 338 (vcard_attrib & vcard_fax ? "[fax]" : ""), | |
| 339 (vcard_attrib & vcard_cell ? "[cell]" : ""), | |
| 340 (vcard_attrib & vcard_inet ? "[inet]" : ""), | |
| 341 (vcard_attrib & vcard_pref ? "[pref]" : ""), | |
| 342 (vcard_attrib ? " " : ""), | |
| 343 text); | |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1283
diff
changeset
|
344 scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_INFO | HBB_PREFIX_CONT, 0); |
| 1006 | 345 g_free(buf); |
| 346 } | |
| 347 | |
| 1598 | 348 static void handle_vcard_node(const char *barejid, LmMessageNode *vcardnode) |
|
1003
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
349 { |
| 1598 | 350 LmMessageNode *x; |
|
1003
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
351 const char *p; |
|
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
352 |
| 1598 | 353 for (x = vcardnode->children ; x; x = x->next) { |
| 1006 | 354 const char *data; |
| 355 enum vcard_attr vcard_attrib = 0; | |
| 356 | |
| 1598 | 357 p = x->name; |
| 358 data = lm_message_node_get_value(x); | |
| 1006 | 359 if (!p || !data) |
| 360 continue; | |
| 361 | |
| 362 if (!strcmp(p, "FN")) | |
| 363 display_vcard_item(barejid, "Name", vcard_attrib, data); | |
| 364 else if (!strcmp(p, "NICKNAME")) | |
| 365 display_vcard_item(barejid, "Nickname", vcard_attrib, data); | |
| 366 else if (!strcmp(p, "URL")) | |
| 367 display_vcard_item(barejid, "URL", vcard_attrib, data); | |
| 368 else if (!strcmp(p, "BDAY")) | |
| 369 display_vcard_item(barejid, "Birthday", vcard_attrib, data); | |
| 370 else if (!strcmp(p, "TZ")) | |
| 371 display_vcard_item(barejid, "Timezone", vcard_attrib, data); | |
| 372 else if (!strcmp(p, "TITLE")) | |
| 373 display_vcard_item(barejid, "Title", vcard_attrib, data); | |
| 374 else if (!strcmp(p, "ROLE")) | |
| 375 display_vcard_item(barejid, "Role", vcard_attrib, data); | |
| 376 else if (!strcmp(p, "DESC")) | |
| 377 display_vcard_item(barejid, "Comment", vcard_attrib, data); | |
| 378 else if (!strcmp(p, "N")) { | |
| 1598 | 379 data = lm_message_node_get_child_value(x, "FAMILY"); |
| 1006 | 380 display_vcard_item(barejid, "Family Name", vcard_attrib, data); |
| 1598 | 381 data = lm_message_node_get_child_value(x, "GIVEN"); |
| 1006 | 382 display_vcard_item(barejid, "Given Name", vcard_attrib, data); |
| 1598 | 383 data = lm_message_node_get_child_value(x, "MIDDLE"); |
| 1006 | 384 display_vcard_item(barejid, "Middle Name", vcard_attrib, data); |
| 385 } else if (!strcmp(p, "ORG")) { | |
| 1598 | 386 data = lm_message_node_get_child_value(x, "ORGNAME"); |
| 1006 | 387 display_vcard_item(barejid, "Organisation name", vcard_attrib, data); |
| 1598 | 388 data = lm_message_node_get_child_value(x, "ORGUNIT"); |
| 1006 | 389 display_vcard_item(barejid, "Organisation unit", vcard_attrib, data); |
| 390 } else { | |
| 391 // The HOME, WORK and PREF attributes are common to the remaining fields | |
| 392 // (ADR, TEL & EMAIL) | |
| 1598 | 393 if (lm_message_node_get_child(x, "HOME")) |
| 1006 | 394 vcard_attrib |= vcard_home; |
| 1598 | 395 if (lm_message_node_get_child(x, "WORK")) |
| 1006 | 396 vcard_attrib |= vcard_work; |
| 1598 | 397 if (lm_message_node_get_child(x, "PREF")) |
| 1006 | 398 vcard_attrib |= vcard_pref; |
| 399 if (!strcmp(p, "ADR")) { // Address | |
| 1598 | 400 if (lm_message_node_get_child(x, "POSTAL")) |
| 1006 | 401 vcard_attrib |= vcard_postal; |
| 1598 | 402 data = lm_message_node_get_child_value(x, "EXTADD"); |
| 1006 | 403 display_vcard_item(barejid, "Addr (ext)", vcard_attrib, data); |
| 1598 | 404 data = lm_message_node_get_child_value(x, "STREET"); |
| 1006 | 405 display_vcard_item(barejid, "Street", vcard_attrib, data); |
| 1598 | 406 data = lm_message_node_get_child_value(x, "LOCALITY"); |
| 1006 | 407 display_vcard_item(barejid, "Locality", vcard_attrib, data); |
| 1598 | 408 data = lm_message_node_get_child_value(x, "REGION"); |
| 1006 | 409 display_vcard_item(barejid, "Region", vcard_attrib, data); |
| 1598 | 410 data = lm_message_node_get_child_value(x, "PCODE"); |
| 1006 | 411 display_vcard_item(barejid, "Postal code", vcard_attrib, data); |
| 1598 | 412 data = lm_message_node_get_child_value(x, "CTRY"); |
| 1006 | 413 display_vcard_item(barejid, "Country", vcard_attrib, data); |
| 414 } else if (!strcmp(p, "TEL")) { // Telephone | |
| 1598 | 415 data = lm_message_node_get_child_value(x, "NUMBER"); |
| 1005 | 416 if (data) { |
| 1598 | 417 if (lm_message_node_get_child(x, "VOICE")) |
| 1006 | 418 vcard_attrib |= vcard_voice; |
| 1598 | 419 if (lm_message_node_get_child(x, "FAX")) |
| 1006 | 420 vcard_attrib |= vcard_fax; |
| 1598 | 421 if (lm_message_node_get_child(x, "CELL")) |
| 1006 | 422 vcard_attrib |= vcard_cell; |
| 423 display_vcard_item(barejid, "Phone", vcard_attrib, data); | |
| 1005 | 424 } |
| 1006 | 425 } else if (!strcmp(p, "EMAIL")) { // Email |
| 1598 | 426 if (lm_message_node_get_child(x, "INTERNET")) |
| 1006 | 427 vcard_attrib |= vcard_inet; |
| 1598 | 428 data = lm_message_node_get_child_value(x, "USERID"); |
| 1006 | 429 display_vcard_item(barejid, "Email", vcard_attrib, data); |
|
1003
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
430 } |
|
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
431 } |
|
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
432 } |
|
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
433 } |
|
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
434 |
| 1598 | 435 static LmHandlerResult cb_vcard(LmMessageHandler *h, LmConnection *c, |
| 436 LmMessage *m, gpointer user_data) | |
|
1003
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
437 { |
| 1598 | 438 LmMessageNode *ansqry; |
|
1698
e67bdd863638
Handle IQ responses with no "from"
Mikael Berthe <mikael@lilotux.net>
parents:
1683
diff
changeset
|
439 const char *bjid; |
| 1598 | 440 char *buf, *tmp; |
|
1003
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
441 |
|
1703
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
442 // Check IQ result sender |
|
1698
e67bdd863638
Handle IQ responses with no "from"
Mikael Berthe <mikael@lilotux.net>
parents:
1683
diff
changeset
|
443 bjid = lm_message_get_from(m); |
|
e67bdd863638
Handle IQ responses with no "from"
Mikael Berthe <mikael@lilotux.net>
parents:
1683
diff
changeset
|
444 if (!bjid) |
|
1699
527c965b45c5
Add small comment in previous change
Mikael Berthe <mikael@lilotux.net>
parents:
1698
diff
changeset
|
445 bjid = lm_connection_get_jid(lconnection); // No from means our JID... |
|
1698
e67bdd863638
Handle IQ responses with no "from"
Mikael Berthe <mikael@lilotux.net>
parents:
1683
diff
changeset
|
446 if (!bjid) { |
|
1703
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
447 scr_LogPrint(LPRINT_LOGNORM, "Invalid IQ:vCard result (no sender name)."); |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
448 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
449 } |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
450 |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
451 // Check for error message |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
452 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) { |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
453 scr_LogPrint(LPRINT_LOGNORM, "Received error IQ message (%s)", bjid); |
|
65ba89949252
Improve error checks in received IQ responses
Mikael Berthe <mikael@lilotux.net>
parents:
1699
diff
changeset
|
454 display_server_error(lm_message_node_get_child(m->node, "error")); |
|
1698
e67bdd863638
Handle IQ responses with no "from"
Mikael Berthe <mikael@lilotux.net>
parents:
1683
diff
changeset
|
455 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
1003
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
456 } |
|
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
457 |
|
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
458 buf = g_strdup_printf("Received IQ:vCard result from <%s>", bjid); |
|
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
459 scr_LogPrint(LPRINT_LOGNORM, "%s", buf); |
|
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
460 |
|
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
461 // Get the vCard node |
| 1598 | 462 ansqry = lm_message_node_get_child(m->node, "vCard"); |
|
1003
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
463 if (!ansqry) { |
|
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
464 scr_LogPrint(LPRINT_LOGNORM, "Empty IQ:vCard result!"); |
|
1340
2031f4b2cced
Fix a small memory leak
Mikael Berthe <mikael@lilotux.net>
parents:
1334
diff
changeset
|
465 g_free(buf); |
| 1598 | 466 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
1003
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
467 } |
|
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
468 |
|
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
469 // bjid should really be the "bare JID", let's strip the resource |
| 1598 | 470 tmp = strchr(bjid, JID_RESOURCE_SEPARATOR); |
| 471 if (tmp) *tmp = '\0'; | |
|
1003
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
472 |
|
1290
e42f48103609
Drawing the MUC nicks by a different color
Michal 'vorner' Vaner <vorner@ucw.cz>
parents:
1283
diff
changeset
|
473 scr_WriteIncomingMessage(bjid, buf, 0, HBB_PREFIX_INFO, 0); |
|
1003
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
474 g_free(buf); |
|
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
475 |
|
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
476 // Get result data... |
|
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
477 handle_vcard_node(bjid, ansqry); |
| 1598 | 478 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
1003
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
479 } |
|
c8b1a52b2fd6
Initial VCard retrieval support
Mikael Berthe <mikael@lilotux.net>
parents:
1002
diff
changeset
|
480 |
| 1598 | 481 static void storage_bookmarks_parse_conference(LmMessageNode *node) |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
482 { |
| 1058 | 483 const char *fjid, *name, *autojoin; |
|
1379
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
484 const char *pstatus, *awhois; |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
485 char *bjid; |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
486 GSList *room_elt; |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
487 |
| 1598 | 488 fjid = lm_message_node_get_attribute(node, "jid"); |
| 1058 | 489 if (!fjid) |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
490 return; |
| 1598 | 491 name = lm_message_node_get_attribute(node, "name"); |
| 492 autojoin = lm_message_node_get_attribute(node, "autojoin"); | |
| 493 awhois = lm_message_node_get_attribute(node, "autowhois"); | |
| 494 pstatus = lm_message_node_get_child_value(node, "print_status"); | |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
495 |
| 1058 | 496 bjid = jidtodisp(fjid); // Bare jid |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
497 |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
498 // Make sure this is a room (it can be a conversion user->room) |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
499 room_elt = roster_find(bjid, jidsearch, 0); |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
500 if (!room_elt) { |
| 1355 | 501 room_elt = roster_add_user(bjid, name, NULL, ROSTER_TYPE_ROOM, |
| 502 sub_none, -1); | |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
503 } else { |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
504 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM); |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
505 /* |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
506 // If the name is available, should we use it? |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
507 // I don't think so, it would be confusing because this item is already |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
508 // in the roster. |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
509 if (name) |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
510 buddy_setname(room_elt->data, name); |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
511 */ |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
512 } |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
513 |
|
1379
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
514 // Set the print_status and auto_whois values |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
515 if (pstatus) { |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
516 enum room_printstatus i; |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
517 for (i = status_none; i <= status_all; i++) |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
518 if (!strcasecmp(pstatus, strprintstatus[i])) |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
519 break; |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
520 if (i <= status_all) |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
521 buddy_setprintstatus(room_elt->data, i); |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
522 } |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
523 if (awhois) { |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
524 enum room_autowhois i = autowhois_default; |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
525 if (!strcmp(awhois, "1")) |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
526 i = autowhois_on; |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
527 else if (!strcmp(awhois, "0")) |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
528 i = autowhois_off; |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
529 if (i != autowhois_default) |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
530 buddy_setautowhois(room_elt->data, i); |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
531 } |
|
74b7621537d7
MUC: Store room settings (print_status, auto_whois) in private storage
Mikael Berthe <mikael@lilotux.net>
parents:
1365
diff
changeset
|
532 |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
533 // Is autojoin set? |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
534 // If it is, we'll look up for more information (nick? password?) and |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
535 // try to join the room. |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
536 if (autojoin && !strcmp(autojoin, "1")) { |
| 1598 | 537 const char *nick, *passwd; |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
538 char *tmpnick = NULL; |
| 1598 | 539 nick = lm_message_node_get_child_value(node, "nick"); |
| 540 passwd = lm_message_node_get_child_value(node, "password"); | |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
541 if (!nick || !*nick) |
|
1395
d431cd75eb53
Use bookmarked nickname when manually joining a room
Mikael Berthe <mikael@lilotux.net>
parents:
1393
diff
changeset
|
542 nick = tmpnick = default_muc_nickname(NULL); |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
543 // Let's join now |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
544 scr_LogPrint(LPRINT_LOGNORM, "Auto-join bookmark <%s>", bjid); |
| 1598 | 545 xmpp_room_join(bjid, nick, passwd); |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
546 g_free(tmpnick); |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
547 } |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
548 g_free(bjid); |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
549 } |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
550 |
| 1598 | 551 static LmHandlerResult cb_storage_bookmarks(LmMessageHandler *h, |
| 552 LmConnection *c, | |
| 553 LmMessage *m, gpointer user_data) | |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
554 { |
| 1598 | 555 LmMessageNode *x, *ansqry; |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
556 char *p; |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
557 |
| 1598 | 558 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) { |
|
1213
4a7db2870685
Improve Private Storage detection.
Mikael Berthe <mikael@lilotux.net>
parents:
1205
diff
changeset
|
559 // No server support, or no bookmarks? |
| 1598 | 560 p = m->node->children->name; |
|
1213
4a7db2870685
Improve Private Storage detection.
Mikael Berthe <mikael@lilotux.net>
parents:
1205
diff
changeset
|
561 if (p && !strcmp(p, "item-not-found")) { |
|
4a7db2870685
Improve Private Storage detection.
Mikael Berthe <mikael@lilotux.net>
parents:
1205
diff
changeset
|
562 // item-no-found means the server has Private Storage, but it's |
|
4a7db2870685
Improve Private Storage detection.
Mikael Berthe <mikael@lilotux.net>
parents:
1205
diff
changeset
|
563 // currently empty. |
| 1598 | 564 if (bookmarks) |
| 565 lm_message_node_unref(bookmarks); | |
| 566 bookmarks = lm_message_node_new("storage", "storage:bookmarks"); | |
|
1213
4a7db2870685
Improve Private Storage detection.
Mikael Berthe <mikael@lilotux.net>
parents:
1205
diff
changeset
|
567 // We return 0 so that the IQ error message be |
|
4a7db2870685
Improve Private Storage detection.
Mikael Berthe <mikael@lilotux.net>
parents:
1205
diff
changeset
|
568 // not displayed, as it isn't a real error. |
| 1598 | 569 return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
1213
4a7db2870685
Improve Private Storage detection.
Mikael Berthe <mikael@lilotux.net>
parents:
1205
diff
changeset
|
570 } |
| 1598 | 571 return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; // Unhandled error |
|
1213
4a7db2870685
Improve Private Storage detection.
Mikael Berthe <mikael@lilotux.net>
parents:
1205
diff
changeset
|
572 } |
|
4a7db2870685
Improve Private Storage detection.
Mikael Berthe <mikael@lilotux.net>
parents:
1205
diff
changeset
|
573 |
| 1598 | 574 ansqry = lm_message_node_get_child(m->node, "query"); |
| 575 ansqry = lm_message_node_get_child(ansqry, "storage"); | |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
576 if (!ansqry) { |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
577 scr_LogPrint(LPRINT_LOG, "Invalid IQ:private result! (storage:bookmarks)"); |
|
1213
4a7db2870685
Improve Private Storage detection.
Mikael Berthe <mikael@lilotux.net>
parents:
1205
diff
changeset
|
578 return 0; |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
579 } |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
580 |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
581 // Walk through the storage tags |
| 1598 | 582 for (x = ansqry->children ; x; x = x->next) { |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
583 // If the current node is a conference item, parse it and update the roster |
| 1598 | 584 if (x->name && !strcmp(x->name, "conference")) |
|
1004
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
585 storage_bookmarks_parse_conference(x); |
|
b57a01ffeed6
Use existing conference bookmarks
Mikael Berthe <mikael@lilotux.net>
parents:
1003
diff
changeset
|
586 } |
| 1598 | 587 // "Copy" the bookmarks node |
| 588 if (bookmarks) | |
| 589 lm_message_node_unref(bookmarks); | |
| 590 lm_message_node_deep_ref(ansqry); | |
| 591 bookmarks = ansqry; | |
|
1213
4a7db2870685
Improve Private Storage detection.
Mikael Berthe <mikael@lilotux.net>
parents:
1205
diff
changeset
|
592 return 0; |
|
686
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
685
diff
changeset
|
593 } |
|
98de2d166a11
Use the new IQ system for authentication
Mikael Berthe <mikael@lilotux.net>
parents:
685
diff
changeset
|
594 |
|
577
5c6d364130ee
Move IQ Jabber stuff to a separate file
Mikael Berthe <mikael@lilotux.net>
parents:
576
diff
changeset
|
595 |
| 1598 | 596 static LmHandlerResult cb_storage_rosternotes(LmMessageHandler *h, |
| 597 LmConnection *c, | |
| 598 LmMessage *m, gpointer user_data) | |
|
1261
704adf4df2d0
Send service-unavailable when Last Activity is disabled
Mikael Berthe <mikael@lilotux.net>
parents:
1255
diff
changeset
|
599 { |
| 1598 | 600 LmMessageNode *ansqry; |
|
1158
c30c315dc447
XEP-0146 support (Remote Controlling Clients)
misc@mandriva.org
parents:
1134
diff
changeset
|
601 |
| 1598 | 602 if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) { |
| 603 const char *p; | |
| 604 // No server support, or no roster notes? | |
| 605 p = m->node->children->name; | |
| 606 if (p && !strcmp(p, "item-not-found")) { | |
| 607 // item-no-found means the server has Private Storage, but it's | |
| 608 // currently empty. | |
| 609 if (rosternotes) | |
| 610 lm_message_node_unref(rosternotes); | |
| 611 rosternotes = lm_message_node_new("storage", "storage:rosternotes"); | |
| 612 // We return 0 so that the IQ error message be | |
| 613 // not displayed, as it isn't a real error. | |
| 614 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
|
1158
c30c315dc447
XEP-0146 support (Remote Controlling Clients)
misc@mandriva.org
parents:
1134
diff
changeset
|
615 } |
| 1598 | 616 return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; // Unhandled error |
|
1158
c30c315dc447
XEP-0146 support (Remote Controlling Clients)
misc@mandriva.org
parents:
1134
diff
changeset
|
617 } |
|
c30c315dc447
XEP-0146 support (Remote Controlling Clients)
misc@mandriva.org
parents:
1134
diff
changeset
|
618 |
| 1598 | 619 ansqry = lm_message_node_get_child(m->node, "query"); |
| 620 ansqry = lm_message_node_get_child(ansqry, "storage"); | |
| 621 if (!ansqry) { | |
| 622 scr_LogPrint(LPRINT_LOG, "Invalid IQ:private result! " | |
| 623 "(storage:rosternotes)"); | |
| 624 return LM_HANDLER_RESULT_REMOVE_MESSAGE; | |
|
1158
c30c315dc447
XEP-0146 support (Remote Controlling Clients)
misc@mandriva.org
parents:
1134
diff
changeset
|
625 } |
| 1598 | 626 // Copy the rosternotes node |
| 627 if (rosternotes) | |
| 628 lm_message_node_unref(rosternotes); | |
| 629 lm_message_node_deep_ref(ansqry); | |
| 630 rosternotes = ansqry; | |
| 631 return 0; | |
|
1158
c30c315dc447
XEP-0146 support (Remote Controlling Clients)
misc@mandriva.org
parents:
1134
diff
changeset
|
632 } |
|
c30c315dc447
XEP-0146 support (Remote Controlling Clients)
misc@mandriva.org
parents:
1134
diff
changeset
|
633 |
|
995
c89e7993c4d9
Answer IQ disco#info queries
Mikael Berthe <mikael@lilotux.net>
parents:
977
diff
changeset
|
634 |
| 1598 | 635 static struct IqRequestStorageHandlers |
|
1254
401639413340
More jabber:iq:last support... (misc)
Mikael Berthe <mikael@lilotux.net>
parents:
1224
diff
changeset
|
636 { |
| 1598 | 637 const gchar *storagens; |
| 638 LmHandleMessageFunction handler; | |
| 639 } iq_request_storage_handlers[] = { | |
| 640 {"storage:rosternotes", &cb_storage_rosternotes}, | |
| 641 {"storage:bookmarks", &cb_storage_bookmarks}, | |
| 642 {NULL, NULL} | |
| 643 }; | |
|
619
44ddf9bec3a5
Answer IQ:version & IQ:time requests
Mikael Berthe <mikael@lilotux.net>
parents:
613
diff
changeset
|
644 |
| 1598 | 645 void xmpp_request_storage(const gchar *storage) |
|
619
44ddf9bec3a5
Answer IQ:version & IQ:time requests
Mikael Berthe <mikael@lilotux.net>
parents:
613
diff
changeset
|
646 { |
| 1598 | 647 LmMessage *iq; |
| 648 LmMessageNode *query; | |
| 649 LmMessageHandler *handler; | |
| 650 int i; | |
|
703
8cbcbff8de7d
Fix UTC time in IQ:version queries
Mikael Berthe <mikael@lilotux.net>
parents:
699
diff
changeset
|
651 |
| 1598 | 652 iq = lm_message_new_with_sub_type(NULL, LM_MESSAGE_TYPE_IQ, |
| 653 LM_MESSAGE_SUB_TYPE_GET); | |
| 654 query = lm_message_node_add_child(iq->node, "query", NULL); | |
| 655 lm_message_node_set_attribute(query, "xmlns", NS_PRIVATE); | |
| 656 lm_message_node_set_attribute(lm_message_node_add_child | |
| 657 (query, "storage", NULL), | |
| 658 "xmlns", storage); | |
|
1283
2faf179166f3
Implement XEP-0202 (Entity Time)
Mikael Berthe <mikael@lilotux.net>
parents:
1268
diff
changeset
|
659 |
| 1598 | 660 for (i = 0; |
| 661 strcmp(iq_request_storage_handlers[i].storagens, storage) != 0; | |
| 662 ++i) ; | |
|
595
0c1d37300862
IQ: send feature-not-implemented error stanzas
Mikael Berthe <mikael@lilotux.net>
parents:
582
diff
changeset
|
663 |
| 1598 | 664 handler = lm_message_handler_new(iq_request_storage_handlers[i].handler, |
| 665 NULL, FALSE); | |
| 666 lm_connection_send_with_reply(lconnection, iq, handler, NULL); | |
| 667 lm_message_handler_unref(handler); | |
| 668 lm_message_unref(iq); | |
|
547
1df26ff0ed8c
Break packethandler() out
Mikael Berthe <mikael@lilotux.net>
parents:
539
diff
changeset
|
669 } |
| 1599 | 670 |
| 671 /* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */ |