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