diff options
| -rw-r--r-- | docbook/release-notes.asciidoc | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-btsdp.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-irc.c | 2 | ||||
| -rw-r--r-- | epan/packet.c | 6 |
4 files changed, 14 insertions, 6 deletions
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index a2483123d4..9fa53ca8c5 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -119,6 +119,8 @@ instead of 1. (ws-buglink:9126[]) * PTP Dissector Wrongfully Reports Malformed Packet. (ws-buglink:9262[]) +* Wireshark lua dissector unable to load for media_type=application/octet-stream. (ws-buglink:9296[]) + * Wireshark crash when dissecting packet with NTLMSSP. (ws-buglink:9299[]) * Padding in uint64 field in DCERPC protocol wrongly reported. (ws-buglink:9300[]) @@ -129,6 +131,10 @@ instead of 1. (ws-buglink:9126[]) * The tshark summary line doesn't display the frame number or displays it sporadically. (ws-buglink:9317[]) +* Bluetooth: SDP improvements and minor fixes. (ws-buglink:9327[]) + +* Duplicate header field abbreviation breaks filter (example: irc.response.command). (ws-buglink:9360[]) + === New and Updated Features There are no new features in this release. @@ -142,6 +148,7 @@ There are no new protocols in this release. --sort-and-group-- 3GPP2 A11 +Bluetooth SDP BSSGP DCERPC DCERPC NDR @@ -153,6 +160,7 @@ Ethernet EtherNet/IP H.225 IEEE 802.15.4 +IRC NBAP NTLMSSP OpenWire diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 7b26b2e155..0aebe0a8fb 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -2047,8 +2047,8 @@ dissect_sdp_type(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, supported_features = tvb_get_guint8(tvb, offset); g_snprintf(str, MAX_SDP_LEN, "%s%s", - (supported_features & 0x01) ? "SIM " : "", - (supported_features & 0x02) ? "LocalPhonebook " : ""); + (supported_features & 0x01) ? "LocalPhonebook " : "", + (supported_features & 0x02) ? "SIM " : ""); break; default: found = FALSE; diff --git a/epan/dissectors/packet-irc.c b/epan/dissectors/packet-irc.c index bfc04c7d19..f950a7ad97 100644 --- a/epan/dissectors/packet-irc.c +++ b/epan/dissectors/packet-irc.c @@ -525,7 +525,7 @@ proto_register_irc(void) { &hf_irc_response_command, { "Command", "irc.response.command", FT_STRING, BASE_NONE, NULL, 0x0, "Response command", HFILL }}, - { &hf_irc_response_num_command, { "Command", "irc.response.command", FT_UINT16, BASE_DEC, + { &hf_irc_response_num_command, { "Command", "irc.response.num_command", FT_UINT16, BASE_DEC, NULL, 0x0, "Response (numeric) command", HFILL }}, { &hf_irc_response_command_param, { "Parameter", "irc.response.command_parameter", FT_STRING, BASE_NONE, diff --git a/epan/packet.c b/epan/packet.c index 6197f7a966..23ba3fca48 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -1078,7 +1078,7 @@ dissector_add_string(const char *name, const gchar *pattern, dtbl_entry->initial = dtbl_entry->current; /* do the table insertion */ - g_hash_table_insert( sub_dissectors->hash_table, (gpointer)pattern, + g_hash_table_insert( sub_dissectors->hash_table, (gpointer)g_strdup(pattern), (gpointer)dtbl_entry); /* @@ -1154,7 +1154,7 @@ dissector_change_string(const char *name, const gchar *pattern, dtbl_entry->current = handle; /* do the table insertion */ - g_hash_table_insert( sub_dissectors->hash_table, (gpointer)pattern, + g_hash_table_insert( sub_dissectors->hash_table, (gpointer)g_strdup(pattern), (gpointer)dtbl_entry); } @@ -1603,7 +1603,7 @@ register_dissector_table(const char *name, const char *ui_name, const ftenum_t t case FT_STRINGZ: sub_dissectors->hash_table = g_hash_table_new_full( g_str_hash, g_str_equal, - NULL, + &g_free, &g_free ); break; |