OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 6... Line 6...
6 pppd/multilink.c | 55 +++++++++++++++++++++++++++++++++------------ 6 pppd/multilink.c | 55 +++++++++++++++++++++++++++++++++------------
7 pppd/sys-linux.c | 12 +++++++++ 7 pppd/sys-linux.c | 12 +++++++++
8 2 files changed, 53 insertions(+), 14 deletions(-) 8 2 files changed, 53 insertions(+), 14 deletions(-)
9 --- a/pppd/multilink.c 9 --- a/pppd/multilink.c
10 +++ b/pppd/multilink.c 10 +++ b/pppd/multilink.c
11 @@ -35,6 +35,7 @@ -  
12 #include <signal.h> -  
13 #include <netinet/in.h> -  
14 #include <unistd.h> -  
15 +#include <net/if.h> -  
16 -  
17 #include "pppd.h" -  
18 #include "fsm.h" -  
19 @@ -56,7 +57,8 @@ static void iterate_bundle_links __P((vo 11 @@ -56,7 +56,8 @@ static void iterate_bundle_links __P((vo
Line 20... Line 12...
20 12
21 static int get_default_epdisc __P((struct epdisc *)); 13 static int get_default_epdisc __P((struct epdisc *));
22 static int parse_num __P((char *str, const char *key, int *valp)); 14 static int parse_num __P((char *str, const char *key, int *valp));
23 -static int owns_unit __P((TDB_DATA pid, int unit)); 15 -static int owns_unit __P((TDB_DATA pid, int unit));
24 +static int parse_str __P((char *str, const char *key, char *buf, int buflen)); 16 +static int parse_str __P((char *str, const char *key, char *buf, int buflen));
Line 25... Line 17...
25 +static int owns_link __P((TDB_DATA pid, char *ifname)); 17 +static int owns_link __P((TDB_DATA pid, char *ifname));
26 18
27 #define set_ip_epdisc(ep, addr) do { \ 19 #define set_ip_epdisc(ep, addr) do { \
28 ep->length = 4; \ 20 ep->length = 4; \
29 @@ -197,35 +199,38 @@ mp_join_bundle() 21 @@ -197,35 +198,38 @@ mp_join_bundle()
30 key.dptr = bundle_id; 22 key.dptr = bundle_id;
31 key.dsize = p - bundle_id; 23 key.dsize = p - bundle_id;
32 pid = tdb_fetch(pppdb, key); 24 pid = tdb_fetch(pppdb, key);
Line 71... Line 63...
71 } 63 }
72 - /* attach failed because bundle doesn't exist */ 64 - /* attach failed because bundle doesn't exist */
73 } 65 }
Line 74... Line 66...
74 66
75 /* we have to make a new bundle */ 67 /* we have to make a new bundle */
76 @@ -408,22 +413,45 @@ parse_num(str, key, valp) 68 @@ -408,22 +412,45 @@ parse_num(str, key, valp)
77 return 0; 69 return 0;
Line 78... Line 70...
78 } 70 }
79 71
Line 124... Line 116...
124 if (vd.dptr != NULL) { 116 if (vd.dptr != NULL) {
125 ret = vd.dsize == key.dsize 117 ret = vd.dsize == key.dsize
126 && memcmp(vd.dptr, key.dptr, vd.dsize) == 0; 118 && memcmp(vd.dptr, key.dptr, vd.dsize) == 0;
127 --- a/pppd/sys-linux.c 119 --- a/pppd/sys-linux.c
128 +++ b/pppd/sys-linux.c 120 +++ b/pppd/sys-linux.c
129 @@ -686,6 +686,16 @@ void cfg_bundle(int mrru, int mtru, int 121 @@ -698,6 +698,16 @@ void cfg_bundle(int mrru, int mtru, int
130 add_fd(ppp_dev_fd); 122 add_fd(ppp_dev_fd);
131 } 123 }
Line 132... Line 124...
132 124
133 +static void 125 +static void
Line 141... Line 133...
141 +} 133 +}
142 + 134 +
143 /* 135 /*
144 * make_new_bundle - create a new PPP unit (i.e. a bundle) 136 * make_new_bundle - create a new PPP unit (i.e. a bundle)
145 * and connect our channel to it. This should only get called 137 * and connect our channel to it. This should only get called
146 @@ -704,6 +714,8 @@ void make_new_bundle(int mrru, int mtru, 138 @@ -716,6 +726,8 @@ void make_new_bundle(int mrru, int mtru,
Line 147... Line 139...
147 139
148 /* set the mrru and flags */ 140 /* set the mrru and flags */
149 cfg_bundle(mrru, mtru, rssn, tssn); 141 cfg_bundle(mrru, mtru, rssn, tssn);
150 + 142 +