diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2009-07-16 02:43:47 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2009-07-16 02:43:47 +0200 |
| commit | e6be58c2322fab098466d66816d99f67ae5a210f (patch) | |
| tree | 0d312815c73b5e61c2ea0a75dda84000a8809c5c /src/ipv4.c | |
| parent | 016c1490e180fa737815bf65f96cc60b1761ed89 (diff) | |
| download | connman-e6be58c2322fab098466d66816d99f67ae5a210f.tar.gz connman-e6be58c2322fab098466d66816d99f67ae5a210f.tar.bz2 connman-e6be58c2322fab098466d66816d99f67ae5a210f.zip | |
Fix handling of strict-aliasing rules
Diffstat (limited to 'src/ipv4.c')
| -rw-r--r-- | src/ipv4.c | 32 |
1 files changed, 18 insertions, 14 deletions
@@ -44,7 +44,7 @@ static int set_ipv4(struct connman_element *element, struct connman_ipv4 *ipv4, const char *nameserver) { struct ifreq ifr; - struct sockaddr_in *addr; + struct sockaddr_in addr; int sk, err; DBG("element %p ipv4 %p", element, ipv4); @@ -63,27 +63,30 @@ static int set_ipv4(struct connman_element *element, DBG("ifname %s", ifr.ifr_name); - addr = (struct sockaddr_in *) &ifr.ifr_addr; - addr->sin_family = AF_INET; - addr->sin_addr = ipv4->address; + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr = ipv4->address; + memcpy(&ifr.ifr_addr, &addr, sizeof(ifr.ifr_addr)); err = ioctl(sk, SIOCSIFADDR, &ifr); if (err < 0) DBG("address setting failed (%s)", strerror(errno)); - addr = (struct sockaddr_in *) &ifr.ifr_netmask; - addr->sin_family = AF_INET; - addr->sin_addr = ipv4->netmask; + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr = ipv4->netmask; + memcpy(&ifr.ifr_netmask, &addr, sizeof(ifr.ifr_netmask)); err = ioctl(sk, SIOCSIFNETMASK, &ifr); if (err < 0) DBG("netmask setting failed (%s)", strerror(errno)); - addr = (struct sockaddr_in *) &ifr.ifr_broadaddr; - addr->sin_family = AF_INET; - addr->sin_addr = ipv4->broadcast; + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr = ipv4->broadcast; + memcpy(&ifr.ifr_broadaddr, &addr, sizeof(ifr.ifr_broadaddr)); err = ioctl(sk, SIOCSIFBRDADDR, &ifr); @@ -103,7 +106,7 @@ static int set_ipv4(struct connman_element *element, static int clear_ipv4(struct connman_element *element) { struct ifreq ifr; - struct sockaddr_in *addr; + struct sockaddr_in addr; int sk, err; DBG("element %p", element); @@ -124,9 +127,10 @@ static int clear_ipv4(struct connman_element *element) connman_resolver_remove_all(ifr.ifr_name); - addr = (struct sockaddr_in *) &ifr.ifr_addr; - addr->sin_family = AF_INET; - addr->sin_addr.s_addr = INADDR_ANY; + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = INADDR_ANY; + memcpy(&ifr.ifr_addr, &addr, sizeof(ifr.ifr_addr)); //err = ioctl(sk, SIOCDIFADDR, &ifr); err = ioctl(sk, SIOCSIFADDR, &ifr); |