[U-Boot-Users] [PATCH] net - Support ping reply when processing net-loop

[U-Boot-Users] [PATCH] net - Support ping reply when processing net-loop

[Ed Swarthout]

Add ICMP_ECHO_REQUEST packet support by responding with a ICMP_ECHO_REPLY.

This permits the ping command to test the phy interface when the phy
is put in loopback mode (typically by setting register 0 bit 14).

It also allows the port to respond to an external ping when u-boot is
processing some other net command (such as tftp).  This is useful when
tftp appears to hang.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>

---

This version does not add unused variable i.

 net/net.c |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/net/net.c b/net/net.c
index 1d1c98f..2df52dc 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1424,6 +1424,29 @@ NetReceive(volatile uchar * inpkt, int len)
 				/* XXX point to ip packet */
 				(*packetHandler)((uchar *)ip, 0, 0, 0);
 				return;
+
+			case ICMP_ECHO_REQUEST:
+			{
+				int rlen = ETHER_HDR_SIZE + len;
+#ifdef ET_DEBUG
+				printf ("Got ICMP ECHO REQUEST, return %d bytes \n",rlen);
+#endif
+				memcpy (&et->et_dest[0], &et->et_src[0], 6);
+				memcpy (&et->et_src[ 0], NetOurEther, 6);
+
+				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_NO_UDP >> 1);
+
+				icmph->type = ICMP_ECHO_REPLY;
+				icmph->checksum = 0;
+				icmph->checksum = ~NetCksum((uchar *)icmph,
+							    (len - IP_HDR_SIZE_NO_UDP) >> 1);
+				(void) eth_send((uchar *)et, rlen);
+				return;
+			}
 #endif
 			default:
 				return;
-- 
1.5.0.2.279.g4808

[U-Boot-Users] [PATCH] net - Support ping reply when processing net-loop

[Ed Swarthout]

Add ICMP_ECHO_REQUEST packet support by responding with a ICMP_ECHO_REPLY.

This permits the ping command to test the phy interface when the phy
is put in loopback mode (typically by setting register 0 bit 14).

It also allows the port to respond to an external ping when u-boot is
processing some other net command (such as tftp).  This is useful when
tftp appears to hang.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
---
 net/net.c |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/net/net.c b/net/net.c
index 1d1c98f..3294380 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1424,6 +1424,30 @@ NetReceive(volatile uchar * inpkt, int len)
 				/* XXX point to ip packet */
 				(*packetHandler)((uchar *)ip, 0, 0, 0);
 				return;
+
+			case ICMP_ECHO_REQUEST:
+			{
+				int rlen = ETHER_HDR_SIZE + len;
+				int i;
+#ifdef ET_DEBUG
+				printf ("Got ICMP ECHO REQUEST, return %d bytes \n",rlen);
+#endif
+				memcpy (&et->et_dest[0], &et->et_src[0], 6);
+				memcpy (&et->et_src[ 0], NetOurEther, 6);
+
+				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_NO_UDP >> 1);
+
+				icmph->type = ICMP_ECHO_REPLY;
+				icmph->checksum = 0;
+				icmph->checksum = ~NetCksum((uchar *)icmph,
+							    (len - IP_HDR_SIZE_NO_UDP) >> 1);
+				(void) eth_send((uchar *)et, rlen);
+				return;
+			}
 #endif
 			default:
 				return;
-- 
1.5.0.2.279.g4808

[U-Boot-Users] [PATCH] net - Support ping reply when processing net-loop

[Ben Warren]

Ed,

This looks like a useful debug tool.  Please fix a little nit.  In the
meantime I'm going to play around with it a bit.

On Mon, 2007-03-05 at 23:33 -0600, Ed Swarthout wrote:
<SNIP>
> +
> +			case ICMP_ECHO_REQUEST:
> +			{
> +				int rlen = ETHER_HDR_SIZE + len;
> +				int i;
These variables aren't necessary.  'i' isn't even used.  Please ditch
them along with the braces.  You can calcalate the length in the two
places that it's referenced.

regards,
Ben

[U-Boot-Users] [PATCH] net - Support ping reply when processing net-loop

[Ed Swarthout]

Add ICMP_ECHO_REQUEST packet support by responding with a ICMP_ECHO_REPLY.

This permits the ping command to test the phy interface when the phy
is put in loopback mode (typically by setting register 0 bit 14).

It also allows the port to respond to an external ping when u-boot is
processing some other net command (such as tftp).  This is useful when
tftp appears to hang.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>

---

Version 2.  Style fixes - remove temp variable and braces.

 net/net.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/net/net.c b/net/net.c
index 1d1c98f..63d090f 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1424,6 +1424,26 @@ NetReceive(volatile uchar * inpkt, int len)
 				/* XXX point to ip packet */
 				(*packetHandler)((uchar *)ip, 0, 0, 0);
 				return;
+			case ICMP_ECHO_REQUEST:
+#ifdef ET_DEBUG
+				printf ("Got ICMP ECHO REQUEST, return %d bytes \n",
+					ETHER_HDR_SIZE + len);
+#endif
+				memcpy (&et->et_dest[0], &et->et_src[0], 6);
+				memcpy (&et->et_src[ 0], NetOurEther, 6);
+
+				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_NO_UDP >> 1);
+
+				icmph->type = ICMP_ECHO_REPLY;
+				icmph->checksum = 0;
+				icmph->checksum = ~NetCksum((uchar *)icmph,
+							    (len - IP_HDR_SIZE_NO_UDP) >> 1);
+				(void) eth_send((uchar *)et, ETHER_HDR_SIZE + len);
+				return;
 #endif
 			default:
 				return;
