From: Joshua Colp <jcolp@digium.com>
Date: Wed, 2 Dec 2009 16:42:52 +0000 (+0000)
Subject: Merged revisions 232345 via svnmerge from
X-Git-Tag: 1.6.1.12-rc1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffe164d3f51b37bb59e1073e7af39aca39c2d614;p=thirdparty%2Fasterisk.git

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

........
  r232345 | file | 2009-12-02 12:40:14 -0400 (Wed, 02 Dec 2009) | 7 lines

  Add support for handling the 415 Unsupported media type response like we do for a 488 Not acceptable here response.

  (closes issue #16186)
  Reported by: atis
  Patches:
        sip_t38_response_415.patch uploaded by atis (license 242)
........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 30fdf32e53..cea195c99e 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -17002,6 +17002,7 @@ static void handle_response_invite(struct sip_pvt *p, int resp, char *rest, stru
 			sip_alreadygone(p);
 		}
 		break;
+	case 415: /* Unsupported media type */
 	case 488: /* Not acceptable here */
 		xmitres = transmit_request(p, SIP_ACK, seqno, XMIT_UNRELIABLE, FALSE);
 		if (p->udptl && p->t38.state == T38_LOCAL_REINVITE) {
@@ -17581,6 +17582,7 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_
 			if (sipmethod == SIP_INVITE)
 				handle_response_invite(p, resp, rest, req, seqno);
 			break;
+		case 415: /* Unsupported media type */
 		case 488: /* Not acceptable here - codec error */
 			if (sipmethod == SIP_INVITE)
 				handle_response_invite(p, resp, rest, req, seqno);
@@ -17783,6 +17785,7 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_
 				if ((resp != 487))
 					ast_verb(3, "Incoming call: Got SIP response %d \"%s\" back from %s\n", resp, rest, ast_inet_ntoa(p->sa.sin_addr));
 				switch(resp) {
+				case 415: /* Unsupported media type */
 				case 488: /* Not acceptable here - codec error */
 				case 603: /* Decline */
 				case 500: /* Server error */