1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
|
$NetBSD: patch-res_res__xmpp.c,v 1.1 2013/08/08 00:45:10 jnemeth Exp $
--- res/res_xmpp.c.orig 2013-04-16 23:27:51.000000000 +0000
+++ res/res_xmpp.c
@@ -510,11 +510,14 @@ static void *xmpp_config_find(struct ao2
return ao2_find(tmp_container, category, OBJ_KEY);
}
+RAII_DECL(struct xmpp_config *, cfg, ao2_cleanup);
+RAII_DECL(struct ast_xmpp_client_config *, clientcfg, ao2_cleanup);
+
/*! \brief Look up existing client or create a new one */
static void *xmpp_client_find_or_create(const char *category)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
if (!cfg || !cfg->clients || !(clientcfg = xmpp_config_find(cfg->clients, category))) {
return xmpp_client_alloc(category);
@@ -602,11 +605,13 @@ error:
return NULL;
}
+RAII_DECL(struct ast_xmpp_client_config *, oldclientcfg, ao2_cleanup);
+
static int xmpp_config_prelink(void *newitem)
{
struct ast_xmpp_client_config *clientcfg = newitem;
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, oldclientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, oldclientcfg, NULL);
if (ast_strlen_zero(clientcfg->user)) {
ast_log(LOG_ERROR, "No user specified on client '%s'\n", clientcfg->name);
@@ -642,7 +647,7 @@ static int xmpp_config_prelink(void *new
static void xmpp_config_post_apply(void)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
ao2_callback(cfg->clients, OBJ_NODATA | OBJ_MULTIPLE, xmpp_client_config_post_apply, NULL);
}
@@ -728,8 +733,8 @@ static int xmpp_is_secure(struct ast_xmp
struct ast_xmpp_client *ast_xmpp_client_find(const char *name)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
if (!cfg || !cfg->clients || !(clientcfg = xmpp_config_find(cfg->clients, name))) {
return NULL;
@@ -757,8 +762,8 @@ void ast_xmpp_client_unlock(struct ast_x
/*! \brief Internal function used to send a message to a user or chatroom */
static int xmpp_client_send_message(struct ast_xmpp_client *client, int group, const char *nick, const char *address, const char *message)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
int res = 0;
char from[XMPP_MAX_JIDLEN];
iks *message_packet;
@@ -821,8 +826,8 @@ done:
static int xmpp_client_set_group_presence(struct ast_xmpp_client *client, const char *room, int level, const char *nick)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
int res = 0;
iks *presence = NULL, *x = NULL;
char from[XMPP_MAX_JIDLEN], roomid[XMPP_MAX_JIDLEN];
@@ -892,8 +897,8 @@ void ast_xmpp_increment_mid(char *mid)
*/
static iks* xmpp_pubsub_iq_create(struct ast_xmpp_client *client, const char *type)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
iks *request;
if (!cfg || !cfg->clients || !(clientcfg = xmpp_config_find(cfg->clients, client->name)) ||
@@ -925,7 +930,7 @@ static iks* xmpp_pubsub_iq_create(struct
static iks* xmpp_pubsub_build_publish_skeleton(struct ast_xmpp_client *client, const char *node,
const char *event_type, unsigned int cachable)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
iks *request, *pubsub, *publish, *item;
if (!cfg || !cfg->global || !(request = xmpp_pubsub_iq_create(client, "set"))) {
@@ -1151,7 +1156,7 @@ static void xmpp_pubsub_publish_mwi(stru
static void xmpp_pubsub_publish_device_state(struct ast_xmpp_client *client, const char *device,
const char *device_state, unsigned int cachable)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
iks *request, *state;
char eid_str[20], cachable_str[2];
@@ -1263,7 +1268,7 @@ static void xmpp_pubsub_unsubscribe(stru
*/
static void xmpp_pubsub_subscribe(struct ast_xmpp_client *client, const char *node)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
iks *request = xmpp_pubsub_iq_create(client, "set");
iks *pubsub, *subscribe;
@@ -1369,7 +1374,7 @@ static int xmpp_pubsub_handle_event(void
static int xmpp_pubsub_handle_error(void *data, ikspak *pak)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
char *node_name, *error;
int error_num;
iks *orig_request, *orig_pubsub = iks_find(pak->x, "pubsub");
@@ -1442,8 +1447,8 @@ static int xmpp_pubsub_handle_error(void
*/
static void xmpp_init_event_distribution(struct ast_xmpp_client *client)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
if (!cfg || !cfg->clients || !(clientcfg = xmpp_config_find(cfg->clients, client->name))) {
return;
@@ -1497,8 +1502,8 @@ static int xmpp_resource_immediate(void
*/
static int xmpp_status_exec(struct ast_channel *chan, const char *data)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
struct ast_xmpp_buddy *buddy;
struct ast_xmpp_resource *resource;
char *s = NULL, status[2];
@@ -1576,8 +1581,8 @@ static int xmpp_status_exec(struct ast_c
*/
static int acf_jabberstatus_read(struct ast_channel *chan, const char *name, char *data, char *buf, size_t buflen)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
struct ast_xmpp_buddy *buddy;
struct ast_xmpp_resource *resource;
int stat = 7;
@@ -1649,8 +1654,8 @@ static struct ast_custom_function jabber
*/
static int xmpp_join_exec(struct ast_channel *chan, const char *data)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
char *s, nick[XMPP_MAX_RESJIDLEN];
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(sender);
@@ -1708,8 +1713,8 @@ static int xmpp_join_exec(struct ast_cha
*/
static int xmpp_leave_exec(struct ast_channel *chan, const char *data)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
char *s, nick[XMPP_MAX_RESJIDLEN];
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(sender);
@@ -1769,8 +1774,8 @@ static int xmpp_leave_exec(struct ast_ch
*/
static int xmpp_send_exec(struct ast_channel *chan, const char *data)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
char *s;
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(sender);
@@ -1810,8 +1815,8 @@ static int xmpp_send_exec(struct ast_cha
*/
static int xmpp_sendgroup_exec(struct ast_channel *chan, const char *data)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
char *s, nick[XMPP_MAX_RESJIDLEN];
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(sender);
@@ -1863,8 +1868,8 @@ static int xmpp_sendgroup_exec(struct as
*/
static int acf_jabberreceive_read(struct ast_channel *chan, const char *name, char *data, char *buf, size_t buflen)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
char *parse = NULL;
int timeout, jidlen, resourcelen, found = 0;
struct timeval start;
@@ -2022,8 +2027,8 @@ static struct ast_custom_function jabber
*/
static int delete_old_messages(struct ast_xmpp_client *client, char *from)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
int deleted = 0, isold = 0;
struct ast_xmpp_message *message = NULL;
@@ -2056,8 +2061,8 @@ static int delete_old_messages(struct as
static int xmpp_send_cb(const struct ast_msg *msg, const char *to, const char *from)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
char *sender, *dest;
int res;
@@ -2181,8 +2186,8 @@ static int xmpp_client_subscribe_user(vo
/*! \brief Hook function called when roster is received from server */
static int xmpp_roster_hook(void *data, ikspak *pak)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
struct ast_xmpp_client *client = data;
iks *item;
@@ -2239,8 +2244,8 @@ static int xmpp_roster_hook(void *data,
/*! \brief Internal function which changes the presence status of an XMPP client */
static void xmpp_client_set_presence(struct ast_xmpp_client *client, const char *to, const char *from, int level, const char *desc)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
iks *presence = NULL, *cnode = NULL, *priority = NULL;
char priorityS[10];
@@ -2367,8 +2372,8 @@ static int xmpp_client_service_discovery
/*! \brief Hook function called when client finishes authenticating with the server */
static int xmpp_connect_hook(void *data, ikspak *pak)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
struct ast_xmpp_client *client = data;
iks *roster;
@@ -2405,8 +2410,8 @@ static int xmpp_connect_hook(void *data,
/*! \brief Logging hook function */
static void xmpp_log_hook(void *data, const char *xmpp, size_t size, int incoming)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
struct ast_xmpp_client *client = data;
if (!ast_strlen_zero(xmpp)) {
@@ -2750,8 +2755,8 @@ static int xmpp_component_authenticate(s
/*! \brief Hook function called when component receives a service discovery get message */
static int xmpp_component_service_discovery_get_hook(void *data, ikspak *pak)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
struct ast_xmpp_client *client = data;
iks *iq = NULL, *query = NULL, *identity = NULL, *disco = NULL, *reg = NULL, *commands = NULL, *gateway = NULL;
iks *version = NULL, *vcard = NULL, *search = NULL, *item = NULL;
@@ -2837,8 +2842,8 @@ done:
/*! \brief Hook function called when the component is queried about registration */
static int xmpp_component_register_get_hook(void *data, ikspak *pak)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
struct ast_xmpp_client *client = data;
iks *iq = NULL, *query = NULL, *error = NULL, *notacceptable = NULL, *instructions = NULL;
struct ast_xmpp_buddy *buddy;
@@ -2945,8 +2950,8 @@ done:
/*! \brief Hook function called when we receive a service discovery items request */
static int xmpp_component_service_discovery_items_hook(void *data, ikspak *pak)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
struct ast_xmpp_client *client = data;
iks *iq = NULL, *query = NULL, *item = NULL, *feature = NULL;
char *node;
@@ -3295,8 +3300,8 @@ static int xmpp_pak_s10n(struct ast_xmpp
/*! \brief Action hook for when things occur */
static int xmpp_action_hook(void *data, int type, iks *node)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
struct ast_xmpp_client *client = data;
ikspak *pak;
int i;
@@ -3405,8 +3410,8 @@ int ast_xmpp_client_disconnect(struct as
/*! \brief Internal function used to reconnect an XMPP client to its server */
static int xmpp_client_reconnect(struct ast_xmpp_client *client)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
int res = IKS_NET_NOCONN;
if (!cfg || !cfg->clients || !(clientcfg = xmpp_config_find(cfg->clients, client->name))) {
@@ -3569,8 +3574,8 @@ static void *xmpp_client_thread(void *da
} else if (res == IKS_NET_TLSFAIL) {
ast_log(LOG_ERROR, "JABBER: Failure in TLS.\n");
} else if (!client->timeout && client->state == XMPP_STATE_CONNECTED) {
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
if (cfg && cfg->clients && (clientcfg = xmpp_config_find(cfg->clients, client->name))) {
res = ast_test_flag(&clientcfg->flags, XMPP_KEEPALIVE) ? xmpp_client_send_raw_message(client, " ") : IKS_OK;
@@ -3667,8 +3672,8 @@ static int xmpp_client_config_post_apply
*/
static int manager_jabber_send(struct mansession *s, const struct message *m)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
const char *id = astman_get_header(m, "ActionID");
const char *jabber = astman_get_header(m, "Jabber");
const char *screenname = astman_get_header(m, "ScreenName");
@@ -3794,8 +3799,8 @@ static void xmpp_pubsub_request_nodes(st
static char *xmpp_cli_list_pubsub_nodes(struct ast_cli_entry *e, int cmd, struct
ast_cli_args *a)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
const char *name = NULL, *collection = NULL;
switch (cmd) {
@@ -3880,8 +3885,8 @@ static void xmpp_pubsub_purge_nodes(stru
static char *xmpp_cli_purge_pubsub_nodes(struct ast_cli_entry *e, int cmd, struct
ast_cli_args *a)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
const char *name;
switch (cmd) {
@@ -3925,8 +3930,8 @@ static char *xmpp_cli_purge_pubsub_nodes
static char *xmpp_cli_delete_pubsub_node(struct ast_cli_entry *e, int cmd, struct
ast_cli_args *a)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
const char *name;
switch (cmd) {
@@ -3962,8 +3967,8 @@ static char *xmpp_cli_delete_pubsub_node
*/
static char *xmpp_cli_create_collection(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
const char *name, *collection_name;
switch (cmd) {
@@ -4002,8 +4007,8 @@ static char *xmpp_cli_create_collection(
*/
static char *xmpp_cli_create_leafnode(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
const char *name, *collection_name, *leaf_name;
switch (cmd) {
@@ -4078,7 +4083,7 @@ static char *xmpp_do_set_debug(struct as
*/
static char *xmpp_show_clients(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
struct ao2_iterator i;
struct ast_xmpp_client_config *clientcfg;
@@ -4154,7 +4159,7 @@ static char *xmpp_show_clients(struct as
*/
static char *xmpp_show_buddies(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
struct ao2_iterator i;
struct ast_xmpp_client_config *clientcfg;
|
