]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
No more errors reported under valgrind :)
authorRoy Marples <roy@marples.name>
Wed, 21 Feb 2007 11:40:50 +0000 (11:40 +0000)
committerRoy Marples <roy@marples.name>
Wed, 21 Feb 2007 11:40:50 +0000 (11:40 +0000)
dhcp.c
socket.c

diff --git a/dhcp.c b/dhcp.c
index 6f3c071775c3f4816b7baa479be60bceab13852b..90a0e012dc44a69370eb0c9ef26505dfbe565ea5 100644 (file)
--- 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));
 
index a1726b4a70304b095fa13a990d701526f30f64ab..84a6589f6d1f01bb969b393cd670cd52e5003db0 100644 (file)
--- 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,