summaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/dcerpc/idl2wrs.c13
-rw-r--r--epan/dissectors/packet-dhcp.c4
-rw-r--r--epan/dissectors/packet-e212.c2
-rw-r--r--epan/dissectors/packet-mysql.c1
-rw-r--r--epan/dissectors/packet-nas_5gs.c91
-rw-r--r--epan/dissectors/packet-protobuf.c14
-rw-r--r--epan/dissectors/packet-rlc-lte.c2
-rw-r--r--epan/dissectors/packet-rtp.c3
-rw-r--r--epan/dissectors/packet-sip.c7
-rw-r--r--epan/dissectors/packet-sprt.c29
-rw-r--r--epan/dissectors/packet-thrift.c2
-rw-r--r--epan/dissectors/packet-tls-utils.c110
-rw-r--r--epan/dissectors/packet-wisun.c7
-rw-r--r--epan/dissectors/usb.c25
14 files changed, 234 insertions, 76 deletions
diff --git a/epan/dissectors/dcerpc/idl2wrs.c b/epan/dissectors/dcerpc/idl2wrs.c
index 054a62d1..3d95a4d6 100644
--- a/epan/dissectors/dcerpc/idl2wrs.c
+++ b/epan/dissectors/dcerpc/idl2wrs.c
@@ -1657,17 +1657,9 @@ static void parsetypedefstruct(int pass)
fixed_array_size=0;
is_array_of_pointers=0;
if(!g_strcmp0(ti->str, "[")){
- char fss[BASE_BUFFER_SIZE];
-
/* this might be a fixed array */
ti=ti->next;
- if (!ws_strtou32(ti->str, NULL, &fixed_array_size)) {
- FPRINTF(stderr, "ERROR: invalid integer: %s\n", ti->str);
- Exit(10);
- }
- snprintf(fss, BASE_BUFFER_SIZE, "%d", fixed_array_size);
-
if(!g_strcmp0("]", ti->str)){
/* this is just a normal [] array */
fixed_array_size=0;
@@ -1676,9 +1668,8 @@ static void parsetypedefstruct(int pass)
fixed_array_size=0;
is_array_of_pointers=1;
ti=ti->next;
- } else if(g_strcmp0(fss, ti->str)){
- FPRINTF(stderr, "ERROR: typedefstruct (%s) fixed array size looks different to calculated one %s!=%s\n", struct_name, fss, ti->str);
- ti=ti->next;
+ } else if (!ws_strtou32(ti->str, NULL, &fixed_array_size)) {
+ FPRINTF(stderr, "ERROR: invalid integer: %s\n", ti->str);
Exit(10);
} else {
ti=ti->next;
diff --git a/epan/dissectors/packet-dhcp.c b/epan/dissectors/packet-dhcp.c
index ce553c9f..4aa36290 100644
--- a/epan/dissectors/packet-dhcp.c
+++ b/epan/dissectors/packet-dhcp.c
@@ -3503,7 +3503,7 @@ dhcp_dhcp_decode_agent_info(packet_info *pinfo, proto_item *v_ti, proto_tree *v_
{16, {"Access Point BSSID", special, &hf_dhcp_option82_option_ani_ap_bssid}}, /* [RFC7839] */
{17, {"Access Network Operator ID", bytes, &hf_dhcp_option82_option_ani_operator_id}}, /* [RFC7839] */
{18, {"Access Network Operator Realm", string, &hf_dhcp_option82_option_ani_operator_realm}}, /* [RFC7839] */
- {19, {"Source Port", val_u_short, &hf_dhcp_option82_option_source_port}}, /* [RFC8357] */
+ {19, {"Source Port", presence, &hf_dhcp_option82_option_source_port}}, /* [RFC8357] */
{150, {"Link selection (Cisco proprietary)", ipv4, &hf_dhcp_option82_link_selection_cisco}}, /* [RFC3527] */
{151, {"VRF name/VPN ID", special, &hf_dhcp_option82_vrf_name_vpn_id}}, /* [RFC2685] */
{152, {"Server ID Override (Cisco proprietary)", ipv4, &hf_dhcp_option82_server_id_override_cisco}} /* [RFC 5107] */
@@ -9325,7 +9325,7 @@ proto_register_dhcp(void)
{ &hf_dhcp_option82_option_source_port,
{ "Source Port", "dhcp.option.agent_information_option.source_port",
- FT_UINT16, BASE_DEC, NULL, 0x00,
+ FT_NONE, BASE_NONE, NULL, 0x00,
"Option 82:19 Source Port", HFILL }},
{ &hf_dhcp_option82_link_selection_cisco,
diff --git a/epan/dissectors/packet-e212.c b/epan/dissectors/packet-e212.c
index a51328c4..cfce48c9 100644
--- a/epan/dissectors/packet-e212.c
+++ b/epan/dissectors/packet-e212.c
@@ -1079,7 +1079,7 @@ static const value_string mcc_mnc_2digits_codes[] = {
{ 22855, "WeMobile SA" },
{ 22857, "Mitto AG" },
{ 22858, "Beeone Communications SA" },
- { 22858, "Vectone Mobile Limited, London" },
+ { 22859, "Vectone Mobile Limited, London" },
{ 22860, "Sunrise Communications AG" },
{ 22862, "Telecom26 AG" },
{ 22863, "Fink Telecom Services" },
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c
index e2c4ffdd..5f5dd62d 100644
--- a/epan/dissectors/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
@@ -1512,6 +1512,7 @@ static const mysql_exec_dissector_t mysql_exec_dissectors[] = {
{ 0x05, 0, mysql_dissect_exec_double },
{ 0x06, 0, mysql_dissect_exec_null },
{ 0x07, 0, mysql_dissect_exec_datetime },
+ { 0x07, 1, mysql_dissect_exec_datetime },
{ 0x08, 0, mysql_dissect_exec_longlong },
{ 0x08, 1, mysql_dissect_exec_unsigned_longlong },
{ 0x0a, 0, mysql_dissect_exec_datetime },
diff --git a/epan/dissectors/packet-nas_5gs.c b/epan/dissectors/packet-nas_5gs.c
index 26bb927f..31dd9d9d 100644
--- a/epan/dissectors/packet-nas_5gs.c
+++ b/epan/dissectors/packet-nas_5gs.c
@@ -547,6 +547,7 @@ static int ett_nas_5gs_user_data_cont = -1;
static int ett_nas_5gs_ciph_data_set = -1;
static int ett_nas_5gs_mm_mapped_nssai = -1;
static int ett_nas_5gs_mm_partial_extended_rejected_nssai_list = -1;
+static int ett_nas_5gs_mm_ext_rej_nssai_back_off_timer = -1;
static int ett_nas_5gs_mm_ext_rej_nssai = -1;
static int ett_nas_5gs_mm_op_def_acc_cat_def = -1;
static int ett_nas_5gs_mm_op_def_acc_cat_criteria_component = -1;
@@ -741,10 +742,10 @@ static int hf_nas_5gs_mm_trunc_amf_pointer = -1;
static int hf_nas_5gs_mm_n5gcreg_b0 = -1;
static int hf_nas_5gs_mm_nb_n1_drx_value = -1;
static int hf_nas_5gs_mm_scmr = -1;
-static int hf_nas_5gs_mm_extended_rejected_s_nssai_number_of_element = -1;
-static int hf_nas_5gs_mm_extended_rejected_s_nssai_type_of_list = -1;
-static int hf_nas_5gs_mm_extended_rejected_s_nssai_spare = -1;
-static int hf_nas_5gs_mm_extended_rejected_s_nssai_back_off_timer = -1;
+static int hf_nas_5gs_mm_extended_rejected_nssai_number_of_element = -1;
+static int hf_nas_5gs_mm_extended_rejected_nssai_type_of_list = -1;
+static int hf_nas_5gs_mm_extended_rejected_nssai_spare = -1;
+static int hf_nas_5gs_mm_extended_rejected_nssai_back_off_timer = -1;
static int hf_nas_5gs_mm_len_of_rejected_s_nssai = -1;
static int hf_nas_5gs_mm_rejected_s_nssai_cause_value = -1;
static int hf_nas_5gs_mm_paging_restriction_type = -1;
@@ -4064,12 +4065,31 @@ de_nas_5gs_mm_additional_conf_ind(tvbuff_t* tvb, proto_tree* tree, packet_info*
/*
* 9.11.3.75 Extended rejected NSSAI
*/
+static const value_string nas_5gs_mm_extended_rejected_s_nssai_type_of_list_vals[] = {
+ { 0x00, "list of S-NSSAIs without any associated back-off timer value" },
+ { 0x01, "list of S-NSSAIs with one associated back-off timer value that applies to all S-NSSAIs in the list" },
+ { 0, NULL }
+};
+
+static const value_string nas_5gs_mm_extended_rejected_s_nssai_number_of_element_vals[] = {
+ { 0x00, "1 element" },
+ { 0x01, "2 elements" },
+ { 0x02, "3 elements" },
+ { 0x03, "4 elements" },
+ { 0x04, "5 elements" },
+ { 0x05, "6 elements" },
+ { 0x06, "7 elements" },
+ { 0x07, "8 elements" },
+ { 0, NULL }
+};
+
static const value_string nas_5gs_mm_extended_rej_s_nssai_cause_vals[] = {
{ 0x00, "S-NSSAI not available in the current PLMN or SNPN" },
{ 0x01, "S-NSSAI not available in the current registration area" },
{ 0x02, "S-NSSAI not available due to the failed or revoked network slice-specific authentication and authorization" },
{ 0x03, "S-NSSAI not available due to maximum number of UEs reached" },
- { 0, NULL } };
+ { 0, NULL }
+};
static guint16
de_nas_5gs_mm_extended_rejected_nssai(tvbuff_t* tvb, proto_tree* tree, packet_info* pinfo _U_,
@@ -4089,17 +4109,18 @@ de_nas_5gs_mm_extended_rejected_nssai(tvbuff_t* tvb, proto_tree* tree, packet_in
sub_partial_tree = proto_tree_add_subtree_format(tree, tvb, curr_offset, -1, ett_nas_5gs_mm_partial_extended_rejected_nssai_list,
&item, "Partial extended rejected NSSAI list %u", num_partial_items);
- proto_tree_add_item(sub_partial_tree, hf_nas_5gs_mm_extended_rejected_s_nssai_spare, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
- proto_tree_add_item_ret_uint(sub_partial_tree, hf_nas_5gs_mm_extended_rejected_s_nssai_type_of_list, tvb, curr_offset, 1, ENC_BIG_ENDIAN, &type_of_list);
- proto_tree_add_item_ret_uint(sub_partial_tree, hf_nas_5gs_mm_extended_rejected_s_nssai_number_of_element, tvb, curr_offset, 1, ENC_BIG_ENDIAN, &number_of_element);
+ proto_tree_add_item(sub_partial_tree, hf_nas_5gs_mm_extended_rejected_nssai_spare, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item_ret_uint(sub_partial_tree, hf_nas_5gs_mm_extended_rejected_nssai_type_of_list, tvb, curr_offset, 1, ENC_BIG_ENDIAN, &type_of_list);
+ proto_tree_add_item_ret_uint(sub_partial_tree, hf_nas_5gs_mm_extended_rejected_nssai_number_of_element, tvb, curr_offset, 1, ENC_BIG_ENDIAN, &number_of_element);
curr_offset++;
if (type_of_list > 0) {
- proto_tree_add_item(sub_partial_tree, hf_nas_5gs_mm_extended_rejected_s_nssai_back_off_timer, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
+ item = proto_tree_add_item(sub_partial_tree, hf_nas_5gs_mm_extended_rejected_nssai_back_off_timer, tvb, curr_offset, 1, ENC_BIG_ENDIAN);
+ de_gc_timer3(tvb, proto_item_add_subtree(item, ett_nas_5gs_mm_ext_rej_nssai_back_off_timer), pinfo, curr_offset, 1, NULL, 0);
curr_offset++;
}
- for (i = 0; i < (int)number_of_element; i++)
+ for (i = 0; i < ((int)number_of_element + 1); i++)
{
sub_rejected_tree = proto_tree_add_subtree_format(sub_partial_tree, tvb, curr_offset, -1, ett_nas_5gs_mm_ext_rej_nssai,
&item, "Rejected S-NSSAI %u", i+1);
@@ -10480,8 +10501,7 @@ dissect_nas_5gs_media_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
} else if (!strcmp(n1_msg_class, "LPP")) {
subdissector = lpp_handle;
} else if (!strcmp(n1_msg_class, "SMS")) {
- /* how to know the direction? */
- subdissector = NULL;
+ subdissector = gsm_a_dtap_handle;
} else if (!strcmp(n1_msg_class, "UPDP")) {
/* UD policy delivery service */
dissect_nas_5gs_updp(tvb, pinfo, tree, 0);
@@ -13550,24 +13570,24 @@ proto_register_nas_5gs(void)
FT_BOOLEAN, 8, TFS(&tfs_nas_5gs_mm_scmr), 0x01,
NULL, HFILL }
},
- { &hf_nas_5gs_mm_extended_rejected_s_nssai_number_of_element,
- { "Number of element", "nas-5gs.mm.extended_rejected_s_nssai.number_of_element",
- FT_UINT8, BASE_DEC, NULL, 0x0f,
+ { &hf_nas_5gs_mm_extended_rejected_nssai_number_of_element,
+ { "Number of element", "nas-5gs.mm.extended_rejected_nssai.number_of_element",
+ FT_UINT8, BASE_DEC, VALS(nas_5gs_mm_extended_rejected_s_nssai_number_of_element_vals), 0x0f,
NULL, HFILL }
},
- { &hf_nas_5gs_mm_extended_rejected_s_nssai_type_of_list,
- { "Type of list", "nas-5gs.mm.extended_rejected_s_nssai.type_of_list",
- FT_UINT8, BASE_DEC, NULL, 0x70,
+ { &hf_nas_5gs_mm_extended_rejected_nssai_type_of_list,
+ { "Type of list", "nas-5gs.mm.extended_rejected_nssai.type_of_list",
+ FT_UINT8, BASE_DEC, VALS(nas_5gs_mm_extended_rejected_s_nssai_type_of_list_vals), 0x70,
NULL, HFILL }
},
- { &hf_nas_5gs_mm_extended_rejected_s_nssai_spare,
- { "Spare", "nas-5gs.mm.extended_rejected_s_nssai.spare",
+ { &hf_nas_5gs_mm_extended_rejected_nssai_spare,
+ { "Spare", "nas-5gs.mm.extended_rejected_nssai.spare",
FT_UINT8, BASE_DEC, NULL, 0x80,
NULL, HFILL }
},
- { &hf_nas_5gs_mm_extended_rejected_s_nssai_back_off_timer,
- { "Back-off timer value", "nas-5gs.mm.extended_rejected_s_nssai.back_off_timer",
- FT_UINT8, BASE_DEC, NULL, 0x0,
+ { &hf_nas_5gs_mm_extended_rejected_nssai_back_off_timer,
+ { "Back-off timer value", "nas-5gs.mm.extended_rejected_nssai.back_off_timer",
+ FT_UINT8, BASE_HEX, NULL, 0x0,
NULL, HFILL }
},
{ &hf_nas_5gs_mm_len_of_rejected_s_nssai,
@@ -13791,7 +13811,7 @@ proto_register_nas_5gs(void)
guint last_offset;
/* Setup protocol subtree array */
-#define NUM_INDIVIDUAL_ELEMS 44
+#define NUM_INDIVIDUAL_ELEMS 45
gint *ett[NUM_INDIVIDUAL_ELEMS +
NUM_NAS_5GS_COMMON_ELEM +
NUM_NAS_5GS_MM_MSG + NUM_NAS_5GS_MM_ELEM +
@@ -13832,17 +13852,18 @@ proto_register_nas_5gs(void)
ett[30] = &ett_nas_5gs_ciph_data_set;
ett[31] = &ett_nas_5gs_mm_mapped_nssai;
ett[32] = &ett_nas_5gs_mm_partial_extended_rejected_nssai_list;
- ett[33] = &ett_nas_5gs_mm_ext_rej_nssai;
- ett[34] = &ett_nas_5gs_mm_op_def_acc_cat_def;
- ett[35] = &ett_nas_5gs_mm_op_def_acc_cat_criteria_component;
- ett[36] = &ett_nas_5gs_mm_op_def_acc_cat_criteria;
- ett[37] = &ett_nas_5gs_cmn_service_level_aa_cont_param;
- ett[38] = &ett_nas_5gs_mm_pld_cont_event_notif_ind;
- ett[39] = &ett_nas_5gs_mm_peips_assist_info;
- ett[40] = &ett_nas_5gs_mm_nssrg_info;
- ett[41] = &ett_nas_5gs_mm_plmns_list_disaster_cond;
- ett[42] = &ett_nas_5gs_mm_reg_wait_range;
- ett[43] = &ett_nas_5gs_mm_nsag_info;
+ ett[33] = &ett_nas_5gs_mm_ext_rej_nssai_back_off_timer;
+ ett[34] = &ett_nas_5gs_mm_ext_rej_nssai;
+ ett[35] = &ett_nas_5gs_mm_op_def_acc_cat_def;
+ ett[36] = &ett_nas_5gs_mm_op_def_acc_cat_criteria_component;
+ ett[37] = &ett_nas_5gs_mm_op_def_acc_cat_criteria;
+ ett[38] = &ett_nas_5gs_cmn_service_level_aa_cont_param;
+ ett[39] = &ett_nas_5gs_mm_pld_cont_event_notif_ind;
+ ett[40] = &ett_nas_5gs_mm_peips_assist_info;
+ ett[41] = &ett_nas_5gs_mm_nssrg_info;
+ ett[42] = &ett_nas_5gs_mm_plmns_list_disaster_cond;
+ ett[43] = &ett_nas_5gs_mm_reg_wait_range;
+ ett[44] = &ett_nas_5gs_mm_nsag_info;
last_offset = NUM_INDIVIDUAL_ELEMS;
diff --git a/epan/dissectors/packet-protobuf.c b/epan/dissectors/packet-protobuf.c
index 8597da4a..e6f892e6 100644
--- a/epan/dissectors/packet-protobuf.c
+++ b/epan/dissectors/packet-protobuf.c
@@ -1393,7 +1393,9 @@ dissect_protobuf_message(tvbuff_t *tvb, guint offset, guint length, packet_info
if (message_desc) {
message_name = pbw_Descriptor_full_name(message_desc);
- field_count = pbw_Descriptor_field_count(message_desc);
+ /* N.B. extra entries are needed because of possibly repeated items within message.
+ TODO: use dynamic wmem_array_t? Don't fancy void* interface... */
+ field_count = pbw_Descriptor_field_count(message_desc) + 256;
if (add_default_value && field_count > 0) {
parsed_fields = wmem_alloc0_array(pinfo->pool, int, field_count);
}
@@ -1464,11 +1466,17 @@ dissect_protobuf_message(tvbuff_t *tvb, guint offset, guint length, packet_info
{
field_desc = NULL;
if (!dissect_one_protobuf_field(tvb, &offset, max_offset - offset, pinfo, message_tree, message_desc,
- is_top_level, &field_desc, prev_field_desc, dumper))
+ is_top_level, &field_desc, prev_field_desc, dumper)) {
break;
+ }
if (parsed_fields && field_desc) {
- parsed_fields[parsed_fields_count++] = pbw_FieldDescriptor_number(field_desc);
+ if (parsed_fields_count < field_count) {
+ parsed_fields[parsed_fields_count++] = pbw_FieldDescriptor_number(field_desc);
+ }
+ else {
+ /* TODO: error? Means default values may not be set/shown.. */
+ }
}
prev_field_desc = field_desc;
diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c
index e32457de..313ee778 100644
--- a/epan/dissectors/packet-rlc-lte.c
+++ b/epan/dissectors/packet-rlc-lte.c
@@ -3719,7 +3719,7 @@ void proto_reg_handoff_rlc_lte(void)
ip_handle = find_dissector_add_dependency("ip", proto_rlc_lte);
lte_rrc_mcch = find_dissector_add_dependency("lte_rrc.mcch", proto_rlc_lte);
lte_rrc_ul_ccch = find_dissector_add_dependency("lte_rrc.ul_ccch", proto_rlc_lte);
- lte_rrc_dl_ccch = find_dissector_add_dependency("lte_rrc.dl_dcch", proto_rlc_lte);
+ lte_rrc_dl_ccch = find_dissector_add_dependency("lte_rrc.dl_ccch", proto_rlc_lte);
lte_rrc_bcch_bch = find_dissector_add_dependency("lte_rrc.bcch_bch", proto_rlc_lte);
lte_rrc_bcch_dl_sch = find_dissector_add_dependency("lte_rrc.bcch_dl_sch", proto_rlc_lte);
lte_rrc_pcch = find_dissector_add_dependency("lte_rrc.pcch", proto_rlc_lte);
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c
index 9e34b914..04d68a58 100644
--- a/epan/dissectors/packet-rtp.c
+++ b/epan/dissectors/packet-rtp.c
@@ -1238,6 +1238,9 @@ srtp_add_address(packet_info *pinfo, const port_type ptype, address *addr, int p
* If not, create a new conversation.
*/
if (!p_conv || p_conv->setup_frame != setup_frame_number) {
+ /* XXX - If setup_frame_number < pinfo->num, creating this conversation
+ * can mean that the dissection is different on later passes.
+ */
p_conv = conversation_new(setup_frame_number, addr, &null_addr, conversation_pt_to_conversation_type(ptype),
(guint32)port, (guint32)other_port,
NO_ADDR2 | (!other_port ? NO_PORT2 : 0));
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index 36c81ae8..f252391c 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -3121,7 +3121,12 @@ void dissect_sip_p_access_network_info_header(tvbuff_t *tvb, packet_info *pinfo,
if ((param_name != NULL)&&(g_ascii_strcasecmp(param_name, "utran-cell-id-3gpp") == 0)) {
proto_tree_add_item(tree, hf_sip_p_acc_net_i_ucid_3gpp, tvb,
equals_offset + 1, semi_colon_offset - equals_offset - 1, ENC_UTF_8 | ENC_NA);
- dissect_e212_mcc_mnc_in_utf8_address(tvb, pinfo, tree, equals_offset + 1);
+ /* check if value is quoted */
+ if (tvb_get_guint8(tvb, equals_offset + 1) == '"') {
+ dissect_e212_mcc_mnc_in_utf8_address(tvb, pinfo, tree, equals_offset + 2);
+ } else {
+ dissect_e212_mcc_mnc_in_utf8_address(tvb, pinfo, tree, equals_offset + 1);
+ }
}
else {
proto_tree_add_format_text(tree, tvb, current_offset, length);
diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c
index 300461fd..e212109c 100644
--- a/epan/dissectors/packet-sprt.c
+++ b/epan/dissectors/packet-sprt.c
@@ -1343,6 +1343,23 @@ dissect_sprt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
/*guint16 tcn;*/
/*guint16 sqn;*/
+ /* Get conversation data, or create it if not found */
+ p_conv_data = find_sprt_conversation_data(pinfo);
+ if (!p_conv_data)
+ {
+ sprt_add_address(pinfo,
+ &pinfo->src, pinfo->srcport,
+ 0,
+ "SPRT stream",
+ pinfo->num);
+ p_conv_data = find_sprt_conversation_data(pinfo);
+ if (!p_conv_data) {
+ // This shouldn't happen; likely a new RTP conversation was set up
+ // after this frame but with a setup frame before this one.
+ return 0;
+ }
+ }
+
/* Make entries in Protocol column and Info column on summary display */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "SPRT");
col_clear(pinfo->cinfo, COL_INFO);
@@ -1397,18 +1414,6 @@ dissect_sprt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
noa = (tvb_get_ntohs(tvb, offset + 4) & 0xC000) >> 14;
- /* Get conversation data, or create it if not found */
- p_conv_data = find_sprt_conversation_data(pinfo);
- if (!p_conv_data)
- {
- sprt_add_address(pinfo,
- &pinfo->src, pinfo->srcport,
- 0,
- "SPRT stream",
- pinfo->num);
- p_conv_data = find_sprt_conversation_data(pinfo);
- }
-
proto_tree_add_item(sprt_tree, hf_sprt_header_extension_bit, tvb, offset, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(sprt_tree, hf_sprt_subsession_id, tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
diff --git a/epan/dissectors/packet-thrift.c b/epan/dissectors/packet-thrift.c
index a266c446..a620fc7f 100644
--- a/epan/dissectors/packet-thrift.c
+++ b/epan/dissectors/packet-thrift.c
@@ -1710,7 +1710,7 @@ dissect_thrift_t_struct_expert(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
expert_add_info(pinfo, proto_tree_get_parent(tree), &ei_thrift_too_many_subtypes);
return THRIFT_REQUEST_REASSEMBLY;
}
- p_set_proto_depth(pinfo, proto_thrift, nested_count--);
+ p_set_proto_depth(pinfo, proto_thrift, nested_count + 1);
type_pi = proto_tree_add_item(tree, hf_id, tvb, offset, -1, ENC_BIG_ENDIAN);
sub_tree = proto_item_add_subtree(type_pi, ett_id);
} else {
diff --git a/epan/dissectors/packet-tls-utils.c b/epan/dissectors/packet-tls-utils.c
index 2a60d835..72c457f1 100644
--- a/epan/dissectors/packet-tls-utils.c
+++ b/epan/dissectors/packet-tls-utils.c
@@ -1533,7 +1533,7 @@ const value_string tls_cert_status_type[] = {
};
/* Generated by tools/make-tls-ct-logids.py
- * Last-Modified Sat, 27 Jan 2024 13:28:00 GMT, 138 entries. */
+ * Last-Modified Sat, 06 Jul 2024 13:38:00 GMT, 156 entries. */
static const bytes_string ct_logids[] = {
{ (const uint8_t[]){
0xb2, 0x1e, 0x05, 0xcc, 0x8b, 0xa2, 0xcd, 0x8a, 0x20, 0x4e, 0x87,
@@ -1578,6 +1578,18 @@ static const bytes_string ct_logids[] = {
},
32, "Google 'Argon2025h2' log" },
{ (const uint8_t[]){
+ 0x0e, 0x57, 0x94, 0xbc, 0xf3, 0xae, 0xa9, 0x3e, 0x33, 0x1b, 0x2c,
+ 0x99, 0x07, 0xb3, 0xf7, 0x90, 0xdf, 0x9b, 0xc2, 0x3d, 0x71, 0x32,
+ 0x25, 0xdd, 0x21, 0xa9, 0x25, 0xac, 0x61, 0xc5, 0x4e, 0x21,
+ },
+ 32, "Google 'Argon2026h1' log" },
+ { (const uint8_t[]){
+ 0xd7, 0x6d, 0x7d, 0x10, 0xd1, 0xa7, 0xf5, 0x77, 0xc2, 0xc7, 0xe9,
+ 0x5f, 0xd7, 0x00, 0xbf, 0xf9, 0x82, 0xc9, 0x33, 0x5a, 0x65, 0xe1,
+ 0xd0, 0xb3, 0x01, 0x73, 0x17, 0xc0, 0xc8, 0xc5, 0x69, 0x77,
+ },
+ 32, "Google 'Argon2026h2' log" },
+ { (const uint8_t[]){
0x07, 0xb7, 0x5c, 0x1b, 0xe5, 0x7d, 0x68, 0xff, 0xf1, 0xb0, 0xc6,
0x1d, 0x23, 0x15, 0xc7, 0xba, 0xe6, 0x57, 0x7c, 0x57, 0x94, 0xb7,
0x6a, 0xee, 0xbc, 0x61, 0x3a, 0x1a, 0x69, 0xd3, 0xa2, 0x1c,
@@ -1620,6 +1632,18 @@ static const bytes_string ct_logids[] = {
},
32, "Google 'Xenon2025h2' log" },
{ (const uint8_t[]){
+ 0x96, 0x97, 0x64, 0xbf, 0x55, 0x58, 0x97, 0xad, 0xf7, 0x43, 0x87,
+ 0x68, 0x37, 0x08, 0x42, 0x77, 0xe9, 0xf0, 0x3a, 0xd5, 0xf6, 0xa4,
+ 0xf3, 0x36, 0x6e, 0x46, 0xa4, 0x3f, 0x0f, 0xca, 0xa9, 0xc6,
+ },
+ 32, "Google 'Xenon2026h1' log" },
+ { (const uint8_t[]){
+ 0xd8, 0x09, 0x55, 0x3b, 0x94, 0x4f, 0x7a, 0xff, 0xc8, 0x16, 0x19,
+ 0x6f, 0x94, 0x4f, 0x85, 0xab, 0xb0, 0xf8, 0xfc, 0x5e, 0x87, 0x55,
+ 0x26, 0x0f, 0x15, 0xd1, 0x2e, 0x72, 0xbb, 0x45, 0x4b, 0x14,
+ },
+ 32, "Google 'Xenon2026h2' log" },
+ { (const uint8_t[]){
0x68, 0xf6, 0x98, 0xf8, 0x1f, 0x64, 0x82, 0xbe, 0x3a, 0x8c, 0xee,
0xb9, 0x28, 0x1d, 0x4c, 0xfc, 0x71, 0x51, 0x5d, 0x67, 0x93, 0xd4,
0x44, 0xd1, 0x0a, 0x67, 0xac, 0xbb, 0x4f, 0x4f, 0xfb, 0xc4,
@@ -1896,6 +1920,54 @@ static const bytes_string ct_logids[] = {
},
32, "DigiCert Nessie2025 Log" },
{ (const uint8_t[]){
+ 0xb6, 0x9d, 0xdc, 0xbc, 0x3c, 0x1a, 0xbd, 0xef, 0x6f, 0x9f, 0xd6,
+ 0x0c, 0x88, 0xb1, 0x06, 0x7b, 0x77, 0xf0, 0x82, 0x68, 0x8b, 0x2d,
+ 0x78, 0x65, 0xd0, 0x4b, 0x39, 0xab, 0xe9, 0x27, 0xa5, 0x75,
+ },
+ 32, "DigiCert 'Wyvern2024h1' Log" },
+ { (const uint8_t[]){
+ 0x0c, 0x2a, 0xef, 0x2c, 0x4a, 0x5b, 0x98, 0x83, 0xd4, 0xdd, 0xa3,
+ 0x82, 0xfe, 0x50, 0xfb, 0x51, 0x88, 0xb3, 0xe9, 0x73, 0x33, 0xa1,
+ 0xec, 0x53, 0xa0, 0x9d, 0xc9, 0xa7, 0x9d, 0x0d, 0x08, 0x20,
+ },
+ 32, "DigiCert 'Wyvern2024h2' Log" },
+ { (const uint8_t[]){
+ 0x73, 0x20, 0x22, 0x0f, 0x08, 0x16, 0x8a, 0xf9, 0xf3, 0xc4, 0xa6,
+ 0x8b, 0x0a, 0xb2, 0x6a, 0x9a, 0x4a, 0x00, 0xee, 0xf5, 0x77, 0x85,
+ 0x8a, 0x08, 0x4d, 0x05, 0x00, 0xd4, 0xa5, 0x42, 0x44, 0x59,
+ },
+ 32, "DigiCert 'Wyvern2025h1' Log" },
+ { (const uint8_t[]){
+ 0xed, 0x3c, 0x4b, 0xd6, 0xe8, 0x06, 0xc2, 0xa4, 0xa2, 0x00, 0x57,
+ 0xdb, 0xcb, 0x24, 0xe2, 0x38, 0x01, 0xdf, 0x51, 0x2f, 0xed, 0xc4,
+ 0x86, 0xc5, 0x70, 0x0f, 0x20, 0xdd, 0xb7, 0x3e, 0x3f, 0xe0,
+ },
+ 32, "DigiCert 'Wyvern2025h2' Log" },
+ { (const uint8_t[]){
+ 0xdb, 0x07, 0x6c, 0xde, 0x6a, 0x8b, 0x78, 0xec, 0x58, 0xd6, 0x05,
+ 0x64, 0x96, 0xeb, 0x6a, 0x26, 0xa8, 0xc5, 0x9e, 0x72, 0x12, 0x93,
+ 0xe8, 0xac, 0x03, 0x27, 0xdd, 0xde, 0x89, 0xdb, 0x5a, 0x2a,
+ },
+ 32, "DigiCert 'Sphinx2024h1' Log" },
+ { (const uint8_t[]){
+ 0xdc, 0xc9, 0x5e, 0x6f, 0xa2, 0x99, 0xb9, 0xb0, 0xfd, 0xbd, 0x6c,
+ 0xa6, 0xa3, 0x6e, 0x1d, 0x72, 0xc4, 0x21, 0x2f, 0xdd, 0x1e, 0x0f,
+ 0x47, 0x55, 0x3a, 0x36, 0xd6, 0xcf, 0x1a, 0xd1, 0x1d, 0x8d,
+ },
+ 32, "DigiCert 'Sphinx2024h2' Log" },
+ { (const uint8_t[]){
+ 0xde, 0x85, 0x81, 0xd7, 0x50, 0x24, 0x7c, 0x6b, 0xcd, 0xcb, 0xaf,
+ 0x56, 0x37, 0xc5, 0xe7, 0x81, 0xc6, 0x4c, 0xe4, 0x6e, 0xd6, 0x17,
+ 0x63, 0x9f, 0x8f, 0x34, 0xa7, 0x26, 0xc9, 0xe2, 0xbd, 0x37,
+ },
+ 32, "DigiCert 'Sphinx2025h1' Log" },
+ { (const uint8_t[]){
+ 0xa4, 0x42, 0xc5, 0x06, 0x49, 0x60, 0x61, 0x54, 0x8f, 0x0f, 0xd4,
+ 0xea, 0x9c, 0xfb, 0x7a, 0x2d, 0x26, 0x45, 0x4d, 0x87, 0xa9, 0x7f,
+ 0x2f, 0xdf, 0x45, 0x59, 0xf6, 0x27, 0x4f, 0x3a, 0x84, 0x54,
+ },
+ 32, "DigiCert 'Sphinx2025h2' Log" },
+ { (const uint8_t[]){
0xdd, 0xeb, 0x1d, 0x2b, 0x7a, 0x0d, 0x4f, 0xa6, 0x20, 0x8b, 0x81,
0xad, 0x81, 0x68, 0x70, 0x7e, 0x2e, 0x8e, 0x9d, 0x01, 0xd5, 0x5c,
0x88, 0x8d, 0x3d, 0x11, 0xc4, 0xcd, 0xb6, 0xec, 0xbe, 0xcc,
@@ -2076,6 +2148,30 @@ static const bytes_string ct_logids[] = {
},
32, "Sectigo 'Mammoth2025h2'" },
{ (const uint8_t[]){
+ 0x25, 0x2f, 0x94, 0xc2, 0x2b, 0x29, 0xe9, 0x6e, 0x9f, 0x41, 0x1a,
+ 0x72, 0x07, 0x2b, 0x69, 0x5c, 0x5b, 0x52, 0xff, 0x97, 0xa9, 0x0d,
+ 0x25, 0x40, 0xbb, 0xfc, 0xdc, 0x51, 0xec, 0x4d, 0xee, 0x0b,
+ },
+ 32, "Sectigo 'Mammoth2026h1'" },
+ { (const uint8_t[]){
+ 0x94, 0xb1, 0xc1, 0x8a, 0xb0, 0xd0, 0x57, 0xc4, 0x7b, 0xe0, 0xac,
+ 0x04, 0x0e, 0x1f, 0x2c, 0xbc, 0x8d, 0xc3, 0x75, 0x72, 0x7b, 0xc9,
+ 0x51, 0xf2, 0x0a, 0x52, 0x61, 0x26, 0x86, 0x3b, 0xa7, 0x3c,
+ },
+ 32, "Sectigo 'Mammoth2026h2'" },
+ { (const uint8_t[]){
+ 0x56, 0x6c, 0xd5, 0xa3, 0x76, 0xbe, 0x83, 0xdf, 0xe3, 0x42, 0xb6,
+ 0x75, 0xc4, 0x9c, 0x23, 0x24, 0x98, 0xa7, 0x69, 0xba, 0xc3, 0x82,
+ 0xcb, 0xab, 0x49, 0xa3, 0x87, 0x7d, 0x9a, 0xb3, 0x2d, 0x01,
+ },
+ 32, "Sectigo 'Sabre2026h1'" },
+ { (const uint8_t[]){
+ 0x1f, 0x56, 0xd1, 0xab, 0x94, 0x70, 0x4a, 0x41, 0xdd, 0x3f, 0xea,
+ 0xfd, 0xf4, 0x69, 0x93, 0x55, 0x30, 0x2c, 0x14, 0x31, 0xbf, 0xe6,
+ 0x13, 0x46, 0x08, 0x9f, 0xff, 0xae, 0x79, 0x5d, 0xcc, 0x2f,
+ },
+ 32, "Sectigo 'Sabre2026h2'" },
+ { (const uint8_t[]){
0xdb, 0x76, 0xfd, 0xad, 0xac, 0x65, 0xe7, 0xd0, 0x95, 0x08, 0x88,
0x6e, 0x21, 0x59, 0xbd, 0x8b, 0x90, 0x35, 0x2f, 0x5f, 0xea, 0xd3,
0xe3, 0xdc, 0x5e, 0x22, 0xeb, 0x35, 0x0a, 0xcc, 0x7b, 0x98,
@@ -2238,6 +2334,18 @@ static const bytes_string ct_logids[] = {
},
32, "TrustAsia Log2025b" },
{ (const uint8_t[]){
+ 0x74, 0xdb, 0x9d, 0x58, 0xf7, 0xd4, 0x7e, 0x9d, 0xfd, 0x78, 0x7a,
+ 0x16, 0x2a, 0x99, 0x1c, 0x18, 0xcf, 0x69, 0x8d, 0xa7, 0xc7, 0x29,
+ 0x91, 0x8c, 0x9a, 0x18, 0xb0, 0x45, 0x0d, 0xba, 0x44, 0xbc,
+ },
+ 32, "TrustAsia 'log2026a'" },
+ { (const uint8_t[]){
+ 0x25, 0xb7, 0xef, 0xde, 0xa1, 0x13, 0x01, 0x93, 0xed, 0x93, 0x07,
+ 0x97, 0x70, 0xaa, 0x32, 0x2a, 0x26, 0x62, 0x0d, 0xe3, 0x5a, 0xc8,
+ 0xaa, 0x7c, 0x75, 0x19, 0x7d, 0xe0, 0xb1, 0xa9, 0xe0, 0x65,
+ },
+ 32, "TrustAsia 'log2026b'" },
+ { (const uint8_t[]){
0x45, 0x35, 0x94, 0x98, 0xd9, 0x3a, 0x89, 0xe0, 0x28, 0x03, 0x08,
0xd3, 0x7d, 0x62, 0x6d, 0xc4, 0x23, 0x75, 0x47, 0x58, 0xdc, 0xe0,
0x37, 0x00, 0x36, 0xfb, 0xab, 0x0e, 0xdf, 0x8a, 0x6b, 0xcf,
diff --git a/epan/dissectors/packet-wisun.c b/epan/dissectors/packet-wisun.c
index e0a6d34a..6985a784 100644
--- a/epan/dissectors/packet-wisun.c
+++ b/epan/dissectors/packet-wisun.c
@@ -849,6 +849,7 @@ dissect_wisun_luttie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint
static int
dissect_wisun_nrie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset)
{
+ guint start_offset = offset;
guint8 node_role = tvb_get_guint8(tvb, offset) & WISUN_WSIE_NODE_ROLE_MASK;
proto_tree_add_item(tree, hf_wisun_nrie_nr_id, tvb, offset, 1, ENC_LITTLE_ENDIAN);
@@ -869,7 +870,7 @@ dissect_wisun_nrie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guin
offset += 3;
}
- return offset;
+ return offset - start_offset;
}
static int
@@ -1382,7 +1383,7 @@ dissect_wisun_pomie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, voi
proto_item *item;
proto_tree *subtree;
guint8 number_operating_modes;
- guint8 offset = 0;
+ guint offset = 0;
static int* const wisun_pomie_fields[] = {
&hf_wisun_pomie_number_operating_modes,
@@ -1499,7 +1500,7 @@ dissect_wisun_jmie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void
&hf_wisun_jmie_metric_len,
NULL
};
- guint8 offset = 0;
+ guint offset = 0;
proto_item *item;
proto_tree *subtree;
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 0c76303e..f524a41a 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -5812,6 +5812,7 @@ static const value_string usb_products_vals[] = {
{ 0x045e02e3, "Xbox One Elite Controller" },
{ 0x045e02e6, "Xbox Wireless Adapter for Windows" },
{ 0x045e02ea, "Xbox One Controller" },
+ { 0x045e02f3, "Xbox One Chatpad" },
{ 0x045e02fd, "Xbox One S Controller [Bluetooth]" },
{ 0x045e02fe, "Xbox Wireless Adapter for Windows" },
{ 0x045e0306, "Surface Pro 7 SD Card Reader" },
@@ -7963,6 +7964,7 @@ static const value_string usb_products_vals[] = {
{ 0x04a932ea, "Canon EOS 90D" },
{ 0x04a932ee, "Canon PowerShot SX70 HS" },
{ 0x04a932ef, "Canon EOS M200" },
+ { 0x04a932f0, "Canon PowerShot G7 X Mark III" },
{ 0x04a932f1, "Canon EOS 850D" },
{ 0x04a932f4, "Canon EOS R5" },
{ 0x04a932f5, "Canon EOS R6" },
@@ -8555,7 +8557,7 @@ static const value_string usb_products_vals[] = {
{ 0x04bf0a28, "INDI AV-IN Device" },
{ 0x04bf1301, "Network Controller" },
{ 0x04bf1302, "i3 Gateway" },
- { 0x04bf1303, "3 Micro Module" },
+ { 0x04bf1303, "i3 Micro Module" },
{ 0x04bf1304, "i3 Module" },
{ 0x04bf1305, "i3 Multi Sensing Module" },
{ 0x04c10020, "56K Voice Pro" },
@@ -10051,6 +10053,7 @@ static const value_string usb_products_vals[] = {
{ 0x04f92060, "PT-E550W P-touch Label Printer" },
{ 0x04f92061, "PT-P700 P-touch Label Printer" },
{ 0x04f92064, "PT-P700 P-touch Label Printer RemovableDisk" },
+ { 0x04f92065, "PT-P750W P-Touch Label Writer" },
{ 0x04f92074, "PT-D600 P-touch Label Printer" },
{ 0x04f9209b, "QL-800 Label Printer" },
{ 0x04f9209c, "QL-810W Label Printer" },
@@ -11115,6 +11118,7 @@ static const value_string usb_products_vals[] = {
{ 0x056a03dd, "PTH-460 [Intuos Pro BT (S)] tablet" },
{ 0x056a03ec, "DTH134 [DTH134] touchscreen" },
{ 0x056a03ed, "DTC121 [DTC121] touchscreen" },
+ { 0x056a03f0, "DTH135 [Movink 13]" },
{ 0x056a0400, "PenPartner 4x5" },
{ 0x056a4001, "TPC4001" },
{ 0x056a4004, "TPC4004" },
@@ -12623,6 +12627,7 @@ static const value_string usb_products_vals[] = {
{ 0x05e30752, "micros Reader" },
{ 0x05e30760, "USB 2.0 Card Reader/Writer" },
{ 0x05e30761, "Genesys Mass Storage Device" },
+ { 0x05e30769, "SPR2801S [Lightspeeur 2801]" },
{ 0x05e30780, "USBFS DFU Adapter" },
{ 0x05e307a0, "Pen Flash" },
{ 0x05e30880, "Wasp (SL-6612)" },
@@ -14166,7 +14171,7 @@ static const value_string usb_products_vals[] = {
{ 0x079b0056, "Agfa AP1100 Photo Printer" },
{ 0x079b005d, "Mobile Mass Storage" },
{ 0x079b005f, "Laser Pro LL [MFPrinter]" },
- { 0x079b0062, "XG-76NA 802.11bg" },
+ { 0x079b0062, "XG-76NA / XG-760N 802.11b/g Wireless adapter" },
{ 0x079b0078, "Laser Pro Monochrome MFP" },
{ 0x079d0201, "GamePort Adapter" },
{ 0x07a1d952, "Palladio USB V.92 Modem" },
@@ -14413,6 +14418,7 @@ static const value_string usb_products_vals[] = {
{ 0x07ca1228, "MPEG-2 Capture Device (M038)" },
{ 0x07ca1830, "AVerTV Volar Video Capture (H830)" },
{ 0x07ca1871, "TD310 DVB-T/T2/C dongle" },
+ { 0x07ca2553, "Live Gamer Ultra 2.1" },
{ 0x07ca3835, "AVerTV Volar Green HD (A835B)" },
{ 0x07ca850a, "AverTV Volar Black HD (A850)" },
{ 0x07ca850b, "AverTV Red HD+ (A850T)" },
@@ -14424,6 +14430,7 @@ static const value_string usb_products_vals[] = {
{ 0x07cab300, "A300 DVB-T TV receiver" },
{ 0x07cab800, "MR800 FM Radio" },
{ 0x07cac039, "DVD EZMaker 7" },
+ { 0x07cad553, "Live Gamer Ultra Pro-RGB" },
{ 0x07cae880, "MPEG-2 Capture Device (E880)" },
{ 0x07cae882, "MPEG-2 Capture Device (E882)" },
{ 0x07cc0000, "CF Card Reader" },
@@ -15382,7 +15389,7 @@ static const value_string usb_products_vals[] = {
{ 0x09300a0b, "WLU5053 802.11abgn Wireless Module [Broadcom BCM43236B]" },
{ 0x09300a13, "AX88179 Gigabit Ethernet [Toshiba]" },
{ 0x09300b05, "PX1220E-1G25 External hard drive" },
- { 0x09300b09, "PX1396E-3T01 External hard drive" },
+ { 0x09300b09, "PX139xE 3.5 External HDD" },
{ 0x09300b1a, "STOR.E ALU 2S" },
{ 0x09301300, "Wireless Broadband (CDMA EV-DO) SM-Bus Minicard Status Port" },
{ 0x09301301, "Wireless Broadband (CDMA EV-DO) Minicard Status Port" },
@@ -15500,6 +15507,7 @@ static const value_string usb_products_vals[] = {
{ 0x0944010f, "nanoKONTROL studio controller" },
{ 0x09440117, "nanoKONTROL2 MIDI Controller" },
{ 0x0944012f, "SQ-1" },
+ { 0x09440154, "NTS-1 digital kit mkII" },
{ 0x09440203, "KRONOS" },
{ 0x09440f03, "K-Series K61P MIDI studio controller" },
{ 0x09480301, "USB Pro (24/48)" },
@@ -15942,6 +15950,7 @@ static const value_string usb_products_vals[] = {
{ 0x0a5c5803, "BCM5880 Secure Applications Processor with secure keyboard" },
{ 0x0a5c5804, "BCM5880 Secure Applications Processor with fingerprint swipe sensor" },
{ 0x0a5c5832, "BCM5880 Secure Applications Processor Smartcard reader" },
+ { 0x0a5c5843, "BCM58200 ControlVault 3 (FingerPrint sensor + Contacted SmartCard)" },
{ 0x0a5c6300, "Pirelli Remote NDIS Device" },
{ 0x0a5c6410, "BCM20703A1 Bluetooth 4.1 + LE" },
{ 0x0a5cbd11, "BCM4320 802.11bg Wireless Adapter" },
@@ -15956,11 +15965,14 @@ static const value_string usb_products_vals[] = {
{ 0x0a5f0009, "LP2844 Printer" },
{ 0x0a5f0027, "ZTC LP2844-Z-200dpi" },
{ 0x0a5f0050, "P120i / WM120i" },
+ { 0x0a5f0062, "GK420d Label Printer" },
+ { 0x0a5f0065, "ZM400 Label Printer" },
{ 0x0a5f0080, "GK420d Label Printer" },
{ 0x0a5f0081, "GK420t Label Printer" },
{ 0x0a5f0084, "GX420d Desktop Label Printer" },
{ 0x0a5f008b, "HC100 wristbands Printer" },
{ 0x0a5f008c, "ZP 450 Printer" },
+ { 0x0a5f00a1, "TLP2824 Plus" },
{ 0x0a5f00d1, "GC420d Label Printer" },
{ 0x0a5f0110, "ZD500 Desktop Label Printer" },
{ 0x0a5f011c, "ZD410 Direct Thermal Label Printer" },
@@ -15968,6 +15980,7 @@ static const value_string usb_products_vals[] = {
{ 0x0a5f0172, "ZT411 Barcode Label Printer" },
{ 0x0a5f930a, "Printer" },
{ 0x0a620010, "MPMan MP-F40 MP3 Player" },
+ { 0x0a67ffff, "LCS Audio" },
{ 0x0a6b0001, "Compact Flash R/W with MP3 player" },
{ 0x0a6b000f, "FlashDisk" },
{ 0x0a6f0400, "Xanboo" },
@@ -16131,10 +16144,11 @@ static const value_string usb_products_vals[] = {
{ 0x0ac8c42d, "Lenovo IdeaCentre Web Camera" },
{ 0x0ac90000, "Backpack CD-ReWriter" },
{ 0x0ac90001, "BACKPACK 2 Cable" },
- { 0x0ac90010, "BACKPACK" },
+ { 0x0ac90010, "BACKPACK CD Drive" },
{ 0x0ac90011, "Backpack 40GB Hard Drive" },
{ 0x0ac90110, "BACKPACK" },
{ 0x0ac90111, "BackPack" },
+ { 0x0ac910ff, "BACKPACK" },
{ 0x0ac91234, "BACKPACK" },
{ 0x0aca1060, "OPEN NT1 Plus II" },
{ 0x0acd0300, "IDT1221U RS-232 Adapter" },
@@ -16176,7 +16190,7 @@ static const value_string usb_products_vals[] = {
{ 0x0aec3102, "MemoryStick Card Reader" },
{ 0x0aec3201, "MMC/SD+MemoryStick Card Reader" },
{ 0x0aec3216, "HS Card Reader" },
- { 0x0aec3260, "7-in-1 Card Reader" },
+ { 0x0aec3260, "ND3260 7-in-1 Card Reader" },
{ 0x0aec5010, "ND5010 Card Reader" },
{ 0x0af05000, "UMTS Card" },
{ 0x0af06000, "GlobeTrotter 3G datacard" },
@@ -16239,6 +16253,7 @@ static const value_string usb_products_vals[] = {
{ 0x0b0517a0, "Xonar U3 sound card" },
{ 0x0b0517a1, "Eee Note EA800 (mass storage mode)" },
{ 0x0b0517ab, "USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU]" },
+ { 0x0b0517b5, "Broadcom BCM20702A0 Bluetooth" },
{ 0x0b0517ba, "N10 Nano 802.11n Network Adapter [Realtek RTL8192CU]" },
{ 0x0b0517c2, "ROG Spitfire" },
{ 0x0b0517c7, "WL-330NUL" },
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 19:49:14 +0000