[svn-commits] mmichelson: branch 1.6.0 r249102 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Feb 26 11:05:22 2010
New Revision: 249102

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=249102
Log:
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)
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=249102&r1=249101&r2=249102
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Fri Feb 26 11:05:22 2010
@@ -16186,6 +16186,7 @@
 		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 @@
 			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;