Jun-ichiro's IPv6 patch is merged in with ethereal and now uses the new

proto*() functions. The configure script tries to use ipv6 name resolution if
it knows the type of ipv6 stack the user has (this can be avoided with the
--disable-ipv6 switch) Additionally, the configure script now deals with wiretap
better. If the user doesn't want to compile wiretap, the wiretap is never
visited. A few unnecessary #includes were removed from some wiretap files, and
a CPP macro was moved from bpf.c to wtap.h.

svn path=/trunk/; revision=229

1 files changed, 478 insertions, 8 deletions

diff --git a/packet-ipv6.h b/packet-ipv6.h
index 75ac3d9dd0..f37465ebad 100644
--- a/packet-ipv6.h
+++ b/packet-ipv6.h
@@ -1,8 +1,478 @@
-typedef struct _e_ipv6_header{
-    /* the version contains 4-bit version and 4-bit priority */
-    guint8 	version;
-    guint8 	flow_label[3];
-    guint16 	payload_length;
-    guint8	next_header;
-    guint8	hop_limit;
-} e_ipv6_header;
+#ifndef __PACKET_IPV6_H_DEFINED__
+#define __PACKET_IPV6_H_DEFINED__
+
+struct e_in6_addr {
+	union {
+		guint32  u6_addr32[4];
+		guint16  u6_addr16[8];
+		guint8   u6_addr8[16];
+	} u6_addr;			/* 128 bit IP6 address */
+};
+
+#define s6_addr32 u6_addr.u6_addr32
+#define s6_addr16 u6_addr.u6_addr16
+#define s6_addr8  u6_addr.u6_addr8
+#define s6_addr   u6_addr.u6_addr8
+
+#define INET6_ADDRSTRLEN	46
+
+/*
+ * Definition for internet protocol version 6.
+ * RFC 1883
+ */
+struct ip6_hdr {
+	union {
+		struct ip6_hdrctl {
+			guint32 ip6_un1_flow;	/* 20 bits of flow-ID */
+			guint16 ip6_un1_plen;	/* payload length */
+			guint8  ip6_un1_nxt;	/* next header */
+			guint8  ip6_un1_hlim;	/* hop limit */
+		} ip6_un1;
+		guint8 ip6_un2_vfc;	/* 4 bits version, 4 bits class */
+	} ip6_ctlun;
+	struct e_in6_addr ip6_src;	/* source address */
+	struct e_in6_addr ip6_dst;	/* destination address */
+};
+
+#define ip6_vfc		ip6_ctlun.ip6_un2_vfc
+#define ip6_flow	ip6_ctlun.ip6_un1.ip6_un1_flow
+#define ip6_plen	ip6_ctlun.ip6_un1.ip6_un1_plen
+#define ip6_nxt		ip6_ctlun.ip6_un1.ip6_un1_nxt
+#define ip6_hlim	ip6_ctlun.ip6_un1.ip6_un1_hlim
+#define ip6_hops	ip6_ctlun.ip6_un1.ip6_un1_hlim
+
+#define IPV6_VERSION		0x60
+#define IPV6_VERSION_MASK	0xf0
+
+#if BYTE_ORDER == BIG_ENDIAN
+#define IPV6_FLOWINFO_MASK	0x0fffffff	/* flow info (28 bits) */
+#define IPV6_FLOWLABEL_MASK	0x000fffff	/* flow label (20 bits) */
+#endif /* BIG_ENDIAN */
+#if BYTE_ORDER == LITTLE_ENDIAN
+#define IPV6_FLOWINFO_MASK	0xffffff0f	/* flow info (28 bits) */
+#define IPV6_FLOWLABEL_MASK	0xffff0f00	/* flow label (20 bits) */
+#endif /* LITTLE_ENDIAN */
+
+/*
+ * Extension Headers
+ */
+
+struct	ip6_ext {
+	u_char	ip6e_nxt;
+	u_char	ip6e_len;
+};
+
+/* Hop-by-Hop options header */
+/* XXX should we pad it to force alignment on an 8-byte boundary? */
+struct ip6_hbh {
+	guint8 ip6h_nxt;	/* next header */
+	guint8 ip6h_len;	/* length in units of 8 octets */
+	/* followed by options */
+};
+
+/* Destination options header */
+/* XXX should we pad it to force alignment on an 8-byte boundary? */
+struct ip6_dest {
+	guint8 ip6d_nxt;	/* next header */
+	guint8 ip6d_len;	/* length in units of 8 octets */
+	/* followed by options */
+};
+
+/* Option types and related macros */
+#define IP6OPT_PAD1		0x00	/* 00 0 00000 */
+#define IP6OPT_PADN		0x01	/* 00 0 00001 */
+#define IP6OPT_JUMBO		0xC2	/* 11 0 00010 = 194 */
+#define IP6OPT_JUMBO_LEN	6
+#define IP6OPT_RTALERT		0x05	/* 00 0 00101 */
+#define IP6OPT_RTALERT_LEN	4
+#define IP6OPT_RTALERT_MLD	0	/* Datagram contains MLD message */
+#define IP6OPT_RTALERT_RSVP	1	/* Datagram contains RSVP message */
+#define IP6OPT_MINLEN		2
+
+#define IP6OPT_TYPE(o)		((o) & 0xC0)
+#define IP6OPT_TYPE_SKIP	0x00
+#define IP6OPT_TYPE_DISCARD	0x40
+#define IP6OPT_TYPE_FORCEICMP	0x80
+#define IP6OPT_TYPE_ICMP	0xC0
+
+#define IP6OPT_MUTABLE		0x20
+
+/* Routing header */
+struct ip6_rthdr {
+	guint8  ip6r_nxt;	/* next header */
+	guint8  ip6r_len;	/* length in units of 8 octets */
+	guint8  ip6r_type;	/* routing type */
+	guint8  ip6r_segleft;	/* segments left */
+	/* followed by routing type specific data */
+};
+
+/* Type 0 Routing header */
+struct ip6_rthdr0 {
+	guint8  ip6r0_nxt;		/* next header */
+	guint8  ip6r0_len;		/* length in units of 8 octets */
+	guint8  ip6r0_type;		/* always zero */
+	guint8  ip6r0_segleft;	/* segments left */
+	guint8  ip6r0_reserved;	/* reserved field */
+	guint8  ip6r0_slmap[3];	/* strict/loose bit map */
+	struct e_in6_addr  ip6r0_addr[1];	/* up to 23 addresses */
+};
+
+/* Fragment header */
+struct ip6_frag {
+	guint8  ip6f_nxt;		/* next header */
+	guint8  ip6f_reserved;	/* reserved field */
+	guint16 ip6f_offlg;		/* offset, reserved, and flag */
+	guint32 ip6f_ident;		/* identification */
+};
+
+#if BYTE_ORDER == BIG_ENDIAN
+#define IP6F_OFF_MASK		0xfff8	/* mask out offset from _offlg */
+#define IP6F_RESERVED_MASK	0x0006	/* reserved bits in ip6f_offlg */
+#define IP6F_MORE_FRAG		0x0001	/* more-fragments flag */
+#else /* BYTE_ORDER == LITTLE_ENDIAN */
+#define IP6F_OFF_MASK		0xf8ff	/* mask out offset from _offlg */
+#define IP6F_RESERVED_MASK	0x0600	/* reserved bits in ip6f_offlg */
+#define IP6F_MORE_FRAG		0x0100	/* more-fragments flag */
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+
+/*
+ * Definition for ICMPv6.
+ * RFC 1885
+ */
+
+#define ICMPV6_PLD_MAXLEN	1232	/* IPV6_MMTU - sizeof(struct ip6_hdr)
+					   - sizeof(struct icmp6_hdr) */
+
+struct icmp6_hdr {
+	guint8	icmp6_type;	/* type field */
+	guint8	icmp6_code;	/* code field */
+	guint16	icmp6_cksum;	/* checksum field */
+	union {
+		guint32	icmp6_un_data32[1]; /* type-specific field */
+		guint16	icmp6_un_data16[2]; /* type-specific field */
+		guint8	icmp6_un_data8[4];  /* type-specific field */
+	} icmp6_dataun;
+};
+
+#define icmp6_data32	icmp6_dataun.icmp6_un_data32
+#define icmp6_data16	icmp6_dataun.icmp6_un_data16
+#define icmp6_data8	icmp6_dataun.icmp6_un_data8
+#define icmp6_pptr	icmp6_data32[0]		/* parameter prob */
+#define icmp6_mtu	icmp6_data32[0]		/* packet too big */
+#define icmp6_id	icmp6_data16[0]		/* echo request/reply */
+#define icmp6_seq	icmp6_data16[1]		/* echo request/reply */
+#define icmp6_maxdelay	icmp6_data16[0]		/* mcast group membership */
+
+#define ICMP6_DST_UNREACH		1	/* dest unreachable, codes: */
+#define ICMP6_PACKET_TOO_BIG		2	/* packet too big */
+#define ICMP6_TIME_EXCEEDED		3	/* time exceeded, code: */
+#define ICMP6_PARAM_PROB		4	/* ip6 header bad */
+
+#define ICMP6_ECHO_REQUEST		128	/* echo service */
+#define ICMP6_ECHO_REPLY		129	/* echo reply */
+#define ICMP6_MEMBERSHIP_QUERY		130	/* group membership query */
+#define MLD6_LISTENER_QUERY		130 	/* multicast listener query */
+#define ICMP6_MEMBERSHIP_REPORT		131	/* group membership report */
+#define MLD6_LISTENER_REPORT		131	/* multicast listener report */
+#define ICMP6_MEMBERSHIP_REDUCTION	132	/* group membership termination */
+#define MLD6_LISTENER_DONE		132	/* multicast listener done */
+
+#define ND_ROUTER_SOLICIT		133	/* router solicitation */
+#define ND_ROUTER_ADVERT		134	/* router advertisment */
+#define ND_NEIGHBOR_SOLICIT		135	/* neighbor solicitation */
+#define ND_NEIGHBOR_ADVERT		136	/* neighbor advertisment */
+#define ND_REDIRECT			137	/* redirect */
+
+#define ICMP6_ROUTER_RENUMBERING	138	/* router renumbering */
+
+/* xxx: actually not assigned yet */
+#define ICMP6_WRUREQUEST		140	/* who are you request */
+#define ICMP6_WRUREPLY			141	/* who are you reply */
+#define ICMP6_FQDN_QUERY		140	/* FQDN query */
+#define ICMP6_FQDN_REPLY		141	/* FQDN reply */
+
+#define ICMP6_MAXTYPE			141
+
+#define ICMP6_DST_UNREACH_NOROUTE	0	/* no route to destination */
+#define ICMP6_DST_UNREACH_ADMIN	 	1	/* administratively prohibited */
+#define ICMP6_DST_UNREACH_NOTNEIGHBOR	2	/* not a neighbor */
+#define ICMP6_DST_UNREACH_ADDR		3	/* address unreachable */
+#define ICMP6_DST_UNREACH_NOPORT	4	/* port unreachable */
+
+#define ICMP6_TIME_EXCEED_TRANSIT 	0	/* ttl==0 in transit */
+#define ICMP6_TIME_EXCEED_REASSEMBLY	1	/* ttl==0 in reass */
+
+#define ICMP6_PARAMPROB_HEADER 	 	0	/* erroneous header field */
+#define ICMP6_PARAMPROB_NEXTHEADER	1	/* unrecognized next header */
+#define ICMP6_PARAMPROB_OPTION		2	/* unrecognized option */
+
+#define ICMP6_INFOMSG_MASK		0x80	/* all informational messages */
+
+#define ICMP6_ROUTER_RENUMBERING_COMMAND  0	/* rr command */
+#define ICMP6_ROUTER_RENUMBERING_RESULT   1	/* rr result */
+#define ICMP6_ROUTER_RENUMBERING_SEQNUM_RESET   255	/* rr seq num reset */
+
+/*
+ * Multicast Listener Discovery
+ */
+struct mld6_hdr {
+	struct icmp6_hdr	mld6_hdr;
+	struct e_in6_addr		mld6_addr; /* multicast address */
+};
+
+#define mld6_type	mld6_hdr.icmp6_type
+#define mld6_code	mld6_hdr.icmp6_code
+#define mld6_cksum	mld6_hdr.icmp6_cksum
+#define mld6_maxdelay	mld6_hdr.icmp6_data16[0]
+#define mld6_reserved	mld6_hdr.icmp6_data16[1]
+
+/*
+ * Neighbor Discovery
+ */
+
+struct nd_router_solicit {	/* router solicitation */
+	struct icmp6_hdr 	nd_rs_hdr;
+	/* could be followed by options */
+};
+
+#define nd_rs_type	nd_rs_hdr.icmp6_type
+#define nd_rs_code	nd_rs_hdr.icmp6_code
+#define nd_rs_cksum	nd_rs_hdr.icmp6_cksum
+#define nd_rs_reserved	nd_rs_hdr.icmp6_data32[0]
+
+struct nd_router_advert {	/* router advertisement */
+	struct icmp6_hdr	nd_ra_hdr;
+	guint32		nd_ra_reachable;	/* reachable time */
+	guint32		nd_ra_retransmit;	/* retransmit timer */
+	/* could be followed by options */
+};
+
+#define nd_ra_type		nd_ra_hdr.icmp6_type
+#define nd_ra_code		nd_ra_hdr.icmp6_code
+#define nd_ra_cksum		nd_ra_hdr.icmp6_cksum
+#define nd_ra_curhoplimit	nd_ra_hdr.icmp6_data8[0]
+#define nd_ra_flags_reserved	nd_ra_hdr.icmp6_data8[1]
+#define ND_RA_FLAG_MANAGED	0x80
+#define ND_RA_FLAG_OTHER	0x40
+#define nd_ra_router_lifetime	nd_ra_hdr.icmp6_data16[1]
+
+struct nd_neighbor_solicit {	/* neighbor solicitation */
+	struct icmp6_hdr	nd_ns_hdr;
+	struct e_in6_addr		nd_ns_target;	/*target address */
+	/* could be followed by options */
+};
+
+#define nd_ns_type		nd_ns_hdr.icmp6_type
+#define nd_ns_code		nd_ns_hdr.icmp6_code
+#define nd_ns_cksum		nd_ns_hdr.icmp6_cksum
+#define nd_ns_reserved		nd_ns_hdr.icmp6_data32[0]
+
+struct nd_neighbor_advert {	/* neighbor advertisement */
+	struct icmp6_hdr	nd_na_hdr;
+	struct e_in6_addr		nd_na_target;	/* target address */
+	/* could be followed by options */
+};
+
+#define nd_na_type		nd_na_hdr.icmp6_type
+#define nd_na_code		nd_na_hdr.icmp6_code
+#define nd_na_cksum		nd_na_hdr.icmp6_cksum
+#define nd_na_flags_reserved	nd_na_hdr.icmp6_data32[0]
+#if BYTE_ORDER == BIG_ENDIAN
+#define ND_NA_FLAG_ROUTER		0x80000000
+#define ND_NA_FLAG_SOLICITED		0x40000000
+#define ND_NA_FLAG_OVERRIDE		0x20000000
+#elif BYTE_ORDER == LITTLE_ENDIAN
+#define ND_NA_FLAG_ROUTER		0x80
+#define ND_NA_FLAG_SOLICITED		0x40
+#define ND_NA_FLAG_OVERRIDE		0x20
+#endif
+
+struct nd_redirect {		/* redirect */
+	struct icmp6_hdr	nd_rd_hdr;
+	struct e_in6_addr		nd_rd_target;	/* target address */
+	struct e_in6_addr		nd_rd_dst;	/* destination address */
+	/* could be followed by options */
+};
+
+#define nd_rd_type		nd_rd_hdr.icmp6_type
+#define nd_rd_code		nd_rd_hdr.icmp6_code
+#define nd_rd_cksum		nd_rd_hdr.icmp6_cksum
+#define nd_rd_reserved		nd_rd_hdr.icmp6_data32[0]
+
+struct nd_opt_hdr {		/* Neighbor discovery option header */
+	guint8	nd_opt_type;
+	guint8	nd_opt_len;
+	/* followed by option specific data*/
+};
+
+#define ND_OPT_SOURCE_LINKADDR		1
+#define ND_OPT_TARGET_LINKADDR		2
+#define ND_OPT_PREFIX_INFORMATION	3
+#define ND_OPT_REDIRECTED_HEADER	4
+#define ND_OPT_MTU			5
+
+struct nd_opt_prefix_info {	/* prefix information */
+	guint8	nd_opt_pi_type;
+	guint8	nd_opt_pi_len;
+	guint8	nd_opt_pi_prefix_len;
+	guint8	nd_opt_pi_flags_reserved;
+	guint32	nd_opt_pi_valid_time;
+	guint32	nd_opt_pi_preferred_time;
+	guint32	nd_opt_pi_reserved2;
+	struct e_in6_addr	nd_opt_pi_prefix;
+};
+
+#define ND_OPT_PI_FLAG_ONLINK		0x80
+#define ND_OPT_PI_FLAG_AUTO		0x40
+
+struct nd_opt_rd_hdr {         /* redirected header */
+	guint8	nd_opt_rh_type;
+	guint8	nd_opt_rh_len;
+	guint16	nd_opt_rh_reserved1;
+	guint32	nd_opt_rh_reserved2;
+	/* followed by IP header and data */
+};
+
+struct nd_opt_mtu {		/* MTU option */
+	guint8	nd_opt_mtu_type;
+	guint8	nd_opt_mtu_len;
+	guint16	nd_opt_mtu_reserved;
+	guint32	nd_opt_mtu_mtu;
+};
+
+#if 0
+/* disregard until used. We have to decide how to handle guint64 */ 
+/*
+ * icmp6 namelookup
+ */
+
+struct icmp6_namelookup {
+	struct icmp6_hdr 	icmp6_nl_hdr;
+	guint64	icmp6_nl_nonce;
+	guint32	icmp6_nl_ttl;
+#if 0
+	guint8	icmp6_nl_len;
+	guint8	icmp6_nl_name[3];
+#endif
+	/* could be followed by options */
+};
+#endif
+
+/*
+ * Router Renumbering. as router-renum-05.txt
+ */
+#if BYTE_ORDER == BIG_ENDIAN /* net byte order */
+struct icmp6_router_renum {	/* router renumbering header */
+	struct icmp6_hdr	rr_hdr;
+	guint8		rr_segnum;
+	guint8		rr_test : 1;
+	guint8		rr_reqresult : 1;
+	guint8		rr_forceapply : 1;
+	guint8		rr_specsite : 1;
+	guint8		rr_prevdone : 1;
+	guint8		rr_flags_reserved : 3;
+	guint16		rr_maxdelay;
+	guint32		rr_reserved;
+};
+#elif BYTE_ORDER == LITTLE_ENDIAN
+struct icmp6_router_renum {	/* router renumbering header */
+	struct icmp6_hdr	rr_hdr;
+	guint8		rr_segnum;
+	guint8		rr_flags_reserved : 3;
+	guint8		rr_prevdone : 1;
+	guint8		rr_specsite : 1;
+	guint8		rr_forceapply : 1;
+	guint8		rr_reqresult : 1;
+	guint8		rr_test : 1;
+	guint16		rr_maxdelay;
+	guint32		rr_reserved;
+};
+#endif /* BYTE_ORDER */
+
+#define rr_type			rr_hdr.icmp6_type
+#define rr_code			rr_hdr.icmp6_code
+#define rr_cksum		rr_hdr.icmp6_cksum
+#define rr_seqnum 		rr_hdr.icmp6_data32[0]
+
+struct rr_pco_match {		/* match prefix part */
+	guint8	rpm_code;
+	guint8	rpm_len;
+	guint8	rpm_ordinal;
+	guint8	rpm_matchlen;
+	guint8	rpm_minlen;
+	guint8	rpm_maxlen;
+	guint16	rpm_reserved;
+	struct e_in6_addr	rpm_prefix;
+};
+
+#define RPM_PCO_ADD		1
+#define RPM_PCO_CHANGE		2
+#define RPM_PCO_SETGLOBAL	3
+#define RPM_PCO_MAX		4
+
+#if BYTE_ORDER == BIG_ENDIAN /* net byte order */
+struct rr_pco_use {		/* use prefix part */
+	guint8	rpu_uselen;
+	guint8	rpu_keeplen;
+	guint8	rpu_mask_onlink : 1;
+	guint8	rpu_mask_autonomous : 1;
+	guint8	rpu_mask_reserved : 6;
+	guint8	rpu_onlink : 1;
+	guint8	rpu_autonomous : 1;
+	guint8	rpu_raflags_reserved : 6;
+	guint32	rpu_vltime;
+	guint32	rpu_pltime;
+	guint32	rpu_decr_vltime : 1;
+	guint32	rpu_decr_pltime : 1;
+	guint32	rpu_flags_reserved : 6;
+	guint32	rpu_reserved : 24;
+	struct e_in6_addr rpu_prefix;
+};
+#elif BYTE_ORDER == LITTLE_ENDIAN
+struct rr_pco_use {		/* use prefix part */
+	guint8	rpu_uselen;
+	guint8	rpu_keeplen;
+	guint8	rpu_mask_reserved : 6;
+	guint8	rpu_mask_autonomous : 1;
+	guint8	rpu_mask_onlink : 1;
+	guint8	rpu_raflags_reserved : 6;
+	guint8	rpu_autonomous : 1;
+	guint8	rpu_onlink : 1;
+	guint32	rpu_vltime;
+	guint32	rpu_pltime;
+	guint32	rpu_flags_reserved : 6;
+	guint32	rpu_decr_pltime : 1;
+	guint32	rpu_decr_vltime : 1;
+	guint32	rpu_reserved : 24;
+	struct e_in6_addr rpu_prefix;
+};
+#endif /* BYTE_ORDER */
+
+#if BYTE_ORDER == BIG_ENDIAN /* net byte order */
+struct rr_result {		/* router renumbering result message */
+	guint8	rrr_reserved;
+	guint8	rrr_flags_reserved : 6;
+	guint8	rrr_outofbound : 1;
+	guint8	rrr_forbidden : 1;
+	guint8	rrr_ordinal;
+	guint8	rrr_matchedlen;
+	guint32	rrr_ifid;
+	struct e_in6_addr rrr_prefix;
+};
+#elif BYTE_ORDER == LITTLE_ENDIAN
+struct rr_result {		/* router renumbering result message */
+	guint8	rrr_reserved;
+	guint8	rrr_forbidden : 1;
+	guint8	rrr_outofbound : 1;
+	guint8	rrr_flags_reserved : 6;
+	guint8	rrr_ordinal;
+	guint8	rrr_matchedlen;
+	guint32	rrr_ifid;
+	struct e_in6_addr rrr_prefix;
+};
+#endif /* BYTE_ORDER */
+
+struct e_in6_addr;
+gchar*     ip6_to_str(struct e_in6_addr *);
+
+#endif /* __PACKET_IPV6_H_DEFINED__ */