[svn-commits] kpfleming: branch 1.6.1 r208550 - in /branches/1.6.1: ./ channels/ include/as...

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Fri Jul 24 10:05:40 2009
New Revision: 208550

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=208550
Log:
Merged revisions 208548 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r208548 | kpfleming | 2009-07-24 10:02:53 -0500 (Fri, 24 Jul 2009) | 8 lines
  
  Resolve a T.38 negotiation issue left over from the udptl-updates merge.
  
  The udptl-updates branch that was merged yesterday failed to properly send back
  T.38 SDP responses with the correct error correction mode, if the incoming SDP
  from the other end caused us to change error correction modes. This patch
  corrects that situation.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c
    branches/1.6.1/include/asterisk/udptl.h
    branches/1.6.1/main/udptl.c

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

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=208550&r1=208549&r2=208550
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Fri Jul 24 10:05:40 2009
@@ -9083,13 +9083,13 @@
 			break;
 		}
 		ast_str_append(&a_modem, 0, "a=T38FaxMaxDatagram:%d\r\n", ast_udptl_get_local_max_datagram(p->udptl));
-		switch (ast_test_flag(&p->flags[1],  SIP_PAGE2_T38SUPPORT)) {
-		case SIP_PAGE2_T38SUPPORT_UDPTL:
+		switch (ast_udptl_get_error_correction_scheme(p->udptl)) {
+		case UDPTL_ERROR_CORRECTION_NONE:
 			break;
-		case SIP_PAGE2_T38SUPPORT_UDPTL_FEC:
+		case UDPTL_ERROR_CORRECTION_FEC:
 			ast_str_append(&a_modem, 0, "a=T38FaxUdpEC:t38UDPFEC\r\n");
 			break;
-		case SIP_PAGE2_T38SUPPORT_UDPTL_REDUNDANCY:
+		case UDPTL_ERROR_CORRECTION_REDUNDANCY:
 			ast_str_append(&a_modem, 0, "a=T38FaxUdpEC:t38UDPRedundancy\r\n");
 			break;
 		}

Modified: branches/1.6.1/include/asterisk/udptl.h
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/include/asterisk/udptl.h?view=diff&rev=208550&r1=208549&r2=208550
==============================================================================
--- branches/1.6.1/include/asterisk/udptl.h (original)
+++ branches/1.6.1/include/asterisk/udptl.h Fri Jul 24 10:05:40 2009
@@ -87,7 +87,7 @@
 void ast_udptl_set_udptlmap_type(struct ast_udptl *udptl, unsigned int pt,
 				 char *mimeType, char *mimeSubtype);
 
-int ast_udptl_get_error_correction_scheme(const struct ast_udptl *udptl);
+enum ast_t38_ec_modes ast_udptl_get_error_correction_scheme(const struct ast_udptl *udptl);
 
 void ast_udptl_set_error_correction_scheme(struct ast_udptl *udptl, enum ast_t38_ec_modes ec);
 

Modified: branches/1.6.1/main/udptl.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/udptl.c?view=diff&rev=208550&r1=208549&r2=208550
==============================================================================
--- branches/1.6.1/main/udptl.c (original)
+++ branches/1.6.1/main/udptl.c Fri Jul 24 10:05:40 2009
@@ -769,7 +769,7 @@
 	udptl->far_max_ifp = new_max * 0.75;
 }
 
-int ast_udptl_get_error_correction_scheme(const struct ast_udptl *udptl)
+enum ast_t38_ec_modes ast_udptl_get_error_correction_scheme(const struct ast_udptl *udptl)
 {
 	if (udptl)
 		return udptl->error_correction_scheme;