From Francesco Fondelli: fix mpls "decode as" dialog

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7089

svn path=/trunk/; revision=42195

diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c
index 4ec16eebc753fdb61700ca418a62bd9fc210a7e5..03ccc6690c1df3eb9b680bf5aa57d9eafc99e30f 100644 (file)
--- a/epan/dissectors/packet-mpls.c
+++ b/epan/dissectors/packet-mpls.c
@@ -556,8 +556,11 @@ dissect_mpls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
         decode_mpls_label(tvb, offset, &label, &exp, &bos, &ttl);
 
-        /* FF: export (last shim in stack) info to subdissectors */
-        mplsinfo.label = label;
+        /*
+         * FF: export (last shim in stack) info to subdissectors and
+         * update pinfo
+         */
+        mplsinfo.label = pinfo->mpls_label = label;
         mplsinfo.exp = exp;
         mplsinfo.bos = bos;
         mplsinfo.ttl = ttl;