Skip to content

Commit

Permalink
Solace SMP protocol attributes prefix to sol-smp (#28)
Browse files Browse the repository at this point in the history
* Wireshark type for Subscription Management Protocol (SMP) should be sol-smp

The protocol name "smp" has already been used by another protocol Session Multiplex Protocol.
The Solace Dissector for Subscription Management protocol (packet-smp.c) was registered as "sol-smp".
However, the attributes are still named with smp as the prefix. e.g. smp.uh.
This update modifies all the attributes in packet-smp.c to use the proper protocol prefix of sol-smp.

* register_dissector with sol-smp

Update based on comment.
  • Loading branch information
ngdavid1013 authored Nov 26, 2024
1 parent 316b2a9 commit 58e15ef
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/smf/packet-smf.c
Original file line number Diff line number Diff line change
Expand Up @@ -3327,7 +3327,7 @@ void proto_reg_handoff_smf(void)
subctrl_handle = find_dissector("solace.subctrl");
xmllink_handle = find_dissector("solace.xmllink");
assuredctrl_handle = find_dissector("solace.assuredctrl");
smp_handle = find_dissector("solace.smp");
smp_handle = find_dissector("solace.sol-smp");
smrp_handle = find_dissector("solace.smrp");
clientctrl_handle = find_dissector("solace.clientctrl");
bm_handle = find_dissector("solace.smf-bm");
Expand Down
26 changes: 13 additions & 13 deletions src/smf/packet-smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -334,63 +334,63 @@ proto_register_smp(void)
/* Setup list of header fields See Section 1.6.1 for details*/
static hf_register_info hf[] = {
{ &hf_smp_uh,
{ "UH", "smp.uh",
{ "UH", "sol-smp.uh",
FT_UINT8, BASE_DEC, NULL, 0x80,
"", HFILL }
},
{ &hf_smp_msg_type,
{ "Message type", "smp.msg_type",
{ "Message type", "sol-smp.msg_type",
FT_UINT8, BASE_HEX, VALS(msgtypenames), 0x7f,
"", HFILL }
},
{ &hf_smp_msg_len,
{ "Message length", "smp.msg_len",
{ "Message length", "sol-smp.msg_len",
FT_UINT32, BASE_DEC, NULL, 0x00,
"", HFILL }
},
{ &hf_smp_payload,
{ "Payload", "smp.payload",
{ "Payload", "sol-smp.payload",
FT_BYTES, BASE_NONE, NULL, 0x00,
"", HFILL }
},

{ &hf_smp_add_da,
{ "DeliverAlways", "smp.da",
{ "DeliverAlways", "sol-smp.da",
FT_BOOLEAN, 8, NULL, 0x10,
"", HFILL }
},
{ &hf_smp_add_r,
{ "ResponseRequired", "smp.r",
{ "ResponseRequired", "sol-smp.r",
FT_BOOLEAN, 8, NULL, 0x08,
"", HFILL }
},
{ &hf_smp_add_t,
{ "Topic", "smp.t",
{ "Topic", "sol-smp.t",
FT_BOOLEAN, 8, NULL, 0x04,
"", HFILL }
},
{ &hf_smp_add_p,
{ "Persist", "smp.p",
{ "Persist", "sol-smp.p",
FT_BOOLEAN, 8, NULL, 0x02,
"", HFILL }
},
{ &hf_smp_add_f,
{ "Filter", "smp.f",
{ "Filter", "sol-smp.f",
FT_BOOLEAN, 8, NULL, 0x01,
"", HFILL }
},
{ &hf_smp_add_subscription,
{ "SubscriptionString", "smp.subscription",
{ "SubscriptionString", "sol-smp.subscription",
FT_STRING, BASE_NONE, NULL, 0x0,
"", HFILL }
},
{ &hf_smp_add_queuename,
{ "Queue", "smp.queue",
{ "Queue", "sol-smp.queue",
FT_STRING, BASE_NONE, NULL, 0x0,
"", HFILL }
},
{ &hf_smp_add_clientname,
{ "ClientName", "smp.clientname",
{ "ClientName", "sol-smp.clientname",
FT_STRING, BASE_NONE, NULL, 0x0,
"", HFILL }
},
Expand All @@ -410,7 +410,7 @@ proto_register_smp(void)
proto_register_field_array(proto_smp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));

register_dissector("solace.smp", dissect_smp, proto_smp);
register_dissector("solace.sol-smp", dissect_smp, proto_smp);

#if 0
/* Register preferences module (See Section 2.6 for more on preferences) */
Expand Down

0 comments on commit 58e15ef

Please sign in to comment.