channels/chan_sip: Add improved support for 4xx error codes
[asterisk/asterisk.git] / channels / chan_sip.c
index 43cb2e9..f2cb0d4 100644 (file)
@@ -23225,6 +23225,8 @@ static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest
                }
                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) {
@@ -23478,12 +23480,16 @@ static void handle_response_subscribe(struct sip_pvt *p, int resp, const char *r
                ao2_t_ref(p->mwi, -1, "received 481 response");
                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;
                ao2_t_ref(p->mwi, -1, "received 500/501 response");
-               pvt_set_needdestroy(p, "received 500/501 response");
+               pvt_set_needdestroy(p, "received serious error (500/501/493/414/400) response");
                break;
        }
 }
@@ -23659,11 +23665,14 @@ static int handle_response_register(struct sip_pvt *p, int resp, const char *res
                }
                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, ao2_t_ref(r, -1, "reg ptr unref from handle_response_register 479"));
@@ -24137,6 +24146,9 @@ static void handle_response(struct sip_pvt *p, int resp, const char *rest, struc
                                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);