iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[AFS]: Adjust the new netdevice scanning code

Browse Source 
Adjust the new netdevice scanning code provided by Patrick McHardy:

 (1) Restore the function banner comments that were dropped.

 (2) Rather than using an array size of 6 in some places and an array size of
     ETH_ALEN in others, pass a pointer instead and pass the array size
     through so that we can actually check it.

 (3) Do the buffer fill count check before checking the for_primary_ifa
     condition again.  This permits us to skip that check should maxbufs be
     reached before we run out of interfaces.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Howells 2007-05-03 03:29:41 -07:00 committed by David S. Miller
parent dc1f6bff6a
commit ec9c948546
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/afs/internal.h
View File

@ -563,7 +563,7 @@ extern void afs_fs_exit(void);
* use-rtnetlink.c * use-rtnetlink.c
*/ */
extern int afs_get_ipv4_interfaces(struct afs_interface *, size_t, bool); extern int afs_get_ipv4_interfaces(struct afs_interface *, size_t, bool);
extern int afs_get_MAC_address(u8 [6]); extern int afs_get_MAC_address(u8 *, size_t);
/* /*
* vlclient.c * vlclient.c

2
fs/afs/main.c
View File

@ -54,7 +54,7 @@ static int __init afs_get_client_UUID(void)
/* read the MAC address of one of the external interfaces and construct /* read the MAC address of one of the external interfaces and construct
* a UUID from it */ * a UUID from it */
ret = afs_get_MAC_address(afs_uuid.node); ret = afs_get_MAC_address(afs_uuid.node, sizeof(afs_uuid.node));
if (ret < 0) if (ret < 0)
return ret; return ret;

24
fs/afs/netdevices.c
View File

@ -10,21 +10,33 @@
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include "internal.h" #include "internal.h"
int afs_get_MAC_address(u8 mac[ETH_ALEN]) /*
* get a MAC address from a random ethernet interface that has a real one
* - the buffer will normally be 6 bytes in size
*/
int afs_get_MAC_address(u8 *mac, size_t maclen)
{ {
struct net_device *dev; struct net_device *dev;
int ret = -ENODEV; int ret = -ENODEV;
if (maclen != ETH_ALEN)
BUG();
rtnl_lock(); rtnl_lock();
dev = __dev_getfirstbyhwtype(ARPHRD_ETHER); dev = __dev_getfirstbyhwtype(ARPHRD_ETHER);
if (dev) { if (dev) {
memcpy(mac, dev->dev_addr, ETH_ALEN); memcpy(mac, dev->dev_addr, maclen);
ret = 0; ret = 0;
} }
rtnl_unlock(); rtnl_unlock();
return ret; return ret;
} }
/*
* get a list of this system's interface IPv4 addresses, netmasks and MTUs
* - maxbufs must be at least 1
* - returns the number of interface records in the buffer
*/
int afs_get_ipv4_interfaces(struct afs_interface *bufs, size_t maxbufs, int afs_get_ipv4_interfaces(struct afs_interface *bufs, size_t maxbufs,
bool wantloopback) bool wantloopback)
{ {
@ -32,6 +44,8 @@ int afs_get_ipv4_interfaces(struct afs_interface *bufs, size_t maxbufs,
struct in_device *idev; struct in_device *idev;
int n = 0; int n = 0;
ASSERT(maxbufs > 0);
rtnl_lock(); rtnl_lock();
for (dev = dev_base; dev; dev = dev->next) { for (dev = dev_base; dev; dev = dev->next) {
if (dev->type == ARPHRD_LOOPBACK && !wantloopback) if (dev->type == ARPHRD_LOOPBACK && !wantloopback)
@ -40,13 +54,13 @@ int afs_get_ipv4_interfaces(struct afs_interface *bufs, size_t maxbufs,
if (!idev) if (!idev)
continue; continue;
for_primary_ifa(idev) { for_primary_ifa(idev) {
if (n == maxbufs)
goto out;
bufs[n].address.s_addr = ifa->ifa_address; bufs[n].address.s_addr = ifa->ifa_address;
bufs[n].netmask.s_addr = ifa->ifa_mask; bufs[n].netmask.s_addr = ifa->ifa_mask;
bufs[n].mtu = dev->mtu; bufs[n].mtu = dev->mtu;
n++; n++;
} endfor_ifa(idev) if (n >= maxbufs)
goto out;
} endfor_ifa(idev);
} }
out: out:
rtnl_unlock(); rtnl_unlock();