kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-15 17:27:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix sip transaction match with authentication, fix confusing log message when using getaddrinfo

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@279817 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2010-07-27 16:09:15 +00:00
parent ccfad47983
commit ab374d0446
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
channels/chan_sip.c
View File

@@ -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;
}
}

2
main/netsock2.c
View File

@@ -201,8 +201,10 @@ int ast_sockaddr_parse(struct ast_sockaddr *addr, const char *str, int flags)
hints.ai_flags = AI_NUMERICHOST;
#endif
if ((e = getaddrinfo(host, port, &hints, &res))) {
if (e != EAI_NONAME) { /* if this was just a host name rather than a ip address, don't print error */
ast_log(LOG_ERROR, "getaddrinfo(\"%s\", \"%s\", ...): %s\n",
host, S_OR(port, "(null)"), gai_strerror(e));
}
return 0;
}