diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-21 20:08:20 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-21 20:08:20 +0000 |
| commit | eabaddaca96a79f609a8235fb09e6151f6b9387f (patch) | |
| tree | d91da11cb14ac06039bc010480a16a42bc7ce141 /epan/dissectors/packet-mpls.c | |
| parent | 9fa6c9fb800199967b5ec44a93fcfaeeed405085 (diff) | |
Remove ethertype, mpls_label and ppids from packet_info structure.
The information was converted to "proto" data within their respective dissectors strictly for use in "Decode As".
svn path=/trunk/; revision=53489
Diffstat (limited to 'epan/dissectors/packet-mpls.c')
| -rw-r--r-- | epan/dissectors/packet-mpls.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c index b4f9c05d6a..95214f148c 100644 --- a/epan/dissectors/packet-mpls.c +++ b/epan/dissectors/packet-mpls.c @@ -319,12 +319,13 @@ static dissector_table_t mpls_subdissector_table; static void mpls_prompt(packet_info *pinfo, gchar* result) { - g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "Data after label %u as", pinfo->mpls_label); + g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "Data after label %u as", + GPOINTER_TO_UINT(p_get_proto_data(pinfo->fd, proto_mpls, 0))); } static gpointer mpls_value(packet_info *pinfo) { - return GUINT_TO_POINTER(pinfo->mpls_label); + return p_get_proto_data(pinfo->fd, proto_mpls, 0); } /* @@ -548,7 +549,8 @@ dissect_mpls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * FF: export (last shim in stack) info to subdissectors and * update pinfo */ - mplsinfo.label = pinfo->mpls_label = label; + mplsinfo.label = label; + p_add_proto_data(pinfo->fd, proto_mpls, 0, GUINT_TO_POINTER(label)); mplsinfo.exp = exp; mplsinfo.bos = bos; mplsinfo.ttl = ttl; |