2013-04-25 18:25:31 +00:00
|
|
|
/*
|
|
|
|
* Asterisk -- An open source telephony toolkit.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2013, Digium, Inc.
|
|
|
|
*
|
|
|
|
* Mark Michelson <mmichelson@digium.com>
|
|
|
|
*
|
|
|
|
* See http://www.asterisk.org for more information about
|
|
|
|
* the Asterisk project. Please do not directly contact
|
|
|
|
* any of the maintainers of this project for assistance;
|
|
|
|
* the project provides a web site, mailing lists and IRC
|
|
|
|
* channels for your use.
|
|
|
|
*
|
|
|
|
* This program is free software, distributed under the terms of
|
|
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
|
|
* at the top of the source tree.
|
|
|
|
*/
|
|
|
|
|
2013-04-26 21:52:06 +00:00
|
|
|
/*** MODULEINFO
|
|
|
|
<depend>pjproject</depend>
|
2013-07-30 18:14:50 +00:00
|
|
|
<depend>res_pjsip</depend>
|
2013-10-14 15:01:59 +00:00
|
|
|
<depend>res_pjsip_pubsub</depend>
|
2013-04-26 21:52:06 +00:00
|
|
|
<support_level>core</support_level>
|
|
|
|
***/
|
|
|
|
|
2013-04-25 18:25:31 +00:00
|
|
|
#include "asterisk.h"
|
|
|
|
|
|
|
|
#include <pjsip.h>
|
|
|
|
#include <pjsip_simple.h>
|
|
|
|
#include <pjlib.h>
|
|
|
|
|
2013-07-30 18:14:50 +00:00
|
|
|
#include "asterisk/res_pjsip.h"
|
|
|
|
#include "asterisk/res_pjsip_pubsub.h"
|
Decouple subscription handling from NOTIFY/PUBLISH body generation.
When the PJSIP pubsub framework was created, subscription handlers were required
to state what event they handled along with what body types they knew how to
generate. While this serves well when implementing a base RFC, it has problems
when trying to extend the body to support non-standard or proprietary body
elements. The code also was NOTIFY-specific, meaning that when the time comes
that we start writing code to send out PUBLISH requests with MWI or presence
bodies, we would likely find ourselves duplicating code that had previously been
written.
This changeset introduces the concept of body generators and body supplements. A
body generator is responsible for allocating a native structure for a given body
type, providing the primary body content, converting the native structure to a
string, and deallocating resources. A body supplement takes the primary body
content (the native structure, not a string) generated by the body generator and
adds nonstandard elements to the body. With these elements living in their own
module, it becomes easy to extend our support for body types and to re-use
resources when sending a PUBLISH request.
Body generators and body supplements register themselves with the pubsub core,
similar to how subscription and publish handlers had done. Now, subscription
handlers do not need to know what type of body content they generate, but they
still need to inform the pubsub core about what the default body type for a
given event package is. The pubsub core keeps track of what body generators and
body supplements have been registered. When a SUBSCRIBE arrives, the pubsub core
will check that there is a subscription handler for the event in the SUBSCRIBE,
then it will check that there is a body generator that can provide the content
specified in the Accept header(s).
Because of the nature of body generators and supplements, it means
res_pjsip_exten_state and res_pjsip_mwi have been completely gutted. They no
longer worry about body types, instead calling
ast_sip_pubsub_generate_body_content() when they need to generate a NOTIFY body.
Review: https://reviewboard.asterisk.org/r/3150
........
Merged revisions 407016 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@407030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-01-31 22:27:07 +00:00
|
|
|
#include "asterisk/res_pjsip_body_generator_types.h"
|
2013-04-25 18:25:31 +00:00
|
|
|
#include "asterisk/module.h"
|
|
|
|
#include "asterisk/logger.h"
|
|
|
|
#include "asterisk/astobj2.h"
|
2016-08-08 17:53:32 +00:00
|
|
|
#include "asterisk/taskprocessor.h"
|
2013-04-25 18:25:31 +00:00
|
|
|
#include "asterisk/sorcery.h"
|
|
|
|
#include "asterisk/stasis.h"
|
|
|
|
#include "asterisk/app.h"
|
|
|
|
|
|
|
|
struct mwi_subscription;
|
2015-06-17 10:04:39 +00:00
|
|
|
static struct ao2_container *unsolicited_mwi;
|
2013-04-25 18:25:31 +00:00
|
|
|
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
static char *default_voicemail_extension;
|
|
|
|
|
2013-04-25 18:25:31 +00:00
|
|
|
#define STASIS_BUCKETS 13
|
|
|
|
#define MWI_BUCKETS 53
|
Decouple subscription handling from NOTIFY/PUBLISH body generation.
When the PJSIP pubsub framework was created, subscription handlers were required
to state what event they handled along with what body types they knew how to
generate. While this serves well when implementing a base RFC, it has problems
when trying to extend the body to support non-standard or proprietary body
elements. The code also was NOTIFY-specific, meaning that when the time comes
that we start writing code to send out PUBLISH requests with MWI or presence
bodies, we would likely find ourselves duplicating code that had previously been
written.
This changeset introduces the concept of body generators and body supplements. A
body generator is responsible for allocating a native structure for a given body
type, providing the primary body content, converting the native structure to a
string, and deallocating resources. A body supplement takes the primary body
content (the native structure, not a string) generated by the body generator and
adds nonstandard elements to the body. With these elements living in their own
module, it becomes easy to extend our support for body types and to re-use
resources when sending a PUBLISH request.
Body generators and body supplements register themselves with the pubsub core,
similar to how subscription and publish handlers had done. Now, subscription
handlers do not need to know what type of body content they generate, but they
still need to inform the pubsub core about what the default body type for a
given event package is. The pubsub core keeps track of what body generators and
body supplements have been registered. When a SUBSCRIBE arrives, the pubsub core
will check that there is a subscription handler for the event in the SUBSCRIBE,
then it will check that there is a body generator that can provide the content
specified in the Accept header(s).
Because of the nature of body generators and supplements, it means
res_pjsip_exten_state and res_pjsip_mwi have been completely gutted. They no
longer worry about body types, instead calling
ast_sip_pubsub_generate_body_content() when they need to generate a NOTIFY body.
Review: https://reviewboard.asterisk.org/r/3150
........
Merged revisions 407016 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@407030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-01-31 22:27:07 +00:00
|
|
|
|
|
|
|
#define MWI_TYPE "application"
|
|
|
|
#define MWI_SUBTYPE "simple-message-summary"
|
|
|
|
|
2014-08-07 19:26:32 +00:00
|
|
|
#define MWI_DATASTORE "MWI datastore"
|
|
|
|
|
2016-08-08 17:53:32 +00:00
|
|
|
/*! Number of serializers in pool if one not supplied. */
|
|
|
|
#define MWI_SERIALIZER_POOL_SIZE 8
|
|
|
|
|
|
|
|
/*! Pool of serializers to use if not supplied. */
|
|
|
|
static struct ast_taskprocessor *mwi_serializer_pool[MWI_SERIALIZER_POOL_SIZE];
|
|
|
|
|
2013-04-25 18:25:31 +00:00
|
|
|
static void mwi_subscription_shutdown(struct ast_sip_subscription *sub);
|
2013-11-23 17:26:57 +00:00
|
|
|
static void mwi_to_ami(struct ast_sip_subscription *sub, struct ast_str **buf);
|
2014-06-25 20:57:28 +00:00
|
|
|
static int mwi_new_subscribe(struct ast_sip_endpoint *endpoint,
|
|
|
|
const char *resource);
|
2014-08-07 19:26:32 +00:00
|
|
|
static int mwi_subscription_established(struct ast_sip_subscription *sub);
|
|
|
|
static void *mwi_get_notify_data(struct ast_sip_subscription *sub);
|
2014-06-25 20:57:28 +00:00
|
|
|
|
|
|
|
static struct ast_sip_notifier mwi_notifier = {
|
|
|
|
.default_accept = MWI_TYPE"/"MWI_SUBTYPE,
|
|
|
|
.new_subscribe = mwi_new_subscribe,
|
2014-08-07 19:26:32 +00:00
|
|
|
.subscription_established = mwi_subscription_established,
|
|
|
|
.get_notify_data = mwi_get_notify_data,
|
2014-06-25 20:57:28 +00:00
|
|
|
};
|
2013-04-25 18:25:31 +00:00
|
|
|
|
|
|
|
static struct ast_sip_subscription_handler mwi_handler = {
|
|
|
|
.event_name = "message-summary",
|
2014-09-18 16:09:25 +00:00
|
|
|
.body_type = AST_SIP_MESSAGE_ACCUMULATOR,
|
Decouple subscription handling from NOTIFY/PUBLISH body generation.
When the PJSIP pubsub framework was created, subscription handlers were required
to state what event they handled along with what body types they knew how to
generate. While this serves well when implementing a base RFC, it has problems
when trying to extend the body to support non-standard or proprietary body
elements. The code also was NOTIFY-specific, meaning that when the time comes
that we start writing code to send out PUBLISH requests with MWI or presence
bodies, we would likely find ourselves duplicating code that had previously been
written.
This changeset introduces the concept of body generators and body supplements. A
body generator is responsible for allocating a native structure for a given body
type, providing the primary body content, converting the native structure to a
string, and deallocating resources. A body supplement takes the primary body
content (the native structure, not a string) generated by the body generator and
adds nonstandard elements to the body. With these elements living in their own
module, it becomes easy to extend our support for body types and to re-use
resources when sending a PUBLISH request.
Body generators and body supplements register themselves with the pubsub core,
similar to how subscription and publish handlers had done. Now, subscription
handlers do not need to know what type of body content they generate, but they
still need to inform the pubsub core about what the default body type for a
given event package is. The pubsub core keeps track of what body generators and
body supplements have been registered. When a SUBSCRIBE arrives, the pubsub core
will check that there is a subscription handler for the event in the SUBSCRIBE,
then it will check that there is a body generator that can provide the content
specified in the Accept header(s).
Because of the nature of body generators and supplements, it means
res_pjsip_exten_state and res_pjsip_mwi have been completely gutted. They no
longer worry about body types, instead calling
ast_sip_pubsub_generate_body_content() when they need to generate a NOTIFY body.
Review: https://reviewboard.asterisk.org/r/3150
........
Merged revisions 407016 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@407030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-01-31 22:27:07 +00:00
|
|
|
.accept = { MWI_TYPE"/"MWI_SUBTYPE, },
|
2013-04-25 18:25:31 +00:00
|
|
|
.subscription_shutdown = mwi_subscription_shutdown,
|
2013-11-23 17:26:57 +00:00
|
|
|
.to_ami = mwi_to_ami,
|
2014-06-25 20:57:28 +00:00
|
|
|
.notifier = &mwi_notifier,
|
2013-04-25 18:25:31 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/*!
|
|
|
|
* \brief Wrapper for stasis subscription
|
|
|
|
*
|
|
|
|
* An MWI subscription has a container of these. This
|
|
|
|
* represents a stasis subscription for MWI state.
|
|
|
|
*/
|
|
|
|
struct mwi_stasis_subscription {
|
|
|
|
/*! The MWI stasis subscription */
|
|
|
|
struct stasis_subscription *stasis_sub;
|
|
|
|
/*! The mailbox corresponding with the MWI subscription. Used as a hash key */
|
|
|
|
char mailbox[1];
|
|
|
|
};
|
|
|
|
|
|
|
|
/*!
|
|
|
|
* \brief A subscription for MWI
|
|
|
|
*
|
|
|
|
* This subscription is the basis for MWI for an endpoint. Each
|
|
|
|
* endpoint that uses MWI will have a corresponding mwi_subscription.
|
|
|
|
*
|
|
|
|
* This structure acts as the owner for the underlying SIP subscription.
|
|
|
|
* When the mwi_subscription is destroyed, the SIP subscription dies, too.
|
|
|
|
* The mwi_subscription's lifetime is governed by its underlying stasis
|
|
|
|
* subscriptions. When all stasis subscriptions are destroyed, the
|
|
|
|
* mwi_subscription is destroyed as well.
|
|
|
|
*/
|
|
|
|
struct mwi_subscription {
|
|
|
|
/*! Container of \ref mwi_stasis_subscription structures.
|
2015-04-14 19:04:46 +00:00
|
|
|
* A single MWI subscription may be for multiple mailboxes, thus
|
2013-04-25 18:25:31 +00:00
|
|
|
* requiring multiple stasis subscriptions
|
|
|
|
*/
|
|
|
|
struct ao2_container *stasis_subs;
|
|
|
|
/*! The SIP subscription. Unsolicited MWI does not use this */
|
|
|
|
struct ast_sip_subscription *sip_sub;
|
2015-04-14 19:04:46 +00:00
|
|
|
/*! AORs we should react to for unsolicited MWI NOTIFY */
|
|
|
|
char *aors;
|
2013-04-25 18:25:31 +00:00
|
|
|
/*! Is the MWI solicited (i.e. Initiated with an external SUBSCRIBE) ? */
|
|
|
|
unsigned int is_solicited;
|
|
|
|
/*! Identifier for the subscription.
|
|
|
|
* The identifier is the same as the corresponding endpoint's stasis ID.
|
|
|
|
* Used as a hash key
|
|
|
|
*/
|
|
|
|
char id[1];
|
|
|
|
};
|
|
|
|
|
2016-08-08 17:53:32 +00:00
|
|
|
/*!
|
|
|
|
* \internal
|
|
|
|
* \brief Shutdown the serializers in the mwi pool.
|
|
|
|
* \since 13.12.0
|
|
|
|
*
|
|
|
|
* \return Nothing
|
|
|
|
*/
|
|
|
|
static void mwi_serializer_pool_shutdown(void)
|
|
|
|
{
|
|
|
|
int idx;
|
|
|
|
|
|
|
|
for (idx = 0; idx < MWI_SERIALIZER_POOL_SIZE; ++idx) {
|
|
|
|
ast_taskprocessor_unreference(mwi_serializer_pool[idx]);
|
|
|
|
mwi_serializer_pool[idx] = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*!
|
|
|
|
* \internal
|
|
|
|
* \brief Setup the serializers in the mwi pool.
|
|
|
|
* \since 13.12.0
|
|
|
|
*
|
|
|
|
* \retval 0 on success.
|
|
|
|
* \retval -1 on error.
|
|
|
|
*/
|
|
|
|
static int mwi_serializer_pool_setup(void)
|
|
|
|
{
|
|
|
|
char tps_name[AST_TASKPROCESSOR_MAX_NAME + 1];
|
|
|
|
int idx;
|
|
|
|
|
|
|
|
for (idx = 0; idx < MWI_SERIALIZER_POOL_SIZE; ++idx) {
|
|
|
|
/* Create name with seq number appended. */
|
|
|
|
ast_taskprocessor_build_name(tps_name, sizeof(tps_name), "pjsip/mwi");
|
|
|
|
|
|
|
|
mwi_serializer_pool[idx] = ast_sip_create_serializer(tps_name);
|
|
|
|
if (!mwi_serializer_pool[idx]) {
|
|
|
|
mwi_serializer_pool_shutdown();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*!
|
|
|
|
* \internal
|
|
|
|
* \brief Pick a mwi serializer from the pool.
|
|
|
|
* \since 13.12.0
|
|
|
|
*
|
|
|
|
* \retval least queue size task processor.
|
|
|
|
*/
|
|
|
|
static struct ast_taskprocessor *get_mwi_serializer(void)
|
|
|
|
{
|
|
|
|
int idx;
|
|
|
|
int pos;
|
|
|
|
|
|
|
|
if (!mwi_serializer_pool[0]) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (pos = idx = 0; idx < MWI_SERIALIZER_POOL_SIZE; ++idx) {
|
|
|
|
if (ast_taskprocessor_size(mwi_serializer_pool[idx]) < ast_taskprocessor_size(mwi_serializer_pool[pos])) {
|
|
|
|
pos = idx;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return mwi_serializer_pool[pos];
|
|
|
|
}
|
|
|
|
|
|
|
|
/*!
|
|
|
|
* \internal
|
|
|
|
* \brief Set taskprocessor alert levels for the serializers in the mwi pool.
|
|
|
|
* \since 13.12.0
|
|
|
|
*
|
|
|
|
* \retval 0 on success.
|
|
|
|
* \retval -1 on error.
|
|
|
|
*/
|
|
|
|
static int mwi_serializer_set_alert_levels(void)
|
|
|
|
{
|
|
|
|
int idx;
|
|
|
|
long tps_queue_high;
|
|
|
|
long tps_queue_low;
|
|
|
|
|
|
|
|
if (!mwi_serializer_pool[0]) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
tps_queue_high = ast_sip_get_mwi_tps_queue_high();
|
|
|
|
if (tps_queue_high <= 0) {
|
|
|
|
ast_log(AST_LOG_WARNING, "Invalid taskprocessor high water alert trigger level '%ld'\n",
|
|
|
|
tps_queue_high);
|
|
|
|
tps_queue_high = AST_TASKPROCESSOR_HIGH_WATER_LEVEL;
|
|
|
|
}
|
|
|
|
|
|
|
|
tps_queue_low = ast_sip_get_mwi_tps_queue_low();
|
|
|
|
if (tps_queue_low < -1 || tps_queue_high < tps_queue_low) {
|
|
|
|
ast_log(AST_LOG_WARNING, "Invalid taskprocessor low water clear alert level '%ld'\n",
|
|
|
|
tps_queue_low);
|
|
|
|
tps_queue_low = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (idx = 0; idx < MWI_SERIALIZER_POOL_SIZE; ++idx) {
|
|
|
|
if (ast_taskprocessor_alert_set_levels(mwi_serializer_pool[idx], tps_queue_low, tps_queue_high)) {
|
|
|
|
ast_log(AST_LOG_WARNING, "Failed to set alert levels for MWI serializer pool #%d.\n",
|
|
|
|
idx);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-04-25 18:25:31 +00:00
|
|
|
static void mwi_stasis_cb(void *userdata, struct stasis_subscription *sub,
|
Multiple revisions 399887,400138,400178,400180-400181
........
r399887 | dlee | 2013-09-26 10:41:47 -0500 (Thu, 26 Sep 2013) | 1 line
Minor performance bump by not allocate manager variable struct if we don't need it
........
r400138 | dlee | 2013-09-30 10:24:00 -0500 (Mon, 30 Sep 2013) | 23 lines
Stasis performance improvements
This patch addresses several performance problems that were found in
the initial performance testing of Asterisk 12.
The Stasis dispatch object was allocated as an AO2 object, even though
it has a very confined lifecycle. This was replaced with a straight
ast_malloc().
The Stasis message router was spending an inordinate amount of time
searching hash tables. In this case, most of our routers had 6 or
fewer routes in them to begin with. This was replaced with an array
that's searched linearly for the route.
We more heavily rely on AO2 objects in Asterisk 12, and the memset()
in ao2_ref() actually became noticeable on the profile. This was
#ifdef'ed to only run when AO2_DEBUG was enabled.
After being misled by an erroneous comment in taskprocessor.c during
profiling, the wrong comment was removed.
Review: https://reviewboard.asterisk.org/r/2873/
........
r400178 | dlee | 2013-09-30 13:26:27 -0500 (Mon, 30 Sep 2013) | 24 lines
Taskprocessor optimization; switch Stasis to use taskprocessors
This patch optimizes taskprocessor to use a semaphore for signaling,
which the OS can do a better job at managing contention and waiting
that we can with a mutex and condition.
The taskprocessor execution was also slightly optimized to reduce the
number of locks taken.
The only observable difference in the taskprocessor implementation is
that when the final reference to the taskprocessor goes away, it will
execute all tasks to completion instead of discarding the unexecuted
tasks.
For systems where unnamed semaphores are not supported, a really
simple semaphore implementation is provided. (Which gives identical
performance as the original taskprocessor implementation).
The way we ended up implementing Stasis caused the threadpool to be a
burden instead of a boost to performance. This was switched to just
use taskprocessors directly for subscriptions.
Review: https://reviewboard.asterisk.org/r/2881/
........
r400180 | dlee | 2013-09-30 13:39:34 -0500 (Mon, 30 Sep 2013) | 28 lines
Optimize how Stasis forwards are dispatched
This patch optimizes how forwards are dispatched in Stasis.
Originally, forwards were dispatched as subscriptions that are invoked
on the publishing thread. This did not account for the vast number of
forwards we would end up having in the system, and the amount of work it
would take to walk though the forward subscriptions.
This patch modifies Stasis so that rather than walking the tree of
forwards on every dispatch, when forwards and subscriptions are changed,
the subscriber list for every topic in the tree is changed.
This has a couple of benefits. First, this reduces the workload of
dispatching messages. It also reduces contention when dispatching to
different topics that happen to forward to the same aggregation topic
(as happens with all of the channel, bridge and endpoint topics).
Since forwards are no longer subscriptions, the bulk of this patch is
simply changing stasis_subscription objects to stasis_forward objects
(which, admittedly, I should have done in the first place.)
Since this required me to yet again put in a growing array, I finally
abstracted that out into a set of ast_vector macros in
asterisk/vector.h.
Review: https://reviewboard.asterisk.org/r/2883/
........
r400181 | dlee | 2013-09-30 13:48:57 -0500 (Mon, 30 Sep 2013) | 28 lines
Remove dispatch object allocation from Stasis publishing
While looking for areas for performance improvement, I realized that an
unused feature in Stasis was negatively impacting performance.
When a message is sent to a subscriber, a dispatch object is allocated
for the dispatch, containing the topic the message was published to, the
subscriber the message is being sent to, and the message itself.
The topic is actually unused by any subscriber in Asterisk today. And
the subscriber is associated with the taskprocessor the message is being
dispatched to.
First, this patch removes the unused topic parameter from Stasis
subscription callbacks.
Second, this patch introduces the concept of taskprocessor local data,
data that may be set on a taskprocessor and provided along with the data
pointer when a task is pushed using the ast_taskprocessor_push_local()
call. This allows the task to have both data specific to that
taskprocessor, in addition to data specific to that invocation.
With those two changes, the dispatch object can be removed completely,
and the message is simply refcounted and sent directly to the
taskprocessor.
Review: https://reviewboard.asterisk.org/r/2884/
........
Merged revisions 399887,400138,400178,400180-400181 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@400186 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2013-09-30 18:55:27 +00:00
|
|
|
struct stasis_message *msg);
|
2013-04-25 18:25:31 +00:00
|
|
|
|
|
|
|
static struct mwi_stasis_subscription *mwi_stasis_subscription_alloc(const char *mailbox, struct mwi_subscription *mwi_sub)
|
|
|
|
{
|
|
|
|
struct mwi_stasis_subscription *mwi_stasis_sub;
|
|
|
|
struct stasis_topic *topic;
|
2013-11-23 17:26:57 +00:00
|
|
|
|
2013-04-25 18:25:31 +00:00
|
|
|
if (!mwi_sub) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2013-11-23 17:26:57 +00:00
|
|
|
|
2013-04-25 18:25:31 +00:00
|
|
|
mwi_stasis_sub = ao2_alloc(sizeof(*mwi_stasis_sub) + strlen(mailbox), NULL);
|
|
|
|
if (!mwi_stasis_sub) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-05-24 20:44:07 +00:00
|
|
|
topic = ast_mwi_topic(mailbox);
|
2013-04-25 18:25:31 +00:00
|
|
|
|
|
|
|
/* Safe strcpy */
|
|
|
|
strcpy(mwi_stasis_sub->mailbox, mailbox);
|
2015-06-26 23:48:35 +00:00
|
|
|
|
|
|
|
ast_debug(3, "Creating stasis MWI subscription to mailbox %s for endpoint %s\n",
|
|
|
|
mailbox, mwi_sub->id);
|
2013-04-25 18:25:31 +00:00
|
|
|
ao2_ref(mwi_sub, +1);
|
main/stasis: Allow subscriptions to use a threadpool for message delivery
Prior to this patch, all Stasis subscriptions would receive a dedicated
thread for servicing published messages. In contrast, prior to r400178
(see review https://reviewboard.asterisk.org/r/2881/), the subscriptions
shared a thread pool. It was discovered during some initial work on Stasis
that, for a low subscription count with high message throughput, the
threadpool was not as performant as simply having a dedicated thread per
subscriber.
For situations where a subscriber receives a substantial number of messages
and is always present, the model of having a dedicated thread per subscriber
makes sense. While we still have plenty of subscriptions that would follow
this model, e.g., AMI, CDRs, CEL, etc., there are plenty that also fall into
the following two categories:
* Large number of subscriptions, specifically those tied to endpoints/peers.
* Low number of messages. Some subscriptions exist specifically to coordinate
a single message - the subscription is created, a message is published, the
delivery is synchronized, and the subscription is destroyed.
In both of the latter two cases, creating a dedicated thread is wasteful (and
in the case of a large number of peers/endpoints, harmful). In those cases,
having shared delivery threads is far more performant.
This patch adds the ability of a subscriber to Stasis to choose whether or not
their messages are dispatched on a dedicated thread or on a threadpool. The
threadpool is configurable through stasis.conf.
Review: https://reviewboard.asterisk.org/r/4193
ASTERISK-24533 #close
Reported by: xrobau
Tested by: xrobau
........
Merged revisions 428681 from http://svn.asterisk.org/svn/asterisk/branches/12
........
Merged revisions 428687 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@428688 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-12-01 17:59:21 +00:00
|
|
|
mwi_stasis_sub->stasis_sub = stasis_subscribe_pool(topic, mwi_stasis_cb, mwi_sub);
|
2015-06-26 23:48:35 +00:00
|
|
|
if (!mwi_stasis_sub->stasis_sub) {
|
|
|
|
/* Failed to subscribe. */
|
|
|
|
ao2_ref(mwi_stasis_sub, -1);
|
|
|
|
ao2_ref(mwi_sub, -1);
|
|
|
|
mwi_stasis_sub = NULL;
|
|
|
|
}
|
2018-09-23 20:50:01 +00:00
|
|
|
stasis_subscription_accept_message_type(mwi_stasis_sub->stasis_sub, ast_mwi_state_type());
|
|
|
|
stasis_subscription_accept_message_type(mwi_stasis_sub->stasis_sub, stasis_subscription_change_type());
|
|
|
|
stasis_subscription_set_filter(mwi_stasis_sub->stasis_sub, STASIS_SUBSCRIPTION_FILTER_SELECTIVE);
|
2013-04-25 18:25:31 +00:00
|
|
|
return mwi_stasis_sub;
|
|
|
|
}
|
|
|
|
|
2014-03-14 18:05:04 +00:00
|
|
|
static int stasis_sub_hash(const void *obj, const int flags)
|
2013-04-25 18:25:31 +00:00
|
|
|
{
|
2014-03-14 18:05:04 +00:00
|
|
|
const struct mwi_stasis_subscription *object;
|
|
|
|
const char *key;
|
2013-04-25 18:25:31 +00:00
|
|
|
|
2014-03-14 18:05:04 +00:00
|
|
|
switch (flags & OBJ_SEARCH_MASK) {
|
|
|
|
case OBJ_SEARCH_KEY:
|
|
|
|
key = obj;
|
|
|
|
break;
|
|
|
|
case OBJ_SEARCH_OBJECT:
|
|
|
|
object = obj;
|
|
|
|
key = object->mailbox;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ast_assert(0);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return ast_str_hash(key);
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int stasis_sub_cmp(void *obj, void *arg, int flags)
|
|
|
|
{
|
2014-03-14 18:05:04 +00:00
|
|
|
const struct mwi_stasis_subscription *sub_left = obj;
|
|
|
|
const struct mwi_stasis_subscription *sub_right = arg;
|
|
|
|
const char *right_key = arg;
|
|
|
|
int cmp;
|
|
|
|
|
|
|
|
switch (flags & OBJ_SEARCH_MASK) {
|
|
|
|
case OBJ_SEARCH_OBJECT:
|
|
|
|
right_key = sub_right->mailbox;
|
|
|
|
/* Fall through */
|
|
|
|
case OBJ_SEARCH_KEY:
|
|
|
|
cmp = strcmp(sub_left->mailbox, right_key);
|
|
|
|
break;
|
|
|
|
case OBJ_SEARCH_PARTIAL_KEY:
|
|
|
|
cmp = strncmp(sub_left->mailbox, right_key, strlen(right_key));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
cmp = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (cmp) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return CMP_MATCH;
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void mwi_subscription_destructor(void *obj)
|
|
|
|
{
|
|
|
|
struct mwi_subscription *sub = obj;
|
|
|
|
|
|
|
|
ast_debug(3, "Destroying MWI subscription for endpoint %s\n", sub->id);
|
res_pjsip_pubsub: Solidify lifetime and ownership of objects.
There have been crashes and general instability seen in the pubsub code,
so this patch introduces three changes to increase the stability.
First, the ownership model for subscriptions has been modified. Due to
RLS, subscriptions are stored in memory as a tree structure. Prior to my
patch, the PJSIP subscription was the owner of the subscription tree.
When the PJSIP subscription told us that it was terminating, we started
destroying the subscription tree along with all of the individual leaf
subscriptions that belong to the tree. The problem with this model is
that the two actors in play here, the PJSIP subscription and the
individual leaf subscriptions, need to have joint ownership of the
subscription tree. So now, the PJSIP subscription and the individual
leaf subscriptions each have a reference to the subscription tree. This
way, we will not actually free memory until no players are left that
care. The PJSIP subscription is a bigger stakeholder, in that if the
PJSIP subscription's reference to the subscription tree is removed, the
subscription tree instructs the leaf subscriptions to shut down and drop
their references to the subscription tree when possible. The individual
leaf subscriptions, upon being told to shut down, can drop their stasis
subscriptions or whatever they use to learn of new state, and then drop
their reference to the subscription tree once they are ready to die.
Second, the lifetime of a PJSIP subscription's reference to our
subscription tree has been altered. As I learned from doing a deep dive,
the PJSIP evsub code can tell Asterisk multiple times that the
subscription has been terminated, and not all of these times
are especially helpful. I have altered the message flow that we use for
SIP subscriptions such that we will always drop the PJSIP subscription's
reference to the subscription tree when we send the NOTIFY that
terminates a SIP subscription. This also means that we will now queue
NOTIFY requests to be sent after responding to incoming SUBSCRIBEs so
that we can have predictable state changes from the PJSIP evsub code.
Third, the synchronization of operations has been improved. PJSIP can
call into our code from a serializer thread (e.g. upon receiving an
incoming request) or from the monitor thread (e.g. when a subscription
times out). Because of this, there is the possibility of competing
threads stepping on each other. PJSIP attempts to do some
synchronization on its own by always keeping the dialog lock held when
it calls into us. However, since we end up pushing tasks into the
serializer, the result was that serialized operations were not grabbing
the dialog lock and could, as a result, step on something that was being
attempted by a different thread. Now we ensure that serialized
operations grab the dialog lock, then check for extenuating
circumstances, then proceed with their operation if they can.
Change-Id: Iff2990c40178dad9cc5f6a5c7f76932ec644b2e5
2015-09-01 20:47:19 +00:00
|
|
|
if (sub->is_solicited) {
|
|
|
|
ast_sip_subscription_destroy(sub->sip_sub);
|
|
|
|
}
|
2013-04-25 18:25:31 +00:00
|
|
|
ao2_cleanup(sub->stasis_subs);
|
2015-04-14 19:04:46 +00:00
|
|
|
ast_free(sub->aors);
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct mwi_subscription *mwi_subscription_alloc(struct ast_sip_endpoint *endpoint,
|
2014-06-25 20:57:28 +00:00
|
|
|
unsigned int is_solicited, struct ast_sip_subscription *sip_sub)
|
2013-04-25 18:25:31 +00:00
|
|
|
{
|
|
|
|
struct mwi_subscription *sub;
|
|
|
|
const char *endpoint_id = ast_sorcery_object_get_id(endpoint);
|
|
|
|
|
|
|
|
sub = ao2_alloc(sizeof(*sub) + strlen(endpoint_id),
|
|
|
|
mwi_subscription_destructor);
|
|
|
|
|
|
|
|
if (!sub) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Safe strcpy */
|
|
|
|
strcpy(sub->id, endpoint_id);
|
2014-06-25 20:57:28 +00:00
|
|
|
|
2013-04-25 18:25:31 +00:00
|
|
|
/* Unsolicited MWI doesn't actually result in a SIP subscription being
|
|
|
|
* created. This is because a SIP subscription associates with a dialog.
|
|
|
|
* Most devices expect unsolicited MWI NOTIFYs to appear out of dialog. If
|
|
|
|
* they receive an in-dialog MWI NOTIFY (i.e. with a to-tag), then they
|
|
|
|
* will reject the NOTIFY with a 481, thus resulting in message-waiting
|
|
|
|
* state not being updated on the device
|
|
|
|
*/
|
|
|
|
if (is_solicited) {
|
res_pjsip_pubsub: Solidify lifetime and ownership of objects.
There have been crashes and general instability seen in the pubsub code,
so this patch introduces three changes to increase the stability.
First, the ownership model for subscriptions has been modified. Due to
RLS, subscriptions are stored in memory as a tree structure. Prior to my
patch, the PJSIP subscription was the owner of the subscription tree.
When the PJSIP subscription told us that it was terminating, we started
destroying the subscription tree along with all of the individual leaf
subscriptions that belong to the tree. The problem with this model is
that the two actors in play here, the PJSIP subscription and the
individual leaf subscriptions, need to have joint ownership of the
subscription tree. So now, the PJSIP subscription and the individual
leaf subscriptions each have a reference to the subscription tree. This
way, we will not actually free memory until no players are left that
care. The PJSIP subscription is a bigger stakeholder, in that if the
PJSIP subscription's reference to the subscription tree is removed, the
subscription tree instructs the leaf subscriptions to shut down and drop
their references to the subscription tree when possible. The individual
leaf subscriptions, upon being told to shut down, can drop their stasis
subscriptions or whatever they use to learn of new state, and then drop
their reference to the subscription tree once they are ready to die.
Second, the lifetime of a PJSIP subscription's reference to our
subscription tree has been altered. As I learned from doing a deep dive,
the PJSIP evsub code can tell Asterisk multiple times that the
subscription has been terminated, and not all of these times
are especially helpful. I have altered the message flow that we use for
SIP subscriptions such that we will always drop the PJSIP subscription's
reference to the subscription tree when we send the NOTIFY that
terminates a SIP subscription. This also means that we will now queue
NOTIFY requests to be sent after responding to incoming SUBSCRIBEs so
that we can have predictable state changes from the PJSIP evsub code.
Third, the synchronization of operations has been improved. PJSIP can
call into our code from a serializer thread (e.g. upon receiving an
incoming request) or from the monitor thread (e.g. when a subscription
times out). Because of this, there is the possibility of competing
threads stepping on each other. PJSIP attempts to do some
synchronization on its own by always keeping the dialog lock held when
it calls into us. However, since we end up pushing tasks into the
serializer, the result was that serialized operations were not grabbing
the dialog lock and could, as a result, step on something that was being
attempted by a different thread. Now we ensure that serialized
operations grab the dialog lock, then check for extenuating
circumstances, then proceed with their operation if they can.
Change-Id: Iff2990c40178dad9cc5f6a5c7f76932ec644b2e5
2015-09-01 20:47:19 +00:00
|
|
|
sub->sip_sub = sip_sub;
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
|
|
|
|
2018-11-19 20:10:02 +00:00
|
|
|
sub->stasis_subs = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0,
|
|
|
|
STASIS_BUCKETS, stasis_sub_hash, NULL, stasis_sub_cmp);
|
2013-04-25 18:25:31 +00:00
|
|
|
if (!sub->stasis_subs) {
|
|
|
|
ao2_cleanup(sub);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
sub->is_solicited = is_solicited;
|
|
|
|
|
2015-04-14 19:04:46 +00:00
|
|
|
if (!is_solicited && !ast_strlen_zero(endpoint->aors)) {
|
|
|
|
sub->aors = ast_strdup(endpoint->aors);
|
|
|
|
if (!sub->aors) {
|
|
|
|
ao2_ref(sub, -1);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-25 18:25:31 +00:00
|
|
|
ast_debug(3, "Created %s MWI subscription for endpoint %s\n", is_solicited ? "solicited" : "unsolicited", sub->id);
|
|
|
|
|
|
|
|
return sub;
|
|
|
|
}
|
|
|
|
|
2014-03-14 18:05:04 +00:00
|
|
|
static int mwi_sub_hash(const void *obj, const int flags)
|
2013-04-25 18:25:31 +00:00
|
|
|
{
|
2014-03-14 18:05:04 +00:00
|
|
|
const struct mwi_subscription *object;
|
|
|
|
const char *key;
|
2013-11-23 17:26:57 +00:00
|
|
|
|
2014-03-14 18:05:04 +00:00
|
|
|
switch (flags & OBJ_SEARCH_MASK) {
|
|
|
|
case OBJ_SEARCH_KEY:
|
|
|
|
key = obj;
|
|
|
|
break;
|
|
|
|
case OBJ_SEARCH_OBJECT:
|
|
|
|
object = obj;
|
|
|
|
key = object->id;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ast_assert(0);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return ast_str_hash(key);
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int mwi_sub_cmp(void *obj, void *arg, int flags)
|
|
|
|
{
|
2014-03-14 18:05:04 +00:00
|
|
|
const struct mwi_subscription *sub_left = obj;
|
|
|
|
const struct mwi_subscription *sub_right = arg;
|
|
|
|
const char *right_key = arg;
|
|
|
|
int cmp;
|
|
|
|
|
|
|
|
switch (flags & OBJ_SEARCH_MASK) {
|
|
|
|
case OBJ_SEARCH_OBJECT:
|
|
|
|
right_key = sub_right->id;
|
|
|
|
/* Fall through */
|
|
|
|
case OBJ_SEARCH_KEY:
|
|
|
|
cmp = strcmp(sub_left->id, right_key);
|
|
|
|
break;
|
|
|
|
case OBJ_SEARCH_PARTIAL_KEY:
|
|
|
|
cmp = strncmp(sub_left->id, right_key, strlen(right_key));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
cmp = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (cmp) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return CMP_MATCH;
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int get_message_count(void *obj, void *arg, int flags)
|
|
|
|
{
|
2015-06-17 10:04:39 +00:00
|
|
|
struct stasis_message *msg;
|
2013-04-25 18:25:31 +00:00
|
|
|
struct mwi_stasis_subscription *mwi_stasis = obj;
|
Decouple subscription handling from NOTIFY/PUBLISH body generation.
When the PJSIP pubsub framework was created, subscription handlers were required
to state what event they handled along with what body types they knew how to
generate. While this serves well when implementing a base RFC, it has problems
when trying to extend the body to support non-standard or proprietary body
elements. The code also was NOTIFY-specific, meaning that when the time comes
that we start writing code to send out PUBLISH requests with MWI or presence
bodies, we would likely find ourselves duplicating code that had previously been
written.
This changeset introduces the concept of body generators and body supplements. A
body generator is responsible for allocating a native structure for a given body
type, providing the primary body content, converting the native structure to a
string, and deallocating resources. A body supplement takes the primary body
content (the native structure, not a string) generated by the body generator and
adds nonstandard elements to the body. With these elements living in their own
module, it becomes easy to extend our support for body types and to re-use
resources when sending a PUBLISH request.
Body generators and body supplements register themselves with the pubsub core,
similar to how subscription and publish handlers had done. Now, subscription
handlers do not need to know what type of body content they generate, but they
still need to inform the pubsub core about what the default body type for a
given event package is. The pubsub core keeps track of what body generators and
body supplements have been registered. When a SUBSCRIBE arrives, the pubsub core
will check that there is a subscription handler for the event in the SUBSCRIBE,
then it will check that there is a body generator that can provide the content
specified in the Accept header(s).
Because of the nature of body generators and supplements, it means
res_pjsip_exten_state and res_pjsip_mwi have been completely gutted. They no
longer worry about body types, instead calling
ast_sip_pubsub_generate_body_content() when they need to generate a NOTIFY body.
Review: https://reviewboard.asterisk.org/r/3150
........
Merged revisions 407016 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@407030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-01-31 22:27:07 +00:00
|
|
|
struct ast_sip_message_accumulator *counter = arg;
|
2013-05-24 20:44:07 +00:00
|
|
|
struct ast_mwi_state *mwi_state;
|
2013-04-25 18:25:31 +00:00
|
|
|
|
2013-08-01 15:31:03 +00:00
|
|
|
msg = stasis_cache_get(ast_mwi_state_cache(), ast_mwi_state_type(), mwi_stasis->mailbox);
|
2013-04-25 18:25:31 +00:00
|
|
|
if (!msg) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
mwi_state = stasis_message_data(msg);
|
|
|
|
counter->old_msgs += mwi_state->old_msgs;
|
|
|
|
counter->new_msgs += mwi_state->new_msgs;
|
2015-06-17 10:04:39 +00:00
|
|
|
|
|
|
|
ao2_ref(msg, -1);
|
|
|
|
|
2013-04-25 18:25:31 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
static void set_voicemail_extension(pj_pool_t *pool, pjsip_sip_uri *local_uri,
|
|
|
|
struct ast_sip_message_accumulator *counter, const char *voicemail_extension)
|
|
|
|
{
|
|
|
|
pjsip_sip_uri *account_uri;
|
|
|
|
const char *vm_exten;
|
|
|
|
|
|
|
|
if (ast_strlen_zero(voicemail_extension)) {
|
|
|
|
vm_exten = default_voicemail_extension;
|
|
|
|
} else {
|
|
|
|
vm_exten = voicemail_extension;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!ast_strlen_zero(vm_exten)) {
|
|
|
|
account_uri = pjsip_uri_clone(pool, local_uri);
|
|
|
|
pj_strdup2(pool, &account_uri->user, vm_exten);
|
|
|
|
pjsip_uri_print(PJSIP_URI_IN_CONTACT_HDR, account_uri, counter->message_account, sizeof(counter->message_account));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-25 18:25:31 +00:00
|
|
|
struct unsolicited_mwi_data {
|
|
|
|
struct mwi_subscription *sub;
|
|
|
|
struct ast_sip_endpoint *endpoint;
|
|
|
|
pjsip_evsub_state state;
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
struct ast_sip_message_accumulator *counter;
|
2013-04-25 18:25:31 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static int send_unsolicited_mwi_notify_to_contact(void *obj, void *arg, int flags)
|
|
|
|
{
|
|
|
|
struct unsolicited_mwi_data *mwi_data = arg;
|
|
|
|
struct mwi_subscription *sub = mwi_data->sub;
|
|
|
|
struct ast_sip_endpoint *endpoint = mwi_data->endpoint;
|
|
|
|
pjsip_evsub_state state = mwi_data->state;
|
|
|
|
struct ast_sip_contact *contact = obj;
|
|
|
|
const char *state_name;
|
|
|
|
pjsip_tx_data *tdata;
|
|
|
|
pjsip_sub_state_hdr *sub_state;
|
|
|
|
pjsip_event_hdr *event;
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
pjsip_from_hdr *from;
|
|
|
|
pjsip_sip_uri *from_uri;
|
2013-04-25 18:25:31 +00:00
|
|
|
const pjsip_hdr *allow_events = pjsip_evsub_get_allow_events_hdr(NULL);
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
struct ast_sip_body body;
|
|
|
|
struct ast_str *body_text;
|
|
|
|
struct ast_sip_body_data body_data = {
|
|
|
|
.body_type = AST_SIP_MESSAGE_ACCUMULATOR,
|
|
|
|
.body_data = mwi_data->counter,
|
|
|
|
};
|
2013-04-25 18:25:31 +00:00
|
|
|
|
2014-01-15 13:16:10 +00:00
|
|
|
if (ast_sip_create_request("NOTIFY", NULL, endpoint, NULL, contact, &tdata)) {
|
2013-04-25 18:25:31 +00:00
|
|
|
ast_log(LOG_WARNING, "Unable to create unsolicited NOTIFY request to endpoint %s URI %s\n", sub->id, contact->uri);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
body.type = MWI_TYPE;
|
|
|
|
body.subtype = MWI_SUBTYPE;
|
|
|
|
body_text = ast_str_create(64);
|
|
|
|
if (!body_text) {
|
2017-02-01 23:56:13 +00:00
|
|
|
pjsip_tx_data_dec_ref(tdata);
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2013-07-18 19:25:51 +00:00
|
|
|
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
from = PJSIP_MSG_FROM_HDR(tdata->msg);
|
|
|
|
from_uri = pjsip_uri_get_uri(from->uri);
|
|
|
|
|
|
|
|
if (!ast_strlen_zero(endpoint->subscription.mwi.fromuser)) {
|
2013-07-30 15:17:56 +00:00
|
|
|
pj_strdup2(tdata->pool, &from_uri->user, endpoint->subscription.mwi.fromuser);
|
2013-07-18 19:25:51 +00:00
|
|
|
}
|
|
|
|
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
set_voicemail_extension(tdata->pool, from_uri, mwi_data->counter, endpoint->subscription.mwi.voicemail_extension);
|
|
|
|
|
|
|
|
if (ast_sip_pubsub_generate_body_content(body.type, body.subtype, &body_data, &body_text)) {
|
|
|
|
ast_log(LOG_WARNING, "Unable to generate SIP MWI NOTIFY body.\n");
|
|
|
|
ast_free(body_text);
|
2017-02-01 23:56:13 +00:00
|
|
|
pjsip_tx_data_dec_ref(tdata);
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
body.body_text = ast_str_buffer(body_text);
|
|
|
|
|
2013-04-25 18:25:31 +00:00
|
|
|
switch (state) {
|
|
|
|
case PJSIP_EVSUB_STATE_ACTIVE:
|
|
|
|
state_name = "active";
|
|
|
|
break;
|
|
|
|
case PJSIP_EVSUB_STATE_TERMINATED:
|
|
|
|
default:
|
|
|
|
state_name = "terminated";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub_state = pjsip_sub_state_hdr_create(tdata->pool);
|
|
|
|
pj_cstr(&sub_state->sub_state, state_name);
|
|
|
|
pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr *) sub_state);
|
|
|
|
|
|
|
|
event = pjsip_event_hdr_create(tdata->pool);
|
|
|
|
pj_cstr(&event->event_type, "message-summary");
|
|
|
|
pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr *) event);
|
|
|
|
|
|
|
|
pjsip_msg_add_hdr(tdata->msg, pjsip_hdr_shallow_clone(tdata->pool, allow_events));
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
ast_sip_add_body(tdata, &body);
|
2014-01-15 13:16:10 +00:00
|
|
|
ast_sip_send_request(tdata, NULL, endpoint, NULL, NULL);
|
2013-04-25 18:25:31 +00:00
|
|
|
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
ast_free(body_text);
|
|
|
|
|
2013-04-25 18:25:31 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-03-30 17:38:47 +00:00
|
|
|
static struct ast_sip_aor *find_aor_for_resource(struct ast_sip_endpoint *endpoint, const char *resource)
|
|
|
|
{
|
|
|
|
struct ast_sip_aor *aor;
|
|
|
|
char *aor_name;
|
|
|
|
char *aors_copy;
|
|
|
|
|
|
|
|
/* Direct match */
|
|
|
|
if ((aor = ast_sip_location_retrieve_aor(resource))) {
|
|
|
|
return aor;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!endpoint) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This may be a subscribe to the voicemail_extension. If so,
|
|
|
|
* look for an aor belonging to this endpoint that has a matching
|
|
|
|
* voicemail_extension.
|
|
|
|
*/
|
|
|
|
aors_copy = ast_strdupa(endpoint->aors);
|
|
|
|
while ((aor_name = ast_strip(strsep(&aors_copy, ",")))) {
|
|
|
|
struct ast_sip_aor *check_aor = ast_sip_location_retrieve_aor(aor_name);
|
|
|
|
|
|
|
|
if (!check_aor) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2016-04-04 23:02:09 +00:00
|
|
|
if (!ast_strlen_zero(check_aor->voicemail_extension)
|
|
|
|
&& !strcasecmp(check_aor->voicemail_extension, resource)) {
|
2016-03-30 17:38:47 +00:00
|
|
|
ast_debug(1, "Found an aor (%s) that matches voicemail_extension %s\n", aor_name, resource);
|
|
|
|
return check_aor;
|
|
|
|
}
|
|
|
|
|
|
|
|
ao2_ref(check_aor, -1);
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-06-25 20:57:28 +00:00
|
|
|
static void send_unsolicited_mwi_notify(struct mwi_subscription *sub,
|
|
|
|
struct ast_sip_message_accumulator *counter)
|
2013-04-25 18:25:31 +00:00
|
|
|
{
|
|
|
|
RAII_VAR(struct ast_sip_endpoint *, endpoint, ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(),
|
|
|
|
"endpoint", sub->id), ao2_cleanup);
|
|
|
|
char *endpoint_aors;
|
|
|
|
char *aor_name;
|
|
|
|
|
|
|
|
if (!endpoint) {
|
|
|
|
ast_log(LOG_WARNING, "Unable to send unsolicited MWI to %s because endpoint does not exist\n",
|
|
|
|
sub->id);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (ast_strlen_zero(endpoint->aors)) {
|
|
|
|
ast_log(LOG_WARNING, "Unable to send unsolicited MWI to %s because the endpoint has no"
|
|
|
|
" configured AORs\n", sub->id);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
endpoint_aors = ast_strdupa(endpoint->aors);
|
|
|
|
|
2014-06-25 20:57:28 +00:00
|
|
|
ast_debug(5, "Sending unsolicited MWI NOTIFY to endpoint %s, new messages: %d, old messages: %d\n",
|
|
|
|
sub->id, counter->new_msgs, counter->old_msgs);
|
|
|
|
|
res_pjsip: Strip spaces from items parsed from comma-separated lists
Configurations like "aors = a, b, c" were either ignoring everything after "a"
or trying to look up " b". Same for mailboxes, ciphers, contacts and a few
others.
To fix, all the strsep(©, ",") calls have been wrapped in ast_strip. To
facilitate this, ast_strip, ast_skip_blanks and ast_skip_nonblanks were
updated to handle null pointers.
In some cases, an ast_strlen_zero() test was added to skip consecutive commas.
There was also an attempt to ast_free an ast_strdupa'd string in
ast_sip_for_each_aor which was causing a SEGV. I removed it.
Although this issue was reported for realtime, the issue was in the res_pjsip
modules so all config mechanisms were affected.
ASTERISK-25829 #close
Reported-by: Mateusz Kowalski
Change-Id: I0b22a2cf22a7c1c50d4ecacbfa540155bec0e7a2
2016-03-06 20:38:41 +00:00
|
|
|
while ((aor_name = ast_strip(strsep(&endpoint_aors, ",")))) {
|
2013-04-25 18:25:31 +00:00
|
|
|
RAII_VAR(struct ast_sip_aor *, aor, ast_sip_location_retrieve_aor(aor_name), ao2_cleanup);
|
|
|
|
RAII_VAR(struct ao2_container *, contacts, NULL, ao2_cleanup);
|
|
|
|
struct unsolicited_mwi_data mwi_data = {
|
|
|
|
.sub = sub,
|
|
|
|
.endpoint = endpoint,
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
.counter = counter,
|
2013-04-25 18:25:31 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
if (!aor) {
|
|
|
|
ast_log(LOG_WARNING, "Unable to locate AOR %s for unsolicited MWI\n", aor_name);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
contacts = ast_sip_location_retrieve_aor_contacts(aor);
|
|
|
|
if (!contacts || (ao2_container_count(contacts) == 0)) {
|
2016-02-25 21:39:54 +00:00
|
|
|
ast_debug(1, "No contacts bound to AOR %s. Cannot send unsolicited MWI until a contact registers.\n", aor_name);
|
2013-04-25 18:25:31 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
ao2_callback(contacts, OBJ_NODATA, send_unsolicited_mwi_notify_to_contact, &mwi_data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-25 20:57:28 +00:00
|
|
|
static void send_mwi_notify(struct mwi_subscription *sub)
|
2013-04-25 18:25:31 +00:00
|
|
|
{
|
Decouple subscription handling from NOTIFY/PUBLISH body generation.
When the PJSIP pubsub framework was created, subscription handlers were required
to state what event they handled along with what body types they knew how to
generate. While this serves well when implementing a base RFC, it has problems
when trying to extend the body to support non-standard or proprietary body
elements. The code also was NOTIFY-specific, meaning that when the time comes
that we start writing code to send out PUBLISH requests with MWI or presence
bodies, we would likely find ourselves duplicating code that had previously been
written.
This changeset introduces the concept of body generators and body supplements. A
body generator is responsible for allocating a native structure for a given body
type, providing the primary body content, converting the native structure to a
string, and deallocating resources. A body supplement takes the primary body
content (the native structure, not a string) generated by the body generator and
adds nonstandard elements to the body. With these elements living in their own
module, it becomes easy to extend our support for body types and to re-use
resources when sending a PUBLISH request.
Body generators and body supplements register themselves with the pubsub core,
similar to how subscription and publish handlers had done. Now, subscription
handlers do not need to know what type of body content they generate, but they
still need to inform the pubsub core about what the default body type for a
given event package is. The pubsub core keeps track of what body generators and
body supplements have been registered. When a SUBSCRIBE arrives, the pubsub core
will check that there is a subscription handler for the event in the SUBSCRIBE,
then it will check that there is a body generator that can provide the content
specified in the Accept header(s).
Because of the nature of body generators and supplements, it means
res_pjsip_exten_state and res_pjsip_mwi have been completely gutted. They no
longer worry about body types, instead calling
ast_sip_pubsub_generate_body_content() when they need to generate a NOTIFY body.
Review: https://reviewboard.asterisk.org/r/3150
........
Merged revisions 407016 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@407030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-01-31 22:27:07 +00:00
|
|
|
struct ast_sip_message_accumulator counter = {
|
2013-04-25 18:25:31 +00:00
|
|
|
.old_msgs = 0,
|
|
|
|
.new_msgs = 0,
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
.message_account[0] = '\0',
|
2013-04-25 18:25:31 +00:00
|
|
|
};
|
2014-09-18 16:09:25 +00:00
|
|
|
struct ast_sip_body_data data = {
|
|
|
|
.body_type = AST_SIP_MESSAGE_ACCUMULATOR,
|
|
|
|
.body_data = &counter,
|
|
|
|
};
|
2013-04-25 18:25:31 +00:00
|
|
|
|
|
|
|
ao2_callback(sub->stasis_subs, OBJ_NODATA, get_message_count, &counter);
|
|
|
|
|
2014-06-25 20:57:28 +00:00
|
|
|
if (sub->is_solicited) {
|
2018-02-01 19:01:25 +00:00
|
|
|
const char *resource = ast_sip_subscription_get_resource_name(sub->sip_sub);
|
2016-03-30 17:38:47 +00:00
|
|
|
struct ast_sip_endpoint *endpoint = ast_sip_subscription_get_endpoint(sub->sip_sub);
|
|
|
|
struct ast_sip_aor *aor = find_aor_for_resource(endpoint, resource);
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
pjsip_dialog *dlg = ast_sip_subscription_get_dialog(sub->sip_sub);
|
|
|
|
pjsip_sip_uri *sip_uri = ast_sip_subscription_get_sip_uri(sub->sip_sub);
|
|
|
|
|
|
|
|
if (aor && dlg && sip_uri) {
|
|
|
|
set_voicemail_extension(dlg->pool, sip_uri, &counter, aor->voicemail_extension);
|
|
|
|
}
|
|
|
|
|
|
|
|
ao2_cleanup(aor);
|
2016-03-30 17:38:47 +00:00
|
|
|
ao2_cleanup(endpoint);
|
2014-09-18 16:09:25 +00:00
|
|
|
ast_sip_subscription_notify(sub->sip_sub, &data, 0);
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
|
Decouple subscription handling from NOTIFY/PUBLISH body generation.
When the PJSIP pubsub framework was created, subscription handlers were required
to state what event they handled along with what body types they knew how to
generate. While this serves well when implementing a base RFC, it has problems
when trying to extend the body to support non-standard or proprietary body
elements. The code also was NOTIFY-specific, meaning that when the time comes
that we start writing code to send out PUBLISH requests with MWI or presence
bodies, we would likely find ourselves duplicating code that had previously been
written.
This changeset introduces the concept of body generators and body supplements. A
body generator is responsible for allocating a native structure for a given body
type, providing the primary body content, converting the native structure to a
string, and deallocating resources. A body supplement takes the primary body
content (the native structure, not a string) generated by the body generator and
adds nonstandard elements to the body. With these elements living in their own
module, it becomes easy to extend our support for body types and to re-use
resources when sending a PUBLISH request.
Body generators and body supplements register themselves with the pubsub core,
similar to how subscription and publish handlers had done. Now, subscription
handlers do not need to know what type of body content they generate, but they
still need to inform the pubsub core about what the default body type for a
given event package is. The pubsub core keeps track of what body generators and
body supplements have been registered. When a SUBSCRIBE arrives, the pubsub core
will check that there is a subscription handler for the event in the SUBSCRIBE,
then it will check that there is a body generator that can provide the content
specified in the Accept header(s).
Because of the nature of body generators and supplements, it means
res_pjsip_exten_state and res_pjsip_mwi have been completely gutted. They no
longer worry about body types, instead calling
ast_sip_pubsub_generate_body_content() when they need to generate a NOTIFY body.
Review: https://reviewboard.asterisk.org/r/3150
........
Merged revisions 407016 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@407030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-01-31 22:27:07 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-06-25 20:57:28 +00:00
|
|
|
send_unsolicited_mwi_notify(sub, &counter);
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int unsubscribe_stasis(void *obj, void *arg, int flags)
|
|
|
|
{
|
|
|
|
struct mwi_stasis_subscription *mwi_stasis = obj;
|
|
|
|
if (mwi_stasis->stasis_sub) {
|
|
|
|
ast_debug(3, "Removing stasis subscription to mailbox %s\n", mwi_stasis->mailbox);
|
2015-05-23 02:50:43 +00:00
|
|
|
mwi_stasis->stasis_sub = stasis_unsubscribe_and_join(mwi_stasis->stasis_sub);
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
|
|
|
return CMP_MATCH;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mwi_subscription_shutdown(struct ast_sip_subscription *sub)
|
|
|
|
{
|
|
|
|
struct mwi_subscription *mwi_sub;
|
2015-06-17 10:04:39 +00:00
|
|
|
struct ast_datastore *mwi_datastore;
|
2013-04-25 18:25:31 +00:00
|
|
|
|
2015-06-17 10:04:39 +00:00
|
|
|
mwi_datastore = ast_sip_subscription_get_datastore(sub, MWI_DATASTORE);
|
2013-04-25 18:25:31 +00:00
|
|
|
if (!mwi_datastore) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
mwi_sub = mwi_datastore->data;
|
|
|
|
ao2_callback(mwi_sub->stasis_subs, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, unsubscribe_stasis, NULL);
|
2015-06-26 23:48:35 +00:00
|
|
|
ast_sip_subscription_remove_datastore(sub, MWI_DATASTORE);
|
2015-06-17 10:04:39 +00:00
|
|
|
|
|
|
|
ao2_ref(mwi_datastore, -1);
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
|
|
|
|
2015-06-26 23:48:35 +00:00
|
|
|
static void mwi_ds_destroy(void *data)
|
|
|
|
{
|
|
|
|
struct mwi_subscription *sub = data;
|
|
|
|
|
|
|
|
ao2_ref(sub, -1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ast_datastore_info mwi_ds_info = {
|
|
|
|
.destroy = mwi_ds_destroy,
|
|
|
|
};
|
2013-04-25 18:25:31 +00:00
|
|
|
|
|
|
|
static int add_mwi_datastore(struct mwi_subscription *sub)
|
|
|
|
{
|
2015-06-17 10:04:39 +00:00
|
|
|
struct ast_datastore *mwi_datastore;
|
2015-06-26 23:48:35 +00:00
|
|
|
int res;
|
2013-04-25 18:25:31 +00:00
|
|
|
|
2014-08-07 19:26:32 +00:00
|
|
|
mwi_datastore = ast_sip_subscription_alloc_datastore(&mwi_ds_info, MWI_DATASTORE);
|
2013-04-25 18:25:31 +00:00
|
|
|
if (!mwi_datastore) {
|
|
|
|
return -1;
|
|
|
|
}
|
2015-06-26 23:48:35 +00:00
|
|
|
ao2_ref(sub, +1);
|
2013-04-25 18:25:31 +00:00
|
|
|
mwi_datastore->data = sub;
|
|
|
|
|
2015-06-26 23:48:35 +00:00
|
|
|
/*
|
|
|
|
* NOTE: Adding the datastore to the subscription creates a ref loop
|
|
|
|
* that must be manually broken.
|
|
|
|
*/
|
|
|
|
res = ast_sip_subscription_add_datastore(sub->sip_sub, mwi_datastore);
|
2015-06-17 10:04:39 +00:00
|
|
|
ao2_ref(mwi_datastore, -1);
|
2015-06-26 23:48:35 +00:00
|
|
|
return res;
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
|
|
|
|
2014-03-14 18:05:04 +00:00
|
|
|
/*!
|
|
|
|
* \brief Determines if an endpoint is receiving unsolicited MWI for a particular mailbox.
|
|
|
|
*
|
|
|
|
* \param endpoint The endpoint to check
|
|
|
|
* \param mailbox The candidate mailbox
|
|
|
|
* \retval 0 The endpoint does not receive unsolicited MWI for this mailbox
|
|
|
|
* \retval 1 The endpoint receives unsolicited MWI for this mailbox
|
|
|
|
*/
|
|
|
|
static int endpoint_receives_unsolicited_mwi_for_mailbox(struct ast_sip_endpoint *endpoint,
|
|
|
|
const char *mailbox)
|
|
|
|
{
|
|
|
|
struct ao2_iterator *mwi_subs;
|
|
|
|
struct mwi_subscription *mwi_sub;
|
|
|
|
const char *endpoint_id = ast_sorcery_object_get_id(endpoint);
|
|
|
|
int ret = 0;
|
|
|
|
|
2015-06-17 10:04:39 +00:00
|
|
|
mwi_subs = ao2_find(unsolicited_mwi, endpoint_id, OBJ_SEARCH_KEY | OBJ_MULTIPLE);
|
2014-03-14 18:05:04 +00:00
|
|
|
if (!mwi_subs) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (; (mwi_sub = ao2_iterator_next(mwi_subs)) && !ret; ao2_cleanup(mwi_sub)) {
|
|
|
|
struct mwi_stasis_subscription *mwi_stasis;
|
|
|
|
|
|
|
|
mwi_stasis = ao2_find(mwi_sub->stasis_subs, mailbox, OBJ_SEARCH_KEY);
|
|
|
|
if (mwi_stasis) {
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
if (endpoint->subscription.mwi.subscribe_replaces_unsolicited) {
|
|
|
|
unsubscribe_stasis(mwi_stasis, NULL, 0);
|
|
|
|
ao2_unlink(mwi_sub->stasis_subs, mwi_stasis);
|
|
|
|
} else {
|
|
|
|
ret = 1;
|
|
|
|
}
|
2014-03-14 18:05:04 +00:00
|
|
|
ao2_cleanup(mwi_stasis);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ao2_iterator_destroy(mwi_subs);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*!
|
|
|
|
* \brief Determine if an endpoint is a candidate to be able to subscribe for MWI
|
|
|
|
*
|
|
|
|
* Currently, this just makes sure that the endpoint is not already receiving unsolicted
|
|
|
|
* MWI for any of an AOR's configured mailboxes.
|
|
|
|
*
|
|
|
|
* \param obj The AOR to which the endpoint is subscribing.
|
|
|
|
* \param arg The endpoint that is attempting to subscribe.
|
|
|
|
* \param flags Unused.
|
|
|
|
* \retval 0 Endpoint is a candidate to subscribe to MWI on the AOR.
|
|
|
|
* \retval -1 The endpoint cannot subscribe to MWI on the AOR.
|
|
|
|
*/
|
|
|
|
static int mwi_validate_for_aor(void *obj, void *arg, int flags)
|
|
|
|
{
|
|
|
|
struct ast_sip_aor *aor = obj;
|
|
|
|
struct ast_sip_endpoint *endpoint = arg;
|
|
|
|
char *mailboxes;
|
|
|
|
char *mailbox;
|
|
|
|
|
|
|
|
if (ast_strlen_zero(aor->mailboxes)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
mailboxes = ast_strdupa(aor->mailboxes);
|
res_pjsip: Strip spaces from items parsed from comma-separated lists
Configurations like "aors = a, b, c" were either ignoring everything after "a"
or trying to look up " b". Same for mailboxes, ciphers, contacts and a few
others.
To fix, all the strsep(©, ",") calls have been wrapped in ast_strip. To
facilitate this, ast_strip, ast_skip_blanks and ast_skip_nonblanks were
updated to handle null pointers.
In some cases, an ast_strlen_zero() test was added to skip consecutive commas.
There was also an attempt to ast_free an ast_strdupa'd string in
ast_sip_for_each_aor which was causing a SEGV. I removed it.
Although this issue was reported for realtime, the issue was in the res_pjsip
modules so all config mechanisms were affected.
ASTERISK-25829 #close
Reported-by: Mateusz Kowalski
Change-Id: I0b22a2cf22a7c1c50d4ecacbfa540155bec0e7a2
2016-03-06 20:38:41 +00:00
|
|
|
while ((mailbox = ast_strip(strsep(&mailboxes, ",")))) {
|
|
|
|
if (ast_strlen_zero(mailbox)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2014-03-14 18:05:04 +00:00
|
|
|
if (endpoint_receives_unsolicited_mwi_for_mailbox(endpoint, mailbox)) {
|
2016-02-25 21:39:54 +00:00
|
|
|
ast_debug(1, "Endpoint '%s' already configured for unsolicited MWI for mailbox '%s'. "
|
2014-03-14 18:05:04 +00:00
|
|
|
"Denying MWI subscription to %s\n", ast_sorcery_object_get_id(endpoint), mailbox,
|
|
|
|
ast_sorcery_object_get_id(aor));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-01-31 22:08:46 +00:00
|
|
|
static int mwi_on_aor(void *obj, void *arg, int flags)
|
2013-04-25 18:25:31 +00:00
|
|
|
{
|
2014-01-31 22:08:46 +00:00
|
|
|
struct ast_sip_aor *aor = obj;
|
|
|
|
struct mwi_subscription *sub = arg;
|
2013-04-25 18:25:31 +00:00
|
|
|
char *mailboxes;
|
|
|
|
char *mailbox;
|
|
|
|
|
2014-01-31 22:08:46 +00:00
|
|
|
if (ast_strlen_zero(aor->mailboxes)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
mailboxes = ast_strdupa(aor->mailboxes);
|
res_pjsip: Strip spaces from items parsed from comma-separated lists
Configurations like "aors = a, b, c" were either ignoring everything after "a"
or trying to look up " b". Same for mailboxes, ciphers, contacts and a few
others.
To fix, all the strsep(©, ",") calls have been wrapped in ast_strip. To
facilitate this, ast_strip, ast_skip_blanks and ast_skip_nonblanks were
updated to handle null pointers.
In some cases, an ast_strlen_zero() test was added to skip consecutive commas.
There was also an attempt to ast_free an ast_strdupa'd string in
ast_sip_for_each_aor which was causing a SEGV. I removed it.
Although this issue was reported for realtime, the issue was in the res_pjsip
modules so all config mechanisms were affected.
ASTERISK-25829 #close
Reported-by: Mateusz Kowalski
Change-Id: I0b22a2cf22a7c1c50d4ecacbfa540155bec0e7a2
2016-03-06 20:38:41 +00:00
|
|
|
while ((mailbox = ast_strip(strsep(&mailboxes, ",")))) {
|
2015-06-17 10:04:39 +00:00
|
|
|
struct mwi_stasis_subscription *mwi_stasis_sub;
|
|
|
|
|
res_pjsip: Strip spaces from items parsed from comma-separated lists
Configurations like "aors = a, b, c" were either ignoring everything after "a"
or trying to look up " b". Same for mailboxes, ciphers, contacts and a few
others.
To fix, all the strsep(©, ",") calls have been wrapped in ast_strip. To
facilitate this, ast_strip, ast_skip_blanks and ast_skip_nonblanks were
updated to handle null pointers.
In some cases, an ast_strlen_zero() test was added to skip consecutive commas.
There was also an attempt to ast_free an ast_strdupa'd string in
ast_sip_for_each_aor which was causing a SEGV. I removed it.
Although this issue was reported for realtime, the issue was in the res_pjsip
modules so all config mechanisms were affected.
ASTERISK-25829 #close
Reported-by: Mateusz Kowalski
Change-Id: I0b22a2cf22a7c1c50d4ecacbfa540155bec0e7a2
2016-03-06 20:38:41 +00:00
|
|
|
if (ast_strlen_zero(mailbox)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2015-06-17 10:04:39 +00:00
|
|
|
mwi_stasis_sub = mwi_stasis_subscription_alloc(mailbox, sub);
|
|
|
|
if (!mwi_stasis_sub) {
|
|
|
|
continue;
|
2014-01-31 22:08:46 +00:00
|
|
|
}
|
2015-06-17 10:04:39 +00:00
|
|
|
|
|
|
|
ao2_link(sub->stasis_subs, mwi_stasis_sub);
|
|
|
|
ao2_ref(mwi_stasis_sub, -1);
|
2014-01-31 22:08:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct mwi_subscription *mwi_create_subscription(
|
2014-06-25 20:57:28 +00:00
|
|
|
struct ast_sip_endpoint *endpoint, struct ast_sip_subscription *sip_sub)
|
2014-01-31 22:08:46 +00:00
|
|
|
{
|
2014-06-25 20:57:28 +00:00
|
|
|
struct mwi_subscription *sub = mwi_subscription_alloc(endpoint, 1, sip_sub);
|
2014-01-31 22:08:46 +00:00
|
|
|
|
|
|
|
if (!sub) {
|
2013-04-25 18:25:31 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-01-31 22:08:46 +00:00
|
|
|
if (add_mwi_datastore(sub)) {
|
2015-06-26 23:48:35 +00:00
|
|
|
ast_log(LOG_WARNING, "Unable to add datastore for MWI subscription to %s\n",
|
|
|
|
sub->id);
|
2014-01-31 22:08:46 +00:00
|
|
|
ao2_ref(sub, -1);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return sub;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct mwi_subscription *mwi_subscribe_single(
|
2014-06-25 20:57:28 +00:00
|
|
|
struct ast_sip_endpoint *endpoint, struct ast_sip_subscription *sip_sub, const char *name)
|
2014-01-31 22:08:46 +00:00
|
|
|
{
|
2015-06-30 16:14:57 +00:00
|
|
|
struct ast_sip_aor *aor;
|
2014-01-31 22:08:46 +00:00
|
|
|
struct mwi_subscription *sub;
|
|
|
|
|
2016-03-30 17:38:47 +00:00
|
|
|
aor = find_aor_for_resource(endpoint, name);
|
2013-04-25 18:25:31 +00:00
|
|
|
if (!aor) {
|
2016-03-30 17:38:47 +00:00
|
|
|
ast_log(LOG_WARNING, "Unable to locate aor %s. MWI subscription failed.\n", name);
|
2013-04-25 18:25:31 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2015-06-30 16:14:57 +00:00
|
|
|
sub = mwi_create_subscription(endpoint, sip_sub);
|
|
|
|
if (sub) {
|
|
|
|
mwi_on_aor(aor, sub, 0);
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
|
|
|
|
2015-06-30 16:14:57 +00:00
|
|
|
ao2_ref(aor, -1);
|
2014-01-31 22:08:46 +00:00
|
|
|
return sub;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct mwi_subscription *mwi_subscribe_all(
|
2014-06-25 20:57:28 +00:00
|
|
|
struct ast_sip_endpoint *endpoint, struct ast_sip_subscription *sip_sub)
|
2014-01-31 22:08:46 +00:00
|
|
|
{
|
2014-03-14 18:05:04 +00:00
|
|
|
struct mwi_subscription *sub;
|
|
|
|
|
2014-06-25 20:57:28 +00:00
|
|
|
sub = mwi_create_subscription(endpoint, sip_sub);
|
2013-04-25 18:25:31 +00:00
|
|
|
if (!sub) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-01-31 22:08:46 +00:00
|
|
|
ast_sip_for_each_aor(endpoint->aors, mwi_on_aor, sub);
|
|
|
|
return sub;
|
|
|
|
}
|
|
|
|
|
2014-06-25 20:57:28 +00:00
|
|
|
static int mwi_new_subscribe(struct ast_sip_endpoint *endpoint,
|
|
|
|
const char *resource)
|
2014-01-31 22:08:46 +00:00
|
|
|
{
|
2015-01-23 15:21:56 +00:00
|
|
|
RAII_VAR(struct ast_sip_aor *, aor, NULL, ao2_cleanup);
|
2014-01-31 22:08:46 +00:00
|
|
|
|
2014-06-25 20:57:28 +00:00
|
|
|
if (ast_strlen_zero(resource)) {
|
|
|
|
if (ast_sip_for_each_aor(endpoint->aors, mwi_validate_for_aor, endpoint)) {
|
|
|
|
return 500;
|
|
|
|
}
|
|
|
|
return 200;
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
|
|
|
|
2016-03-30 17:38:47 +00:00
|
|
|
aor = find_aor_for_resource(endpoint, resource);
|
2014-06-25 20:57:28 +00:00
|
|
|
if (!aor) {
|
2016-03-30 17:38:47 +00:00
|
|
|
ast_debug(1, "Unable to locate aor %s. MWI subscription failed.\n", resource);
|
2014-06-25 20:57:28 +00:00
|
|
|
return 404;
|
|
|
|
}
|
2014-02-13 18:52:08 +00:00
|
|
|
|
2014-06-25 20:57:28 +00:00
|
|
|
if (ast_strlen_zero(aor->mailboxes)) {
|
2016-02-25 21:39:54 +00:00
|
|
|
ast_debug(1, "AOR %s has no configured mailboxes. MWI subscription failed.\n",
|
2015-06-30 16:11:19 +00:00
|
|
|
resource);
|
2014-06-25 20:57:28 +00:00
|
|
|
return 404;
|
2014-02-13 18:52:08 +00:00
|
|
|
}
|
|
|
|
|
2014-06-25 20:57:28 +00:00
|
|
|
if (mwi_validate_for_aor(aor, endpoint, 0)) {
|
|
|
|
return 500;
|
|
|
|
}
|
2013-04-25 18:25:31 +00:00
|
|
|
|
2014-06-25 20:57:28 +00:00
|
|
|
return 200;
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
|
|
|
|
2014-08-07 19:26:32 +00:00
|
|
|
static int mwi_subscription_established(struct ast_sip_subscription *sip_sub)
|
2013-04-25 18:25:31 +00:00
|
|
|
{
|
2014-06-25 20:57:28 +00:00
|
|
|
const char *resource = ast_sip_subscription_get_resource_name(sip_sub);
|
|
|
|
struct mwi_subscription *sub;
|
|
|
|
struct ast_sip_endpoint *endpoint = ast_sip_subscription_get_endpoint(sip_sub);
|
2013-04-25 18:25:31 +00:00
|
|
|
|
2014-06-25 20:57:28 +00:00
|
|
|
/* no aor in uri? subscribe to all on endpoint */
|
|
|
|
if (ast_strlen_zero(resource)) {
|
|
|
|
sub = mwi_subscribe_all(endpoint, sip_sub);
|
|
|
|
} else {
|
|
|
|
sub = mwi_subscribe_single(endpoint, sip_sub, resource);
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
2014-06-25 20:57:28 +00:00
|
|
|
if (!sub) {
|
|
|
|
ao2_cleanup(endpoint);
|
|
|
|
return -1;
|
|
|
|
}
|
2013-04-25 18:25:31 +00:00
|
|
|
|
2015-06-26 23:48:35 +00:00
|
|
|
if (!ao2_container_count(sub->stasis_subs)) {
|
|
|
|
/*
|
|
|
|
* We setup no MWI subscriptions so remove the MWI datastore
|
|
|
|
* to break the ref loop.
|
|
|
|
*/
|
|
|
|
ast_sip_subscription_remove_datastore(sip_sub, MWI_DATASTORE);
|
|
|
|
}
|
|
|
|
|
2014-06-25 20:57:28 +00:00
|
|
|
ao2_cleanup(sub);
|
|
|
|
ao2_cleanup(endpoint);
|
|
|
|
return 0;
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
|
|
|
|
2014-08-07 19:26:32 +00:00
|
|
|
static void *mwi_get_notify_data(struct ast_sip_subscription *sub)
|
2013-04-25 18:25:31 +00:00
|
|
|
{
|
2014-08-07 19:26:32 +00:00
|
|
|
struct ast_sip_message_accumulator *counter;
|
2013-04-25 18:25:31 +00:00
|
|
|
struct mwi_subscription *mwi_sub;
|
2014-06-25 20:57:28 +00:00
|
|
|
struct ast_datastore *mwi_datastore;
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
struct ast_sip_aor *aor;
|
2016-03-30 17:38:47 +00:00
|
|
|
struct ast_sip_endpoint *endpoint = ast_sip_subscription_get_endpoint(sub);
|
2013-04-25 18:25:31 +00:00
|
|
|
|
2014-08-07 19:26:32 +00:00
|
|
|
mwi_datastore = ast_sip_subscription_get_datastore(sub, MWI_DATASTORE);
|
|
|
|
if (!mwi_datastore) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
mwi_sub = mwi_datastore->data;
|
2013-04-25 18:25:31 +00:00
|
|
|
|
2014-08-07 19:26:32 +00:00
|
|
|
counter = ao2_alloc(sizeof(*counter), NULL);
|
|
|
|
if (!counter) {
|
2014-06-25 20:57:28 +00:00
|
|
|
ao2_cleanup(mwi_datastore);
|
2014-08-07 19:26:32 +00:00
|
|
|
return NULL;
|
2014-06-25 20:57:28 +00:00
|
|
|
}
|
2013-04-25 18:25:31 +00:00
|
|
|
|
2016-03-30 17:38:47 +00:00
|
|
|
if ((aor = find_aor_for_resource(endpoint, ast_sip_subscription_get_resource_name(sub)))) {
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
pjsip_dialog *dlg = ast_sip_subscription_get_dialog(sub);
|
|
|
|
pjsip_sip_uri *sip_uri = ast_sip_subscription_get_sip_uri(sub);
|
|
|
|
|
|
|
|
if (dlg && sip_uri) {
|
|
|
|
set_voicemail_extension(dlg->pool, sip_uri, counter, aor->voicemail_extension);
|
|
|
|
}
|
|
|
|
ao2_ref(aor, -1);
|
|
|
|
}
|
2016-03-30 17:38:47 +00:00
|
|
|
ao2_cleanup(endpoint);
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
|
2014-08-07 19:26:32 +00:00
|
|
|
ao2_callback(mwi_sub->stasis_subs, OBJ_NODATA, get_message_count, counter);
|
|
|
|
ao2_cleanup(mwi_datastore);
|
|
|
|
return counter;
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
|
|
|
|
2013-11-23 17:26:57 +00:00
|
|
|
static void mwi_subscription_mailboxes_str(struct ao2_container *stasis_subs,
|
|
|
|
struct ast_str **str)
|
|
|
|
{
|
2015-06-30 16:17:25 +00:00
|
|
|
int is_first = 1;
|
2013-11-23 17:26:57 +00:00
|
|
|
struct mwi_stasis_subscription *node;
|
|
|
|
struct ao2_iterator i = ao2_iterator_init(stasis_subs, 0);
|
|
|
|
|
|
|
|
while ((node = ao2_iterator_next(&i))) {
|
2015-06-30 16:17:25 +00:00
|
|
|
if (is_first) {
|
|
|
|
is_first = 0;
|
2013-11-23 17:26:57 +00:00
|
|
|
ast_str_append(str, 0, "%s", node->mailbox);
|
2015-06-30 16:17:25 +00:00
|
|
|
} else {
|
|
|
|
ast_str_append(str, 0, ",%s", node->mailbox);
|
2013-11-23 17:26:57 +00:00
|
|
|
}
|
|
|
|
ao2_ref(node, -1);
|
|
|
|
}
|
|
|
|
ao2_iterator_destroy(&i);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mwi_to_ami(struct ast_sip_subscription *sub,
|
|
|
|
struct ast_str **buf)
|
|
|
|
{
|
|
|
|
struct mwi_subscription *mwi_sub;
|
2015-06-17 10:04:39 +00:00
|
|
|
struct ast_datastore *mwi_datastore;
|
2013-11-23 17:26:57 +00:00
|
|
|
|
2015-06-17 10:04:39 +00:00
|
|
|
mwi_datastore = ast_sip_subscription_get_datastore(sub, MWI_DATASTORE);
|
2013-11-23 17:26:57 +00:00
|
|
|
if (!mwi_datastore) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
mwi_sub = mwi_datastore->data;
|
|
|
|
|
|
|
|
ast_str_append(buf, 0, "SubscriptionType: mwi\r\n");
|
|
|
|
ast_str_append(buf, 0, "Mailboxes: ");
|
|
|
|
mwi_subscription_mailboxes_str(mwi_sub->stasis_subs, buf);
|
|
|
|
ast_str_append(buf, 0, "\r\n");
|
2015-06-17 10:04:39 +00:00
|
|
|
|
|
|
|
ao2_ref(mwi_datastore, -1);
|
2013-11-23 17:26:57 +00:00
|
|
|
}
|
|
|
|
|
2013-04-25 18:25:31 +00:00
|
|
|
static int serialized_notify(void *userdata)
|
|
|
|
{
|
|
|
|
struct mwi_subscription *mwi_sub = userdata;
|
|
|
|
|
2014-06-25 20:57:28 +00:00
|
|
|
send_mwi_notify(mwi_sub);
|
2013-04-25 18:25:31 +00:00
|
|
|
ao2_ref(mwi_sub, -1);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int serialized_cleanup(void *userdata)
|
|
|
|
{
|
|
|
|
struct mwi_subscription *mwi_sub = userdata;
|
|
|
|
|
|
|
|
/* This is getting rid of the reference that was added
|
|
|
|
* just before this serialized task was pushed.
|
|
|
|
*/
|
|
|
|
ao2_cleanup(mwi_sub);
|
|
|
|
/* This is getting rid of the reference held by the
|
|
|
|
* stasis subscription
|
|
|
|
*/
|
|
|
|
ao2_cleanup(mwi_sub);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-04-14 19:04:46 +00:00
|
|
|
static int send_notify(void *obj, void *arg, int flags)
|
|
|
|
{
|
|
|
|
struct mwi_subscription *mwi_sub = obj;
|
2015-06-30 16:17:25 +00:00
|
|
|
struct ast_taskprocessor *serializer = mwi_sub->is_solicited
|
|
|
|
? ast_sip_subscription_get_serializer(mwi_sub->sip_sub)
|
2016-08-08 17:53:32 +00:00
|
|
|
: get_mwi_serializer();
|
2015-04-14 19:04:46 +00:00
|
|
|
|
|
|
|
if (ast_sip_push_task(serializer, serialized_notify, ao2_bump(mwi_sub))) {
|
|
|
|
ao2_ref(mwi_sub, -1);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-04-25 18:25:31 +00:00
|
|
|
static void mwi_stasis_cb(void *userdata, struct stasis_subscription *sub,
|
Multiple revisions 399887,400138,400178,400180-400181
........
r399887 | dlee | 2013-09-26 10:41:47 -0500 (Thu, 26 Sep 2013) | 1 line
Minor performance bump by not allocate manager variable struct if we don't need it
........
r400138 | dlee | 2013-09-30 10:24:00 -0500 (Mon, 30 Sep 2013) | 23 lines
Stasis performance improvements
This patch addresses several performance problems that were found in
the initial performance testing of Asterisk 12.
The Stasis dispatch object was allocated as an AO2 object, even though
it has a very confined lifecycle. This was replaced with a straight
ast_malloc().
The Stasis message router was spending an inordinate amount of time
searching hash tables. In this case, most of our routers had 6 or
fewer routes in them to begin with. This was replaced with an array
that's searched linearly for the route.
We more heavily rely on AO2 objects in Asterisk 12, and the memset()
in ao2_ref() actually became noticeable on the profile. This was
#ifdef'ed to only run when AO2_DEBUG was enabled.
After being misled by an erroneous comment in taskprocessor.c during
profiling, the wrong comment was removed.
Review: https://reviewboard.asterisk.org/r/2873/
........
r400178 | dlee | 2013-09-30 13:26:27 -0500 (Mon, 30 Sep 2013) | 24 lines
Taskprocessor optimization; switch Stasis to use taskprocessors
This patch optimizes taskprocessor to use a semaphore for signaling,
which the OS can do a better job at managing contention and waiting
that we can with a mutex and condition.
The taskprocessor execution was also slightly optimized to reduce the
number of locks taken.
The only observable difference in the taskprocessor implementation is
that when the final reference to the taskprocessor goes away, it will
execute all tasks to completion instead of discarding the unexecuted
tasks.
For systems where unnamed semaphores are not supported, a really
simple semaphore implementation is provided. (Which gives identical
performance as the original taskprocessor implementation).
The way we ended up implementing Stasis caused the threadpool to be a
burden instead of a boost to performance. This was switched to just
use taskprocessors directly for subscriptions.
Review: https://reviewboard.asterisk.org/r/2881/
........
r400180 | dlee | 2013-09-30 13:39:34 -0500 (Mon, 30 Sep 2013) | 28 lines
Optimize how Stasis forwards are dispatched
This patch optimizes how forwards are dispatched in Stasis.
Originally, forwards were dispatched as subscriptions that are invoked
on the publishing thread. This did not account for the vast number of
forwards we would end up having in the system, and the amount of work it
would take to walk though the forward subscriptions.
This patch modifies Stasis so that rather than walking the tree of
forwards on every dispatch, when forwards and subscriptions are changed,
the subscriber list for every topic in the tree is changed.
This has a couple of benefits. First, this reduces the workload of
dispatching messages. It also reduces contention when dispatching to
different topics that happen to forward to the same aggregation topic
(as happens with all of the channel, bridge and endpoint topics).
Since forwards are no longer subscriptions, the bulk of this patch is
simply changing stasis_subscription objects to stasis_forward objects
(which, admittedly, I should have done in the first place.)
Since this required me to yet again put in a growing array, I finally
abstracted that out into a set of ast_vector macros in
asterisk/vector.h.
Review: https://reviewboard.asterisk.org/r/2883/
........
r400181 | dlee | 2013-09-30 13:48:57 -0500 (Mon, 30 Sep 2013) | 28 lines
Remove dispatch object allocation from Stasis publishing
While looking for areas for performance improvement, I realized that an
unused feature in Stasis was negatively impacting performance.
When a message is sent to a subscriber, a dispatch object is allocated
for the dispatch, containing the topic the message was published to, the
subscriber the message is being sent to, and the message itself.
The topic is actually unused by any subscriber in Asterisk today. And
the subscriber is associated with the taskprocessor the message is being
dispatched to.
First, this patch removes the unused topic parameter from Stasis
subscription callbacks.
Second, this patch introduces the concept of taskprocessor local data,
data that may be set on a taskprocessor and provided along with the data
pointer when a task is pushed using the ast_taskprocessor_push_local()
call. This allows the task to have both data specific to that
taskprocessor, in addition to data specific to that invocation.
With those two changes, the dispatch object can be removed completely,
and the message is simply refcounted and sent directly to the
taskprocessor.
Review: https://reviewboard.asterisk.org/r/2884/
........
Merged revisions 399887,400138,400178,400180-400181 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@400186 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2013-09-30 18:55:27 +00:00
|
|
|
struct stasis_message *msg)
|
2013-04-25 18:25:31 +00:00
|
|
|
{
|
|
|
|
struct mwi_subscription *mwi_sub = userdata;
|
|
|
|
|
|
|
|
if (stasis_subscription_final_message(sub, msg)) {
|
2015-04-14 19:04:46 +00:00
|
|
|
if (ast_sip_push_task(NULL, serialized_cleanup, ao2_bump(mwi_sub))) {
|
|
|
|
ao2_ref(mwi_sub, -1);
|
|
|
|
}
|
2013-04-25 18:25:31 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-05-24 20:44:07 +00:00
|
|
|
if (ast_mwi_state_type() == stasis_message_type(msg)) {
|
2015-04-14 19:04:46 +00:00
|
|
|
send_notify(mwi_sub, NULL, 0);
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-01 20:07:30 +00:00
|
|
|
/*! \note Called with the unsolicited_mwi container lock held. */
|
2013-04-25 18:25:31 +00:00
|
|
|
static int create_mwi_subscriptions_for_endpoint(void *obj, void *arg, int flags)
|
|
|
|
{
|
|
|
|
RAII_VAR(struct mwi_subscription *, aggregate_sub, NULL, ao2_cleanup);
|
|
|
|
struct ast_sip_endpoint *endpoint = obj;
|
2016-07-18 14:22:57 +00:00
|
|
|
char *mailboxes, *mailbox;
|
2013-04-25 18:25:31 +00:00
|
|
|
|
2013-07-30 15:17:56 +00:00
|
|
|
if (ast_strlen_zero(endpoint->subscription.mwi.mailboxes)) {
|
2013-04-25 18:25:31 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-07-30 15:17:56 +00:00
|
|
|
if (endpoint->subscription.mwi.aggregate) {
|
2017-06-16 23:08:30 +00:00
|
|
|
const char *endpoint_id = ast_sorcery_object_get_id(endpoint);
|
|
|
|
|
|
|
|
/* Check if subscription exists */
|
|
|
|
aggregate_sub = ao2_find(unsolicited_mwi, endpoint_id, OBJ_SEARCH_KEY | OBJ_NOLOCK);
|
|
|
|
if (aggregate_sub) {
|
|
|
|
return 0;
|
|
|
|
}
|
2014-06-25 20:57:28 +00:00
|
|
|
aggregate_sub = mwi_subscription_alloc(endpoint, 0, NULL);
|
2013-04-25 18:25:31 +00:00
|
|
|
if (!aggregate_sub) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-07-30 15:17:56 +00:00
|
|
|
mailboxes = ast_strdupa(endpoint->subscription.mwi.mailboxes);
|
res_pjsip: Strip spaces from items parsed from comma-separated lists
Configurations like "aors = a, b, c" were either ignoring everything after "a"
or trying to look up " b". Same for mailboxes, ciphers, contacts and a few
others.
To fix, all the strsep(©, ",") calls have been wrapped in ast_strip. To
facilitate this, ast_strip, ast_skip_blanks and ast_skip_nonblanks were
updated to handle null pointers.
In some cases, an ast_strlen_zero() test was added to skip consecutive commas.
There was also an attempt to ast_free an ast_strdupa'd string in
ast_sip_for_each_aor which was causing a SEGV. I removed it.
Although this issue was reported for realtime, the issue was in the res_pjsip
modules so all config mechanisms were affected.
ASTERISK-25829 #close
Reported-by: Mateusz Kowalski
Change-Id: I0b22a2cf22a7c1c50d4ecacbfa540155bec0e7a2
2016-03-06 20:38:41 +00:00
|
|
|
while ((mailbox = ast_strip(strsep(&mailboxes, ",")))) {
|
|
|
|
struct mwi_subscription *sub;
|
2015-06-17 10:04:39 +00:00
|
|
|
struct mwi_stasis_subscription *mwi_stasis_sub;
|
|
|
|
|
2017-06-16 23:08:30 +00:00
|
|
|
/* check if subscription exists */
|
|
|
|
if (ast_strlen_zero(mailbox) ||
|
|
|
|
(!aggregate_sub && endpoint_receives_unsolicited_mwi_for_mailbox(endpoint, mailbox))) {
|
res_pjsip: Strip spaces from items parsed from comma-separated lists
Configurations like "aors = a, b, c" were either ignoring everything after "a"
or trying to look up " b". Same for mailboxes, ciphers, contacts and a few
others.
To fix, all the strsep(©, ",") calls have been wrapped in ast_strip. To
facilitate this, ast_strip, ast_skip_blanks and ast_skip_nonblanks were
updated to handle null pointers.
In some cases, an ast_strlen_zero() test was added to skip consecutive commas.
There was also an attempt to ast_free an ast_strdupa'd string in
ast_sip_for_each_aor which was causing a SEGV. I removed it.
Although this issue was reported for realtime, the issue was in the res_pjsip
modules so all config mechanisms were affected.
ASTERISK-25829 #close
Reported-by: Mateusz Kowalski
Change-Id: I0b22a2cf22a7c1c50d4ecacbfa540155bec0e7a2
2016-03-06 20:38:41 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub = aggregate_sub ?: mwi_subscription_alloc(endpoint, 0, NULL);
|
2015-06-17 10:04:39 +00:00
|
|
|
mwi_stasis_sub = mwi_stasis_subscription_alloc(mailbox, sub);
|
2013-04-25 18:25:31 +00:00
|
|
|
if (mwi_stasis_sub) {
|
|
|
|
ao2_link(sub->stasis_subs, mwi_stasis_sub);
|
2015-06-17 10:04:39 +00:00
|
|
|
ao2_ref(mwi_stasis_sub, -1);
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
2015-06-17 10:04:39 +00:00
|
|
|
if (!aggregate_sub && sub) {
|
|
|
|
ao2_link_flags(unsolicited_mwi, sub, OBJ_NOLOCK);
|
|
|
|
ao2_ref(sub, -1);
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
|
|
|
}
|
2014-03-06 15:58:13 +00:00
|
|
|
if (aggregate_sub) {
|
2015-06-17 10:04:39 +00:00
|
|
|
ao2_link_flags(unsolicited_mwi, aggregate_sub, OBJ_NOLOCK);
|
2014-03-06 15:58:13 +00:00
|
|
|
}
|
2013-04-25 18:25:31 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int unsubscribe(void *obj, void *arg, int flags)
|
|
|
|
{
|
|
|
|
struct mwi_subscription *mwi_sub = obj;
|
|
|
|
|
|
|
|
ao2_callback(mwi_sub->stasis_subs, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, unsubscribe_stasis, NULL);
|
2015-04-14 19:04:46 +00:00
|
|
|
|
2013-04-25 18:25:31 +00:00
|
|
|
return CMP_MATCH;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void create_mwi_subscriptions(void)
|
|
|
|
{
|
2015-06-17 10:04:39 +00:00
|
|
|
struct ao2_container *endpoints;
|
sorcery/res_pjsip: Refactor for realtime performance
There were a number of places in the res_pjsip stack that were getting
all endpoints or all aors, and then filtering them locally.
A good example is pjsip_options which, on startup, retrieves all
endpoints, then the aors for those endpoints, then tests the aors to see
if the qualify_frequency is > 0. One issue was that it never did
anything with the endpoints other than retrieve the aors so we probably
could have skipped a step and just retrieved all aors. But nevermind.
This worked reasonably well with local config files but with a realtime
backend and thousands of objects, this was a nightmare. The issue
really boiled down to the fact that while realtime supports predicates
that are passed to the database engine, the non-realtime sorcery
backends didn't.
They do now.
The realtime engines have a scheme for doing simple comparisons. They
take in an ast_variable (or list) for matching, and the name of each
variable can contain an operator. For instance, a name of
"qualify_frequency >" and a value of "0" would create a SQL predicate
that looks like "where qualify_frequency > '0'". If there's no operator
after the name, the engines add an '=' so a simple name of
"qualify_frequency" and a value of "10" would return exact matches.
The non-realtime backends decide whether to include an object in a
result set by calling ast_sorcery_changeset_create on every object in
the internal container. However, ast_sorcery_changeset_create only does
exact string matches though so a name of "qualify_frequency >" and a
value of "0" returns nothing because the literal "qualify_frequency >"
doesn't match any name in the objset set.
So, the real task was to create a generic string matcher that can take a
left value, operator and a right value and perform the match. To that
end, strings.c has a new ast_strings_match(left, operator, right)
function. Left and right are the strings to operate on and the operator
can be a string containing any of the following: = (or NULL or ""), !=,
>, >=, <, <=, like or regex. If the operator is like or regex, the
right string should be a %-pattern or a regex expression. If both left
and right can be converted to float, then a numeric comparison is
performed, otherwise a string comparison is performed.
To use this new function on ast_variables, 2 new functions were added to
config.c. One that compares 2 ast_variables, and one that compares 2
ast_variable lists. The former is useful when you want to compare 2
ast_variables that happen to be in a list but don't want to traverse the
list. The latter will traverse the right list and return true if all
the variables in it match the left list.
Now, the backends' fields_cmp functions call ast_variable_lists_match
instead of ast_sorcery_changeset_create and they can now process the
same syntax as the realtime engines. The realtime backend just passes
the variable list unaltered to the engine. The only gotcha is that
there's no common realtime engine support for regex so that's been noted
in the api docs for ast_sorcery_retrieve_by_fields.
Only one more change to sorcery was done... A new config flag
"allow_unqualified_fetch" was added to reg_sorcery_realtime.
"no": ignore fetches if no predicate fields were supplied.
"error": same as no but emit an error. (good for testing)
"yes": allow (the default);
"warn": allow but emit a warning. (good for testing)
Now on to res_pjsip...
pjsip_options was modified to retrieve aors with qualify_frequency > 0
rather than all endpoints then all aors. Not only was this a big
improvement in realtime retrieval but even for config files there's an
improvement because we're not going through endpoints anymore.
res_pjsip_mwi was modified to retieve only endpoints with something in
the mailboxes field instead of all endpoints then testing mailboxes.
res_pjsip_registrar_expire was completely refactored. It was retrieving
all contacts then setting up scheduler entries to check for expiration.
Now, it's a single thread (like keepalive) that periodically retrieves
only contacts whose expiration time is < now and deletes them. A new
contact_expiration_check_interval was added to global with a default of
30 seconds.
Ross Beer reports that with this patch, his Asterisk startup time dropped
from around an hour to under 30 seconds.
There are still objects that can't be filtered at the database like
identifies, transports, and registrations. These are not going to be
anywhere near as numerous as endpoints, aors, auths, contacts however.
Back to allow_unqualified_fetch. If this is set to yes and you have a
very large number of objects in the database, the pjsip CLI commands
will attempt to retrive ALL of them if not qualified with a LIKE.
Worse, if you type "pjsip show endpoint <tab>" guess what's going to
happen? :) Having a cache helps but all the objects will have to be
retrieved at least once to fill the cache. Setting
allow_unqualified_fetch=no prevents the mass retrieve and should be used
on endpoints, auths, aors, and contacts. It should NOT be used for
identifies, registrations and transports since these MUST be
retrieved in bulk.
Example sorcery.conf:
[res_pjsip]
endpoint=config,pjsip.conf,criteria=type=endpoint
endpoint=realtime,ps_endpoints,allow_unqualified_fetch=error
ASTERISK-25826 #close
Reported-by: Ross Beer
Tested-by: Ross Beer
Change-Id: Id2691e447db90892890036e663aaf907b2dc1c67
2016-03-08 21:55:30 +00:00
|
|
|
struct ast_variable *var;
|
|
|
|
|
|
|
|
var = ast_variable_new("mailboxes !=", "", "");
|
2013-04-25 18:25:31 +00:00
|
|
|
|
2015-06-17 10:04:39 +00:00
|
|
|
endpoints = ast_sorcery_retrieve_by_fields(ast_sip_get_sorcery(), "endpoint",
|
sorcery/res_pjsip: Refactor for realtime performance
There were a number of places in the res_pjsip stack that were getting
all endpoints or all aors, and then filtering them locally.
A good example is pjsip_options which, on startup, retrieves all
endpoints, then the aors for those endpoints, then tests the aors to see
if the qualify_frequency is > 0. One issue was that it never did
anything with the endpoints other than retrieve the aors so we probably
could have skipped a step and just retrieved all aors. But nevermind.
This worked reasonably well with local config files but with a realtime
backend and thousands of objects, this was a nightmare. The issue
really boiled down to the fact that while realtime supports predicates
that are passed to the database engine, the non-realtime sorcery
backends didn't.
They do now.
The realtime engines have a scheme for doing simple comparisons. They
take in an ast_variable (or list) for matching, and the name of each
variable can contain an operator. For instance, a name of
"qualify_frequency >" and a value of "0" would create a SQL predicate
that looks like "where qualify_frequency > '0'". If there's no operator
after the name, the engines add an '=' so a simple name of
"qualify_frequency" and a value of "10" would return exact matches.
The non-realtime backends decide whether to include an object in a
result set by calling ast_sorcery_changeset_create on every object in
the internal container. However, ast_sorcery_changeset_create only does
exact string matches though so a name of "qualify_frequency >" and a
value of "0" returns nothing because the literal "qualify_frequency >"
doesn't match any name in the objset set.
So, the real task was to create a generic string matcher that can take a
left value, operator and a right value and perform the match. To that
end, strings.c has a new ast_strings_match(left, operator, right)
function. Left and right are the strings to operate on and the operator
can be a string containing any of the following: = (or NULL or ""), !=,
>, >=, <, <=, like or regex. If the operator is like or regex, the
right string should be a %-pattern or a regex expression. If both left
and right can be converted to float, then a numeric comparison is
performed, otherwise a string comparison is performed.
To use this new function on ast_variables, 2 new functions were added to
config.c. One that compares 2 ast_variables, and one that compares 2
ast_variable lists. The former is useful when you want to compare 2
ast_variables that happen to be in a list but don't want to traverse the
list. The latter will traverse the right list and return true if all
the variables in it match the left list.
Now, the backends' fields_cmp functions call ast_variable_lists_match
instead of ast_sorcery_changeset_create and they can now process the
same syntax as the realtime engines. The realtime backend just passes
the variable list unaltered to the engine. The only gotcha is that
there's no common realtime engine support for regex so that's been noted
in the api docs for ast_sorcery_retrieve_by_fields.
Only one more change to sorcery was done... A new config flag
"allow_unqualified_fetch" was added to reg_sorcery_realtime.
"no": ignore fetches if no predicate fields were supplied.
"error": same as no but emit an error. (good for testing)
"yes": allow (the default);
"warn": allow but emit a warning. (good for testing)
Now on to res_pjsip...
pjsip_options was modified to retrieve aors with qualify_frequency > 0
rather than all endpoints then all aors. Not only was this a big
improvement in realtime retrieval but even for config files there's an
improvement because we're not going through endpoints anymore.
res_pjsip_mwi was modified to retieve only endpoints with something in
the mailboxes field instead of all endpoints then testing mailboxes.
res_pjsip_registrar_expire was completely refactored. It was retrieving
all contacts then setting up scheduler entries to check for expiration.
Now, it's a single thread (like keepalive) that periodically retrieves
only contacts whose expiration time is < now and deletes them. A new
contact_expiration_check_interval was added to global with a default of
30 seconds.
Ross Beer reports that with this patch, his Asterisk startup time dropped
from around an hour to under 30 seconds.
There are still objects that can't be filtered at the database like
identifies, transports, and registrations. These are not going to be
anywhere near as numerous as endpoints, aors, auths, contacts however.
Back to allow_unqualified_fetch. If this is set to yes and you have a
very large number of objects in the database, the pjsip CLI commands
will attempt to retrive ALL of them if not qualified with a LIKE.
Worse, if you type "pjsip show endpoint <tab>" guess what's going to
happen? :) Having a cache helps but all the objects will have to be
retrieved at least once to fill the cache. Setting
allow_unqualified_fetch=no prevents the mass retrieve and should be used
on endpoints, auths, aors, and contacts. It should NOT be used for
identifies, registrations and transports since these MUST be
retrieved in bulk.
Example sorcery.conf:
[res_pjsip]
endpoint=config,pjsip.conf,criteria=type=endpoint
endpoint=realtime,ps_endpoints,allow_unqualified_fetch=error
ASTERISK-25826 #close
Reported-by: Ross Beer
Tested-by: Ross Beer
Change-Id: Id2691e447db90892890036e663aaf907b2dc1c67
2016-03-08 21:55:30 +00:00
|
|
|
AST_RETRIEVE_FLAG_MULTIPLE, var);
|
|
|
|
|
|
|
|
ast_variables_destroy(var);
|
2015-06-17 10:04:39 +00:00
|
|
|
if (!endpoints) {
|
2013-04-25 18:25:31 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We remove all the old stasis subscriptions first before applying the new configuration. This
|
|
|
|
* prevents a situation where there might be multiple overlapping stasis subscriptions for an
|
|
|
|
* endpoint for mailboxes. Though there may be mailbox changes during the gap between unsubscribing
|
|
|
|
* and resubscribing, up-to-date mailbox state will be sent out to the endpoint when the
|
|
|
|
* new stasis subscription is established
|
|
|
|
*/
|
2015-06-17 10:04:39 +00:00
|
|
|
ao2_lock(unsolicited_mwi);
|
|
|
|
ao2_callback(unsolicited_mwi, OBJ_NOLOCK | OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, unsubscribe, NULL);
|
|
|
|
ao2_callback(endpoints, OBJ_NODATA, create_mwi_subscriptions_for_endpoint, NULL);
|
|
|
|
ao2_unlock(unsolicited_mwi);
|
|
|
|
|
|
|
|
ao2_ref(endpoints, -1);
|
2013-04-25 18:25:31 +00:00
|
|
|
}
|
|
|
|
|
2015-04-14 19:04:46 +00:00
|
|
|
/*! \brief Function called to send MWI NOTIFY on any unsolicited mailboxes relating to this AOR */
|
|
|
|
static int send_contact_notify(void *obj, void *arg, int flags)
|
|
|
|
{
|
|
|
|
struct mwi_subscription *mwi_sub = obj;
|
|
|
|
const char *aor = arg;
|
|
|
|
|
|
|
|
if (!mwi_sub->aors || !strstr(mwi_sub->aors, aor)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-08-08 17:53:32 +00:00
|
|
|
if (ast_sip_push_task(get_mwi_serializer(), serialized_notify, ao2_bump(mwi_sub))) {
|
2015-04-14 19:04:46 +00:00
|
|
|
ao2_ref(mwi_sub, -1);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-06-16 23:08:30 +00:00
|
|
|
/*! \brief Create mwi subscriptions and notify */
|
|
|
|
static void mwi_contact_changed(const struct ast_sip_contact *contact)
|
2015-04-14 19:04:46 +00:00
|
|
|
{
|
2017-06-16 23:08:30 +00:00
|
|
|
char *id = ast_strdupa(ast_sorcery_object_get_id(contact));
|
|
|
|
char *aor = NULL;
|
|
|
|
struct ast_sip_endpoint *endpoint = NULL;
|
2015-06-17 10:04:39 +00:00
|
|
|
|
2017-06-16 23:08:30 +00:00
|
|
|
if (contact->endpoint) {
|
|
|
|
endpoint = ao2_bump(contact->endpoint);
|
|
|
|
} else {
|
|
|
|
if (!ast_strlen_zero(contact->endpoint_name)) {
|
|
|
|
endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", contact->endpoint_name);
|
|
|
|
}
|
|
|
|
}
|
2015-06-17 10:04:39 +00:00
|
|
|
|
2017-06-16 23:08:30 +00:00
|
|
|
if (!endpoint || ast_strlen_zero(endpoint->subscription.mwi.mailboxes)) {
|
|
|
|
ao2_cleanup(endpoint);
|
2015-04-14 19:04:46 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-06-17 10:04:39 +00:00
|
|
|
ao2_lock(unsolicited_mwi);
|
2017-06-16 23:08:30 +00:00
|
|
|
create_mwi_subscriptions_for_endpoint(endpoint, NULL, 0);
|
|
|
|
ao2_unlock(unsolicited_mwi);
|
|
|
|
ao2_cleanup(endpoint);
|
2015-06-17 10:04:39 +00:00
|
|
|
|
2017-06-16 23:08:30 +00:00
|
|
|
aor = strsep(&id, ";@");
|
|
|
|
ao2_callback(unsolicited_mwi, OBJ_NODATA, send_contact_notify, aor);
|
|
|
|
}
|
2015-06-17 10:04:39 +00:00
|
|
|
|
2017-06-16 23:08:30 +00:00
|
|
|
/*! \brief Function called when a contact is updated */
|
|
|
|
static void mwi_contact_updated(const void *object)
|
|
|
|
{
|
|
|
|
mwi_contact_changed(object);
|
|
|
|
}
|
2015-06-17 10:04:39 +00:00
|
|
|
|
2017-06-16 23:08:30 +00:00
|
|
|
/*! \brief Function called when a contact is added */
|
|
|
|
static void mwi_contact_added(const void *object)
|
|
|
|
{
|
|
|
|
mwi_contact_changed(object);
|
2015-04-14 19:04:46 +00:00
|
|
|
}
|
|
|
|
|
2017-06-12 21:17:38 +00:00
|
|
|
/*! \brief Function called when a contact is deleted */
|
|
|
|
static void mwi_contact_deleted(const void *object)
|
|
|
|
{
|
|
|
|
const struct ast_sip_contact *contact = object;
|
|
|
|
struct ao2_iterator *mwi_subs;
|
|
|
|
struct mwi_subscription *mwi_sub;
|
2017-06-21 22:57:11 +00:00
|
|
|
struct ast_sip_endpoint *endpoint = NULL;
|
|
|
|
struct ast_sip_contact *found_contact;
|
2017-06-12 21:17:38 +00:00
|
|
|
|
|
|
|
if (contact->endpoint) {
|
|
|
|
endpoint = ao2_bump(contact->endpoint);
|
|
|
|
} else {
|
|
|
|
if (!ast_strlen_zero(contact->endpoint_name)) {
|
|
|
|
endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", contact->endpoint_name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!endpoint || ast_strlen_zero(endpoint->subscription.mwi.mailboxes)) {
|
2017-06-21 22:57:11 +00:00
|
|
|
ao2_cleanup(endpoint);
|
2017-06-12 21:17:38 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check if there is another contact */
|
|
|
|
found_contact = ast_sip_location_retrieve_contact_from_aor_list(endpoint->aors);
|
2017-06-21 22:57:11 +00:00
|
|
|
ao2_cleanup(endpoint);
|
2017-06-12 21:17:38 +00:00
|
|
|
if (found_contact) {
|
2017-06-21 22:57:11 +00:00
|
|
|
ao2_cleanup(found_contact);
|
2017-06-12 21:17:38 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
ao2_lock(unsolicited_mwi);
|
|
|
|
mwi_subs = ao2_find(unsolicited_mwi, contact->endpoint_name,
|
|
|
|
OBJ_SEARCH_KEY | OBJ_MULTIPLE | OBJ_NOLOCK | OBJ_UNLINK);
|
|
|
|
if (mwi_subs) {
|
|
|
|
for (; (mwi_sub = ao2_iterator_next(mwi_subs)); ao2_cleanup(mwi_sub)) {
|
|
|
|
unsubscribe(mwi_sub, NULL, 0);
|
|
|
|
}
|
|
|
|
ao2_iterator_destroy(mwi_subs);
|
|
|
|
}
|
|
|
|
ao2_unlock(unsolicited_mwi);
|
|
|
|
}
|
|
|
|
|
2015-04-14 19:04:46 +00:00
|
|
|
/*! \brief Observer for contacts so unsolicited MWI is sent when a contact changes */
|
|
|
|
static const struct ast_sorcery_observer mwi_contact_observer = {
|
2015-06-17 10:04:39 +00:00
|
|
|
.created = mwi_contact_added,
|
|
|
|
.updated = mwi_contact_updated,
|
2017-06-12 21:17:38 +00:00
|
|
|
.deleted = mwi_contact_deleted,
|
2015-04-14 19:04:46 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/*! \brief Task invoked to send initial MWI NOTIFY for unsolicited */
|
|
|
|
static int send_initial_notify_all(void *obj)
|
|
|
|
{
|
2015-06-17 10:04:39 +00:00
|
|
|
ao2_callback(unsolicited_mwi, OBJ_NODATA, send_notify, NULL);
|
2015-04-14 19:04:46 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*! \brief Event callback which fires initial unsolicited MWI NOTIFY messages when we're fully booted */
|
|
|
|
static void mwi_startup_event_cb(void *data, struct stasis_subscription *sub, struct stasis_message *message)
|
|
|
|
{
|
|
|
|
struct ast_json_payload *payload;
|
|
|
|
const char *type;
|
|
|
|
|
|
|
|
if (stasis_message_type(message) != ast_manager_get_generic_type()) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
payload = stasis_message_data(message);
|
|
|
|
type = ast_json_string_get(ast_json_object_get(payload->json, "type"));
|
|
|
|
|
|
|
|
if (strcmp(type, "FullyBooted")) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
ast_sip_push_task(NULL, send_initial_notify_all, NULL);
|
|
|
|
|
|
|
|
stasis_unsubscribe(sub);
|
|
|
|
}
|
|
|
|
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
static void global_loaded(const char *object_type)
|
|
|
|
{
|
|
|
|
ast_free(default_voicemail_extension);
|
|
|
|
default_voicemail_extension = ast_sip_get_default_voicemail_extension();
|
2016-08-08 17:53:32 +00:00
|
|
|
mwi_serializer_set_alert_levels();
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct ast_sorcery_observer global_observer = {
|
|
|
|
.loaded = global_loaded,
|
|
|
|
};
|
|
|
|
|
2013-04-25 18:25:31 +00:00
|
|
|
static int reload(void)
|
|
|
|
{
|
2017-06-12 14:57:24 +00:00
|
|
|
if (!ast_sip_get_mwi_disable_initial_unsolicited()) {
|
|
|
|
create_mwi_subscriptions();
|
|
|
|
}
|
2013-04-25 18:25:31 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int load_module(void)
|
|
|
|
{
|
|
|
|
if (ast_sip_register_subscription_handler(&mwi_handler)) {
|
|
|
|
return AST_MODULE_LOAD_DECLINE;
|
|
|
|
}
|
2015-06-17 10:04:39 +00:00
|
|
|
|
2016-08-08 17:53:32 +00:00
|
|
|
if (mwi_serializer_pool_setup()) {
|
|
|
|
ast_log(AST_LOG_WARNING, "Failed to create MWI serializer pool. The default SIP pool will be used for MWI\n");
|
|
|
|
}
|
|
|
|
|
2016-08-01 20:07:30 +00:00
|
|
|
unsolicited_mwi = ao2_container_alloc_hash(AO2_ALLOC_OPT_LOCK_MUTEX, 0, MWI_BUCKETS,
|
|
|
|
mwi_sub_hash, NULL, mwi_sub_cmp);
|
|
|
|
if (!unsolicited_mwi) {
|
|
|
|
mwi_serializer_pool_shutdown();
|
|
|
|
ast_sip_unregister_subscription_handler(&mwi_handler);
|
|
|
|
return AST_MODULE_LOAD_DECLINE;
|
|
|
|
}
|
|
|
|
|
2015-04-14 19:04:46 +00:00
|
|
|
ast_sorcery_observer_add(ast_sip_get_sorcery(), "contact", &mwi_contact_observer);
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
ast_sorcery_observer_add(ast_sip_get_sorcery(), "global", &global_observer);
|
|
|
|
ast_sorcery_reload_object(ast_sip_get_sorcery(), "global");
|
2015-04-14 19:04:46 +00:00
|
|
|
|
2016-08-08 17:53:32 +00:00
|
|
|
if (!ast_sip_get_mwi_disable_initial_unsolicited()) {
|
2017-06-12 14:57:24 +00:00
|
|
|
create_mwi_subscriptions();
|
2016-08-08 17:53:32 +00:00
|
|
|
if (ast_test_flag(&ast_options, AST_OPT_FLAG_FULLY_BOOTED)) {
|
|
|
|
ast_sip_push_task(NULL, send_initial_notify_all, NULL);
|
|
|
|
} else {
|
2018-09-23 20:50:01 +00:00
|
|
|
struct stasis_subscription *sub;
|
|
|
|
|
|
|
|
sub = stasis_subscribe_pool(ast_manager_get_topic(), mwi_startup_event_cb, NULL);
|
|
|
|
stasis_subscription_accept_message_type(sub, ast_manager_get_generic_type());
|
|
|
|
stasis_subscription_set_filter(sub, STASIS_SUBSCRIPTION_FILTER_SELECTIVE);
|
2016-08-08 17:53:32 +00:00
|
|
|
}
|
2015-04-14 19:04:46 +00:00
|
|
|
}
|
|
|
|
|
2013-04-25 18:25:31 +00:00
|
|
|
return AST_MODULE_LOAD_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int unload_module(void)
|
|
|
|
{
|
2016-08-01 20:07:30 +00:00
|
|
|
ast_sorcery_observer_remove(ast_sip_get_sorcery(), "global", &global_observer);
|
|
|
|
ast_sorcery_observer_remove(ast_sip_get_sorcery(), "contact", &mwi_contact_observer);
|
|
|
|
|
2015-06-17 10:04:39 +00:00
|
|
|
ao2_callback(unsolicited_mwi, OBJ_UNLINK | OBJ_NODATA | OBJ_MULTIPLE, unsubscribe, NULL);
|
|
|
|
ao2_ref(unsolicited_mwi, -1);
|
2016-08-01 20:07:30 +00:00
|
|
|
unsolicited_mwi = NULL;
|
|
|
|
|
2016-08-08 17:53:32 +00:00
|
|
|
mwi_serializer_pool_shutdown();
|
2016-08-01 20:07:30 +00:00
|
|
|
|
2013-04-25 18:25:31 +00:00
|
|
|
ast_sip_unregister_subscription_handler(&mwi_handler);
|
2016-08-01 20:07:30 +00:00
|
|
|
|
res_pjsip_mwi: Add voicemail extension and mwi_subscribe_replaces_unsolicited
res_pjsip_mwi was missing the chan_sip "vmexten" functionality which adds
the Message-Account header to the MWI NOTIFY. Also, specifying mailboxes
on endpoints for unsolicited mwi and on aors for subscriptions required
that the admin know in advance which the client wanted. If you specified
mailboxes on the endpoint, subscriptions were rejected even if you also
specified mailboxes on the aor.
Voicemail extension:
* Added a global default_voicemail_extension which defaults to "".
* Added voicemail_extension to both endpoint and aor.
* Added ast_sip_subscription_get_dialog for support.
* Added ast_sip_subscription_get_sip_uri for support.
When an unsolicited NOTIFY is constructed, the From header is parsed, the
voicemail extension from the endpoint is substituted for the user, and the
result placed in the Message-Account field in the body.
When a subscribed NOTIFY is constructed, the subscription dialog local uri
is parsed, the voicemail_extension from the aor (looked up from the
subscription resource name) is substituted for the user, and the result
placed in the Message-Account field in the body.
If no voicemail extension was defined, the Message-Account field is not added
to the NOTIFY body.
mwi_subscribe_replaces_unsolicited:
* Added mwi_subscribe_replaces_unsolicited to endpoint.
The previous behavior was to reject a subscribe if a previous internal
subscription for unsolicited MWI was found for the mailbox. That remains the
default. However, if there are mailboxes also set on the aor and the client
subscribes and mwi_subscribe_replaces_unsolicited is set, the existing internal
subscription is removed and replaced with the external subscription. This
allows an admin to configure mailboxes on both the endpoint and aor and allows
the client to select which to use.
ASTERISK-25865 #close
Reported-by: Ross Beer
Change-Id: Ic15a9415091760539c7134a5ba3dc4a6a1217cea
2016-03-25 03:55:03 +00:00
|
|
|
ast_free(default_voicemail_extension);
|
2016-08-01 20:07:30 +00:00
|
|
|
default_voicemail_extension = NULL;
|
2013-04-25 18:25:31 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-07-30 18:14:50 +00:00
|
|
|
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP MWI resource",
|
2015-05-06 00:49:04 +00:00
|
|
|
.support_level = AST_MODULE_SUPPORT_CORE,
|
|
|
|
.load = load_module,
|
|
|
|
.unload = unload_module,
|
|
|
|
.reload = reload,
|
2016-04-28 16:35:44 +00:00
|
|
|
.load_pri = AST_MODPRI_CHANNEL_DEPEND + 5,
|
2017-11-19 22:30:49 +00:00
|
|
|
.requires = "res_pjsip,res_pjsip_pubsub",
|
2013-04-25 18:25:31 +00:00
|
|
|
);
|