X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=net%2Fping.c;h=9508cf1160ea048b03bc715c8b7599f5f71ceff7;hb=d2ad2c6192d1b8f03aa8918a34ee771ba0bbcd73;hp=04a594cf53ae9944576fdc7ce525beb1dfa44d6b;hpb=cb487f5664b1bf7d907f5d23fe10cc14dc1bd45a;p=karo-tx-uboot.git

diff --git a/net/ping.c b/net/ping.c
index 04a594cf53..9508cf1160 100644
--- a/net/ping.c
+++ b/net/ping.c
@@ -6,133 +6,108 @@
  *	Copyright 2000 Roland Borde
  *	Copyright 2000 Paolo Scaffardi
  *	Copyright 2000-2002 Wolfgang Denk, wd@denx.de
+ *	SPDX-License-Identifier:	GPL-2.0
  */
 
 #include "ping.h"
 #include "arp.h"
 
-static ushort PingSeqNo;
+static ushort ping_seq_number;
 
 /* The ip address to ping */
-IPaddr_t NetPingIP;
+struct in_addr net_ping_ip;
+
+static void set_icmp_header(uchar *pkt, struct in_addr dest)
+{
+	/*
+	 *	Construct an IP and ICMP header.
+	 */
+	struct ip_hdr *ip = (struct ip_hdr *)pkt;
+	struct icmp_hdr *icmp = (struct icmp_hdr *)(pkt + IP_HDR_SIZE);
+
+	net_set_ip_header(pkt, dest, net_ip);
+
+	ip->ip_len   = htons(IP_ICMP_HDR_SIZE);
+	ip->ip_p     = IPPROTO_ICMP;
+	ip->ip_sum   = compute_ip_checksum(ip, IP_HDR_SIZE);
+
+	icmp->type = ICMP_ECHO_REQUEST;
+	icmp->code = 0;
+	icmp->checksum = 0;
+	icmp->un.echo.id = 0;
+	icmp->un.echo.sequence = htons(ping_seq_number++);
+	icmp->checksum = compute_ip_checksum(icmp, ICMP_HDR_SIZE);
+}
 
 static int ping_send(void)
 {
-	static uchar mac[6];
-	struct ip_udp_hdr *ip;
-	ushort *s;
 	uchar *pkt;
+	int eth_hdr_size;
 
 	/* XXX always send arp request */
 
-	memcpy(mac, NetEtherNullAddr, 6);
-
-	debug("sending ARP for %pI4\n", &NetPingIP);
+	debug_cond(DEBUG_DEV_PKT, "sending ARP for %pI4\n", &net_ping_ip);
 
-	NetArpWaitPacketIP = NetPingIP;
-	NetArpWaitPacketMAC = mac;
+	net_arp_wait_packet_ip = net_ping_ip;
 
-	pkt = NetArpWaitTxPacket;
-	pkt += NetSetEther(pkt, mac, PROT_IP);
+	eth_hdr_size = net_set_ether(net_tx_packet, net_null_ethaddr, PROT_IP);
+	pkt = (uchar *)net_tx_packet + eth_hdr_size;
 
-	ip = (struct ip_udp_hdr *)pkt;
-
-	/*
-	 * Construct an IP and ICMP header.
-	 * (need to set no fragment bit - XXX)
-	 */
-	/* IP_HDR_SIZE / 4 (not including UDP) */
-	ip->ip_hl_v  = 0x45;
-	ip->ip_tos   = 0;
-	ip->ip_len   = htons(IP_HDR_SIZE + 8);
-	ip->ip_id    = htons(NetIPID++);
-	ip->ip_off   = htons(IP_FLAGS_DFRAG);	/* Don't fragment */
-	ip->ip_ttl   = 255;
-	ip->ip_p     = 0x01;		/* ICMP */
-	ip->ip_sum   = 0;
-	/* already in network byte order */
-	NetCopyIP((void *)&ip->ip_src, &NetOurIP);
-	/* - "" - */
-	NetCopyIP((void *)&ip->ip_dst, &NetPingIP);
-	ip->ip_sum   = ~NetCksum((uchar *)ip, IP_HDR_SIZE / 2);
-
-	s = &ip->udp_src;		/* XXX ICMP starts here */
-	s[0] = htons(0x0800);		/* echo-request, code */
-	s[1] = 0;			/* checksum */
-	s[2] = 0;			/* identifier */
-	s[3] = htons(PingSeqNo++);	/* sequence number */
-	s[1] = ~NetCksum((uchar *)s, 8/2);
+	set_icmp_header(pkt, net_ping_ip);
 
 	/* size of the waiting packet */
-	NetArpWaitTxPacketSize =
-		(pkt - NetArpWaitTxPacket) + IP_HDR_SIZE + 8;
+	arp_wait_tx_packet_size = eth_hdr_size + IP_ICMP_HDR_SIZE;
 
 	/* and do the ARP request */
-	NetArpWaitTry = 1;
-	NetArpWaitTimerStart = get_timer(0);
-	ArpRequest();
+	arp_wait_try = 1;
+	arp_wait_timer_start = get_timer(0);
+	arp_request();
 	return 1;	/* waiting */
 }
 
