author | Mikael Berthe <mikael@lilotux.net> |
Mon, 07 Mar 2011 19:41:44 +0100 | |
changeset 39 | ab9dad1e6d66 |
parent 37 | 92c8a28f133e |
parent 34 | 1a62a570e66b |
child 40 | d1826ea1d01f |
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 |
|
0539bca09f11
New module loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
45 |
static void disco_init (void); |
0539bca09f11
New module loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
46 |
static void disco_uninit (void); |
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 |
|
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
50 |
static module_info_t info_disco_experimental = { |
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
51 |
.branch = "experimental", |
39
ab9dad1e6d66
Merge with an updated copy of isbear repository
Mikael Berthe <mikael@lilotux.net>
diff
changeset
|
52 |
.api = 32, |
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, |
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
58 |
.next = NULL, |
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
59 |
}; |
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
60 |
|
37
92c8a28f133e
Add info struct for stable
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
61 |
static module_info_t info_disco_dev = { |
28
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
62 |
.branch = "dev", |
35 | 63 |
.api = 13, |
28
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
64 |
.version = PROJECT_VERSION, |
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
65 |
.description = DESCRIPTION, |
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
66 |
.requires = NULL, |
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
67 |
.init = disco_init, |
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
68 |
.uninit = disco_uninit, |
ff36ae7e2b1e
Use new module struct with api
Myhailo Danylenko <isbear@ukrpost.net>
parents:
27
diff
changeset
|
69 |
.next = &info_disco_experimental, |
27
0539bca09f11
New module loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
70 |
}; |
0539bca09f11
New module loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
71 |
|
37
92c8a28f133e
Add info struct for stable
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
72 |
module_info_t info_disco = { |
39
ab9dad1e6d66
Merge with an updated copy of isbear repository
Mikael Berthe <mikael@lilotux.net>
diff
changeset
|
73 |
.branch = "0.10.1", |
37
92c8a28f133e
Add info struct for stable
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
74 |
.api = 1, |
92c8a28f133e
Add info struct for stable
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
75 |
.version = PROJECT_VERSION, |
92c8a28f133e
Add info struct for stable
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
76 |
.description = DESCRIPTION, |
92c8a28f133e
Add info struct for stable
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
77 |
.requires = NULL, |
92c8a28f133e
Add info struct for stable
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
78 |
.init = disco_init, |
92c8a28f133e
Add info struct for stable
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
79 |
.uninit = disco_uninit, |
92c8a28f133e
Add info struct for stable
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
80 |
.next = &info_disco_dev, |
92c8a28f133e
Add info struct for stable
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
81 |
}; |
92c8a28f133e
Add info struct for stable
Myhailo Danylenko <isbear@ukrpost.net>
parents:
36
diff
changeset
|
82 |
|
27
0539bca09f11
New module loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
83 |
// |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
84 |
// private types |
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 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
87 |
// lm message handler userdata |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
88 |
typedef struct { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
89 |
disco_info_handler_t handler; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
90 |
gpointer data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
91 |
GDestroyNotify notify; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
92 |
} disco_info_reply_handler_t; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
93 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
94 |
// lm message handler userdata |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
95 |
typedef struct { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
96 |
disco_items_handler_t handler; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
97 |
gpointer data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
98 |
GDestroyNotify notify; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
99 |
} disco_items_reply_handler_t; |
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 |
// 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
|
102 |
typedef struct { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
103 |
gchar *jid; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
104 |
gchar *node; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
105 |
} disco_handler_t; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
106 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
107 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
108 |
// globals |
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 |
|
36
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
111 |
#ifdef HAVE_CMD_ID |
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
112 |
static gpointer disco_cmid = NULL; |
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
113 |
#endif |
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
114 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
115 |
static guint disco_cid = 0; |
29 | 116 |
static guint disco_hid = 0; |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
117 |
static GSList *reply_handlers = NULL; |
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 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
120 |
// destroyers |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
121 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
122 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
123 |
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
|
124 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
125 |
disco_info_reply_handler_t *cb = data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
126 |
if (cb -> notify) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
127 |
cb -> notify (cb -> data); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
128 |
g_free (cb); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
129 |
return; |
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 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
|
133 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
134 |
disco_items_reply_handler_t *cb = data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
135 |
if (cb -> notify) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
136 |
cb -> notify (cb -> data); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
137 |
g_free (cb); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
138 |
return; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
139 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
140 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
141 |
static void disco_handler_destroy_notify (gpointer data) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
142 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
143 |
disco_handler_t *cb = data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
144 |
g_free (cb -> jid); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
145 |
g_free (cb -> node); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
146 |
g_free (cb); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
147 |
return; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
148 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
149 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
150 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
151 |
// lm reply handlers |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
152 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
153 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
154 |
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
|
155 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
156 |
disco_info_reply_handler_t *cb = udata; |
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 |
reply_handlers = g_slist_remove (reply_handlers, handler); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
159 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
160 |
switch (lm_message_get_sub_type (message)) { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
161 |
case LM_MESSAGE_SUB_TYPE_RESULT: |
12
4d2ac929e61a
Use persistant reply handlers
Myhailo Danylenko <isbear@ukrpost.net>
parents:
9
diff
changeset
|
162 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
163 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
164 |
LmMessageNode *node = lm_message_get_node (message); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
165 |
GSList *identities = NULL; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
166 |
GSList *features = NULL; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
167 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
168 |
node = lm_message_node_get_child (node, "query"); |
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 |
// check xmlns |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
171 |
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
|
172 |
break; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
173 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
174 |
// parse request results |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
175 |
if (node->children) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
176 |
for (node = node->children; node; node = node->next) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
177 |
if (!strcasecmp (node->name, "identity")) { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
178 |
disco_identity_t *identity = g_new (disco_identity_t, 1); |
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 |
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
|
181 |
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
|
182 |
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
|
183 |
identity -> reserved = NULL; |
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 |
identities = g_slist_append (identities, identity); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
186 |
} else if (!strcasecmp (node->name, "feature")) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
187 |
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
|
188 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
189 |
// call handler |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
190 |
cb -> handler (identities, features, cb -> data); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
191 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
192 |
{ // free resources |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
193 |
GSList *iel; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
194 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
195 |
for (iel = identities; iel; iel = iel -> next) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
196 |
g_free (iel -> data); |
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 |
g_slist_free (identities); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
199 |
g_slist_free (features); |
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 |
} |
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 |
break; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
204 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
205 |
case LM_MESSAGE_SUB_TYPE_ERROR: |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
206 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
207 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
208 |
LmMessageNode *node = lm_message_get_node (message); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
209 |
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
|
210 |
const gchar *type; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
211 |
const gchar *reason; |
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 |
node = lm_message_node_get_child (node, "error"); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
214 |
type = lm_message_node_get_attribute (node, "type"); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
215 |
if (node->children) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
216 |
reason = node->children->name; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
217 |
else |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
218 |
reason = "undefined"; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
219 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
220 |
// XXX: we need to inform user, but do we really need to print this on every possible error? |
29 | 221 |
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
|
222 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
223 |
cb -> handler (NULL, NULL, cb -> data); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
224 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
225 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
226 |
break; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
227 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
228 |
default: |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
229 |
return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
230 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
231 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
232 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
233 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
234 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
235 |
static LmHandlerResult disco_items_reply_handler (LmMessageHandler *handler, LmConnection *connection, LmMessage *message, gpointer udata) |
0 | 236 |
{ |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
237 |
disco_items_reply_handler_t *cb = udata; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
238 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
239 |
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
|
240 |
|
0 | 241 |
switch (lm_message_get_sub_type (message)) { |
242 |
case LM_MESSAGE_SUB_TYPE_RESULT: |
|
243 |
||
244 |
{ |
|
1 | 245 |
LmMessageNode *node = lm_message_get_node (message); |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
246 |
GSList *items = NULL; |
1 | 247 |
|
0 | 248 |
node = lm_message_node_get_child (node, "query"); |
1 | 249 |
|
250 |
// check xmlns |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
251 |
if (!node || g_strcmp0 (lm_message_node_get_attribute (node, "xmlns"), NS_DISCO_ITEMS)) |
0 | 252 |
break; |
1 | 253 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
254 |
// parse request results |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
255 |
if (node->children) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
256 |
for (node = node->children; node; node = node->next) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
257 |
if (!strcasecmp (node->name, "item")) { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
258 |
disco_item_t *item = g_new (disco_item_t, 1); |
1 | 259 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
260 |
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
|
261 |
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
|
262 |
item -> node = lm_message_node_get_attribute (node, "node"); |
1 | 263 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
264 |
items = g_slist_append (items, item); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
265 |
} |
33
104ecab6a1d5
Remove trailing space characters
Mikael Berthe <mikael@lilotux.net>
parents:
32
diff
changeset
|
266 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
267 |
// call handler |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
268 |
cb -> handler (items, cb -> data); |
1 | 269 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
270 |
{ // free resources |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
271 |
GSList *iel; |
1 | 272 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
273 |
for (iel = items; iel; iel = iel -> next) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
274 |
g_free (iel -> data); |
1 | 275 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
276 |
g_slist_free (items); |
0 | 277 |
} |
278 |
} |
|
279 |
||
280 |
break; |
|
281 |
||
282 |
case LM_MESSAGE_SUB_TYPE_ERROR: |
|
283 |
||
284 |
{ |
|
1 | 285 |
LmMessageNode *node = lm_message_get_node (message); |
286 |
const gchar *from = lm_message_node_get_attribute (node, "from"); |
|
287 |
const gchar *type; |
|
288 |
const gchar *reason; |
|
0 | 289 |
|
290 |
node = lm_message_node_get_child (node, "error"); |
|
291 |
type = lm_message_node_get_attribute (node, "type"); |
|
292 |
if (node->children) |
|
293 |
reason = node->children->name; |
|
294 |
else |
|
295 |
reason = "undefined"; |
|
296 |
||
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
297 |
// XXX: we need to inform user, but do we really need to print this on every possible error? |
29 | 298 |
scr_log_print (LPRINT_LOGNORM, "disco: Service items discovery for %s failed: %s - %s", from, type, reason); |
0 | 299 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
300 |
cb -> handler (NULL, cb -> data); |
0 | 301 |
} |
302 |
||
303 |
break; |
|
304 |
||
305 |
default: |
|
306 |
return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; |
|
307 |
} |
|
308 |
||
309 |
return LM_HANDLER_RESULT_REMOVE_MESSAGE; |
|
310 |
} |
|
311 |
||
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
312 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
313 |
// disco requests sending |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
314 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
315 |
|
30
060c59f6f3de
Fix compilation warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
29
diff
changeset
|
316 |
#if 0 |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
317 |
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
|
318 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
319 |
const gchar *feature = data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
320 |
GSList **features = userdata; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
321 |
*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
|
322 |
return; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
323 |
} |
30
060c59f6f3de
Fix compilation warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
29
diff
changeset
|
324 |
#endif |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
325 |
|
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
326 |
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
|
327 |
{ |
22
6d0d6bbf98d0
Use xmpp_is_online and unregiste_reply_handler
Myhailo Danylenko <isbear@ukrpost.net>
parents:
21
diff
changeset
|
328 |
if (!handler || !xmpp_is_online ()) { |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
329 |
if (notify) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
330 |
notify (userdata); |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
331 |
return NULL; |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
332 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
333 |
|
30
060c59f6f3de
Fix compilation warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
29
diff
changeset
|
334 |
#if 0 |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
335 |
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
|
336 |
gchar *bjid = jidtodisp (jid); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
337 |
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
|
338 |
const gchar *resource = strchr (jid, JID_RESOURCE_SEPARATOR); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
339 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
340 |
g_free (bjid); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
341 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
342 |
if (buddy) { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
343 |
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
|
344 |
if (hash) { // cached result |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
345 |
GSList *identities = NULL; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
346 |
GSList *features = NULL; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
347 |
caps_foreach_feature (hash, disco_features_cb, &features); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
348 |
handler (identities, features, userdata); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
349 |
if (notify) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
350 |
notify (userdata); |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
351 |
return NULL; |
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 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
354 |
} |
30
060c59f6f3de
Fix compilation warnings
Myhailo Danylenko <isbear@ukrpost.net>
parents:
29
diff
changeset
|
355 |
#endif |
16
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 |
{ // send request |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
358 |
LmMessage *request; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
359 |
LmMessageNode *node; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
360 |
LmMessageHandler *lhandler; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
361 |
GError *error = NULL; |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
362 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
363 |
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
|
364 |
node = lm_message_get_node (request); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
365 |
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
|
366 |
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
|
367 |
if (dnode) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
368 |
lm_message_node_set_attribute (node, "node", dnode); |
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 |
{ |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
371 |
disco_info_reply_handler_t *cb = g_new (disco_info_reply_handler_t, 1); |
33
104ecab6a1d5
Remove trailing space characters
Mikael Berthe <mikael@lilotux.net>
parents:
32
diff
changeset
|
372 |
|
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
373 |
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
|
374 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
375 |
cb -> handler = handler; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
376 |
cb -> data = userdata; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
377 |
cb -> notify = notify; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
378 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
379 |
reply_handlers = g_slist_append (reply_handlers, lhandler); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
380 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
381 |
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
|
382 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
383 |
if (error) { |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
384 |
// XXX destroy handler and return NULL? |
29 | 385 |
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
|
386 |
g_error_free (error); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
387 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
388 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
389 |
lm_message_handler_unref (lhandler); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
390 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
391 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
392 |
lm_message_unref (request); |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
393 |
|
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
394 |
return lhandler; |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
395 |
} |
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 |
|
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
398 |
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
|
399 |
{ |
22
6d0d6bbf98d0
Use xmpp_is_online and unregiste_reply_handler
Myhailo Danylenko <isbear@ukrpost.net>
parents:
21
diff
changeset
|
400 |
if (!handler || !xmpp_is_online ()) { |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
401 |
if (notify) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
402 |
notify (userdata); |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
403 |
return NULL; |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
404 |
} |
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 |
{ // send request |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
407 |
LmMessage *request; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
408 |
LmMessageNode *node; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
409 |
GError *error = NULL; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
410 |
LmMessageHandler *lhandler; |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
411 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
412 |
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
|
413 |
node = lm_message_get_node (request); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
414 |
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
|
415 |
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
|
416 |
if (dnode) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
417 |
lm_message_node_set_attribute (node, "node", dnode); |
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 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
420 |
disco_items_reply_handler_t *cb = g_new (disco_items_reply_handler_t, 1); |
33
104ecab6a1d5
Remove trailing space characters
Mikael Berthe <mikael@lilotux.net>
parents:
32
diff
changeset
|
421 |
|
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
422 |
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
|
423 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
424 |
cb -> handler = handler; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
425 |
cb -> data = userdata; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
426 |
cb -> notify = notify; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
427 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
428 |
reply_handlers = g_slist_append (reply_handlers, lhandler); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
429 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
430 |
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
|
431 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
432 |
if (error) { |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
433 |
// XXX destroy handler and return NULL? |
29 | 434 |
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
|
435 |
g_error_free (error); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
436 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
437 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
438 |
lm_message_handler_unref (lhandler); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
439 |
} |
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 |
lm_message_unref (request); |
25
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
442 |
|
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
443 |
return lhandler; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
444 |
} |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
445 |
} |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
446 |
|
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
447 |
void disco_cancel_request (gpointer id) |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
448 |
{ |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
449 |
GSList *hel; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
450 |
|
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
451 |
for (hel = reply_handlers; hel; hel = hel -> next) { |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
452 |
if (hel -> data == id) { |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
453 |
LmMessageHandler *handler = id; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
454 |
reply_handlers = g_slist_remove (reply_handlers, handler); |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
455 |
lm_message_handler_invalidate (handler); |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
456 |
#ifdef HAVE_LM_CONNECTION_UNREGISTER_REPLY_HANDLER |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
457 |
if (lconnection) |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
458 |
lm_connection_unregister_reply_handler (lconnection, handler); |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
459 |
#endif |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
460 |
return; |
05469ec9c2e0
Add disco_cancel_request
Myhailo Danylenko <isbear@ukrpost.net>
parents:
23
diff
changeset
|
461 |
} |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
462 |
} |
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 |
return; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
465 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
466 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
467 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
468 |
// user requests handlers (print results) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
469 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
470 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
471 |
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
|
472 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
473 |
disco_handler_t *cb = udata; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
474 |
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
|
475 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
476 |
g_string_append (info, cb -> jid); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
477 |
if (cb -> node) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
478 |
g_string_append_printf (info, " (%s):", cb -> node); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
479 |
else |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
480 |
g_string_append_c (info, ':'); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
481 |
|
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 |
GString *tmp = g_string_new (NULL); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
484 |
GSList *el; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
485 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
486 |
// compose identities part |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
487 |
for (el = identities; el; el = el -> next) { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
488 |
disco_identity_t *identity = el -> data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
489 |
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
|
490 |
identity -> category ? identity -> category : "none", |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
491 |
identity -> type ? identity -> type : "none", |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
492 |
identity -> name ? identity -> name : ""); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
493 |
} |
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 |
if (tmp -> len) { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
496 |
g_string_append_printf (info, "\n Identities:%s", tmp -> str); |
17
2780d5e74400
Fix identities displaying
Myhailo Danylenko <isbear@ukrpost.net>
parents:
16
diff
changeset
|
497 |
g_string_truncate (tmp, 0); |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
498 |
} |
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 |
// compose features part |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
501 |
for (el = features; el; el = el -> next) { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
502 |
gchar *feature = el -> data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
503 |
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
|
504 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
505 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
506 |
if (tmp -> len) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
507 |
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
|
508 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
509 |
g_string_free (tmp, TRUE); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
510 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
511 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
512 |
{ // print to buddy's buffer |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
513 |
gchar *bjid = jidtodisp (cb -> jid); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
514 |
|
29 | 515 |
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
|
516 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
517 |
g_free (bjid); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
518 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
519 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
520 |
g_string_free (info, TRUE); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
521 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
522 |
return; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
523 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
524 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
525 |
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
|
526 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
527 |
disco_handler_t *cb = udata; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
528 |
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
|
529 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
530 |
g_string_append (info, cb -> jid); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
531 |
if (cb -> node) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
532 |
g_string_append_printf (info, " (%s):", cb -> node); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
533 |
else |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
534 |
g_string_append_c (info, ':'); |
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 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
537 |
GSList *el; |
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 |
// add items info |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
540 |
for (el = items; el; el = el -> next) { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
541 |
disco_item_t *item = el -> data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
542 |
if (item -> node) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
543 |
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
|
544 |
item -> jid ? item -> jid : "none", item -> node, |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
545 |
item -> name ? item -> name : ""); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
546 |
else |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
547 |
g_string_append_printf (info, "\n [%s] %s", |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
548 |
item -> jid ? item -> jid : "none", |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
549 |
item -> name ? item -> name : ""); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
550 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
551 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
552 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
553 |
{ // print to buddy's buffer |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
554 |
gchar *bjid = jidtodisp (cb -> jid); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
555 |
|
29 | 556 |
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
|
557 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
558 |
g_free (bjid); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
559 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
560 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
561 |
g_string_free (info, TRUE); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
562 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
563 |
return; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
564 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
565 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
566 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
567 |
// command |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
568 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
569 |
|
0 | 570 |
static void do_disco (char *arg) |
571 |
{ |
|
572 |
char **args = split_arg (arg, 3, 0); |
|
573 |
int info = -1; |
|
574 |
||
1 | 575 |
if (!args[0] || !strcmp (args[0], "info")) |
0 | 576 |
info = 1; |
577 |
else if (!strcmp (args[0], "items")) |
|
578 |
info = 0; |
|
579 |
else |
|
29 | 580 |
scr_log_print (LPRINT_NORMAL, "Unknown subcomand."); |
0 | 581 |
|
582 |
if (info != -1) { |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
583 |
char *to = NULL; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
584 |
char *dnode = NULL; |
33
104ecab6a1d5
Remove trailing space characters
Mikael Berthe <mikael@lilotux.net>
parents:
32
diff
changeset
|
585 |
|
1 | 586 |
if (args[0] && args[1]) { |
13 | 587 |
char *p = args[1]; |
588 |
||
589 |
if (*p == '.') { |
|
590 |
if (*(p + 1) == JID_RESOURCE_SEPARATOR) { |
|
591 |
char *rest = to_utf8 (p + 1); |
|
1 | 592 |
|
593 |
to = g_strdup_printf ("%s%s", CURRENT_JID, rest); |
|
594 |
g_free (rest); |
|
13 | 595 |
} else if (*(p + 1)) |
596 |
to = to_utf8 (p); |
|
1 | 597 |
} else |
13 | 598 |
to = to_utf8 (p); |
0 | 599 |
|
600 |
if (args[2]) |
|
1 | 601 |
dnode = to_utf8 (args[2]); |
602 |
} |
|
34
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
603 |
|
39
ab9dad1e6d66
Merge with an updated copy of isbear repository
Mikael Berthe <mikael@lilotux.net>
diff
changeset
|
604 |
if (!to) { |
ab9dad1e6d66
Merge with an updated copy of isbear repository
Mikael Berthe <mikael@lilotux.net>
diff
changeset
|
605 |
// 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
|
606 |
if (current_buddy) { |
39
ab9dad1e6d66
Merge with an updated copy of isbear repository
Mikael Berthe <mikael@lilotux.net>
diff
changeset
|
607 |
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
|
608 |
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
|
609 |
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
|
610 |
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
|
611 |
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
|
612 |
} |
34
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
613 |
} |
39
ab9dad1e6d66
Merge with an updated copy of isbear repository
Mikael Berthe <mikael@lilotux.net>
diff
changeset
|
614 |
} |
34
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
615 |
|
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
616 |
if (!to) { |
39
ab9dad1e6d66
Merge with an updated copy of isbear repository
Mikael Berthe <mikael@lilotux.net>
diff
changeset
|
617 |
scr_log_print (LPRINT_NORMAL, "Invalid disco target."); |
ab9dad1e6d66
Merge with an updated copy of isbear repository
Mikael Berthe <mikael@lilotux.net>
diff
changeset
|
618 |
free_arg_lst (args); |
ab9dad1e6d66
Merge with an updated copy of isbear repository
Mikael Berthe <mikael@lilotux.net>
diff
changeset
|
619 |
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
|
620 |
} |
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
621 |
|
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
622 |
// XXX send to all resources/current resource? |
1 | 623 |
|
16
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 |
disco_handler_t *cb = g_new (disco_handler_t, 1); |
1 | 626 |
|
34
1a62a570e66b
Fix a segfault when the selected item is not a valid disco target
Mikael Berthe <mikael@lilotux.net>
parents:
33
diff
changeset
|
627 |
cb -> jid = to; |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
628 |
cb -> node = dnode; |
14
f43622080b3a
Check for request sending error
Myhailo Danylenko <isbear@ukrpost.net>
parents:
13
diff
changeset
|
629 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
630 |
if (info) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
631 |
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
|
632 |
else |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
633 |
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
|
634 |
} |
0 | 635 |
} |
7 | 636 |
|
637 |
free_arg_lst (args); |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
638 |
return; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
639 |
} |
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 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
642 |
// module mechanics |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
643 |
// |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
644 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
645 |
static void disco_unregister_handlers (void) |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
646 |
{ |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
647 |
GSList *hel; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
648 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
649 |
for (hel = reply_handlers; hel; hel = hel -> next) { |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
650 |
LmMessageHandler *handler = hel -> data; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
651 |
lm_message_handler_invalidate (handler); |
22
6d0d6bbf98d0
Use xmpp_is_online and unregiste_reply_handler
Myhailo Danylenko <isbear@ukrpost.net>
parents:
21
diff
changeset
|
652 |
#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
|
653 |
if (lconnection) |
23
63a8b60efcb2
Forgot to actually include config.h
Myhailo Danylenko <isbear@ukrpost.net>
parents:
22
diff
changeset
|
654 |
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
|
655 |
#endif |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
656 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
657 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
658 |
g_slist_free (reply_handlers); |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
659 |
reply_handlers = NULL; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
660 |
|
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
661 |
return; |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
662 |
} |
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
663 |
|
29 | 664 |
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
|
665 |
{ |
21
299300f1dd31
Use split hooks if available
Myhailo Danylenko <isbear@ukrpost.net>
parents:
18
diff
changeset
|
666 |
disco_unregister_handlers (); |
29 | 667 |
return HOOK_HANDLER_RESULT_ALLOW_MORE_HANDLERS; |
0 | 668 |
} |
669 |
||
27
0539bca09f11
New module loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
670 |
static void disco_init (void) |
0 | 671 |
{ |
3 | 672 |
// completion |
673 |
disco_cid = compl_new_category (); |
|
674 |
if (disco_cid) { |
|
5 | 675 |
compl_add_category_word (disco_cid, "info"); |
676 |
compl_add_category_word (disco_cid, "items"); |
|
3 | 677 |
} |
678 |
||
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
679 |
// hook handler |
29 | 680 |
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
|
681 |
|
3 | 682 |
// command |
36
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
683 |
#ifndef HAVE_CMD_ID |
3 | 684 |
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
|
685 |
#else |
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
686 |
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
|
687 |
#endif |
3 | 688 |
|
27
0539bca09f11
New module loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
689 |
return; |
0 | 690 |
} |
691 |
||
27
0539bca09f11
New module loading scheme
Myhailo Danylenko <isbear@ukrpost.net>
parents:
26
diff
changeset
|
692 |
static void disco_uninit (void) |
0 | 693 |
{ |
3 | 694 |
// command |
36
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
695 |
#ifndef HAVE_CMD_ID |
0 | 696 |
cmd_del ("disco"); |
36
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
697 |
#else |
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
698 |
if (disco_cmid) |
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
699 |
cmd_del (disco_cmid); |
2910a8ca0d92
Use id to delete command
Myhailo Danylenko <isbear@ukrpost.net>
parents:
35
diff
changeset
|
700 |
#endif |
3 | 701 |
|
702 |
// completion |
|
703 |
if (disco_cid) |
|
5 | 704 |
compl_del_category (disco_cid); |
33
104ecab6a1d5
Remove trailing space characters
Mikael Berthe <mikael@lilotux.net>
parents:
32
diff
changeset
|
705 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
706 |
// hook handler |
29 | 707 |
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
|
708 |
|
12
4d2ac929e61a
Use persistant reply handlers
Myhailo Danylenko <isbear@ukrpost.net>
parents:
9
diff
changeset
|
709 |
// unregister handlers |
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
710 |
disco_unregister_handlers (); |
12
4d2ac929e61a
Use persistant reply handlers
Myhailo Danylenko <isbear@ukrpost.net>
parents:
9
diff
changeset
|
711 |
|
16
e903da874e63
Provide public interface to disco requests
Myhailo Danylenko <isbear@ukrpost.net>
parents:
15
diff
changeset
|
712 |
return; |
0 | 713 |
} |
714 |
||
12
4d2ac929e61a
Use persistant reply handlers
Myhailo Danylenko <isbear@ukrpost.net>
parents:
9
diff
changeset
|
715 |
/* vim: se ts=4 sw=4: */ |