summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorDavid Vossel <dvossel@digium.com>2010-07-27 16:11:11 +0000
committerDavid Vossel <dvossel@digium.com>2010-07-27 16:11:11 +0000
commitd61a4088f5b052a4caec1bbbfa4ae6b165c451a6 (patch)
treeea829bd7c41dbd04d04a1d9258e427db186ee4cd /channels
parent8bd241f2382979e65f127775e133b7707739a1f2 (diff)
Merged revisions 279817 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r279817 | dvossel | 2010-07-27 11:09:15 -0500 (Tue, 27 Jul 2010) | 2 lines fix sip transaction match with authentication, fix confusing log message when using getaddrinfo ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@279818 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 4dd27f8a0..b74bc2912 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7369,11 +7369,10 @@ static struct sip_pvt *find_call(struct sip_request *req, struct ast_sockaddr *a
/* If this is a Request, set the Via and Authorization header arguments */
if (req->method != SIP_RESPONSE) {
- const char *auth_header;
args.ruri = REQ_OFFSET_TO_STR(req, rlPart2);
get_viabranch(ast_strdupa(get_header(req, "Via")), (char **) &args.viasentby, (char **) &args.viabranch);
- auth_header = get_header(req, "WWW-Authenticate");
- if (!ast_strlen_zero(auth_header)) {
+ if (!ast_strlen_zero(get_header(req, "Authorization")) ||
+ !ast_strlen_zero(get_header(req, "Proxy-Authorization"))) {
args.authentication_present = 1;
}
}