mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-01 04:11:52 +02:00
79c8117684
Bump to the current version of PPP. A few of the patches are either in 2.4.5 or something functionally equivalent is, so those patches were removed. 1 patch was added to accommodate pppol2pv3_addr which is referenced in a linux kernel header file, but isn't defined in the kernel header files packaged with PPP. Redux: re-instate the commenting out of the exponential back-off as requested by Felix. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27818 3c298f89-4303-0410-b956-a3cf2f4a3e73
33 lines
1.5 KiB
Diff
33 lines
1.5 KiB
Diff
--- a/pppd/pppd.h
|
|
+++ b/pppd/pppd.h
|
|
@@ -309,7 +309,6 @@ extern int holdoff; /* Dead time before
|
|
extern bool holdoff_specified; /* true if user gave a holdoff value */
|
|
extern bool notty; /* Stdin/out is not a tty */
|
|
extern char *pty_socket; /* Socket to connect to pty */
|
|
-extern char *record_file; /* File to record chars sent/received */
|
|
extern bool sync_serial; /* Device is synchronous serial device */
|
|
extern int maxfail; /* Max # of unsuccessful connection attempts */
|
|
extern char linkname[MAXPATHLEN]; /* logical name for link */
|
|
--- a/pppd/tty.c
|
|
+++ b/pppd/tty.c
|
|
@@ -145,7 +145,7 @@ char *disconnect_script = NULL; /* Scrip
|
|
char *welcomer = NULL; /* Script to run after phys link estab. */
|
|
char *ptycommand = NULL; /* Command to run on other side of pty */
|
|
bool notty = 0; /* Stdin/out is not a tty */
|
|
-char *record_file = NULL; /* File to record chars sent/received */
|
|
+static char *const record_file = NULL; /* File to record chars sent/received */
|
|
int max_data_rate; /* max bytes/sec through charshunt */
|
|
bool sync_serial = 0; /* Device is synchronous serial device */
|
|
char *pty_socket = NULL; /* Socket to connect to pty */
|
|
@@ -201,8 +201,10 @@ option_t tty_options[] = {
|
|
"Send and receive over socket, arg is host:port",
|
|
OPT_PRIO | OPT_DEVNAM },
|
|
|
|
+#if 0
|
|
{ "record", o_string, &record_file,
|
|
"Record characters sent/received to file", OPT_PRIO },
|
|
+#endif
|
|
|
|
{ "crtscts", o_int, &crtscts,
|
|
"Set hardware (RTS/CTS) flow control",
|