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
120 lines
2.8 KiB
C
120 lines
2.8 KiB
C
/*
|
|
* Asterisk -- An open source telephony toolkit.
|
|
*
|
|
* Copyright (C) 2014, 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.
|
|
*/
|
|
|
|
/*** MODULEINFO
|
|
<depend>pjproject</depend>
|
|
<depend>res_pjsip</depend>
|
|
<depend>res_pjsip_pubsub</depend>
|
|
<support_level>core</support_level>
|
|
***/
|
|
|
|
#include "asterisk.h"
|
|
|
|
#include <pjsip.h>
|
|
#include <pjsip_simple.h>
|
|
#include <pjlib.h>
|
|
|
|
#include "asterisk/res_pjsip.h"
|
|
#include "asterisk/res_pjsip_pubsub.h"
|
|
#include "asterisk/res_pjsip_body_generator_types.h"
|
|
#include "asterisk/module.h"
|
|
#include "asterisk/strings.h"
|
|
|
|
#define MWI_TYPE "application"
|
|
#define MWI_SUBTYPE "simple-message-summary"
|
|
|
|
static void *mwi_allocate_body(void *data)
|
|
{
|
|
struct ast_str **mwi_str;
|
|
|
|
mwi_str = ast_malloc(sizeof(*mwi_str));
|
|
if (!mwi_str) {
|
|
return NULL;
|
|
}
|
|
*mwi_str = ast_str_create(128);
|
|
if (!*mwi_str) {
|
|
ast_free(mwi_str);
|
|
return NULL;
|
|
}
|
|
return mwi_str;
|
|
}
|
|
|
|
static int mwi_generate_body_content(void *body, void *data)
|
|
{
|
|
struct ast_str **mwi = body;
|
|
struct ast_sip_message_accumulator *counter = data;
|
|
|
|
ast_str_append(mwi, 0, "Messages-Waiting: %s\r\n",
|
|
counter->new_msgs ? "yes" : "no");
|
|
ast_str_append(mwi, 0, "Voice-Message: %d/%d (0/0)\r\n",
|
|
counter->new_msgs, counter->old_msgs);
|
|
if (!ast_strlen_zero(counter->message_account)) {
|
|
ast_str_append(mwi, 0, "Message-Account: %s\r\n", counter->message_account);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void mwi_to_string(void *body, struct ast_str **str)
|
|
{
|
|
struct ast_str **mwi = body;
|
|
|
|
ast_str_set(str, 0, "%s", ast_str_buffer(*mwi));
|
|
}
|
|
|
|
static void mwi_destroy_body(void *body)
|
|
{
|
|
struct ast_str **mwi = body;
|
|
|
|
ast_free(*mwi);
|
|
ast_free(mwi);
|
|
}
|
|
|
|
static struct ast_sip_pubsub_body_generator mwi_generator = {
|
|
.type = MWI_TYPE,
|
|
.subtype = MWI_SUBTYPE,
|
|
.body_type = AST_SIP_MESSAGE_ACCUMULATOR,
|
|
.allocate_body = mwi_allocate_body,
|
|
.generate_body_content = mwi_generate_body_content,
|
|
.to_string = mwi_to_string,
|
|
.destroy_body = mwi_destroy_body,
|
|
};
|
|
|
|
static int load_module(void)
|
|
{
|
|
CHECK_PJSIP_PUBSUB_MODULE_LOADED();
|
|
|
|
if (ast_sip_pubsub_register_body_generator(&mwi_generator)) {
|
|
return AST_MODULE_LOAD_DECLINE;
|
|
}
|
|
return AST_MODULE_LOAD_SUCCESS;
|
|
}
|
|
|
|
static int unload_module(void)
|
|
{
|
|
ast_sip_pubsub_unregister_body_generator(&mwi_generator);
|
|
return 0;
|
|
}
|
|
|
|
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP MWI resource",
|
|
.support_level = AST_MODULE_SUPPORT_CORE,
|
|
.load = load_module,
|
|
.unload = unload_module,
|
|
.load_pri = AST_MODPRI_CHANNEL_DEPEND,
|
|
);
|