]> git.karo-electronics.de Git - karo-tx-uboot.git/blobdiff - net/link_local.c
net: cosmetic: Fix var naming net <-> eth drivers
[karo-tx-uboot.git] / net / link_local.c
index d52f13adb45deca75d52cabaaecc592963b2ca5f..2bca7de12ab4274fede6faf57b8c609e58d7b3ca 100644 (file)
@@ -49,7 +49,7 @@ static enum ll_state_t {
        DISABLED
 } state = DISABLED;
 
-static IPaddr_t ip;
+static struct in_addr ip;
 static int timeout_ms = -1;
 static unsigned deadline_ms;
 static unsigned conflicts;
@@ -64,14 +64,16 @@ static void link_local_timeout(void);
  * Pick a random link local IP address on 169.254/16, except that
  * the first and last 256 addresses are reserved.
  */
-static IPaddr_t pick(void)
+static struct in_addr pick(void)
 {
        unsigned tmp;
+       struct in_addr ip;
 
        do {
                tmp = rand_r(&seed) & IN_CLASSB_HOST;
        } while (tmp > (IN_CLASSB_HOST - 0x0200));
-       return (IPaddr_t) htonl((LINKLOCAL_ADDR + 0x0100) + tmp);
+       ip.s_addr = htonl((LINKLOCAL_ADDR + 0x0100) + tmp);
+       return ip;
 }
 
 /**
@@ -102,16 +104,17 @@ static void configure_wait(void)
 
 void link_local_start(void)
 {
-       ip = getenv_IPaddr("llipaddr");
-       if (ip != 0 && (ip & IN_CLASSB_NET) != LINKLOCAL_ADDR) {
+       ip = getenv_ip("llipaddr");
+       if (ip.s_addr != 0 &&
+           (ntohl(ip.s_addr) & IN_CLASSB_NET) != LINKLOCAL_ADDR) {
                puts("invalid link address");
                net_set_state(NETLOOP_FAIL);
                return;
        }
-       NetOurSubnetMask = IN_CLASSB_NET;
+       net_netmask.s_addr = IN_CLASSB_NET;
 
        seed = seed_mac();
-       if (ip == 0)
+       if (ip.s_addr == 0)
                ip = pick();
 
        state = PROBE;
@@ -131,10 +134,12 @@ static void link_local_timeout(void)
                /* timeouts in the PROBE state mean no conflicting ARP packets
                   have been received, so we can progress through the states */
                if (nprobes < PROBE_NUM) {
+                       struct in_addr zero_ip = {.s_addr = 0};
+
                        nprobes++;
                        debug_cond(DEBUG_LL_STATE, "probe/%u %s@%pI4\n",
                                        nprobes, eth_get_name(), &ip);
-                       arp_raw_request(0, NetEtherNullAddr, ip);
+                       arp_raw_request(zero_ip, net_null_ethaddr, ip);
                        timeout_ms = PROBE_MIN * 1000;
                        timeout_ms += random_delay_ms(PROBE_MAX - PROBE_MIN);
                } else {
@@ -143,7 +148,7 @@ static void link_local_timeout(void)
                        nclaims = 0;
                        debug_cond(DEBUG_LL_STATE, "announce/%u %s@%pI4\n",
                                        nclaims, eth_get_name(), &ip);
-                       arp_raw_request(ip, NetOurEther, ip);
+                       arp_raw_request(ip, net_ethaddr, ip);
                        timeout_ms = ANNOUNCE_INTERVAL * 1000;
                }
                break;
@@ -155,7 +160,7 @@ static void link_local_timeout(void)
                nclaims = 0;
                debug_cond(DEBUG_LL_STATE, "announce/%u %s@%pI4\n",
                                nclaims, eth_get_name(), &ip);
-               arp_raw_request(ip, NetOurEther, ip);
+               arp_raw_request(ip, net_ethaddr, ip);
                timeout_ms = ANNOUNCE_INTERVAL * 1000;
                break;
        case ANNOUNCE:
@@ -166,13 +171,13 @@ static void link_local_timeout(void)
                        nclaims++;
                        debug_cond(DEBUG_LL_STATE, "announce/%u %s@%pI4\n",
                                        nclaims, eth_get_name(), &ip);
-                       arp_raw_request(ip, NetOurEther, ip);
+                       arp_raw_request(ip, net_ethaddr, ip);
                        timeout_ms = ANNOUNCE_INTERVAL * 1000;
                } else {
                        /* Switch to monitor state */
                        state = MONITOR;
                        printf("Successfully assigned %pI4\n", &ip);
-                       NetCopyIP(&NetOurIP, &ip);
+                       net_copy_ip(&net_ip, &ip);
                        ready = 1;
                        conflicts = 0;
                        timeout_ms = -1;
@@ -206,6 +211,7 @@ void link_local_receive_arp(struct arp_hdr *arp, int len)
 {
        int source_ip_conflict;
        int target_ip_conflict;
+       struct in_addr null_ip = {.s_addr = 0};
 
        if (state == DISABLED)
                return;
@@ -262,15 +268,21 @@ void link_local_receive_arp(struct arp_hdr *arp, int len)
        source_ip_conflict = 0;
        target_ip_conflict = 0;
 
-       if (memcmp(&arp->ar_spa, &ip, ARP_PLEN) == 0
-        && memcmp(&arp->ar_sha, NetOurEther, ARP_HLEN) != 0
-       ) {
+       if (memcmp(&arp->ar_spa, &ip, ARP_PLEN) == 0 &&
+           memcmp(&arp->ar_sha, net_ethaddr, ARP_HLEN) != 0)
                source_ip_conflict = 1;
-       }
-       if (arp->ar_op == htons(ARPOP_REQUEST)
-        && memcmp(&arp->ar_tpa, &ip, ARP_PLEN) == 0
-        && memcmp(&arp->ar_tha, NetOurEther, ARP_HLEN) != 0
-       ) {
+
+       /*
+        * According to RFC 3927, section 2.2.1:
+        * Check if packet is an ARP probe by checking for a null source IP
+        * then check that target IP is equal to ours and source hw addr
+        * is not equal to ours. This condition should cause a conflict only
+        * during probe.
+        */
+       if (arp->ar_op == htons(ARPOP_REQUEST) &&
+           memcmp(&arp->ar_spa, &null_ip, ARP_PLEN) == 0 &&
+           memcmp(&arp->ar_tpa, &ip, ARP_PLEN) == 0 &&
+           memcmp(&arp->ar_sha, net_ethaddr, ARP_HLEN) != 0) {
                target_ip_conflict = 1;
        }
 
@@ -304,7 +316,7 @@ void link_local_receive_arp(struct arp_hdr *arp, int len)
                        debug("monitor conflict -- defending\n");
                        state = DEFEND;
                        timeout_ms = DEFEND_INTERVAL * 1000;
-                       arp_raw_request(ip, NetOurEther, ip);
+                       arp_raw_request(ip, net_ethaddr, ip);
                }
                break;
        case DEFEND:
@@ -313,7 +325,7 @@ void link_local_receive_arp(struct arp_hdr *arp, int len)
                        state = PROBE;
                        debug("defend conflict -- starting over\n");
                        ready = 0;
-                       NetOurIP = 0;
+                       net_ip.s_addr = 0;
 
                        /* restart the whole protocol */
                        ip = pick();