[asterisk-commits] mjordan: branch 12 r426601 - in /branches/12: ./ channels/chan_sip.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Oct 29 20:58:37 CDT 2014
Author: mjordan
Date: Wed Oct 29 20:58:33 2014
New Revision: 426601
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=426601
Log:
channels/chan_sip: Add improved support for 4xx error codes
This patch adds support for 414, 493, 479, and a stray 400 response in REGISTER
response handling. This helps interoperability in a number of scenarios.
Review: https://reviewboard.asterisk.org/r/3437
patches:
rb3437.patch uploaded by oej (License 5267)
........
Merged revisions 426599 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 426600 from http://svn.asterisk.org/svn/asterisk/branches/11
Modified:
branches/12/ (props changed)
branches/12/channels/chan_sip.c
Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.
Modified: branches/12/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/channels/chan_sip.c?view=diff&rev=426601&r1=426600&r2=426601
==============================================================================
--- branches/12/channels/chan_sip.c (original)
+++ branches/12/channels/chan_sip.c Wed Oct 29 20:58:33 2014
@@ -23476,6 +23476,8 @@
}
break;
+ case 414: /* Bad request URI */
+ case 493: /* Undecipherable */
case 404: /* Not found */
xmitres = transmit_request(p, SIP_ACK, seqno, XMIT_UNRELIABLE, FALSE);
if (p->owner && !req->ignore) {
@@ -23729,12 +23731,16 @@
ASTOBJ_UNREF(p->mwi, sip_subscribe_mwi_destroy);
pvt_set_needdestroy(p, "received 481 response");
break;
+
+ case 400: /* Bad Request */
+ case 414: /* Request URI too long */
+ case 493: /* Undecipherable */
case 500:
case 501:
ast_log(LOG_WARNING, "Subscription failed for MWI. The remote side may have suffered a heart attack.\n");
p->mwi->call = NULL;
ASTOBJ_UNREF(p->mwi, sip_subscribe_mwi_destroy);
- pvt_set_needdestroy(p, "received 500/501 response");
+ pvt_set_needdestroy(p, "received serious error (500/501/493/414/400) response");
break;
}
}
@@ -23910,11 +23916,14 @@
}
sip_publish_registry(r->username, r->hostname, regstate2str(r->regstate));
break;
- case 479: /* SER: Not able to process the URI - address is wrong in register*/
- ast_log(LOG_WARNING, "Got error 479 on register to %s@%s, giving up (check config)\n", p->registry->username, p->registry->hostname);
- pvt_set_needdestroy(p, "received 479 response");
+ case 400: /* Bad request */
+ case 414: /* Request URI too long */
+ case 493: /* Undecipherable */
+ case 479: /* Kamailio/OpenSIPS: Not able to process the URI - address is wrong in register*/
+ ast_log(LOG_WARNING, "Got error %d on register to %s@%s, giving up (check config)\n", resp, p->registry->username, p->registry->hostname);
+ pvt_set_needdestroy(p, "received 4xx response");
if (r->call)
- r->call = dialog_unref(r->call, "unsetting registry->call pointer-- case 479");
+ r->call = dialog_unref(r->call, "unsetting registry->call pointer-- case 4xx");
r->regstate = REG_STATE_REJECTED;
sip_publish_registry(r->username, r->hostname, regstate2str(r->regstate));
AST_SCHED_DEL_UNREF(sched, r->timeout, registry_unref(r, "reg ptr unref from handle_response_register 479"));
@@ -24388,6 +24397,9 @@
pvt_set_needdestroy(p, "received 403 response");
}
break;
+ case 400: /* Bad Request */
+ case 414: /* Request URI too long */
+ case 493: /* Undecipherable */
case 404: /* Not found */
if (p->registry && sipmethod == SIP_REGISTER)
handle_response_register(p, resp, rest, req, seqno);
More information about the asterisk-commits
mailing list