[svn-commits] kpfleming: branch 1.4 r3476 - in /branches/1.4: ./ ppp/zaptel.c

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Thu Dec 13 16:59:45 2007
New Revision: 3476

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3476
Log:
Merged revisions 3475 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r3475 | kpfleming | 2007-12-13 16:59:16 -0600 (Thu, 13 Dec 2007) | 2 lines

remove some code that is not compatible with modern versions of pppd

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/ppp/zaptel.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/ppp/zaptel.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/ppp/zaptel.c?view=diff&rev=3476&r1=3475&r2=3476
==============================================================================
--- branches/1.4/ppp/zaptel.c (original)
+++ branches/1.4/ppp/zaptel.c Thu Dec 13 16:59:45 2007
@@ -44,56 +44,6 @@
 
 #define ZAP_MTU	(ZT_DEFAULT_MTU_MRU - 16)
 extern int kill_link;
-static char *bad_options[] = {
-    "noaccomp",
-    "-ac",
-    "default-asyncmap",
-    "-am",
-    "asyncmap",
-    "-as",
-    "escape",
-    "multilink",
-    "receive-all",
-    "crtscts",
-    "-crtscts",
-    "nocrtscts",
-    "cdtrcts",
-    "nocdtrcts",
-    "xonxoff",
-    "modem",
-    "local",
-    "sync",
-    "deflate",
-    "nodeflate",
-    "vj",
-    "novj",
-    "nobsdcomp",
-    "bsdcomp",
-    "-bsdcomp",
-    NULL
-};
-#if 0
-static char *bad_options[] = {
-    "noaccomp",
-    "-ac",
-    "default-asyncmap",
-    "-am",
-    "asyncmap",
-    "-as",
-    "escape",
-    "receive-all",
-    "crtscts",
-    "-crtscts",
-    "nocrtscts",
-    "cdtrcts",
-    "nocdtrcts",
-    "xonxoff",
-    "modem",
-    "local",
-    "sync",
-    NULL
-};
-#endif
 int     retries = 0;
 
 int setdevname_zaptel(const char *cp);
@@ -283,11 +233,6 @@
 
 	the_channel = &zaptel_channel;
 
-	{
-	    char **a;
-	    for (a = bad_options; *a != NULL; a++)
-		remove_option(*a);
-	}
 	modem = 0;
 
 	lcp_allowoptions[0].neg_accompression = 0;