fill_arp_packet(&pkt, rif, spa, tpa);
- pkt.arp.arp_op = htons(ARPOP_REPLY);
if (tha) {
+ pkt.arp.arp_op = htons(ARPOP_REPLY);
memcpy(pkt.eth.ether_dhost, tha, ETH_ALEN);
memcpy(pkt.arp.arp_tha, tha, ETH_ALEN);
rif->ifname, IP_BUF(pkt.arp.arp_tpa),
IP_BUF(pkt.arp.arp_spa), MAC_BUF(pkt.eth.ether_shost));
} else {
+ pkt.arp.arp_op = htons(ARPOP_REQUEST);
memset(pkt.eth.ether_dhost, 0xff, ETH_ALEN);
- memset(pkt.arp.arp_tha, 0, ETH_ALEN);
+ memset(pkt.arp.arp_tha, 0xff, ETH_ALEN);
DPRINTF(2, "%s: sending gratuitous ARP: "IP_FMT" is at ("MAC_FMT")\n",
rif->ifname, IP_BUF(pkt.arp.arp_tpa),
sendto(rif->fd.fd, &pkt, sizeof(pkt), 0,
(struct sockaddr *) &rif->sll, sizeof(rif->sll));
+
+ if (tha)
+ return;
+
+ /*
+ * Gratuitous ARP comes in two flavours, request and reply.
+ * Some operating systems only accept request, some only reply.
+ * Let's just send both...
+ */
+ pkt.arp.arp_op = htons(ARPOP_REPLY);
+
+ sendto(rif->fd.fd, &pkt, sizeof(pkt), 0,
+ (struct sockaddr *) &rif->sll, sizeof(rif->sll));
+
}
static void host_entry_timeout(struct uloop_timeout *timeout)
continue;
memcpy(reqpkt.eth.ether_shost, rif->sll.sll_addr, ETH_ALEN);
+ memset(reqpkt.eth.ether_dhost, 0xff, ETH_ALEN);
memcpy(reqpkt.arp.arp_sha, rif->sll.sll_addr, ETH_ALEN);
+ memset(reqpkt.arp.arp_tha, 0, ETH_ALEN);
DPRINTF(2, "%s: sending ARP who-has "IP_FMT", tell "IP_FMT" ("MAC_FMT")\n",
rif->ifname, IP_BUF(reqpkt.arp.arp_tpa),
if (!memcmp(pkt->arp.arp_spa, "\x00\x00\x00\x00", 4))
return;
+ host = find_host_by_ipaddr(NULL, pkt->arp.arp_spa);
+ if (!host || host->rif != rif)
+ relayd_refresh_host(rif, pkt->eth.ether_shost, pkt->arp.arp_spa);
+
if (local_route_table && !memcmp(pkt->arp.arp_tpa, local_addr, sizeof(local_addr))) {
send_arp_reply(rif, local_addr, pkt->arp.arp_sha, pkt->arp.arp_spa);
return;
}
- host = find_host_by_ipaddr(NULL, pkt->arp.arp_spa);
- if (!host || host->rif != rif)
- relayd_refresh_host(rif, pkt->eth.ether_shost, pkt->arp.arp_spa);
-
host = find_host_by_ipaddr(NULL, pkt->arp.arp_tpa);
/*
}
#ifdef PACKET_RECV_TYPE
- pkt_type = (1 << PACKET_BROADCAST);
+ pkt_type = (1 << PACKET_BROADCAST) | (1 << PACKET_MULTICAST);
setsockopt(fd, SOL_PACKET, PACKET_RECV_TYPE, &pkt_type, sizeof(pkt_type));
#endif
local_route_table = 0;
uloop_init();
- while ((ch = getopt(argc, argv, "I:i:t:BDdT:G:R:L:")) != -1) {
+ while ((ch = getopt(argc, argv, "I:i:t:p:BDdT:G:R:L:")) != -1) {
switch(ch) {
case 'I':
managed = true;