From Alexis La Goutte:

A patch to enhance the ICMPv6 dissector
- Make ICMP Type (sub)field filterable
- Add Inverse Neighbor Discovery (RFC 3122)
- Remove dependency to packet-ipv6.h
- Cleanup packet-ipv6.h
- Update RFC Draft to draft-ietf-roll-rpl-17 (with make a sub dissector
  for RPL Control and add Secure RPL...)
- Replace tvb_get_ipv6/ip6_to_str by new function tvb_ip6_to_str
- and other enchancements.....

svn path=/trunk/; revision=35586

1 files changed, 0 insertions, 302 deletions

diff --git a/epan/dissectors/packet-ipv6.h b/epan/dissectors/packet-ipv6.h
index 34658981e8..03fb6bf9ad 100644
--- a/epan/dissectors/packet-ipv6.h
+++ b/epan/dissectors/packet-ipv6.h
@@ -210,308 +210,6 @@ struct ip6_shim {
 #define IP6F_RESERVED_MASK	0x0006	/* reserved bits in ip6f_offlg */
 #define IP6F_MORE_FRAG		0x0001	/* more-fragments flag */
 
-/*
- * 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 */
-
-#define ICMP6_WRUREQUEST			139	/* who are you request */
-#define ICMP6_WRUREPLY				140	/* who are you reply */
-#define ICMP6_FQDN_QUERY			139	/* FQDN query */
-#define ICMP6_FQDN_REPLY			140	/* FQDN reply */
-#define ICMP6_NI_QUERY				139	/* node information request */
-#define ICMP6_NI_REPLY				140	/* node information reply */
-#define ICMP6_IND_SOLICIT			141	/* Inverse ND Solicitation */
-#define ICMP6_IND_ADVERT			142	/* Inverse ND advertisement */
-#define ICMP6_MLDV2_REPORT			143	/* MLD v2 report message : [RFC3810] */
-
-#define ICMP6_MIP6_DHAAD_REQUEST	144	/* Mobile IPv6 DHAAD */
-#define ICMP6_MIP6_DHAAD_REPLY		145	/* Mobile IPv6 DHAAD */
-#define ICMP6_MIP6_MPS				146	/* Mobile IPv6 MPS */
-#define ICMP6_MIP6_MPA				147	/* Mobile IPv6 MPA */
-#define ICMP6_CERT_PATH_SOL			148 /* Certification Path Solicitation Message          [RFC3971] */
-#define ICMP6_CERT_PATH_AD			149 /* Certification Path Advertisement Message         [RFC3971] */
-#define ICMP6_EXPERIMENTAL_MOBILITY	150	/* ICMP Experimental Mobility Protocol Type */
-
-#define ICMP6_MCAST_ROUTER_ADVERT		151 /* Multicast Router Advertisement                   [RFC4286] */
-#define ICMP6_MCAST_ROUTER_SOLICIT		152 /* Multicast Router Solicitation                    [RFC4286] */
-#define ICMP6_MCAST_ROUTER_TERM			153 /* Multicast Router Termination                     [RFC4286] */
-#define ICMP6_FMIPV6_MESSAGES			154 /* FMIPv6 Messages       [RFC-ietf-mipshop-rfc5268bis-01.txt] */
-#define ICMP6_RPL_CONTROL		155 /* RPL control messages  [draft-ietf-roll-rpl-12.txt] */
-                                            /* (Pending IANA Assignment) */
-
-#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(obsolete) */
-#define ICMP6_DST_UNREACH_BEYONDSCOPE	2	/* beyond scope of source address */
-#define ICMP6_DST_UNREACH_ADDR			3	/* address unreachable */
-#define ICMP6_DST_UNREACH_NOPORT		4	/* port unreachable */
-#define ICMP6_DST_UNREACH_INGR_EGR		5	/* source address failed ingress/egress policy */
-#define ICMP6_DST_UNREACH_REJECT		6	/* reject route to destination */
-
-#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_NI_SUBJ_IPV6	0	/* Query Subject is an IPv6 address */
-#define ICMP6_NI_SUBJ_FQDN	1	/* Query Subject is a Domain name */
-#define ICMP6_NI_SUBJ_IPV4	2	/* Query Subject is an IPv4 address */
-
-#define ICMP6_NI_SUCCESS	0	/* node information successful reply */
-#define ICMP6_NI_REFUSED	1	/* node information request is refused */
-#define ICMP6_NI_UNKNOWN	2	/* unknown Qtype */
-
-#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 */
-
-
-/*
- * 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_FLAG_HOME_AGENT	0x20
-
-/*
- * Router preference values based on RFC4191.
- */
-#define ND_RA_FLAG_RTPREF_MASK	0x18 /* 00011000 */
-#define ND_RA_FLAG_RESERV_MASK	0xE7 /* 11100111 */
-
-#define ND_RA_FLAG_RTPREF_HIGH		0x01
-#define ND_RA_FLAG_RTPREF_MEDIUM	0x00
-#define ND_RA_FLAG_RTPREF_LOW		0x03
-#define ND_RA_FLAG_RTPREF_RSV		0x02
-
-#define ND_RA_FLAG_ND_PROXY     0x04 /* RFC 4389 */
-
-#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]
-#define ND_NA_FLAG_ROUTER		0x80000000
-#define ND_NA_FLAG_SOLICITED		0x40000000
-#define ND_NA_FLAG_OVERRIDE		0x20000000
-
-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_OPT_PI_FLAG_ONLINK		0x80
-#define ND_OPT_PI_FLAG_AUTO		0x40
-#define ND_OPT_PI_FLAG_ROUTER		0x20
-#define ND_OPT_PI_FLAG_SITEPREF		0x10
-
-#define ND_OPT_MAP_FLAG_R	0x80
-#define ND_OPT_MAP_FLAG_M	0x40
-#define ND_OPT_MAP_FLAG_I	0x20
-#define ND_OPT_MAP_FLAG_T	0x10
-#define ND_OPT_MAP_FLAG_P	0x08
-#define ND_OPT_MAP_FLAG_V	0x04
-
-#define ND_OPT_6CO_FLAG_C        0x10
-#define ND_OPT_6CO_FLAG_CID      0x0F
-#define ND_OPT_6CO_FLAG_RESERVED 0xE0
-
-/*
- * icmp6 node information
- */
-struct icmp6_nodeinfo {
-	struct icmp6_hdr icmp6_ni_hdr;
-	guint8 icmp6_ni_nonce[8];
-	/* could be followed by reply data */
-};
-
-#define ni_type		icmp6_ni_hdr.icmp6_type
-#define ni_code		icmp6_ni_hdr.icmp6_code
-#define ni_cksum	icmp6_ni_hdr.icmp6_cksum
-#define ni_qtype	icmp6_ni_hdr.icmp6_data16[0]
-#define ni_flags	icmp6_ni_hdr.icmp6_data16[1]
-
-/*
- * FMIPv6
- */
-
-#define FMIP6_SUBTYPE_RTSOLPR   2   /* Router Solicitation for Proxy Advertisement                  */
-#define FMIP6_RTSOLPR_CODE      0   /* Currently the only code for RTSOLPR                          */
-
-#define FMIP6_SUBTYPE_PRRTADV   3   /* Proxy Router Advertisement                                   */
-#define FMIP6_PRRTADV_MNTUP     0   /* MN should use AP-ID, AR-info tuple                           */
-#define FMIP6_PRRTADV_NI_HOVER  1   /* LLA of the AP is present, Network Initiated Handover trigger */
-#define FMIP6_PRRTADV_NORTINFO  2   /* No new router information is present                         */
-#define FMIP6_PRRTADV_LIMRTINFO 3   /* Limited new router information is present                    */
-#define FMIP6_PRRTADV_UNSOL     4   /* Subnet info for neighbor Access Points are sent unsolicited  */
-
-#define FMIP6_SUBTYPE_HI        4   /* Handover Initiate                                            */
-#define FMIP6_HI_PCOA           0   /* PAR receives FBU with PCoA as source IP address              */
-#define FMIP6_HI_NOTPCOA        1   /* PAR receives FBU whose source IP address is not PCoA         */
-
-#define FMIP6_SUBTYPE_HACK      5   /* Handover Acknowledge                                         */
-#define FMIP6_HACK_VALID        0   /* Handover Accepted, NCoA valid                                */
-#define FMIP6_HACK_INVALID      1   /* Handover Accepted, NCoA not valid                            */
-#define FMIP6_HACK_INUSE        2   /* Handover Accepted, NCoA in use                               */
-#define FMIP6_HACK_ASSIGNED     3   /* Handover Accepted, NCoA assigned                             */
-#define FMIP6_HACK_NOTASSIGNED  4   /* Handover Accepted, NCoA not assigned                         */
-#define FMIP6_HACK_NOTACCEPTED  128 /* Handover Not Accepted, reason unspecified                    */
-#define FMIP6_HACK_PROHIBITED   129 /* Administratively prohibited                                  */
-#define FMIP6_HACK_INSUFFICIENT 130 /* Insufficient resources                                       */
-
-/* Fast Handover Mobile IPv6 extension: Router Solicitation for Proxy Advertisement (RtSolPr).  */
-struct fmip6_rtsolpr {
-	struct icmp6_hdr fmip6_rtsolpr_hdr;
-};
-#define fmip6_rtsolpr_type     fmip6_rtsolpr_hdr.icmp6_type
-#define fmip6_rtsolpr_code     fmip6_rtsolpr_hdr.icmp6_code
-#define fmip6_rtsolpr_cksum    fmip6_rtsolpr_hdr.icmp6_cksum
-#define fmip6_rtsolpr_subtype  fmip6_rtsolpr_hdr.icmp6_data8[0]
-#define fmip6_rtsolpr_reserved fmip6_rtsolpr_hdr.icmp6_data8[1]
-#define fmip6_rtsolpr_id       fmip6_rtsolpr_hdr.icmp6_data16[1]
-
-/* Fast Handover Mobile IPv6 extension: Proxy Router Advertisement (PrRtAdv).  */
-struct fmip6_prrtadv {
-	struct icmp6_hdr fmip6_prrtadv_hdr;
-};
-
-#define fmip6_prrtadv_type     fmip6_prrtadv_hdr.icmp6_type
-#define fmip6_prrtadv_code     fmip6_prrtadv_hdr.icmp6_code
-#define fmip6_prrtadv_cksum    fmip6_prrtadv_hdr.icmp6_cksum
-#define fmip6_prrtadv_subtype  fmip6_prrtadv_hdr.icmp6_data8[0]
-#define fmip6_prrtadv_reserved fmip6_prrtadv_hdr.icmp6_data8[1]
-#define fmip6_prrtadv_id       fmip6_prrtadv_hdr.icmp6_data16[1]
-
-/* Fast Handover Mobile IPv6 extension: Handover Initiate (HI).  */
-struct fmip6_hi {
-	struct icmp6_hdr fmip6_hi_hdr;
-};
-
-#define fmip6_hi_type           fmip6_hi_hdr.icmp6_type
-#define fmip6_hi_code           fmip6_hi_hdr.icmp6_code
-#define fmip6_hi_cksum          fmip6_hi_hdr.icmp6_cksum
-#define fmip6_hi_subtype        fmip6_hi_hdr.icmp6_data8[0]
-#define fmip6_hi_flags_reserved fmip6_hi_hdr.icmp6_data8[1]
-#define fmip6_hi_id             fmip6_hi_hdr.icmp6_data16[1]
-
-#define FMIP_HI_FLAG_ASSIGNED 0x80
-#define FMIP_HI_FLAG_BUFFER   0x40
-
-/* Fast Handover Mobile IPv6 extension: Handover Acknowledge (HAck).  */
-struct fmip6_hack {
-	struct icmp6_hdr fmip6_hack_hdr;
-};
-
-#define fmip6_hack_type		fmip6_hack_hdr.icmp6_type
-#define fmip6_hack_code		fmip6_hack_hdr.icmp6_code
-#define fmip6_hack_cksum	fmip6_hack_hdr.icmp6_cksum
-#define fmip6_hack_subtype	fmip6_hack_hdr.icmp6_data8[0]
-#define fmip6_hack_reserved	fmip6_hack_hdr.icmp6_data8[1]
-#define fmip6_hack_id		fmip6_hack_hdr.icmp6_data16[1]
-
-
-struct fmip6_opt_hdr {
-    guint8 fmip6_opt_type;
-    guint8 fmip6_opt_len;     /* size of this option in 8 octets including opt_hdr */
-    guint8 fmip6_opt_optcode; /* Option-Code see the definition below              */
-};
-
-
-
 void capture_ipv6(const guchar *, int, int, packet_counts *);