From: Terry Wilson Date: Mon, 7 Feb 2011 21:51:43 +0000 (+0000) Subject: Don't allow a REFER w/replaces to replace its own dialog X-Git-Tag: 1.4.41-rc1~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c80738307a0bf1d1e3acab7fe13067c5fd2a9bfb;p=thirdparty%2Fasterisk.git Don't allow a REFER w/replaces to replace its own dialog Asterisk currently accepts a REFER with a Refer-To with an embedded Replaces header that matches the dialog of the REFER. This would be a situation like A calls B, A calls C, A transfers B to A, which is just silly. This patch makes the transfer fail instead of making Asterisk freak out and forget to hang other channels up. Review: https://reviewboard.asterisk.org/r/1093/ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@306617 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 87d6f34dfe..cf5a4dc879 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -10386,7 +10386,15 @@ static int get_refer_info(struct sip_pvt *transferer, struct sip_request *outgoi *to = '\0'; ast_copy_string(referdata->replaces_callid_fromtag, ptr, sizeof(referdata->replaces_callid_fromtag)); } - + + if (!strcmp(referdata->replaces_callid, transferer->callid) && + (!pedanticsipchecking || + (!strcmp(referdata->replaces_callid_fromtag, transferer->tag) && + !strcmp(referdata->replaces_callid_totag, transferer->theirtag)))) { + ast_log(LOG_WARNING, "Got an attempt to replace own Call-ID on %s\n", transferer->callid); + return -4; + } + if (option_debug > 1) { if (!pedanticsipchecking) ast_log(LOG_DEBUG,"Attended transfer: Will use Replace-Call-ID : %s (No check of from/to tags)\n", referdata->replaces_callid );