net: Refactor packet length computations
[pandora-u-boot.git] / net / arp.c
index c09dc1a..e58a074 100644 (file)
--- a/net/arp.c
+++ b/net/arp.c
 /*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ *     Copied from Linux Monitor (LiMon) - Networking.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ *     Copyright 1994 - 2000 Neil Russell.
+ *     (See License)
+ *     Copyright 2000 Roland Borde
+ *     Copyright 2000 Paolo Scaffardi
+ *     Copyright 2000-2002 Wolfgang Denk, wd@denx.de
  */
 
 #include <common.h>
-#include <command.h>
-#include <net.h>
-#include "bootp.h"
-#include "tftp.h"
-#include "arp.h"
 
-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#include "arp.h"
 
-#define TIMEOUT                5               /* Seconds before trying ARP again */
-#ifndef        CONFIG_NET_RETRY_COUNT
-# define TIMEOUT_COUNT 5               /* # of timeouts before giving up  */
+#ifndef        CONFIG_ARP_TIMEOUT
+/* Milliseconds before trying ARP again */
+# define ARP_TIMEOUT           5000UL
 #else
-# define TIMEOUT_COUNT  (CONFIG_NET_RETRY_COUNT)
+# define ARP_TIMEOUT           CONFIG_ARP_TIMEOUT
 #endif
 
-static void ArpHandler(uchar *pkt, unsigned dest, unsigned src, unsigned len);
-static void ArpTimeout(void);
 
-int    ArpTry = 0;
+#ifndef        CONFIG_NET_RETRY_COUNT
+# define ARP_TIMEOUT_COUNT     5       /* # of timeouts before giving up  */
+#else
+# define ARP_TIMEOUT_COUNT     CONFIG_NET_RETRY_COUNT
+#endif
 
-/*
- *     Handle a ARP received packet.
- */
-static void
-ArpHandler(uchar *pkt, unsigned dest, unsigned src, unsigned len)
+IPaddr_t       NetArpWaitPacketIP;
+IPaddr_t       NetArpWaitReplyIP;
+/* MAC address of waiting packet's destination */
+uchar         *NetArpWaitPacketMAC;
+/* THE transmit packet */
+uchar         *NetArpWaitTxPacket;
+int            NetArpWaitTxPacketSize;
+uchar          NetArpWaitPacketBuf[PKTSIZE_ALIGN + PKTALIGN];
+ulong          NetArpWaitTimerStart;
+int            NetArpWaitTry;
+
+void ArpInit(void)
 {
-       /* Check if the frame is really an ARP reply */
-       if (memcmp (NetServerEther, NetBcastAddr, 6) != 0) {
-#ifdef DEBUG
-               printf("Got good ARP - start TFTP\n");
-#endif
-               TftpStart ();
-       }
+       /* XXX problem with bss workaround */
+       NetArpWaitPacketMAC = NULL;
+       NetArpWaitPacketIP = 0;
+       NetArpWaitReplyIP = 0;
+       NetArpWaitTxPacket = &NetArpWaitPacketBuf[0] + (PKTALIGN - 1);
+       NetArpWaitTxPacket -= (ulong)NetArpWaitTxPacket % PKTALIGN;
+       NetArpWaitTxPacketSize = 0;
 }
 