-- 
1.5.0.2.279.g4808

[U-Boot-Users] [PATCH] net - Support ping reply when processing net-loop

[Ben Warren]

Ed,

On Wed, 2007-03-07 at 00:12 -0600, Ed Swarthout wrote:
> Add ICMP_ECHO_REQUEST packet support by responding with a ICMP_ECHO_REPLY.
> 
> This permits the ping command to test the phy interface when the phy
> is put in loopback mode (typically by setting register 0 bit 14).
> 
> It also allows the port to respond to an external ping when u-boot is
> processing some other net command (such as tftp).  This is useful when
> tftp appears to hang.
> 
> Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Sorry for being a pain, but this patch doesn't apply cleanly, due to
whitespace issues.  Please make sure you're using tabs for indentation
with TABSTOP=8.  When I modified your patch to do this, it went in fine,
but I want it to come from you so all history is maintained.

regards,
Ben

[U-Boot-Users] [PATCH] net - Support ping reply when processing net-loop

[Wolfgang Denk]

In message <1173279099.24846.135.camel@saruman.qstreams.net> you wrote:
> 
> Sorry for being a pain, but this patch doesn't apply cleanly, due to

You're not a pain, but a highly appreciated Custodian at Work :-)

Thanks!

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH, HRB 165235 Munich, CEO: Wolfgang Denk
Office:  Kirchenstr. 5,       D-82194 Groebenzell,            Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Without freedom of choice there is no creativity.
	-- Kirk, "The return of the Archons", stardate 3157.4

[U-Boot-Users] [PATCH] net - Support ping reply when processing net-loop

[Ed Swarthout]

Add ICMP_ECHO_REQUEST packet support by responding with a ICMP_ECHO_REPLY.

This permits the ping command to test the phy interface when the phy
is put in loopback mode (typically by setting register 0 bit 14).

It also allows the port to respond to an external ping when u-boot is
processing some other net command (such as tftp).  This is useful when
tftp appears to hang.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>

---

Version 3.  Whitespace cleanup of patch.

Removed spaces used for indentation of descendant line.
80-char line-length is still violated (like other parts of file).

If I run Lident on the file, I get 67 changes and it still uses spaces
to indent descendant lines.  Should I send that version instead?

Pain leads to strength...

 net/net.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/net/net.c b/net/net.c
index 1d1c98f..2ff7bfc 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1424,6 +1424,26 @@ NetReceive(volatile uchar * inpkt, int len)
 				/* XXX point to ip packet */
 				(*packetHandler)((uchar *)ip, 0, 0, 0);
 				return;
+			case ICMP_ECHO_REQUEST:
+#ifdef ET_DEBUG
+				printf ("Got ICMP ECHO REQUEST, return %d bytes \n",
+					ETHER_HDR_SIZE + len);
+#endif
+				memcpy (&et->et_dest[0], &et->et_src[0], 6);
+				memcpy (&et->et_src[ 0], NetOurEther, 6);
+
+				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_NO_UDP >> 1);
+
+				icmph->type = ICMP_ECHO_REPLY;
+				icmph->checksum = 0;
+				icmph->checksum = ~NetCksum((uchar *)icmph,
+						(len - IP_HDR_SIZE_NO_UDP) >> 1);
+				(void) eth_send((uchar *)et, ETHER_HDR_SIZE + len);
+				return;
 #endif
 			default:
 				return;
-- 
1.5.0.2.279.g4808

[U-Boot-Users] [PATCH] net - Support ping reply when processing net-loop

[Ben Warren]

Ed,
On Wed, 2007-03-07 at 12:14 -0600, Ed Swarthout wrote:
> Add ICMP_ECHO_REQUEST packet support by responding with a ICMP_ECHO_REPLY.
> 
> This permits the ping command to test the phy interface when the phy
> is put in loopback mode (typically by setting register 0 bit 14).
> 
> It also allows the port to respond to an external ping when u-boot is
> processing some other net command (such as tftp).  This is useful when
> tftp appears to hang.
> 
> Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
> 
> ---
> 
> Version 3.  Whitespace cleanup of patch.
> 
> Removed spaces used for indentation of descendant line.
> 80-char line-length is still violated (like other parts of file).
> 
> If I run Lident on the file, I get 67 changes and it still uses spaces
> to indent descendant lines.  Should I send that version instead?
> 
> Pain leads to strength...

This one's fine.  Thanks!

Ben