Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't process re-subscribes as new subscriptions.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@16804 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
BJ Weschke 20 years ago
parent b7c52b3416
commit 225d8d5270
1 changed files with 89 additions and 81 deletions
Show Stats Download Patch File Download Diff File

170
channels/chan_sip.c
Unescape View File

@ -6534,6 +6534,10 @@ static int cb_extensionstate(char *context, char* exten, int state, void *data)
{ {
struct sip_pvt *p = data; struct sip_pvt *p = data;
if (p == (struct sip_pvt *) NULL) {
ast_log(LOG_ERROR, "We're sent state change for channel we don't know... Major issue!!!!! Notify management!!!\n");
return 0;
}
switch(state) { switch(state) {
case AST_EXTENSION_DEACTIVATED: /* Retry after a while */ case AST_EXTENSION_DEACTIVATED: /* Retry after a while */
case AST_EXTENSION_REMOVED: /* Extension is gone */ case AST_EXTENSION_REMOVED: /* Extension is gone */
@ -11024,93 +11028,97 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
} else if (debug && ignore) } else if (debug && ignore)
ast_verbose("Ignoring this SUBSCRIBE request\n"); ast_verbose("Ignoring this SUBSCRIBE request\n");
/* Find parameters to Event: header value and remove them for now */ /* Don't treat this SUBSCRIBE request as new if it isn't */
if ((eventparam = strchr(event, ';'))) if (!p->lastinvite) {
*eventparam++ = '\0';
/* Handle authentication if this is our first subscribe */ /* Find parameters to Event: header value and remove them for now */
res = check_user_full(p, req, SIP_SUBSCRIBE, e, 0, sin, ignore, &authpeer); if ((eventparam = strchr(event, ';')))
if (res) { *eventparam++ = '\0';
if (res < 0) {
ast_log(LOG_NOTICE, "Failed to authenticate user %s for SUBSCRIBE\n", get_header(req, "From")); /* Handle authentication if this is our first subscribe */
ast_set_flag(&p->flags[0], SIP_NEEDDESTROY); res = check_user_full(p, req, SIP_SUBSCRIBE, e, 0, sin, ignore, &authpeer);
if (res) {
if (res < 0) {
ast_log(LOG_NOTICE, "Failed to authenticate user %s for SUBSCRIBE\n", get_header(req, "From"));
ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
}
return 0;
} }
return 0;
} /* Check if this user/peer is allowed to subscribe at all */
if (!ast_test_flag(&p->flags[1], SIP_PAGE2_ALLOWSUBSCRIBE)) {
/* Check if this user/peer is allowed to subscribe at all */ transmit_response(p, "403 Forbidden (policy)", req);
if (!ast_test_flag(&p->flags[1], SIP_PAGE2_ALLOWSUBSCRIBE)) { ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
transmit_response(p, "403 Forbidden (policy)", req); return 0;
ast_set_flag(&p->flags[0], SIP_NEEDDESTROY); }
return 0;
} /* Initialize the context if it hasn't been already */
if (!ast_strlen_zero(p->subscribecontext))
/* Initialize the context if it hasn't been already */ ast_string_field_set(p, context, p->subscribecontext);
if (!ast_strlen_zero(p->subscribecontext)) else if (ast_strlen_zero(p->context))
ast_string_field_set(p, context, p->subscribecontext); ast_string_field_set(p, context, default_context);
else if (ast_strlen_zero(p->context))
ast_string_field_set(p, context, default_context); /* Get destination right away */
gotdest = get_destination(p, NULL);
/* Get destination right away */ build_contact(p);
gotdest = get_destination(p, NULL); if (gotdest) {
build_contact(p); transmit_response(p, "404 Not Found", req);
if (gotdest) { ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
transmit_response(p, "404 Not Found", req); return 0;
ast_set_flag(&p->flags[0], SIP_NEEDDESTROY); } else {
return 0; /* Initialize tag for new subscriptions */
} else { if (ast_strlen_zero(p->tag))
/* Initialize tag for new subscriptions */ make_our_tag(p->tag, sizeof(p->tag));
if (ast_strlen_zero(p->tag))
make_our_tag(p->tag, sizeof(p->tag)); if (!strcmp(event, "presence") || !strcmp(event, "dialog")) { /* Presence, RFC 3842 */
if (!strcmp(event, "presence") || !strcmp(event, "dialog")) { /* Presence, RFC 3842 */ /* Header from Xten Eye-beam Accept: multipart/related, application/rlmi+xml, application/pidf+xml, application/xpidf+xml */
if (strstr(accept, "application/pidf+xml")) {
/* Header from Xten Eye-beam Accept: multipart/related, application/rlmi+xml, application/pidf+xml, application/xpidf+xml */ p->subscribed = PIDF_XML; /* RFC 3863 format */
if (strstr(accept, "application/pidf+xml")) { } else if (strstr(accept, "application/dialog-info+xml")) {
p->subscribed = PIDF_XML; /* RFC 3863 format */ p->subscribed = DIALOG_INFO_XML;
} else if (strstr(accept, "application/dialog-info+xml")) { /* IETF draft: draft-ietf-sipping-dialog-package-05.txt */
p->subscribed = DIALOG_INFO_XML; } else if (strstr(accept, "application/cpim-pidf+xml")) {
/* IETF draft: draft-ietf-sipping-dialog-package-05.txt */ p->subscribed = CPIM_PIDF_XML; /* RFC 3863 format */
} else if (strstr(accept, "application/cpim-pidf+xml")) { } else if (strstr(accept, "application/xpidf+xml")) {
p->subscribed = CPIM_PIDF_XML; /* RFC 3863 format */ p->subscribed = XPIDF_XML; /* Early pre-RFC 3863 format with MSN additions (Microsoft Messenger) */
} else if (strstr(accept, "application/xpidf+xml")) { } else if (strstr(p->useragent, "Polycom")) {
p->subscribed = XPIDF_XML; /* Early pre-RFC 3863 format with MSN additions (Microsoft Messenger) */ p->subscribed = XPIDF_XML; /* Polycoms subscribe for "event: dialog" but don't include an "accept:" header */
} else if (strstr(p->useragent, "Polycom")) { } else {
p->subscribed = XPIDF_XML; /* Polycoms subscribe for "event: dialog" but don't include an "accept:" header */ /* Can't find a format for events that we know about */
} else { transmit_response(p, "489 Bad Event", req);
/* Can't find a format for events that we know about */ ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
transmit_response(p, "489 Bad Event", req); return 0;
}
} else if (!strcmp(event, "message-summary") && !strcmp(accept, "application/simple-message-summary")) {
/* Looks like they actually want a mailbox status
This version of Asterisk supports mailbox subscriptions
The subscribed URI needs to exist in the dial plan
In most devices, this is configurable to the voicemailmain extension you use
*/
if (!authpeer || ast_strlen_zero(authpeer->mailbox)) {
transmit_response(p, "404 Not found (no mailbox)", req);
ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
ast_log(LOG_NOTICE, "Received SIP subscribe for peer without mailbox: %s\n", authpeer->name);
return 0;
}
p->subscribed = MWI_NOTIFICATION;
if (authpeer->mwipvt && authpeer->mwipvt != p) /* Destroy old PVT if this is a new one */
/* We only allow one subscription per peer */
sip_destroy(authpeer->mwipvt);
authpeer->mwipvt = p; /* Link from peer to pvt */
p->relatedpeer = authpeer; /* Link from pvt to peer */
} else { /* At this point, Asterisk does not understand the specified event */
transmit_response(p, "489 Bad Event", req);
if (option_debug > 1)
ast_log(LOG_DEBUG, "Received SIP subscribe for unknown event package: %s\n", event);
ast_set_flag(&p->flags[0], SIP_NEEDDESTROY); ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
return 0;
}
} else if (!strcmp(event, "message-summary") && !strcmp(accept, "application/simple-message-summary")) {
/* Looks like they actually want a mailbox status
This version of Asterisk supports mailbox subscriptions
The subscribed URI needs to exist in the dial plan
In most devices, this is configurable to the voicemailmain extension you use
*/
if (!authpeer || ast_strlen_zero(authpeer->mailbox)) {
transmit_response(p, "404 Not found (no mailbox)", req);
ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
ast_log(LOG_NOTICE, "Received SIP subscribe for peer without mailbox: %s\n", authpeer->name);
return 0; return 0;
} }
if (p->subscribed != MWI_NOTIFICATION)
p->subscribed = MWI_NOTIFICATION; p->stateid = ast_extension_state_add(p->context, p->exten, cb_extensionstate, p);
if (authpeer->mwipvt && authpeer->mwipvt != p) /* Destroy old PVT if this is a new one */
/* We only allow one subscription per peer */
sip_destroy(authpeer->mwipvt);
authpeer->mwipvt = p; /* Link from peer to pvt */
p->relatedpeer = authpeer; /* Link from pvt to peer */
} else { /* At this point, Asterisk does not understand the specified event */
transmit_response(p, "489 Bad Event", req);
if (option_debug > 1)
ast_log(LOG_DEBUG, "Received SIP subscribe for unknown event package: %s\n", event);
ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
return 0;
} }
if (p->subscribed != MWI_NOTIFICATION)
p->stateid = ast_extension_state_add(p->context, p->exten, cb_extensionstate, p);
} }
if (!ignore && p) if (!ignore && p)

Write Preview
Loading…
Cancel
Save