From: Mark Michelson <mmichelson@digium.com>
Date: Fri, 26 Feb 2010 17:05:22 +0000 (+0000)
Subject: Merged revisions 249101 via svnmerge from
X-Git-Tag: 1.6.0.26-rc1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=429e38a9504f8c5093341c4f7c5674e09e424ffb;p=thirdparty%2Fasterisk.git

Merged revisions 249101 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r249101 | mmichelson | 2010-02-26 11:04:58 -0600 (Fri, 26 Feb 2010) | 14 lines

  Merged revisions 249100 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r249100 | mmichelson | 2010-02-26 11:04:29 -0600 (Fri, 26 Feb 2010) | 8 lines

    For T.38 reINVITEs treat a 606 the same as a 488.

    (closes issue #16792)
    Reported by: vrban
    Patches:
          t38_606.patch uploaded by vrban (license 756)
  ........
................


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 68d3c49762..6e45b882cc 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -16186,6 +16186,7 @@ static void handle_response_invite(struct sip_pvt *p, int resp, char *rest, stru
 		break;
 	case 415: /* Unsupported media type */
 	case 488: /* Not acceptable here */
+	case 606: /* Not Acceptable */
 		xmitres = transmit_request(p, SIP_ACK, seqno, XMIT_UNRELIABLE, FALSE);
 		if (p->udptl && p->t38.state == T38_LOCAL_REINVITE) {
 			change_t38_state(p, T38_DISABLED);
@@ -16727,6 +16728,7 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_
 			break;
 		case 415: /* Unsupported media type */
 		case 488: /* Not acceptable here - codec error */
+		case 606: /* Not Acceptable */
 			if (sipmethod == SIP_INVITE)
 				handle_response_invite(p, resp, rest, req, seqno);
 			break;