Initial IPv6 support

new file mode 100644
index 0000000..03bccb2
@@ -0,0 +1,43 @@
+/**
+ * Simple IPv6 network layer implementation.
+ *
+ * Based and/or adapted from the IPv4 network layer in net.[hc]
+ *
+ * (C) Copyright 2013 Allied Telesis Labs NZ
+ *
+ * This file is released under the terms of GPL v2 and any later version.
+ * See the file COPYING in the root directory of the source tree for details.
+ */
+#ifndef __NET6_H__
+#define __NET6_H__
+
+typedef union ip6addr_t {
+	__u8	u6_addr8[16];
+	__be16	u6_addr16[8];
+	__be32	u6_addr32[4];
+} IP6addr_t;
+
+/**
+ * struct ipv6hdr - Internet Protocol V6 (IPv6) header.
+ *
+ * IPv6 packet header as defined in RFC 2460.
+ */
+struct ip6_hdr {
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+	__u8    priority:4,
+		version:4;
+#elif defined(__BIG_ENDIAN_BITFIELD)
+	__u8    version:4,
+		priority:4;
+#else
+#error  "Please fix <asm/byteorder.h>"
+#endif
+	__u8		flow_lbl[3];
+	__be16		payload_len;
+	__u8		nexthdr;
+	__u8		hop_limit;
+	IP6addr_t	saddr;
+	IP6addr_t	daddr;
+};
+
+#endif /* __NET6_H__ */

index 03bccb2..bdb4326 100644
@@ -40,4 +40,17 @@ struct ip6_hdr {
 	IP6addr_t	daddr;
 };
 
+/* ::ffff:0:0/96 is reserved for v4 mapped addresses */
+static inline int ipv6_addr_v4mapped(const IP6addr_t *a)
+{
+	return (a->u6_addr32[0] | a->u6_addr32[1] |
+			(a->u6_addr32[2] ^ htonl(0x0000ffff))) == 0;
+}
+
+/* Intra-Site Automatic Tunnel Addressing Protocol Address */
+static inline int ipv6_addr_is_isatap(const IP6addr_t *a)
+{
+	return (a->u6_addr32[2] | htonl(0x02000000)) == htonl(0x02005EFE);
+}
+
 #endif /* __NET6_H__ */

189 lines not on this page · raw message

index b425a68..afe0c16 100644
@@ -38,12 +38,17 @@ IPaddr_t string_to_ip(const char *s)
 		return(0);
 
 	for (addr=0, i=0; i<4; ++i) {
-		ulong val = s ? simple_strtoul(s, &e, 10) : 0;
+		ulong val = simple_strtoul(s, &e, 10);
+		if (val > 255)
+			return 0;
 		addr <<= 8;
-		addr |= (val & 0xFF);
-		if (s) {
-			s = (*e) ? e+1 : e;
-		}
+		addr |= val;
+		if (*e == '.')
+			s = e+1;
+		else if (*e == '\0')
+			break;
+		else
+			return 0;
 	}
 
 	return (htonl(addr));

index bdb4326..55ab187 100644
@@ -53,4 +53,7 @@ static inline int ipv6_addr_is_isatap(const IP6addr_t *a)
 	return (a->u6_addr32[2] | htonl(0x02000000)) == htonl(0x02005EFE);
 }
 
+/* Convert a string to an ipv6 address */
+extern int string_to_ip6(const char *s, IP6addr_t *addr);
+
 #endif /* __NET6_H__ */

123 lines not on this page · raw message

index 4ad17ea..59cd2eb 100644
@@ -842,6 +842,12 @@ static inline IPaddr_t getenv_IPaddr(char *var)
 	return string_to_ip(getenv(var));
 }
 
+#include <net6.h>
+static inline int getenv_IP6addr(char *var, IP6addr_t *a)
+{
+	return string_to_ip6(getenv(var), a);
+}
+
 /*
  * CONSOLE multiplexing.
  */

index 1c80b25..c783ddc 100644
@@ -27,7 +27,6 @@
  */
 
 #include <common.h>
