forked from osmocom/wireshark
"new" dissector API -> dissector API for ASN.1 dissectors.
Change-Id: I7b794cba2feda2cae40411e2b1cb9fb091d08220 Reviewed-on: https://code.wireshark.org/review/12480 Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
parent
1a1893ad54
commit
a391a70b3b
|
@ -67,7 +67,7 @@ void proto_register_HI2Operations(void) {
|
|||
proto_register_field_array(proto_HI2Operations, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
new_register_dissector("HI2Operations", dissect_IRIsContent_PDU, proto_HI2Operations);
|
||||
register_dissector("HI2Operations", dissect_IRIsContent_PDU, proto_HI2Operations);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -284,7 +284,7 @@ void proto_register_acse(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_acse = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("acse", dissect_acse, proto_acse);
|
||||
register_dissector("acse", dissect_acse, proto_acse);
|
||||
|
||||
/* Register connectionless protocol */
|
||||
proto_clacse = proto_register_protocol(CLPNAME, CLPSNAME, CLPFNAME);
|
||||
|
|
|
@ -5457,7 +5457,7 @@ void proto_register_ansi_map(void) {
|
|||
expert_ansi_map = expert_register_protocol(proto_ansi_map);
|
||||
expert_register_field_array(expert_ansi_map, ei, array_length(ei));
|
||||
|
||||
new_register_dissector("ansi_map", dissect_ansi_map, proto_ansi_map);
|
||||
register_dissector("ansi_map", dissect_ansi_map, proto_ansi_map);
|
||||
|
||||
is637_tele_id_dissector_table =
|
||||
register_dissector_table("ansi_map.tele_id", "IS-637 Teleservice ID",
|
||||
|
|
|
@ -509,7 +509,7 @@ proto_register_ansi_tcap(void)
|
|||
|
||||
/* Register the protocol name and description */
|
||||
proto_ansi_tcap = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("ansi_tcap", dissect_ansi_tcap, proto_ansi_tcap);
|
||||
register_dissector("ansi_tcap", dissect_ansi_tcap, proto_ansi_tcap);
|
||||
|
||||
/* Note the high bit should be masked off when registering in this table (0x7fff)*/
|
||||
ansi_tcap_national_opcode_table = register_dissector_table("ansi_tcap.nat.opcode", "ANSI TCAP National Opcodes", FT_UINT16, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
|
|
|
@ -213,7 +213,7 @@ void proto_register_atn_cm (void)
|
|||
ett,
|
||||
array_length(ett));
|
||||
|
||||
new_register_dissector(
|
||||
register_dissector(
|
||||
"atn-cm",
|
||||
dissect_atn_cm,
|
||||
proto_atn_cm);
|
||||
|
|
|
@ -323,7 +323,7 @@ void proto_register_atn_cpdlc (void)
|
|||
ett,
|
||||
array_length(ett));
|
||||
|
||||
new_register_dissector(
|
||||
register_dissector(
|
||||
"atn-cpdlc",
|
||||
dissect_atn_cpdlc,
|
||||
proto_atn_cpdlc);
|
||||
|
|
|
@ -861,7 +861,7 @@ void proto_register_atn_ulcs (void)
|
|||
ett,
|
||||
array_length (ett));
|
||||
|
||||
new_register_dissector(
|
||||
register_dissector(
|
||||
"atn-ulcs",
|
||||
dissect_atn_ulcs,
|
||||
proto_atn_ulcs);
|
||||
|
|
|
@ -1416,8 +1416,8 @@ proto_reg_handoff_c1222(void)
|
|||
guint8 *temp = NULL;
|
||||
|
||||
if( !initialized ) {
|
||||
c1222_handle = new_create_dissector_handle(dissect_c1222, proto_c1222);
|
||||
c1222_udp_handle = new_create_dissector_handle(dissect_c1222_common, proto_c1222);
|
||||
c1222_handle = create_dissector_handle(dissect_c1222, proto_c1222);
|
||||
c1222_udp_handle = create_dissector_handle(dissect_c1222_common, proto_c1222);
|
||||
dissector_add_uint("tcp.port", global_c1222_port, c1222_handle);
|
||||
dissector_add_uint("udp.port", global_c1222_port, c1222_udp_handle);
|
||||
initialized = TRUE;
|
||||
|
|
|
@ -1550,9 +1550,9 @@ void proto_register_camel(void) {
|
|||
/* Register protocol */
|
||||
proto_camel = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
|
||||
new_register_dissector("camel", dissect_camel, proto_camel);
|
||||
new_register_dissector("camel-v1", dissect_camel_v1, proto_camel);
|
||||
new_register_dissector("camel-v2", dissect_camel_v2, proto_camel);
|
||||
register_dissector("camel", dissect_camel, proto_camel);
|
||||
register_dissector("camel-v1", dissect_camel_v1, proto_camel);
|
||||
register_dissector("camel-v2", dissect_camel_v2, proto_camel);
|
||||
|
||||
proto_register_field_array(proto_camel, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
|
|
@ -100,6 +100,6 @@ proto_register_charging_ase(void)
|
|||
void
|
||||
proto_reg_handoff_charging_ase(void)
|
||||
{
|
||||
charging_ase_handle = new_create_dissector_handle(dissect_charging_ase, proto_charging_ase);
|
||||
charging_ase_handle = create_dissector_handle(dissect_charging_ase, proto_charging_ase);
|
||||
}
|
||||
|
||||
|
|
|
@ -187,7 +187,7 @@ void proto_register_cmip(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_cmip = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("cmip", dissect_cmip, proto_cmip);
|
||||
register_dissector("cmip", dissect_cmip, proto_cmip);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_cmip, hf, array_length(hf));
|
||||
|
|
|
@ -378,15 +378,15 @@ void proto_reg_handoff_cmp(void) {
|
|||
static guint cmp_alternate_tcp_style_http_port_prev = 0;
|
||||
|
||||
if (!inited) {
|
||||
cmp_http_handle = new_create_dissector_handle(dissect_cmp_http, proto_cmp);
|
||||
cmp_http_handle = create_dissector_handle(dissect_cmp_http, proto_cmp);
|
||||
dissector_add_string("media_type", "application/pkixcmp", cmp_http_handle);
|
||||
dissector_add_string("media_type", "application/x-pkixcmp", cmp_http_handle);
|
||||
|
||||
cmp_tcp_style_http_handle = new_create_dissector_handle(dissect_cmp_tcp_pdu, proto_cmp);
|
||||
cmp_tcp_style_http_handle = create_dissector_handle(dissect_cmp_tcp_pdu, proto_cmp);
|
||||
dissector_add_string("media_type", "application/pkixcmp-poll", cmp_tcp_style_http_handle);
|
||||
dissector_add_string("media_type", "application/x-pkixcmp-poll", cmp_tcp_style_http_handle);
|
||||
|
||||
cmp_tcp_handle = new_create_dissector_handle(dissect_cmp_tcp, proto_cmp);
|
||||
cmp_tcp_handle = create_dissector_handle(dissect_cmp_tcp, proto_cmp);
|
||||
dissector_add_uint("tcp.port", TCP_PORT_CMP, cmp_tcp_handle);
|
||||
|
||||
oid_add_from_string("Cryptlib-presence-check","1.3.6.1.4.1.3029.3.1.1");
|
||||
|
|
|
@ -173,7 +173,7 @@ void proto_reg_handoff_cms(void) {
|
|||
oid_add_from_string("id-alg-des-ede3-cbc","1.2.840.113549.3.7");
|
||||
oid_add_from_string("id-alg-des-cbc","1.3.14.3.2.7");
|
||||
|
||||
content_info_handle = new_create_dissector_handle (dissect_ContentInfo_PDU, proto_cms);
|
||||
content_info_handle = create_dissector_handle (dissect_ContentInfo_PDU, proto_cms);
|
||||
dissector_add_string("media_type", "application/pkcs7-mime", content_info_handle);
|
||||
dissector_add_string("media_type", "application/pkcs7-signature", content_info_handle);
|
||||
}
|
||||
|
|
|
@ -161,7 +161,7 @@ void proto_register_credssp(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_credssp = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("credssp", dissect_credssp, proto_credssp);
|
||||
register_dissector("credssp", dissect_credssp, proto_credssp);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_credssp, hf, array_length(hf));
|
||||
|
|
|
@ -219,7 +219,7 @@ void proto_register_disp(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_disp = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("disp", dissect_disp, proto_disp);
|
||||
register_dissector("disp", dissect_disp, proto_disp);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_disp, hf, array_length(hf));
|
||||
|
|
|
@ -261,7 +261,7 @@ void proto_register_dop(void) {
|
|||
/* Register protocol */
|
||||
proto_dop = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
|
||||
new_register_dissector("dop", dissect_dop, proto_dop);
|
||||
register_dissector("dop", dissect_dop, proto_dop);
|
||||
|
||||
dop_dissector_table = register_dissector_table("dop.oid", "DOP OID Dissectors", FT_STRING, BASE_NONE, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
|
||||
|
|
|
@ -291,7 +291,7 @@ void proto_register_dsp(void) {
|
|||
/* Register protocol */
|
||||
proto_dsp = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
|
||||
new_register_dissector("dsp", dissect_dsp, proto_dsp);
|
||||
register_dissector("dsp", dissect_dsp, proto_dsp);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_dsp, hf, array_length(hf));
|
||||
|
|
|
@ -143,7 +143,7 @@ void proto_register_ftam(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_ftam = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("ftam", dissect_ftam, proto_ftam);
|
||||
register_dissector("ftam", dissect_ftam, proto_ftam);
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_ftam, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
|
|
@ -141,7 +141,7 @@ void proto_register_goose(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_goose = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("goose", dissect_goose, proto_goose);
|
||||
register_dissector("goose", dissect_goose, proto_goose);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_goose, hf, array_length(hf));
|
||||
|
|
|
@ -3122,8 +3122,8 @@ void proto_register_gsm_map(void) {
|
|||
/* Register protocol */
|
||||
proto_gsm_map_dialogue =proto_gsm_map = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
|
||||
new_register_dissector("gsm_map", dissect_gsm_map, proto_gsm_map);
|
||||
new_register_dissector("gsm_map_sccp", dissect_gsm_map_sccp, proto_gsm_map);
|
||||
register_dissector("gsm_map", dissect_gsm_map, proto_gsm_map);
|
||||
register_dissector("gsm_map_sccp", dissect_gsm_map_sccp, proto_gsm_map);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_gsm_map, hf, array_length(hf));
|
||||
|
|
|
@ -908,9 +908,9 @@ void proto_register_h225(void) {
|
|||
"ON - display tunnelled protocols inside H.225.0 tree, OFF - display tunnelled protocols in root tree after H.225.0",
|
||||
&h225_tp_in_tree);
|
||||
|
||||
new_register_dissector(PFNAME, dissect_h225_H323UserInformation, proto_h225);
|
||||
new_register_dissector("h323ui",dissect_h225_H323UserInformation, proto_h225);
|
||||
new_register_dissector("h225.ras", dissect_h225_h225_RasMessage, proto_h225);
|
||||
register_dissector(PFNAME, dissect_h225_H323UserInformation, proto_h225);
|
||||
register_dissector("h323ui",dissect_h225_H323UserInformation, proto_h225);
|
||||
register_dissector("h225.ras", dissect_h225_h225_RasMessage, proto_h225);
|
||||
|
||||
nsp_object_dissector_table = register_dissector_table("h225.nsp.object", "H.225 NonStandardParameter (object)", FT_STRING, BASE_NONE, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
nsp_h221_dissector_table = register_dissector_table("h225.nsp.h221", "H.225 NonStandardParameter (h221)", FT_UINT32, BASE_HEX, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
|
|
|
@ -138,7 +138,7 @@ void proto_reg_handoff_h235(void) {
|
|||
|
||||
/* H.235.8, Chapter 4.1.2, SrtpCryptoCapability transport */
|
||||
dissector_add_string("h245.gef.content", "GenericCapability/0.0.8.235.0.4.90/nonCollapsingRaw",
|
||||
new_create_dissector_handle(dissect_SrtpCryptoCapability_PDU, proto_h235));
|
||||
create_dissector_handle(dissect_SrtpCryptoCapability_PDU, proto_h235));
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -538,8 +538,8 @@ void proto_register_h245(void) {
|
|||
"Show h245 info in reversed order",
|
||||
"Whether the dissector should print items of h245 Info column in reversed order",
|
||||
&info_col_fmt_prepend);
|
||||
new_register_dissector("h245dg", dissect_h245_h245, proto_h245);
|
||||
new_register_dissector("h245", dissect_h245, proto_h245);
|
||||
register_dissector("h245dg", dissect_h245_h245, proto_h245);
|
||||
register_dissector("h245", dissect_h245, proto_h245);
|
||||
|
||||
nsp_object_dissector_table = register_dissector_table("h245.nsp.object", "H.245 NonStandardParameter (object)", FT_STRING, BASE_NONE, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
nsp_h221_dissector_table = register_dissector_table("h245.nsp.h221", "H.245 NonStandardParameter (h221)", FT_UINT32, BASE_HEX, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
|
|
|
@ -1614,8 +1614,8 @@ void proto_register_h248(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_h248 = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("h248", dissect_h248, proto_h248);
|
||||
new_register_dissector("h248.tpkt", dissect_h248_tpkt, proto_h248);
|
||||
register_dissector("h248", dissect_h248, proto_h248);
|
||||
register_dissector("h248.tpkt", dissect_h248_tpkt, proto_h248);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_h248, hf, array_length(hf));
|
||||
|
|
|
@ -85,8 +85,8 @@ void proto_register_h282(void) {
|
|||
proto_register_field_array(proto_h282, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
new_register_dissector(PFNAME, dissect_h282, proto_h282);
|
||||
new_register_dissector(PFNAME".device_list", dissect_NonCollapsingCapabilities_PDU, proto_h282);
|
||||
register_dissector(PFNAME, dissect_h282, proto_h282);
|
||||
register_dissector(PFNAME".device_list", dissect_NonCollapsingCapabilities_PDU, proto_h282);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -90,7 +90,7 @@ void proto_register_h283(void) {
|
|||
proto_register_field_array(proto_h283, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
new_register_dissector(PFNAME, dissect_h283_udp, proto_h283);
|
||||
register_dissector(PFNAME, dissect_h283_udp, proto_h283);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -128,10 +128,10 @@ void proto_reg_handoff_h323(void)
|
|||
|
||||
/* H.323, Annex M4, Tunnelling of narrow-band signalling syntax (NSS) for H.323 */
|
||||
dissector_add_string("h225.gef.content", "GenericData/1000/1",
|
||||
new_create_dissector_handle(dissect_RasTunnelledSignallingMessage_PDU, proto_h323));
|
||||
create_dissector_handle(dissect_RasTunnelledSignallingMessage_PDU, proto_h323));
|
||||
|
||||
/* H.323, Annex R, Robustness methods for H.323 entities */
|
||||
dissector_add_string("h225.gef.content", "GenericData/1/1",
|
||||
new_create_dissector_handle(dissect_RobustnessData_PDU, proto_h323));
|
||||
create_dissector_handle(dissect_RobustnessData_PDU, proto_h323));
|
||||
}
|
||||
|
||||
|
|
|
@ -279,7 +279,7 @@ void proto_register_h450(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_h450 = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("h4501", dissect_h450_H4501SupplementaryService_PDU, proto_h450);
|
||||
register_dissector("h4501", dissect_h450_H4501SupplementaryService_PDU, proto_h450);
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_h450, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
@ -308,13 +308,13 @@ proto_reg_handoff_h450(void)
|
|||
dissector_handle_t h450_res_handle;
|
||||
dissector_handle_t h450_err_handle;
|
||||
|
||||
h450_arg_handle = new_create_dissector_handle(dissect_h450_arg, proto_h450);
|
||||
h450_res_handle = new_create_dissector_handle(dissect_h450_res, proto_h450);
|
||||
h450_arg_handle = create_dissector_handle(dissect_h450_arg, proto_h450);
|
||||
h450_res_handle = create_dissector_handle(dissect_h450_res, proto_h450);
|
||||
for (i=0; i<(int)array_length(h450_op_tab); i++) {
|
||||
dissector_add_uint("h450.ros.local.arg", h450_op_tab[i].opcode, h450_arg_handle);
|
||||
dissector_add_uint("h450.ros.local.res", h450_op_tab[i].opcode, h450_res_handle);
|
||||
}
|
||||
h450_err_handle = new_create_dissector_handle(dissect_h450_err, proto_h450);
|
||||
h450_err_handle = create_dissector_handle(dissect_h450_err, proto_h450);
|
||||
for (i=0; i<(int)array_length(h450_err_tab); i++) {
|
||||
dissector_add_uint("h450.ros.local.err", h450_err_tab[i].errcode, h450_err_handle);
|
||||
}
|
||||
|
|
|
@ -264,7 +264,7 @@ void proto_register_h460(void) {
|
|||
if (ftr->opt & FD) ftr->key_fd = g_strdup_printf("FeatureDescriptor/%s", ftr->id);
|
||||
if (ftr->opt & GM) ftr->key_gm = g_strdup_printf("GenericMessage/%s", ftr->id);
|
||||
if (ftr->opt & GI) ftr->key_gi = g_strdup_printf("GenericInformation/%s", ftr->id);
|
||||
if (ftr->content_pdu) ftr->content_hnd = new_create_dissector_handle(ftr->content_pdu, proto_h460);
|
||||
if (ftr->content_pdu) ftr->content_hnd = create_dissector_handle(ftr->content_pdu, proto_h460);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -277,7 +277,7 @@ void proto_reg_handoff_h460(void)
|
|||
q931_ie_handle = find_dissector("q931.ie");
|
||||
h225_ras_handle = find_dissector("h225.ras");
|
||||
|
||||
h460_name_handle = new_create_dissector_handle(dissect_h460_name, proto_h460);
|
||||
h460_name_handle = create_dissector_handle(dissect_h460_name, proto_h460);
|
||||
for (ftr=h460_feature_tab; ftr->id; ftr++) {
|
||||
if (ftr->key_gd) dissector_add_string("h225.gef.name", ftr->key_gd, h460_name_handle);
|
||||
if (ftr->key_fd) dissector_add_string("h225.gef.name", ftr->key_fd, h460_name_handle);
|
||||
|
|
|
@ -109,7 +109,7 @@ void proto_register_h501(void) {
|
|||
proto_register_field_array(proto_h501, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
new_register_dissector(PFNAME, dissect_h501_pdu, proto_h501);
|
||||
register_dissector(PFNAME, dissect_h501_pdu, proto_h501);
|
||||
|
||||
h501_module = prefs_register_protocol(proto_h501, proto_reg_handoff_h501);
|
||||
prefs_register_uint_preference(h501_module, "udp.port",
|
||||
|
@ -138,8 +138,8 @@ void proto_reg_handoff_h501(void)
|
|||
|
||||
if (!h501_prefs_initialized) {
|
||||
h501_pdu_handle = find_dissector(PFNAME);
|
||||
h501_udp_handle = new_create_dissector_handle(dissect_h501_udp, proto_h501);
|
||||
h501_tcp_handle = new_create_dissector_handle(dissect_h501_tcp, proto_h501);
|
||||
h501_udp_handle = create_dissector_handle(dissect_h501_udp, proto_h501);
|
||||
h501_tcp_handle = create_dissector_handle(dissect_h501_tcp, proto_h501);
|
||||
h501_prefs_initialized = TRUE;
|
||||
} else {
|
||||
dissector_delete_uint("udp.port", saved_h501_udp_port, h501_udp_handle);
|
||||
|
|
|
@ -163,7 +163,7 @@ module_t *hnbap_module;
|
|||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
/* Register dissector */
|
||||
new_register_dissector("hnbap", dissect_hnbap, proto_hnbap);
|
||||
register_dissector("hnbap", dissect_hnbap, proto_hnbap);
|
||||
|
||||
/* Register dissector tables */
|
||||
hnbap_ies_dissector_table = register_dissector_table("hnbap.ies", "HNBAP-PROTOCOL-IES", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
|
|
|
@ -336,7 +336,7 @@ void proto_register_idmp(void)
|
|||
proto_register_field_array(proto_idmp, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
new_register_dissector("idmp", dissect_idmp_tcp, proto_idmp);
|
||||
register_dissector("idmp", dissect_idmp_tcp, proto_idmp);
|
||||
|
||||
register_init_routine (&idmp_reassemble_init);
|
||||
register_cleanup_routine (&idmp_reassemble_cleanup);
|
||||
|
|
|
@ -115,7 +115,7 @@ void proto_register_ilp(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_ilp = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("ilp", dissect_ilp_tcp, proto_ilp);
|
||||
register_dissector("ilp", dissect_ilp_tcp, proto_ilp);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_ilp, hf, array_length(hf));
|
||||
|
|
|
@ -237,7 +237,7 @@ void proto_register_inap(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_inap = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("inap", dissect_inap, proto_inap);
|
||||
register_dissector("inap", dissect_inap, proto_inap);
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_inap, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
|
|
@ -301,8 +301,8 @@ void proto_reg_handoff_isdn_sup(void) {
|
|||
q931_handle = find_dissector("q931");
|
||||
#endif
|
||||
|
||||
isdn_sup_arg_handle = new_create_dissector_handle(dissect_isdn_sup_arg, proto_isdn_sup);
|
||||
isdn_sup_res_handle = new_create_dissector_handle(dissect_isdn_sup_res, proto_isdn_sup);
|
||||
isdn_sup_arg_handle = create_dissector_handle(dissect_isdn_sup_arg, proto_isdn_sup);
|
||||
isdn_sup_res_handle = create_dissector_handle(dissect_isdn_sup_res, proto_isdn_sup);
|
||||
for (i=0; i<(int)array_length(isdn_sup_op_tab); i++) {
|
||||
dissector_add_uint("q932.ros.etsi.local.arg", isdn_sup_op_tab[i].opcode, isdn_sup_arg_handle);
|
||||
dissector_add_uint("q932.ros.etsi.local.res", isdn_sup_op_tab[i].opcode, isdn_sup_res_handle);
|
||||
|
@ -310,12 +310,12 @@ void proto_reg_handoff_isdn_sup(void) {
|
|||
|
||||
for (i=0; i<(int)array_length(isdn_sup_global_op_tab); i++) {
|
||||
if(isdn_sup_global_op_tab->arg_pdu)
|
||||
dissector_add_string("q932.ros.global.arg", isdn_sup_global_op_tab[i].oid, new_create_dissector_handle(isdn_sup_global_op_tab[i].arg_pdu, proto_isdn_sup));
|
||||
dissector_add_string("q932.ros.global.arg", isdn_sup_global_op_tab[i].oid, create_dissector_handle(isdn_sup_global_op_tab[i].arg_pdu, proto_isdn_sup));
|
||||
if(isdn_sup_global_op_tab->res_pdu)
|
||||
dissector_add_string("q932.ros.global.res", isdn_sup_global_op_tab[i].oid, new_create_dissector_handle(isdn_sup_global_op_tab[i].res_pdu, proto_isdn_sup));
|
||||
dissector_add_string("q932.ros.global.res", isdn_sup_global_op_tab[i].oid, create_dissector_handle(isdn_sup_global_op_tab[i].res_pdu, proto_isdn_sup));
|
||||
}
|
||||
|
||||
isdn_sup_err_handle = new_create_dissector_handle(dissect_isdn_sup_err, proto_isdn_sup);
|
||||
isdn_sup_err_handle = create_dissector_handle(dissect_isdn_sup_err, proto_isdn_sup);
|
||||
|
||||
for (i=0; i<(int)array_length(isdn_sup_err_tab); i++) {
|
||||
dissector_add_uint("q932.ros.etsi.local.err", isdn_sup_err_tab[i].errcode, isdn_sup_err_handle);
|
||||
|
|
|
@ -2470,10 +2470,10 @@ proto_reg_handoff_kerberos(void)
|
|||
|
||||
krb4_handle = find_dissector("krb4");
|
||||
|
||||
kerberos_handle_udp = new_create_dissector_handle(dissect_kerberos_udp,
|
||||
kerberos_handle_udp = create_dissector_handle(dissect_kerberos_udp,
|
||||
proto_kerberos);
|
||||
|
||||
kerberos_handle_tcp = new_create_dissector_handle(dissect_kerberos_tcp,
|
||||
kerberos_handle_tcp = create_dissector_handle(dissect_kerberos_tcp,
|
||||
proto_kerberos);
|
||||
|
||||
dissector_add_uint("udp.port", UDP_PORT_KERBEROS, kerberos_handle_udp);
|
||||
|
|
|
@ -307,7 +307,7 @@ void proto_register_lcsap(void) {
|
|||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_lcsap, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
new_register_dissector("lcsap", dissect_lcsap, proto_lcsap);
|
||||
register_dissector("lcsap", dissect_lcsap, proto_lcsap);
|
||||
|
||||
/* Register dissector tables */
|
||||
lcsap_ies_dissector_table = register_dissector_table("lcsap.ies", "LCS-AP-PROTOCOL-IES", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
|
|
|
@ -2226,7 +2226,7 @@ void proto_register_ldap(void) {
|
|||
expert_ldap = expert_register_protocol(proto_ldap);
|
||||
expert_register_field_array(expert_ldap, ei, array_length(ei));
|
||||
|
||||
new_register_dissector("ldap", dissect_ldap_tcp, proto_ldap);
|
||||
register_dissector("ldap", dissect_ldap_tcp, proto_ldap);
|
||||
|
||||
ldap_module = prefs_register_protocol(proto_ldap, prefs_register_ldap);
|
||||
prefs_register_bool_preference(ldap_module, "desegment_ldap_messages",
|
||||
|
@ -2288,7 +2288,7 @@ proto_reg_handoff_ldap(void)
|
|||
|
||||
dissector_add_uint("tcp.port", TCP_PORT_GLOBALCAT_LDAP, ldap_handle);
|
||||
|
||||
cldap_handle = new_create_dissector_handle(dissect_mscldap, proto_cldap);
|
||||
cldap_handle = create_dissector_handle(dissect_mscldap, proto_cldap);
|
||||
dissector_add_uint("udp.port", UDP_PORT_CLDAP, cldap_handle);
|
||||
|
||||
gssapi_handle = find_dissector("gssapi");
|
||||
|
@ -2343,12 +2343,12 @@ proto_reg_handoff_ldap(void)
|
|||
oid_add_from_string("LDAP_SERVER_SHUTDOWN_NOTIFY_OID","1.2.840.113556.1.4.1907");
|
||||
oid_add_from_string("LDAP_SERVER_RANGE_RETRIEVAL_NOERR_OID","1.2.840.113556.1.4.1948");
|
||||
|
||||
dissector_add_string("ldap.name", "netlogon", new_create_dissector_handle(dissect_NetLogon_PDU, proto_cldap));
|
||||
dissector_add_string("ldap.name", "objectGUID", new_create_dissector_handle(dissect_ldap_guid, proto_ldap));
|
||||
dissector_add_string("ldap.name", "supportedControl", new_create_dissector_handle(dissect_ldap_oid, proto_ldap));
|
||||
dissector_add_string("ldap.name", "supportedCapabilities", new_create_dissector_handle(dissect_ldap_oid, proto_ldap));
|
||||
dissector_add_string("ldap.name", "objectSid", new_create_dissector_handle(dissect_ldap_sid, proto_ldap));
|
||||
dissector_add_string("ldap.name", "nTSecurityDescriptor", new_create_dissector_handle(dissect_ldap_nt_sec_desc, proto_ldap));
|
||||
dissector_add_string("ldap.name", "netlogon", create_dissector_handle(dissect_NetLogon_PDU, proto_cldap));
|
||||
dissector_add_string("ldap.name", "objectGUID", create_dissector_handle(dissect_ldap_guid, proto_ldap));
|
||||
dissector_add_string("ldap.name", "supportedControl", create_dissector_handle(dissect_ldap_oid, proto_ldap));
|
||||
dissector_add_string("ldap.name", "supportedCapabilities", create_dissector_handle(dissect_ldap_oid, proto_ldap));
|
||||
dissector_add_string("ldap.name", "objectSid", create_dissector_handle(dissect_ldap_sid, proto_ldap));
|
||||
dissector_add_string("ldap.name", "nTSecurityDescriptor", create_dissector_handle(dissect_ldap_nt_sec_desc, proto_ldap));
|
||||
|
||||
#include "packet-ldap-dis-tab.c"
|
||||
|
||||
|
|
|
@ -1698,7 +1698,7 @@ void proto_register_lpp(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_lpp = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("lpp", dissect_lpp, proto_lpp);
|
||||
register_dissector("lpp", dissect_lpp, proto_lpp);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_lpp, hf, array_length(hf));
|
||||
|
|
|
@ -104,7 +104,7 @@ void proto_register_lppa(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_lppa = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("lppa", dissect_LPPA_PDU_PDU, proto_lppa);
|
||||
register_dissector("lppa", dissect_LPPA_PDU_PDU, proto_lppa);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_lppa, hf, array_length(hf));
|
||||
|
|
|
@ -77,7 +77,7 @@ void proto_register_lppe(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_lppe = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("lppe", dissect_OMA_LPPe_MessageExtension_PDU, proto_lppe);
|
||||
register_dissector("lppe", dissect_OMA_LPPe_MessageExtension_PDU, proto_lppe);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_lppe, hf, array_length(hf));
|
||||
|
|
|
@ -3607,16 +3607,16 @@ void proto_register_lte_rrc(void) {
|
|||
proto_lte_rrc = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
|
||||
/* These entry points will first create an lte_rrc root node */
|
||||
new_register_dissector("lte_rrc.dl_ccch", dissect_lte_rrc_DL_CCCH, proto_lte_rrc);
|
||||
new_register_dissector("lte_rrc.dl_dcch", dissect_lte_rrc_DL_DCCH, proto_lte_rrc);
|
||||
new_register_dissector("lte_rrc.ul_ccch", dissect_lte_rrc_UL_CCCH, proto_lte_rrc);
|
||||
new_register_dissector("lte_rrc.ul_dcch", dissect_lte_rrc_UL_DCCH, proto_lte_rrc);
|
||||
new_register_dissector("lte_rrc.bcch_bch", dissect_lte_rrc_BCCH_BCH, proto_lte_rrc);
|
||||
new_register_dissector("lte_rrc.bcch_dl_sch", dissect_lte_rrc_BCCH_DL_SCH, proto_lte_rrc);
|
||||
new_register_dissector("lte_rrc.pcch", dissect_lte_rrc_PCCH, proto_lte_rrc);
|
||||
new_register_dissector("lte_rrc.mcch", dissect_lte_rrc_MCCH, proto_lte_rrc);
|
||||
new_register_dissector("lte_rrc.handover_prep_info", dissect_lte_rrc_Handover_Preparation_Info, proto_lte_rrc);
|
||||
new_register_dissector("lte_rrc.sbcch_sl_bch", dissect_lte_rrc_SBCCH_SL_BCH, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.dl_ccch", dissect_lte_rrc_DL_CCCH, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.dl_dcch", dissect_lte_rrc_DL_DCCH, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.ul_ccch", dissect_lte_rrc_UL_CCCH, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.ul_dcch", dissect_lte_rrc_UL_DCCH, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.bcch_bch", dissect_lte_rrc_BCCH_BCH, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.bcch_dl_sch", dissect_lte_rrc_BCCH_DL_SCH, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.pcch", dissect_lte_rrc_PCCH, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.mcch", dissect_lte_rrc_MCCH, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.handover_prep_info", dissect_lte_rrc_Handover_Preparation_Info, proto_lte_rrc);
|
||||
register_dissector("lte_rrc.sbcch_sl_bch", dissect_lte_rrc_SBCCH_SL_BCH, proto_lte_rrc);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_lte_rrc, hf, array_length(hf));
|
||||
|
|
|
@ -183,11 +183,11 @@ proto_reg_handoff_m3ap(void)
|
|||
static guint SctpPort;
|
||||
|
||||
if( !inited ) {
|
||||
m3ap_handle = new_create_dissector_handle(dissect_m3ap, proto_m3ap);
|
||||
m3ap_handle = create_dissector_handle(dissect_m3ap, proto_m3ap);
|
||||
dissector_add_uint("sctp.ppi", PROTO_3GPP_M3AP_PROTOCOL_ID, m3ap_handle);
|
||||
inited = TRUE;
|
||||
#include "packet-m3ap-dis-tab.c"
|
||||
dissector_add_uint("m3ap.extension", 17, new_create_dissector_handle(dissect_AllocationAndRetentionPriority_PDU, proto_m3ap));
|
||||
dissector_add_uint("m3ap.extension", 17, create_dissector_handle(dissect_AllocationAndRetentionPriority_PDU, proto_m3ap));
|
||||
}
|
||||
else {
|
||||
if (SctpPort != 0) {
|
||||
|
|
|
@ -111,7 +111,7 @@ void proto_register_mms(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_mms = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("mms", dissect_mms, proto_mms);
|
||||
register_dissector("mms", dissect_mms, proto_mms);
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_mms, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
|
|
@ -654,14 +654,14 @@ proto_register_mpeg_pes(void)
|
|||
|
||||
proto_mpeg = proto_register_protocol(
|
||||
"Moving Picture Experts Group", "MPEG", "mpeg");
|
||||
new_register_dissector("mpeg", dissect_mpeg, proto_mpeg);
|
||||
register_dissector("mpeg", dissect_mpeg, proto_mpeg);
|
||||
heur_subdissector_list = register_heur_dissector_list("mpeg");
|
||||
|
||||
proto_mpeg_pes = proto_register_protocol(
|
||||
"Packetized Elementary Stream", "MPEG PES", "mpeg-pes");
|
||||
proto_register_field_array(proto_mpeg_pes, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
new_register_dissector("mpeg-pes", dissect_mpeg_pes, proto_mpeg_pes);
|
||||
register_dissector("mpeg-pes", dissect_mpeg_pes, proto_mpeg_pes);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -507,7 +507,7 @@ void proto_register_nbap(void)
|
|||
expert_register_field_array(expert_nbap, ei, array_length(ei));
|
||||
|
||||
/* Register dissector */
|
||||
new_register_dissector("nbap", dissect_nbap, proto_nbap);
|
||||
register_dissector("nbap", dissect_nbap, proto_nbap);
|
||||
|
||||
nbap_module = prefs_register_protocol(proto_nbap, NULL);
|
||||
|
||||
|
|
|
@ -128,8 +128,8 @@ void proto_reg_handoff_ocsp(void) {
|
|||
dissector_handle_t ocsp_request_handle;
|
||||
dissector_handle_t ocsp_response_handle;
|
||||
|
||||
ocsp_request_handle = new_create_dissector_handle(dissect_ocsp_request, proto_ocsp);
|
||||
ocsp_response_handle = new_create_dissector_handle(dissect_ocsp_response, proto_ocsp);
|
||||
ocsp_request_handle = create_dissector_handle(dissect_ocsp_request, proto_ocsp);
|
||||
ocsp_response_handle = create_dissector_handle(dissect_ocsp_response, proto_ocsp);
|
||||
|
||||
dissector_add_string("media_type", "application/ocsp-request", ocsp_request_handle);
|
||||
dissector_add_string("media_type", "application/ocsp-response", ocsp_response_handle);
|
||||
|
|
|
@ -363,7 +363,7 @@ void proto_register_p1(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_p1 = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("p1", dissect_p1, proto_p1);
|
||||
register_dissector("p1", dissect_p1, proto_p1);
|
||||
|
||||
proto_p3 = proto_register_protocol("X.411 Message Access Service", "P3", "p3");
|
||||
|
||||
|
|
|
@ -127,7 +127,7 @@ void proto_register_p22(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_p22 = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("p22", dissect_p22, proto_p22);
|
||||
register_dissector("p22", dissect_p22, proto_p22);
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_p22, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
|
|
@ -99,7 +99,7 @@ void proto_register_p772(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_p772 = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("p772", dissect_p772, proto_p772);
|
||||
register_dissector("p772", dissect_p772, proto_p772);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_p772, hf, array_length(hf));
|
||||
|
|
|
@ -188,7 +188,7 @@ void proto_register_pcap(void) {
|
|||
pcap_module = prefs_register_protocol(proto_pcap, proto_reg_handoff_pcap);
|
||||
|
||||
/* Register dissector */
|
||||
new_register_dissector("pcap", dissect_pcap, proto_pcap);
|
||||
register_dissector("pcap", dissect_pcap, proto_pcap);
|
||||
|
||||
/* Register dissector tables */
|
||||
pcap_ies_dissector_table = register_dissector_table("pcap.ies", "PCAP-PROTOCOL-IES", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
|
|
|
@ -59,7 +59,7 @@ PrivateKeyInfo
|
|||
|
||||
/* we change the CMS id-data dissector to dissect as AuthenticatedSafe
|
||||
not sure why PKCS#12 couldn't have used its own content type OID for AuthenticatedSafe */
|
||||
dissector_handle=new_create_dissector_handle(dissect_AuthenticatedSafe_OCTETSTRING_PDU, proto_pkcs12);
|
||||
dissector_handle=create_dissector_handle(dissect_AuthenticatedSafe_OCTETSTRING_PDU, proto_pkcs12);
|
||||
dissector_change_string("ber.oid", "1.2.840.113549.1.7.1", dissector_handle);
|
||||
|
||||
%(DEFAULT_BODY)s
|
||||
|
@ -71,7 +71,7 @@ PrivateKeyInfo
|
|||
dissector_handle_t dissector_handle;
|
||||
|
||||
/* we change the CMS id-data dissector to dissect as SafeContents */
|
||||
dissector_handle=new_create_dissector_handle(dissect_SafeContents_OCTETSTRING_PDU, proto_pkcs12);
|
||||
dissector_handle=create_dissector_handle(dissect_SafeContents_OCTETSTRING_PDU, proto_pkcs12);
|
||||
dissector_change_string("ber.oid", "1.2.840.113549.1.7.1", dissector_handle);
|
||||
|
||||
%(DEFAULT_BODY)s
|
||||
|
@ -145,7 +145,7 @@ PrivateKeyInfo
|
|||
|
||||
|
||||
|
||||
dissector_handle=new_create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12);
|
||||
dissector_handle=create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12);
|
||||
dissector_change_string("ber.oid", object_identifier_id, dissector_handle);
|
||||
|
||||
PBE_decrypt_data(object_identifier_id, encrypted_tvb, actx, actx->created_item);
|
||||
|
|
|
@ -123,10 +123,10 @@ void proto_reg_handoff_pkixtsp(void) {
|
|||
dissector_handle_t timestamp_reply_handle;
|
||||
dissector_handle_t timestamp_query_handle;
|
||||
|
||||
timestamp_reply_handle = new_create_dissector_handle(dissect_timestamp_reply, proto_pkixtsp);
|
||||
timestamp_reply_handle = create_dissector_handle(dissect_timestamp_reply, proto_pkixtsp);
|
||||
dissector_add_string("media_type", "application/timestamp-reply", timestamp_reply_handle);
|
||||
|
||||
timestamp_query_handle = new_create_dissector_handle(dissect_timestamp_query, proto_pkixtsp);
|
||||
timestamp_query_handle = create_dissector_handle(dissect_timestamp_query, proto_pkixtsp);
|
||||
dissector_add_string("media_type", "application/timestamp-query", timestamp_query_handle);
|
||||
|
||||
#include "packet-pkixtsp-dis-tab.c"
|
||||
|
|
|
@ -432,7 +432,7 @@ void proto_register_pres(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_pres = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("pres", dissect_pres, proto_pres);
|
||||
register_dissector("pres", dissect_pres, proto_pres);
|
||||
|
||||
/* Register connectionless protocol (just for the description) */
|
||||
proto_clpres = proto_register_protocol(CLPNAME, CLPSNAME, CLPFNAME);
|
||||
|
|
|
@ -100,7 +100,7 @@ void proto_register_q932_ros(void) {
|
|||
expert_q932_ros = expert_register_protocol(proto_q932_ros);
|
||||
expert_register_field_array(expert_q932_ros, ei, array_length(ei));
|
||||
|
||||
new_register_dissector(PFNAME, dissect_q932_ros, proto_q932_ros);
|
||||
register_dissector(PFNAME, dissect_q932_ros, proto_q932_ros);
|
||||
}
|
||||
|
||||
/*--- proto_reg_handoff_q932_ros --------------------------------------------*/
|
||||
|
|
|
@ -335,7 +335,7 @@ void proto_register_q932(void) {
|
|||
|
||||
/* Register protocol and dissector */
|
||||
proto_q932 = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("q932.apdu", dissect_q932_apdu, proto_q932);
|
||||
register_dissector("q932.apdu", dissect_q932_apdu, proto_q932);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_q932, hf, array_length(hf));
|
||||
|
@ -373,7 +373,7 @@ void proto_reg_handoff_q932(void) {
|
|||
static gboolean q931_prefs_initialized = FALSE;
|
||||
|
||||
if (!q931_prefs_initialized) {
|
||||
q932_ie_handle = new_create_dissector_handle(dissect_q932_ie, proto_q932);
|
||||
q932_ie_handle = create_dissector_handle(dissect_q932_ie, proto_q932);
|
||||
/* Facility */
|
||||
dissector_add_uint("q931.ie", (0x00 << 8) | Q932_IE_FACILITY, q932_ie_handle);
|
||||
/* Notification indicator */
|
||||
|
|
|
@ -713,8 +713,8 @@ void proto_reg_handoff_qsig(void) {
|
|||
q931_handle = find_dissector("q931");
|
||||
q931_ie_handle = find_dissector("q931.ie");
|
||||
|
||||
qsig_arg_handle = new_create_dissector_handle(dissect_qsig_arg, proto_qsig);
|
||||
qsig_res_handle = new_create_dissector_handle(dissect_qsig_res, proto_qsig);
|
||||
qsig_arg_handle = create_dissector_handle(dissect_qsig_arg, proto_qsig);
|
||||
qsig_res_handle = create_dissector_handle(dissect_qsig_res, proto_qsig);
|
||||
for (i=0; i<(int)array_length(qsig_op_tab); i++) {
|
||||
dissector_add_uint("q932.ros.local.arg", qsig_op_tab[i].opcode, qsig_arg_handle);
|
||||
dissector_add_uint("q932.ros.local.res", qsig_op_tab[i].opcode, qsig_res_handle);
|
||||
|
@ -725,16 +725,16 @@ void proto_reg_handoff_qsig(void) {
|
|||
dissector_add_string("q932.ros.global.res", oid, qsig_res_handle);
|
||||
}
|
||||
}
|
||||
qsig_err_handle = new_create_dissector_handle(dissect_qsig_err, proto_qsig);
|
||||
qsig_err_handle = create_dissector_handle(dissect_qsig_err, proto_qsig);
|
||||
for (i=0; i<(int)array_length(qsig_err_tab); i++) {
|
||||
dissector_add_uint("q932.ros.local.err", qsig_err_tab[i].errcode, qsig_err_handle);
|
||||
}
|
||||
|
||||
qsig_ie_handle = new_create_dissector_handle(dissect_qsig_ie_cs4, proto_qsig);
|
||||
qsig_ie_handle = create_dissector_handle(dissect_qsig_ie_cs4, proto_qsig);
|
||||
/* QSIG-TC - Transit counter */
|
||||
dissector_add_uint("q931.ie", CS4 | QSIG_IE_TRANSIT_COUNTER, qsig_ie_handle);
|
||||
|
||||
qsig_ie_handle = new_create_dissector_handle(dissect_qsig_ie_cs5, proto_qsig);
|
||||
qsig_ie_handle = create_dissector_handle(dissect_qsig_ie_cs5, proto_qsig);
|
||||
/* SSIG-BC - Party category */
|
||||
dissector_add_uint("q931.ie", CS5 | QSIG_IE_PARTY_CATEGORY, qsig_ie_handle);
|
||||
|
||||
|
|
|
@ -342,7 +342,7 @@ void proto_register_ranap(void) {
|
|||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
/* Register dissector */
|
||||
new_register_dissector("ranap", dissect_ranap, proto_ranap);
|
||||
register_dissector("ranap", dissect_ranap, proto_ranap);
|
||||
|
||||
/* Register dissector tables */
|
||||
ranap_ies_dissector_table = register_dissector_table("ranap.ies", "RANAP-PROTOCOL-IES", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
|
|
|
@ -158,7 +158,7 @@ void proto_register_rnsap(void) {
|
|||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
/* Register dissector */
|
||||
new_register_dissector("rnsap", dissect_rnsap, proto_rnsap);
|
||||
register_dissector("rnsap", dissect_rnsap, proto_rnsap);
|
||||
|
||||
/* Register dissector tables */
|
||||
rnsap_ies_dissector_table = register_dissector_table("rnsap.ies", "RNSAP-PROTOCOL-IES", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
|
|
|
@ -506,7 +506,7 @@ void proto_register_ros(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_ros = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("ros", dissect_ros, proto_ros);
|
||||
register_dissector("ros", dissect_ros, proto_ros);
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_ros, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
|
|
@ -334,7 +334,7 @@ void proto_register_rrc(void) {
|
|||
expert_rrc = expert_register_protocol(proto_rrc);
|
||||
expert_register_field_array(expert_rrc, ei, array_length(ei));
|
||||
|
||||
new_register_dissector("rrc", dissect_rrc, proto_rrc);
|
||||
register_dissector("rrc", dissect_rrc, proto_rrc);
|
||||
|
||||
#include "packet-rrc-dis-reg.c"
|
||||
|
||||
|
|
|
@ -82,7 +82,7 @@ void proto_register_rrlp(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_rrlp = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("rrlp", dissect_PDU_PDU, proto_rrlp);
|
||||
register_dissector("rrlp", dissect_PDU_PDU, proto_rrlp);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_rrlp, hf, array_length(hf));
|
||||
|
|
|
@ -384,7 +384,7 @@ void proto_register_rtse(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_rtse = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("rtse", dissect_rtse, proto_rtse);
|
||||
register_dissector("rtse", dissect_rtse, proto_rtse);
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_rtse, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
|
|
@ -148,7 +148,7 @@ module_t *rua_module;
|
|||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
/* Register dissector */
|
||||
new_register_dissector("rua", dissect_rua, proto_rua);
|
||||
register_dissector("rua", dissect_rua, proto_rua);
|
||||
|
||||
/* Register dissector tables */
|
||||
rua_ies_dissector_table = register_dissector_table("rua.ies", "RUA-PROTOCOL-IES", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
|
|
|
@ -274,7 +274,7 @@ void proto_register_s1ap(void) {
|
|||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
/* Register dissector */
|
||||
new_register_dissector("s1ap", dissect_s1ap, proto_s1ap);
|
||||
register_dissector("s1ap", dissect_s1ap, proto_s1ap);
|
||||
|
||||
/* Register dissector tables */
|
||||
s1ap_ies_dissector_table = register_dissector_table("s1ap.ies", "S1AP-PROTOCOL-IES", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
|
|
|
@ -267,8 +267,8 @@ void proto_register_sabp(void) {
|
|||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
/* Register dissector */
|
||||
new_register_dissector("sabp", dissect_sabp, proto_sabp);
|
||||
new_register_dissector("sabp.tcp", dissect_sabp_tcp, proto_sabp);
|
||||
register_dissector("sabp", dissect_sabp, proto_sabp);
|
||||
register_dissector("sabp.tcp", dissect_sabp_tcp, proto_sabp);
|
||||
|
||||
/* Register dissector tables */
|
||||
sabp_ies_dissector_table = register_dissector_table("sabp.ies", "SABP-PROTOCOL-IES", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
|
|
|
@ -183,7 +183,7 @@ proto_reg_handoff_sbc_ap(void)
|
|||
static guint SctpPort;
|
||||
|
||||
if( !inited ) {
|
||||
sbc_ap_handle = new_create_dissector_handle(dissect_sbc_ap, proto_sbc_ap);
|
||||
sbc_ap_handle = create_dissector_handle(dissect_sbc_ap, proto_sbc_ap);
|
||||
dissector_add_uint("sctp.ppi", SBC_AP_PAYLOAD_PROTOCOL_ID, sbc_ap_handle);
|
||||
inited = TRUE;
|
||||
#include "packet-sbc-ap-dis-tab.c"
|
||||
|
|
|
@ -177,7 +177,7 @@ void proto_register_smrse(void) {
|
|||
void proto_reg_handoff_smrse(void) {
|
||||
dissector_handle_t smrse_handle;
|
||||
|
||||
smrse_handle = new_create_dissector_handle(dissect_smrse, proto_smrse);
|
||||
smrse_handle = create_dissector_handle(dissect_smrse, proto_smrse);
|
||||
dissector_add_uint("tcp.port",TCP_PORT_SMRSE, smrse_handle);
|
||||
}
|
||||
|
||||
|
|
|
@ -2530,7 +2530,7 @@ void proto_register_snmp(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_snmp = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("snmp", dissect_snmp, proto_snmp);
|
||||
register_dissector("snmp", dissect_snmp, proto_snmp);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_snmp, hf, array_length(hf));
|
||||
|
@ -2599,7 +2599,7 @@ void proto_reg_handoff_snmp(void) {
|
|||
dissector_add_uint("ipx.socket", IPX_SOCKET_SNMP_SINK, snmp_handle);
|
||||
dissector_add_uint("hpext.dxsap", HPEXT_SNMP, snmp_handle);
|
||||
|
||||
snmp_tcp_handle = new_create_dissector_handle(dissect_snmp_tcp, proto_snmp);
|
||||
snmp_tcp_handle = create_dissector_handle(dissect_snmp_tcp, proto_snmp);
|
||||
dissector_add_uint("tcp.port", TCP_PORT_SNMP, snmp_tcp_handle);
|
||||
dissector_add_uint("tcp.port", TCP_PORT_SNMP_TRAP, snmp_tcp_handle);
|
||||
|
||||
|
@ -2607,10 +2607,10 @@ void proto_reg_handoff_snmp(void) {
|
|||
|
||||
/* SNMPv2-MIB sysDescr "1.3.6.1.2.1.1.1.0" */
|
||||
dissector_add_string("snmp.variable_oid", "1.3.6.1.2.1.1.1.0",
|
||||
new_create_dissector_handle(dissect_snmp_variable_string, proto_snmp));
|
||||
create_dissector_handle(dissect_snmp_variable_string, proto_snmp));
|
||||
/* SNMPv2-MIB::sysName.0 (1.3.6.1.2.1.1.5.0) */
|
||||
dissector_add_string("snmp.variable_oid", "1.3.6.1.2.1.1.5.0",
|
||||
new_create_dissector_handle(dissect_snmp_variable_string, proto_snmp));
|
||||
create_dissector_handle(dissect_snmp_variable_string, proto_snmp));
|
||||
|
||||
/*
|
||||
* Process preference settings.
|
||||
|
@ -2642,7 +2642,7 @@ proto_reg_handoff_smux(void)
|
|||
{
|
||||
dissector_handle_t smux_handle;
|
||||
|
||||
smux_handle = new_create_dissector_handle(dissect_smux, proto_smux);
|
||||
smux_handle = create_dissector_handle(dissect_smux, proto_smux);
|
||||
dissector_add_uint("tcp.port", TCP_PORT_SMUX, smux_handle);
|
||||
}
|
||||
|
||||
|
|
|
@ -1435,14 +1435,14 @@ void proto_register_spnego(void) {
|
|||
/* Register protocol */
|
||||
proto_spnego = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
|
||||
new_register_dissector("spnego", dissect_spnego, proto_spnego);
|
||||
register_dissector("spnego", dissect_spnego, proto_spnego);
|
||||
|
||||
proto_spnego_krb5 = proto_register_protocol("SPNEGO-KRB5",
|
||||
"SPNEGO-KRB5",
|
||||
"spnego-krb5");
|
||||
|
||||
new_register_dissector("spnego-krb5", dissect_spnego_krb5, proto_spnego_krb5);
|
||||
new_register_dissector("spnego-krb5-wrap", dissect_spnego_krb5_wrap, proto_spnego_krb5);
|
||||
register_dissector("spnego-krb5", dissect_spnego_krb5, proto_spnego_krb5);
|
||||
register_dissector("spnego-krb5-wrap", dissect_spnego_krb5_wrap, proto_spnego_krb5);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_spnego, hf, array_length(hf));
|
||||
|
@ -1461,7 +1461,7 @@ void proto_reg_handoff_spnego(void) {
|
|||
/* Register protocol with GSS-API module */
|
||||
|
||||
spnego_handle = find_dissector("spnego");
|
||||
spnego_wrap_handle = new_create_dissector_handle(dissect_spnego_wrap, proto_spnego);
|
||||
spnego_wrap_handle = create_dissector_handle(dissect_spnego_wrap, proto_spnego);
|
||||
gssapi_init_oid("1.3.6.1.5.5.2", proto_spnego, ett_spnego,
|
||||
spnego_handle, spnego_wrap_handle,
|
||||
"SPNEGO - Simple Protected Negotiation");
|
||||
|
|
|
@ -314,7 +314,7 @@ void proto_register_sv(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_sv = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("sv", dissect_sv, proto_sv);
|
||||
register_dissector("sv", dissect_sv, proto_sv);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_sv, hf, array_length(hf));
|
||||
|
|
|
@ -78,7 +78,7 @@ register_t124_ns_dissector(const char *nsKey, new_dissector_t dissector, int pro
|
|||
{
|
||||
dissector_handle_t dissector_handle;
|
||||
|
||||
dissector_handle=new_create_dissector_handle(dissector, proto);
|
||||
dissector_handle=create_dissector_handle(dissector, proto);
|
||||
dissector_add_string("t124.ns", nsKey, dissector_handle);
|
||||
}
|
||||
|
||||
|
@ -91,7 +91,7 @@ void register_t124_sd_dissector(packet_info *pinfo _U_, guint32 channelId_param,
|
|||
|
||||
dissector_handle_t dissector_handle;
|
||||
|
||||
dissector_handle=new_create_dissector_handle(dissector, proto);
|
||||
dissector_handle=create_dissector_handle(dissector, proto);
|
||||
dissector_add_uint("t124.sd", channelId_param, dissector_handle);
|
||||
|
||||
}
|
||||
|
@ -206,7 +206,7 @@ void proto_register_t124(void) {
|
|||
t124_ns_dissector_table = register_dissector_table("t124.ns", "T.124 H.221 Non Standard Dissectors", FT_STRING, BASE_NONE, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
t124_sd_dissector_table = register_dissector_table("t124.sd", "T.124 H.221 Send Data Dissectors", FT_UINT32, BASE_HEX, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
|
||||
new_register_dissector("t124", dissect_t124, proto_t124);
|
||||
register_dissector("t124", dissect_t124, proto_t124);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -139,7 +139,7 @@ void proto_register_t125(void) {
|
|||
|
||||
t125_heur_subdissector_list= register_heur_dissector_list("t125");
|
||||
|
||||
new_register_dissector("t125", dissect_t125, proto_t125);
|
||||
register_dissector("t125", dissect_t125, proto_t125);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -722,7 +722,7 @@ proto_register_t38(void)
|
|||
proto_register_subtree_array(ett, array_length(ett));
|
||||
expert_t38 = expert_register_protocol(proto_t38);
|
||||
expert_register_field_array(expert_t38, ei, array_length(ei));
|
||||
new_register_dissector("t38_udp", dissect_t38_udp, proto_t38);
|
||||
register_dissector("t38_udp", dissect_t38_udp, proto_t38);
|
||||
|
||||
/* Init reassemble tables for HDLC */
|
||||
register_init_routine(t38_defragment_init);
|
||||
|
@ -778,9 +778,9 @@ proto_reg_handoff_t38(void)
|
|||
static guint udp_port;
|
||||
|
||||
if (!t38_prefs_initialized) {
|
||||
t38_udp_handle=new_create_dissector_handle(dissect_t38_udp, proto_t38);
|
||||
t38_tcp_handle=new_create_dissector_handle(dissect_t38_tcp, proto_t38);
|
||||
t38_tcp_pdu_handle=new_create_dissector_handle(dissect_t38_tcp_pdu, proto_t38);
|
||||
t38_udp_handle=create_dissector_handle(dissect_t38_udp, proto_t38);
|
||||
t38_tcp_handle=create_dissector_handle(dissect_t38_tcp, proto_t38);
|
||||
t38_tcp_pdu_handle=create_dissector_handle(dissect_t38_tcp_pdu, proto_t38);
|
||||
rtp_handle = find_dissector("rtp");
|
||||
t30_hdlc_handle = find_dissector("t30.hdlc");
|
||||
data_handle = find_dissector("data");
|
||||
|
|
|
@ -2214,9 +2214,9 @@ proto_register_tcap(void)
|
|||
itu_sub_dissectors = g_hash_table_new(g_direct_hash,g_direct_equal);
|
||||
|
||||
/* 'globally' register dissector */
|
||||
new_register_dissector("tcap", dissect_tcap, proto_tcap);
|
||||
register_dissector("tcap", dissect_tcap, proto_tcap);
|
||||
|
||||
tcap_handle = new_create_dissector_handle(dissect_tcap, proto_tcap);
|
||||
tcap_handle = create_dissector_handle(dissect_tcap, proto_tcap);
|
||||
|
||||
register_init_routine(&init_tcap);
|
||||
register_cleanup_routine(&cleanup_tcap);
|
||||
|
|
|
@ -553,7 +553,7 @@ void proto_reg_handoff_tetra(void)
|
|||
|
||||
if (!initialized) {
|
||||
data_handle = find_dissector("data");
|
||||
tetra_handle = new_create_dissector_handle(dissect_tetra, proto_tetra);
|
||||
tetra_handle = create_dissector_handle(dissect_tetra, proto_tetra);
|
||||
dissector_add_uint("udp.port", global_tetra_port, tetra_handle);
|
||||
}
|
||||
|
||||
|
@ -642,7 +642,7 @@ void proto_register_tetra (void)
|
|||
proto_tetra = proto_register_protocol("TETRA Protocol", "tetra", "tetra");
|
||||
proto_register_field_array (proto_tetra, hf, array_length (hf));
|
||||
proto_register_subtree_array (ett, array_length (ett));
|
||||
new_register_dissector("tetra", dissect_tetra, proto_tetra);
|
||||
register_dissector("tetra", dissect_tetra, proto_tetra);
|
||||
expert_tetra = expert_register_protocol(proto_tetra);
|
||||
expert_register_field_array(expert_tetra, ei, array_length(ei));
|
||||
|
||||
|
|
|
@ -119,7 +119,7 @@ void proto_register_ulp(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_ulp = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("ulp", dissect_ulp_tcp, proto_ulp);
|
||||
register_dissector("ulp", dissect_ulp_tcp, proto_ulp);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_ulp, hf, array_length(hf));
|
||||
|
@ -159,7 +159,7 @@ proto_reg_handoff_ulp(void)
|
|||
if (!initialized) {
|
||||
ulp_tcp_handle = find_dissector("ulp");
|
||||
dissector_add_string("media_type","application/oma-supl-ulp", ulp_tcp_handle);
|
||||
ulp_udp_handle = new_create_dissector_handle(dissect_ULP_PDU_PDU, proto_ulp);
|
||||
ulp_udp_handle = create_dissector_handle(dissect_ULP_PDU_PDU, proto_ulp);
|
||||
rrlp_handle = find_dissector("rrlp");
|
||||
lpp_handle = find_dissector("lpp");
|
||||
initialized = TRUE;
|
||||
|
|
|
@ -161,7 +161,7 @@ void proto_register_x2ap(void) {
|
|||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
/* Register dissector */
|
||||
new_register_dissector("x2ap", dissect_x2ap, proto_x2ap);
|
||||
register_dissector("x2ap", dissect_x2ap, proto_x2ap);
|
||||
|
||||
/* Register dissector tables */
|
||||
x2ap_ies_dissector_table = register_dissector_table("x2ap.ies", "X2AP-PROTOCOL-IES", FT_UINT32, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
|
|
|
@ -141,7 +141,7 @@ void proto_register_x509af(void) {
|
|||
void proto_reg_handoff_x509af(void) {
|
||||
dissector_handle_t pkix_crl_handle;
|
||||
|
||||
pkix_crl_handle = new_create_dissector_handle(dissect_pkix_crl, proto_x509af);
|
||||
pkix_crl_handle = create_dissector_handle(dissect_pkix_crl, proto_x509af);
|
||||
dissector_add_string("media_type", "application/pkix-crl", pkix_crl_handle);
|
||||
|
||||
#include "packet-x509af-dis-tab.c"
|
||||
|
@ -177,15 +177,15 @@ void proto_reg_handoff_x509af(void) {
|
|||
|
||||
/* these will generally be encoded as ";binary" in LDAP */
|
||||
|
||||
dissector_add_string("ldap.name", "cACertificate", new_create_dissector_handle(dissect_x509af_Certificate_PDU, proto_x509af));
|
||||
dissector_add_string("ldap.name", "userCertificate", new_create_dissector_handle(dissect_x509af_Certificate_PDU, proto_x509af));
|
||||
dissector_add_string("ldap.name", "cACertificate", create_dissector_handle(dissect_x509af_Certificate_PDU, proto_x509af));
|
||||
dissector_add_string("ldap.name", "userCertificate", create_dissector_handle(dissect_x509af_Certificate_PDU, proto_x509af));
|
||||
|
||||
dissector_add_string("ldap.name", "certificateRevocationList", new_create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
|
||||
dissector_add_string("ldap.name", "crl", new_create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
|
||||
dissector_add_string("ldap.name", "certificateRevocationList", create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
|
||||
dissector_add_string("ldap.name", "crl", create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
|
||||
|
||||
dissector_add_string("ldap.name", "authorityRevocationList", new_create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
|
||||
dissector_add_string("ldap.name", "arl", new_create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
|
||||
dissector_add_string("ldap.name", "authorityRevocationList", create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
|
||||
dissector_add_string("ldap.name", "arl", create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
|
||||
|
||||
dissector_add_string("ldap.name", "crossCertificatePair", new_create_dissector_handle(dissect_CertificatePair_PDU, proto_x509af));
|
||||
dissector_add_string("ldap.name", "crossCertificatePair", create_dissector_handle(dissect_CertificatePair_PDU, proto_x509af));
|
||||
}
|
||||
|
||||
|
|
|
@ -61,11 +61,11 @@ x509ce_enable_ciplus(void)
|
|||
{
|
||||
dissector_handle_t dh25, dh26, dh27;
|
||||
|
||||
dh25 = new_create_dissector_handle(dissect_ScramblerCapabilities_PDU, proto_x509ce);
|
||||
dh25 = create_dissector_handle(dissect_ScramblerCapabilities_PDU, proto_x509ce);
|
||||
dissector_change_string("ber.oid", "1.3.6.1.5.5.7.1.25", dh25);
|
||||
dh26 = new_create_dissector_handle(dissect_CiplusInfo_PDU, proto_x509ce);
|
||||
dh26 = create_dissector_handle(dissect_CiplusInfo_PDU, proto_x509ce);
|
||||
dissector_change_string("ber.oid", "1.3.6.1.5.5.7.1.26", dh26);
|
||||
dh27 = new_create_dissector_handle(dissect_CicamBrandId_PDU, proto_x509ce);
|
||||
dh27 = create_dissector_handle(dissect_CicamBrandId_PDU, proto_x509ce);
|
||||
dissector_change_string("ber.oid", "1.3.6.1.5.5.7.1.27", dh27);
|
||||
}
|
||||
|
||||
|
|
|
@ -5158,7 +5158,7 @@ void proto_register_HI2Operations(void) {
|
|||
proto_register_field_array(proto_HI2Operations, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
||||
new_register_dissector("HI2Operations", dissect_IRIsContent_PDU, proto_HI2Operations);
|
||||
register_dissector("HI2Operations", dissect_IRIsContent_PDU, proto_HI2Operations);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -2308,7 +2308,7 @@ void proto_register_acse(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_acse = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("acse", dissect_acse, proto_acse);
|
||||
register_dissector("acse", dissect_acse, proto_acse);
|
||||
|
||||
/* Register connectionless protocol */
|
||||
proto_clacse = proto_register_protocol(CLPNAME, CLPSNAME, CLPFNAME);
|
||||
|
|
|
@ -19527,7 +19527,7 @@ void proto_register_ansi_map(void) {
|
|||
expert_ansi_map = expert_register_protocol(proto_ansi_map);
|
||||
expert_register_field_array(expert_ansi_map, ei, array_length(ei));
|
||||
|
||||
new_register_dissector("ansi_map", dissect_ansi_map, proto_ansi_map);
|
||||
register_dissector("ansi_map", dissect_ansi_map, proto_ansi_map);
|
||||
|
||||
is637_tele_id_dissector_table =
|
||||
register_dissector_table("ansi_map.tele_id", "IS-637 Teleservice ID",
|
||||
|
|
|
@ -1806,7 +1806,7 @@ proto_register_ansi_tcap(void)
|
|||
|
||||
/* Register the protocol name and description */
|
||||
proto_ansi_tcap = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("ansi_tcap", dissect_ansi_tcap, proto_ansi_tcap);
|
||||
register_dissector("ansi_tcap", dissect_ansi_tcap, proto_ansi_tcap);
|
||||
|
||||
/* Note the high bit should be masked off when registering in this table (0x7fff)*/
|
||||
ansi_tcap_national_opcode_table = register_dissector_table("ansi_tcap.nat.opcode", "ANSI TCAP National Opcodes", FT_UINT16, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
|
|
|
@ -971,7 +971,7 @@ void proto_register_atn_cm (void)
|
|||
ett,
|
||||
array_length(ett));
|
||||
|
||||
new_register_dissector(
|
||||
register_dissector(
|
||||
"atn-cm",
|
||||
dissect_atn_cm,
|
||||
proto_atn_cm);
|
||||
|
|
|
@ -8088,7 +8088,7 @@ void proto_register_atn_cpdlc (void)
|
|||
ett,
|
||||
array_length(ett));
|
||||
|
||||
new_register_dissector(
|
||||
register_dissector(
|
||||
"atn-cpdlc",
|
||||
dissect_atn_cpdlc,
|
||||
proto_atn_cpdlc);
|
||||
|
|
|
@ -2587,7 +2587,7 @@ void proto_register_atn_ulcs (void)
|
|||
ett,
|
||||
array_length (ett));
|
||||
|
||||
new_register_dissector(
|
||||
register_dissector(
|
||||
"atn-ulcs",
|
||||
dissect_atn_ulcs,
|
||||
proto_atn_ulcs);
|
||||
|
|
|
@ -2056,8 +2056,8 @@ proto_reg_handoff_c1222(void)
|
|||
guint8 *temp = NULL;
|
||||
|
||||
if( !initialized ) {
|
||||
c1222_handle = new_create_dissector_handle(dissect_c1222, proto_c1222);
|
||||
c1222_udp_handle = new_create_dissector_handle(dissect_c1222_common, proto_c1222);
|
||||
c1222_handle = create_dissector_handle(dissect_c1222, proto_c1222);
|
||||
c1222_udp_handle = create_dissector_handle(dissect_c1222_common, proto_c1222);
|
||||
dissector_add_uint("tcp.port", global_c1222_port, c1222_handle);
|
||||
dissector_add_uint("udp.port", global_c1222_port, c1222_udp_handle);
|
||||
initialized = TRUE;
|
||||
|
|
|
@ -10669,9 +10669,9 @@ void proto_register_camel(void) {
|
|||
/* Register protocol */
|
||||
proto_camel = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
|
||||
new_register_dissector("camel", dissect_camel, proto_camel);
|
||||
new_register_dissector("camel-v1", dissect_camel_v1, proto_camel);
|
||||
new_register_dissector("camel-v2", dissect_camel_v2, proto_camel);
|
||||
register_dissector("camel", dissect_camel, proto_camel);
|
||||
register_dissector("camel-v1", dissect_camel_v1, proto_camel);
|
||||
register_dissector("camel-v2", dissect_camel_v2, proto_camel);
|
||||
|
||||
proto_register_field_array(proto_camel, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
|
|
@ -1176,6 +1176,6 @@ proto_register_charging_ase(void)
|
|||
void
|
||||
proto_reg_handoff_charging_ase(void)
|
||||
{
|
||||
charging_ase_handle = new_create_dissector_handle(dissect_charging_ase, proto_charging_ase);
|
||||
charging_ase_handle = create_dissector_handle(dissect_charging_ase, proto_charging_ase);
|
||||
}
|
||||
|
||||
|
|
|
@ -5808,7 +5808,7 @@ void proto_register_cmip(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_cmip = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("cmip", dissect_cmip, proto_cmip);
|
||||
register_dissector("cmip", dissect_cmip, proto_cmip);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_cmip, hf, array_length(hf));
|
||||
|
|
|
@ -2477,15 +2477,15 @@ void proto_reg_handoff_cmp(void) {
|
|||
static guint cmp_alternate_tcp_style_http_port_prev = 0;
|
||||
|
||||
if (!inited) {
|
||||
cmp_http_handle = new_create_dissector_handle(dissect_cmp_http, proto_cmp);
|
||||
cmp_http_handle = create_dissector_handle(dissect_cmp_http, proto_cmp);
|
||||
dissector_add_string("media_type", "application/pkixcmp", cmp_http_handle);
|
||||
dissector_add_string("media_type", "application/x-pkixcmp", cmp_http_handle);
|
||||
|
||||
cmp_tcp_style_http_handle = new_create_dissector_handle(dissect_cmp_tcp_pdu, proto_cmp);
|
||||
cmp_tcp_style_http_handle = create_dissector_handle(dissect_cmp_tcp_pdu, proto_cmp);
|
||||
dissector_add_string("media_type", "application/pkixcmp-poll", cmp_tcp_style_http_handle);
|
||||
dissector_add_string("media_type", "application/x-pkixcmp-poll", cmp_tcp_style_http_handle);
|
||||
|
||||
cmp_tcp_handle = new_create_dissector_handle(dissect_cmp_tcp, proto_cmp);
|
||||
cmp_tcp_handle = create_dissector_handle(dissect_cmp_tcp, proto_cmp);
|
||||
dissector_add_uint("tcp.port", TCP_PORT_CMP, cmp_tcp_handle);
|
||||
|
||||
oid_add_from_string("Cryptlib-presence-check","1.3.6.1.4.1.3029.3.1.1");
|
||||
|
|
|
@ -2474,7 +2474,7 @@ void proto_reg_handoff_cms(void) {
|
|||
oid_add_from_string("id-alg-des-ede3-cbc","1.2.840.113549.3.7");
|
||||
oid_add_from_string("id-alg-des-cbc","1.3.14.3.2.7");
|
||||
|
||||
content_info_handle = new_create_dissector_handle (dissect_ContentInfo_PDU, proto_cms);
|
||||
content_info_handle = create_dissector_handle (dissect_ContentInfo_PDU, proto_cms);
|
||||
dissector_add_string("media_type", "application/pkcs7-mime", content_info_handle);
|
||||
dissector_add_string("media_type", "application/pkcs7-signature", content_info_handle);
|
||||
}
|
||||
|
|
|
@ -537,7 +537,7 @@ void proto_register_credssp(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_credssp = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("credssp", dissect_credssp, proto_credssp);
|
||||
register_dissector("credssp", dissect_credssp, proto_credssp);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_credssp, hf, array_length(hf));
|
||||
|
|
|
@ -2120,7 +2120,7 @@ void proto_register_disp(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_disp = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("disp", dissect_disp, proto_disp);
|
||||
register_dissector("disp", dissect_disp, proto_disp);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_disp, hf, array_length(hf));
|
||||
|
|
|
@ -3054,7 +3054,7 @@ void proto_register_dop(void) {
|
|||
/* Register protocol */
|
||||
proto_dop = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
|
||||
new_register_dissector("dop", dissect_dop, proto_dop);
|
||||
register_dissector("dop", dissect_dop, proto_dop);
|
||||
|
||||
dop_dissector_table = register_dissector_table("dop.oid", "DOP OID Dissectors", FT_STRING, BASE_NONE, DISSECTOR_TABLE_ALLOW_DUPLICATE);
|
||||
|
||||
|
|
|
@ -2546,7 +2546,7 @@ void proto_register_dsp(void) {
|
|||
/* Register protocol */
|
||||
proto_dsp = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
|
||||
new_register_dissector("dsp", dissect_dsp, proto_dsp);
|
||||
register_dissector("dsp", dissect_dsp, proto_dsp);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_dsp, hf, array_length(hf));
|
||||
|
|
|
@ -6654,7 +6654,7 @@ void proto_register_ftam(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_ftam = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("ftam", dissect_ftam, proto_ftam);
|
||||
register_dissector("ftam", dissect_ftam, proto_ftam);
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_ftam, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
|
|
|
@ -1053,7 +1053,7 @@ void proto_register_goose(void) {
|
|||
|
||||
/* Register protocol */
|
||||
proto_goose = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
new_register_dissector("goose", dissect_goose, proto_goose);
|
||||
register_dissector("goose", dissect_goose, proto_goose);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_goose, hf, array_length(hf));
|
||||
|
|
|
@ -30620,8 +30620,8 @@ void proto_register_gsm_map(void) {
|
|||
/* Register protocol */
|
||||
proto_gsm_map_dialogue =proto_gsm_map = proto_register_protocol(PNAME, PSNAME, PFNAME);
|
||||
|
||||
new_register_dissector("gsm_map", dissect_gsm_map, proto_gsm_map);
|
||||
new_register_dissector("gsm_map_sccp", dissect_gsm_map_sccp, proto_gsm_map);
|
||||
register_dissector("gsm_map", dissect_gsm_map, proto_gsm_map);
|
||||
register_dissector("gsm_map_sccp", dissect_gsm_map_sccp, proto_gsm_map);
|
||||
|
||||
/* Register fields and subtrees */
|
||||
proto_register_field_array(proto_gsm_map, hf, array_length(hf));
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue