summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-04-18 17:10:30 +0200
committerWolfgang Denk <wd@denx.de>2007-04-18 17:10:30 +0200
commit1d10b9e99d1b4a6a880d424ec791cde45cb04614 (patch)
treed3826be897f57a1d85797fb96e15dae8c360fbe7
parent2a26ec4732efd7a308d0bbc97714c1d75ef1173b (diff)
parent443feb740584e406efa203af909fe2926608e8d5 (diff)
downloadu-boot-imx-1d10b9e99d1b4a6a880d424ec791cde45cb04614.zip
u-boot-imx-1d10b9e99d1b4a6a880d424ec791cde45cb04614.tar.gz
u-boot-imx-1d10b9e99d1b4a6a880d424ec791cde45cb04614.tar.bz2
Merge with /home/wd/git/u-boot/custodian/u-boot-net
-rw-r--r--doc/README.NetConsole5
-rw-r--r--net/net.c20
2 files changed, 25 insertions, 0 deletions
diff --git a/doc/README.NetConsole b/doc/README.NetConsole
index cc35a0a..fea8e33 100644
--- a/doc/README.NetConsole
+++ b/doc/README.NetConsole
@@ -38,6 +38,11 @@ The script expects exactly one argument, which is interpreted as the
target IP address (or host name, assuming DNS is working). The script
can be interrupted by pressing ^T (CTRL-T).
+Be aware that in some distributives (Fedora Core 5 at least)
+usage of nc has been changed and -l and -p options are considered
+as mutually exclusive. If nc complains about options provided,
+you can just remove the -p option from the script.
+
It turns out that 'netcat' cannot be used to listen to broadcast
packets. We developed our own tool 'ncb' (see tools directory) that
listens to broadcast packets on a given port and dumps them to the
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;