mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-02 15:25:22 +00:00
Code Issues Releases Wiki Activity

Return netmask along with IP address when querying through netdev

Browse Source 
The call netdev_get_in4() now allows the caller to also retrieve the
associated netmask.
This commit is contained in:
Justin Pettit
2009-07-10 17:21:43 -07:00
parent a5f37a2deb
commit f10725fea5
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extras/ezio/ovs-switchui.c
View File

@@ -2480,7 +2480,7 @@ choose_netdevs(struct svec *choices)
retval = netdev_open(name, NETDEV_ETH_TYPE_NONE, &netdev); retval = netdev_open(name, NETDEV_ETH_TYPE_NONE, &netdev);
if (!retval) { if (!retval) {
bool exclude = netdev_get_in4(netdev, NULL); bool exclude = netdev_get_in4(netdev, NULL, NULL);
netdev_close(netdev); netdev_close(netdev);
if (exclude) { if (exclude) {
continue; continue;

28
lib/netdev.c
View File

@@ -781,10 +781,12 @@ netdev_set_advertisements(struct netdev *netdev, uint32_t advertise)
return do_ethtool(netdev, &ecmd, ETHTOOL_SSET, "ETHTOOL_SSET"); return do_ethtool(netdev, &ecmd, ETHTOOL_SSET, "ETHTOOL_SSET");
} }
/* If 'netdev' has an assigned IPv4 address, sets '*in4' to that address (if /* If 'netdev' has an assigned IPv4 address, sets '*in4' to that address
* 'in4' is non-null) and returns true. Otherwise, returns false. */ * and '*mask' to the netmask (if they are non-null) and returns true.
* Otherwise, returns false. */
bool bool
netdev_nodev_get_in4(const char *netdev_name, struct in_addr *in4) netdev_nodev_get_in4(const char *netdev_name, struct in_addr *in4,
struct in_addr *mask)
{ {
struct ifreq ifr; struct ifreq ifr;
struct in_addr ip = { INADDR_ANY }; struct in_addr ip = { INADDR_ANY };
@@ -804,13 +806,25 @@ netdev_nodev_get_in4(const char *netdev_name, struct in_addr *in4)
if (in4) { if (in4) {
*in4 = ip; *in4 = ip;
} }
if (mask) {
if (ioctl(af_inet_sock, SIOCGIFNETMASK, &ifr) == 0) {
struct sockaddr_in *sin = (struct sockaddr_in *) &ifr.ifr_addr;
*mask = sin->sin_addr;
} else {
VLOG_DBG_RL(&rl, "%s: ioctl(SIOCGIFNETMASK) failed: %s",
netdev_name, strerror(errno));
}
}
return ip.s_addr != INADDR_ANY; return ip.s_addr != INADDR_ANY;
} }
bool bool
netdev_get_in4(const struct netdev *netdev, struct in_addr *in4) netdev_get_in4(const struct netdev *netdev, struct in_addr *in4, struct
in_addr *mask)
{ {
return netdev_nodev_get_in4(netdev->name, in4); return netdev_nodev_get_in4(netdev->name, in4, mask);
} }
static void static void
@@ -1309,7 +1323,7 @@ netdev_find_dev_by_in4(const struct in_addr *in4, char **netdev_name)
struct svec dev_list; struct svec dev_list;
/* Check the hint first. */ /* Check the hint first. */
if (*netdev_name && (netdev_nodev_get_in4(*netdev_name, &dev_in4)) if (*netdev_name && (netdev_nodev_get_in4(*netdev_name, &dev_in4, NULL))
&& (dev_in4.s_addr == in4->s_addr)) { && (dev_in4.s_addr == in4->s_addr)) {
return true; return true;
} }
@@ -1319,7 +1333,7 @@ netdev_find_dev_by_in4(const struct in_addr *in4, char **netdev_name)
netdev_enumerate(&dev_list); netdev_enumerate(&dev_list);
for (i=0; i<dev_list.n; i++) { for (i=0; i<dev_list.n; i++) {
if ((netdev_nodev_get_in4(dev_list.names[i], &dev_in4)) if ((netdev_nodev_get_in4(dev_list.names[i], &dev_in4, NULL))
&& (dev_in4.s_addr == in4->s_addr)) { && (dev_in4.s_addr == in4->s_addr)) {
*netdev_name = xstrdup(dev_list.names[i]); *netdev_name = xstrdup(dev_list.names[i]);
svec_destroy(&dev_list); svec_destroy(&dev_list);

8
lib/netdev.h
View File

@@ -90,8 +90,9 @@ int netdev_get_features(struct netdev *,
uint32_t *current, uint32_t *advertised, uint32_t *current, uint32_t *advertised,
uint32_t *supported, uint32_t *peer); uint32_t *supported, uint32_t *peer);
int netdev_set_advertisements(struct netdev *, uint32_t advertise); int netdev_set_advertisements(struct netdev *, uint32_t advertise);
bool netdev_get_in4(const struct netdev *, struct in_addr *); bool netdev_get_in4(const struct netdev *, struct in_addr *addr,
int netdev_set_in4(struct netdev *, struct in_addr addr, struct in_addr mask); struct in_addr *mask);
int netdev_set_in4(struct netdev *, struct in_addr in4, struct in_addr mask);
int netdev_add_router(struct in_addr router); int netdev_add_router(struct in_addr router);
bool netdev_get_in6(const struct netdev *, struct in6_addr *); bool netdev_get_in6(const struct netdev *, struct in6_addr *);
int netdev_get_flags(const struct netdev *, enum netdev_flags *); int netdev_get_flags(const struct netdev *, enum netdev_flags *);
@@ -107,7 +108,8 @@ int netdev_set_policing(struct netdev *, uint32_t kbits_rate,
void netdev_enumerate(struct svec *); void netdev_enumerate(struct svec *);
bool netdev_find_dev_by_in4(const struct in_addr *in4, char **netdev_name); bool netdev_find_dev_by_in4(const struct in_addr *in4, char **netdev_name);
int netdev_nodev_get_flags(const char *netdev_name, enum netdev_flags *); int netdev_nodev_get_flags(const char *netdev_name, enum netdev_flags *);
bool netdev_nodev_get_in4(const char *netdev_name, struct in_addr *); bool netdev_nodev_get_in4(const char *netdev_name, struct in_addr *in4,
struct in_addr *mask);
int netdev_nodev_set_etheraddr(const char *name, const uint8_t mac[6]); int netdev_nodev_set_etheraddr(const char *name, const uint8_t mac[6]);
int netdev_nodev_get_etheraddr(const char *netdev_name, uint8_t mac[6]); int netdev_nodev_get_etheraddr(const char *netdev_name, uint8_t mac[6]);
int netdev_nodev_set_policing(const char *netdev_name, uint32_t kbits_rate, int netdev_nodev_set_policing(const char *netdev_name, uint32_t kbits_rate,