X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=net%2Frarp.c;h=1fa11b690d218fbda9fd80d26d99746acae10bf9;hb=ea990816fe96c86d3acb9aaa38776c10de2fb4b0;hp=660a02c5770282d9c7a4ab79ed9a7384fd9175e6;hpb=8b9c53221f6ce30ad132e3202e6d445bc21ed8aa;p=oweals%2Fu-boot.git

diff --git a/net/rarp.c b/net/rarp.c
index 660a02c577..1fa11b690d 100644
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -2,32 +2,16 @@
  * (C) Copyright 2000-2002
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * 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
+ * SPDX-License-Identifier:	GPL-2.0+
  */
 
 #include <common.h>
 #include <command.h>
 #include <net.h>
+#include <net/tftp.h>
 #include "nfs.h"
 #include "bootp.h"
 #include "rarp.h"
-#include "tftp.h"
 
 #define TIMEOUT 5000UL /* Milliseconds before trying BOOTP again */
 #ifndef	CONFIG_NET_RETRY_COUNT
@@ -36,34 +20,33 @@
 #define TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT)
 #endif
 
-int RarpTry;
+int rarp_try;
 
 /*
  *	Handle a RARP received packet.
  */
-void rarp_receive(IP_t *ip, unsigned len)
+void rarp_receive(struct ip_udp_hdr *ip, unsigned len)
 {
-	ARP_t *arp;
+	struct arp_hdr *arp;
 
-	debug("Got RARP\n");
-	arp = (ARP_t *)ip;
+	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)) {
-
+	    (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 {
-		NetCopyIP(&NetOurIP, &arp->ar_data[16]);
-		if (NetServerIP == 0)
-			NetCopyIP(&NetServerIP, &arp->ar_data[6]);
-		memcpy(NetServerEther, &arp->ar_data[0], 6);
-		debug("Got good RARP\n");
+		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();
 	}
 }
@@ -72,43 +55,45 @@ void rarp_receive(IP_t *ip, unsigned len)
 /*
  *	Timeout on BOOTP request.
  */
-static void RarpTimeout(void)
+static void rarp_timeout_handler(void)
 {
-	if (RarpTry >= TIMEOUT_COUNT) {
+	if (rarp_try >= TIMEOUT_COUNT) {
 		puts("\nRetry count exceeded; starting again\n");
-		NetStartAgain();
+		net_start_again();
 	} else {
-		NetSetTimeout(TIMEOUT, RarpTimeout);
-		RarpRequest();
+		net_set_timeout_handler(TIMEOUT, rarp_timeout_handler);
+		rarp_request();
 	}
 }
 
 
-void RarpRequest(void)
+void rarp_request(void)
 {
 	uchar *pkt;
-	ARP_t *rarp;
+	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_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[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], NetOurEther, 6);
+	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);
+	net_set_timeout_handler(TIMEOUT, rarp_timeout_handler);
 }