Merge branch 'master' of git://git.denx.de/u-boot-usb

[J-u-boot.git] / net / rarp.c

diff --git a/net/rarp.c b/net/rarp.c
index 9444c036453a946b7e232f4d3c89140f624f9b7b..a676a4253b5eab4d4ca64051d720bc0d065b822d 100644 (file)
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -1,116 +1,99 @@
+// SPDX-License-Identifier: GPL-2.0+

 /*
  * (C) Copyright 2000-2002
  * Wolfgang Denk, DENX Software Engineering, [email protected].
 /*
  * (C) Copyright 2000-2002
  * Wolfgang Denk, DENX Software Engineering, [email protected].

- *
- * 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

  */
 
 #include <common.h>
 #include <command.h>
  */
 
 #include <common.h>
 #include <command.h>

+#include <log.h>

 #include <net.h>
 #include <net.h>

+#include <net/tftp.h>

 #include "nfs.h"
 #include "bootp.h"
 #include "rarp.h"
 #include "nfs.h"
 #include "bootp.h"
 #include "rarp.h"

-#include "tftp.h"

 
 

-#define TIMEOUT                5000UL  /* Milliseconds before trying BOOTP again */
+#define TIMEOUT 5000UL /* Milliseconds before trying BOOTP again */

 #ifndef        CONFIG_NET_RETRY_COUNT
 #ifndef        CONFIG_NET_RETRY_COUNT

-# define TIMEOUT_COUNT 5               /* # of timeouts before giving up  */
+#define TIMEOUT_COUNT 5 /* # of timeouts before giving up  */

 #else
 #else

-# define TIMEOUT_COUNT  (CONFIG_NET_RETRY_COUNT)
+#define TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT)

 #endif
 
 #endif
 

-
-int            RarpTry;
+int rarp_try;

 
 /*
  *     Handle a RARP received packet.
  */
 
 /*
  *     Handle a RARP received packet.
  */

-static void
-RarpHandler(uchar * dummi0, unsigned dummi1, unsigned dummi2, unsigned dummi3)
+void rarp_receive(struct ip_udp_hdr *ip, unsigned len)

 {
 {

-       char *s;
-       debug("Got good RARP\n");
-       if ((s = getenv("autoload")) != NULL) {
-               if (*s == 'n') {
-                       /*
-                        * Just use RARP to configure system;
-                        * Do not use TFTP/NFS to to load the bootfile.
-                        */
-                       NetState = NETLOOP_SUCCESS;
-                       return;
-#if defined(CONFIG_CMD_NFS)
-               } else if ((s != NULL) && !strcmp(s, "NFS")) {
-                       NfsStart();
-                       return;
-#endif
-               }
+       struct arp_hdr *arp;
+
+       debug_cond(DEBUG_NET_PKT, "Got RARP\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_op) != RARPOP_REPLY) ||
+           (ntohs(arp->ar_hrd) != ARP_ETHER)   ||
+           (ntohs(arp->ar_pro) != PROT_IP)     ||
+           (arp->ar_hln != 6) || (arp->ar_pln != 4)) {
+               puts("invalid RARP header\n");
+       } else {
+               net_copy_ip(&net_ip, &arp->ar_data[16]);
+               if (net_server_ip.s_addr == 0)
+                       net_copy_ip(&net_server_ip, &arp->ar_data[6]);
+               memcpy(net_server_ethaddr, &arp->ar_data[0], 6);
+               debug_cond(DEBUG_DEV_PKT, "Got good RARP\n");
+               net_auto_load();

        }
        }

-       TftpStart ();

 }
 
 
 /*
  *     Timeout on BOOTP request.
  */
 }
 
 
 /*
  *     Timeout on BOOTP request.
  */

-static void
-RarpTimeout(void)
+static void rarp_timeout_handler(void)

 {
 {

-       if (RarpTry >= TIMEOUT_COUNT) {
-               puts ("\nRetry count exceeded; starting again\n");
-               NetStartAgain ();
+       if (rarp_try >= TIMEOUT_COUNT) {
+               puts("\nRetry count exceeded; starting again\n");
+               net_start_again();

        } else {
        } else {

-               NetSetTimeout (TIMEOUT, RarpTimeout);
-               RarpRequest ();
+               net_set_timeout_handler(TIMEOUT, rarp_timeout_handler);
+               rarp_request();

        }
 }
 
 
        }
 }
 
 

-void
-RarpRequest (void)
+void rarp_request(void)

 {
 {

-       int i;
-       volatile uchar *pkt;
-       ARP_t * rarp;
+       uchar *pkt;
+       struct arp_hdr *rarp;
+       int eth_hdr_size;

 
 

-       printf("RARP broadcast %d\n", ++RarpTry);
-       pkt = NetTxPacket;
+       printf("RARP broadcast %d\n", ++rarp_try);
+       pkt = net_tx_packet;

 
 

-       pkt += NetSetEther(pkt, NetBcastAddr, PROT_RARP);
+       eth_hdr_size = net_set_ether(pkt, net_bcast_ethaddr, PROT_RARP);
+       pkt += eth_hdr_size;

 
 

-       rarp = (ARP_t *)pkt;
+       rarp = (struct arp_hdr *)pkt;

 
 

-       rarp->ar_hrd = htons (ARP_ETHER);
-       rarp->ar_pro = htons (PROT_IP);
+       rarp->ar_hrd = htons(ARP_ETHER);
+       rarp->ar_pro = htons(PROT_IP);

        rarp->ar_hln = 6;
        rarp->ar_pln = 4;
        rarp->ar_hln = 6;
        rarp->ar_pln = 4;

-       rarp->ar_op  = htons (RARPOP_REQUEST);
-       memcpy (&rarp->ar_data[0],  NetOurEther, 6);    /* source ET addr */
-       memcpy (&rarp->ar_data[6],  &NetOurIP,   4);    /* source IP addr */
-       memcpy (&rarp->ar_data[10], NetOurEther, 6);    /* dest ET addr = source ET addr ??*/
-       /* dest. IP addr set to broadcast */
-       for (i = 0; i <= 3; i++) {
-               rarp->ar_data[16 + i] = 0xff;
-       }
+       rarp->ar_op  = htons(RARPOP_REQUEST);
+       memcpy(&rarp->ar_data[0],  net_ethaddr, 6);     /* source ET addr */
+       memcpy(&rarp->ar_data[6],  &net_ip,   4);       /* source IP addr */
+       /* dest ET addr = source ET addr ??*/
+       memcpy(&rarp->ar_data[10], net_ethaddr, 6);
+       /* dest IP addr set to broadcast */
+       memset(&rarp->ar_data[16], 0xff,        4);

 
 

-       NetSendPacket(NetTxPacket, (pkt - NetTxPacket) + ARP_HDR_SIZE);
+       net_send_packet(net_tx_packet, eth_hdr_size + ARP_HDR_SIZE);

 
 

-       NetSetTimeout(TIMEOUT, RarpTimeout);
-       NetSetHandler(RarpHandler);
+       net_set_timeout_handler(TIMEOUT, rarp_timeout_handler);

 }
 }