add host route on local ip arp request
authorAlejandro Enrique <alejandro.enrique@fon.com>
Wed, 11 Feb 2015 10:02:45 +0000 (11:02 +0100)
committerFelix Fietkau <nbd@openwrt.org>
Wed, 11 Feb 2015 10:08:22 +0000 (21:08 +1100)
This patch fixes relayd not adding a host on an ARP request for the local
IP address.
When relayd is launched using the -L option, it was not adding the
necessary host routes when it receives an ARP request for the local
IP address.

This issue makes a host not able to connect to the device running
relayd until there is ARP traffic involving a third host.

Signed-off-by: Alejandro Enrique <alejandro.enrique@fon.com>
main.c

diff --git a/main.c b/main.c
index 801d2f2a7ff44a4973d13d63778a4890cb796ccb..2e349541ba2539664d92a5e66b4edf64543a57ca 100644 (file)
--- a/main.c
+++ b/main.c
@@ -386,15 +386,15 @@ 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;
 
+       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);
 
        /*