diff options
| author | Olle Johansson <oej@edvina.net> | 2007-05-29 19:35:43 +0000 |
|---|---|---|
| committer | Olle Johansson <oej@edvina.net> | 2007-05-29 19:35:43 +0000 |
| commit | ee3a0af16a6cfff4bf0e2a663302925d8d92686f (patch) | |
| tree | e8ecafdfb690f349c871c19582ef8ed787cd2f8e /channels/chan_sip.c | |
| parent | 6d6c525b1041999729fb22323f8333884a98f5c4 (diff) | |
Merged revisions 66503 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66503 | oej | 2007-05-29 21:32:57 +0200 (Tue, 29 May 2007) | 2 lines
Properly handle 408 request timeout - according to the RFC, the dialog dies if a request in a dialog gets this response.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66504 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 30e592e5a..9c0a7d4ca 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -12809,6 +12809,7 @@ static void handle_response_invite(struct sip_pvt *p, int resp, char *rest, stru sip_alreadygone(p); break; + case 408: /* Request timeout */ case 481: /* Call leg does not exist */ /* Could be REFER caused INVITE with replaces */ ast_log(LOG_WARNING, "Re-invite to non-existing call leg on other UA. SIP dialog '%s'. Giving up.\n", p->callid); @@ -12974,6 +12975,14 @@ static int handle_response_register(struct sip_pvt *p, int resp, char *rest, str ast_set_flag(&p->flags[0], SIP_NEEDDESTROY); } break; + case 408: /* Request timeout */ + if (global_regattempts_max) + p->registry->regattempts = global_regattempts_max+1; + ast_set_flag(&p->flags[0], SIP_NEEDDESTROY); + r->call = NULL; + ast_sched_del(sched, r->timeout); + r->timeout = -1; + break; case 423: /* Interval too brief */ r->expiry = atoi(get_header(req, "Min-Expires")); ast_log(LOG_WARNING, "Got 423 Interval too brief for service %s@%s, minimum is %d seconds\n", p->registry->username, p->registry->hostname, r->expiry); @@ -13271,6 +13280,21 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_ if (sipmethod == SIP_REGISTER) res = handle_response_register(p, resp, rest, req, seqno); break; + case 408: /* Request timeout - terminate dialog */ + if (sipmethod == SIP_INVITE) + handle_response_invite(p, resp, rest, req, seqno); + else if (sipmethod == SIP_REGISTER) + res = handle_response_register(p, resp, rest, req, ignore, seqno); + else if (sipmethod == SIP_BYE) { + ast_set_flag(&p->flags[0], SIP_NEEDDESTROY); + if (option_debug) + ast_log(LOG_DEBUG, "Got timeout on bye. Thanks for the answer. Now, kill this call\n"); + } else { + if (owner) + ast_queue_control(p->owner, AST_CONTROL_CONGESTION); + ast_set_flag(&p->flags[0], SIP_NEEDDESTROY); + } + break; case 481: /* Call leg does not exist */ if (sipmethod == SIP_INVITE) { handle_response_invite(p, resp, rest, req, seqno); |