-#include <net6.h>
 #include <linux/ctype.h>
 
 IPaddr_t string_to_ip(const char *s)

index f5e314b..005413b 100644
@@ -361,6 +361,10 @@ static void startup_tsec(struct eth_device *dev)
 	if ((SVR_MAJ(svr) == 1) || IS_SVR_REV(svr, 2, 0))
 		redundant_init(dev);
 #endif
+#ifdef CONFIG_CMD_NET6
+	/* Enable promiscuous mode */
+	setbits_be32(&regs->rctrl, 0x8);
+#endif
 	/* Enable Transmit and Receive */
 	setbits_be32(&regs->maccfg1, MACCFG1_RX_EN | MACCFG1_TX_EN);
 

index 3b93ef2..9d09ab7 100644
@@ -27,6 +27,7 @@
 #include <common.h>
 #include <command.h>
 #include <net.h>
+#include <net6.h>
 
 static int netboot_common(enum proto_t, cmd_tbl_t *, int, char * const []);
 

@@ -298,6 +299,32 @@ U_BOOT_CMD(
 	"send ICMP ECHO_REQUEST to network host",
 	"pingAddress"
 );
+
+#ifdef CONFIG_CMD_NET6
+int do_ping6(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+	if (argc < 2)
+		return -1;
+
+	if (string_to_ip6(argv[1], &NetPingIP6) != 0)
+		return CMD_RET_USAGE;
+
+	if (NetLoop(PING6) < 0) {
+		printf("ping6 failed; host %pI6c is not alive\n", &NetPingIP6);
+		return 1;
+	}
+
+	printf("host %pI6c is alive\n", &NetPingIP6);
+
+	return 0;
+}
+
+U_BOOT_CMD(
+	ping6,  2,      1,      do_ping6,
+	"send ICMPv6 ECHO_REQUEST to network host",
+	"pingAddress"
+);
+#endif /* CONFIG_CMD_NET6 */
 #endif
 
 #if defined(CONFIG_CMD_CDP)

index 970d4d1..48dad5d 100644
@@ -239,6 +239,7 @@ struct vlan_ethernet_hdr {
 #define VLAN_ETHER_HDR_SIZE	(sizeof(struct vlan_ethernet_hdr))
 
 #define PROT_IP		0x0800		/* IP protocol			*/
+#define PROT_IP6        0x86DD          /* IPv6 protocol		*/
 #define PROT_ARP	0x0806		/* IP ARP protocol		*/
 #define PROT_RARP	0x8035		/* IP ARP protocol		*/
 #define PROT_VLAN	0x8100		/* IEEE 802.1q protocol		*/

@@ -436,8 +437,8 @@ extern ushort		NetOurNativeVLAN;	/* Our Native VLAN */
 extern int		NetRestartWrap;		/* Tried all network devices */
 
 enum proto_t {
-	BOOTP, RARP, ARP, TFTPGET, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP,
-	TFTPSRV, TFTPPUT, LINKLOCAL
+	BOOTP, RARP, ARP, TFTPGET, DHCP, PING, PING6, DNS, NFS, CDP, NETCONS,
+	SNTP, TFTPSRV, TFTPPUT, TFTP6, LINKLOCAL
 };
 
 /* from net/net.c */

224 lines not on this page · raw message

276 lines not on this page · raw message

new file mode 100644
index 0000000..9c9fd49
@@ -0,0 +1,29 @@
+/*
+ * net/ndisc.h
+ *
+ * (C) Copyright 2013 Allied Telesis Labs NZ
+ *
+ * This file is released under the terms of GPL v2 and any later version.
+ * See the file COPYING in the root directory of the source tree for details.
+ */
+
+/* IPv6 destination address of packet waiting for ND */
+extern IP6addr_t NetNDSolPacketIP6;
+/* IPv6 address we are expecting ND advert from */
+extern IP6addr_t NetNDRepPacketIP6;
+/* MAC destination address of packet waiting for ND */
+extern uchar *NetNDPacketMAC;
+/* pointer to packet waiting to be transmitted after ND is resolved */
+extern uchar *NetNDTxPacket;
+extern uchar NetNDPacketBuf[PKTSIZE_ALIGN + PKTALIGN];
+/* size of packet waiting to be transmitted */
+extern int NetNDTxPacketSize;
+/* the timer for ND resolution */
+extern ulong NetNDTimerStart;
+/* the number of requests we have sent so far */
+extern int NetNDTry;
+
+
+void ndisc_receive(struct ethernet_hdr *et, struct ip6_hdr *ip6, int len);
+void ip6_NDISC_Request(void);
+void ip6_NDISC_TimeoutCheck(void);

index a40cde1..531b2e4 100644
@@ -84,6 +84,7 @@
 #include <command.h>
 #include <environment.h>
 #include <net.h>
+#include <net6.h>
 #if defined(CONFIG_STATUS_LED)
 #include <miiphy.h>
 #include <status_led.h>

@@ -269,9 +270,22 @@ static void NetInitLoop(void)
 #if defined(CONFIG_CMD_DNS)
 		NetOurDNSIP = getenv_IPaddr("dnsip");
 #endif
+#ifdef CONFIG_CMD_NET6
+		getenv_IP6addr("ipaddr6", &NetOurIP6);
+		getenv_IP6addr("gatewayip6", &NetOurGatewayIP6);
+		if (getenv("prefixlength6"))
+			NetPrefixLength =
+				simple_strtoul(getenv("prefixlength6"),
+					       NULL, 10);
+		else
+			NetPrefixLength = 64;
+#endif
 		env_changed_id = env_id;
 	}
 	memcpy(NetOurEther, eth_get_dev()->enetaddr, 6);
