diff options
Diffstat (limited to 'epan/dissectors')
41 files changed, 62 insertions, 4 deletions
diff --git a/epan/dissectors/asn1/c1222/packet-c1222-template.c b/epan/dissectors/asn1/c1222/packet-c1222-template.c index 1c8b5ae40a..7fdea6f5b1 100644 --- a/epan/dissectors/asn1/c1222/packet-c1222-template.c +++ b/epan/dissectors/asn1/c1222/packet-c1222-template.c @@ -1397,6 +1397,7 @@ void proto_register_c1222(void) { c1222_uat_data_update_cb, /* update callback */ NULL, /* free callback */ NULL, /* post update callback */ + NULL, /* reset callback */ c1222_uat_flds); /* UAT field definitions */ prefs_register_uat_preference(c1222_module, diff --git a/epan/dissectors/asn1/ess/packet-ess-template.c b/epan/dissectors/asn1/ess/packet-ess-template.c index b9c20eb7c1..6c44ca8f3b 100644 --- a/epan/dissectors/asn1/ess/packet-ess-template.c +++ b/epan/dissectors/asn1/ess/packet-ess-template.c @@ -176,6 +176,7 @@ void proto_register_ess(void) { NULL, ess_free_cb, NULL, + NULL, attributes_flds); static module_t *ess_module; diff --git a/epan/dissectors/asn1/ldap/packet-ldap-template.c b/epan/dissectors/asn1/ldap/packet-ldap-template.c index b78dd6a7a0..f635be702a 100644 --- a/epan/dissectors/asn1/ldap/packet-ldap-template.c +++ b/epan/dissectors/asn1/ldap/packet-ldap-template.c @@ -2218,6 +2218,7 @@ void proto_register_ldap(void) { attribute_types_update_cb, attribute_types_free_cb, attribute_types_initialize_cb, + NULL, custom_attribute_types_uat_fields); prefs_register_uat_preference(ldap_module, "custom_ldap_attribute_types", diff --git a/epan/dissectors/asn1/pres/packet-pres-template.c b/epan/dissectors/asn1/pres/packet-pres-template.c index 46273d5d21..54ac9ae26f 100644 --- a/epan/dissectors/asn1/pres/packet-pres-template.c +++ b/epan/dissectors/asn1/pres/packet-pres-template.c @@ -422,6 +422,7 @@ void proto_register_pres(void) { NULL, pres_free_cb, NULL, + NULL, users_flds); expert_module_t* expert_pres; diff --git a/epan/dissectors/asn1/snmp/packet-snmp-template.c b/epan/dissectors/asn1/snmp/packet-snmp-template.c index 7e4ade2470..00ea2e2619 100644 --- a/epan/dissectors/asn1/snmp/packet-snmp-template.c +++ b/epan/dissectors/asn1/snmp/packet-snmp-template.c @@ -2495,6 +2495,7 @@ void proto_register_snmp(void) { snmp_users_update_cb, snmp_users_free_cb, renew_ue_cache, + NULL, users_fields); static uat_field_t specific_traps_flds[] = { @@ -2516,6 +2517,7 @@ void proto_register_snmp(void) { NULL, snmp_specific_trap_free_cb, NULL, + NULL, specific_traps_flds); /* Register protocol */ diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index fbc6545709..e0de3c6078 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -4522,6 +4522,7 @@ proto_register_ber(void) NULL, oid_free_cb, ber_update_oids, + NULL, users_flds); proto_ber = proto_register_protocol("Basic Encoding Rules (ASN.1 X.690)", "BER", "ber"); diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index 6f15b7f3a8..c9b204545a 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -8705,6 +8705,7 @@ proto_register_bootp(void) uat_bootp_record_update_cb, /* update callback */ uat_bootp_record_free_cb, /* free callback */ NULL, /* post update callback */ + NULL, /* reset callback */ bootp_uat_flds); /* UAT field definitions */ prefs_register_uat_preference(bootp_module, diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 71e1a1557d..091cf9e932 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -1163,6 +1163,7 @@ proto_register_btrfcomm(void) NULL, NULL, NULL, + NULL, uat_rfcomm_channels_fields); prefs_register_uat_preference(module, "rfcomm.channels", diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index 75d32f407b..98c8163573 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -2037,6 +2037,7 @@ void proto_register_c1222(void) { c1222_uat_data_update_cb, /* update callback */ NULL, /* free callback */ NULL, /* post update callback */ + NULL, /* reset callback */ c1222_uat_flds); /* UAT field definitions */ prefs_register_uat_preference(c1222_module, diff --git a/epan/dissectors/packet-devicenet.c b/epan/dissectors/packet-devicenet.c index fac1b3fcf8..76657cbca8 100644 --- a/epan/dissectors/packet-devicenet.c +++ b/epan/dissectors/packet-devicenet.c @@ -1050,6 +1050,7 @@ void proto_register_devicenet(void) uat_devicenet_record_update_cb, /* update callback */ NULL, /* free callback */ NULL, /* post update callback */ + NULL, /* reset callback */ devicenet_uat_flds); /* UAT field definitions */ prefs_register_uat_preference(devicenet_module, diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index fccb32083a..8413259107 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -4905,6 +4905,7 @@ void proto_register_dmp (void) NULL, dmp_class_free_cb, NULL, + NULL, attributes_flds); module_t *dmp_module; diff --git a/epan/dissectors/packet-dof.c b/epan/dissectors/packet-dof.c index d8ac8f18cd..d2cb747442 100644 --- a/epan/dissectors/packet-dof.c +++ b/epan/dissectors/packet-dof.c @@ -10973,6 +10973,7 @@ static void dof_register(void) secmode_list_update_cb, secmode_list_free_cb, secmode_list_post_update_cb, + NULL, secmode_uat_fields ); @@ -10988,6 +10989,7 @@ static void dof_register(void) seckey_list_update_cb, seckey_list_free_cb, seckey_list_post_update_cb, + NULL, seckey_uat_fields ); @@ -11003,6 +11005,7 @@ static void dof_register(void) identsecret_list_update_cb, identsecret_list_free_cb, identsecret_list_post_update_cb, + NULL, identsecret_uat_fields ); diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index ee625903f7..bc3cb5bd29 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -276,6 +276,13 @@ dtls_parse_uat(void) } static void +dtls_reset_uat(void) +{ + g_hash_table_destroy(dtls_key_hash); + dtls_key_hash = NULL; +} + +static void dtls_parse_old_keys(void) { gchar **old_keys, **parts, *err; @@ -1906,6 +1913,7 @@ proto_register_dtls(void) NULL, /* dtlsdecrypt_update_cb? */ dtlsdecrypt_free_cb, dtls_parse_uat, + dtls_reset_uat, dtlskeylist_uats_flds); prefs_register_uat_preference(dtls_module, "cfg", diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c index c77e4f0625..694e8d3156 100644 --- a/epan/dissectors/packet-ess.c +++ b/epan/dissectors/packet-ess.c @@ -1515,6 +1515,7 @@ void proto_register_ess(void) { NULL, ess_free_cb, NULL, + NULL, attributes_flds); static module_t *ess_module; @@ -1560,6 +1561,6 @@ void proto_reg_handoff_ess(void) { /*--- End of included file: packet-ess-dis-tab.c ---*/ -#line 203 "./asn1/ess/packet-ess-template.c" +#line 204 "./asn1/ess/packet-ess-template.c" } diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 34d2efa1db..7118f451e4 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -3675,6 +3675,7 @@ proto_register_http(void) header_fields_update_cb, header_fields_free_cb, header_fields_initialize_cb, + NULL, custom_header_uat_fields ); diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index c9eeaf880b..fed32f01c7 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -27603,6 +27603,7 @@ proto_register_ieee80211(void) uat_wep_key_record_update_cb, /* update callback */ uat_wep_key_record_free_cb, /* free callback */ init_wepkeys, /* post update callback - update the WEP/WPA keys */ + NULL, /* reset callback */ wep_uat_flds); /* UAT field definitions */ prefs_register_uat_preference(wlan_module, diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 3ef8189049..7cd95e0fbb 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -4225,6 +4225,7 @@ void proto_register_ieee802154(void) addr_uat_update_cb, /* update callback */ NULL, /* free callback */ NULL, /* post update callback */ + NULL, /* reset callback */ addr_uat_flds); /* UAT field definitions */ prefs_register_uat_preference(ieee802154_module, "static_addr", "Static Addresses", diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index 2b3de17644..f4b518ea38 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.c @@ -1312,6 +1312,7 @@ proto_register_imf(void) header_fields_update_cb, header_fields_free_cb, header_fields_initialize_cb, + NULL, attributes_flds); module_t *imf_module; diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 9ce911dc14..35da543de9 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -2463,6 +2463,7 @@ proto_register_ipsec(void) uat_esp_sa_record_update_cb, /* update callback */ uat_esp_sa_record_free_cb, /* free callback */ NULL, /* post update callback */ + NULL, /* reset callback */ esp_uat_flds); /* UAT field definitions */ prefs_register_uat_preference(esp_module, diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 38771fbe09..f238033857 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -7156,6 +7156,7 @@ proto_register_isakmp(void) ikev1_uat_data_update_cb, NULL, NULL, + NULL, ikev1_uat_flds); prefs_register_uat_preference(isakmp_module, @@ -7176,6 +7177,7 @@ proto_register_isakmp(void) ikev2_uat_data_update_cb, NULL, NULL, + NULL, ikev2_uat_flds); prefs_register_uat_preference(isakmp_module, diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c index 050b369e04..17252f8d4b 100644 --- a/epan/dissectors/packet-k12.c +++ b/epan/dissectors/packet-k12.c @@ -492,6 +492,7 @@ proto_register_k12(void) k12_update_cb, k12_free_cb, NULL, + NULL, uat_k12_flds); k12_module = prefs_register_protocol(proto_k12, NULL); diff --git a/epan/dissectors/packet-lbmpdmtcp.c b/epan/dissectors/packet-lbmpdmtcp.c index 5a13a49877..6b9a3dcf21 100644 --- a/epan/dissectors/packet-lbmpdmtcp.c +++ b/epan/dissectors/packet-lbmpdmtcp.c @@ -424,6 +424,7 @@ void proto_register_lbmpdm_tcp(void) lbmpdm_tcp_tag_update_cb, lbmpdm_tcp_tag_free_cb, NULL, + NULL, lbmpdm_tcp_tag_array); prefs_register_uat_preference(lbmpdm_tcp_module, "tnw_lbmpdm_tcp_tags", diff --git a/epan/dissectors/packet-lbmr.c b/epan/dissectors/packet-lbmr.c index de3e11d894..0573ef3b5b 100644 --- a/epan/dissectors/packet-lbmr.c +++ b/epan/dissectors/packet-lbmr.c @@ -6584,6 +6584,7 @@ void proto_register_lbmr(void) lbmr_tag_update_cb, lbmr_tag_free_cb, NULL, + NULL, lbmr_tag_array); prefs_register_uat_preference(lbmr_module, "tnw_lbmr_tags", diff --git a/epan/dissectors/packet-lbtrm.c b/epan/dissectors/packet-lbtrm.c index f201d8b1ec..2b331e80af 100644 --- a/epan/dissectors/packet-lbtrm.c +++ b/epan/dissectors/packet-lbtrm.c @@ -1847,6 +1847,7 @@ void proto_register_lbtrm(void) lbtrm_tag_update_cb, lbtrm_tag_free_cb, NULL, + NULL, lbtrm_tag_array); prefs_register_uat_preference(lbtrm_module, "tnw_lbtrm_tags", diff --git a/epan/dissectors/packet-lbtru.c b/epan/dissectors/packet-lbtru.c index 4adaa1cb90..4f3a27f37a 100644 --- a/epan/dissectors/packet-lbtru.c +++ b/epan/dissectors/packet-lbtru.c @@ -1988,6 +1988,7 @@ void proto_register_lbtru(void) lbtru_tag_update_cb, lbtru_tag_free_cb, NULL, + NULL, lbtru_tag_array); prefs_register_uat_preference(lbtru_module, "tnw_lbtru_tags", diff --git a/epan/dissectors/packet-lbttcp.c b/epan/dissectors/packet-lbttcp.c index a2d717c767..680fc21a0f 100644 --- a/epan/dissectors/packet-lbttcp.c +++ b/epan/dissectors/packet-lbttcp.c @@ -786,6 +786,7 @@ void proto_register_lbttcp(void) lbttcp_tag_update_cb, lbttcp_tag_free_cb, NULL, + NULL, lbttcp_tag_array); prefs_register_uat_preference(lbttcp_module, "tnw_lbttcp_tags", diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 71519c66b3..02256b64fb 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -5767,6 +5767,7 @@ void proto_register_ldap(void) { attribute_types_update_cb, attribute_types_free_cb, attribute_types_initialize_cb, + NULL, custom_attribute_types_uat_fields); prefs_register_uat_preference(ldap_module, "custom_ldap_attribute_types", @@ -5876,7 +5877,7 @@ proto_reg_handoff_ldap(void) /*--- End of included file: packet-ldap-dis-tab.c ---*/ -#line 2314 "./asn1/ldap/packet-ldap-template.c" +#line 2315 "./asn1/ldap/packet-ldap-template.c" dissector_add_uint_range_with_preference("tcp.port", TCP_PORT_RANGE_LDAP, ldap_handle); } diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index e9713f3d3b..cf374b87a7 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -9222,6 +9222,7 @@ void proto_register_mac_lte(void) NULL, NULL, NULL, + NULL, lcid_drb_mapping_flds ); prefs_register_uat_preference(mac_lte_module, diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index f5ad91c02c..c3b6acf198 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -2939,6 +2939,7 @@ void proto_register_pdcp(void) uat_ue_keys_record_update_cb, /* update callback */ uat_ue_keys_record_free_cb, /* free callback */ NULL, /* post update callback */ + NULL, /* reset callback */ ue_keys_uat_flds); /* UAT field definitions */ prefs_register_uat_preference(pdcp_lte_module, diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index 8fce786f18..7fcd15060f 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -1915,6 +1915,7 @@ void proto_register_pres(void) { NULL, pres_free_cb, NULL, + NULL, users_flds); expert_module_t* expert_pres; diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c index 6f7e13f943..79960d38ce 100644 --- a/epan/dissectors/packet-reload.c +++ b/epan/dissectors/packet-reload.c @@ -5909,6 +5909,7 @@ proto_register_reload(void) NULL, uat_kindid_record_free_cb, NULL, + NULL, reloadkindidlist_uats_flds); diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 4b148a729a..a2115b1cc5 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -4103,7 +4103,7 @@ proto_register_sccp(void) &num_sccp_users, UAT_AFFECTS_DISSECTION, "ChSccpUsers", sccp_users_copy_cb, sccp_users_update_cb, sccp_users_free_cb, - NULL, users_flds ); + NULL, NULL, users_flds ); /* Register the protocol name and description */ proto_sccp = proto_register_protocol("Signalling Connection Control Part", "SCCP", "sccp"); diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index e7cb2f7f26..9ccc23caf2 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -5044,6 +5044,7 @@ proto_register_sctp(void) sctp_chunk_type_update_cb, sctp_chunk_type_free_cb, NULL, + NULL, custom_types_uat_fields ); diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 73fd297c8b..a7c007f918 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -6887,6 +6887,7 @@ void proto_register_sip(void) header_fields_update_cb, header_fields_free_cb, header_fields_initialize_cb, + NULL, sip_custom_header_uat_fields ); diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index 3d51523d66..1be6c4010a 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -3993,6 +3993,7 @@ void proto_register_snmp(void) { snmp_users_update_cb, snmp_users_free_cb, renew_ue_cache, + NULL, users_fields); static uat_field_t specific_traps_flds[] = { @@ -4014,6 +4015,7 @@ void proto_register_snmp(void) { NULL, snmp_specific_trap_free_cb, NULL, + NULL, specific_traps_flds); /* Register protocol */ diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 2dd098fda8..c188c5bf2e 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -429,6 +429,13 @@ ssl_parse_uat(void) } static void +ssl_reset_uat(void) +{ + g_hash_table_destroy(ssl_key_hash); + ssl_key_hash = NULL; +} + +static void ssl_parse_old_keys(void) { gchar **old_keys, **parts, *err; @@ -4195,6 +4202,7 @@ proto_register_ssl(void) NULL, ssldecrypt_free_cb, ssl_parse_uat, + ssl_reset_uat, sslkeylist_uats_flds); prefs_register_uat_preference(ssl_module, "key_table", diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index 1044d8eed4..e6e0ef995b 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -5714,6 +5714,7 @@ void proto_register_fp(void) NULL, /* update callback */ uat_umts_fp_record_free_cb, /* free callback */ NULL, /* post update callback */ + NULL, /* reset callback */ umts_fp_uat_flds); /* UAT field definitions */ prefs_register_uat_preference(fp_module, diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c index 2a0d778fa8..842d21bb31 100644 --- a/epan/dissectors/packet-user_encap.c +++ b/epan/dissectors/packet-user_encap.c @@ -284,6 +284,7 @@ void proto_register_user_encap(void) NULL, user_free_cb, NULL, + NULL, user_flds ); prefs_register_uat_preference(module, diff --git a/epan/dissectors/packet-vcdu.c b/epan/dissectors/packet-vcdu.c index e04eef7931..0818491a30 100644 --- a/epan/dissectors/packet-vcdu.c +++ b/epan/dissectors/packet-vcdu.c @@ -655,6 +655,7 @@ proto_register_vcdu(void) vcdu_uat_data_update_cb, NULL, NULL, + NULL, vcdu_uat_flds); prefs_register_uat_preference(vcdu_module, diff --git a/epan/dissectors/packet-zbee-nwk-gp.c b/epan/dissectors/packet-zbee-nwk-gp.c index 112ecb4c74..2099334126 100644 --- a/epan/dissectors/packet-zbee-nwk-gp.c +++ b/epan/dissectors/packet-zbee-nwk-gp.c @@ -1857,7 +1857,7 @@ proto_register_zbee_nwk_gp(void) zbee_gp_sec_key_table_uat = uat_new("ZigBee GP Security Keys", sizeof(uat_key_record_t), "zigbee_gp_keys", TRUE, &gp_uat_key_records, &num_uat_key_records, UAT_AFFECTS_DISSECTION, NULL, uat_key_record_copy_cb, - uat_key_record_update_cb, uat_key_record_free_cb, uat_key_record_post_update_cb, key_uat_fields); + uat_key_record_update_cb, uat_key_record_free_cb, uat_key_record_post_update_cb, NULL, key_uat_fields); prefs_register_uat_preference(gp_zbee_prefs, "gp_key_table", "Pre-configured GP Security Keys", "Pre-configured GP Security Keys.", zbee_gp_sec_key_table_uat); diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c index e787da4473..76bb364bc4 100644 --- a/epan/dissectors/packet-zbee-security.c +++ b/epan/dissectors/packet-zbee-security.c @@ -323,6 +323,7 @@ void zbee_security_register(module_t *zbee_prefs, int proto) uat_key_record_update_cb, uat_key_record_free_cb, uat_key_record_post_update, + NULL, key_uat_fields ); prefs_register_uat_preference(zbee_prefs, |