-
-/*
- *     Timeout on ARP request.
- */
-static void
-ArpTimeout(void)
+void ArpRequest(void)
 {
-       if (ArpTry >= TIMEOUT_COUNT) {
-               puts ("\nRetry count exceeded; starting again\n");
-               NetStartAgain ();
+       uchar *pkt;
+       struct arp_hdr *arp;
+       int eth_hdr_size;
+
+       debug("ARP broadcast %d\n", NetArpWaitTry);
+
+       pkt = NetTxPacket;
+
+       eth_hdr_size = NetSetEther(pkt, NetBcastAddr, PROT_ARP);
+       pkt += eth_hdr_size;
+
+       arp = (struct arp_hdr *) pkt;
+
+       arp->ar_hrd = htons(ARP_ETHER);
+       arp->ar_pro = htons(PROT_IP);
+       arp->ar_hln = ARP_HLEN;
+       arp->ar_pln = ARP_PLEN;
+       arp->ar_op = htons(ARPOP_REQUEST);
+
+       /* source ET addr */
+       memcpy(&arp->ar_sha, NetOurEther, ARP_HLEN);
+       /* source IP addr */
+       NetWriteIP(&arp->ar_spa, NetOurIP);
+       /* dest ET addr = 0 */
+       memset(&arp->ar_tha, 0, ARP_HLEN);
+       if ((NetArpWaitPacketIP & NetOurSubnetMask) !=
+           (NetOurIP & NetOurSubnetMask)) {
+               if (NetOurGatewayIP == 0) {
+                       puts("## Warning: gatewayip needed but not set\n");
+                       NetArpWaitReplyIP = NetArpWaitPacketIP;
+               } else {
+                       NetArpWaitReplyIP = NetOurGatewayIP;
+               }
        } else {
-               NetSetTimeout (TIMEOUT * CFG_HZ, ArpTimeout);
-               ArpRequest ();
+               NetArpWaitReplyIP = NetArpWaitPacketIP;
        }
-}
 
+       NetWriteIP(&arp->ar_tpa, NetArpWaitReplyIP);
+       (void) eth_send(NetTxPacket, eth_hdr_size + ARP_HDR_SIZE);
+}
 
