int odhcpd_get_mac(const struct interface *iface, uint8_t mac[6])
{
struct ifreq ifr;
+
memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, iface->ifname, sizeof(ifr.ifr_name));
+ strncpy(ifr.ifr_name, iface->ifname, sizeof(ifr.ifr_name) - 1);
if (ioctl(ioctl_sock, SIOCGIFHWADDR, &ifr) < 0)
return -1;
+
memcpy(mac, ifr.ifr_hwaddr.sa_data, 6);
return 0;
}
ssize_t sent = sendmsg(socket, &msg, MSG_DONTWAIT);
if (sent < 0)
- syslog(LOG_NOTICE, "Failed to send to %s%%%s (%s)",
- ipbuf, iface->ifname, strerror(errno));
+ syslog(LOG_NOTICE, "Failed to send to %s%%%s (%m)",
+ ipbuf, iface->ifname);
else
syslog(LOG_DEBUG, "Sent %li bytes to %s%%%s",
(long)sent, ipbuf, iface->ifname);
if (addr.ll.sll_family == AF_PACKET)
destiface = addr.ll.sll_ifindex;
- struct interface *iface =
- odhcpd_get_interface_by_index(destiface);
-
- if (!iface && addr.nl.nl_family != AF_NETLINK)
- continue;
-
char ipbuf[INET6_ADDRSTRLEN] = "kernel";
if (addr.ll.sll_family == AF_PACKET &&
len >= (ssize_t)sizeof(struct ip6_hdr))
else if (addr.in.sin_family == AF_INET)
inet_ntop(AF_INET, &addr.in.sin_addr, ipbuf, sizeof(ipbuf));
- syslog(LOG_DEBUG, "Received %li Bytes from %s%%%s", (long)len,
- ipbuf, (iface) ? iface->ifname : "netlink");
+ // From netlink
+ if (addr.nl.nl_family == AF_NETLINK) {
+ syslog(LOG_DEBUG, "Received %li Bytes from %s%%%s", (long)len,
+ ipbuf, "netlink");
+ e->handle_dgram(&addr, data_buf, len, NULL, dest);
+ return;
+ } else if (destiface != 0) {
+ struct interface *iface;
+ list_for_each_entry(iface, &interfaces, head) {
+ if (iface->ifindex != destiface)
+ continue;
+
+ syslog(LOG_DEBUG, "Received %li Bytes from %s%%%s", (long)len,
+ ipbuf, iface->ifname);
+
+ e->handle_dgram(&addr, data_buf, len, iface, dest);
+ }
+ }
+
- e->handle_dgram(&addr, data_buf, len, iface, dest);
}
}