-static void ping_timeout(void)
+static void ping_timeout_handler(void)
 {
 	eth_halt();
-	NetState = NETLOOP_FAIL;	/* we did not get the reply */
-}
-
-static void ping_handler(uchar *pkt, unsigned dest, IPaddr_t sip,
-	    unsigned src, unsigned len)
-{
-	if (sip != NetPingIP)
-		return;
-
-	NetState = NETLOOP_SUCCESS;
+	net_set_state(NETLOOP_FAIL);	/* we did not get the reply */
 }
 
 void ping_start(void)
 {
 	printf("Using %s device\n", eth_get_name());
-	NetSetTimeout(10000UL, ping_timeout);
-	NetSetHandler(ping_handler);
+	net_set_timeout_handler(10000UL, ping_timeout_handler);
 
 	ping_send();
 }
 
 void ping_receive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)
 {
-	ICMP_t *icmph = (ICMP_t *)&(ip->udp_src);
-	IPaddr_t src_ip;
+	struct icmp_hdr *icmph = (struct icmp_hdr *)&ip->udp_src;
+	struct in_addr src_ip;
+	int eth_hdr_size;
 
 	switch (icmph->type) {
 	case ICMP_ECHO_REPLY:
-		/*
-		 * IP header OK.  Pass the packet to the
-		 * current handler.
-		 */
-		/* XXX point to ip packet */
-		src_ip = NetReadIP((void *)&ip->ip_src);
-		NetGetHandler()((uchar *)ip, 0, src_ip, 0, 0);
+		src_ip = net_read_ip((void *)&ip->ip_src);
+		if (src_ip.s_addr == net_ping_ip.s_addr)
+			net_set_state(NETLOOP_SUCCESS);
 		return;
 	case ICMP_ECHO_REQUEST:
-		debug("Got ICMP ECHO REQUEST, return "
-			"%d bytes\n", ETHER_HDR_SIZE + len);
+		eth_hdr_size = net_update_ether(et, et->et_src, PROT_IP);
 
-		memcpy(&et->et_dest[0], &et->et_src[0], 6);
-		memcpy(&et->et_src[0], NetOurEther, 6);
+		debug_cond(DEBUG_DEV_PKT,
+			   "Got ICMP ECHO REQUEST, return %d bytes\n",
+			   eth_hdr_size + len);
 
 		ip->ip_sum = 0;
 		ip->ip_off = 0;
-		NetCopyIP((void *)&ip->ip_dst, &ip->ip_src);
-		NetCopyIP((void *)&ip->ip_src, &NetOurIP);
-		ip->ip_sum = ~NetCksum((uchar *)ip,
-				       IP_HDR_SIZE >> 1);
+		net_copy_ip((void *)&ip->ip_dst, &ip->ip_src);
+		net_copy_ip((void *)&ip->ip_src, &net_ip);
+		ip->ip_sum = compute_ip_checksum(ip, IP_HDR_SIZE);
 
 		icmph->type = ICMP_ECHO_REPLY;
 		icmph->checksum = 0;
-		icmph->checksum = ~NetCksum((uchar *)icmph,
-			(len - IP_HDR_SIZE) >> 1);
-		(void) eth_send((uchar *)et,
-				ETHER_HDR_SIZE + len);
+		icmph->checksum = compute_ip_checksum(icmph, len - IP_HDR_SIZE);
+		net_send_packet((uchar *)et, eth_hdr_size + len);
 		return;
 /*	default:
 		return;*/