aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/dissectors/packet-aruba-erm.c12
-rw-r--r--epan/dissectors/packet-frame.c2
-rw-r--r--epan/dissectors/packet-glusterd.c15
-rw-r--r--epan/dissectors/packet-i2c.c8
-rw-r--r--epan/dissectors/packet-iso7816.c3
-rw-r--r--epan/dissectors/packet-lwapp.c9
-rw-r--r--epan/dissectors/packet-rmi.c4
7 files changed, 24 insertions, 29 deletions
diff --git a/epan/dissectors/packet-aruba-erm.c b/epan/dissectors/packet-aruba-erm.c
index d751838b40..73b912c97d 100644
--- a/epan/dissectors/packet-aruba-erm.c
+++ b/epan/dissectors/packet-aruba-erm.c
@@ -427,12 +427,12 @@ proto_register_aruba_erm(void)
expert_module_t* expert_aruba_erm;
proto_aruba_erm = proto_register_protocol(PROTO_LONG_NAME, "ARUBA_ERM" , "aruba_erm");
- proto_aruba_erm_type0 = proto_register_protocol("Aruba Networks encapsulated remote mirroring - PCAP (Type 0)", "ARUBA ERM PCAP (Type 0)", "aruba_erm_type0");
- proto_aruba_erm_type1 = proto_register_protocol("Aruba Networks encapsulated remote mirroring - PEEK (Type 1)", "ARUBA ERM PEEK (type 1)", "aruba_erm_type1");
- proto_aruba_erm_type2 = proto_register_protocol("Aruba Networks encapsulated remote mirroring - AIRMAGNET (Type 2)", "ARUBA ERM AIRMAGNET (Type 2)", "aruba_erm_type2");
- proto_aruba_erm_type3 = proto_register_protocol("Aruba Networks encapsulated remote mirroring - PCAP+RADIO (Type 3)", "ARUBA ERM PCAP+RADIO (Type 3)", "aruba_erm_type3");
- proto_aruba_erm_type4 = proto_register_protocol("Aruba Networks encapsulated remote mirroring - PPI (Type 4)", "ARUBA ERM PPI (Type 4)", "aruba_erm_type4");
- proto_aruba_erm_type5 = proto_register_protocol("Aruba Networks encapsulated remote mirroring - PEEK (Type 5)", "ARUBA ERM PEEK-NG (type 5)", "aruba_erm_type5");
+ proto_aruba_erm_type0 = proto_register_protocol_in_name_only("Aruba Networks encapsulated remote mirroring - PCAP (Type 0)", "ARUBA ERM PCAP (Type 0)", "aruba_erm_type0", proto_aruba_erm, FT_PROTOCOL);
+ proto_aruba_erm_type1 = proto_register_protocol_in_name_only("Aruba Networks encapsulated remote mirroring - PEEK (Type 1)", "ARUBA ERM PEEK (type 1)", "aruba_erm_type1", proto_aruba_erm, FT_PROTOCOL);
+ proto_aruba_erm_type2 = proto_register_protocol_in_name_only("Aruba Networks encapsulated remote mirroring - AIRMAGNET (Type 2)", "ARUBA ERM AIRMAGNET (Type 2)", "aruba_erm_type2", proto_aruba_erm, FT_PROTOCOL);
+ proto_aruba_erm_type3 = proto_register_protocol_in_name_only("Aruba Networks encapsulated remote mirroring - PCAP+RADIO (Type 3)", "ARUBA ERM PCAP+RADIO (Type 3)", "aruba_erm_type3", proto_aruba_erm, FT_PROTOCOL);
+ proto_aruba_erm_type4 = proto_register_protocol_in_name_only("Aruba Networks encapsulated remote mirroring - PPI (Type 4)", "ARUBA ERM PPI (Type 4)", "aruba_erm_type4", proto_aruba_erm, FT_PROTOCOL);
+ proto_aruba_erm_type5 = proto_register_protocol_in_name_only("Aruba Networks encapsulated remote mirroring - PEEK (Type 5)", "ARUBA ERM PEEK-NG (type 5)", "aruba_erm_type5", proto_aruba_erm, FT_PROTOCOL);
aruba_erm_module = prefs_register_protocol(proto_aruba_erm, NULL);
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c
index 5f42b7bb60..d5c793404f 100644
--- a/epan/dissectors/packet-frame.c
+++ b/epan/dissectors/packet-frame.c
@@ -925,7 +925,7 @@ proto_register_frame(void)
}
proto_frame = proto_register_protocol("Frame", "Frame", "frame");
- proto_pkt_comment = proto_register_protocol("Packet comments", "Pkt_Comment", "pkt_comment");
+ proto_pkt_comment = proto_register_protocol_in_name_only("Packet comments", "Pkt_Comment", "pkt_comment", proto_frame, FT_PROTOCOL);
proto_syscall = proto_register_protocol("System Call", "Syscall", "syscall");
proto_register_field_array(proto_frame, hf, array_length(hf));
diff --git a/epan/dissectors/packet-glusterd.c b/epan/dissectors/packet-glusterd.c
index 53183f177f..664507a8c7 100644
--- a/epan/dissectors/packet-glusterd.c
+++ b/epan/dissectors/packet-glusterd.c
@@ -881,19 +881,18 @@ proto_register_gluster_gd_mgmt(void)
};
/* Register the protocol name and description */
- proto_glusterd = proto_register_protocol("Gluster Daemon", "GlusterD",
- "glusterd");
+ proto_glusterd = proto_register_protocol("Gluster Daemon", "GlusterD", "glusterd");
proto_register_subtree_array(ett, array_length(ett));
proto_register_field_array(proto_glusterd, hf, array_length(hf));
- proto_gd_mgmt = proto_register_protocol("Gluster Daemon Management",
- "GlusterD Management", "glusterd.mgmt");
- proto_gd_brick = proto_register_protocol(
+ proto_gd_mgmt = proto_register_protocol_in_name_only("Gluster Daemon Management",
+ "GlusterD Management", "glusterd.mgmt", proto_glusterd, FT_PROTOCOL);
+ proto_gd_brick = proto_register_protocol_in_name_only(
"Gluster Daemon Brick Operations",
- "GlusterD Brick", "glusterd.brick");
- proto_gd_friend = proto_register_protocol(
+ "GlusterD Brick", "glusterd.brick", proto_glusterd, FT_PROTOCOL);
+ proto_gd_friend = proto_register_protocol_in_name_only(
"Gluster Daemon Friend Operations",
- "GlusterD Friend", "glusterd.friend");
+ "GlusterD Friend", "glusterd.friend", proto_glusterd, FT_PROTOCOL);
}
void
diff --git a/epan/dissectors/packet-i2c.c b/epan/dissectors/packet-i2c.c
index 1aea2199cd..5af77db8cc 100644
--- a/epan/dissectors/packet-i2c.c
+++ b/epan/dissectors/packet-i2c.c
@@ -247,14 +247,14 @@ proto_register_i2c(void)
static decode_as_t i2c_da = {"i2c", "I2C Message", "i2c.message", 1, 0, &i2c_da_values, NULL, NULL,
decode_as_default_populate_list, decode_as_default_reset, decode_as_default_change, NULL};
- /* Placeholders for capture statistics */
- proto_i2c_event = proto_register_protocol("I2C Events", "I2C Events", "i2c_event");
- proto_i2c_data = proto_register_protocol("I2C Data", "I2C Data", "i2c_data");
-
proto_i2c = proto_register_protocol("Inter-Integrated Circuit", "I2C", "i2c");
proto_register_field_array(proto_i2c, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
+ /* Placeholders for capture statistics */
+ proto_i2c_event = proto_register_protocol_in_name_only("I2C Events", "I2C Events", "i2c_event", proto_i2c, FT_PROTOCOL);
+ proto_i2c_data = proto_register_protocol_in_name_only("I2C Data", "I2C Data", "i2c_data", proto_i2c, FT_PROTOCOL);
+
subdissector_table = register_dissector_table("i2c.message", "I2C messages dissector", proto_i2c, FT_UINT32, BASE_DEC);
m = prefs_register_protocol(proto_i2c, NULL);
diff --git a/epan/dissectors/packet-iso7816.c b/epan/dissectors/packet-iso7816.c
index 61a0f6ef77..19647abec5 100644
--- a/epan/dissectors/packet-iso7816.c
+++ b/epan/dissectors/packet-iso7816.c
@@ -933,8 +933,7 @@ proto_register_iso7816(void)
transactions = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
- proto_iso7816_atr = proto_register_protocol(
- "ISO/IEC 7816-3", "ISO 7816-3", "iso7816.atr");
+ proto_iso7816_atr = proto_register_protocol_in_name_only("ISO/IEC 7816-3", "ISO 7816-3", "iso7816.atr", proto_iso7816, FT_PROTOCOL);
iso7816_atr_handle = register_dissector("iso7816.atr", dissect_iso7816_atr, proto_iso7816_atr);
}
diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c
index ee315b3bd1..78b8205495 100644
--- a/epan/dissectors/packet-lwapp.c
+++ b/epan/dissectors/packet-lwapp.c
@@ -517,14 +517,11 @@ proto_register_lwapp(void)
};
module_t *lwapp_module;
- proto_lwapp = proto_register_protocol ("LWAPP Encapsulated Packet",
- "LWAPP", "lwapp");
+ proto_lwapp = proto_register_protocol ("LWAPP Encapsulated Packet", "LWAPP", "lwapp");
- proto_lwapp_l3 = proto_register_protocol ("LWAPP Layer 3 Packet",
- "LWAPP-L3", "lwapp-l3");
+ proto_lwapp_l3 = proto_register_protocol_in_name_only ("LWAPP Layer 3 Packet", "LWAPP-L3", "lwapp-l3", proto_lwapp, FT_PROTOCOL);
- proto_lwapp_control = proto_register_protocol ("LWAPP Control Message",
- "LWAPP-CNTL", "lwapp-cntl");
+ proto_lwapp_control = proto_register_protocol_in_name_only ("LWAPP Control Message", "LWAPP-CNTL", "lwapp-cntl", proto_lwapp, FT_PROTOCOL);
proto_register_field_array(proto_lwapp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
diff --git a/epan/dissectors/packet-rmi.c b/epan/dissectors/packet-rmi.c
index 6552cd8c8a..7f6f745170 100644
--- a/epan/dissectors/packet-rmi.c
+++ b/epan/dissectors/packet-rmi.c
@@ -360,8 +360,8 @@ proto_register_rmi(void)
};
proto_rmi = proto_register_protocol("Java RMI", "RMI", "rmi");
- proto_ser = proto_register_protocol("Java Serialization", "Serialization",
- "serialization");
+ proto_ser = proto_register_protocol_in_name_only("Java Serialization", "Serialization",
+ "serialization", proto_rmi, FT_PROTOCOL);
proto_register_field_array(proto_rmi, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 19:50:24 +0000