OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 10... Line 10...
10   10  
Line 11... Line 11...
11 Signed-off-by: Jo-Philipp Wich <jo@mein.io> 11 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
12   12  
13 --- a/pppd/main.c 13 --- a/pppd/main.c
Line 14... Line 14...
14 +++ b/pppd/main.c 14 +++ b/pppd/main.c
15 @@ -310,6 +310,8 @@ main(argc, argv) 15 @@ -318,6 +318,8 @@ main(argc, argv)
16 16
17 strlcpy(path_ipup, _PATH_IPUP, sizeof(path_ipup)); 17 strlcpy(path_ipup, _PATH_IPUP, sizeof(path_ipup));
Line 18... Line 18...
18 strlcpy(path_ipdown, _PATH_IPDOWN, sizeof(path_ipdown)); 18 strlcpy(path_ipdown, _PATH_IPDOWN, sizeof(path_ipdown));
19 + strlcpy(path_ipv6up, _PATH_IPV6UP, sizeof(path_ipv6up)); 19 + strlcpy(path_ipv6up, _PATH_IPV6UP, sizeof(path_ipv6up));
20 + strlcpy(path_ipv6down, _PATH_IPV6DOWN, sizeof(path_ipv6down)); 20 + strlcpy(path_ipv6down, _PATH_IPV6DOWN, sizeof(path_ipv6down));
21 21
22 link_stats_valid = 0; 22 link_stats_valid = 0;
23 new_phase(PHASE_INITIALIZE); 23 new_phase(PHASE_INITIALIZE);
24 --- a/pppd/options.c 24 --- a/pppd/options.c
25 +++ b/pppd/options.c 25 +++ b/pppd/options.c
26 @@ -120,6 +120,8 @@ int req_unit = -1; /* requested interfa 26 @@ -116,6 +116,8 @@ int connect_delay = 1000; /* wait this m
27 char req_ifname[MAXIFNAMELEN]; /* requested interface name */ 27 int req_unit = -1; /* requested interface unit */
28 char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */ 28 char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */
29 char path_ipdown[MAXPATHLEN];/* pathname of ip-down script */ 29 char path_ipdown[MAXPATHLEN];/* pathname of ip-down script */
30 +char path_ipv6up[MAXPATHLEN]; /* pathname of ipv6-up script */ 30 +char path_ipv6up[MAXPATHLEN]; /* pathname of ipv6-up script */
31 +char path_ipv6down[MAXPATHLEN];/* pathname of ipv6-down script */ 31 +char path_ipv6down[MAXPATHLEN];/* pathname of ipv6-down script */
32 bool multilink = 0; /* Enable multilink operation */ 32 bool multilink = 0; /* Enable multilink operation */
33 char *bundle_name = NULL; /* bundle name for multilink */ 33 char *bundle_name = NULL; /* bundle name for multilink */
Line 34... Line 34...
34 bool dump_options; /* print out option values */ 34 bool dump_options; /* print out option values */
35 @@ -326,6 +328,13 @@ option_t general_options[] = { 35 @@ -308,6 +310,13 @@ option_t general_options[] = {
Line 82... Line 82...
82 } 82 }
83 break; 83 break;
84 } 84 }
85 --- a/pppd/pppd.h 85 --- a/pppd/pppd.h
86 +++ b/pppd/pppd.h 86 +++ b/pppd/pppd.h
87 @@ -334,6 +334,8 @@ extern int req_unit; /* interface unit n 87 @@ -320,6 +320,8 @@ extern int max_data_rate; /* max bytes/s
88 extern char req_ifname[MAXIFNAMELEN]; /* interface name to use */ 88 extern int req_unit; /* interface unit number to use */
89 extern char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */ 89 extern char path_ipup[MAXPATHLEN]; /* pathname of ip-up script */
90 extern char path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */ 90 extern char path_ipdown[MAXPATHLEN]; /* pathname of ip-down script */
91 +extern char path_ipv6up[MAXPATHLEN]; /* pathname of ipv6-up script */ 91 +extern char path_ipv6up[MAXPATHLEN]; /* pathname of ipv6-up script */
92 +extern char path_ipv6down[MAXPATHLEN]; /* pathname of ipv6-down script */ 92 +extern char path_ipv6down[MAXPATHLEN]; /* pathname of ipv6-down script */
93 extern bool multilink; /* enable multilink operation */ 93 extern bool multilink; /* enable multilink operation */