-void
-ArpRequest (void)
+void ArpTimeoutCheck(void)
 {
-       int i;
-       volatile uchar *pkt;
-       ARP_t * arp;
+       ulong t;
 
-       printf("ARP broadcast %d\n", ++ArpTry);
-       pkt = NetTxPacket;
+       if (!NetArpWaitPacketIP)
+               return;
 
-       NetSetEther(pkt, NetBcastAddr, PROT_ARP);
-       pkt += ETHER_HDR_SIZE;
+       t = get_timer(0);
 
-       arp = (ARP_t *)pkt;
+       /* check for arp timeout */
+       if ((t - NetArpWaitTimerStart) > ARP_TIMEOUT) {
+               NetArpWaitTry++;
 
-       arp->ar_hrd = htons(ARP_ETHER);
-       arp->ar_pro = htons(PROT_IP);
-       arp->ar_hln = 6;
-       arp->ar_pln = 4;
-       arp->ar_op  = htons(ARPOP_REQUEST);
-
-       memcpy (&arp->ar_data[0], NetOurEther, 6);      /* source ET addr       */
-       NetWriteIP((uchar*)&arp->ar_data[6], NetOurIP); /* source IP addr       */
-       for (i=10; i<16; ++i) {
-               arp->ar_data[i] = 0;                    /* dest ET addr = 0     */
+               if (NetArpWaitTry >= ARP_TIMEOUT_COUNT) {
+                       puts("\nARP Retry count exceeded; starting again\n");
+                       NetArpWaitTry = 0;
+                       NetStartAgain();
+               } else {
+                       NetArpWaitTimerStart = t;
+                       ArpRequest();
+               }
        }
+}
 
-       if((NetServerIP & NetOurSubnetMask) != (NetOurIP & NetOurSubnetMask)) {
-           if (NetOurGatewayIP == 0) {
-               puts ("## Warning: gatewayip needed but not set\n");
-           }
-           NetWriteIP((uchar*)&arp->ar_data[16], NetOurGatewayIP);
-       } else {
-           NetWriteIP((uchar*)&arp->ar_data[16], NetServerIP);
+void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)
+{
+       struct arp_hdr *arp;
+       IPaddr_t reply_ip_addr;
+       uchar *pkt;
+       int eth_hdr_size;
+
+       /*
+        * We have to deal with two types of ARP packets:
+        * - REQUEST packets will be answered by sending  our
+        *   IP address - if we know it.
+        * - REPLY packates are expected only after we asked
+        *   for the TFTP server's or the gateway's ethernet
+        *   address; so if we receive such a packet, we set
+        *   the server ethernet address
+        */
+       debug("Got ARP\n");
+
+       arp = (struct arp_hdr *)ip;
+       if (len < ARP_HDR_SIZE) {
+               printf("bad length %d < %d\n", len, ARP_HDR_SIZE);
+               return;
        }
+       if (ntohs(arp->ar_hrd) != ARP_ETHER)
+               return;
+       if (ntohs(arp->ar_pro) != PROT_IP)
+               return;
+       if (arp->ar_hln != ARP_HLEN)
+               return;
+       if (arp->ar_pln != ARP_PLEN)
+               return;
+
+       if (NetOurIP == 0)
+               return;
+
+       if (NetReadIP(&arp->ar_tpa) != NetOurIP)
+               return;
+
+       switch (ntohs(arp->ar_op)) {
+       case ARPOP_REQUEST:
+               /* reply with our IP address */
+               debug("Got ARP REQUEST, return our IP\n");
+               pkt = (uchar *)et;
+               eth_hdr_size = NetSetEther(pkt, et->et_src, PROT_ARP);
+               pkt += eth_hdr_size;
+               arp->ar_op = htons(ARPOP_REPLY);
+               memcpy(&arp->ar_tha, &arp->ar_sha, ARP_HLEN);
+               NetCopyIP(&arp->ar_tpa, &arp->ar_spa);
+               memcpy(&arp->ar_sha, NetOurEther, ARP_HLEN);
+               NetCopyIP(&arp->ar_spa, &NetOurIP);
+               (void) eth_send((uchar *)et, eth_hdr_size + ARP_HDR_SIZE);
+               return;
+
+       case ARPOP_REPLY:               /* arp reply */
+               /* are we waiting for a reply */
+               if (!NetArpWaitPacketIP || !NetArpWaitPacketMAC)
+                       break;
+
+#ifdef CONFIG_KEEP_SERVERADDR
+               if (NetServerIP == NetArpWaitPacketIP) {
+                       char buf[20];
+                       sprintf(buf, "%pM", arp->ar_sha);
+                       setenv("serveraddr", buf);
+               }
+#endif
 
+               reply_ip_addr = NetReadIP(&arp->ar_spa);
 
-       NetSendPacket(NetTxPacket, ETHER_HDR_SIZE + ARP_HDR_SIZE);
+               /* matched waiting packet's address */
+               if (reply_ip_addr == NetArpWaitReplyIP) {
+                       debug("Got ARP REPLY, set eth addr (%pM)\n",
+                               arp->ar_data);
 
-       NetSetTimeout(TIMEOUT * CFG_HZ, ArpTimeout);
-       NetSetHandler(ArpHandler);
-}
+                       /* save address for later use */
+                       memcpy(NetArpWaitPacketMAC,
+                               &arp->ar_sha, ARP_HLEN);
 
-#endif /* CFG_CMD_NET */
+#ifdef CONFIG_NETCONSOLE
+                       NetGetHandler()(0, 0, 0, 0, 0);
+#endif
+                       /* modify header, and transmit it */
+                       memcpy(((struct ethernet_hdr *)NetArpWaitTxPacket)->
+                               et_dest, NetArpWaitPacketMAC, ARP_HLEN);
+                       (void) eth_send(NetArpWaitTxPacket,
+                                       NetArpWaitTxPacketSize);
+
+                       /* no arp request pending now */
+                       NetArpWaitPacketIP = 0;
+                       NetArpWaitTxPacketSize = 0;
+                       NetArpWaitPacketMAC = NULL;
+
+               }
+               return;
+       default:
+               debug("Unexpected ARP opcode 0x%x\n",
+                     ntohs(arp->ar_op));
+               return;
+       }
+}