[asterisk-commits] kpfleming: branch 1.6.1 r221602 - in /branches/1.6.1: ./ configs/ main/

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Thu Oct  1 11:19:43 2009
New Revision: 221602

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=221602
Log:
Merged revisions 221592 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r221592 | kpfleming | 2009-10-01 11:16:09 -0500 (Thu, 01 Oct 2009) | 12 lines
  
  Remove ability to control T.38 FAX error correction from udptl.conf.
  
  chan_sip has had the ability to control T.38 FAX error correction mode on a per-peer
  (or global) basis for a couple of releases now, which is where it should have been
  all along. This patch removes the ability to configure it in udptl.conf, but issues
  a warning if the user tries to do, telling them to look at sip.conf.sample for how
  to configure it now. For any SIP peers that are T.38 enabled in sip.conf, there is
  already a default for FEC error correction even if the user does not specify any mode,
  so this change will not turn off error correction by default, it will have the same
  default value that has been in the udptl.conf sample file.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/UPGRADE.txt
    branches/1.6.1/configs/udptl.conf.sample
    branches/1.6.1/main/udptl.c

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

Modified: branches/1.6.1/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/UPGRADE.txt?view=diff&rev=221602&r1=221601&r2=221602
==============================================================================
--- branches/1.6.1/UPGRADE.txt (original)
+++ branches/1.6.1/UPGRADE.txt Thu Oct  1 11:19:43 2009
@@ -25,6 +25,10 @@
   install the firmware into its proper location, place the firmware in the
   contrib/firmware/iax/ directory in the Asterisk source tree before running
   "make install".
+
+* T.38 FAX error correction mode can no longer be configured in udptl.conf;
+  instead, it is configured on a per-peer (or global) basis in sip.conf, with
+  the same default as was present in udptl.conf.sample.
 
 As of 1.6.1.6:
 

Modified: branches/1.6.1/configs/udptl.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/configs/udptl.conf.sample?view=diff&rev=221602&r1=221601&r2=221602
==============================================================================
--- branches/1.6.1/configs/udptl.conf.sample (original)
+++ branches/1.6.1/configs/udptl.conf.sample Thu Oct  1 11:19:43 2009
@@ -11,11 +11,6 @@
 ; Whether to enable or disable UDP checksums on UDPTL traffic
 ;
 ;udptlchecksums=no
-;
-; The error correction type to be sent
-;
-T38FaxUdpEC = t38UDPFEC
-;T38FaxUdpEC = t38UDPRedundancy
 ;
 ; The maximum length of a UDPTL packet
 ;

Modified: branches/1.6.1/main/udptl.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/udptl.c?view=diff&rev=221602&r1=221601&r2=221602
==============================================================================
--- branches/1.6.1/main/udptl.c (original)
+++ branches/1.6.1/main/udptl.c Thu Oct  1 11:19:43 2009
@@ -81,7 +81,6 @@
 #ifdef SO_NO_CHECK
 static int nochecksums;
 #endif
-static enum ast_t38_ec_modes udptlfectype;
 static int udptlfecentries;
 static int udptlfecspan;
 static int udptlmaxdatagram;
@@ -866,7 +865,6 @@
 	if (!(udptl = ast_calloc(1, sizeof(*udptl))))
 		return NULL;
 
-	udptl->error_correction_scheme = udptlfectype;
 	udptl->error_correction_span = udptlfecspan;
 	udptl->error_correction_entries = udptlfecentries;
 	
@@ -1326,7 +1324,6 @@
 
 	udptlstart = 4500;
 	udptlend = 4999;
-	udptlfectype = UDPTL_ERROR_CORRECTION_NONE;
 	udptlfecentries = 0;
 	udptlfecspan = 0;
 	udptlmaxdatagram = 0;
@@ -1367,10 +1364,7 @@
 #endif
 		}
 		if ((s = ast_variable_retrieve(cfg, "general", "T38FaxUdpEC"))) {
-			if (strcmp(s, "t38UDPFEC") == 0)
-				udptlfectype = UDPTL_ERROR_CORRECTION_FEC;
-			else if (strcmp(s, "t38UDPRedundancy") == 0)
-				udptlfectype = UDPTL_ERROR_CORRECTION_REDUNDANCY;
+			ast_log(LOG_WARNING, "T38FaxUdpEC in udptl.conf is no longer supported; use the t38pt_udptl configuration option in sip.conf instead.\n");
 		}
 		if ((s = ast_variable_retrieve(cfg, "general", "T38FaxMaxDatagram"))) {
 			udptlmaxdatagram = atoi(s);