To make a dissector available for Decode As, just use dissector_add_handle().

No need to use dissector_add_uint() with a bogus value.

Change-Id: Ia5e51d199487ba14cd671c7df44231a0d407c50b
Reviewed-on: https://code.wireshark.org/review/2431
Reviewed-by: Guy Harris <guy@alum.mit.edu>

6 files changed, 16 insertions, 14 deletions

diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c
index eb30c8da95..d8981b0a17 100644
--- a/epan/dissectors/packet-pw-atm.c
+++ b/epan/dissectors/packet-pw-atm.c
@@ -1966,13 +1966,13 @@ proto_reg_handoff_pw_atm_ata(void)
 {
 	dissector_handle_t h;
 	h = find_dissector("mpls_pw_atm_n1_cw");
-	dissector_add_uint( "mpls.label", MPLS_LABEL_INVALID, h );
+	dissector_add_handle( "mpls.label", h );
 	h = find_dissector("mpls_pw_atm_n1_nocw");
-	dissector_add_uint( "mpls.label", MPLS_LABEL_INVALID, h );
+	dissector_add_handle( "mpls.label", h );
 	h = find_dissector("mpls_pw_atm_11_or_aal5_pdu");
-	dissector_add_uint( "mpls.label", MPLS_LABEL_INVALID, h );
+	dissector_add_handle( "mpls.label", h );
 	h = find_dissector("mpls_pw_atm_aal5_sdu");
-	dissector_add_uint( "mpls.label", MPLS_LABEL_INVALID, h );
+	dissector_add_handle( "mpls.label", h );
 
 	dh_cell		   = find_dissector("mpls_pw_atm_cell");
 	dh_cell_header	   = find_dissector("mpls_pw_atm_cell_header");
diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c
index 17bd89878b..5e11207459 100644
--- a/epan/dissectors/packet-pw-cesopsn.c
+++ b/epan/dissectors/packet-pw-cesopsn.c
@@ -456,7 +456,8 @@ void proto_reg_handoff_pw_cesopsn(void)
 {
 	data_handle = find_dissector("data");
 	pw_padding_handle = find_dissector("pw_padding");
-	dissector_add_uint("mpls.label", MPLS_LABEL_INVALID, find_dissector("pw_cesopsn_mpls"));
-	dissector_add_handle("udp.port", find_dissector("pw_cesopsn_udp")); /* For Decode-As */
+	/* For Decode As */
+	dissector_add_handle("mpls.label", find_dissector("pw_cesopsn_mpls"));
+	dissector_add_handle("udp.port", find_dissector("pw_cesopsn_udp"));
 	return;
 }
diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c
index f1ecf9a562..966dc3d563 100644
--- a/epan/dissectors/packet-pw-eth.c
+++ b/epan/dissectors/packet-pw-eth.c
@@ -209,13 +209,13 @@ proto_reg_handoff_pw_eth(void)
     eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
 
     pw_eth_handle_cw = find_dissector("pw_eth_cw");
-    dissector_add_uint("mpls.label", MPLS_LABEL_INVALID, pw_eth_handle_cw);
+    dissector_add_handle("mpls.label", pw_eth_handle_cw);
 
     pw_eth_handle_nocw = find_dissector("pw_eth_nocw");
-    dissector_add_uint("mpls.label", MPLS_LABEL_INVALID, pw_eth_handle_nocw);
+    dissector_add_handle("mpls.label", pw_eth_handle_nocw);
 
     pw_eth_handle_heuristic = find_dissector("pw_eth_heuristic");
-    dissector_add_uint("mpls.label", MPLS_LABEL_INVALID, pw_eth_handle_heuristic);
+    dissector_add_handle("mpls.label", pw_eth_handle_heuristic);
 }
 
 /*
diff --git a/epan/dissectors/packet-pw-fr.c b/epan/dissectors/packet-pw-fr.c
index 4d96a134ef..5d04833231 100644
--- a/epan/dissectors/packet-pw-fr.c
+++ b/epan/dissectors/packet-pw-fr.c
@@ -311,7 +311,7 @@ proto_reg_handoff_pw_fr(void)
 {
 	dissector_handle_t h;
 	h = find_dissector("pw_fr");
-	dissector_add_uint("mpls.label", MPLS_LABEL_INVALID, h);
+	dissector_add_handle("mpls.label", h);
 	fr_stripped_address_handle = find_dissector("fr_stripped_address");
 }
 
diff --git a/epan/dissectors/packet-pw-hdlc.c b/epan/dissectors/packet-pw-hdlc.c
index 53331bb3d5..d6b9060a2a 100644
--- a/epan/dissectors/packet-pw-hdlc.c
+++ b/epan/dissectors/packet-pw-hdlc.c
@@ -222,10 +222,10 @@ void proto_reg_handoff_pw_hdlc(void)
 	dissector_handle_t handle;
 
 	handle = find_dissector("pw_hdlc_nocw_fr");
-	dissector_add_uint( "mpls.label", MPLS_LABEL_INVALID, handle );
+	dissector_add_handle( "mpls.label", handle );
 
 	handle = find_dissector("pw_hdlc_nocw_hdlc_ppp");
-	dissector_add_uint( "mpls.label", MPLS_LABEL_INVALID, handle );
+	dissector_add_handle( "mpls.label", handle );
 
 	ppp_handle = find_dissector( "ppp" );
 	fr_handle = find_dissector( "fr" );
diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c
index 5b06993a9b..30db8e7d15 100644
--- a/epan/dissectors/packet-pw-satop.c
+++ b/epan/dissectors/packet-pw-satop.c
@@ -471,6 +471,7 @@ void proto_reg_handoff_pw_satop(void)
 {
 	data_handle = find_dissector("data");
 	pw_padding_handle = find_dissector("pw_padding");
-	dissector_add_uint("mpls.label", MPLS_LABEL_INVALID, find_dissector("pw_satop_mpls"));
-	dissector_add_handle("udp.port", find_dissector("pw_satop_udp")); /* for Decode-As */
+	/* For Decode As */
+	dissector_add_handle("mpls.label", find_dissector("pw_satop_mpls"));
+	dissector_add_handle("udp.port", find_dissector("pw_satop_udp"));
 }