You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2021/12/13 11:42:16 UTC

[pulsar] branch master updated: [C++] Wireshark Pulsar dissector naming replace yahoo with apache (#13251)

This is an automated email from the ASF dual-hosted git repository.

penghui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new ba00002  [C++] Wireshark Pulsar dissector naming replace yahoo with apache (#13251)
ba00002 is described below

commit ba00002441fc9f97f30c7c44c777608b529b6521
Author: Kai Wang <kw...@streamnative.io>
AuthorDate: Mon Dec 13 19:41:07 2021 +0800

    [C++] Wireshark Pulsar dissector naming replace yahoo with apache (#13251)
---
 pulsar-client-cpp/wireshark/pulsarDissector.cc | 68 +++++++++++++-------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/pulsar-client-cpp/wireshark/pulsarDissector.cc b/pulsar-client-cpp/wireshark/pulsarDissector.cc
index 26fe5f8..8d625af 100644
--- a/pulsar-client-cpp/wireshark/pulsarDissector.cc
+++ b/pulsar-client-cpp/wireshark/pulsarDissector.cc
@@ -297,7 +297,7 @@ void link_to_response_frame(proto_tree* cmd_tree, tvbuff_t* tvb, int offset, int
 /* This method dissects fully reassembled messages */
 static int dissect_pulsar_message(tvbuff_t *tvb, packet_info* pinfo, proto_tree* tree,
                                void* data _U_) {
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "yahoo-Pulsar");
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "Pulsar");
 
     conversation_t* conversation = find_or_create_conversation(pinfo);
     ConnectionState* state = (ConnectionState*) conversation_get_proto_data(conversation,
@@ -900,97 +900,97 @@ static int dissect_pulsar(tvbuff_t *tvb, packet_info* pinfo, proto_tree* tree, v
 }
 
 static hf_register_info hf[] = {  //
-        { &hf_pulsar_error, { "Error", "yahoo.pulsar.error", FT_BOOLEAN, BASE_DEC,
+        { &hf_pulsar_error, { "Error", "apache.pulsar.error", FT_BOOLEAN, BASE_DEC,
         NULL, 0x0, NULL, HFILL } },  //
-                { &hf_pulsar_error_message, { "Message", "yahoo.pulsar.error_message", FT_STRING, 0,
+                { &hf_pulsar_error_message, { "Message", "apache.pulsar.error_message", FT_STRING, 0,
                 NULL, 0x0,
                 NULL, HFILL } },  //
-                { &hf_pulsar_cmd_type, { "Command Type", "yahoo.pulsar.cmd.type", FT_STRING, 0,
+                { &hf_pulsar_cmd_type, { "Command Type", "apache.pulsar.cmd.type", FT_STRING, 0,
                 NULL, 0x0,
                 NULL, HFILL } },  //
-                { &hf_pulsar_frame_size, { "Frame size", "yahoo.pulsar.frame_size", FT_UINT32, BASE_DEC,
+                { &hf_pulsar_frame_size, { "Frame size", "apache.pulsar.frame_size", FT_UINT32, BASE_DEC,
                 NULL, 0x0, NULL, HFILL } },  //
-                { &hf_pulsar_cmd_size, { "Command size", "yahoo.pulsar.cmd_size", FT_UINT32, BASE_DEC,
+                { &hf_pulsar_cmd_size, { "Command size", "apache.pulsar.cmd_size", FT_UINT32, BASE_DEC,
                 NULL, 0x0,
                 NULL, HFILL } },  //
 
-                { &hf_pulsar_client_version, { "Client version", "yahoo.pulsar.client_version", FT_STRING,
+                { &hf_pulsar_client_version, { "Client version", "apache.pulsar.client_version", FT_STRING,
                         0,
                         NULL, 0x0, NULL, HFILL } },  //
-                { &hf_pulsar_auth_method, { "Auth method", "yahoo.pulsar.auth_method", FT_STRING, 0, NULL,
+                { &hf_pulsar_auth_method, { "Auth method", "apache.pulsar.auth_method", FT_STRING, 0, NULL,
                         0x0,
                         NULL, HFILL } },  //
-                { &hf_pulsar_auth_data, { "Auth data", "yahoo.pulsar.auth_data", FT_STRING, 0,
+                { &hf_pulsar_auth_data, { "Auth data", "apache.pulsar.auth_data", FT_STRING, 0,
                 NULL, 0x0, NULL, HFILL } },  //
-                { &hf_pulsar_protocol_version, { "Protocol version", "yahoo.pulsar.protocol_version",
+                { &hf_pulsar_protocol_version, { "Protocol version", "apache.pulsar.protocol_version",
                         FT_STRING, 0,
                         NULL, 0x0, NULL, HFILL } },
 
-                { &hf_pulsar_server_version, { "Server version", "yahoo.pulsar.server_version", FT_STRING,
+                { &hf_pulsar_server_version, { "Server version", "apache.pulsar.server_version", FT_STRING,
                         0,
                         NULL, 0x0, NULL, HFILL } },  //
-                { &hf_pulsar_topic, { "Topic", "yahoo.pulsar.topic", FT_STRING, 0, NULL, 0x0,
+                { &hf_pulsar_topic, { "Topic", "apache.pulsar.topic", FT_STRING, 0, NULL, 0x0,
                 NULL, HFILL } },  //
-                { &hf_pulsar_subscription, { "Subscription", "yahoo.pulsar.subscription", FT_STRING, 0,
+                { &hf_pulsar_subscription, { "Subscription", "apache.pulsar.subscription", FT_STRING, 0,
                 NULL, 0x0, NULL, HFILL } },  //
-                { &hf_pulsar_subType, { "Subscription type:", "yahoo.pulsar.sub_type", FT_STRING, 0, NULL,
+                { &hf_pulsar_subType, { "Subscription type:", "apache.pulsar.sub_type", FT_STRING, 0, NULL,
                         0x0,
                         NULL, HFILL } },  //
-                { &hf_pulsar_consumer_id, { "Consumer Id", "yahoo.pulsar.consumer_id", FT_UINT64,
+                { &hf_pulsar_consumer_id, { "Consumer Id", "apache.pulsar.consumer_id", FT_UINT64,
                         BASE_DEC,
                         NULL, 0x0, NULL, HFILL } },  //
-                { &hf_pulsar_producer_id, { "Producer Id", "yahoo.pulsar.producer_id", FT_UINT64,
+                { &hf_pulsar_producer_id, { "Producer Id", "apache.pulsar.producer_id", FT_UINT64,
                         BASE_DEC,
                         NULL, 0x0, NULL, HFILL } },  //
 
-                { &hf_pulsar_server_error, { "Server error", "yahoo.pulsar.server_error", FT_STRING, 0,
+                { &hf_pulsar_server_error, { "Server error", "apache.pulsar.server_error", FT_STRING, 0,
                 NULL, 0x0, NULL, HFILL } },  //
-                { &hf_pulsar_ack_type, { "Ack type", "yahoo.pulsar.ack_type", FT_STRING, 0,
+                { &hf_pulsar_ack_type, { "Ack type", "apache.pulsar.ack_type", FT_STRING, 0,
                 NULL, 0x0, NULL, HFILL } },  //
 
-                { &hf_pulsar_request_id, { "Request Id", "yahoo.pulsar.request_id", FT_UINT64, BASE_DEC,
+                { &hf_pulsar_request_id, { "Request Id", "apache.pulsar.request_id", FT_UINT64, BASE_DEC,
                 NULL, 0x0, NULL, HFILL } },  //
-                { &hf_pulsar_consumer_name, { "Consumer Name", "yahoo.pulsar.consumer_name", FT_STRING,
+                { &hf_pulsar_consumer_name, { "Consumer Name", "apache.pulsar.consumer_name", FT_STRING,
                         BASE_NONE,
                         NULL, 0x0, NULL, HFILL } },  //
-                { &hf_pulsar_producer_name, { "Producer Name", "yahoo.pulsar.producer_name", FT_STRING,
+                { &hf_pulsar_producer_name, { "Producer Name", "apache.pulsar.producer_name", FT_STRING,
                         BASE_NONE,
                         NULL, 0x0, NULL, HFILL } },  //
 
-                { &hf_pulsar_sequence_id, { "Sequence Id", "yahoo.pulsar.sequence_id", FT_UINT64,
+                { &hf_pulsar_sequence_id, { "Sequence Id", "apache.pulsar.sequence_id", FT_UINT64,
                         BASE_DEC,
                         NULL, 0x0, NULL, HFILL } },  //
-                { &hf_pulsar_message_id, { "Message Id", "yahoo.pulsar.message_id", FT_STRING, BASE_NONE,
+                { &hf_pulsar_message_id, { "Message Id", "apache.pulsar.message_id", FT_STRING, BASE_NONE,
                 NULL, 0x0, NULL, HFILL } },  //
-                { &hf_pulsar_message_permits, { "Message Permits", "yahoo.pulsar.message_permits",
+                { &hf_pulsar_message_permits, { "Message Permits", "apache.pulsar.message_permits",
                         FT_UINT32, BASE_DEC,
                         NULL, 0x0, NULL, HFILL } },  //
 
-                { &hf_pulsar_publish_time, { "Publish time", "yahoo.pulsar.publish_time", FT_UINT64,
+                { &hf_pulsar_publish_time, { "Publish time", "apache.pulsar.publish_time", FT_UINT64,
                         BASE_DEC,
                         NULL, 0x0, NULL, HFILL } },  //
 
-                { &hf_pulsar_replicated_from, { "Replicated from", "yahoo.pulsar.replicated_from",
+                { &hf_pulsar_replicated_from, { "Replicated from", "apache.pulsar.replicated_from",
                         FT_STRING, BASE_NONE,
                         NULL, 0x0, NULL, HFILL } },  //
-                { &hf_pulsar_partition_key, { "Partition key", "yahoo.pulsar.partition_key", FT_STRING,
+                { &hf_pulsar_partition_key, { "Partition key", "apache.pulsar.partition_key", FT_STRING,
                         BASE_NONE,
                         NULL, 0x0, NULL, HFILL } },  //
-                { &hf_pulsar_replicate_to, { "Replicate to", "yahoo.pulsar.replicate_to", FT_STRING,
+                { &hf_pulsar_replicate_to, { "Replicate to", "apache.pulsar.replicate_to", FT_STRING,
                         BASE_NONE,
                         NULL, 0x0, NULL, HFILL } },  //
-                { &hf_pulsar_property, { "Property", "yahoo.pulsar.property", FT_STRING, BASE_NONE,
+                { &hf_pulsar_property, { "Property", "apache.pulsar.property", FT_STRING, BASE_NONE,
                 NULL, 0x0, NULL, HFILL } },  //
 
-                { &hf_pulsar_request_in, { "Request in frame", "yahoo.pulsar.request_in", FT_FRAMENUM,
+                { &hf_pulsar_request_in, { "Request in frame", "apache.pulsar.request_in", FT_FRAMENUM,
                         BASE_NONE,
                         NULL, 0, "This packet is a response to the packet with this number",
                         HFILL } },  //
-                { &hf_pulsar_response_in, { "Response in frame", "yahoo.pulsar.response_in", FT_FRAMENUM,
+                { &hf_pulsar_response_in, { "Response in frame", "apache.pulsar.response_in", FT_FRAMENUM,
                         BASE_NONE,
                         NULL, 0, "This packet will be responded in the packet with this number",
                         HFILL } },  //
-                { &hf_pulsar_publish_latency, { "Latency", "yahoo.pulsar.publish_latency",
+                { &hf_pulsar_publish_latency, { "Latency", "apache.pulsar.publish_latency",
                         FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0,
                         "How long time it took to ACK message", HFILL } }, };
 
@@ -1001,8 +1001,8 @@ void proto_register_pulsar() {
     static dissector_handle_t pulsar_handle;
 
     proto_pulsar = proto_register_protocol("Pulsar Wire Protocol", /* name       */
-                                        "Yahoo Pulsar", /* short name */
-                                        "yahoo.pulsar" /* abbrev     */
+                                        "Apache Pulsar", /* short name */
+                                        "apache.pulsar" /* abbrev     */
                                         );
 
     /* Setup protocol subtree array */