From: Roy Marples Date: Wed, 21 Feb 2007 11:40:50 +0000 (+0000) Subject: No more errors reported under valgrind :) X-Git-Tag: v3.2.3~311 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c59fd7179f65ef39251228d6f1d6e37eea24e388;p=thirdparty%2Fdhcpcd.git No more errors reported under valgrind :) --- diff --git a/dhcp.c b/dhcp.c index 6f3c0717..90a0e012 100644 --- a/dhcp.c +++ b/dhcp.c @@ -72,10 +72,11 @@ size_t send_message (const interface_t *iface, const dhcp_t *dhcp, if (!iface || !options || !dhcp) return -1; + memset (&from, 0, sizeof (from)); + memset (&to, 0, sizeof (to)); + if (type == DHCP_RELEASE) to.s_addr = dhcp->serveraddress.s_addr; - else - to.s_addr = 0; memset (&message, 0, sizeof (dhcpmessage_t)); diff --git a/socket.c b/socket.c index a1726b4a..84a6589f 100644 --- a/socket.c +++ b/socket.c @@ -495,7 +495,7 @@ int send_packet (const interface_t *iface, const int type, sll.sll_family = AF_PACKET; sll.sll_protocol = htons (type); sll.sll_ifindex = if_nametoindex (iface->name); - sll.sll_halen = ETHER_ADDR_LEN; + sll.sll_halen = iface->hwlen; memset(sll.sll_addr, 0xff, sizeof (sll.sll_addr)); if ((retval = sendto (iface->fd, data, len, 0, (struct sockaddr *) &sll,