diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-03-24 01:42:11 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-03-24 01:42:11 +0000 |
| commit | cc22f60f30b32b24b1b178fda7cc1bbef4b3cbc3 (patch) | |
| tree | fb472db22ff2b730de574160d46fc7cff1708777 /channels | |
| parent | 518ff7941e292357c19d04253c847712bc557c4a (diff) | |
Merged revisions 59195 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r59195 | file | 2007-03-23 21:39:44 -0400 (Fri, 23 Mar 2007) | 10 lines
Merged revisions 59194 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r59194 | file | 2007-03-23 21:35:49 -0400 (Fri, 23 Mar 2007) | 2 lines
Only try to handle a response if it has a response code. (ASA-2007-011)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59196 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 9345a334b..07ba786be 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -15285,20 +15285,20 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc respond appropriately */ ast_set_flag(req, SIP_PKT_IGNORE); append_history(p, "Ignore", "Ignoring this retransmit\n"); - } - - e = ast_skip_blanks(e); - if (sscanf(e, "%d %n", &respid, &len) != 1) { - ast_log(LOG_WARNING, "Invalid response: '%s'\n", e); - } else { - if (respid <= 0) { - ast_log(LOG_WARNING, "Invalid SIP response code: '%d'\n", respid); - return 0; + } else if (e) { + e = ast_skip_blanks(e); + if (sscanf(e, "%d %n", &respid, &len) != 1) { + ast_log(LOG_WARNING, "Invalid response: '%s'\n", e); + } else { + if (respid <= 0) { + ast_log(LOG_WARNING, "Invalid SIP response code: '%d'\n", respid); + return 0; + } + /* More SIP ridiculousness, we have to ignore bogus contacts in 100 etc responses */ + if ((respid == 200) || ((respid >= 300) && (respid <= 399))) + extract_uri(p, req); + handle_response(p, respid, e + len, req, seqno); } - /* More SIP ridiculousness, we have to ignore bogus contacts in 100 etc responses */ - if ((respid == 200) || ((respid >= 300) && (respid <= 399))) - extract_uri(p, req); - handle_response(p, respid, e + len, req, seqno); } return 0; } |