Merge remote-tracking branch 'upstream/master'

CMakeLists.txt

@@ -63,7 +63,7 @@ set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT
 
 set(STRATOSHARK_MAJOR_VERSION 0)
 set(STRATOSHARK_MINOR_VERSION 9)
-set(STRATOSHARK_PATCH_VERSION 0)
+set(STRATOSHARK_PATCH_VERSION 1)
 set(STRATOSHARK_BUILD_VERSION 0)
 set(STRATOSHARK_VERSION_EXTENSION "")
 

doc/Stratoshark_Release_Notes.adoc

@@ -27,6 +27,10 @@ If you or your organization would like to contribute or become a sponsor, please
 // Many other improvements have been made.
 // See the “New and Updated Features” section below for more details.
 
+The following changes have been made since version 0.9.0:
+
+* The application icons have been updated.
+
 === Bug Fixes
 
 //The following bugs have been fixed:
@@ -37,6 +41,7 @@ If you or your organization would like to contribute or become a sponsor, please
 
 The following bugs have been fixed since version 0.9.0:
 
+* Falco Bridge: Empty frame.protocols field. wsbuglink:20248[].
 * Sysdig event and Falco bridge dissection mismatch due to unsupported pcapng block types. wsbuglink:20358[].
 
 

doc/attributes.adoc

@@ -1,7 +1,7 @@
 // Common attributes
 
 :wireshark-version: 4.5.0
-:stratoshark-version: 0.9.0
+:stratoshark-version: 0.9.1
 
 // Required for btn, kbd:, and menu: macros.
 :experimental:

epan/dissectors/asn1/mpeg-pes/packet-mpeg-pes-template.c

@@ -564,7 +564,9 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
 				 * the formats of those payloads specified?)
 				 */
 				length -= ((offset - save_offset) / 8) - 2;
-			} else if (stream < STREAM_VIDEO || stream > STREAM_VIDEO_MAX) {
+			} else if (!(stream == STREAM_PRIVATE1 && (stream_type == 0x21 || stream_type == 0x32))
+				&& (stream < STREAM_VIDEO || stream > STREAM_VIDEO_MAX)) {
+				/* Video with PES length == 0 can also be stream_private_1 with stream_type 0x21 (JPEG 2000) or 0x32 (JPEG XS). */
 				proto_tree_add_expert(tree, pinfo, &ei_mpeg_pes_length_zero, tvb, save_offset / 8, 2);
 			}
 

epan/dissectors/packet-flexray.c

@@ -39,6 +39,7 @@ static int proto_flexray;
 static int hf_flexray_measurement_header_field;
 static int hf_flexray_error_flags_field;
 static int hf_flexray_frame_header;
+static int hf_flexray_frame_trailer;
 
 static int hf_flexray_ti;
 static int hf_flexray_ch;
@@ -58,11 +59,13 @@ static int hf_flexray_hcrc;
 static int hf_flexray_cc;
 static int hf_flexray_sl;
 static int hf_flexray_flexray_id;
+static int hf_flexray_crc;
 
 static int ett_flexray;
 static int ett_flexray_measurement_header;
 static int ett_flexray_error_flags;
 static int ett_flexray_frame;
+static int ett_flexray_frame_trailer;
 
 static int * const error_fields[] = {
     &hf_flexray_fcrc_err,
@@ -326,6 +329,7 @@ dissect_flexray(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
     if (frame_type == FLEXRAY_FRAME) {
         proto_tree *error_flags_tree, *flexray_frame_tree;
         bool call_subdissector = true;
+        bool payload_truncated = false;
 
         /* Error Flags [1 Byte] */
         ti = proto_tree_add_bitmask(flexray_tree, tvb, 1, hf_flexray_error_flags_field, ett_flexray_error_flags, error_fields, ENC_BIG_ENDIAN);
@@ -365,12 +369,11 @@ dissect_flexray(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
 
         uint32_t flexray_pl;
         proto_tree_add_item_ret_uint(flexray_frame_tree, hf_flexray_pl, tvb, 4, 1, ENC_BIG_ENDIAN, &flexray_pl);
-        int flexray_reported_payload_length = 2 * flexray_pl;
+        int flexray_real_payload_length = 2 * flexray_pl;
         int flexray_current_payload_length = flexray_frame_length - FLEXRAY_HEADER_LENGTH;
-        bool payload_truncated = flexray_reported_payload_length > flexray_current_payload_length;
-
-        if (flexray_reported_payload_length < flexray_current_payload_length) {
-            flexray_current_payload_length = MAX(0, flexray_reported_payload_length);
+        if (flexray_real_payload_length > flexray_current_payload_length) {
+            payload_truncated = true;
+            flexray_real_payload_length = MAX(0, flexray_current_payload_length);
         }
 
         proto_tree_add_item(flexray_frame_tree, hf_flexray_hcrc, tvb, 4, 3, ENC_BIG_ENDIAN);
@@ -385,22 +388,29 @@ dissect_flexray(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
                 call_subdissector = false;
             }
 
-            if (tvb != NULL && flexray_current_payload_length > 0) {
-                col_append_fstr(pinfo->cinfo, COL_INFO, "   %s", tvb_bytes_to_str_punct(pinfo->pool, tvb, 7, flexray_current_payload_length, ' '));
+            if (tvb != NULL && flexray_real_payload_length > 0) {
+                col_append_fstr(pinfo->cinfo, COL_INFO, "   %s", tvb_bytes_to_str_punct(pinfo->pool, tvb, 7, flexray_real_payload_length, ' '));
             }
 
         } else {
             call_subdissector = false;
             col_append_str(pinfo->cinfo, COL_INFO, "   NF");
 
             /* Payload is optional on Null Frames */
-            if (payload_truncated && flexray_current_payload_length != 0) {
+            if (payload_truncated && flexray_real_payload_length != 0) {
                 expert_add_info(pinfo, flexray_frame_tree, &ei_flexray_frame_payload_truncated);
             }
         }
 
         proto_item_set_end(ti_header, tvb, 2 + FLEXRAY_HEADER_LENGTH);
 
+        if (flexray_current_payload_length > flexray_real_payload_length) {
+            int trailer_len = flexray_current_payload_length - flexray_real_payload_length;
+            proto_item* ti_trailer = proto_tree_add_item(flexray_tree, hf_flexray_frame_trailer, tvb, 7 + flexray_real_payload_length, trailer_len, ENC_NA);
+            proto_tree* flexray_trailer = proto_item_add_subtree(ti_trailer, ett_flexray_frame_trailer);
+            proto_tree_add_item(flexray_trailer, hf_flexray_crc, tvb, 7 + flexray_real_payload_length, 3, ENC_BIG_ENDIAN);
+        }
+
         /* Only supporting single bus id right now */
         flexray_info_t flexray_info = { .id = (uint16_t)flexray_id,
                                         .cc = (uint8_t)flexray_cc,
@@ -411,8 +421,8 @@ dissect_flexray(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
         proto_item_set_hidden(ti);
         flexray_set_source_and_destination_columns(pinfo, &flexray_info);
 
-        if (flexray_current_payload_length > 0) {
-            tvbuff_t *next_tvb = tvb_new_subset_length(tvb, 7, flexray_current_payload_length);
+        if (flexray_real_payload_length > 0) {
+            tvbuff_t *next_tvb = tvb_new_subset_length(tvb, 7, flexray_real_payload_length);
             if (!call_subdissector || !flexray_call_subdissectors(next_tvb, pinfo, tree, &flexray_info, prefvar_try_heuristic_first)) {
                 call_data_dissector(next_tvb, pinfo, tree);
             }
@@ -471,20 +481,25 @@ proto_register_flexray(void) {
         { &hf_flexray_pl, {
             "Payload length", "flexray.pl", FT_UINT8, BASE_DEC, NULL, 0xfe, NULL, HFILL } },
         { &hf_flexray_hcrc, {
-            "Header CRC", "flexray.hcrc", FT_UINT24, BASE_DEC, NULL, 0x01ffc0, NULL, HFILL } },
+            "Header CRC", "flexray.hcrc", FT_UINT24, BASE_HEX, NULL, 0x01ffc0, NULL, HFILL } },
         { &hf_flexray_cc, {
             "Cycle Counter", "flexray.cc", FT_UINT8, BASE_DEC, NULL, 0x3f, NULL, HFILL } },
         { &hf_flexray_sl, {
             "Symbol length", "flexray.sl", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL } },
         { &hf_flexray_flexray_id, {
             "FlexRay ID (combined)", "flexray.combined_id", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } },
+        { &hf_flexray_frame_trailer, {
+            "FlexRay Frame Trailer", "flexray.frame_trailer", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } },
+        { &hf_flexray_crc, {
+            "CRC", "flexray.crc", FT_UINT24, BASE_HEX, NULL, 0, NULL, HFILL } },
     };
 
     static int *ett[] = {
         &ett_flexray,
         &ett_flexray_measurement_header,
         &ett_flexray_error_flags,
-        &ett_flexray_frame
+        &ett_flexray_frame,
+        &ett_flexray_frame_trailer
     };
 
     static ei_register_info ei[] = {