Diff markup
1 /* 1 /*
2 * Anycast support for IPv6 2 * Anycast support for IPv6
3 * Linux INET6 implementation !! 3 * Linux INET6 implementation
4 * 4 *
5 * Authors: 5 * Authors:
6 * David L Stevens (dlstevens@us.ibm.com) 6 * David L Stevens (dlstevens@us.ibm.com)
7 * 7 *
8 * based heavily on net/ipv6/mcast.c 8 * based heavily on net/ipv6/mcast.c
9 * 9 *
10 * This program is free software; you can 10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU G 11 * modify it under the terms of the GNU General Public License
12 * as published by the Free Software Foun 12 * as published by the Free Software Foundation; either version
13 * 2 of the License, or (at your option) 13 * 2 of the License, or (at your option) any later version.
14 */ 14 */
15 15
16 #include <linux/capability.h> !! 16 #include <linux/config.h>
17 #include <linux/module.h> 17 #include <linux/module.h>
18 #include <linux/errno.h> 18 #include <linux/errno.h>
19 #include <linux/types.h> 19 #include <linux/types.h>
20 #include <linux/random.h> 20 #include <linux/random.h>
21 #include <linux/string.h> 21 #include <linux/string.h>
22 #include <linux/socket.h> 22 #include <linux/socket.h>
23 #include <linux/sockios.h> 23 #include <linux/sockios.h>
>> 24 #include <linux/sched.h>
24 #include <linux/net.h> 25 #include <linux/net.h>
25 #include <linux/in6.h> 26 #include <linux/in6.h>
26 #include <linux/netdevice.h> 27 #include <linux/netdevice.h>
27 #include <linux/if_arp.h> 28 #include <linux/if_arp.h>
28 #include <linux/route.h> 29 #include <linux/route.h>
29 #include <linux/init.h> 30 #include <linux/init.h>
30 #include <linux/proc_fs.h> 31 #include <linux/proc_fs.h>
31 #include <linux/seq_file.h> 32 #include <linux/seq_file.h>
32 33
33 #include <net/net_namespace.h> <<
34 #include <net/sock.h> 34 #include <net/sock.h>
35 #include <net/snmp.h> 35 #include <net/snmp.h>
36 36
37 #include <net/ipv6.h> 37 #include <net/ipv6.h>
38 #include <net/protocol.h> 38 #include <net/protocol.h>
39 #include <net/if_inet6.h> 39 #include <net/if_inet6.h>
40 #include <net/ndisc.h> 40 #include <net/ndisc.h>
41 #include <net/addrconf.h> 41 #include <net/addrconf.h>
42 #include <net/ip6_route.h> 42 #include <net/ip6_route.h>
43 43
44 #include <net/checksum.h> 44 #include <net/checksum.h>
45 45
46 static int ipv6_dev_ac_dec(struct net_device * 46 static int ipv6_dev_ac_dec(struct net_device *dev, struct in6_addr *addr);
47 47
48 /* Big ac list lock for all the sockets */ 48 /* Big ac list lock for all the sockets */
49 static DEFINE_RWLOCK(ipv6_sk_ac_lock); 49 static DEFINE_RWLOCK(ipv6_sk_ac_lock);
50 50
>> 51 /* XXX ip6_addr_match() and ip6_onlink() really belong in net/core.c */
>> 52
>> 53 static int
>> 54 ip6_addr_match(struct in6_addr *addr1, struct in6_addr *addr2, int prefix)
>> 55 {
>> 56 __u32 mask;
>> 57 int i;
>> 58
>> 59 if (prefix > 128 || prefix < 0)
>> 60 return 0;
>> 61 if (prefix == 0)
>> 62 return 1;
>> 63 for (i=0; i<4; ++i) {
>> 64 if (prefix >= 32)
>> 65 mask = ~0;
>> 66 else
>> 67 mask = htonl(~0 << (32 - prefix));
>> 68 if ((addr1->s6_addr32[i] ^ addr2->s6_addr32[i]) & mask)
>> 69 return 0;
>> 70 prefix -= 32;
>> 71 if (prefix <= 0)
>> 72 break;
>> 73 }
>> 74 return 1;
>> 75 }
>> 76
51 static int 77 static int
52 ip6_onlink(struct in6_addr *addr, struct net_d 78 ip6_onlink(struct in6_addr *addr, struct net_device *dev)
53 { 79 {
54 struct inet6_dev *idev; 80 struct inet6_dev *idev;
55 struct inet6_ifaddr *ifa; 81 struct inet6_ifaddr *ifa;
56 int onlink; 82 int onlink;
57 83
58 onlink = 0; 84 onlink = 0;
59 rcu_read_lock(); !! 85 read_lock(&addrconf_lock);
60 idev = __in6_dev_get(dev); 86 idev = __in6_dev_get(dev);
61 if (idev) { 87 if (idev) {
62 read_lock_bh(&idev->lock); 88 read_lock_bh(&idev->lock);
63 for (ifa=idev->addr_list; ifa; 89 for (ifa=idev->addr_list; ifa; ifa=ifa->if_next) {
64 onlink = ipv6_prefix_e !! 90 onlink = ip6_addr_match(addr, &ifa->addr,
65 !! 91 ifa->prefix_len);
66 if (onlink) 92 if (onlink)
67 break; 93 break;
68 } 94 }
69 read_unlock_bh(&idev->lock); 95 read_unlock_bh(&idev->lock);
70 } 96 }
71 rcu_read_unlock(); !! 97 read_unlock(&addrconf_lock);
72 return onlink; 98 return onlink;
73 } 99 }
74 100
75 /* 101 /*
76 * socket join an anycast group 102 * socket join an anycast group
77 */ 103 */
78 104
79 int ipv6_sock_ac_join(struct sock *sk, int ifi 105 int ipv6_sock_ac_join(struct sock *sk, int ifindex, struct in6_addr *addr)
80 { 106 {
81 struct ipv6_pinfo *np = inet6_sk(sk); 107 struct ipv6_pinfo *np = inet6_sk(sk);
82 struct net_device *dev = NULL; 108 struct net_device *dev = NULL;
83 struct inet6_dev *idev; 109 struct inet6_dev *idev;
84 struct ipv6_ac_socklist *pac; 110 struct ipv6_ac_socklist *pac;
85 int ishost = !ipv6_devconf.forward 111 int ishost = !ipv6_devconf.forwarding;
86 int err = 0; 112 int err = 0;
87 113
88 if (!capable(CAP_NET_ADMIN)) 114 if (!capable(CAP_NET_ADMIN))
89 return -EPERM; 115 return -EPERM;
90 if (ipv6_addr_is_multicast(addr)) 116 if (ipv6_addr_is_multicast(addr))
91 return -EINVAL; 117 return -EINVAL;
92 if (ipv6_chk_addr(&init_net, addr, NUL !! 118 if (ipv6_chk_addr(addr, NULL, 0))
93 return -EINVAL; 119 return -EINVAL;
94 120
95 pac = sock_kmalloc(sk, sizeof(struct i 121 pac = sock_kmalloc(sk, sizeof(struct ipv6_ac_socklist), GFP_KERNEL);
96 if (pac == NULL) 122 if (pac == NULL)
97 return -ENOMEM; 123 return -ENOMEM;
98 pac->acl_next = NULL; 124 pac->acl_next = NULL;
99 ipv6_addr_copy(&pac->acl_addr, addr); 125 ipv6_addr_copy(&pac->acl_addr, addr);
100 126
101 if (ifindex == 0) { 127 if (ifindex == 0) {
102 struct rt6_info *rt; 128 struct rt6_info *rt;
103 129
104 rt = rt6_lookup(addr, NULL, 0, 130 rt = rt6_lookup(addr, NULL, 0, 0);
105 if (rt) { 131 if (rt) {
106 dev = rt->rt6i_dev; 132 dev = rt->rt6i_dev;
107 dev_hold(dev); 133 dev_hold(dev);
108 dst_release(&rt->u.dst 134 dst_release(&rt->u.dst);
109 } else if (ishost) { 135 } else if (ishost) {
110 err = -EADDRNOTAVAIL; 136 err = -EADDRNOTAVAIL;
111 goto out_free_pac; 137 goto out_free_pac;
112 } else { 138 } else {
113 /* router, no matching 139 /* router, no matching interface: just pick one */
114 140
115 dev = dev_get_by_flags !! 141 dev = dev_get_by_flags(IFF_UP, IFF_UP|IFF_LOOPBACK);
116 } 142 }
117 } else 143 } else
118 dev = dev_get_by_index(&init_n !! 144 dev = dev_get_by_index(ifindex);
119 145
120 if (dev == NULL) { 146 if (dev == NULL) {
121 err = -ENODEV; 147 err = -ENODEV;
122 goto out_free_pac; 148 goto out_free_pac;
123 } 149 }
124 150
125 idev = in6_dev_get(dev); 151 idev = in6_dev_get(dev);
126 if (!idev) { 152 if (!idev) {
127 if (ifindex) 153 if (ifindex)
128 err = -ENODEV; 154 err = -ENODEV;
129 else 155 else
130 err = -EADDRNOTAVAIL; 156 err = -EADDRNOTAVAIL;
131 goto out_dev_put; 157 goto out_dev_put;
132 } 158 }
133 /* reset ishost, now that we have a sp 159 /* reset ishost, now that we have a specific device */
134 ishost = !idev->cnf.forwarding; 160 ishost = !idev->cnf.forwarding;
135 in6_dev_put(idev); 161 in6_dev_put(idev);
136 162
137 pac->acl_ifindex = dev->ifindex; 163 pac->acl_ifindex = dev->ifindex;
138 164
139 /* XXX 165 /* XXX
140 * For hosts, allow link-local or matc 166 * For hosts, allow link-local or matching prefix anycasts.
141 * This obviates the need for propagat 167 * This obviates the need for propagating anycast routes while
142 * still allowing some non-router anyc 168 * still allowing some non-router anycast participation.
143 */ 169 */
144 if (!ip6_onlink(addr, dev)) { 170 if (!ip6_onlink(addr, dev)) {
145 if (ishost) 171 if (ishost)
146 err = -EADDRNOTAVAIL; 172 err = -EADDRNOTAVAIL;
147 if (err) 173 if (err)
148 goto out_dev_put; 174 goto out_dev_put;
149 } 175 }
150 176
151 err = ipv6_dev_ac_inc(dev, addr); 177 err = ipv6_dev_ac_inc(dev, addr);
152 if (err) 178 if (err)
153 goto out_dev_put; 179 goto out_dev_put;
154 180
155 write_lock_bh(&ipv6_sk_ac_lock); 181 write_lock_bh(&ipv6_sk_ac_lock);
156 pac->acl_next = np->ipv6_ac_list; 182 pac->acl_next = np->ipv6_ac_list;
157 np->ipv6_ac_list = pac; 183 np->ipv6_ac_list = pac;
158 write_unlock_bh(&ipv6_sk_ac_lock); 184 write_unlock_bh(&ipv6_sk_ac_lock);
159 185
160 dev_put(dev); 186 dev_put(dev);
161 187
162 return 0; 188 return 0;
163 189
164 out_dev_put: 190 out_dev_put:
165 dev_put(dev); 191 dev_put(dev);
166 out_free_pac: 192 out_free_pac:
167 sock_kfree_s(sk, pac, sizeof(*pac)); 193 sock_kfree_s(sk, pac, sizeof(*pac));
168 return err; 194 return err;
169 } 195 }
170 196
171 /* 197 /*
172 * socket leave an anycast group 198 * socket leave an anycast group
173 */ 199 */
174 int ipv6_sock_ac_drop(struct sock *sk, int ifi 200 int ipv6_sock_ac_drop(struct sock *sk, int ifindex, struct in6_addr *addr)
175 { 201 {
176 struct ipv6_pinfo *np = inet6_sk(sk); 202 struct ipv6_pinfo *np = inet6_sk(sk);
177 struct net_device *dev; 203 struct net_device *dev;
178 struct ipv6_ac_socklist *pac, *prev_pa 204 struct ipv6_ac_socklist *pac, *prev_pac;
179 205
180 write_lock_bh(&ipv6_sk_ac_lock); 206 write_lock_bh(&ipv6_sk_ac_lock);
181 prev_pac = NULL; 207 prev_pac = NULL;
182 for (pac = np->ipv6_ac_list; pac; pac 208 for (pac = np->ipv6_ac_list; pac; pac = pac->acl_next) {
183 if ((ifindex == 0 || pac->acl_ 209 if ((ifindex == 0 || pac->acl_ifindex == ifindex) &&
184 ipv6_addr_equal(&pac->acl 210 ipv6_addr_equal(&pac->acl_addr, addr))
185 break; 211 break;
186 prev_pac = pac; 212 prev_pac = pac;
187 } 213 }
188 if (!pac) { 214 if (!pac) {
189 write_unlock_bh(&ipv6_sk_ac_lo 215 write_unlock_bh(&ipv6_sk_ac_lock);
190 return -ENOENT; 216 return -ENOENT;
191 } 217 }
192 if (prev_pac) 218 if (prev_pac)
193 prev_pac->acl_next = pac->acl_ 219 prev_pac->acl_next = pac->acl_next;
194 else 220 else
195 np->ipv6_ac_list = pac->acl_ne 221 np->ipv6_ac_list = pac->acl_next;
196 222
197 write_unlock_bh(&ipv6_sk_ac_lock); 223 write_unlock_bh(&ipv6_sk_ac_lock);
198 224
199 dev = dev_get_by_index(&init_net, pac- !! 225 dev = dev_get_by_index(pac->acl_ifindex);
200 if (dev) { 226 if (dev) {
201 ipv6_dev_ac_dec(dev, &pac->acl 227 ipv6_dev_ac_dec(dev, &pac->acl_addr);
202 dev_put(dev); 228 dev_put(dev);
203 } 229 }
204 sock_kfree_s(sk, pac, sizeof(*pac)); 230 sock_kfree_s(sk, pac, sizeof(*pac));
205 return 0; 231 return 0;
206 } 232 }
207 233
208 void ipv6_sock_ac_close(struct sock *sk) 234 void ipv6_sock_ac_close(struct sock *sk)
209 { 235 {
210 struct ipv6_pinfo *np = inet6_sk(sk); 236 struct ipv6_pinfo *np = inet6_sk(sk);
211 struct net_device *dev = NULL; 237 struct net_device *dev = NULL;
212 struct ipv6_ac_socklist *pac; 238 struct ipv6_ac_socklist *pac;
213 int prev_index; 239 int prev_index;
214 240
215 write_lock_bh(&ipv6_sk_ac_lock); 241 write_lock_bh(&ipv6_sk_ac_lock);
216 pac = np->ipv6_ac_list; 242 pac = np->ipv6_ac_list;
217 np->ipv6_ac_list = NULL; 243 np->ipv6_ac_list = NULL;
218 write_unlock_bh(&ipv6_sk_ac_lock); 244 write_unlock_bh(&ipv6_sk_ac_lock);
219 245
220 prev_index = 0; 246 prev_index = 0;
221 while (pac) { 247 while (pac) {
222 struct ipv6_ac_socklist *next 248 struct ipv6_ac_socklist *next = pac->acl_next;
223 249
224 if (pac->acl_ifindex != prev_i 250 if (pac->acl_ifindex != prev_index) {
225 if (dev) 251 if (dev)
226 dev_put(dev); 252 dev_put(dev);
227 dev = dev_get_by_index !! 253 dev = dev_get_by_index(pac->acl_ifindex);
228 prev_index = pac->acl_ 254 prev_index = pac->acl_ifindex;
229 } 255 }
230 if (dev) 256 if (dev)
231 ipv6_dev_ac_dec(dev, & 257 ipv6_dev_ac_dec(dev, &pac->acl_addr);
232 sock_kfree_s(sk, pac, sizeof(* 258 sock_kfree_s(sk, pac, sizeof(*pac));
233 pac = next; 259 pac = next;
234 } 260 }
235 if (dev) 261 if (dev)
236 dev_put(dev); 262 dev_put(dev);
237 } 263 }
238 264
239 #if 0 265 #if 0
240 /* The function is not used, which is funny. A 266 /* The function is not used, which is funny. Apparently, author
241 * supposed to use it to filter out datagrams 267 * supposed to use it to filter out datagrams inside udp/raw but forgot.
242 * 268 *
243 * It is OK, anycasts are not special comparin 269 * It is OK, anycasts are not special comparing to delivery to unicasts.
244 */ 270 */
245 271
246 int inet6_ac_check(struct sock *sk, struct in6 272 int inet6_ac_check(struct sock *sk, struct in6_addr *addr, int ifindex)
247 { 273 {
248 struct ipv6_ac_socklist *pac; 274 struct ipv6_ac_socklist *pac;
249 struct ipv6_pinfo *np = inet6_sk(sk); 275 struct ipv6_pinfo *np = inet6_sk(sk);
250 int found; 276 int found;
251 277
252 found = 0; 278 found = 0;
253 read_lock(&ipv6_sk_ac_lock); 279 read_lock(&ipv6_sk_ac_lock);
254 for (pac=np->ipv6_ac_list; pac; pac=pa 280 for (pac=np->ipv6_ac_list; pac; pac=pac->acl_next) {
255 if (ifindex && pac->acl_ifinde 281 if (ifindex && pac->acl_ifindex != ifindex)
256 continue; 282 continue;
257 found = ipv6_addr_equal(&pac-> 283 found = ipv6_addr_equal(&pac->acl_addr, addr);
258 if (found) 284 if (found)
259 break; 285 break;
260 } 286 }
261 read_unlock(&ipv6_sk_ac_lock); 287 read_unlock(&ipv6_sk_ac_lock);
262 288
263 return found; 289 return found;
264 } 290 }
265 291
266 #endif 292 #endif
267 293
268 static void aca_put(struct ifacaddr6 *ac) 294 static void aca_put(struct ifacaddr6 *ac)
269 { 295 {
270 if (atomic_dec_and_test(&ac->aca_refcn 296 if (atomic_dec_and_test(&ac->aca_refcnt)) {
271 in6_dev_put(ac->aca_idev); 297 in6_dev_put(ac->aca_idev);
272 dst_release(&ac->aca_rt->u.dst 298 dst_release(&ac->aca_rt->u.dst);
273 kfree(ac); 299 kfree(ac);
274 } 300 }
275 } 301 }
276 302
277 /* 303 /*
278 * device anycast group inc (add if not f 304 * device anycast group inc (add if not found)
279 */ 305 */
280 int ipv6_dev_ac_inc(struct net_device *dev, st 306 int ipv6_dev_ac_inc(struct net_device *dev, struct in6_addr *addr)
281 { 307 {
282 struct ifacaddr6 *aca; 308 struct ifacaddr6 *aca;
283 struct inet6_dev *idev; 309 struct inet6_dev *idev;
284 struct rt6_info *rt; 310 struct rt6_info *rt;
285 int err; 311 int err;
286 312
287 idev = in6_dev_get(dev); 313 idev = in6_dev_get(dev);
288 314
289 if (idev == NULL) 315 if (idev == NULL)
290 return -EINVAL; 316 return -EINVAL;
291 317
292 write_lock_bh(&idev->lock); 318 write_lock_bh(&idev->lock);
293 if (idev->dead) { 319 if (idev->dead) {
294 err = -ENODEV; 320 err = -ENODEV;
295 goto out; 321 goto out;
296 } 322 }
297 323
298 for (aca = idev->ac_list; aca; aca = a 324 for (aca = idev->ac_list; aca; aca = aca->aca_next) {
299 if (ipv6_addr_equal(&aca->aca_ 325 if (ipv6_addr_equal(&aca->aca_addr, addr)) {
300 aca->aca_users++; 326 aca->aca_users++;
301 err = 0; 327 err = 0;
302 goto out; 328 goto out;
303 } 329 }
304 } 330 }
305 331
306 /* 332 /*
307 * not found: create a new one. 333 * not found: create a new one.
308 */ 334 */
309 335
310 aca = kzalloc(sizeof(struct ifacaddr6) !! 336 aca = kmalloc(sizeof(struct ifacaddr6), GFP_ATOMIC);
311 337
312 if (aca == NULL) { 338 if (aca == NULL) {
313 err = -ENOMEM; 339 err = -ENOMEM;
314 goto out; 340 goto out;
315 } 341 }
316 342
317 rt = addrconf_dst_alloc(idev, addr, 1) 343 rt = addrconf_dst_alloc(idev, addr, 1);
318 if (IS_ERR(rt)) { 344 if (IS_ERR(rt)) {
319 kfree(aca); 345 kfree(aca);
320 err = PTR_ERR(rt); 346 err = PTR_ERR(rt);
321 goto out; 347 goto out;
322 } 348 }
323 349
>> 350 memset(aca, 0, sizeof(struct ifacaddr6));
>> 351
324 ipv6_addr_copy(&aca->aca_addr, addr); 352 ipv6_addr_copy(&aca->aca_addr, addr);
325 aca->aca_idev = idev; 353 aca->aca_idev = idev;
326 aca->aca_rt = rt; 354 aca->aca_rt = rt;
327 aca->aca_users = 1; 355 aca->aca_users = 1;
328 /* aca_tstamp should be updated upon c 356 /* aca_tstamp should be updated upon changes */
329 aca->aca_cstamp = aca->aca_tstamp = ji 357 aca->aca_cstamp = aca->aca_tstamp = jiffies;
330 atomic_set(&aca->aca_refcnt, 2); 358 atomic_set(&aca->aca_refcnt, 2);
331 spin_lock_init(&aca->aca_lock); 359 spin_lock_init(&aca->aca_lock);
332 360
333 aca->aca_next = idev->ac_list; 361 aca->aca_next = idev->ac_list;
334 idev->ac_list = aca; 362 idev->ac_list = aca;
335 write_unlock_bh(&idev->lock); 363 write_unlock_bh(&idev->lock);
336 364
337 ip6_ins_rt(rt); !! 365 dst_hold(&rt->u.dst);
>> 366 if (ip6_ins_rt(rt, NULL, NULL))
>> 367 dst_release(&rt->u.dst);
338 368
339 addrconf_join_solict(dev, &aca->aca_ad 369 addrconf_join_solict(dev, &aca->aca_addr);
340 370
341 aca_put(aca); 371 aca_put(aca);
342 return 0; 372 return 0;
343 out: 373 out:
344 write_unlock_bh(&idev->lock); 374 write_unlock_bh(&idev->lock);
345 in6_dev_put(idev); 375 in6_dev_put(idev);
346 return err; 376 return err;
347 } 377 }
348 378
349 /* 379 /*
350 * device anycast group decrement 380 * device anycast group decrement
351 */ 381 */
352 int __ipv6_dev_ac_dec(struct inet6_dev *idev, 382 int __ipv6_dev_ac_dec(struct inet6_dev *idev, struct in6_addr *addr)
353 { 383 {
354 struct ifacaddr6 *aca, *prev_aca; 384 struct ifacaddr6 *aca, *prev_aca;
355 385
356 write_lock_bh(&idev->lock); 386 write_lock_bh(&idev->lock);
357 prev_aca = NULL; 387 prev_aca = NULL;
358 for (aca = idev->ac_list; aca; aca = a 388 for (aca = idev->ac_list; aca; aca = aca->aca_next) {
359 if (ipv6_addr_equal(&aca->aca_ 389 if (ipv6_addr_equal(&aca->aca_addr, addr))
360 break; 390 break;
361 prev_aca = aca; 391 prev_aca = aca;
362 } 392 }
363 if (!aca) { 393 if (!aca) {
364 write_unlock_bh(&idev->lock); 394 write_unlock_bh(&idev->lock);
365 return -ENOENT; 395 return -ENOENT;
366 } 396 }
367 if (--aca->aca_users > 0) { 397 if (--aca->aca_users > 0) {
368 write_unlock_bh(&idev->lock); 398 write_unlock_bh(&idev->lock);
369 return 0; 399 return 0;
370 } 400 }
371 if (prev_aca) 401 if (prev_aca)
372 prev_aca->aca_next = aca->aca_ 402 prev_aca->aca_next = aca->aca_next;
373 else 403 else
374 idev->ac_list = aca->aca_next; 404 idev->ac_list = aca->aca_next;
375 write_unlock_bh(&idev->lock); 405 write_unlock_bh(&idev->lock);
376 addrconf_leave_solict(idev, &aca->aca_ 406 addrconf_leave_solict(idev, &aca->aca_addr);
377 407
378 dst_hold(&aca->aca_rt->u.dst); 408 dst_hold(&aca->aca_rt->u.dst);
379 ip6_del_rt(aca->aca_rt); !! 409 if (ip6_del_rt(aca->aca_rt, NULL, NULL))
>> 410 dst_free(&aca->aca_rt->u.dst);
>> 411 else
>> 412 dst_release(&aca->aca_rt->u.dst);
380 413
381 aca_put(aca); 414 aca_put(aca);
382 return 0; 415 return 0;
383 } 416 }
384 417
385 static int ipv6_dev_ac_dec(struct net_device * 418 static int ipv6_dev_ac_dec(struct net_device *dev, struct in6_addr *addr)
386 { 419 {
387 int ret; 420 int ret;
388 struct inet6_dev *idev = in6_dev_get(d 421 struct inet6_dev *idev = in6_dev_get(dev);
389 if (idev == NULL) 422 if (idev == NULL)
390 return -ENODEV; 423 return -ENODEV;
391 ret = __ipv6_dev_ac_dec(idev, addr); 424 ret = __ipv6_dev_ac_dec(idev, addr);
392 in6_dev_put(idev); 425 in6_dev_put(idev);
393 return ret; 426 return ret;
394 } 427 }
395 !! 428
396 /* 429 /*
397 * check if the interface has this anycas 430 * check if the interface has this anycast address
398 */ 431 */
399 static int ipv6_chk_acast_dev(struct net_devic 432 static int ipv6_chk_acast_dev(struct net_device *dev, struct in6_addr *addr)
400 { 433 {
401 struct inet6_dev *idev; 434 struct inet6_dev *idev;
402 struct ifacaddr6 *aca; 435 struct ifacaddr6 *aca;
403 436
404 idev = in6_dev_get(dev); 437 idev = in6_dev_get(dev);
405 if (idev) { 438 if (idev) {
406 read_lock_bh(&idev->lock); 439 read_lock_bh(&idev->lock);
407 for (aca = idev->ac_list; aca; 440 for (aca = idev->ac_list; aca; aca = aca->aca_next)
408 if (ipv6_addr_equal(&a 441 if (ipv6_addr_equal(&aca->aca_addr, addr))
409 break; 442 break;
410 read_unlock_bh(&idev->lock); 443 read_unlock_bh(&idev->lock);
411 in6_dev_put(idev); 444 in6_dev_put(idev);
412 return aca != NULL; !! 445 return aca != 0;
413 } 446 }
414 return 0; 447 return 0;
415 } 448 }
416 449
417 /* 450 /*
418 * check if given interface (or any, if d 451 * check if given interface (or any, if dev==0) has this anycast address
419 */ 452 */
420 int ipv6_chk_acast_addr(struct net_device *dev 453 int ipv6_chk_acast_addr(struct net_device *dev, struct in6_addr *addr)
421 { 454 {
422 int found = 0; <<
423 <<
424 if (dev) 455 if (dev)
425 return ipv6_chk_acast_dev(dev, 456 return ipv6_chk_acast_dev(dev, addr);
426 read_lock(&dev_base_lock); 457 read_lock(&dev_base_lock);
427 for_each_netdev(&init_net, dev) !! 458 for (dev=dev_base; dev; dev=dev->next)
428 if (ipv6_chk_acast_dev(dev, ad !! 459 if (ipv6_chk_acast_dev(dev, addr))
429 found = 1; <<
430 break; 460 break;
431 } <<
432 read_unlock(&dev_base_lock); 461 read_unlock(&dev_base_lock);
433 return found; !! 462 return dev != 0;
434 } 463 }
435 464
436 465
437 #ifdef CONFIG_PROC_FS 466 #ifdef CONFIG_PROC_FS
438 struct ac6_iter_state { 467 struct ac6_iter_state {
439 struct net_device *dev; 468 struct net_device *dev;
440 struct inet6_dev *idev; 469 struct inet6_dev *idev;
441 }; 470 };
442 471
443 #define ac6_seq_private(seq) ((struct ac6_i 472 #define ac6_seq_private(seq) ((struct ac6_iter_state *)(seq)->private)
444 473
445 static inline struct ifacaddr6 *ac6_get_first( 474 static inline struct ifacaddr6 *ac6_get_first(struct seq_file *seq)
446 { 475 {
447 struct ifacaddr6 *im = NULL; 476 struct ifacaddr6 *im = NULL;
448 struct ac6_iter_state *state = ac6_seq 477 struct ac6_iter_state *state = ac6_seq_private(seq);
449 478
450 state->idev = NULL; !! 479 for (state->dev = dev_base, state->idev = NULL;
451 for_each_netdev(&init_net, state->dev) !! 480 state->dev;
>> 481 state->dev = state->dev->next) {
452 struct inet6_dev *idev; 482 struct inet6_dev *idev;
453 idev = in6_dev_get(state->dev) 483 idev = in6_dev_get(state->dev);
454 if (!idev) 484 if (!idev)
455 continue; 485 continue;
456 read_lock_bh(&idev->lock); 486 read_lock_bh(&idev->lock);
457 im = idev->ac_list; 487 im = idev->ac_list;
458 if (im) { 488 if (im) {
459 state->idev = idev; 489 state->idev = idev;
460 break; 490 break;
461 } 491 }
462 read_unlock_bh(&idev->lock); 492 read_unlock_bh(&idev->lock);
463 in6_dev_put(idev); <<
464 } 493 }
465 return im; 494 return im;
466 } 495 }
467 496
468 static struct ifacaddr6 *ac6_get_next(struct s 497 static struct ifacaddr6 *ac6_get_next(struct seq_file *seq, struct ifacaddr6 *im)
469 { 498 {
470 struct ac6_iter_state *state = ac6_seq 499 struct ac6_iter_state *state = ac6_seq_private(seq);
471 500
472 im = im->aca_next; 501 im = im->aca_next;
473 while (!im) { 502 while (!im) {
474 if (likely(state->idev != NULL 503 if (likely(state->idev != NULL)) {
475 read_unlock_bh(&state- 504 read_unlock_bh(&state->idev->lock);
476 in6_dev_put(state->ide 505 in6_dev_put(state->idev);
477 } 506 }
478 state->dev = next_net_device(s !! 507 state->dev = state->dev->next;
479 if (!state->dev) { 508 if (!state->dev) {
480 state->idev = NULL; 509 state->idev = NULL;
481 break; 510 break;
482 } 511 }
483 state->idev = in6_dev_get(stat 512 state->idev = in6_dev_get(state->dev);
484 if (!state->idev) 513 if (!state->idev)
485 continue; 514 continue;
486 read_lock_bh(&state->idev->loc 515 read_lock_bh(&state->idev->lock);
487 im = state->idev->ac_list; 516 im = state->idev->ac_list;
488 } 517 }
489 return im; 518 return im;
490 } 519 }
491 520
492 static struct ifacaddr6 *ac6_get_idx(struct se 521 static struct ifacaddr6 *ac6_get_idx(struct seq_file *seq, loff_t pos)
493 { 522 {
494 struct ifacaddr6 *im = ac6_get_first(s 523 struct ifacaddr6 *im = ac6_get_first(seq);
495 if (im) 524 if (im)
496 while (pos && (im = ac6_get_ne 525 while (pos && (im = ac6_get_next(seq, im)) != NULL)
497 --pos; 526 --pos;
498 return pos ? NULL : im; 527 return pos ? NULL : im;
499 } 528 }
500 529
501 static void *ac6_seq_start(struct seq_file *se 530 static void *ac6_seq_start(struct seq_file *seq, loff_t *pos)
502 __acquires(dev_base_lock) <<
503 { 531 {
504 read_lock(&dev_base_lock); 532 read_lock(&dev_base_lock);
505 return ac6_get_idx(seq, *pos); 533 return ac6_get_idx(seq, *pos);
506 } 534 }
507 535
508 static void *ac6_seq_next(struct seq_file *seq 536 static void *ac6_seq_next(struct seq_file *seq, void *v, loff_t *pos)
509 { 537 {
510 struct ifacaddr6 *im; 538 struct ifacaddr6 *im;
511 im = ac6_get_next(seq, v); 539 im = ac6_get_next(seq, v);
512 ++*pos; 540 ++*pos;
513 return im; 541 return im;
514 } 542 }
515 543
516 static void ac6_seq_stop(struct seq_file *seq, 544 static void ac6_seq_stop(struct seq_file *seq, void *v)
517 __releases(dev_base_lock) <<
518 { 545 {
519 struct ac6_iter_state *state = ac6_seq 546 struct ac6_iter_state *state = ac6_seq_private(seq);
520 if (likely(state->idev != NULL)) { 547 if (likely(state->idev != NULL)) {
521 read_unlock_bh(&state->idev->l 548 read_unlock_bh(&state->idev->lock);
522 in6_dev_put(state->idev); 549 in6_dev_put(state->idev);
523 } 550 }
524 read_unlock(&dev_base_lock); 551 read_unlock(&dev_base_lock);
525 } 552 }
526 553
527 static int ac6_seq_show(struct seq_file *seq, 554 static int ac6_seq_show(struct seq_file *seq, void *v)
528 { 555 {
529 struct ifacaddr6 *im = (struct ifacadd 556 struct ifacaddr6 *im = (struct ifacaddr6 *)v;
530 struct ac6_iter_state *state = ac6_seq 557 struct ac6_iter_state *state = ac6_seq_private(seq);
531 558
532 seq_printf(seq, 559 seq_printf(seq,
533 "%-4d %-15s " NIP6_SEQFMT " !! 560 "%-4d %-15s "
>> 561 "%04x%04x%04x%04x%04x%04x%04x%04x "
>> 562 "%5d\n",
534 state->dev->ifindex, state- 563 state->dev->ifindex, state->dev->name,
535 NIP6(im->aca_addr), 564 NIP6(im->aca_addr),
536 im->aca_users); 565 im->aca_users);
537 return 0; 566 return 0;
538 } 567 }
539 568
540 static const struct seq_operations ac6_seq_ops !! 569 static struct seq_operations ac6_seq_ops = {
541 .start = ac6_seq_start, 570 .start = ac6_seq_start,
542 .next = ac6_seq_next, 571 .next = ac6_seq_next,
543 .stop = ac6_seq_stop, 572 .stop = ac6_seq_stop,
544 .show = ac6_seq_show, 573 .show = ac6_seq_show,
545 }; 574 };
546 575
547 static int ac6_seq_open(struct inode *inode, s 576 static int ac6_seq_open(struct inode *inode, struct file *file)
548 { 577 {
549 return seq_open_private(file, &ac6_seq !! 578 struct seq_file *seq;
550 sizeof(struct ac6_iter !! 579 int rc = -ENOMEM;
>> 580 struct ac6_iter_state *s = kmalloc(sizeof(*s), GFP_KERNEL);
>> 581
>> 582 if (!s)
>> 583 goto out;
>> 584
>> 585 rc = seq_open(file, &ac6_seq_ops);
>> 586 if (rc)
>> 587 goto out_kfree;
>> 588
>> 589 seq = file->private_data;
>> 590 seq->private = s;
>> 591 memset(s, 0, sizeof(*s));
>> 592 out:
>> 593 return rc;
>> 594 out_kfree:
>> 595 kfree(s);
>> 596 goto out;
551 } 597 }
552 598
553 static const struct file_operations ac6_seq_fo !! 599 static struct file_operations ac6_seq_fops = {
554 .owner = THIS_MODULE, 600 .owner = THIS_MODULE,
555 .open = ac6_seq_open, 601 .open = ac6_seq_open,
556 .read = seq_read, 602 .read = seq_read,
557 .llseek = seq_lseek, 603 .llseek = seq_lseek,
558 .release = seq_release_pr 604 .release = seq_release_private,
559 }; 605 };
560 606
561 int __init ac6_proc_init(void) 607 int __init ac6_proc_init(void)
562 { 608 {
563 if (!proc_net_fops_create(&init_net, " !! 609 if (!proc_net_fops_create("anycast6", S_IRUGO, &ac6_seq_fops))
564 return -ENOMEM; 610 return -ENOMEM;
565 611
566 return 0; 612 return 0;
567 } 613 }
568 614
569 void ac6_proc_exit(void) 615 void ac6_proc_exit(void)
570 { 616 {
571 proc_net_remove(&init_net, "anycast6") !! 617 proc_net_remove("anycast6");
572 } 618 }
573 #endif 619 #endif
574 620
575 621
|
This page was automatically generated by the
LXR engine.
|