Merged revisions 373849 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

................
  r373849 | mmichelson | 2012-09-26 16:11:35 -0500 (Wed, 26 Sep 2012) | 8 lines

  Move handling of 408 response so there is no misleading warning message.

  (closes issue ASTERISK-20060)
  Reported by: Walter Doekes
  ........

  Merged revisions 373848 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@373877 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 149646e76888d81c959e42bc31421e4a2288b4cd..def30b5e87d914d48b2d66c5f70450daf7d29552 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -21329,7 +21329,6 @@ static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest
                }
                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);
@@ -21411,6 +21410,7 @@ static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest
                }
                break;
 
+       case 408: /* Request timeout */
        case 405: /* Not allowed */
        case 501: /* Not implemented */
                xmitres = transmit_request(p, SIP_ACK, seqno, XMIT_UNRELIABLE, FALSE);