picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "sd-dhcp-client: fix strict aliasing issue"

Browse source 
This reverts commit 6ec8e7c763.

This doesn't fix any issues, just makes the code harder to read.
This commit is contained in:
Lennart Poettering 2015-04-10 19:04:43 +02:00
parent 53bac4e0e3
commit 3dc055541c
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libsystemd-network/sd-dhcp-client.c
View file

@ -1469,7 +1469,7 @@ static int client_receive_message_udp(sd_event_source *s, int fd,
_cleanup_free_ DHCPMessage *message = NULL;
int buflen = 0, len, r;
const struct ether_addr zero_mac = { { 0, 0, 0, 0, 0, 0 } };
bool expect_chaddr;
const struct ether_addr *expected_chaddr = NULL;
uint8_t expected_hlen = 0;
assert(s);
@ -1514,11 +1514,11 @@ static int client_receive_message_udp(sd_event_source *s, int fd,
if (client->arp_type == ARPHRD_ETHER) {
expected_hlen = ETH_ALEN;
expect_chaddr = true;
expected_chaddr = (const struct ether_addr *) &client->mac_addr;
} else {
/* Non-ethernet links expect zero chaddr */
expected_hlen = 0;
expect_chaddr = false;
expected_chaddr = &zero_mac;
}
if (message->hlen != expected_hlen) {
@ -1526,10 +1526,7 @@ static int client_receive_message_udp(sd_event_source *s, int fd,
return 0;
}
if (memcmp(&message->chaddr[0], expect_chaddr ?
(void *)&client->mac_addr :
(void *)&zero_mac,
ETH_ALEN)) {
if (memcmp(&message->chaddr[0], expected_chaddr, ETH_ALEN)) {
log_dhcp_client(client, "received chaddr does not match "
"expected: ignoring");
return 0;