diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-09-11 17:39:49 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-09-11 17:39:49 +0000 |
| commit | 6986eb4866e2efab4c1289e55ce6dd9402a5bf68 (patch) | |
| tree | bfcbe119a982ec85312d2f9f70e2c42217d0e766 /epan | |
| parent | 2d132d3a38aa272f1eac0c116c7378ae17816b0a (diff) | |
Move a lot of includes from follow_stream_dialog.h to
follow_stream_dialog.cpp. Remove the ones that we don't use. Use
QMessageBox in place of simple_dialog.
Move IP6OPT_HOME_ADDRESS and related definitions to packet-ipv6.c. It
looks like we only use it there and it conflicts with WinPcap.
Mark some items unused.
svn path=/trunk/; revision=51951
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ipv6.c | 24 | ||||
| -rw-r--r-- | epan/dissectors/packet-ipv6.h | 33 |
2 files changed, 31 insertions, 26 deletions
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index f50be8302c..4fac14aab3 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -56,6 +56,30 @@ #include <epan/geoip_db.h> #endif /* HAVE_GEOIP_V6 */ +/* Option types and related macros */ +#define IP6OPT_PAD1 0x00 /* 00 0 00000 */ +#define IP6OPT_PADN 0x01 /* 00 0 00001 */ +#define IP6OPT_TEL 0x04 /* 00 0 00100 */ +#define IP6OPT_RTALERT 0x05 /* 00 0 00101 */ +#define IP6OPT_CALIPSO 0x07 /* 00 0 00111 */ +#define IP6OPT_QUICKSTART 0x26 /* 00 1 00110 */ +#define IP6OPT_ENDI 0x8A /* 10 0 01010 */ +#define IP6OPT_EXP_1E 0x1E /* 00 0 11110 */ +#define IP6OPT_EXP_3E 0x3E /* 00 1 11110 */ +#define IP6OPT_EXP_5E 0x5E /* 01 0 11110 */ +#define IP6OPT_RPL 0x63 /* 01 1 00011 */ +#define IP6OPT_EXP_7E 0x7E /* 01 1 11110 */ +#define IP6OPT_EXP_9E 0x9E /* 10 0 11110 */ +#define IP6OPT_EXP_BE 0xBE /* 10 1 11110 */ +#define IP6OPT_JUMBO 0xC2 /* 11 0 00010 = 194 */ +#define IP6OPT_HOME_ADDRESS 0xC9 /* 11 0 01001 */ +#define IP6OPT_EXP_DE 0xDE /* 11 0 11110 */ +#define IP6OPT_EXP_FE 0xFE /* 11 1 11110 */ + +#define IP6OPT_RTALERT_MLD 0 /* Datagram contains MLD msg */ +#define IP6OPT_RTALERT_RSVP 1 /* Datagram contains RSVP msg */ +#define IP6OPT_RTALERT_ACTNET 2 /* Datagram contains ACTNET msg */ + /* Differentiated Services Field. See RFCs 2474, 2597 and 2598. */ #define IPDSFIELD_DSCP_MASK 0xFC #define IPDSFIELD_ECN_MASK 0x03 diff --git a/epan/dissectors/packet-ipv6.h b/epan/dissectors/packet-ipv6.h index 699a4e763b..8226d1b2bf 100644 --- a/epan/dissectors/packet-ipv6.h +++ b/epan/dissectors/packet-ipv6.h @@ -78,32 +78,6 @@ struct ip6_ext { guchar ip6e_len; }; - -/* Option types and related macros */ -#define IP6OPT_PAD1 0x00 /* 00 0 00000 */ -#define IP6OPT_PADN 0x01 /* 00 0 00001 */ -#define IP6OPT_TEL 0x04 /* 00 0 00100 */ -#define IP6OPT_RTALERT 0x05 /* 00 0 00101 */ -#define IP6OPT_CALIPSO 0x07 /* 00 0 00111 */ -#define IP6OPT_QUICKSTART 0x26 /* 00 1 00110 */ -#define IP6OPT_ENDI 0x8A /* 10 0 01010 */ -#define IP6OPT_EXP_1E 0x1E /* 00 0 11110 */ -#define IP6OPT_EXP_3E 0x3E /* 00 1 11110 */ -#define IP6OPT_EXP_5E 0x5E /* 01 0 11110 */ -#define IP6OPT_RPL 0x63 /* 01 1 00011 */ -#define IP6OPT_EXP_7E 0x7E /* 01 1 11110 */ -#define IP6OPT_EXP_9E 0x9E /* 10 0 11110 */ -#define IP6OPT_EXP_BE 0xBE /* 10 1 11110 */ -#define IP6OPT_JUMBO 0xC2 /* 11 0 00010 = 194 */ -#define IP6OPT_HOME_ADDRESS 0xC9 /* 11 0 01001 */ -#define IP6OPT_EXP_DE 0xDE /* 11 0 11110 */ -#define IP6OPT_EXP_FE 0xFE /* 11 1 11110 */ - -#define IP6OPT_RTALERT_MLD 0 /* Datagram contains MLD msg */ -#define IP6OPT_RTALERT_RSVP 1 /* Datagram contains RSVP msg */ -#define IP6OPT_RTALERT_ACTNET 2 /* Datagram contains ACTNET msg */ - - /* Routing header */ struct ip6_rthdr { guint8 ip6r_nxt; /* next header */ @@ -192,7 +166,14 @@ struct ip6_shim { #define IP6F_RESERVED_MASK 0x0006 /* reserved bits in ip6f_offlg */ #define IP6F_MORE_FRAG 0x0001 /* more-fragments flag */ +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + void capture_ipv6(const guchar *, int, int, packet_counts *); +#ifdef __cplusplus +} +#endif /* __cplusplus */ #endif /* __PACKET_IPV6_H_DEFINED__ */ |