author | Myhailo Danylenko <isbear@ukrpost.net> |
Sun, 22 Jul 2012 15:25:51 +0300 | |
changeset 54 | 170801fe3bdf |
parent 53 | dc9cf0b65d1c |
child 59 | 50173578fddc |
permissions | -rw-r--r-- |
14
f43622080b3a
Check for request sending error
Myhailo Danylenko <isbear@ukrpost.net>
parents:
13
diff
changeset
|
1 |
|
32
14534d171215
Update copyright data and API version
Mikael Berthe <mikael@lilotux.net>
parents:
30
diff
changeset
|
2 |
/* Copyright 2009,2010 Myhailo Danylenko |
0 | 3 |
* |
14
f43622080b3a
Check for request sending error
Myhailo Danylenko <isbear@ukrpost.net>
parents:
13
diff
changeset
|
4 |
* Service discovery requests |
0 | 5 |
* |
14
f43622080b3a
Check for request sending error
Myhailo Danylenko <isbear@ukrpost.net>
parents:
13
diff
changeset
|
6 |
* This file is part of mcabber-disco |
f43622080b3a
Check for request sending error
Myhailo Danylenko <isbear@ukrpost.net>
parents:
13
diff
changeset
|
7 |
* |
f43622080b3a
Check for request sending error
Myhailo Danylenko <isbear@ukrpost.net>
parents:
13
diff
changeset
|
8 |
* mcabber-disco is free software: you can redistribute it and/or modify |
0 | 9 |
* it under the terms of the GNU General Public License as published by |
14
f43622080b3a
Check for request sending error
Myhailo Danylenko <isbear@ukrpost.net>
parents:
13
diff
changeset
|
10 |
* the Free Software Foundation, either version 2 of the License, or |
f43622080b3a
Check for request sending error
Myhailo Danylenko <isbear@ukrpost.net>
parents:
13
diff
changeset
|
11 |
* (at your option) any later version. |
0 | 12 |
* |
14
f43622080b3a
Check for request sending error
Myhailo Danylenko <isbear@ukrpost.net>
parents:
13
diff
changeset
|
13 |
* This program is distributed in the hope that it will be useful, |
f43622080b3a
Check for request sending error
Myhailo Danylenko <isbear@ukrpost.net>
parents:
13
diff
changeset
|
14 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
f43622080b3a
Check for request sending error
Myhailo Danylenko <isbear@ukrpost.net>
parents:
13
diff
changeset
|
15 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
f43622080b3a
Check for request sending error
Myhailo Danylenko <isbear@ukrpost.net>
parents:
13
diff
changeset
|
16 |
* GNU General Public License for more details. |
0 | 17 |
* |
18 |
* You should have received a copy of the GNU General Public License |
|
14
f43622080b3a
Check for request sending error
Myhailo Danylenko <isbear@ukrpost.net>
parents:
13
diff
changeset
|
19 |
* along with this program. If not, see <http://www.gnu.org/licenses/>. */ |
0 | 20 |
|
21 |
#include <glib.h> |
|
22 |
#include <loudmouth/loudmouth.h> |
|
12
4d2ac929e61a
Use persistant reply handlers
Myhailo Danylenko <isbear@ukrpost.net>
parents:
9
diff
changeset
|
23 |
#include <string.h> |
0 | 24 |
|
18
47dc571eb408
Change mcabber headers naming covention
Myhailo Danylenko <isbear@ukrpost.net>
parents:
17
diff
changeset
|
25 |
#include <mcabber/commands.h> |
47dc571eb408
Change mcabber headers naming covention
Myhailo Danylenko <isbear@ukrpost.net>
parents:
17
diff
changeset
|
26 |
#include <mcabber/logprint.h> |
47dc571eb408
Change mcabber headers naming covention
Myhailo Danylenko <isbear@ukrpost.net>
parents:
17
diff
changeset
|
27 |
#include <mcabber/utils.h> |
47dc571eb408
Change mcabber headers naming covention
Myhailo Danylenko <isbear@ukrpost.net>
parents:
17
diff
changeset
|
28 |
#include <mcabber/hooks.h> |
47dc571eb408
Change mcabber headers naming covention
Myhailo Danylenko <isbear@ukrpost.net>
parents:
17
diff
changeset
|
29 |
#include <mcabber/xmpp.h> |
47dc571eb408
Change mcabber headers naming covention
Myhailo Danylenko <isbear@ukrpost.net>
parents:
17
diff
changeset
|
30 |
#include <mcabber/compl.h> |
47dc571eb408
Change mcabber headers naming covention
Myhailo Danylenko <isbear@ukrpost.net>
parents:
17
diff
changeset
|
31 |
#include <mcabber/xmpp_defines.h> |
47dc571eb408
Change mcabber headers naming covention
Myhailo Danylenko <isbear@ukrpost.net>
parents:
17
diff
changeset
|
32 |
#include <mcabber/screen.h> |
47dc571eb408
Change mcabber headers naming covention
Myhailo Danylenko <isbear@ukrpost.net>
parents:
17
diff
changeset
|
33 |
#include <mcabber/hbuf.h> |
27
0539bca09f11
New module loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
34 |
#include <mcabber/modules.h> |
30
060c59f6f3de
Fix compilation warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
29
diff
changeset
|
35 |
#include <mcabber/caps.h> |
3 | 36 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
37 |
#include "disco.h" |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
38 |
|
23
63a8b60efcb2
Forgot to actually include config.h
Myhailo Danylenko <isbear@ukrpost.net>
parents:
22
diff
changeset
|
39 |
#include "config.h" |
63a8b60efcb2
Forgot to actually include config.h
Myhailo Danylenko <isbear@ukrpost.net>
parents:
22
diff
changeset
|
40 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
41 |
// |
27
0539bca09f11
New module loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
42 |
// module description |
0539bca09f11
New module loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
43 |
// |
0539bca09f11
New module loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
44 |
|
49
a9c3cc3626ca
Update versions & add AVV description
Myhailo Danylenko <isbear@ukrpost.net>
parents:
37
diff
changeset
|
45 |
void disco_init (void); |
a9c3cc3626ca
Update versions & add AVV description
Myhailo Danylenko <isbear@ukrpost.net>
parents:
37
diff
changeset
|
46 |
void disco_uninit (void); |
27
0539bca09f11
New module loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
47 |
|
28
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
48 |
#define DESCRIPTION ( "Service discovery requests\nProvides command /disco" ) |
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
49 |
|
54
170801fe3bdf
Use gslices and build-time api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
53
diff
changeset
|
50 |
module_info_t info_disco = { |
170801fe3bdf
Use gslices and build-time api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
53
diff
changeset
|
51 |
.branch = MCABBER_BRANCH, |
170801fe3bdf
Use gslices and build-time api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
53
diff
changeset
|
52 |
.api = MCABBER_API_VERSION, |
28
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
53 |
.version = PROJECT_VERSION, |
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
54 |
.description = DESCRIPTION, |
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
55 |
.requires = NULL, |
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
56 |
.init = disco_init, |
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
57 |
.uninit = disco_uninit, |
49
a9c3cc3626ca
Update versions & add AVV description
Myhailo Danylenko <isbear@ukrpost.net>
parents:
37
diff
changeset
|
58 |
.next = NULL, |
27
0539bca09f11
New module loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
59 |
}; |
0539bca09f11
New module loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
60 |
|
0539bca09f11
New module loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
61 |
// |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
62 |
// private types |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
63 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
64 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
65 |
// lm message handler userdata |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
66 |
typedef struct { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
67 |
disco_info_handler_t handler; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
68 |
gpointer data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
69 |
GDestroyNotify notify; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
70 |
} disco_info_reply_handler_t; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
71 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
72 |
// lm message handler userdata |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
73 |
typedef struct { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
74 |
disco_items_handler_t handler; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
75 |
gpointer data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
76 |
GDestroyNotify notify; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
77 |
} disco_items_reply_handler_t; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
78 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
79 |
// user request disco handler userdata (common for info and items) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
80 |
typedef struct { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
81 |
gchar *jid; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
82 |
gchar *node; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
83 |
} disco_handler_t; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
84 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
85 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
86 |
// globals |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
87 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
88 |
|
43
751d06b00558
Use MCABBER_API_HAVE_CMD_ID
Mikael Berthe <mikael@lilotux.net>
parents:
42
diff
changeset
|
89 |
#ifdef MCABBER_API_HAVE_CMD_ID |
36
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
90 |
static gpointer disco_cmid = NULL; |
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
91 |
#endif |
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
92 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
93 |
static guint disco_cid = 0; |
29 | 94 |
static guint disco_hid = 0; |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
95 |
static GSList *reply_handlers = NULL; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
96 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
97 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
98 |
// destroyers |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
99 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
100 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
101 |
static void disco_info_reply_handler_destroy_notify (gpointer data) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
102 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
103 |
disco_info_reply_handler_t *cb = data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
104 |
if (cb -> notify) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
105 |
cb -> notify (cb -> data); |
54
170801fe3bdf
Use gslices and build-time api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
53
diff
changeset
|
106 |
g_slice_free (disco_info_reply_handler_t, cb); |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
107 |
return; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
108 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
109 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
110 |
static void disco_items_reply_handler_destroy_notify (gpointer data) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
111 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
112 |
disco_items_reply_handler_t *cb = data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
113 |
if (cb -> notify) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
114 |
cb -> notify (cb -> data); |
54
170801fe3bdf
Use gslices and build-time api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
53
diff
changeset
|
115 |
g_slice_free (disco_items_reply_handler_t, cb); |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
116 |
return; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
117 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
118 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
119 |
static void disco_handler_destroy_notify (gpointer data) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
120 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
121 |
disco_handler_t *cb = data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
122 |
g_free (cb -> jid); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
123 |
g_free (cb -> node); |
54
170801fe3bdf
Use gslices and build-time api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
53
diff
changeset
|
124 |
g_slice_free (disco_handler_t, cb); |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
125 |
return; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
126 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
127 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
128 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
129 |
// lm reply handlers |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
130 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
131 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
132 |
static LmHandlerResult disco_info_reply_handler (LmMessageHandler *handler, LmConnection *connection, LmMessage *message, gpointer udata) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
133 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
134 |
disco_info_reply_handler_t *cb = udata; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
135 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
136 |
reply_handlers = g_slist_remove (reply_handlers, handler); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
137 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
138 |
switch (lm_message_get_sub_type (message)) { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
139 |
case LM_MESSAGE_SUB_TYPE_RESULT: |
12
4d2ac929e61a
Use persistant reply handlers
Myhailo Danylenko <isbear@ukrpost.net>
parents:
9
diff
changeset
|
140 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
141 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
142 |
LmMessageNode *node = lm_message_get_node (message); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
143 |
GSList *identities = NULL; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
144 |
GSList *features = NULL; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
145 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
146 |
node = lm_message_node_get_child (node, "query"); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
147 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
148 |
// check xmlns |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
149 |
if (!node || g_strcmp0 (lm_message_node_get_attribute (node, "xmlns"), NS_DISCO_INFO)) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
150 |
break; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
151 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
152 |
// parse request results |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
153 |
if (node->children) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
154 |
for (node = node->children; node; node = node->next) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
155 |
if (!strcasecmp (node->name, "identity")) { |
54
170801fe3bdf
Use gslices and build-time api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
53
diff
changeset
|
156 |
disco_identity_t *identity = g_slice_new (disco_identity_t); |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
157 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
158 |
identity -> category = lm_message_node_get_attribute (node, "category"); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
159 |
identity -> type = lm_message_node_get_attribute (node, "type"); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
160 |
identity -> name = lm_message_node_get_attribute (node, "name"); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
161 |
identity -> reserved = NULL; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
162 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
163 |
identities = g_slist_append (identities, identity); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
164 |
} else if (!strcasecmp (node->name, "feature")) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
165 |
features = g_slist_insert_sorted (features, (gpointer) lm_message_node_get_attribute (node, "var"), (GCompareFunc) g_strcmp0); |
33
104ecab6a1d5
Remove trailing space characters
Mikael Berthe <mikael@lilotux.net>
parents:
32
diff
changeset
|
166 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
167 |
// call handler |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
168 |
cb -> handler (identities, features, cb -> data); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
169 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
170 |
{ // free resources |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
171 |
GSList *iel; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
172 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
173 |
for (iel = identities; iel; iel = iel -> next) |
54
170801fe3bdf
Use gslices and build-time api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
53
diff
changeset
|
174 |
g_slice_free (disco_identity_t, iel -> data); |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
175 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
176 |
g_slist_free (identities); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
177 |
g_slist_free (features); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
178 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
179 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
180 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
181 |
break; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
182 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
183 |
case LM_MESSAGE_SUB_TYPE_ERROR: |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
184 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
185 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
186 |
LmMessageNode *node = lm_message_get_node (message); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
187 |
const gchar *from = lm_message_node_get_attribute (node, "from"); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
188 |
const gchar *type; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
189 |
const gchar *reason; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
190 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
191 |
node = lm_message_node_get_child (node, "error"); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
192 |
type = lm_message_node_get_attribute (node, "type"); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
193 |
if (node->children) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
194 |
reason = node->children->name; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
195 |
else |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
196 |
reason = "undefined"; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
197 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
198 |
// XXX: we need to inform user, but do we really need to print this on every possible error? |
29 | 199 |
scr_log_print (LPRINT_LOGNORM, "disco: Service info discovery for %s failed: %s - %s", from, type, reason); |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
200 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
201 |
cb -> handler (NULL, NULL, cb -> data); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
202 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
203 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
204 |
break; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
205 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
206 |
default: |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
207 |
return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
208 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
209 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
210 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
211 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
212 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
213 |
static LmHandlerResult disco_items_reply_handler (LmMessageHandler *handler, LmConnection *connection, LmMessage *message, gpointer udata) |
0 | 214 |
{ |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
215 |
disco_items_reply_handler_t *cb = udata; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
216 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
217 |
reply_handlers = g_slist_remove (reply_handlers, handler); |
15
2aa6a333b0af
Use handler object for request type indication
Myhailo Danylenko <isbear@ukrpost.net>
parents:
14
diff
changeset
|
218 |
|
0 | 219 |
switch (lm_message_get_sub_type (message)) { |
220 |
case LM_MESSAGE_SUB_TYPE_RESULT: |
|
221 |
||
222 |
{ |
|
1 | 223 |
LmMessageNode *node = lm_message_get_node (message); |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
224 |
GSList *items = NULL; |
1 | 225 |
|
0 | 226 |
node = lm_message_node_get_child (node, "query"); |
1 | 227 |
|
228 |
// check xmlns |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
229 |
if (!node || g_strcmp0 (lm_message_node_get_attribute (node, "xmlns"), NS_DISCO_ITEMS)) |
0 | 230 |
break; |
1 | 231 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
232 |
// parse request results |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
233 |
if (node->children) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
234 |
for (node = node->children; node; node = node->next) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
235 |
if (!strcasecmp (node->name, "item")) { |
54
170801fe3bdf
Use gslices and build-time api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
53
diff
changeset
|
236 |
disco_item_t *item = g_slice_new (disco_item_t); |
1 | 237 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
238 |
item -> name = lm_message_node_get_attribute (node, "name"); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
239 |
item -> jid = lm_message_node_get_attribute (node, "jid"); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
240 |
item -> node = lm_message_node_get_attribute (node, "node"); |
1 | 241 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
242 |
items = g_slist_append (items, item); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
243 |
} |
33
104ecab6a1d5
Remove trailing space characters
Mikael Berthe <mikael@lilotux.net>
parents:
32
diff
changeset
|
244 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
245 |
// call handler |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
246 |
cb -> handler (items, cb -> data); |
1 | 247 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
248 |
{ // free resources |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
249 |
GSList *iel; |
1 | 250 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
251 |
for (iel = items; iel; iel = iel -> next) |
54
170801fe3bdf
Use gslices and build-time api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
53
diff
changeset
|
252 |
g_slice_free (disco_item_t, iel -> data); |
1 | 253 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
254 |
g_slist_free (items); |
0 | 255 |
} |
256 |
} |
|
257 |
||
258 |
break; |
|
259 |
||
260 |
case LM_MESSAGE_SUB_TYPE_ERROR: |
|
261 |
||
262 |
{ |
|
1 | 263 |
LmMessageNode *node = lm_message_get_node (message); |
264 |
const gchar *from = lm_message_node_get_attribute (node, "from"); |
|
265 |
const gchar *type; |
|
266 |
const gchar *reason; |
|
0 | 267 |
|
268 |
node = lm_message_node_get_child (node, "error"); |
|
269 |
type = lm_message_node_get_attribute (node, "type"); |
|
270 |
if (node->children) |
|
271 |
reason = node->children->name; |
|
272 |
else |
|
273 |
reason = "undefined"; |
|
274 |
||
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
275 |
// XXX: we need to inform user, but do we really need to print this on every possible error? |
29 | 276 |
scr_log_print (LPRINT_LOGNORM, "disco: Service items discovery for %s failed: %s - %s", from, type, reason); |
0 | 277 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
278 |
cb -> handler (NULL, cb -> data); |
0 | 279 |
} |
280 |
||
281 |
break; |
|
282 |
||
283 |
default: |
|
284 |
return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; |
|
285 |
} |
|
286 |
||
287 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
288 |
} |
|
289 |
||
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
290 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
291 |
// disco requests sending |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
292 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
293 |
|
30
060c59f6f3de
Fix compilation warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
29
diff
changeset
|
294 |
#if 0 |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
295 |
static void disco_features_cb (gconstpointer data, gpointer userdata) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
296 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
297 |
const gchar *feature = data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
298 |
GSList **features = userdata; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
299 |
*features = g_slist_insert_sorted (*features, (gpointer) feature, (GCompareFunc) g_strcmp0); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
300 |
return; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
301 |
} |
30
060c59f6f3de
Fix compilation warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
29
diff
changeset
|
302 |
#endif |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
303 |
|
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
304 |
gpointer disco_info_request (const gchar *jid, const gchar *dnode, disco_info_handler_t handler, gpointer userdata, GDestroyNotify notify) |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
305 |
{ |
22
6d0d6bbf98d0
Use xmpp_is_online and unregiste_reply_handler
Myhailo Danylenko <isbear@ukrpost.net>
parents:
21
diff
changeset
|
306 |
if (!handler || !xmpp_is_online ()) { |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
307 |
if (notify) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
308 |
notify (userdata); |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
309 |
return NULL; |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
310 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
311 |
|
30
060c59f6f3de
Fix compilation warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
29
diff
changeset
|
312 |
#if 0 |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
313 |
if (0 && !dnode) { // FIXME: no way to get identity(ies) from caps |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
314 |
gchar *bjid = jidtodisp (jid); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
315 |
GSList *buddy = roster_find (bjid, jidsearch, ROSTER_TYPE_USER | ROSTER_TYPE_ROOM | ROSTER_TYPE_AGENT); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
316 |
const gchar *resource = strchr (jid, JID_RESOURCE_SEPARATOR); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
317 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
318 |
g_free (bjid); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
319 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
320 |
if (buddy) { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
321 |
const gchar *hash = buddy_resource_getcaps (BUDDATA(buddy), resource); // ?? will it all work? |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
322 |
if (hash) { // cached result |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
323 |
GSList *identities = NULL; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
324 |
GSList *features = NULL; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
325 |
caps_foreach_feature (hash, disco_features_cb, &features); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
326 |
handler (identities, features, userdata); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
327 |
if (notify) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
328 |
notify (userdata); |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
329 |
return NULL; |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
330 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
331 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
332 |
} |
30
060c59f6f3de
Fix compilation warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
29
diff
changeset
|
333 |
#endif |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
334 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
335 |
{ // send request |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
336 |
LmMessage *request; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
337 |
LmMessageNode *node; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
338 |
LmMessageHandler *lhandler; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
339 |
GError *error = NULL; |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
340 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
341 |
request = lm_message_new_with_sub_type (jid, LM_MESSAGE_TYPE_IQ, LM_MESSAGE_SUB_TYPE_GET); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
342 |
node = lm_message_get_node (request); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
343 |
node = lm_message_node_add_child (node, "query", NULL); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
344 |
lm_message_node_set_attribute (node, "xmlns", NS_DISCO_INFO); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
345 |
if (dnode) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
346 |
lm_message_node_set_attribute (node, "node", dnode); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
347 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
348 |
{ |
54
170801fe3bdf
Use gslices and build-time api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
53
diff
changeset
|
349 |
disco_info_reply_handler_t *cb = g_slice_new (disco_info_reply_handler_t); |
33
104ecab6a1d5
Remove trailing space characters
Mikael Berthe <mikael@lilotux.net>
parents:
32
diff
changeset
|
350 |
|
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
351 |
lhandler = lm_message_handler_new (disco_info_reply_handler, cb, disco_info_reply_handler_destroy_notify); |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
352 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
353 |
cb -> handler = handler; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
354 |
cb -> data = userdata; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
355 |
cb -> notify = notify; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
356 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
357 |
reply_handlers = g_slist_append (reply_handlers, lhandler); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
358 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
359 |
lm_connection_send_with_reply (lconnection, request, lhandler, &error); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
360 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
361 |
if (error) { |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
362 |
// XXX destroy handler and return NULL? |
29 | 363 |
scr_log_print (LPRINT_DEBUG, "disco: Error sending disco request: %s.", error -> message); |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
364 |
g_error_free (error); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
365 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
366 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
367 |
lm_message_handler_unref (lhandler); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
368 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
369 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
370 |
lm_message_unref (request); |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
371 |
|
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
372 |
return lhandler; |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
373 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
374 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
375 |
|
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
376 |
gpointer disco_items_request (const gchar *jid, const gchar *dnode, disco_items_handler_t handler, gpointer userdata, GDestroyNotify notify) |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
377 |
{ |
22
6d0d6bbf98d0
Use xmpp_is_online and unregiste_reply_handler
Myhailo Danylenko <isbear@ukrpost.net>
parents:
21
diff
changeset
|
378 |
if (!handler || !xmpp_is_online ()) { |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
379 |
if (notify) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
380 |
notify (userdata); |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
381 |
return NULL; |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
382 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
383 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
384 |
{ // send request |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
385 |
LmMessage *request; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
386 |
LmMessageNode *node; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
387 |
GError *error = NULL; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
388 |
LmMessageHandler *lhandler; |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
389 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
390 |
request = lm_message_new_with_sub_type (jid, LM_MESSAGE_TYPE_IQ, LM_MESSAGE_SUB_TYPE_GET); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
391 |
node = lm_message_get_node (request); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
392 |
node = lm_message_node_add_child (node, "query", NULL); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
393 |
lm_message_node_set_attribute (node, "xmlns", NS_DISCO_ITEMS); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
394 |
if (dnode) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
395 |
lm_message_node_set_attribute (node, "node", dnode); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
396 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
397 |
{ |
54
170801fe3bdf
Use gslices and build-time api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
53
diff
changeset
|
398 |
disco_items_reply_handler_t *cb = g_slice_new (disco_items_reply_handler_t); |
33
104ecab6a1d5
Remove trailing space characters
Mikael Berthe <mikael@lilotux.net>
parents:
32
diff
changeset
|
399 |
|
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
400 |
lhandler = lm_message_handler_new (disco_items_reply_handler, cb, disco_items_reply_handler_destroy_notify); |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
401 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
402 |
cb -> handler = handler; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
403 |
cb -> data = userdata; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
404 |
cb -> notify = notify; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
405 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
406 |
reply_handlers = g_slist_append (reply_handlers, lhandler); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
407 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
408 |
lm_connection_send_with_reply (lconnection, request, lhandler, &error); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
409 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
410 |
if (error) { |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
411 |
// XXX destroy handler and return NULL? |
29 | 412 |
scr_log_print (LPRINT_DEBUG, "disco: Error sending disco request: %s.", error -> message); |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
413 |
g_error_free (error); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
414 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
415 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
416 |
lm_message_handler_unref (lhandler); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
417 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
418 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
419 |
lm_message_unref (request); |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
420 |
|
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
421 |
return lhandler; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
422 |
} |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
423 |
} |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
424 |
|
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
425 |
void disco_cancel_request (gpointer id) |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
426 |
{ |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
427 |
GSList *hel; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
428 |
|
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
429 |
for (hel = reply_handlers; hel; hel = hel -> next) { |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
430 |
if (hel -> data == id) { |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
431 |
LmMessageHandler *handler = id; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
432 |
reply_handlers = g_slist_remove (reply_handlers, handler); |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
433 |
lm_message_handler_invalidate (handler); |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
434 |
#ifdef HAVE_LM_CONNECTION_UNREGISTER_REPLY_HANDLER |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
435 |
if (lconnection) |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
436 |
lm_connection_unregister_reply_handler (lconnection, handler); |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
437 |
#endif |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
438 |
return; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
439 |
} |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
440 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
441 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
442 |
return; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
443 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
444 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
445 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
446 |
// user requests handlers (print results) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
447 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
448 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
449 |
static void disco_info_handler (GSList *identities, GSList *features, gpointer udata) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
450 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
451 |
disco_handler_t *cb = udata; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
452 |
GString *info = g_string_new ("Service discovery info results for "); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
453 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
454 |
g_string_append (info, cb -> jid); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
455 |
if (cb -> node) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
456 |
g_string_append_printf (info, " (%s):", cb -> node); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
457 |
else |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
458 |
g_string_append_c (info, ':'); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
459 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
460 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
461 |
GString *tmp = g_string_new (NULL); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
462 |
GSList *el; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
463 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
464 |
// compose identities part |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
465 |
for (el = identities; el; el = el -> next) { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
466 |
disco_identity_t *identity = el -> data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
467 |
g_string_append_printf (tmp, "\n [%s (%s)] %s", |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
468 |
identity -> category ? identity -> category : "none", |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
469 |
identity -> type ? identity -> type : "none", |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
470 |
identity -> name ? identity -> name : ""); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
471 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
472 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
473 |
if (tmp -> len) { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
474 |
g_string_append_printf (info, "\n Identities:%s", tmp -> str); |
17
2780d5e74400
Fix identities displaying
Myhailo Danylenko <isbear@ukrpost.net>
parents:
16
diff
changeset
|
475 |
g_string_truncate (tmp, 0); |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
476 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
477 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
478 |
// compose features part |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
479 |
for (el = features; el; el = el -> next) { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
480 |
gchar *feature = el -> data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
481 |
g_string_append_printf (tmp, "\n [%s]", feature ? feature : "none"); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
482 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
483 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
484 |
if (tmp -> len) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
485 |
g_string_append_printf (info, "\n Features:%s", tmp -> str); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
486 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
487 |
g_string_free (tmp, TRUE); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
488 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
489 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
490 |
{ // print to buddy's buffer |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
491 |
gchar *bjid = jidtodisp (cb -> jid); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
492 |
|
29 | 493 |
scr_write_incoming_message (bjid, info -> str, 0, HBB_PREFIX_INFO, 0); // NO conversion from utf-8 |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
494 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
495 |
g_free (bjid); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
496 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
497 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
498 |
g_string_free (info, TRUE); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
499 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
500 |
return; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
501 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
502 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
503 |
static void disco_items_handler (GSList *items, gpointer udata) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
504 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
505 |
disco_handler_t *cb = udata; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
506 |
GString *info = g_string_new ("Service discovery items results for "); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
507 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
508 |
g_string_append (info, cb -> jid); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
509 |
if (cb -> node) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
510 |
g_string_append_printf (info, " (%s):", cb -> node); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
511 |
else |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
512 |
g_string_append_c (info, ':'); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
513 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
514 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
515 |
GSList *el; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
516 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
517 |
// add items info |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
518 |
for (el = items; el; el = el -> next) { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
519 |
disco_item_t *item = el -> data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
520 |
if (item -> node) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
521 |
g_string_append_printf (info, "\n [%s (%s)] %s", |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
522 |
item -> jid ? item -> jid : "none", item -> node, |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
523 |
item -> name ? item -> name : ""); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
524 |
else |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
525 |
g_string_append_printf (info, "\n [%s] %s", |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
526 |
item -> jid ? item -> jid : "none", |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
527 |
item -> name ? item -> name : ""); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
528 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
529 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
530 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
531 |
{ // print to buddy's buffer |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
532 |
gchar *bjid = jidtodisp (cb -> jid); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
533 |
|
29 | 534 |
scr_write_incoming_message (bjid, info -> str, 0, HBB_PREFIX_INFO, 0); // NO conversion from utf-8 |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
535 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
536 |
g_free (bjid); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
537 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
538 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
539 |
g_string_free (info, TRUE); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
540 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
541 |
return; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
542 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
543 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
544 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
545 |
// command |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
546 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
547 |
|
0 | 548 |
static void do_disco (char *arg) |
549 |
{ |
|
550 |
char **args = split_arg (arg, 3, 0); |
|
551 |
int info = -1; |
|
552 |
||
1 | 553 |
if (!args[0] || !strcmp (args[0], "info")) |
0 | 554 |
info = 1; |
555 |
else if (!strcmp (args[0], "items")) |
|
556 |
info = 0; |
|
557 |
else |
|
29 | 558 |
scr_log_print (LPRINT_NORMAL, "Unknown subcomand."); |
0 | 559 |
|
560 |
if (info != -1) { |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
561 |
char *to = NULL; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
562 |
char *dnode = NULL; |
33
104ecab6a1d5
Remove trailing space characters
Mikael Berthe <mikael@lilotux.net>
parents:
32
diff
changeset
|
563 |
|
1 | 564 |
if (args[0] && args[1]) { |
13 | 565 |
char *p = args[1]; |
566 |
||
567 |
if (*p == '.') { |
|
568 |
if (*(p + 1) == JID_RESOURCE_SEPARATOR) { |
|
569 |
char *rest = to_utf8 (p + 1); |
|
1 | 570 |
|
571 |
to = g_strdup_printf ("%s%s", CURRENT_JID, rest); |
|
572 |
g_free (rest); |
|
13 | 573 |
} else if (*(p + 1)) |
574 |
to = to_utf8 (p); |
|
1 | 575 |
} else |
13 | 576 |
to = to_utf8 (p); |
0 | 577 |
|
578 |
if (args[2]) |
|
1 | 579 |
dnode = to_utf8 (args[2]); |
580 |
} |
|
34
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
581 |
|
39
ab9dad1e6d66
Merge with an updated copy of isbear repository
Mikael Berthe <mikael@lilotux.net>
diff
changeset
|
582 |
if (!to) { |
ab9dad1e6d66
Merge with an updated copy of isbear repository
Mikael Berthe <mikael@lilotux.net>
diff
changeset
|
583 |
// Use currently selected item, if possible |
34
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
584 |
if (current_buddy) { |
39
ab9dad1e6d66
Merge with an updated copy of isbear repository
Mikael Berthe <mikael@lilotux.net>
diff
changeset
|
585 |
gpointer bud = BUDDATA(current_buddy); |
34
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
586 |
if (bud) { |
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
587 |
guint type = buddy_gettype (bud); |
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
588 |
if (type != ROSTER_TYPE_GROUP && type != ROSTER_TYPE_SPECIAL) |
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
589 |
to = g_strdup (buddy_getjid (bud)); // XXX memleak! |
39
ab9dad1e6d66
Merge with an updated copy of isbear repository
Mikael Berthe <mikael@lilotux.net>
diff
changeset
|
590 |
} |
34
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
591 |
} |
39
ab9dad1e6d66
Merge with an updated copy of isbear repository
Mikael Berthe <mikael@lilotux.net>
diff
changeset
|
592 |
} |
34
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
593 |
|
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
594 |
if (!to) { |
39
ab9dad1e6d66
Merge with an updated copy of isbear repository
Mikael Berthe <mikael@lilotux.net>
diff
changeset
|
595 |
scr_log_print (LPRINT_NORMAL, "Invalid disco target."); |
ab9dad1e6d66
Merge with an updated copy of isbear repository
Mikael Berthe <mikael@lilotux.net>
diff
changeset
|
596 |
free_arg_lst (args); |
ab9dad1e6d66
Merge with an updated copy of isbear repository
Mikael Berthe <mikael@lilotux.net>
diff
changeset
|
597 |
return; |
34
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
598 |
} |
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
599 |
|
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
600 |
// XXX send to all resources/current resource? |
1 | 601 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
602 |
{ |
54
170801fe3bdf
Use gslices and build-time api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
53
diff
changeset
|
603 |
disco_handler_t *cb = g_slice_new (disco_handler_t); |
1 | 604 |
|
34
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
605 |
cb -> jid = to; |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
606 |
cb -> node = dnode; |
14
f43622080b3a
Check for request sending error
Myhailo Danylenko <isbear@ukrpost.net>
parents:
13
diff
changeset
|
607 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
608 |
if (info) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
609 |
disco_info_request (cb -> jid, cb -> node, disco_info_handler, cb, disco_handler_destroy_notify); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
610 |
else |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
611 |
disco_items_request (cb -> jid, cb -> node, disco_items_handler, cb, disco_handler_destroy_notify); |
14
f43622080b3a
Check for request sending error
Myhailo Danylenko <isbear@ukrpost.net>
parents:
13
diff
changeset
|
612 |
} |
0 | 613 |
} |
7 | 614 |
|
615 |
free_arg_lst (args); |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
616 |
return; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
617 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
618 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
619 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
620 |
// module mechanics |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
621 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
622 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
623 |
static void disco_unregister_handlers (void) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
624 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
625 |
GSList *hel; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
626 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
627 |
for (hel = reply_handlers; hel; hel = hel -> next) { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
628 |
LmMessageHandler *handler = hel -> data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
629 |
lm_message_handler_invalidate (handler); |
22
6d0d6bbf98d0
Use xmpp_is_online and unregiste_reply_handler
Myhailo Danylenko <isbear@ukrpost.net>
parents:
21
diff
changeset
|
630 |
#ifdef HAVE_LM_CONNECTION_UNREGISTER_REPLY_HANDLER |
6d0d6bbf98d0
Use xmpp_is_online and unregiste_reply_handler
Myhailo Danylenko <isbear@ukrpost.net>
parents:
21
diff
changeset
|
631 |
if (lconnection) |
23
63a8b60efcb2
Forgot to actually include config.h
Myhailo Danylenko <isbear@ukrpost.net>
parents:
22
diff
changeset
|
632 |
lm_connection_unregister_reply_handler (lconnection, handler); |
22
6d0d6bbf98d0
Use xmpp_is_online and unregiste_reply_handler
Myhailo Danylenko <isbear@ukrpost.net>
parents:
21
diff
changeset
|
633 |
#endif |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
634 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
635 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
636 |
g_slist_free (reply_handlers); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
637 |
reply_handlers = NULL; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
638 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
639 |
return; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
640 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
641 |
|
29 | 642 |
static guint disco_hh (const gchar *htype, hk_arg_t *args, gpointer ignore) |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
643 |
{ |
21
299300f1dd31
Use split hooks if available
Myhailo Danylenko <isbear@ukrpost.net>
parents:
18
diff
changeset
|
644 |
disco_unregister_handlers (); |
29 | 645 |
return HOOK_HANDLER_RESULT_ALLOW_MORE_HANDLERS; |
0 | 646 |
} |
647 |
||
49
a9c3cc3626ca
Update versions & add AVV description
Myhailo Danylenko <isbear@ukrpost.net>
parents:
37
diff
changeset
|
648 |
void disco_init (void) |
0 | 649 |
{ |
3 | 650 |
// completion |
651 |
disco_cid = compl_new_category (); |
|
652 |
if (disco_cid) { |
|
5 | 653 |
compl_add_category_word (disco_cid, "info"); |
654 |
compl_add_category_word (disco_cid, "items"); |
|
3 | 655 |
} |
656 |
||
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
657 |
// hook handler |
29 | 658 |
disco_hid = hk_add_handler (disco_hh, HOOK_PRE_DISCONNECT, G_PRIORITY_DEFAULT, NULL); |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
659 |
|
3 | 660 |
// command |
43
751d06b00558
Use MCABBER_API_HAVE_CMD_ID
Mikael Berthe <mikael@lilotux.net>
parents:
42
diff
changeset
|
661 |
#ifndef MCABBER_API_HAVE_CMD_ID |
3 | 662 |
cmd_add ("disco", "", disco_cid, COMPL_JID, do_disco, NULL); |
36
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
663 |
#else |
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
664 |
disco_cmid = cmd_add ("disco", "", disco_cid, COMPL_JID, do_disco, NULL); |
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
665 |
#endif |
3 | 666 |
|
27
0539bca09f11
New module loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
667 |
return; |
0 | 668 |
} |
669 |
||
49
a9c3cc3626ca
Update versions & add AVV description
Myhailo Danylenko <isbear@ukrpost.net>
parents:
37
diff
changeset
|
670 |
void disco_uninit (void) |
0 | 671 |
{ |
3 | 672 |
// command |
43
751d06b00558
Use MCABBER_API_HAVE_CMD_ID
Mikael Berthe <mikael@lilotux.net>
parents:
42
diff
changeset
|
673 |
#ifndef MCABBER_API_HAVE_CMD_ID |
0 | 674 |
cmd_del ("disco"); |
36
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
675 |
#else |
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
676 |
if (disco_cmid) |
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
677 |
cmd_del (disco_cmid); |
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
678 |
#endif |
3 | 679 |
|
680 |
// completion |
|
681 |
if (disco_cid) |
|
5 | 682 |
compl_del_category (disco_cid); |
33
104ecab6a1d5
Remove trailing space characters
Mikael Berthe <mikael@lilotux.net>
parents:
32
diff
changeset
|
683 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
684 |
// hook handler |
29 | 685 |
hk_del_handler (HOOK_PRE_DISCONNECT, disco_hid); |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
686 |
|
12
4d2ac929e61a
Use persistant reply handlers
Myhailo Danylenko <isbear@ukrpost.net>
parents:
9
diff
changeset
|
687 |
// unregister handlers |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
688 |
disco_unregister_handlers (); |
12
4d2ac929e61a
Use persistant reply handlers
Myhailo Danylenko <isbear@ukrpost.net>
parents:
9
diff
changeset
|
689 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
690 |
return; |
0 | 691 |
} |
692 |
||
12
4d2ac929e61a
Use persistant reply handlers
Myhailo Danylenko <isbear@ukrpost.net>
parents:
9
diff
changeset
|
693 |
/* vim: se ts=4 sw=4: */ |