+#ifdef CONFIG_CMD_NET6
+	ip6_make_lladdr(&NetOurLinkLocalIP6, NetOurEther);
+#endif
 
 	return;
 }

@@ -304,6 +318,9 @@ void net_init(void)
 			NetRxPackets[i] = NetTxPacket + (i + 1) * PKTSIZE_ALIGN;
 
 		ArpInit();
+#ifdef CONFIG_CMD_NET6
+		ip6_NDISC_init();
+#endif
 		net_clear_handlers();
 
 		/* Only need to setup buffer pointers once. */

@@ -402,6 +419,11 @@ restart:
 		case PING:
 			ping_start();
 			break;
+#ifdef CONFIG_CMD_NET6
+		case PING6:
+			ping6_start();
+			break;
+#endif
 #endif
 #if defined(CONFIG_CMD_NFS)
 		case NFS:

@@ -489,6 +511,9 @@ restart:
 		}
 
 		ArpTimeoutCheck();
+#ifdef CONFIG_CMD_NET6
+		ip6_NDISC_TimeoutCheck();
+#endif
 
 		/*
 		 *	Check for a timeout, and run the timeout handler

@@ -1053,6 +1078,11 @@ NetReceive(uchar *inpkt, int len)
 		rarp_receive(ip, len);
 		break;
 #endif
+#ifdef CONFIG_CMD_NET6
+	case PROT_IP6:
+		NetIP6PacketHandler(et, (struct ip6_hdr *)ip, len);
+		break;
+#endif
 	case PROT_IP:
 		debug_cond(DEBUG_NET_PKT, "Got IP\n");
 		/* Before we start poking the header, make sure it is there */

@@ -1207,6 +1237,14 @@ static int net_check_prereq(enum proto_t protocol)
 			return 1;
 		}
 		goto common;
+#ifdef CONFIG_CMD_NET6
+	case PING6:
+		if (ip6_is_unspecified_addr(&NetPingIP6)) {
+			puts("*** ERROR: ping address not given\n");
+			return 1;
+		}
+		goto common;
+#endif
 #endif
 #if defined(CONFIG_CMD_SNTP)
 	case SNTP:

349 lines not on this page · raw message

115 lines not on this page · raw message