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.

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

diff --git a/configs/udptl.conf.sample b/configs/udptl.conf.sample
index 706994c..97df842 100644 (file)
--- a/configs/udptl.conf.sample
+++ b/configs/udptl.conf.sample
@@ -12,11 +12,6 @@ udptlend=4999
 ;
 ;udptlchecksums=no
 ;
-; The error correction type to be sent
-;
-T38FaxUdpEC = t38UDPFEC
-;T38FaxUdpEC = t38UDPRedundancy
-;
 ; The maximum length of a UDPTL packet
 ;
 T38FaxMaxDatagram = 400

diff --git a/main/udptl.c b/main/udptl.c
index 22bd13e..edaa3c7 100644 (file)
--- a/main/udptl.c
+++ b/main/udptl.c
@@ -81,7 +81,6 @@ static struct sockaddr_in udptldebugaddr;   /*!< Debug packets to/from this host
 #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 @@ struct ast_udptl *ast_udptl_new_with_bindaddr(struct sched_context *sched, struc
        if (!(udptl = ast_calloc(1, sizeof(*udptl))))
                return NULL;
 
-       udptl->error_correction_scheme = udptlfectype;
        udptl->error_correction_span = udptlfecspan;
        udptl->error_correction_entries = udptlfecentries;
        
@@ -1267,7 +1265,6 @@ static void __ast_udptl_reload(int reload)
 
        udptlstart = 4500;
        udptlend = 4999;
-       udptlfectype = UDPTL_ERROR_CORRECTION_NONE;
        udptlfecentries = 0;
        udptlfecspan = 0;
        udptlmaxdatagram = 0;
@@ -1308,10 +1305,7 @@ static void __ast_udptl_reload(int reload)
 #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);