diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-03-11 19:05:32 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-03-11 19:05:32 +0000 |
| commit | 55ca59ffb94242b717c7b24fd2a9872f8fccf49a (patch) | |
| tree | 3439036cf5aae1b1ea9ca0c8a63af67cd0c74c39 /epan/dissectors/packet-mpls.h | |
| parent | 69b533085bcbd4c2a90e8a96fb971dda00f68465 (diff) | |
From Francesco Fondelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6787
Move Y.1711 out of MPLS dissector
ITU-T Y.1711 code was "embedded" into the MPLS dissector in 2006.
This patch moves it into its own dissector.
From me :
Fix a Clang warning
svn path=/trunk/; revision=41486
Diffstat (limited to 'epan/dissectors/packet-mpls.h')
| -rw-r--r-- | epan/dissectors/packet-mpls.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/epan/dissectors/packet-mpls.h b/epan/dissectors/packet-mpls.h index df038c61d3..d1d367a992 100644 --- a/epan/dissectors/packet-mpls.h +++ b/epan/dissectors/packet-mpls.h @@ -38,10 +38,21 @@ enum { LABEL_ROUTER_ALERT, LABEL_IP6_EXPLICIT_NULL, LABEL_IMPLICIT_NULL, + LABEL_GACH = 13, /* aka GAL */ LABEL_OAM_ALERT = 14, LABEL_MAX_RESERVED = 15, - LABEL_GACH = 13, - LABEL_INVALID = 0xffffffff + LABEL_INVALID = 0xffffffff +}; + +/* + * FF: private data passed from the MPLS dissector to subdissectors + * (pinfo->private_data). + */ +struct mplsinfo { + guint32 label; /* last mpls label in label stack */ + guint8 exp; /* former EXP bits of last mpls shim in stack */ + guint8 bos; /* BOS bit of last mpls shim in stack */ + guint8 ttl; /* TTL bits of last mpls shim in stack */ }; extern const value_string special_labels[]; @@ -49,7 +60,8 @@ extern void decode_mpls_label(tvbuff_t *tvb, int offset, guint32 *label, guint8 *exp, guint8 *bos, guint8 *ttl); -extern gboolean dissect_try_cw_first_nibble( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ); +extern gboolean dissect_try_cw_first_nibble(tvbuff_t *tvb, packet_info *pinfo, + proto_tree *tree ); void dissect_mpls_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); #endif |