From 097635b79bc6ddd6066a8369db6e298a25daa96e Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 24 Aug 2004 23:50:14 +0000
Subject: massive changes - sstrip cleanup from mjn3 - various patches from
 nico and others: http://openwrt.org/forum/viewtopic.php?t=368

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@145 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../openwrt/patches/ppp/018_ip-up_option.diff      | 98 ++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 obsolete-buildroot/sources/openwrt/patches/ppp/018_ip-up_option.diff

(limited to 'obsolete-buildroot/sources/openwrt/patches/ppp/018_ip-up_option.diff')

diff --git a/obsolete-buildroot/sources/openwrt/patches/ppp/018_ip-up_option.diff b/obsolete-buildroot/sources/openwrt/patches/ppp/018_ip-up_option.diff
new file mode 100644
index 000000000..0dee9248e
--- /dev/null
+++ b/obsolete-buildroot/sources/openwrt/patches/ppp/018_ip-up_option.diff
@@ -0,0 +1,98 @@
+--- ppp-2.4.1/pppd/ipcp.c	Thu Mar  8 06:11:12 2001
++++ ppp-2.4.1-new/pppd/ipcp.c	Tue Jun 19 15:35:36 2001
+@@ -1734,7 +1734,7 @@
+      */
+     if (ipcp_script_state == s_down && ipcp_script_pid == 0) {
+ 	ipcp_script_state = s_up;
+-	ipcp_script(_PATH_IPUP);
++	ipcp_script(path_ipup);
+     }
+ }
+ 
+@@ -1777,7 +1777,7 @@
+     /* Execute the ip-down script */
+     if (ipcp_script_state == s_up && ipcp_script_pid == 0) {
+ 	ipcp_script_state = s_down;
+-	ipcp_script(_PATH_IPDOWN);
++	ipcp_script(path_ipdown);
+     }
+ }
+ 
+@@ -1828,13 +1828,13 @@
+     case s_up:
+ 	if (ipcp_fsm[0].state != OPENED) {
+ 	    ipcp_script_state = s_down;
+-	    ipcp_script(_PATH_IPDOWN);
++	    ipcp_script(path_ipdown);
+ 	}
+ 	break;
+     case s_down:
+ 	if (ipcp_fsm[0].state == OPENED) {
+ 	    ipcp_script_state = s_up;
+-	    ipcp_script(_PATH_IPUP);
++	    ipcp_script(path_ipup);
+ 	}
+ 	break;
+     }
+
+--- ppp-2.4.1/pppd/main.c	Tue Mar 13 06:56:19 2001
++++ ppp-2.4.1-new/pppd/main.c	Tue Jun 19 15:35:36 2001
+@@ -233,6 +233,9 @@
+     struct protent *protp;
+     char numbuf[16];
+ 
++    strlcpy(path_ipup, "/etc/ppp/ip-up", sizeof(path_ipup));
++    strlcpy(path_ipdown, "/etc/ppp/ip-down", sizeof(path_ipdown));
++
+     link_stats_valid = 0;
+     new_phase(PHASE_INITIALIZE);
+ 
+
+--- ppp-2.4.1/pppd/options.c	Tue Mar 13 06:56:19 2001
++++ ppp-2.4.1-new/pppd/options.c	Tue Jun 19 15:38:32 2001
+@@ -85,6 +85,8 @@
+ bool	dump_options;		/* print out option values */
+ bool	dryrun;			/* print out option values and exit */
+ char	*domain;		/* domain name set by domain option */
++char	path_ipup[MAXPATHLEN];  /* pathname of ip-up script */
++char	path_ipdown[MAXPATHLEN];/* pathname of ip-down script */
+ 
+ extern option_t auth_options[];
+ extern struct stat devstat;
+@@ -231,6 +233,12 @@
+       "Print out option values after parsing all options", 1 },
+     { "dryrun", o_bool, &dryrun,
+       "Stop after parsing, printing, and checking options", 1 },
++    { "ip-up-script", o_string, path_ipup,
++      "Set pathname of ip-up script",
++      OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN },
++    { "ip-down-script", o_string, path_ipdown,
++      "Set pathname of ip-down script",
++      OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN },
+ 
+ #ifdef HAVE_MULTILINK
+     { "multilink", o_bool, &multilink,
+
+--- ppp-2.4.1/pppd/pathnames.h	Thu Mar  8 06:15:37 2001
++++ ppp-2.4.1-new/pppd/pathnames.h	Tue Jun 19 15:35:36 2001
+@@ -21,8 +21,6 @@
+ #define _PATH_UPAPFILE 	 _ROOT_PATH "/etc/ppp/pap-secrets"
+ #define _PATH_CHAPFILE 	 _ROOT_PATH "/etc/ppp/chap-secrets"
+ #define _PATH_SYSOPTIONS _ROOT_PATH "/etc/ppp/options"
+-#define _PATH_IPUP	 _ROOT_PATH "/etc/ppp/ip-up"
+-#define _PATH_IPDOWN	 _ROOT_PATH "/etc/ppp/ip-down"
+ #define _PATH_AUTHUP	 _ROOT_PATH "/etc/ppp/auth-up"
+ #define _PATH_AUTHDOWN	 _ROOT_PATH "/etc/ppp/auth-down"
+ #define _PATH_TTYOPT	 _ROOT_PATH "/etc/ppp/options."
+
+--- ppp-2.4.1/pppd/pppd.h	Tue Mar 13 06:54:37 2001
++++ ppp-2.4.1-new/pppd/pppd.h	Tue Jun 19 15:39:39 2001
+@@ -272,6 +272,8 @@
+ extern char	*bundle_name;	/* bundle name for multilink */
+ extern bool	dump_options;	/* print out option values */
+ extern bool	dryrun;		/* check everything, print options, exit */
++extern char	path_ipup[MAXPATHLEN];  /* pathname of ip-up script */
++extern char	path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */
+ 
+ #ifdef PPP_FILTER
+ extern struct	bpf_program pass_filter;   /* Filter for pkts to pass */
-- 
cgit v1.2.3