diff options
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-gtp.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-h223.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-mint.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-nfs.c | 26 | ||||
| -rw-r--r-- | epan/dissectors/packet-pcli.c | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-ppp.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-rsvp.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-vxlan.c | 2 |
8 files changed, 25 insertions, 25 deletions
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 01d7d435c7..86dd4b35c6 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -10101,7 +10101,7 @@ proto_register_gtp(void) proto_gtp = proto_register_protocol("GPRS Tunneling Protocol", "GTP", "gtp"); /* Created to remove Decode As confusion */ - proto_gtpprime = proto_register_protocol("GPRS Tunneling Protocol Prime", "GTP (Prime)", "gtpprime"); + proto_gtpprime = proto_register_protocol_in_name_only("GPRS Tunneling Protocol Prime", "GTP (Prime)", "gtpprime", proto_gtp, FT_PROTOCOL); proto_register_field_array(proto_gtp, hf_gtp, array_length(hf_gtp)); proto_register_subtree_array(ett_gtp_array, array_length(ett_gtp_array)); diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index ac22377901..edf38706f5 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -1646,7 +1646,7 @@ void proto_register_h223 (void) proto_register_protocol ("ITU-T Recommendation H.223", "H.223", "h223"); /* Create a H.223 "placeholder" to remove confusion with Decode As" */ proto_h223_bitswapped = - proto_register_protocol ("ITU-T Recommendation H.223 (Bitswapped)", "H.223 (Bitswapped)", "h223_bitswapped"); + proto_register_protocol_in_name_only ("ITU-T Recommendation H.223 (Bitswapped)", "H.223 (Bitswapped)", "h223_bitswapped", proto_h223, FT_PROTOCOL); proto_register_field_array (proto_h223, hf, array_length (hf)); proto_register_subtree_array (ett, array_length (ett)); diff --git a/epan/dissectors/packet-mint.c b/epan/dissectors/packet-mint.c index f2cc30dbba..561ae555d4 100644 --- a/epan/dissectors/packet-mint.c +++ b/epan/dissectors/packet-mint.c @@ -723,7 +723,7 @@ proto_register_mint(void) proto_mint = proto_register_protocol(PROTO_LONG_NAME, PROTO_SHORT_NAME, "mint"); /* Created to remove Decode As confusion */ - proto_mint_data = proto_register_protocol("Media independent Network Transport Data", "MiNT (Data)", "mint_data"); + proto_mint_data = proto_register_protocol_in_name_only("Media independent Network Transport Data", "MiNT (Data)", "mint_data", proto_mint, FT_PROTOCOL); hfi_mint = proto_registrar_get_nth(proto_mint); proto_register_fields(proto_mint, hfi, array_length(hfi)); diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 923eec68e1..837c63481a 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -14028,21 +14028,21 @@ proto_register_nfs(void) proto_nfs = proto_register_protocol("Network File System", "NFS", "nfs"); /* "protocols" registered just for Decode As */ - proto_nfs_unknown = proto_register_protocol("Unknown", "unknown", "nfs.unknown"); - proto_nfs_svr4 = proto_register_protocol("SVR4", "svr4", "nfs.svr4"); - proto_nfs_knfsd_le = proto_register_protocol("KNFSD_LE", "knfsd_le", "nfs.knfsd_le"); - proto_nfs_nfsd_le = proto_register_protocol("NFSD_LE", "nfsd_le", "nfs.nfsd_le"); - proto_nfs_knfsd_new = proto_register_protocol("KNFSD_NEW", "knfsd_new", "nfs.knfsd_new"); - proto_nfs_ontap_v3 = proto_register_protocol("ONTAP_V3", "ontap_v3", "nfs.ontap_v3"); - proto_nfs_ontap_v4 = proto_register_protocol("ONTAP_V4", "ontap_v4", "nfs.ontap_v4"); - proto_nfs_ontap_gx_v3 = proto_register_protocol("ONTAP_GX_V3", "ontap_gx_v3", "nfs.ontap_gx_v3"); - proto_nfs_celerra_vnx = proto_register_protocol("CELERRA_VNX", "celerra_vnx", "nfs.celerra_vnx"); - proto_nfs_gluster = proto_register_protocol("GLUSTER", "gluster", "nfs.gluster"); - proto_nfs_dcache = proto_register_protocol("dCache", "dcache", "nfs.dcache"); - proto_nfs_primary_data = proto_register_protocol("Primary_Data", "pd", "nfs.primary_data"); + proto_nfs_unknown = proto_register_protocol_in_name_only("Unknown", "unknown", "nfs.unknown", proto_nfs, FT_PROTOCOL); + proto_nfs_svr4 = proto_register_protocol_in_name_only("SVR4", "svr4", "nfs.svr4", proto_nfs, FT_PROTOCOL); + proto_nfs_knfsd_le = proto_register_protocol_in_name_only("KNFSD_LE", "knfsd_le", "nfs.knfsd_le", proto_nfs, FT_PROTOCOL); + proto_nfs_nfsd_le = proto_register_protocol_in_name_only("NFSD_LE", "nfsd_le", "nfs.nfsd_le", proto_nfs, FT_PROTOCOL); + proto_nfs_knfsd_new = proto_register_protocol_in_name_only("KNFSD_NEW", "knfsd_new", "nfs.knfsd_new", proto_nfs, FT_PROTOCOL); + proto_nfs_ontap_v3 = proto_register_protocol_in_name_only("ONTAP_V3", "ontap_v3", "nfs.ontap_v3", proto_nfs, FT_PROTOCOL); + proto_nfs_ontap_v4 = proto_register_protocol_in_name_only("ONTAP_V4", "ontap_v4", "nfs.ontap_v4", proto_nfs, FT_PROTOCOL); + proto_nfs_ontap_gx_v3 = proto_register_protocol_in_name_only("ONTAP_GX_V3", "ontap_gx_v3", "nfs.ontap_gx_v3", proto_nfs, FT_PROTOCOL); + proto_nfs_celerra_vnx = proto_register_protocol_in_name_only("CELERRA_VNX", "celerra_vnx", "nfs.celerra_vnx", proto_nfs, FT_PROTOCOL); + proto_nfs_gluster = proto_register_protocol_in_name_only("GLUSTER", "gluster", "nfs.gluster", proto_nfs, FT_PROTOCOL); + proto_nfs_dcache = proto_register_protocol_in_name_only("dCache", "dcache", "nfs.dcache", proto_nfs, FT_PROTOCOL); + proto_nfs_primary_data = proto_register_protocol_in_name_only("Primary_Data", "pd", "nfs.primary_data", proto_nfs, FT_PROTOCOL); /* "protocols" registered just for ONC-RPC Service Response Time */ - proto_nfs_cb = proto_register_protocol("Network File System CB", "NFS CB", "nfs.cb"); + proto_nfs_cb = proto_register_protocol_in_name_only("Network File System CB", "NFS CB", "nfs.cb", proto_nfs, FT_PROTOCOL); proto_register_field_array(proto_nfs, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-pcli.c b/epan/dissectors/packet-pcli.c index 4f21ac3f71..8dc4213329 100644 --- a/epan/dissectors/packet-pcli.c +++ b/epan/dissectors/packet-pcli.c @@ -252,9 +252,9 @@ proto_register_pcli(void) proto_pcli = proto_register_protocol("Packet Cable Lawful Intercept", "PCLI", "pcli"); /* Create "placeholders" to remove confusion with Decode As" */ - proto_pcli8 = proto_register_protocol("Packet Cable Lawful Intercept (8 byte CCCID)", "PCLI8 (8 byte CCCID)", "pcli8"); - proto_pcli12 = proto_register_protocol("Packet Cable Lawful Intercept (timestamp)", "PCLI12 (timestamp)", "pcli12"); - proto_pcli20 = proto_register_protocol("Packet Cable Lawful Intercept (timestamp, case ID)", "PCLI20 (timestamp, case ID)", "pcli20"); + proto_pcli8 = proto_register_protocol_in_name_only("Packet Cable Lawful Intercept (8 byte CCCID)", "PCLI8 (8 byte CCCID)", "pcli8", proto_pcli, FT_PROTOCOL); + proto_pcli12 = proto_register_protocol_in_name_only("Packet Cable Lawful Intercept (timestamp)", "PCLI12 (timestamp)", "pcli12", proto_pcli, FT_PROTOCOL); + proto_pcli20 = proto_register_protocol_in_name_only("Packet Cable Lawful Intercept (timestamp, case ID)", "PCLI20 (timestamp, case ID)", "pcli20", proto_pcli, FT_PROTOCOL); proto_register_field_array(proto_pcli,hf,array_length(hf)); proto_register_subtree_array(ett,array_length(ett)); diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 181b9eb9cd..318415cbb8 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -7584,10 +7584,10 @@ proto_register_iphc_crtp(void) proto_iphc_crtp = proto_register_protocol("CRTP", "CRTP", "crtp"); /* Created to remove Decode As confusion */ - proto_iphc_crtp_cudp16 = proto_register_protocol("CRTP (CUDP 16)", "CRTP (CUDP 16)", "crtp_cudp16"); - proto_iphc_crtp_cudp8 = proto_register_protocol("CRTP (CUDP 8)", "CRTP (CUDP 8)", "crtp_cudp8"); - proto_iphc_crtp_cs = proto_register_protocol("CRTP (CS)", "CRTP (CS)", "crtp_cs"); - proto_iphc_crtp_cntcp = proto_register_protocol("CRTP (CNTCP)", "CRTP (CNTCP)", "crtp_cntcp"); + proto_iphc_crtp_cudp16 = proto_register_protocol_in_name_only("CRTP (CUDP 16)", "CRTP (CUDP 16)", "crtp_cudp16", proto_iphc_crtp, FT_PROTOCOL); + proto_iphc_crtp_cudp8 = proto_register_protocol_in_name_only("CRTP (CUDP 8)", "CRTP (CUDP 8)", "crtp_cudp8", proto_iphc_crtp, FT_PROTOCOL); + proto_iphc_crtp_cs = proto_register_protocol_in_name_only("CRTP (CS)", "CRTP (CS)", "crtp_cs", proto_iphc_crtp, FT_PROTOCOL); + proto_iphc_crtp_cntcp = proto_register_protocol_in_name_only("CRTP (CNTCP)", "CRTP (CNTCP)", "crtp_cntcp", proto_iphc_crtp, FT_PROTOCOL); proto_register_field_array(proto_iphc_crtp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 364d1fe210..1bfc58a09c 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -9527,7 +9527,7 @@ proto_register_rsvp(void) } proto_rsvp = proto_register_protocol("Resource ReserVation Protocol (RSVP)", "RSVP", "rsvp"); /* Created to remove Decode As confusion */ - proto_rsvp_e2e1 = proto_register_protocol("Resource ReserVation Protocol (RSVP-E2EI)", "RSVP-E2EI", "rsvp-e2ei"); + proto_rsvp_e2e1 = proto_register_protocol_in_name_only("Resource ReserVation Protocol (RSVP-E2EI)", "RSVP-E2EI", "rsvp-e2ei", proto_rsvp, FT_PROTOCOL); proto_register_field_array(proto_rsvp, rsvpf_info, array_length(rsvpf_info)); proto_register_subtree_array(ett_tree, array_length(ett_tree)); diff --git a/epan/dissectors/packet-vxlan.c b/epan/dissectors/packet-vxlan.c index e227032a40..58c907ad56 100644 --- a/epan/dissectors/packet-vxlan.c +++ b/epan/dissectors/packet-vxlan.c @@ -278,7 +278,7 @@ proto_register_vxlan(void) proto_vxlan = proto_register_protocol("Virtual eXtensible Local Area Network", "VXLAN", "vxlan"); /* Protocol registered just for Decode As */ - proto_vxlan_gpe = proto_register_protocol("Virtual eXtensible Local Area Network (GPE)", "VXLAN (GPE)", "vxlan_gpe"); + proto_vxlan_gpe = proto_register_protocol_in_name_only("Virtual eXtensible Local Area Network (GPE)", "VXLAN (GPE)", "vxlan_gpe", proto_vxlan, FT_PROTOCOL); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_vxlan, hf, array_length(hf)); |