UPSTREAM: net: tftpput: Add support for receiving ICMP packets

ICMP packets can tell you when there is no server at the other end. It
is useful for tftp to figure this out, so that a quick error can be
displayed, rather than pointlessly retrying.

This adds an ICMP packet handler to the net interface.

Signed-off-by: Simon Glass <sjg@chromium.org>
(cherry picked from commit 4793ee6522f10a3d108de7e47adbcf5f15eb3f46)

Change-Id: I02bbd41b3852b92b06210db160a06c62f5bf414f
Reviewed-on: https://gerrit.chromium.org/gerrit/11795
Commit-Ready: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>

2 files changed, 43 insertions, 3 deletions

diff --git a/include/net.h b/include/net.h
index 01932054714..9e3a8f5f4d0 100644
--- a/include/net.h
+++ b/include/net.h
@@ -84,6 +84,19 @@ typedef void rxhand_f(uchar *pkt, unsigned dport,
 		      IPaddr_t sip, unsigned sport,
 		      unsigned len);
 
+/**
+ * An incoming ICMP packet handler.
+ * @param type	ICMP type
+ * @param code	ICMP code
+ * @param dport	destination UDP port
+ * @param sip	source IP address
+ * @param sport	source UDP port
+ * @param pkt	pointer to the ICMP packet data
+ * @param len	packet length
+ */
+typedef void rxhand_icmp_f(unsigned type, unsigned code, unsigned dport,
+		IPaddr_t sip, unsigned sport, uchar *pkt, unsigned len);
+
 /*
  *	A timeout handler.  Called after time interval has expired.
  */
@@ -260,6 +273,7 @@ typedef struct
  * ICMP stuff (just enough to handle (host) redirect messages)
  */
 #define ICMP_ECHO_REPLY		0	/* Echo reply			*/
+#define ICMP_NOT_REACH		3	/* Detination unreachable	*/
 #define ICMP_REDIRECT		5	/* Redirect (change route)	*/
 #define ICMP_ECHO_REQUEST	8	/* Echo request			*/
 
@@ -267,6 +281,9 @@ typedef struct
 #define ICMP_REDIR_NET		0	/* Redirect Net			*/
 #define ICMP_REDIR_HOST		1	/* Redirect Host		*/
 
+/* Codes for NOT_REACH */
+#define ICMP_NOT_REACH_PORT	3	/* Port unreachable		*/
+
 typedef struct icmphdr {
 	uchar		type;
 	uchar		code;
@@ -281,6 +298,7 @@ typedef struct icmphdr {
 			ushort	__unused;
 			ushort	mtu;
 		} frag;
+		uchar data[0];
 	} un;
 } ICMP_t;
 
@@ -415,6 +433,7 @@ extern uint	NetCksum(uchar *, int);		/* Calculate the checksum	*/
 
 /* Set callbacks */
 extern void	NetSetHandler(rxhand_f *);	/* Set RX packet handler	*/
+extern void net_set_icmp_handler(rxhand_icmp_f *f); /* Set ICMP RX handler */
 extern void	NetSetTimeout(ulong, thand_f *);/* Set timeout handler		*/
 
 /* Transmit "NetTxPacket" */
diff --git a/net/net.c b/net/net.c
index 759cb8d2948..5eaf5333550 100644
--- a/net/net.c
+++ b/net/net.c
@@ -217,6 +217,7 @@ volatile uchar *NetRxPackets[PKTBUFSRX];
 
 /* Current RX packet handler */
 static rxhand_f *packetHandler;
+static rxhand_icmp_f *packet_icmp_handler;	/* Current ICMP rx handler */
 /* Current timeout handler */
 static thand_f *timeHandler;
 /* Time base value */
@@ -346,6 +347,7 @@ int
 NetLoop(proto_t protocol)
 {
 	bd_t *bd = gd->bd;
+	int ret = -1;
 
 #ifdef CONFIG_NET_MULTI
 	NetRestarted = 0;
@@ -527,7 +529,7 @@ restart:
 		if (ctrlc()) {
 			eth_halt();
 			puts("\nAbort\n");
-			return -1;
+			goto done;
 		}
 
 		ArpTimeoutCheck();
@@ -581,12 +583,19 @@ restart:
 				setenv("fileaddr", buf);
 			}
 			eth_halt();
-			return NetBootFileXferSize;
+			ret = NetBootFileXferSize;
+			goto done;
 
 		case NETLOOP_FAIL:
-			return -1;
+			goto done;
 		}
 	}
+
+done:
+	/* Clear out the handlers */
+	NetSetHandler(NULL);
+	net_set_icmp_handler(NULL);
+	return ret;
 }
 
 /**********************************************************************/
@@ -665,6 +674,10 @@ NetSetHandler(rxhand_f *f)
 	packetHandler = f;
 }
 
+void net_set_icmp_handler(rxhand_icmp_f *f)
+{
+	packet_icmp_handler = f;
+}
 
 void
 NetSetTimeout(ulong iv, thand_f *f)
@@ -1409,6 +1422,10 @@ static void receive_icmp(IP_t *ip, int len, IPaddr_t src_ip, Ethernet_t *et)
 		break;
 #endif
 	default:
+		if (packet_icmp_handler)
+			packet_icmp_handler(icmph->type, icmph->code,
+				ntohs(ip->udp_dst), src_ip, ntohs(ip->udp_src),
+				icmph->un.data, ntohs(ip->udp_len));
 		break;
 	}
 }
@@ -1697,6 +1714,10 @@ NetReceive(volatile uchar *inpkt, int len)
 		 * subnet. So this is probably a warning that your
 		 * configuration might be wrong. But I'm not really
 		 * sure if there aren't any other situations.
+		 *
+		 * Simon Glass <sjg@chromium.org>: We get an ICMP when
+		 * we send a tftp packet to a dead connection, or when
+		 * there is no server at the other end.
 		 */
 		if (ip->ip_p == IPPROTO_ICMP) {
 			receive_icmp(ip, len, src_ip, et);