aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/decode_as.c6
-rw-r--r--epan/dissectors/packet-dcerpc.c2
-rw-r--r--epan/dissectors/packet-ip.c2
-rw-r--r--epan/dissectors/packet-mip6.c2
-rw-r--r--epan/dissectors/packet-ppp.c2
-rw-r--r--epan/dissectors/packet-rtnet.c4
-rw-r--r--epan/dissectors/packet-rtp.c8
-rw-r--r--epan/dissectors/packet-sccp.c4
-rw-r--r--epan/dissectors/packet-tcp.c2
-rw-r--r--epan/dissectors/packet-tls-utils.c2
-rw-r--r--epan/packet.c88
-rw-r--r--epan/packet.h13
-rw-r--r--epan/wslua/wslua_dissector.c2
-rw-r--r--packaging/debian/libwireshark0.symbols3
-rw-r--r--ui/qt/models/decode_as_model.cpp8
-rw-r--r--ui/qt/models/dissector_tables_model.cpp2
16 files changed, 101 insertions, 49 deletions
diff --git a/epan/decode_as.c b/epan/decode_as.c
index bc51bfc48f..1c2658dca5 100644
--- a/epan/decode_as.c
+++ b/epan/decode_as.c
@@ -103,7 +103,7 @@ decode_proto_add_to_list (const gchar *table_name, gpointer value, gpointer user
handle = (dissector_handle_t)value;
- proto_name = dissector_handle_get_short_name(handle);
+ proto_name = dissector_handle_get_description(handle);
i = dissector_handle_get_protocol_index(handle);
if (i >= 0 && !proto_is_protocol_enabled(find_protocol_by_id(i)))
@@ -317,12 +317,12 @@ decode_as_write_entry (const gchar *table_name, ftenum_t selector_type,
if (current == NULL)
current_proto_name = DECODE_AS_NONE;
else
- current_proto_name = dissector_handle_get_short_name(current);
+ current_proto_name = dissector_handle_get_description(current);
initial = dtbl_entry_get_initial_handle((dtbl_entry_t *)value);
if (initial == NULL)
initial_proto_name = DECODE_AS_NONE;
else
- initial_proto_name = dissector_handle_get_short_name(initial);
+ initial_proto_name = dissector_handle_get_description(initial);
switch (selector_type) {
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index 0a39bb62a6..61c85f63f1 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -1714,7 +1714,7 @@ dcerpc_get_proto_name(e_guid_t *uuid, guint16 ver)
return NULL;
}
- return dissector_handle_get_short_name(handle);
+ return dissector_handle_get_description(handle);
}
/* Function to find the opnum hf-field of a registered protocol
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index 489c737529..cd58faa7e4 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -1585,7 +1585,7 @@ dissect_ip_options(tvbuff_t *tvb, int offset, guint length,
if (option_dissector == NULL) {
name = wmem_strdup_printf(pinfo->pool, "Unknown (0x%02x)", opt);
} else {
- name = dissector_handle_get_short_name(option_dissector);
+ name = dissector_handle_get_description(option_dissector);
}
/* Option has a length. Is it in the packet? */
diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c
index 937b614983..96e5b965e5 100644
--- a/epan/dissectors/packet-mip6.c
+++ b/epan/dissectors/packet-mip6.c
@@ -3717,7 +3717,7 @@ dissect_mipv6_options(tvbuff_t *tvb, int offset, guint length,
if (option_dissector == NULL) {
name = wmem_strdup_printf(pinfo->pool, "Unknown (0x%02x)", opt);
} else {
- name = dissector_handle_get_short_name(option_dissector);
+ name = dissector_handle_get_description(option_dissector);
}
/* Option has a length. Is it in the packet? */
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 7f2294fde3..8c71a09141 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -1298,7 +1298,7 @@ ppp_dissect_options(tvbuff_t *tvb, int offset, guint length, dissector_table_t c
if (option_dissector == NULL) {
name = wmem_strdup_printf(pinfo->pool, "Unknown (0x%02x)", opt);
} else {
- name = dissector_handle_get_short_name(option_dissector);
+ name = dissector_handle_get_description(option_dissector);
}
} else {
name = wmem_strdup_printf(pinfo->pool, "Unknown (0x%02x)", opt);
diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c
index d6c6f94c65..740cca0563 100644
--- a/epan/dissectors/packet-rtnet.c
+++ b/epan/dissectors/packet-rtnet.c
@@ -582,7 +582,7 @@ dissect_rtmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
if (ver == 1) {
if (!type_str) {
if (dissector != data_handle)
- type_str = dissector_handle_get_short_name(dissector);
+ type_str = dissector_handle_get_description(dissector);
else
type_str = "Unknown";
}
@@ -591,7 +591,7 @@ dissect_rtmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U
type_str = val_to_str_const(type, rtmac_type_vals, "Unknown");
else {
if (dissector != data_handle)
- type_str = dissector_handle_get_short_name(dissector);
+ type_str = dissector_handle_get_description(dissector);
else
type_str = "Unknown";
}
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c
index e40c719414..5a8120ec1a 100644
--- a/epan/dissectors/packet-rtp.c
+++ b/epan/dissectors/packet-rtp.c
@@ -2104,9 +2104,9 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
#endif
if (p_conv_data && p_conv_data->bta2dp_info && p_conv_data->bta2dp_info->codec_dissector) {
- rtp_info->info_payload_type_str = (const char *) dissector_handle_get_short_name(p_conv_data->bta2dp_info->codec_dissector);
+ rtp_info->info_payload_type_str = (const char *) dissector_handle_get_description(p_conv_data->bta2dp_info->codec_dissector);
} else if (p_conv_data && p_conv_data->btvdp_info && p_conv_data->btvdp_info->codec_dissector) {
- rtp_info->info_payload_type_str = (const char *) dissector_handle_get_short_name(p_conv_data->btvdp_info->codec_dissector);
+ rtp_info->info_payload_type_str = (const char *) dissector_handle_get_description(p_conv_data->btvdp_info->codec_dissector);
}
/* if it is dynamic payload, let use the conv data to see if it is defined */
@@ -2142,9 +2142,9 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
}
if (p_conv_data && p_conv_data->bta2dp_info) {
- pt = (p_conv_data->bta2dp_info->codec_dissector) ? dissector_handle_get_short_name(p_conv_data->bta2dp_info->codec_dissector) : "Unknown";
+ pt = (p_conv_data->bta2dp_info->codec_dissector) ? dissector_handle_get_description(p_conv_data->bta2dp_info->codec_dissector) : "Unknown";
} else if (p_conv_data && p_conv_data->btvdp_info) {
- pt = (p_conv_data->btvdp_info->codec_dissector) ? dissector_handle_get_short_name(p_conv_data->btvdp_info->codec_dissector) : "Unknown";
+ pt = (p_conv_data->btvdp_info->codec_dissector) ? dissector_handle_get_description(p_conv_data->btvdp_info->codec_dissector) : "Unknown";
} else {
pt = (payload_type_str ? payload_type_str : val_to_str_ext(payload_type, &rtp_payload_type_vals_ext, "Unknown (%u)"));
}
diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c
index 8ec97ddb6b..21f097ee5c 100644
--- a/epan/dissectors/packet-sccp.c
+++ b/epan/dissectors/packet-sccp.c
@@ -2102,7 +2102,7 @@ dissect_sccp_called_calling_param(tvbuff_t *tvb, proto_tree *tree, packet_info *
ssn_dissector = dissector_get_uint_handle(sccp_ssn_dissector_table, ssn);
if (ssn_dissector) {
- ssn_dissector_short_name = dissector_handle_get_short_name(ssn_dissector);
+ ssn_dissector_short_name = dissector_handle_get_description(ssn_dissector);
if (ssn_dissector_short_name) {
item = proto_tree_add_string_format(call_tree, hf_sccp_linked_dissector, tvb, offset - 1, ADDRESS_SSN_LENGTH,
@@ -2113,7 +2113,7 @@ dissect_sccp_called_calling_param(tvbuff_t *tvb, proto_tree *tree, packet_info *
tcap_ssn_dissector = get_itu_tcap_subdissector(ssn);
if (tcap_ssn_dissector) {
- tcap_ssn_dissector_short_name = dissector_handle_get_short_name(tcap_ssn_dissector);
+ tcap_ssn_dissector_short_name = dissector_handle_get_description(tcap_ssn_dissector);
proto_item_append_text(item,", TCAP SSN linked to %s", tcap_ssn_dissector_short_name);
}
}
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index 9edc47ccae..81d7564f3a 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -7037,7 +7037,7 @@ tcp_dissect_options(tvbuff_t *tvb, int offset, guint length,
name = wmem_strdup_printf(pinfo->pool, "Unknown (0x%02x)", opt);
option_dissector = tcp_opt_unknown_handle;
} else {
- name = dissector_handle_get_short_name(option_dissector);
+ name = dissector_handle_get_description(option_dissector);
}
/* Option has a length. Is it in the packet? */
diff --git a/epan/dissectors/packet-tls-utils.c b/epan/dissectors/packet-tls-utils.c
index 5f47179c9e..f02b9720ec 100644
--- a/epan/dissectors/packet-tls-utils.c
+++ b/epan/dissectors/packet-tls-utils.c
@@ -6562,7 +6562,7 @@ ssl_association_info_(const gchar *table _U_, gpointer handle, gpointer user_dat
{
ssl_association_info_callback_data_t* data = (ssl_association_info_callback_data_t*)user_data;
const int l = (const int)strlen(data->str);
- snprintf(data->str+l, SSL_ASSOC_MAX_LEN-l, "'%s' %s\n", dissector_handle_get_short_name((dissector_handle_t)handle), data->table_protocol);
+ snprintf(data->str+l, SSL_ASSOC_MAX_LEN-l, "'%s' %s\n", dissector_handle_get_description((dissector_handle_t)handle), data->table_protocol);
}
/**
diff --git a/epan/packet.c b/epan/packet.c
index f9c8b908eb..01c6d4ca1c 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -726,6 +726,7 @@ enum dissector_e {
*/
struct dissector_handle {
const char *name; /* dissector name */
+ const char *description; /* dissector description */
enum dissector_e dissector_type;
void *dissector_func;
void *dissector_data;
@@ -2191,8 +2192,10 @@ dissector_add_for_decode_as(const char *name, dissector_handle_t handle)
return;
}
- /* Ensure the protocol is unique. This prevents confusion when
- using Decode As with duplicative entries.
+ /* Ensure the dissector's description is unique. This prevents
+ confusion when using Decode As; duplicate descriptions would
+ make it impossible to distinguish between the dissectors
+ with the same descriptions.
FT_STRING can at least show the string value in the dialog,
so we don't do the check for them. */
@@ -2201,7 +2204,8 @@ dissector_add_for_decode_as(const char *name, dissector_handle_t handle)
for (entry = sub_dissectors->dissector_handles; entry != NULL; entry = g_slist_next(entry))
{
dup_handle = (dissector_handle_t)entry->data;
- if (dup_handle->protocol == handle->protocol)
+ if (dup_handle->description != NULL &&
+ strcmp(dup_handle->description, handle->description) == 0)
{
const char *dissector_name, *dup_dissector_name;
@@ -2211,10 +2215,9 @@ dissector_add_for_decode_as(const char *name, dissector_handle_t handle)
dup_dissector_name = dissector_handle_get_dissector_name(dup_handle);
if (dup_dissector_name == NULL)
dup_dissector_name = "(anonymous)";
- fprintf(stderr, "Duplicate dissectors %s and %s for protocol %s in dissector table %s\n",
+ fprintf(stderr, "Dissectors %s and %s in dissector table %s have same dissector name %s\n",
dissector_name, dup_dissector_name,
- proto_get_protocol_short_name(handle->protocol),
- name);
+ name, handle->description);
if (wireshark_abort_on_dissector_bug)
abort();
}
@@ -2256,7 +2259,7 @@ dissector_table_get_dissector_handles(dissector_table_t dissector_table) {
* Data structure used as user data when iterating dissector handles
*/
typedef struct lookup_entry {
- const gchar* dissector_short_name;
+ const gchar* dissector_description;
dissector_handle_t handle;
} lookup_entry_t;
@@ -2269,17 +2272,17 @@ find_dissector_in_table(gpointer item, gpointer user_data)
{
dissector_handle_t handle = (dissector_handle_t)item;
lookup_entry_t * lookup = (lookup_entry_t *)user_data;
- const gchar *proto_short_name = dissector_handle_get_short_name(handle);
- if (proto_short_name && strcmp(lookup->dissector_short_name, proto_short_name) == 0) {
+ const gchar *description = dissector_handle_get_description(handle);
+ if (description && strcmp(lookup->dissector_description, description) == 0) {
lookup->handle = handle;
}
}
-dissector_handle_t dissector_table_get_dissector_handle(dissector_table_t dissector_table, const gchar* short_name)
+dissector_handle_t dissector_table_get_dissector_handle(dissector_table_t dissector_table, const gchar* description)
{
lookup_entry_t lookup;
- lookup.dissector_short_name = short_name;
+ lookup.dissector_description = description;
lookup.handle = NULL;
g_slist_foreach(dissector_table->dissector_handles, find_dissector_in_table, &lookup);
@@ -3153,18 +3156,20 @@ dissector_handle_get_long_name(const dissector_handle_t handle)
const char *
dissector_handle_get_short_name(const dissector_handle_t handle)
{
- if (handle->protocol == NULL) {
- /*
- * No protocol (see, for example, the handle for
- * dissecting the set of protocols where the first
- * octet of the payload is an OSI network layer protocol
- * ID).
- */
+ if (handle == NULL || handle->protocol == NULL) {
return NULL;
}
return proto_get_protocol_short_name(handle->protocol);
}
+/* Get the description for what the dissector in the dissector handle
+ dissects, if it has one. */
+const char *
+dissector_handle_get_description(const dissector_handle_t handle)
+{
+ return handle->description;
+}
+
/* Get the index of the protocol for a dissector handle, if it has
a protocol. */
int
@@ -3204,7 +3209,7 @@ dissector_handle_t find_dissector_add_dependency(const char *name, const int par
dissector_handle_t handle = (dissector_handle_t)g_hash_table_lookup(registered_dissectors, name);
if ((handle != NULL) && (parent_proto > 0))
{
- register_depend_dissector(proto_get_protocol_short_name(find_protocol_by_id(parent_proto)), dissector_handle_get_short_name(handle));
+ register_depend_dissector(proto_get_protocol_short_name(find_protocol_by_id(parent_proto)), dissector_handle_get_description(handle));
}
return handle;
@@ -3221,16 +3226,32 @@ dissector_handle_get_dissector_name(const dissector_handle_t handle)
}
static dissector_handle_t
-new_dissector_handle(enum dissector_e type, void *dissector, const int proto, const char *name, void *cb_data)
+new_dissector_handle(enum dissector_e type, void *dissector, const int proto, const char *name, const char *description, void *cb_data)
{
struct dissector_handle *handle;
handle = wmem_new(wmem_epan_scope(), struct dissector_handle);
handle->name = name;
+ handle->description = description;
handle->dissector_type = type;
handle->dissector_func = dissector;
handle->dissector_data = cb_data;
handle->protocol = find_protocol_by_id(proto);
+
+ if (handle->description == NULL) {
+ /*
+ * No description for what this dissector dissects
+ * was supplied; use the short name for the protocol,
+ * if we have the protocol.
+ *
+ * (We may have no protocol; see, for example, the handle
+ * for dissecting the set of protocols where the first
+ * octet of the payload is an OSI network layer protocol
+ * ID.)
+ */
+ if (handle->protocol != NULL)
+ handle->description = proto_get_protocol_short_name(handle->protocol);
+ }
return handle;
}
@@ -3238,14 +3259,23 @@ new_dissector_handle(enum dissector_e type, void *dissector, const int proto, co
dissector_handle_t
create_dissector_handle(dissector_t dissector, const int proto)
{
- return new_dissector_handle(DISSECTOR_TYPE_SIMPLE, dissector, proto, NULL, NULL);
+ return new_dissector_handle(DISSECTOR_TYPE_SIMPLE, dissector, proto, NULL, NULL, NULL);
}
dissector_handle_t
create_dissector_handle_with_name(dissector_t dissector,
const int proto, const char* name)
{
- return new_dissector_handle(DISSECTOR_TYPE_SIMPLE, dissector, proto, name, NULL);
+ return new_dissector_handle(DISSECTOR_TYPE_SIMPLE, dissector, proto, name, NULL, NULL);
+}
+
+dissector_handle_t
+create_dissector_handle_with_name_and_description(dissector_t dissector,
+ const int proto,
+ const char* name,
+ const char* description)
+{
+ return new_dissector_handle(DISSECTOR_TYPE_SIMPLE, dissector, proto, name, description, NULL);
}
/* Destroy an anonymous handle for a dissector. */
@@ -3276,7 +3306,17 @@ register_dissector(const char *name, dissector_t dissector, const int proto)
{
struct dissector_handle *handle;
- handle = new_dissector_handle(DISSECTOR_TYPE_SIMPLE, dissector, proto, name, NULL);
+ handle = new_dissector_handle(DISSECTOR_TYPE_SIMPLE, dissector, proto, name, NULL, NULL);
+
+ return register_dissector_handle(name, handle);
+}
+
+dissector_handle_t
+register_dissector_with_description(const char *name, const char *description, dissector_t dissector, const int proto)
+{
+ struct dissector_handle *handle;
+
+ handle = new_dissector_handle(DISSECTOR_TYPE_SIMPLE, dissector, proto, name, description, NULL);
return register_dissector_handle(name, handle);
}
@@ -3286,7 +3326,7 @@ register_dissector_with_data(const char *name, dissector_cb_t dissector, const i
{
struct dissector_handle *handle;
- handle = new_dissector_handle(DISSECTOR_TYPE_CALLBACK, dissector, proto, name, cb_data);
+ handle = new_dissector_handle(DISSECTOR_TYPE_CALLBACK, dissector, proto, name, NULL, cb_data);
return register_dissector_handle(name, handle);
}
diff --git a/epan/packet.h b/epan/packet.h
index 78294c8c30..05484f83a3 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -424,9 +424,10 @@ WS_DLL_PUBLIC void dissector_add_for_decode_as_with_preference(const char *name,
*/
WS_DLL_PUBLIC GSList *dissector_table_get_dissector_handles(dissector_table_t dissector_table);
-/** Get a handle to dissector out of a dissector table
+/** Get a handle to dissector out of a dissector table given the description
+ * of what the dissector dissects.
*/
-WS_DLL_PUBLIC dissector_handle_t dissector_table_get_dissector_handle(dissector_table_t dissector_table, const gchar* short_name);
+WS_DLL_PUBLIC dissector_handle_t dissector_table_get_dissector_handle(dissector_table_t dissector_table, const gchar* description);
/** Get a dissector table's type
*/
@@ -552,6 +553,9 @@ WS_DLL_PUBLIC void heur_dissector_delete(const char *name, heur_dissector_t diss
/** Register a new dissector. */
WS_DLL_PUBLIC dissector_handle_t register_dissector(const char *name, dissector_t dissector, const int proto);
+/** Register a new dissector with a description. */
+WS_DLL_PUBLIC dissector_handle_t register_dissector_with_description(const char *name, const char *description, dissector_t dissector, const int proto);
+
/** Register a new dissector with a callback pointer. */
WS_DLL_PUBLIC dissector_handle_t register_dissector_with_data(const char *name, dissector_cb_t dissector, const int proto, void *cb_data);
@@ -564,6 +568,9 @@ extern const char *dissector_handle_get_long_name(const dissector_handle_t handl
/** Get the short name of the protocol for a dissector handle. */
WS_DLL_PUBLIC const char *dissector_handle_get_short_name(const dissector_handle_t handle);
+/** Get the description for what the dissector for a dissector handle dissects. */
+WS_DLL_PUBLIC const char *dissector_handle_get_description(const dissector_handle_t handle);
+
/** Get the index of the protocol for a dissector handle. */
WS_DLL_PUBLIC int dissector_handle_get_protocol_index(const dissector_handle_t handle);
@@ -584,6 +591,8 @@ WS_DLL_PUBLIC dissector_handle_t create_dissector_handle(dissector_t dissector,
const int proto);
WS_DLL_PUBLIC dissector_handle_t create_dissector_handle_with_name(dissector_t dissector,
const int proto, const char* name);
+WS_DLL_PUBLIC dissector_handle_t create_dissector_handle_with_name_and_description(dissector_t dissector,
+ const int proto, const char* name, const char* description);
/** Call a dissector through a handle and if no dissector was found
* pass it over to the "data" dissector instead.
diff --git a/epan/wslua/wslua_dissector.c b/epan/wslua/wslua_dissector.c
index 759c130b66..51ad2b6318 100644
--- a/epan/wslua/wslua_dissector.c
+++ b/epan/wslua/wslua_dissector.c
@@ -121,7 +121,7 @@ WSLUA_METAMETHOD Dissector__tostring(lua_State* L) {
/* Gets the Dissector's protocol short name. */
Dissector d = checkDissector(L,1);
if (!d) return 0;
- lua_pushstring(L,dissector_handle_get_short_name(d));
+ lua_pushstring(L,dissector_handle_get_description(d));
WSLUA_RETURN(1); /* A string of the protocol's short name. */
}
diff --git a/packaging/debian/libwireshark0.symbols b/packaging/debian/libwireshark0.symbols
index b3e0e31340..8038ddaf53 100644
--- a/packaging/debian/libwireshark0.symbols
+++ b/packaging/debian/libwireshark0.symbols
@@ -220,6 +220,7 @@ libwireshark.so.0 libwireshark0 #MINVER#
create_capture_dissector_handle@Base 2.3.0
create_dissector_handle@Base 2.1.0
create_dissector_handle_with_name@Base 2.1.0
+ create_dissector_handle_with_name_and_description@Base 4.0.0-rc2
dcerpc_get_proto_hf_opnum@Base 2.1.0
dcerpc_get_proto_name@Base 1.9.1
dcerpc_get_proto_sub_dissector@Base 1.9.1
@@ -516,6 +517,7 @@ libwireshark.so.0 libwireshark0 #MINVER#
dissector_get_payload_handle@Base 3.1.0
dissector_get_string_handle@Base 1.9.1
dissector_get_uint_handle@Base 1.9.1
+ dissector_handle_get_description@Base 4.0.0-rc2
dissector_handle_get_dissector_name@Base 1.12.0~rc1
dissector_handle_get_protocol_index@Base 1.9.1
dissector_handle_get_short_name@Base 1.9.1
@@ -1435,6 +1437,7 @@ libwireshark.so.0 libwireshark0 #MINVER#
register_dissector_table@Base 1.9.1
register_dissector_table_alias@Base 2.9.0
register_dissector_with_data@Base 2.5.0
+ register_dissector_with_description@Base 4.0.0-rc2
register_export_object@Base 2.3.0
register_export_pdu_tap@Base 1.99.0
register_export_pdu_tap_with_encap@Base 3.7.0
diff --git a/ui/qt/models/decode_as_model.cpp b/ui/qt/models/decode_as_model.cpp
index 10fc089faf..49702494f1 100644
--- a/ui/qt/models/decode_as_model.cpp
+++ b/ui/qt/models/decode_as_model.cpp
@@ -359,7 +359,7 @@ bool DecodeAsModel::insertRows(int row, int count, const QModelIndex &/*parent*/
lastItemIsOk = itemOk;
if (dissector != NULL) {
- item->default_proto_ = dissector_handle_get_short_name(dissector);
+ item->default_proto_ = dissector_handle_get_description(dissector);
//When adding a new record, "default" should equal "current", so the user can
//explicitly change it
item->current_proto_ = item->default_proto_;
@@ -624,13 +624,13 @@ void DecodeAsModel::buildChangedList(const gchar *table_name, ftenum_t, gpointer
default_dh = dtbl_entry_get_initial_handle((dtbl_entry_t *)value);
if (default_dh) {
- default_proto_name = dissector_handle_get_short_name(default_dh);
+ default_proto_name = dissector_handle_get_description(default_dh);
}
item->default_proto_ = default_proto_name;
current_dh = dtbl_entry_get_handle((dtbl_entry_t *)value);
if (current_dh) {
- current_proto_name = QString(dissector_handle_get_short_name(current_dh));
+ current_proto_name = QString(dissector_handle_get_description(current_dh));
}
item->current_proto_ = current_proto_name;
item->dissector_handle_ = current_dh;
@@ -662,7 +662,7 @@ void DecodeAsModel::buildDceRpcChangedList(gpointer data, gpointer user_data)
guid_val.guid = binding->uuid;
item->dissector_handle_ = dissector_get_guid_handle(sub_dissectors, &guid_val);
if (item->dissector_handle_) {
- current_proto_name = QString(dissector_handle_get_short_name(item->dissector_handle_));
+ current_proto_name = QString(dissector_handle_get_description(item->dissector_handle_));
}
item->current_proto_ = current_proto_name;
item->default_proto_ = default_proto_name;
diff --git a/ui/qt/models/dissector_tables_model.cpp b/ui/qt/models/dissector_tables_model.cpp
index 282428b94f..bfa450e19a 100644
--- a/ui/qt/models/dissector_tables_model.cpp
+++ b/ui/qt/models/dissector_tables_model.cpp
@@ -187,7 +187,7 @@ static void gatherProtocolDecodes(const char *, ftenum_t selector_type, gpointer
dtbl_entry_t *dtbl_entry = (dtbl_entry_t*)value;
dissector_handle_t handle = dtbl_entry_get_handle(dtbl_entry);
- const QString proto_name = dissector_handle_get_short_name(handle);
+ const QString proto_name = dissector_handle_get_description(handle);
DissectorTablesItem *ti = NULL;
switch (selector_type) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 06:09:46 +0000