int speed;
int mtu;
uint32_t features;
- struct in_addr in4;
struct in6_addr in6;
int save_flags; /* Initial device flags. */
int changed_flags; /* Flags that we changed. */
static int get_flags(const struct netdev *, int *flagsp);
static int set_flags(struct netdev *, int flags);
-/* Obtains the IPv4 address for 'name' into 'in4'. Returns true if
- * successful. */
-static bool
-get_ipv4_address(const char *name, struct in_addr *in4)
-{
- struct ifreq ifr;
-
- strncpy(ifr.ifr_name, name, sizeof ifr.ifr_name);
- ifr.ifr_addr.sa_family = AF_INET;
- if (ioctl(af_inet_sock, SIOCGIFADDR, &ifr) == 0) {
- struct sockaddr_in *sin = (struct sockaddr_in *) &ifr.ifr_addr;
- *in4 = sin->sin_addr;
- } else {
- in4->s_addr = INADDR_ANY;
- }
-
- return true;
-}
-
/* Obtains the IPv6 address for 'name' into 'in6'. */
static void
get_ipv6_address(const char *name, struct in6_addr *in6)
struct ifreq ifr;
unsigned int ifindex;
uint8_t etheraddr[ETH_ADDR_LEN];
- struct in_addr in4;
struct in6_addr in6;
int mtu;
int error;
}
mtu = ifr.ifr_mtu;
- if (!get_ipv4_address(name, &in4)) {
- goto error;
- }
get_ipv6_address(name, &in6);
/* Allocate network device. */
netdev->fd = fd;
memcpy(netdev->etheraddr, etheraddr, sizeof etheraddr);
netdev->mtu = mtu;
- netdev->in4 = in4;
netdev->in6 = in6;
/* Get speed, features. */
bool
netdev_get_in4(const struct netdev *netdev, struct in_addr *in4)
{
+ struct ifreq ifr;
+ struct in_addr ip = { INADDR_ANY };
+
+ strncpy(ifr.ifr_name, netdev->name, sizeof ifr.ifr_name);
+ ifr.ifr_addr.sa_family = AF_INET;
+ if (ioctl(af_inet_sock, SIOCGIFADDR, &ifr) == 0) {
+ struct sockaddr_in *sin = (struct sockaddr_in *) &ifr.ifr_addr;
+ ip = sin->sin_addr;
+ } else {
+ VLOG_DBG("%s: ioctl(SIOCGIFADDR) failed: %s",
+ netdev->name, strerror(errno));
+ }
if (in4) {
- *in4 = netdev->in4;
+ *in4 = ip;
}
- return netdev->in4.s_addr != INADDR_ANY;
+ return ip.s_addr != INADDR_ANY;
}
static void
error = do_set_addr(netdev, af_inet_sock,
SIOCSIFADDR, "SIOCSIFADDR", addr);
- if (!error) {
- netdev->in4 = addr;
- if (addr.s_addr != INADDR_ANY) {
- error = do_set_addr(netdev, af_inet_sock,
- SIOCSIFNETMASK, "SIOCSIFNETMASK", mask);
- }
+ if (!error && addr.s_addr != INADDR_ANY) {
+ error = do_set_addr(netdev, af_inet_sock,
+ SIOCSIFNETMASK, "SIOCSIFNETMASK", mask);
}
return error;
}