X-Git-Url: http://git.archive.openwrt.org/?p=project%2Frelayd.git;a=blobdiff_plain;f=main.c;h=a78076c7f1b37e972ac83f0ce10197de44d99ad3;hp=8fbbed2e44804e723cc31277b9a689b97651725d;hb=d49528ef9ccc74a90b0828fcd94408374a8af4b1;hpb=ac87fbca7dbb82d8b09f19ea5588592b1ea10e4e diff --git a/main.c b/main.c index 8fbbed2..a78076c 100644 --- a/main.c +++ b/main.c @@ -36,6 +36,7 @@ LIST_HEAD(interfaces); int debug; static int host_timeout; +static int host_ping_tries; static int inet_sock; static int forward_bcast; static int forward_dhcp; @@ -138,7 +139,7 @@ static void del_host(struct relayd_host *host) free(host); } -static void fill_arp_request(struct arp_packet *pkt, struct relayd_interface *rif, +static void fill_arp_packet(struct arp_packet *pkt, struct relayd_interface *rif, const uint8_t spa[4], const uint8_t tpa[4]) { memset(pkt, 0, sizeof(*pkt)); @@ -160,7 +161,7 @@ static void send_arp_request(struct relayd_interface *rif, const uint8_t *ipaddr { struct arp_packet pkt; - fill_arp_request(&pkt, rif, rif->src_ip, ipaddr); + fill_arp_packet(&pkt, rif, rif->src_ip, ipaddr); pkt.arp.arp_op = htons(ARPOP_REQUEST); memcpy(pkt.arp.arp_spa, rif->src_ip, ETH_ALEN); @@ -205,23 +206,47 @@ void relayd_add_pending_route(const uint8_t *gateway, const uint8_t *dest, uint8 } } -static void send_arp_reply(struct relayd_interface *rif, uint8_t spa[4], - uint8_t tha[ETH_ALEN], uint8_t tpa[4]) +static void send_arp_reply(struct relayd_interface *rif, const uint8_t spa[4], + const uint8_t tha[ETH_ALEN], const uint8_t tpa[4]) { struct arp_packet pkt; - fill_arp_request(&pkt, rif, spa, tpa); + fill_arp_packet(&pkt, rif, spa, tpa); - pkt.arp.arp_op = htons(ARPOP_REPLY); - memcpy(pkt.eth.ether_dhost, tha, ETH_ALEN); - memcpy(pkt.arp.arp_tha, tha, ETH_ALEN); + 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); - DPRINTF(2, "%s: sending ARP reply to "IP_FMT", "IP_FMT" is at ("MAC_FMT")\n", - rif->ifname, IP_BUF(pkt.arp.arp_tpa), - IP_BUF(pkt.arp.arp_spa), MAC_BUF(pkt.eth.ether_shost)); + DPRINTF(2, "%s: sending ARP reply to "IP_FMT", "IP_FMT" is at ("MAC_FMT")\n", + 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, 0xff, ETH_ALEN); + + DPRINTF(2, "%s: sending gratuitous ARP: "IP_FMT" is at ("MAC_FMT")\n", + rif->ifname, IP_BUF(pkt.arp.arp_tpa), + MAC_BUF(pkt.eth.ether_shost)); + } + + 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) @@ -235,7 +260,7 @@ static void host_entry_timeout(struct uloop_timeout *timeout) * When the timeout is reached, try pinging the host a few times before * giving up on it. */ - if (host->rif->managed && host->cleanup_pending < 2) { + if (host->rif->managed && host->cleanup_pending < host_ping_tries) { send_arp_request(host->rif, host->ipaddr); host->cleanup_pending++; uloop_timeout_set(&host->timeout, 1000); @@ -281,6 +306,19 @@ static struct relayd_host *add_host(struct relayd_interface *rif, const uint8_t return host; } +static void send_gratuitous_arp(struct relayd_interface *rif, const uint8_t *spa) +{ + struct relayd_interface *to_rif; + + list_for_each_entry(to_rif, &interfaces, list) { + if (rif == to_rif) + continue; + + send_arp_reply(to_rif, spa, NULL, spa); + } +} + + struct relayd_host *relayd_refresh_host(struct relayd_interface *rif, const uint8_t *lladdr, const uint8_t *ipaddr) { struct relayd_host *host; @@ -305,6 +343,7 @@ struct relayd_host *relayd_refresh_host(struct relayd_interface *rif, const uint } else { host->cleanup_pending = false; uloop_timeout_set(&host->timeout, host_timeout * 1000); + send_gratuitous_arp(rif, ipaddr); } return host; @@ -321,7 +360,9 @@ static void relay_arp_request(struct relayd_interface *from_rif, struct arp_pack 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), @@ -345,7 +386,14 @@ static void recv_arp_request(struct relayd_interface *rif, struct arp_packet *pk if (!memcmp(pkt->arp.arp_spa, "\x00\x00\x00\x00", 4)) return; - relayd_refresh_host(rif, pkt->eth.ether_shost, pkt->arp.arp_spa); + 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_tpa); @@ -361,7 +409,6 @@ static void recv_arp_request(struct relayd_interface *rif, struct arp_packet *pk relay_arp_request(rif, pkt); } - static void recv_arp_reply(struct relayd_interface *rif, struct arp_packet *pkt) { struct relayd_host *host; @@ -375,9 +422,6 @@ static void recv_arp_reply(struct relayd_interface *rif, struct arp_packet *pkt) if (memcmp(pkt->arp.arp_sha, rif->sll.sll_addr, ETH_ALEN) != 0) relayd_refresh_host(rif, pkt->arp.arp_sha, pkt->arp.arp_spa); - if (!memcmp(pkt->arp.arp_tpa, rif->src_ip, 4)) - return; - host = find_host_by_ipaddr(NULL, pkt->arp.arp_tpa); if (!host) return; @@ -542,7 +586,7 @@ static int init_interface(struct relayd_interface *rif) } #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 @@ -641,6 +685,7 @@ static int usage(const char *progname) " -R :/\n" " Add a static route for / via \n" " -t Host entry expiry timeout\n" + " -p Number of ARP ping attempts before considering a host dead\n" " -T Set routing table number for automatically added routes\n" " -B Enable broadcast forwarding\n" " -D Enable DHCP forwarding\n" @@ -668,12 +713,13 @@ int main(int argc, char **argv) return 1; } - host_timeout = 60; + host_timeout = 30; + host_ping_tries = 5; forward_bcast = 0; 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; @@ -691,6 +737,11 @@ int main(int argc, char **argv) if (host_timeout <= 0) return usage(argv[0]); break; + case 'p': + host_ping_tries = atoi(optarg); + if (host_ping_tries <= 0) + return usage(argv[0]); + break; case 'd': debug++; break;