kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/comms/asterisk/patches/patch-res_res__xmpp.c
jnemeth dab9bdafe8 Update to Asterisk 11.6.1: this is a security fix update to fix 
AST-2013-006 and AST-2013-007, and a minor bug fix update.

pkgsrc change: disable SRTP on NetBSD as it doesn't link

---- 11.6.1 ----

The Asterisk Development Team has announced security releases for Certified
Asterisk 1.8.15, 11.2, and Asterisk 1.8, 10, and 11. The available security
releases are released as versions 1.8.15-cert4, 11.2-cert3, 1.8.24.1, 10.12.4,
10.12.4-digiumphones, and 11.6.1.

The release of these versions resolve the following issues:

* A buffer overflow when receiving odd length 16 bit messages in app_sms. An
  infinite loop could occur which would overwrite memory when a message is
  received into the unpacksms16() function and the length of the message is an
  odd number of bytes.

* Prevent permissions escalation in the Asterisk Manager Interface. Asterisk
  now marks certain individual dialplan functions as 'dangerous', which will
  inhibit their execution from external sources.

  A 'dangerous' function is one which results in a privilege escalation. For
  example, if one were to read the channel variable SHELL(rm -rf /) Bad
  Things(TM) could happen; even if the external source has only read
  permissions.

  Execution from external sources may be enabled by setting 'live_dangerously'
  to 'yes' in the [options] section of asterisk.conf. Although doing so is not
  recommended.

These issues and their resolutions are described in the security advisories.

For more information about the details of these vulnerabilities, please read
security advisories AST-2013-006 and AST-2013-007, which were
released at the same time as this announcement.

For a full list of changes in the current releases, please see the ChangeLogs:

http://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-11.6.1

The security advisories are available at:

 * http://downloads.asterisk.org/pub/security/AST-2013-006.pdf
 * http://downloads.asterisk.org/pub/security/AST-2013-007.pdf

Thank you for your continued support of Asterisk!

----- 11.6.0 -----

The Asterisk Development Team has announced the release of Asterisk 11.6.0.

The release of Asterisk 11.6.0 resolves several issues reported by the
community and would have not been possible without your participation.
Thank you!

The following is a sample of the issues resolved in this release:

* --- Confbridge: empty conference not being torn down
  (Closes issue ASTERISK-21859. Reported by Chris Gentle)

* --- Let Queue wrap up time influence member availability
  (Closes issue ASTERISK-22189. Reported by Tony Lewis)

* --- Fix a longstanding issue with MFC-R2 configuration that
      prevented users
  (Closes issue ASTERISK-21117. Reported by Rafael Angulo)

* --- chan_iax2: Fix saving the wrong expiry time in astdb.
  (Closes issue ASTERISK-22504. Reported by Stefan Wachtler)

* --- Fix segfault for certain invalid WebSocket input.
  (Closes issue ASTERISK-21825. Reported by Alfred Farrugia)

For a full list of changes in this release, please see the ChangeLog:

http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-11.6.0

Thank you for your continued support of Asterisk!
2013-12-23 01:34:03 +00:00

430 lines
21 KiB
C
Raw Blame History

$NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
--- res/res_xmpp.c.orig 2013-09-07 00:59:41.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;
@@ -1370,7 +1375,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");
@@ -1443,8 +1448,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;
@@ -1498,8 +1503,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];
@@ -1577,8 +1582,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;
@@ -1650,8 +1655,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);
@@ -1709,8 +1714,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);
@@ -1770,8 +1775,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);
@@ -1811,8 +1816,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);
@@ -1864,8 +1869,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;
@@ -2023,8 +2028,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;
@@ -2057,8 +2062,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;
@@ -2182,8 +2187,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;
@@ -2240,8 +2245,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];
@@ -2368,8 +2373,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;
@@ -2406,8 +2411,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)) {
@@ -2745,8 +2750,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;
@@ -2832,8 +2837,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;
@@ -2940,8 +2945,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;
@@ -3324,8 +3329,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;
@@ -3435,8 +3440,8 @@ int ast_xmpp_client_disconnect(struct as
static int xmpp_client_reconnect(struct ast_xmpp_client *client)
{
struct timeval tv = { .tv_sec = 5, .tv_usec = 0 };
- 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))) {
@@ -3611,8 +3616,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);
@@ -3725,8 +3730,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");
@@ -3852,8 +3857,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) {
@@ -3938,8 +3943,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) {
@@ -3983,8 +3988,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) {
@@ -4020,8 +4025,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) {
@@ -4060,8 +4065,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) {
@@ -4136,7 +4141,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;
@@ -4212,7 +4217,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;
Reference in a new issue View git blame Copy permalink