From e6be58c2322fab098466d66816d99f67ae5a210f Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 16 Jul 2009 02:43:47 +0200 Subject: [PATCH] Fix handling of strict-aliasing rules --- plugins/loopback.c | 16 ++++---- plugins/supplicant.c | 23 ++++++----- scripts/pppd-plugin.c | 10 +++-- src/connection.c | 67 +++++++++++++++++-------------- src/inet.c | 108 +++++++++++++++++++++++++++----------------------- src/ipv4.c | 32 ++++++++------- 6 files changed, 145 insertions(+), 111 deletions(-) diff --git a/plugins/loopback.c b/plugins/loopback.c index 782853e..59716c2 100644 --- a/plugins/loopback.c +++ b/plugins/loopback.c @@ -176,7 +176,7 @@ static int setup_hostname(void) static int setup_loopback(void) { struct ifreq ifr; - struct sockaddr_in *addr; + struct sockaddr_in addr; int sk, err; sk = socket(PF_INET, SOCK_DGRAM, 0); @@ -197,9 +197,10 @@ static int setup_loopback(void) goto done; } - addr = (struct sockaddr_in *) &ifr.ifr_addr; - addr->sin_family = AF_INET; - addr->sin_addr.s_addr = inet_addr("127.0.0.1"); + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + memcpy(&ifr.ifr_addr, &addr, sizeof(ifr.ifr_addr)); err = ioctl(sk, SIOCSIFADDR, &ifr); if (err < 0) { @@ -208,9 +209,10 @@ static int setup_loopback(void) goto done; } - addr = (struct sockaddr_in *) &ifr.ifr_netmask; - addr->sin_family = AF_INET; - addr->sin_addr.s_addr = inet_addr("255.0.0.0"); + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("255.0.0.0"); + memcpy(&ifr.ifr_netmask, &addr, sizeof(ifr.ifr_netmask)); err = ioctl(sk, SIOCSIFNETMASK, &ifr); if (err < 0) { diff --git a/plugins/supplicant.c b/plugins/supplicant.c index 987e009..958200e 100644 --- a/plugins/supplicant.c +++ b/plugins/supplicant.c @@ -185,6 +185,7 @@ struct supplicant_task { gboolean noscan; GSList *scan_results; struct iw_range *range; + gboolean connecting; gboolean disconnecting; }; @@ -981,7 +982,7 @@ static void extract_addr(DBusMessageIter *value, struct supplicant_result *result) { DBusMessageIter array; - struct ether_addr *eth; + struct ether_addr eth; unsigned char *addr; int addr_len; @@ -1002,15 +1003,14 @@ static void extract_addr(DBusMessageIter *value, if (result->path == NULL) return; - eth = (void *) addr; - + memcpy(ð, addr, sizeof(eth)); snprintf(result->path, 13, "%02x%02x%02x%02x%02x%02x", - eth->ether_addr_octet[0], - eth->ether_addr_octet[1], - eth->ether_addr_octet[2], - eth->ether_addr_octet[3], - eth->ether_addr_octet[4], - eth->ether_addr_octet[5]); + eth.ether_addr_octet[0], + eth.ether_addr_octet[1], + eth.ether_addr_octet[2], + eth.ether_addr_octet[3], + eth.ether_addr_octet[4], + eth.ether_addr_octet[5]); } static void extract_ssid(DBusMessageIter *value, @@ -1495,6 +1495,8 @@ static int task_connect(struct supplicant_task *task) if (g_str_equal(security, "none") == FALSE && passphrase == NULL) return -EINVAL; + task->connecting = TRUE; + add_network(task); select_network(task); @@ -1594,6 +1596,7 @@ static void state_change(struct supplicant_task *task, DBusMessage *msg) /* carrier on */ connman_network_set_connected(task->network, TRUE); connman_device_set_scanning(task->device, FALSE); + task->connecting = FALSE; break; case WPA_DISCONNECTED: @@ -1611,6 +1614,7 @@ static void state_change(struct supplicant_task *task, DBusMessage *msg) /* carrier off */ connman_network_set_connected(task->network, FALSE); connman_device_set_scanning(task->device, FALSE); + task->connecting = FALSE; } break; @@ -1690,6 +1694,7 @@ int supplicant_start(struct connman_device *device) task->created = FALSE; task->noscan = FALSE; task->state = WPA_INVALID; + task->connecting = FALSE; task->disconnecting = FALSE; task->pending_network = NULL; diff --git a/scripts/pppd-plugin.c b/scripts/pppd-plugin.c index e8bae0e..81cb59c 100644 --- a/scripts/pppd-plugin.c +++ b/scripts/pppd-plugin.c @@ -23,6 +23,7 @@ #include #endif +#include #include #include @@ -44,12 +45,15 @@ static void notifier_ipup(void *data, int arg) { ipcp_options opts = ipcp_gotoptions[0]; ipcp_options peer = ipcp_hisoptions[0]; + struct in_addr ouraddr, hisaddr; printf("ipup: data %p arg %d\n", data, arg); - printf("%s: %s -> %s\n", ifname, - inet_ntoa(*((struct in_addr *) &opts.ouraddr)), - inet_ntoa(*((struct in_addr *) &peer.hisaddr))); + memcpy(&ouraddr, &opts.ouraddr, sizeof(ouraddr)); + memcpy(&hisaddr, &peer.hisaddr, sizeof(hisaddr)); + + printf("%s: %s -> %s\n", + ifname, inet_ntoa(ouraddr), inet_ntoa(hisaddr)); script_unsetenv("USEPEERDNS"); script_unsetenv("DNS1"); diff --git a/src/connection.c b/src/connection.c index ac6c2e5..6939e44 100644 --- a/src/connection.c +++ b/src/connection.c @@ -70,7 +70,7 @@ static int set_route(struct connman_element *element, const char *gateway) { struct ifreq ifr; struct rtentry rt; - struct sockaddr_in *addr; + struct sockaddr_in addr; int sk, err; DBG("element %p", element); @@ -92,17 +92,20 @@ static int set_route(struct connman_element *element, const char *gateway) memset(&rt, 0, sizeof(rt)); rt.rt_flags = RTF_UP | RTF_HOST; - addr = (struct sockaddr_in *) &rt.rt_dst; - addr->sin_family = AF_INET; - addr->sin_addr.s_addr = inet_addr(gateway); + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr(gateway); + memcpy(&rt.rt_dst, &addr, sizeof(rt.rt_dst)); - addr = (struct sockaddr_in *) &rt.rt_gateway; - 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(&rt.rt_gateway, &addr, sizeof(rt.rt_gateway)); - addr = (struct sockaddr_in *) &rt.rt_genmask; - 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(&rt.rt_genmask, &addr, sizeof(rt.rt_genmask)); rt.rt_dev = ifr.ifr_name; @@ -114,17 +117,20 @@ static int set_route(struct connman_element *element, const char *gateway) memset(&rt, 0, sizeof(rt)); rt.rt_flags = RTF_UP | RTF_GATEWAY; - addr = (struct sockaddr_in *) &rt.rt_dst; - 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(&rt.rt_dst, &addr, sizeof(rt.rt_dst)); - addr = (struct sockaddr_in *) &rt.rt_gateway; - addr->sin_family = AF_INET; - addr->sin_addr.s_addr = inet_addr(gateway); + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr(gateway); + memcpy(&rt.rt_gateway, &addr, sizeof(rt.rt_gateway)); - addr = (struct sockaddr_in *) &rt.rt_genmask; - 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(&rt.rt_genmask, &addr, sizeof(rt.rt_genmask)); err = ioctl(sk, SIOCADDRT, &rt); if (err < 0) @@ -140,7 +146,7 @@ static int del_route(struct connman_element *element, const char *gateway) { struct ifreq ifr; struct rtentry rt; - struct sockaddr_in *addr; + struct sockaddr_in addr; int sk, err; DBG("element %p", element); @@ -162,17 +168,20 @@ static int del_route(struct connman_element *element, const char *gateway) memset(&rt, 0, sizeof(rt)); rt.rt_flags = RTF_UP | RTF_GATEWAY; - addr = (struct sockaddr_in *) &rt.rt_dst; - 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(&rt.rt_dst, &addr, sizeof(rt.rt_dst)); - addr = (struct sockaddr_in *) &rt.rt_gateway; - addr->sin_family = AF_INET; - addr->sin_addr.s_addr = inet_addr(gateway); + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr(gateway); + memcpy(&rt.rt_gateway, &addr, sizeof(rt.rt_gateway)); - addr = (struct sockaddr_in *) &rt.rt_genmask; - 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(&rt.rt_genmask, &addr, sizeof(rt.rt_genmask)); err = ioctl(sk, SIOCDELRT, &rt); if (err < 0) diff --git a/src/inet.c b/src/inet.c index 69e63f2..69c01ec 100644 --- a/src/inet.c +++ b/src/inet.c @@ -202,7 +202,7 @@ static unsigned short index2type(int index) static char *index2addr(int index) { struct ifreq ifr; - struct ether_addr *eth; + struct ether_addr eth; char *str; int sk, err; @@ -230,14 +230,14 @@ static char *index2addr(int index) if (!str) return NULL; - eth = (void *) &ifr.ifr_hwaddr.sa_data; + memcpy(ð, &ifr.ifr_hwaddr.sa_data, sizeof(eth)); snprintf(str, 18, "%02X:%02X:%02X:%02X:%02X:%02X", - eth->ether_addr_octet[0], - eth->ether_addr_octet[1], - eth->ether_addr_octet[2], - eth->ether_addr_octet[3], - eth->ether_addr_octet[4], - eth->ether_addr_octet[5]); + eth.ether_addr_octet[0], + eth.ether_addr_octet[1], + eth.ether_addr_octet[2], + eth.ether_addr_octet[3], + eth.ether_addr_octet[4], + eth.ether_addr_octet[5]); return str; } @@ -245,7 +245,7 @@ static char *index2addr(int index) static char *index2ident(int index, const char *prefix) { struct ifreq ifr; - struct ether_addr *eth; + struct ether_addr eth; char *str; int sk, err, len; @@ -275,15 +275,15 @@ static char *index2ident(int index, const char *prefix) if (!str) return NULL; - eth = (void *) &ifr.ifr_hwaddr.sa_data; + memcpy(ð, &ifr.ifr_hwaddr.sa_data, sizeof(eth)); snprintf(str, len, "%s%02x%02x%02x%02x%02x%02x", prefix ? prefix : "", - eth->ether_addr_octet[0], - eth->ether_addr_octet[1], - eth->ether_addr_octet[2], - eth->ether_addr_octet[3], - eth->ether_addr_octet[4], - eth->ether_addr_octet[5]); + eth.ether_addr_octet[0], + eth.ether_addr_octet[1], + eth.ether_addr_octet[2], + eth.ether_addr_octet[3], + eth.ether_addr_octet[4], + eth.ether_addr_octet[5]); return str; } @@ -459,7 +459,7 @@ int connman_inet_set_address(int index, struct in_addr address, struct in_addr netmask, struct in_addr broadcast) { struct ifreq ifr; - struct sockaddr_in *addr; + struct sockaddr_in addr; int sk, err; sk = socket(PF_INET, SOCK_DGRAM, 0); @@ -476,27 +476,30 @@ int connman_inet_set_address(int index, struct in_addr address, DBG("ifname %s", ifr.ifr_name); - addr = (struct sockaddr_in *) &ifr.ifr_addr; - addr->sin_family = AF_INET; - addr->sin_addr = address; + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr = 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 = netmask; + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr = 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 = broadcast; + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr = broadcast; + memcpy(&ifr.ifr_broadaddr, &addr, sizeof(ifr.ifr_broadaddr)); err = ioctl(sk, SIOCSIFBRDADDR, &ifr); @@ -511,7 +514,7 @@ int connman_inet_set_address(int index, struct in_addr address, int connman_inet_clear_address(int index) { struct ifreq ifr; - struct sockaddr_in *addr; + struct sockaddr_in addr; int sk, err; sk = socket(PF_INET, SOCK_DGRAM, 0); @@ -528,9 +531,10 @@ int connman_inet_clear_address(int index) DBG("ifname %s", 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); @@ -549,7 +553,7 @@ int connman_inet_set_gateway(int index, struct in_addr gateway) { struct ifreq ifr; struct rtentry rt; - struct sockaddr_in *addr; + struct sockaddr_in addr; int sk, err; sk = socket(PF_INET, SOCK_DGRAM, 0); @@ -569,17 +573,20 @@ int connman_inet_set_gateway(int index, struct in_addr gateway) memset(&rt, 0, sizeof(rt)); rt.rt_flags = RTF_UP | RTF_HOST; - addr = (struct sockaddr_in *) &rt.rt_dst; - addr->sin_family = AF_INET; - addr->sin_addr = gateway; + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr = gateway; + memcpy(&rt.rt_dst, &addr, sizeof(rt.rt_dst)); - addr = (struct sockaddr_in *) &rt.rt_gateway; - 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(&rt.rt_gateway, &addr, sizeof(rt.rt_gateway)); - addr = (struct sockaddr_in *) &rt.rt_genmask; - 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(&rt.rt_genmask, &addr, sizeof(rt.rt_genmask)); rt.rt_dev = ifr.ifr_name; @@ -591,17 +598,20 @@ int connman_inet_set_gateway(int index, struct in_addr gateway) memset(&rt, 0, sizeof(rt)); rt.rt_flags = RTF_UP | RTF_GATEWAY; - addr = (struct sockaddr_in *) &rt.rt_dst; - 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(&rt.rt_dst, &addr, sizeof(rt.rt_dst)); - addr = (struct sockaddr_in *) &rt.rt_gateway; - addr->sin_family = AF_INET; - addr->sin_addr = gateway; + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr = gateway; + memcpy(&rt.rt_gateway, &addr, sizeof(rt.rt_gateway)); - addr = (struct sockaddr_in *) &rt.rt_genmask; - 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(&rt.rt_genmask, &addr, sizeof(rt.rt_genmask)); err = ioctl(sk, SIOCADDRT, &rt); if (err < 0) diff --git a/src/ipv4.c b/src/ipv4.c index 25882ba..4ef6b87 100644 --- a/src/ipv4.c +++ b/src/ipv4.c @@ -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); -- 2.7.4