OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 46... Line 46...
46 } 46 }
47 break; 47 break;
48 } 48 }
49 --- a/pppd/main.c 49 --- a/pppd/main.c
50 +++ b/pppd/main.c 50 +++ b/pppd/main.c
51 @@ -308,6 +308,9 @@ main(argc, argv) 51 @@ -316,6 +316,9 @@ main(argc, argv)
52 struct protent *protp; 52 struct protent *protp;
53 char numbuf[16]; 53 char numbuf[16];
Line 54... Line 54...
54 54
55 + strlcpy(path_ipup, _PATH_IPUP, sizeof(path_ipup)); 55 + strlcpy(path_ipup, _PATH_IPUP, sizeof(path_ipup));
Line 58... Line 58...
58 link_stats_valid = 0; 58 link_stats_valid = 0;
59 new_phase(PHASE_INITIALIZE); 59 new_phase(PHASE_INITIALIZE);
Line 60... Line 60...
60 60
61 --- a/pppd/options.c 61 --- a/pppd/options.c
-   62 +++ b/pppd/options.c
62 +++ b/pppd/options.c 63 @@ -114,6 +114,8 @@ char linkname[MAXPATHLEN]; /* logical na
63 @@ -118,6 +118,8 @@ bool tune_kernel; /* may alter kernel s 64 bool tune_kernel; /* may alter kernel settings */
64 int connect_delay = 1000; /* wait this many ms after connect script */ 65 int connect_delay = 1000; /* wait this many ms after connect script */
65 int req_unit = -1; /* requested interface unit */ -  
66 char req_ifname[MAXIFNAMELEN]; /* requested interface name */ 66 int req_unit = -1; /* requested interface unit */
67 +char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */ 67 +char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */
68 +char path_ipdown[MAXPATHLEN];/* pathname of ip-down script */ 68 +char path_ipdown[MAXPATHLEN];/* pathname of ip-down script */
69 bool multilink = 0; /* Enable multilink operation */ 69 bool multilink = 0; /* Enable multilink operation */
70 char *bundle_name = NULL; /* bundle name for multilink */ 70 char *bundle_name = NULL; /* bundle name for multilink */
71 bool dump_options; /* print out option values */ 71 bool dump_options; /* print out option values */
72 @@ -317,6 +319,13 @@ option_t general_options[] = { 72 @@ -299,6 +301,13 @@ option_t general_options[] = {
73 "Metric to use for the default route (Linux only; -1 for default behavior)", 73 "Unset user environment variable",
Line 74... Line 74...
74 OPT_PRIV|OPT_LLIMIT|OPT_INITONLY, NULL, 0, -1 }, 74 OPT_A2PRINTER | OPT_NOPRINT, (void *)user_unsetprint },
75 75
76 + { "ip-up-script", o_string, path_ipup, 76 + { "ip-up-script", o_string, path_ipup,
77 + "Set pathname of ip-up script", 77 + "Set pathname of ip-up script",
Line 83... Line 83...
83 #ifdef HAVE_MULTILINK 83 #ifdef HAVE_MULTILINK
84 { "multilink", o_bool, &multilink, 84 { "multilink", o_bool, &multilink,
85 "Enable multilink operation", OPT_PRIO | 1 }, 85 "Enable multilink operation", OPT_PRIO | 1 },
86 --- a/pppd/pppd.h 86 --- a/pppd/pppd.h
87 +++ b/pppd/pppd.h 87 +++ b/pppd/pppd.h
88 @@ -332,6 +332,8 @@ extern int connect_delay; /* Time to del 88 @@ -318,6 +318,8 @@ extern bool tune_kernel; /* May alter ke
-   89 extern int connect_delay; /* Time to delay after connect script */
89 extern int max_data_rate; /* max bytes/sec through charshunt */ 90 extern int max_data_rate; /* max bytes/sec through charshunt */
90 extern int req_unit; /* interface unit number to use */ 91 extern int req_unit; /* interface unit number to use */
91 extern char req_ifname[MAXIFNAMELEN]; /* interface name to use */ -  
92 +extern char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */ 92 +extern char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */
93 +extern char path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */ 93 +extern char path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */
94 extern bool multilink; /* enable multilink operation */ 94 extern bool multilink; /* enable multilink operation */
95 extern bool noendpoint; /* don't send or accept endpt. discrim. */ 95 extern bool noendpoint; /* don't send or accept endpt. discrim. */
96 extern char *bundle_name; /* bundle name for multilink */ 96 extern char *bundle_name; /* bundle name for multilink */