Minor proto_reg_handoff cleanup: use find_dissector when appropriate.

svn path=/trunk/; revision=26308

30 files changed, 36 insertions, 41 deletions

diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c
index 4291440d15..d3908d9ebc 100644
--- a/epan/dissectors/packet-dua.c
+++ b/epan/dissectors/packet-dua.c
@@ -768,7 +768,7 @@ proto_reg_handoff_dua(void)
 {
   dissector_handle_t dua_handle;
 
-  dua_handle  = create_dissector_handle(dissect_dua, proto_dua);
+  dua_handle  = find_dissector("dua");
   data_handle = find_dissector("data");
   dpnss_handle = find_dissector("dpnss");
   dissector_add("sctp.ppi", DUA_PAYLOAD_PROTOCOL_ID, dua_handle);
diff --git a/epan/dissectors/packet-epmd.c b/epan/dissectors/packet-epmd.c
index 1a6b5f28df..f5ad02d769 100644
--- a/epan/dissectors/packet-epmd.c
+++ b/epan/dissectors/packet-epmd.c
@@ -316,6 +316,6 @@ void
 proto_reg_handoff_epmd(void)
 {
     dissector_handle_t epmd_handle;
-    epmd_handle = new_create_dissector_handle(dissect_epmd, proto_epmd);
+    epmd_handle = find_dissector("epmd");
     dissector_add("tcp.port", EPMD_PORT, epmd_handle);
 }
diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c
index 624a1ae844..49a208dbb6 100644
--- a/epan/dissectors/packet-erf.c
+++ b/epan/dissectors/packet-erf.c
@@ -1228,7 +1228,7 @@ proto_reg_handoff_erf(void)
 {
   dissector_handle_t erf_handle;
 
-  erf_handle = create_dissector_handle(dissect_erf, proto_erf);
+  erf_handle = find_dissector("erf");
   dissector_add("wtap_encap", WTAP_ENCAP_ERF, erf_handle);
 
   /* Dissector called to dump raw data, or unknown protocol */
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index 94d187e8eb..c37ad8ab63 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -559,8 +559,7 @@ proto_reg_handoff_eth(void)
 	 */
 	fw1_handle = find_dissector("fw1");
 
-	eth_maybefcs_handle = create_dissector_handle(dissect_eth_maybefcs,
-	    proto_eth);
+	eth_maybefcs_handle = find_dissector("eth");
 	dissector_add("wtap_encap", WTAP_ENCAP_ETHERNET, eth_maybefcs_handle);
 
 	eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index 6ed77b671f..3a4825553a 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -942,7 +942,7 @@ void proto_reg_handoff_fr(void)
 {
   dissector_handle_t fr_handle, fr_phdr_handle;
 
-  fr_handle = create_dissector_handle(dissect_fr, proto_fr);
+  fr_handle = find_dissector("fr");
   dissector_add("gre.proto", ETHERTYPE_RAW_FR, fr_handle);
   dissector_add("wtap_encap", WTAP_ENCAP_FRELAY, fr_handle);
 
diff --git a/epan/dissectors/packet-gprs-llc.c b/epan/dissectors/packet-gprs-llc.c
index a08a7e3f04..e4ff86518c 100644
--- a/epan/dissectors/packet-gprs-llc.c
+++ b/epan/dissectors/packet-gprs-llc.c
@@ -1312,7 +1312,7 @@ proto_reg_handoff_llcgprs(void)
 	dissector_handle_t gprs_llc_handle;
 
 	/* make sure that the top level can call this dissector */
-	gprs_llc_handle = create_dissector_handle(dissect_llcgprs, proto_llcgprs);
+	gprs_llc_handle = find_dissector("llcgprs");
 	dissector_add("wtap_encap", WTAP_ENCAP_GPRS_LLC, gprs_llc_handle);
 
 	data_handle = find_dissector("data");
diff --git a/epan/dissectors/packet-image-gif.c b/epan/dissectors/packet-image-gif.c
index 4ae5efb7cc..363090b64a 100644
--- a/epan/dissectors/packet-image-gif.c
+++ b/epan/dissectors/packet-image-gif.c
@@ -695,7 +695,7 @@ proto_reg_handoff_gif(void)
 {
 	dissector_handle_t gif_handle;
 
-	gif_handle = create_dissector_handle(dissect_gif, proto_gif);
+	gif_handle = find_dissector("image-gif");
 
 	/* Register the GIF media type */
 	dissector_add_string("media_type", "image/gif", gif_handle);
diff --git a/epan/dissectors/packet-image-jfif.c b/epan/dissectors/packet-image-jfif.c
index 44415c36b3..f9b8f14267 100644
--- a/epan/dissectors/packet-image-jfif.c
+++ b/epan/dissectors/packet-image-jfif.c
@@ -1214,7 +1214,7 @@ proto_reg_handoff_jfif(void)
 {
 	dissector_handle_t jfif_handle;
 
-	jfif_handle = create_dissector_handle(dissect_jfif, proto_jfif);
+	jfif_handle = find_dissector("image-jfif");
 
 	/* Register the JPEG media type */
 	dissector_add_string("media_type", "image/jfif", jfif_handle);
diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c
index 02b741431b..5bcbd82fca 100644
--- a/epan/dissectors/packet-imf.c
+++ b/epan/dissectors/packet-imf.c
@@ -902,7 +902,7 @@ proto_reg_handoff_imf(void)
 {
   dissector_handle_t imf_handle;
 
-  imf_handle = create_dissector_handle(dissect_imf, proto_imf);
+  imf_handle = find_dissector(PFNAME);
 
   dissector_add_string("media_type",
 		       "message/rfc822", imf_handle);
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index c6e05a6ab3..779a2d119c 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -2771,6 +2771,6 @@ proto_reg_handoff_icmp(void)
   ip_handle = find_dissector("ip");
   ipv6_handle = find_dissector("ipv6");
 
-  icmp_handle = create_dissector_handle(dissect_icmp, proto_icmp);
+  icmp_handle = find_dissector("icmp");
   dissector_add("ip.proto", IP_PROTO_ICMP, icmp_handle);
 }
diff --git a/epan/dissectors/packet-iua.c b/epan/dissectors/packet-iua.c
index 86415e84cf..deb5ecf16b 100644
--- a/epan/dissectors/packet-iua.c
+++ b/epan/dissectors/packet-iua.c
@@ -962,7 +962,7 @@ proto_reg_handoff_iua(void)
 {
   dissector_handle_t iua_handle;
 
-  iua_handle  = create_dissector_handle(dissect_iua, proto_iua);
+  iua_handle  = find_dissector("iua");
   q931_handle = find_dissector("q931");
   x25_handle  = find_dissector("x.25");
 
diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c
index ff35d75485..5ca393113d 100644
--- a/epan/dissectors/packet-kerberos4.c
+++ b/epan/dissectors/packet-kerberos4.c
@@ -457,6 +457,6 @@ proto_reg_handoff_krb4(void)
 {
   dissector_handle_t krb4_handle;
 
-  krb4_handle = new_create_dissector_handle(dissect_krb4, proto_krb4);
+  krb4_handle = find_dissector("krb4");
   dissector_add("udp.port", UDP_PORT_KRB4, krb4_handle);
 }
diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c
index 9d032030ca..6aed04015d 100644
--- a/epan/dissectors/packet-m3ua.c
+++ b/epan/dissectors/packet-m3ua.c
@@ -2058,7 +2058,7 @@ proto_reg_handoff_m3ua(void)
    */
   mtp3_handle = find_dissector("mtp3");
   data_handle = find_dissector("data");
-  m3ua_handle = create_dissector_handle(dissect_m3ua, proto_m3ua);
+  m3ua_handle = find_dissector("m3ua");
   dissector_add("sctp.ppi",  M3UA_PAYLOAD_PROTOCOL_ID, m3ua_handle);
   dissector_add("sctp.port", SCTP_PORT_M3UA, m3ua_handle);
 
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c
index 705de9ea00..0a244ca14f 100644
--- a/epan/dissectors/packet-mpls.c
+++ b/epan/dissectors/packet-mpls.c
@@ -711,7 +711,7 @@ proto_reg_handoff_mpls(void)
         data_handle = find_dissector("data");
         ppp_subdissector_table = find_dissector_table("ppp.protocol");
 
-	mpls_handle = create_dissector_handle(dissect_mpls, proto_mpls);
+	mpls_handle = find_dissector("mpls");
 	dissector_add("ethertype", ETHERTYPE_MPLS, mpls_handle);
 	dissector_add("ethertype", ETHERTYPE_MPLS_MULTI, mpls_handle);
 	dissector_add("ppp.protocol", PPP_MPLS_UNI, mpls_handle);
diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c
index ae2e74fb54..c84a7e1e75 100644
--- a/epan/dissectors/packet-ms-mms.c
+++ b/epan/dissectors/packet-ms-mms.c
@@ -1975,8 +1975,7 @@ void proto_register_msmms(void)
 
 void proto_reg_handoff_msmms_command(void)
 {
-    msmms_handle = new_create_dissector_handle(dissect_msmms_pdu, proto_msmms);
-
+    msmms_handle = find_dissector("msmms");
     /* Control commands using TCP port */
     dissector_add("tcp.port", MSMMS_PORT, msmms_handle);
     /* Data command(s) using UDP port */
diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c
index 57a599b46d..bf14d054eb 100644
--- a/epan/dissectors/packet-mtp3.c
+++ b/epan/dissectors/packet-mtp3.c
@@ -831,8 +831,7 @@ proto_reg_handoff_mtp3(void)
 {
   dissector_handle_t mtp3_handle;        
          
-  mtp3_handle = create_dissector_handle(dissect_mtp3, proto_mtp3);       
-                 
+  mtp3_handle = find_dissector("mtp3");               
   dissector_add("wtap_encap", WTAP_ENCAP_MTP3, mtp3_handle);     
   dissector_add_string("tali.opcode", "mtp3", mtp3_handle);
                  
diff --git a/epan/dissectors/packet-mtp3mg.c b/epan/dissectors/packet-mtp3mg.c
index 3e5157e7e1..107f437aa1 100644
--- a/epan/dissectors/packet-mtp3mg.c
+++ b/epan/dissectors/packet-mtp3mg.c
@@ -1532,7 +1532,7 @@ proto_reg_handoff_mtp3mg(void)
 {
     dissector_handle_t mtp3mg_handle;
 
-    mtp3mg_handle = create_dissector_handle(dissect_mtp3mg, proto_mtp3mg);
+    mtp3mg_handle = find_dissector("mtp3mg");
 
     dissector_add("mtp3.service_indicator", MTP3MG_SI, mtp3mg_handle);
 
diff --git a/epan/dissectors/packet-nt-sonmp.c b/epan/dissectors/packet-nt-sonmp.c
index eac62d972f..a616e66921 100644
--- a/epan/dissectors/packet-nt-sonmp.c
+++ b/epan/dissectors/packet-nt-sonmp.c
@@ -317,7 +317,7 @@ proto_reg_handoff_sonmp(void)
 {
 	dissector_handle_t sonmp_handle;
 	
-	sonmp_handle = create_dissector_handle(dissect_sonmp, proto_sonmp);
+	sonmp_handle = find_dissector("sonmp");
 	
 	dissector_add("llc.nortel_pid", 0x01a1, sonmp_handle); /* flatnet hello */
 	dissector_add("llc.nortel_pid", 0x01a2, sonmp_handle); /* Segment hello */ 
diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c
index d9dd6e7ab7..9a6db5ba61 100644
--- a/epan/dissectors/packet-pw-eth.c
+++ b/epan/dissectors/packet-pw-eth.c
@@ -150,9 +150,8 @@ proto_reg_handoff_pw_eth(void)
 
 	eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
 
-	pw_eth_handle = create_dissector_handle(dissect_pw_eth, proto_pw_eth);
+	pw_eth_handle = find_dissector("pw_eth");
 	dissector_add("mpls.label", LABEL_INVALID, pw_eth_handle);
-	pw_eth_handle_nocw = create_dissector_handle(dissect_pw_eth_nocw, 
-						     proto_pw_eth_nocw);
+	pw_eth_handle_nocw = find_dissector("pw_eth_nocw");
 	dissector_add("mpls.label", LABEL_INVALID, pw_eth_handle_nocw);
 }
diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c
index e02851533c..ea966b593d 100644
--- a/epan/dissectors/packet-q933.c
+++ b/epan/dissectors/packet-q933.c
@@ -2280,6 +2280,6 @@ proto_reg_handoff_q933(void)
 {
 	dissector_handle_t q933_handle;
 
-	q933_handle = create_dissector_handle(dissect_q933, proto_q933);
+	q933_handle = find_dissector("q933");
 	dissector_add("fr.osinl", NLPID_Q_933, q933_handle);
 }
diff --git a/epan/dissectors/packet-radiotap.c b/epan/dissectors/packet-radiotap.c
index 14ecae904e..5757de3c1b 100644
--- a/epan/dissectors/packet-radiotap.c
+++ b/epan/dissectors/packet-radiotap.c
@@ -1289,7 +1289,7 @@ proto_reg_handoff_radiotap(void)
     ieee80211_handle = find_dissector("wlan");
     ieee80211_datapad_handle = find_dissector("wlan_datapad");
 
-    radiotap_handle = create_dissector_handle(dissect_radiotap, proto_radiotap);
+    radiotap_handle = find_dissector("radiotap");
 
     dissector_add("wtap_encap", WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP, radiotap_handle);
 }
diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c
index 999e49d55c..9188c6e99d 100644
--- a/epan/dissectors/packet-smpp.c
+++ b/epan/dissectors/packet-smpp.c
@@ -3425,7 +3425,7 @@ proto_reg_handoff_smpp(void)
      * to specify that a given X.25 circuit is to be dissected as SMPP,
      * however.
      */
-    smpp_handle = create_dissector_handle(dissect_smpp, proto_smpp);
+    smpp_handle = find_dissector("smpp");
     dissector_add_handle("tcp.port", smpp_handle);
     heur_dissector_add("tcp", dissect_smpp_heur, proto_smpp);
     heur_dissector_add("x.25", dissect_smpp_heur, proto_smpp);
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c
index 7009f0cbc5..e1e018191a 100644
--- a/epan/dissectors/packet-smtp.c
+++ b/epan/dissectors/packet-smtp.c
@@ -908,7 +908,7 @@ proto_reg_handoff_smtp(void)
 {
   dissector_handle_t smtp_handle;
 
-  smtp_handle = create_dissector_handle(dissect_smtp, proto_smtp);
+  smtp_handle = find_dissector("smtp");
   dissector_add("tcp.port", TCP_PORT_SMTP, smtp_handle);
   dissector_add("tcp.port", TCP_PORT_SUBMISSION, smtp_handle);
 
diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c
index 37c49b869c..8663e0e624 100644
--- a/epan/dissectors/packet-sua.c
+++ b/epan/dissectors/packet-sua.c
@@ -2111,7 +2111,7 @@ proto_reg_handoff_sua(void)
 {
   dissector_handle_t sua_handle;
 
-  sua_handle = create_dissector_handle(dissect_sua, proto_sua);
+  sua_handle = find_dissector("sua");
   dissector_add("sctp.ppi",  SUA_PAYLOAD_PROTOCOL_ID, sua_handle);
   dissector_add("sctp.port", SCTP_PORT_SUA,           sua_handle);
 
diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c
index df5527caef..6a3798df5c 100644
--- a/epan/dissectors/packet-tapa.c
+++ b/epan/dissectors/packet-tapa.c
@@ -619,7 +619,7 @@ proto_reg_handoff_tapa(void)
 {
 	dissector_handle_t tapa_handle;
 
-	tapa_handle = new_create_dissector_handle(dissect_tapa_static, proto_tapa);
+	tapa_handle = find_dissector("tapa");
 	dissector_add("udp.port", PORT_TAPA, tapa_handle);
 }
 
diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c
index e559a67990..5972249506 100644
--- a/epan/dissectors/packet-tnef.c
+++ b/epan/dissectors/packet-tnef.c
@@ -812,8 +812,7 @@ proto_reg_handoff_tnef(void)
 {
   dissector_handle_t tnef_handle;
 
-  tnef_handle = create_dissector_handle(dissect_tnef, proto_tnef);
-
+  tnef_handle = find_dissector(PFNAME);
   dissector_add_string("media_type", "application/ms-tnef", tnef_handle);
 
   /* X.400 file transfer bodypart */
diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c
index 358e688829..a5750b5765 100644
--- a/epan/dissectors/packet-tpkt.c
+++ b/epan/dissectors/packet-tpkt.c
@@ -665,19 +665,19 @@ proto_register_tpkt(void)
 void
 proto_reg_handoff_tpkt(void)
 {
-	dissector_handle_t tpkt_handle;
+	dissector_handle_t tpkt_handle, tpkt_x224_handle;
 
 	osi_tp_handle = find_dissector("ositp");
-	tpkt_handle = create_dissector_handle(dissect_tpkt, proto_tpkt);
+	tpkt_handle = find_dissector("tpkt");
 	dissector_add("tcp.port", TCP_PORT_TPKT, tpkt_handle);
 
 	x224_handle = find_dissector("x224");
-	tpkt_handle = create_dissector_handle(dissect_tpkt_x224, proto_tpkt);
-	dissector_add("tcp.port", TCP_PORT_TPKT_X224, tpkt_handle);
+	tpkt_x224_handle = create_dissector_handle(dissect_tpkt_x224, proto_tpkt);
+	dissector_add("tcp.port", TCP_PORT_TPKT_X224, tpkt_x224_handle);
 	
 	/*
-	tpkt_handle = create_dissector_handle(dissect_ascii_tpkt, proto_tpkt);
-	dissector_add("tcp.port", TCP_PORT_TPKT, tpkt_handle);
+	tpkt_ascii_handle = create_dissector_handle(dissect_ascii_tpkt, proto_tpkt);
+	dissector_add("tcp.port", TCP_PORT_TPKT, tpkt_ascii_handle);
 	*/
 	
 }
diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c
index 6d92266d4d..229b101bb5 100644
--- a/epan/dissectors/packet-udp.c
+++ b/epan/dissectors/packet-udp.c
@@ -544,7 +544,7 @@ proto_reg_handoff_udp(void)
 	dissector_handle_t udp_handle;
 	dissector_handle_t udplite_handle;
 
-	udp_handle = create_dissector_handle(dissect_udp, proto_udp);
+	udp_handle = find_dissector("udp");
 	dissector_add("ip.proto", IP_PROTO_UDP, udp_handle);
 	udplite_handle = create_dissector_handle(dissect_udplite, proto_udplite);
 	dissector_add("ip.proto", IP_PROTO_UDPLITE, udplite_handle);
diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c
index 031e6eac4b..6685b62aa0 100644
--- a/epan/dissectors/packet-usb-masstorage.c
+++ b/epan/dissectors/packet-usb-masstorage.c
@@ -448,7 +448,7 @@ proto_reg_handoff_usb_ms(void)
     dissector_handle_t usb_ms_bulk_handle;
     dissector_handle_t usb_ms_control_handle;
 
-    usb_ms_bulk_handle = create_dissector_handle(dissect_usb_ms_bulk, proto_usb_ms);
+    usb_ms_bulk_handle = find_dissector("usbms");
     dissector_add("usb.bulk", IF_CLASS_MASSTORAGE, usb_ms_bulk_handle);
 
     usb_ms_control_handle = new_create_dissector_handle(dissect_usb_ms_control, proto_usb_ms);
diff --git a/epan/dissectors/packet-wbxml.c b/epan/dissectors/packet-wbxml.c
index b80a050793..4c763b3124 100644
--- a/epan/dissectors/packet-wbxml.c
+++ b/epan/dissectors/packet-wbxml.c
@@ -8339,7 +8339,7 @@ proto_reg_handoff_wbxml(void)
 	 * heur_dissector_add("wsp", dissect_wbxml_heur, proto_wbxml);
 	 */
 
-	wbxml_handle = create_dissector_handle(dissect_wbxml, proto_wbxml);
+	wbxml_handle = find_dissector("wbxml");
 
 	/* Register the WSP content types (defined as protocol port)
 	 * for WBXML dissection.