Compare revisions

Martin Mayer · John Thacker · Gerald Combs · Gerald Combs · Guy Harris · Gerald Combs
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1515,13 +1515,13 @@ if (QT_FOUND)
 		# https://doc.qt.io/qt-5.11/supported-platforms-and-configurations.html
 		# https://doc.qt.io/qt-5.15/supported-platforms.html
 		# https://doc-snapshots.qt.io/qt6-dev/supported-platforms.html
-		if(Qt${qtver}Widgets_VERSION VERSION_GREATER_EQUAL "6.5.0")
+		if(Qt${qtver}Widgets_VERSION VERSION_GREATER_EQUAL "6.5.0" AND MIN_MACOS_VERSION VERSION_LESS "11.0")
 			set(MIN_MACOS_VERSION 11.0)
-		elseif(Qt${qtver}Widgets_VERSION VERSION_GREATER_EQUAL "6.0.0")
+		elseif(Qt${qtver}Widgets_VERSION VERSION_GREATER_EQUAL "6.0.0" AND MIN_MACOS_VERSION VERSION_LESS "10.14")
 			set(MIN_MACOS_VERSION 10.14)
-		elseif(Qt5Widgets_VERSION VERSION_GREATER_EQUAL "5.14.0")
+		elseif(Qt5Widgets_VERSION VERSION_GREATER_EQUAL "5.14.0" AND MIN_MACOS_VERSION VERSION_LESS "10.13")
 			set(MIN_MACOS_VERSION 10.13)
-		elseif(Qt5Widgets_VERSION VERSION_GREATER_EQUAL "5.12.0")
+		elseif(Qt5Widgets_VERSION VERSION_GREATER_EQUAL "5.12.0" AND MIN_MACOS_VERSION VERSION_LESS "10.12")
 			set(MIN_MACOS_VERSION 10.12)
 		endif()
 		if(CMAKE_OSX_DEPLOYMENT_TARGET AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS MIN_MACOS_VERSION)

--- a/dftest.c
+++ b/dftest.c
@@ -49,6 +49,7 @@ static int opt_debug_level = 0; /* currently up to 2 */
 static int opt_flex = 0;
 static int opt_lemon = 0;
 static int opt_syntax_tree = 0;
+static int opt_return_vals = 0;
 static int opt_timer = 0;
 static long opt_optimize = 1;
 static int opt_show_types = 0;
@@ -108,6 +109,7 @@ print_usage(int status)
    fprintf(fp, "  -s, --syntax        print syntax tree\n");
    fprintf(fp, "  -m  --macros        print saved macros\n");
    fprintf(fp, "  -t, --timer         print elapsed compilation time\n");
+    fprintf(fp, "  -r  --return-vals   return field values for the tree root\n");
    fprintf(fp, "  -0, --optimize=0    do not optimize (check syntax)\n");
    fprintf(fp, "      --types         show field value types\n");
    /* NOTE: References are loaded during runtime and dftest only does compilation.
@@ -216,6 +218,8 @@ compile_filter(const char *text, dfilter_t **dfp)
        df_flags |= DF_DEBUG_FLEX;
    if (opt_lemon)
        df_flags |= DF_DEBUG_LEMON;
+    if (opt_return_vals)
+        df_flags |= DF_RETURN_VALUES;

    start = g_get_monotonic_time();
    ok = dfilter_compile_full(text, dfp, &df_err, df_flags, "dftest");
@@ -278,7 +282,7 @@ main(int argc, char **argv)

    ws_init_version_info("DFTest", NULL, NULL);

-    const char *optstring = "hvdDflsmtV0";
+    const char *optstring = "hvdDflsmrtV0";
    static struct ws_option long_options[] = {
        { "help",     ws_no_argument,   0,  'h' },
        { "version",  ws_no_argument,   0,  'v' },
@@ -289,6 +293,7 @@ main(int argc, char **argv)
        { "macros",   ws_no_argument,   0,  'm' },
        { "timer",    ws_no_argument,   0,  't' },
        { "verbose",  ws_no_argument,   0,  'V' },
+        { "return-vals", ws_no_argument,   0,  'r' },
        { "optimize", ws_required_argument, 0, 1000 },
        { "types",    ws_no_argument,   0, 2000 },
        { "refs",     ws_no_argument,   0, 3000 },
@@ -335,6 +340,9 @@ main(int argc, char **argv)
            case 't':
                opt_timer = 1;
                break;
+            case 'r':
+                opt_return_vals = 1;
+                break;
            case '0':
                opt_optimize = 0;
                break;

--- a/epan/dfilter/dfilter.h
+++ b/epan/dfilter/dfilter.h
@@ -73,6 +73,9 @@ dfilter_expand(const char *expr, df_error_t **err_ret);
 #define DF_DEBUG_FLEX		(1U << 3)
 /* Enable debug trace for lemon. */
 #define DF_DEBUG_LEMON		(1U << 4)
+/* If the root of the syntax tree is a field, load and return the field values.
+ * By default the field is only checked for existence. */
+#define DF_RETURN_VALUES        (1U << 5)

 /* Compiles a string to a dfilter_t.
 * On success, sets the dfilter* pointed to by dfp

--- a/epan/dfilter/gencode.c
+++ b/epan/dfilter/gencode.c
@@ -657,6 +657,18 @@ gen_exists(dfwork_t *dfw, stnode_t *st_node)
 	}
 }

+static dfvm_value_t*
+gen_field(dfwork_t *dfw, stnode_t *st_node)
+{
+	dfvm_value_t	*val1;
+	GSList		*jumps = NULL;
+
+	val1 = gen_entity(dfw, st_node, &jumps);
+	g_slist_foreach(jumps, fixup_jumps, dfw);
+	g_slist_free(jumps);
+	return val1;
+}
+
 static dfvm_value_t*
 gen_notzero(dfwork_t *dfw, stnode_t *st_node)
 {
@@ -805,12 +817,22 @@ static dfvm_value_t*
 gencode(dfwork_t *dfw, stnode_t *st_node)
 {
 	dfvm_value_t* val = NULL;
+	/* If the root of the tree is a field, load and return the
+	 * values if we were asked to do so. If not, or anywhere
+	 * other than the root, just test for existence.
+	 */
+	bool return_val = dfw->flags & DF_RETURN_VALUES;
+	dfw->flags &= ~DF_RETURN_VALUES;
 	switch (stnode_type_id(st_node)) {
 		case STTYPE_TEST:
 			gen_test(dfw, st_node);
 			break;
 		case STTYPE_FIELD:
-			gen_exists(dfw, st_node);
+			if (return_val) {
+				val = gen_field(dfw, st_node);
+			} else {
+				gen_exists(dfw, st_node);
+			}
 			break;
 		case STTYPE_ARITHMETIC:
 		case STTYPE_FUNCTION:

--- a/epan/dissectors/packet-drbd.c
+++ b/epan/dissectors/packet-drbd.c
@@ -19,6 +19,7 @@
 #include <config.h>

 #include <epan/packet.h>
+#include <epan/exceptions.h>
 #include <epan/prefs.h>
 #include "packet-tcp.h"

@@ -113,6 +114,11 @@ enum drbd_packet {
    P_OV_DAGTAG_REQ       = 0x4f,
    P_OV_DAGTAG_REPLY     = 0x50,

+    P_WRITE_ACK_IN_SYNC   = 0x51,
+    P_RS_NEG_ACK          = 0x52,
+    P_OV_RESULT_ID        = 0x53,
+    P_RS_DEALLOCATED_ID   = 0x54,
+
    P_INITIAL_META        = 0xfff1,
    P_INITIAL_DATA        = 0xfff2,

@@ -240,6 +246,11 @@ static const value_string packet_names[] = {
    { P_OV_DAGTAG_REQ, "P_OV_DAGTAG_REQ" },
    { P_OV_DAGTAG_REPLY, "P_OV_DAGTAG_REPLY" },

+    { P_WRITE_ACK_IN_SYNC, "P_WRITE_ACK_IN_SYNC" },
+    { P_RS_NEG_ACK, "P_RS_NEG_ACK" },
+    { P_OV_RESULT_ID, "P_OV_RESULT_ID" },
+    { P_RS_DEALLOCATED_ID, "P_RS_DEALLOCATED_ID" },
+
    { P_INITIAL_META, "P_INITIAL_META" },
    { P_INITIAL_DATA, "P_INITIAL_DATA" },

@@ -387,6 +398,17 @@ static const value_string disk_state_names[] = {
 #define DP_WSAME            512
 #define DP_ZEROES          1024

+#define OV_RESULT_SKIP         4710
+#define OV_RESULT_IN_SYNC      4711
+#define OV_RESULT_OUT_OF_SYNC  4712
+
+static const val64_string ov_result_codes[] = {
+    { OV_RESULT_SKIP, "SKIP" },
+    { OV_RESULT_IN_SYNC, "IN_SYNC" },
+    { OV_RESULT_OUT_OF_SYNC, "OUT_OF_SYNC" },
+    { 0, NULL }
+};
+
 #define DRBD_STREAM_DATA 0
 #define DRBD_STREAM_CONTROL 1

@@ -429,6 +451,7 @@ static void decode_payload_data_wsame(tvbuff_t *tvb, proto_tree *tree, drbd_conv
 static void decode_payload_rs_deallocated(tvbuff_t *tvb, proto_tree *tree, drbd_conv *conv_data);

 static void decode_payload_block_ack(tvbuff_t *tvb, proto_tree *tree, drbd_conv *conv_data);
+static void decode_payload_ov_result(tvbuff_t *tvb, proto_tree *tree, drbd_conv *conv_data);
 static void decode_payload_barrier_ack(tvbuff_t *tvb, proto_tree *tree, drbd_conv *conv_data);
 static void decode_payload_confirm_stable(tvbuff_t *tvb, proto_tree *tree, drbd_conv *conv_data);
 static void decode_payload_rq_s_reply(tvbuff_t *tvb, proto_tree *tree, drbd_conv *conv_data);
@@ -476,6 +499,7 @@ static const value_payload_decoder payload_decoders[] = {
    { P_TRIM, NULL, decode_payload_data_size },
    { P_ZEROES, NULL, decode_payload_data_size },
    { P_RS_DEALLOCATED, NULL, decode_payload_rs_deallocated },
+    { P_RS_DEALLOCATED_ID, NULL, decode_payload_block_ack },
    { P_WSAME, NULL, decode_payload_data_wsame },
    { P_DISCONNECT, NULL, NULL },
    { P_RS_DAGTAG_REQ, NULL, decode_payload_dagtag_data_request },
@@ -488,12 +512,15 @@ static const value_payload_decoder payload_decoders[] = {
    { P_PING_ACK, NULL, NULL },
    { P_RECV_ACK, NULL, decode_payload_block_ack },
    { P_WRITE_ACK, NULL, decode_payload_block_ack },
-    { P_RS_WRITE_ACK, NULL, decode_payload_block_ack },
+    { P_WRITE_ACK_IN_SYNC, NULL, decode_payload_block_ack },
    { P_SUPERSEDED, NULL, decode_payload_block_ack },
    { P_NEG_ACK, NULL, decode_payload_block_ack },
    { P_NEG_DREPLY, NULL, decode_payload_block_ack },
    { P_NEG_RS_DREPLY, NULL, decode_payload_block_ack },
+    { P_RS_WRITE_ACK, NULL, decode_payload_block_ack },
+    { P_RS_NEG_ACK, NULL, decode_payload_block_ack },
    { P_OV_RESULT, NULL, decode_payload_block_ack },
+    { P_OV_RESULT_ID, NULL, decode_payload_ov_result },
    { P_BARRIER_ACK, NULL, decode_payload_barrier_ack },
    { P_CONFIRM_STABLE, NULL, decode_payload_confirm_stable },
    { P_STATE_CHG_REPLY, NULL, decode_payload_rq_s_reply },
@@ -515,8 +542,10 @@ void proto_register_drbd(void);
 void proto_reg_handoff_drbd(void);

 static dissector_handle_t drbd_handle;
+static dissector_handle_t drbd_lb_tcp_handle;

 static int proto_drbd;
+static int proto_drbd_lb_tcp;

 static int hf_drbd_command;
 static int hf_drbd_length;
@@ -526,6 +555,7 @@ static int hf_drbd_auth_response_hash;
 static int hf_drbd_sector;
 static int hf_drbd_block_id;
 static int hf_drbd_seq_num;
+static int hf_drbd_ov_result;
 static int hf_drbd_dp_flags;
 static int hf_drbd_data;
 static int hf_drbd_size;
@@ -636,7 +666,11 @@ static int hf_drbd_dp_send_write_ack;
 static int hf_drbd_dp_wsame;
 static int hf_drbd_dp_zeroes;

+static int hf_drbd_lb_tcp_seq;
+static int hf_drbd_lb_tcp_length;
+
 static gint ett_drbd;
+static gint ett_drbd_lb_tcp;
 static gint ett_drbd_state;
 static gint ett_drbd_twopc_flags;
 static gint ett_drbd_uuid_flags;
@@ -713,7 +747,7 @@ static gboolean is_bit_set_64(guint64 value, int bit) {
 #define DRBD_MAGIC_100 0x8620ec20
 #define DRBD_TRANSPORT_RDMA_MAGIC 0x5257494E

-static guint get_drbd_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_)
+static guint read_drbd_packet_len(tvbuff_t *tvb, int offset)
 {
    guint32 magic32;
    guint16 magic16;
@@ -734,6 +768,27 @@ static guint get_drbd_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset,
    return 0;
 }

+static guint get_drbd_pdu_len(packet_info *pinfo, tvbuff_t *tvb, int offset, void *data _U_)
+{
+    guint drbd_len = read_drbd_packet_len(tvb, offset);
+
+    if (tvb_reported_length_remaining(tvb, offset) >= DRBD_FRAME_HEADER_100_LEN && !drbd_len) {
+        /* We have enough data to recognize any header, but none matched.
+         * Either there is data corruption or this is actually an lb-tcp
+         * stream. It is possible that the capture is missing the first lb-tcp
+         * header. In that case, the stream will be misidentified as normal
+         * DRBD on TCP.
+         *
+         * Reset the dissector and throw some exception so that a new dissector
+         * is chosen by the heuristic. */
+        conversation_t *conversation = find_or_create_conversation(pinfo);
+        conversation_set_dissector(conversation, NULL);
+        THROW(ReportedBoundsError);
+    }
+
+    return drbd_len;
+}
+
 static int dissect_drbd_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
    dissect_drbd_message(tvb, pinfo, tree);
@@ -748,27 +803,77 @@ static int dissect_drbd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
    return tvb_reported_length(tvb);
 }

-static gboolean test_drbd_header(tvbuff_t *tvb)
+static guint get_drbd_lb_tcp_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *data _U_)
 {
-    guint reported_length = tvb_reported_length(tvb);
-    if (reported_length < DRBD_FRAME_HEADER_80_LEN || tvb_captured_length(tvb) < 4) {
-        return FALSE;
+    return 8 + tvb_get_ntohl(tvb, offset + 4);
+}
+
+static int dissect_drbd_lb_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+    proto_tree      *lb_tcp_tree;
+    proto_item      *lb_tcp_ti;
+
+    lb_tcp_ti = proto_tree_add_item(tree, proto_drbd_lb_tcp, tvb, 0, -1, ENC_NA);
+    proto_item_set_text(lb_tcp_ti, "DRBD [lb-tcp]");
+    lb_tcp_tree = proto_item_add_subtree(lb_tcp_ti, ett_drbd_lb_tcp);
+
+    proto_tree_add_item(lb_tcp_tree, hf_drbd_lb_tcp_seq, tvb, 0, 4, ENC_BIG_ENDIAN);
+    proto_tree_add_item(lb_tcp_tree, hf_drbd_lb_tcp_length, tvb, 4, 4, ENC_BIG_ENDIAN);
+
+    guint offset = 8;
+    while (tvb_captured_length(tvb) >= offset + DRBD_FRAME_HEADER_80_LEN) {
+        guint length = read_drbd_packet_len(tvb, offset);
+
+        /* Was a header recognized? */
+        if (length == 0) {
+            const gchar *info_text = col_get_text(pinfo->cinfo, COL_INFO);
+
+            col_clear(pinfo->cinfo, COL_INFO);
+            if (!info_text || !info_text[0])
+                col_append_ports(pinfo->cinfo, COL_INFO, PT_TCP, pinfo->srcport, pinfo->destport);
+            col_append_str(pinfo->cinfo, COL_INFO, " [lb-tcp Payload]");
+            col_set_fence(pinfo->cinfo, COL_INFO);
+
+            break;
+        }
+
+        dissect_drbd_message(tvb_new_subset_length(tvb, offset, length), pinfo, tree);
+
+        offset += length;
    }

-    gboolean match = FALSE;
-    guint32 magic32 = tvb_get_ntohl(tvb, 0);
+    return tvb_reported_length(tvb);
+}
+
+static int dissect_drbd_lb_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
+{
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "DRBD lb-tcp");
+    tcp_dissect_pdus(tvb, pinfo, tree, TRUE, 8,
+            get_drbd_lb_tcp_pdu_len, dissect_drbd_lb_tcp_pdu, data);
+    return tvb_reported_length(tvb);
+}
+
+static gboolean test_drbd_header(tvbuff_t *tvb, int offset)
+{
+    int reported_length = tvb_reported_length(tvb);
+    int captured_length = tvb_captured_length(tvb);
+
+    if (reported_length < offset + DRBD_FRAME_HEADER_80_LEN || captured_length < offset + 4)
+        return FALSE;
+
+    guint32 magic32 = tvb_get_ntohl(tvb, offset);

    if (magic32 == DRBD_MAGIC)
-        match = TRUE;
-    else if (reported_length >= DRBD_FRAME_HEADER_100_LEN && magic32 == DRBD_MAGIC_100)
-        match = TRUE;
+        return TRUE;
+    else if (reported_length >= offset + DRBD_FRAME_HEADER_100_LEN && magic32 == DRBD_MAGIC_100)
+        return TRUE;
    else {
-        guint16 magic16 = tvb_get_ntohs(tvb, 0);
+        guint16 magic16 = tvb_get_ntohs(tvb, offset);
        if (magic16 == DRBD_MAGIC_BIG)
-            match = TRUE;
+            return TRUE;
    }

-    return match;
+    return FALSE;
 }

 static gboolean test_drbd_rdma_control_header(tvbuff_t *tvb)
@@ -785,7 +890,7 @@ static gboolean test_drbd_rdma_control_header(tvbuff_t *tvb)
 static gboolean test_drbd_protocol(tvbuff_t *tvb, packet_info *pinfo,
        proto_tree *tree, void *data _U_)
 {
-    if (!test_drbd_header(tvb))
+    if (!test_drbd_header(tvb, 0))
        return FALSE;

    conversation_t *conversation = find_or_create_conversation(pinfo);
@@ -795,6 +900,23 @@ static gboolean test_drbd_protocol(tvbuff_t *tvb, packet_info *pinfo,
    return TRUE;
 }

+static gboolean test_drbd_lb_tcp_protocol(tvbuff_t *tvb, packet_info *pinfo,
+        proto_tree *tree, void *data _U_)
+{
+    /* DRBD packets may be split between lb-tcp wrapper packets. As a result,
+     * there may be lb-tcp packets that do not contain any DRBD header.
+     * However, we have no other way to identify lb-tcp packets, so look for a
+     * DRBD header anyway. This is a best-effort solution. */
+    if (!test_drbd_header(tvb, 8))
+        return FALSE;
+
+    conversation_t *conversation = find_or_create_conversation(pinfo);
+    conversation_set_dissector(conversation, drbd_lb_tcp_handle);
+    dissect_drbd_lb_tcp(tvb, pinfo, tree, data);
+
+    return TRUE;
+}
+
 /*
 * A DRBD connection consists of 2 TCP connections. We need information from
 * one to correctly interpret the other. However, it is impossible to determine
@@ -911,12 +1033,9 @@ static void dissect_drbd_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
    /* Indicate what kind of message this is. */
    const gchar *packet_name = val_to_str(command, packet_names, "Unknown (0x%02x)");
    const gchar *info_text = col_get_text(pinfo->cinfo, COL_INFO);
-    if (!info_text || !info_text[0]) {
+    if (!info_text || !info_text[0])
        col_append_ports(pinfo->cinfo, COL_INFO, PT_TCP, pinfo->srcport, pinfo->destport);
-        col_append_fstr(pinfo->cinfo, COL_INFO, " [%s]", packet_name);
-    } else {
-        col_append_fstr(pinfo->cinfo, COL_INFO, " [%s]", packet_name);
-    }
+    col_append_fstr(pinfo->cinfo, COL_INFO, " [%s]", packet_name);
    col_set_fence(pinfo->cinfo, COL_INFO);

    conversation_t *conv = find_drbd_conversation(pinfo);
@@ -1002,9 +1121,9 @@ static void dissect_drbd_ib_control_message(tvbuff_t *tvb, packet_info *pinfo, p
    proto_tree_add_item(drbd_tree, hf_drbd_rx_desc_stolen_from, tvb, 12, 4, ENC_BIG_ENDIAN);
 }

-static gboolean dissect_drbd_ib(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
+static gboolean dissect_drbd_ib(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-    if (!test_drbd_header(tvb) && !test_drbd_rdma_control_header(tvb))
+    if (!test_drbd_header(tvb, 0) && !test_drbd_rdma_control_header(tvb))
        return FALSE;

    col_set_str(pinfo->cinfo, COL_PROTOCOL, "DRBD RDMA");
@@ -1015,7 +1134,7 @@ static gboolean dissect_drbd_ib(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
        if (is_control_packet)
            length = DRBD_TRANSPORT_RDMA_PACKET_LEN;
        else
-            length = get_drbd_pdu_len(pinfo, tvb, 0, data);
+            length = read_drbd_packet_len(tvb, 0);

        /* Was a header recognized? */
        if (length == 0)
@@ -1396,6 +1515,15 @@ static void decode_payload_block_ack(tvbuff_t *tvb, proto_tree *tree, drbd_conv
    proto_tree_add_item(tree, hf_drbd_seq_num, tvb, 20, 4, ENC_BIG_ENDIAN);
 }

+static void decode_payload_ov_result(tvbuff_t *tvb, proto_tree *tree, drbd_conv *conv_data _U_)
+{
+    proto_tree_add_item(tree, hf_drbd_sector, tvb, 0, 8, ENC_BIG_ENDIAN);
+    proto_tree_add_item(tree, hf_drbd_block_id, tvb, 8, 8, ENC_LITTLE_ENDIAN);
+    proto_tree_add_item(tree, hf_drbd_size, tvb, 16, 4, ENC_BIG_ENDIAN);
+    proto_tree_add_item(tree, hf_drbd_seq_num, tvb, 20, 4, ENC_BIG_ENDIAN);
+    proto_tree_add_item(tree, hf_drbd_ov_result, tvb, 24, 8, ENC_BIG_ENDIAN);
+}
+
 static void decode_payload_barrier_ack(tvbuff_t *tvb, proto_tree *tree, drbd_conv *conv_data _U_)
 {
    proto_tree_add_item(tree, hf_drbd_barrier, tvb, 0, 4, ENC_LITTLE_ENDIAN);
@@ -1510,6 +1638,7 @@ void proto_register_drbd(void)
        { &hf_drbd_sector, { "Sector", "drbd.sector", FT_UINT64, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }},
        { &hf_drbd_block_id, { "Block ID", "drbd.block_id", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
        { &hf_drbd_seq_num, { "Sequence number", "drbd.seq_num", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+        { &hf_drbd_ov_result, { "Online verify result", "drbd.ov_result", FT_UINT64, BASE_DEC|BASE_VAL64_STRING, VALS64(ov_result_codes), 0x0, NULL, HFILL }},
        { &hf_drbd_dp_flags, { "Data flags", "drbd.dp_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
        { &hf_drbd_data, { "Data", "drbd.data", FT_BYTES, BASE_NO_DISPLAY_VALUE, NULL, 0x0, NULL, HFILL }},
        { &hf_drbd_size, { "Size", "drbd.size", FT_UINT32, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }},
@@ -1621,8 +1750,14 @@ void proto_register_drbd(void)
        { &hf_drbd_dp_zeroes, { "zeroes", "drbd.dp_flag.zeroes", FT_BOOLEAN, 32, NULL, DP_ZEROES, NULL, HFILL }},
    };

+    static hf_register_info hf_lb_tcp[] = {
+        { &hf_drbd_lb_tcp_seq, { "lb-tcp sequence number", "drbd_lb_tcp.seq", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+        { &hf_drbd_lb_tcp_length, { "lb-tcp length", "drbd_lb_tcp.length", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
+    };
+
    static gint *ett[] = {
        &ett_drbd,
+        &ett_drbd_lb_tcp,
        &ett_drbd_state,
        &ett_drbd_twopc_flags,
        &ett_drbd_uuid_flags,
@@ -1632,15 +1767,21 @@ void proto_register_drbd(void)

    proto_drbd = proto_register_protocol("DRBD Protocol", "DRBD", "drbd");
    proto_register_field_array(proto_drbd, hf, array_length(hf));
+
+    proto_drbd_lb_tcp = proto_register_protocol("DRBD Load-Balanced Protocol", "DRBD lb-tcp", "drbd_lb_tcp");
+    proto_register_field_array(proto_drbd_lb_tcp, hf_lb_tcp, array_length(hf_lb_tcp));
+
    proto_register_subtree_array(ett, array_length(ett));

    drbd_handle = register_dissector("drbd", dissect_drbd, proto_drbd);
+    drbd_lb_tcp_handle = register_dissector("drbd_lb_tcp", dissect_drbd_lb_tcp, proto_drbd_lb_tcp);
 }

 void proto_reg_handoff_drbd(void)
 {
    heur_dissector_add("tcp", test_drbd_protocol, "DRBD over TCP", "drbd_tcp", proto_drbd, HEURISTIC_DISABLE);
    heur_dissector_add("infiniband.payload", dissect_drbd_ib, "DRBD over RDMA", "drbd_rdma", proto_drbd, HEURISTIC_DISABLE);
+    heur_dissector_add("tcp", test_drbd_lb_tcp_protocol, "DRBD Load-Balanced over TCP", "drbd_lb_tcp", proto_drbd_lb_tcp, HEURISTIC_DISABLE);
 }

 /*

--- a/epan/dissectors/packet-kafka.c
+++ b/epan/dissectors/packet-kafka.c
@@ -4938,7 +4938,7 @@ dissect_kafka_sync_group_request_group_assignment(tvbuff_t *tvb, packet_info *pi
    offset = dissect_kafka_string(subtree, hf_kafka_member_id, tvb, pinfo, offset, api_version >= 4,
                                  &member_start, &member_len);

-    /* member_assigment */
+    /* member_assignment */
    offset = dissect_kafka_bytes(subtree, hf_kafka_member_assignment, tvb, pinfo, offset, api_version >= 4, NULL, NULL);

    if (api_version >= 4) {

--- a/epan/dissectors/packet-ocp1.c
+++ b/epan/dissectors/packet-ocp1.c
 /* packet-ocp1.c
 * Dissector for Open Control Protocol OCP.1/AES70
 *
- * Copyright (c) 2021-2022 by Martin Mayer <martin.mayer@m2-it-solutions.de>
+ * Copyright (c) 2021-2024 by Martin Mayer <martin.mayer@m2-it-solutions.de>
 *
 * Wireshark - Network traffic analyzer
 * By Gerald Combs <gerald@wireshark.org>
@@ -19,6 +19,7 @@
 #define OCP1_SYNC_VAL                0x3B
 #define OCP1_PROTO_VER             0x0001
 #define OCP1_FRAME_HEADER_LEN          10
+#define OCP1_MESSAGE_SIZE_LEN           4

 /* PDU Types */
 #define OCP1_PDU_TYPE_OCA_CMD        0x00
@@ -158,6 +159,7 @@ static int hf_ocp1_params_media_coding_scheme_id;
 /* Expert fields */
 static expert_field ei_ocp1_handle_fail;
 static expert_field ei_ocp1_bad_status_code;
+static expert_field ei_ocp1_invalid_length;

 /* Trees */
 static gint ett_ocp1;
@@ -2316,8 +2318,8 @@ dissect_ocp1_msg_command(tvbuff_t *tvb, gint offset, gint length, packet_info *p

    gint offset_m = offset;

-    proto_tree_add_item(message_tree, hf_ocp1_message_size, tvb, offset_m, 4, ENC_BIG_ENDIAN);
-    offset_m += 4;
+    proto_tree_add_item(message_tree, hf_ocp1_message_size, tvb, offset_m, OCP1_MESSAGE_SIZE_LEN, ENC_BIG_ENDIAN);
+    offset_m += OCP1_MESSAGE_SIZE_LEN;

    proto_tree_add_item(message_tree, hf_ocp1_message_handle, tvb, offset_m, 4, ENC_BIG_ENDIAN);
    offset_m += 4;
@@ -2390,8 +2392,8 @@ dissect_ocp1_msg_notification(tvbuff_t *tvb, gint offset, gint length, proto_tre

    gint offset_m = offset;

-    proto_tree_add_item(message_tree, hf_ocp1_message_size, tvb, offset_m, 4, ENC_BIG_ENDIAN);
-    offset_m += 4;
+    proto_tree_add_item(message_tree, hf_ocp1_message_size, tvb, offset_m, OCP1_MESSAGE_SIZE_LEN, ENC_BIG_ENDIAN);
+    offset_m += OCP1_MESSAGE_SIZE_LEN;

    t_occ = proto_tree_add_item(message_tree, hf_ocp1_message_occ, tvb, offset_m, 8, ENC_BIG_ENDIAN);
    proto_item_set_generated(t_occ);
@@ -2452,8 +2454,8 @@ dissect_ocp1_msg_response(tvbuff_t *tvb, gint offset, gint length, packet_info *

    gint offset_m = offset;

-    proto_tree_add_item(message_tree, hf_ocp1_message_size, tvb, offset_m, 4, ENC_BIG_ENDIAN);
-    offset_m += 4;
+    proto_tree_add_item(message_tree, hf_ocp1_message_size, tvb, offset_m, OCP1_MESSAGE_SIZE_LEN, ENC_BIG_ENDIAN);
+    offset_m += OCP1_MESSAGE_SIZE_LEN;

    proto_tree_add_item(message_tree, hf_ocp1_message_handle, tvb, offset_m, 4, ENC_BIG_ENDIAN);
    offset_m += 4;
@@ -2512,6 +2514,7 @@ dissect_ocp1_pdu(tvbuff_t *tvb, packet_info *pinfo, gint offset, proto_tree *tre

    guint offset_d = offset;                         /* Increment counter for dissection */
    guint offset_m = offset + OCP1_FRAME_HEADER_LEN; /* Set offset to start of first message, will increment to next message later */
+    guint message_size;                              /* Message size (per iteration) */

    if (tvb_captured_length_remaining(tvb, offset) < OCP1_FRAME_HEADER_LEN)
        return offset;
@@ -2578,8 +2581,14 @@ dissect_ocp1_pdu(tvbuff_t *tvb, packet_info *pinfo, gint offset, proto_tree *tre

            while (offset_m < (offset + header_pdu_size + 1)) {
                /* first 4 byte of message is command size (incl. these 4 bytes) */
+                message_size = tvb_get_guint32(tvb, offset_m, ENC_BIG_ENDIAN);
+                if(message_size < OCP1_MESSAGE_SIZE_LEN) {
+                    expert_add_info(pinfo, pdu_tree, &ei_ocp1_invalid_length);
+                    return 0;
+                }
+
                dissect_ocp1_msg_command(tvb, offset_m, tvb_get_guint32(tvb, offset_m, ENC_BIG_ENDIAN), pinfo, pdu_tree, msg_counter);
-                offset_m += tvb_get_guint32(tvb, offset_m, ENC_BIG_ENDIAN);
+                offset_m += message_size;
                msg_counter++;
            }

@@ -2588,8 +2597,14 @@ dissect_ocp1_pdu(tvbuff_t *tvb, packet_info *pinfo, gint offset, proto_tree *tre

            while (offset_m < (offset + header_pdu_size + 1)) {
                /* first 4 byte of message is command size (incl. these 4 bytes) */
+                message_size = tvb_get_guint32(tvb, offset_m, ENC_BIG_ENDIAN);
+                if(message_size < OCP1_MESSAGE_SIZE_LEN) {
+                    expert_add_info(pinfo, pdu_tree, &ei_ocp1_invalid_length);
+                    return 0;
+                }
+
                dissect_ocp1_msg_notification(tvb, offset_m, tvb_get_guint32(tvb, offset_m, ENC_BIG_ENDIAN), pdu_tree, msg_counter);
-                offset_m += tvb_get_guint32(tvb, offset_m, ENC_BIG_ENDIAN);
+                offset_m += message_size;
                msg_counter++;
            }

@@ -2598,8 +2613,13 @@ dissect_ocp1_pdu(tvbuff_t *tvb, packet_info *pinfo, gint offset, proto_tree *tre

            while (offset_m < (offset + header_pdu_size + 1)) {
                /* first 4 byte of message is response size (incl. these 4 bytes) */
+                message_size = tvb_get_guint32(tvb, offset_m, ENC_BIG_ENDIAN);
+                if(message_size < OCP1_MESSAGE_SIZE_LEN) {
+                    expert_add_info(pinfo, pdu_tree, &ei_ocp1_invalid_length);
+                    return 0;
+                }
                dissect_ocp1_msg_response(tvb, offset_m, tvb_get_guint32(tvb, offset_m, ENC_BIG_ENDIAN), pinfo, pdu_tree, msg_counter);
-                offset_m += tvb_get_guint32(tvb, offset_m, ENC_BIG_ENDIAN);
+                offset_m += message_size;
                msg_counter++;
            }

@@ -3288,6 +3308,10 @@ proto_register_ocp1(void)
        { &ei_ocp1_bad_status_code,
            { "ocp1.bad_status_code", PI_RESPONSE_CODE, PI_ERROR,
                "Status code indicates failed command", EXPFILL }
+        },
+        { &ei_ocp1_invalid_length,
+            { "ocp1.invalid_length", PI_MALFORMED, PI_ERROR,
+                "Size or length field has invalid value", EXPFILL }
        }
    };


--- a/epan/dissectors/packet-socketcan.c
+++ b/epan/dissectors/packet-socketcan.c
@@ -669,8 +669,13 @@ dissect_socketcan_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu

        guint32 proto_vcid;

-        proto_tree_add_bitmask_list(can_tree, tvb, 0, 4, canxl_prio_vcid_fields, xl_encoding);
-        proto_vcid = tvb_get_guint32(tvb, 0, xl_encoding);
+	/*
+	 * The priority/VCID field is big-endian in LINKTYPE_CAN_SOCKETCAN
+	 * captures, for historical reasons.  It's host-endian in
+	 * Linux cooked captures.  This means we use the non-XL encoding.
+	 */
+        proto_tree_add_bitmask_list(can_tree, tvb, 0, 4, canxl_prio_vcid_fields, encoding);
+        proto_vcid = tvb_get_guint32(tvb, 0, encoding);
        col_add_fstr(pinfo->cinfo, COL_INFO, "Priority: %u (0x%03x), VCID: %u (0x%02X)", proto_vcid & 0x7FF, proto_vcid & 0x7FF, (proto_vcid >> 16) & 0xFF, (proto_vcid >> 16) & 0xFF);
        proto_item_append_text(can_tree, ", Priority: %u (0x%03x), VCID: %u (0x%02X)", proto_vcid & 0x7FF, proto_vcid & 0x7FF, (proto_vcid >> 16) & 0xFF, (proto_vcid >> 16) & 0xFF);
        proto_tree_add_bitmask_list(can_tree, tvb, 4, 1, canxl_flag_fields, xl_encoding);
@@ -679,6 +684,10 @@ dissect_socketcan_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu

        guint32 sdu_type;

+	/*
+	 * These fields are, if multi-byte, little-endian in
+	 * LINKTYPE_CAN_SOCKETCAN captures, so use xl_encoding.
+	 */
        proto_tree_add_item_ret_uint(can_tree, hf_canxl_sdu_type, tvb, 5, 1, ENC_NA, &sdu_type);
        proto_tree_add_item_ret_uint(can_tree, hf_canxl_len, tvb, CANXL_LEN_OFFSET, 2, xl_encoding, &can_info.len);
        col_append_fstr(pinfo->cinfo, COL_INFO, ", Length: %u", can_info.len);

--- a/epan/dissectors/packet-umts_fp.c
+++ b/epan/dissectors/packet-umts_fp.c
@@ -2799,7 +2799,7 @@ dissect_e_dch_channel_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
            proto_tree *subframe_tree;
            guint bits_in_subframe = 0;
            guint mac_d_pdus_in_subframe = 0;
-            guint    lchid=0;    /*Logcial channel id*/
+            guint    lchid=0;    /*Logical channel id*/
            guint32 user_identity;
            umts_mac_info *macinf;
            bit_offset = 0;
@@ -4171,7 +4171,7 @@ heur_dissect_fp_dcch_over_dch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
    }

    /* Checking if the 4th byte in the frame is zeroed. In this case the CRC checks aren't */
-    /* deterministic enough to gurantee this is a DCH since this packet could also be a PCH frame */
+    /* deterministic enough to guarantee this is a DCH since this packet could also be a PCH frame */
    /* with PI Bitmap of 18 bytes + 0 TBs (Both CRCs will match for both formats) */
    pch_collisions_byte = tvb_get_guint8(tvb, 3);
    if (pch_collisions_byte == 0) {
@@ -4686,7 +4686,7 @@ heur_dissect_fp_pch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *d
                cfn_lowest_bits = tvb_get_guint8(tvb, 2) & 0xF0;
                if(cfn_lowest_bits == 0) {
                    /* Checking if the 4th byte in the frame is zeroed. In this case the CRC checks aren't */
-                    /* deterministic enough to gurantee this is a PCH since this packet could also be a DCH frame */
+                    /* deterministic enough to guarantee this is a PCH since this packet could also be a DCH frame */
                    /* with MAC's C/T is 0 and 4 leftmost bits of RLC are 0 */
                    dch_collisions_byte = tvb_get_guint8(tvb, 3);
                    if (dch_collisions_byte == 0) {

--- a/epan/dissectors/x11-declarations.h
+++ b/epan/dissectors/x11-declarations.h
@@ -1843,6 +1843,39 @@ static int hf_x11_damage_Add_drawable;
 static int hf_x11_damage_Add_region;
 static int hf_x11_damage_extension_minor;

+static int hf_x11_struct_dbe_SwapInfo;
+static int hf_x11_struct_dbe_SwapInfo_window;
+static int hf_x11_struct_dbe_SwapInfo_swap_action;
+static int hf_x11_struct_dbe_BufferAttributes;
+static int hf_x11_struct_dbe_BufferAttributes_window;
+static int hf_x11_struct_dbe_VisualInfo;
+static int hf_x11_struct_dbe_VisualInfo_visual_id;
+static int hf_x11_struct_dbe_VisualInfo_depth;
+static int hf_x11_struct_dbe_VisualInfo_perf_level;
+static int hf_x11_struct_dbe_VisualInfos;
+static int hf_x11_struct_dbe_VisualInfos_n_infos;
+static int hf_x11_struct_dbe_VisualInfos_infos;
+static int hf_x11_struct_dbe_VisualInfos_infos_item;
+static int hf_x11_dbe_QueryVersion_major_version;
+static int hf_x11_dbe_QueryVersion_minor_version;
+static int hf_x11_dbe_QueryVersion_reply_major_version;
+static int hf_x11_dbe_QueryVersion_reply_minor_version;
+static int hf_x11_dbe_AllocateBackBuffer_window;
+static int hf_x11_dbe_AllocateBackBuffer_buffer;
+static int hf_x11_dbe_AllocateBackBuffer_swap_action;
+static int hf_x11_dbe_DeallocateBackBuffer_buffer;
+static int hf_x11_dbe_SwapBuffers_n_actions;
+static int hf_x11_dbe_SwapBuffers_actions;
+static int hf_x11_dbe_SwapBuffers_actions_item;
+static int hf_x11_dbe_GetVisualInfo_n_drawables;
+static int hf_x11_dbe_GetVisualInfo_drawables;
+static int hf_x11_dbe_GetVisualInfo_drawables_item;
+static int hf_x11_dbe_GetVisualInfo_reply_n_supported_visuals;
+static int hf_x11_dbe_GetVisualInfo_reply_supported_visuals;
+static int hf_x11_dbe_GetBackBufferAttributes_buffer;
+static int hf_x11_dbe_GetBackBufferAttributes_reply_attributes;
+static int hf_x11_dbe_extension_minor;
+
 static int hf_x11_dpms_GetVersion_client_major_version;
 static int hf_x11_dpms_GetVersion_client_minor_version;
 static int hf_x11_dpms_GetVersion_reply_server_major_version;
@@ -1857,6 +1890,8 @@ static int hf_x11_dpms_SetTimeouts_off_timeout;
 static int hf_x11_dpms_ForceLevel_power_level;
 static int hf_x11_dpms_Info_reply_power_level;
 static int hf_x11_dpms_Info_reply_state;
+static int hf_x11_dpms_SelectInput_event_mask_mask_InfoNotify;
+static int hf_x11_dpms_SelectInput_event_mask;
 static int hf_x11_dpms_extension_minor;

 static int hf_x11_struct_dri2_DRI2Buffer;
@@ -2021,6 +2056,9 @@ static int hf_x11_dri3_BuffersFromPixmap_reply_strides_item;
 static int hf_x11_dri3_BuffersFromPixmap_reply_offsets;
 static int hf_x11_dri3_BuffersFromPixmap_reply_offsets_item;
 static int hf_x11_dri3_BuffersFromPixmap_reply_buffers;
+static int hf_x11_dri3_SetDRMDeviceInUse_window;
+static int hf_x11_dri3_SetDRMDeviceInUse_drmMajor;
+static int hf_x11_dri3_SetDRMDeviceInUse_drmMinor;
 static int hf_x11_dri3_extension_minor;

 static int hf_x11_ge_QueryVersion_client_major_version;
@@ -4260,6 +4298,10 @@ static int hf_x11_xfixes_CreatePointerBarrier_num_devices;
 static int hf_x11_xfixes_CreatePointerBarrier_devices;
 static int hf_x11_xfixes_CreatePointerBarrier_devices_item;
 static int hf_x11_xfixes_DeletePointerBarrier_barrier;
+static int hf_x11_xfixes_SetClientDisconnectMode_disconnect_mode_mask_Terminate;
+static int hf_x11_xfixes_SetClientDisconnectMode_disconnect_mode;
+static int hf_x11_xfixes_GetClientDisconnectMode_reply_disconnect_mode_mask_Terminate;
+static int hf_x11_xfixes_GetClientDisconnectMode_reply_disconnect_mode;
 static int hf_x11_xfixes_extension_minor;

 static int hf_x11_struct_xinerama_ScreenInfo;
@@ -4816,6 +4858,7 @@ static int hf_x11_struct_xinput_DeviceClass_Scroll_flags;
 static int hf_x11_struct_xinput_DeviceClass_Scroll_increment;
 static int hf_x11_struct_xinput_DeviceClass_Touch_mode;
 static int hf_x11_struct_xinput_DeviceClass_Touch_num_touches;
+static int hf_x11_struct_xinput_DeviceClass_Gesture_num_touches;
 static int hf_x11_struct_xinput_XIDeviceInfo;
 static int hf_x11_struct_xinput_XIDeviceInfo_deviceid;
 static int hf_x11_struct_xinput_XIDeviceInfo_type;
@@ -5176,6 +5219,46 @@ static int hf_x11_xinput_BarrierHit_root_x;
 static int hf_x11_xinput_BarrierHit_root_y;
 static int hf_x11_xinput_BarrierHit_dx;
 static int hf_x11_xinput_BarrierHit_dy;
+static int hf_x11_xinput_GesturePinchBegin_deviceid;
+static int hf_x11_xinput_GesturePinchBegin_time;
+static int hf_x11_xinput_GesturePinchBegin_detail;
+static int hf_x11_xinput_GesturePinchBegin_root;
+static int hf_x11_xinput_GesturePinchBegin_event;
+static int hf_x11_xinput_GesturePinchBegin_child;
+static int hf_x11_xinput_GesturePinchBegin_root_x;
+static int hf_x11_xinput_GesturePinchBegin_root_y;
+static int hf_x11_xinput_GesturePinchBegin_event_x;
+static int hf_x11_xinput_GesturePinchBegin_event_y;
+static int hf_x11_xinput_GesturePinchBegin_delta_x;
+static int hf_x11_xinput_GesturePinchBegin_delta_y;
+static int hf_x11_xinput_GesturePinchBegin_delta_unaccel_x;
+static int hf_x11_xinput_GesturePinchBegin_delta_unaccel_y;
+static int hf_x11_xinput_GesturePinchBegin_scale;
+static int hf_x11_xinput_GesturePinchBegin_delta_angle;
+static int hf_x11_xinput_GesturePinchBegin_sourceid;
+static int hf_x11_xinput_GesturePinchBegin_mods;
+static int hf_x11_xinput_GesturePinchBegin_group;
+static int hf_x11_xinput_GesturePinchBegin_flags_mask_GesturePinchCancelled;
+static int hf_x11_xinput_GesturePinchBegin_flags;
+static int hf_x11_xinput_GestureSwipeBegin_deviceid;
+static int hf_x11_xinput_GestureSwipeBegin_time;
+static int hf_x11_xinput_GestureSwipeBegin_detail;
+static int hf_x11_xinput_GestureSwipeBegin_root;
+static int hf_x11_xinput_GestureSwipeBegin_event;
+static int hf_x11_xinput_GestureSwipeBegin_child;
+static int hf_x11_xinput_GestureSwipeBegin_root_x;
+static int hf_x11_xinput_GestureSwipeBegin_root_y;
+static int hf_x11_xinput_GestureSwipeBegin_event_x;
+static int hf_x11_xinput_GestureSwipeBegin_event_y;
+static int hf_x11_xinput_GestureSwipeBegin_delta_x;
+static int hf_x11_xinput_GestureSwipeBegin_delta_y;
+static int hf_x11_xinput_GestureSwipeBegin_delta_unaccel_x;
+static int hf_x11_xinput_GestureSwipeBegin_delta_unaccel_y;
+static int hf_x11_xinput_GestureSwipeBegin_sourceid;
+static int hf_x11_xinput_GestureSwipeBegin_mods;
+static int hf_x11_xinput_GestureSwipeBegin_group;
+static int hf_x11_xinput_GestureSwipeBegin_flags_mask_GestureSwipeCancelled;
+static int hf_x11_xinput_GestureSwipeBegin_flags;
 static int hf_x11_xinput_SendExtensionEvent_destination;
 static int hf_x11_xinput_SendExtensionEvent_device_id;
 static int hf_x11_xinput_SendExtensionEvent_propagate;

--- a/epan/dissectors/x11-enum.h
+++ b/epan/dissectors/x11-enum.h
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-xcb.pl
-   using xcbproto version xcb-proto-1.14-3-g7d58eed */
+   using xcbproto version xcb-proto-1.16.0-2-g1388374 */
 /*
 * Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
 *
@@ -36,6 +36,14 @@ static const value_string x11_enum_xfixes_Region[] = {
    {   0, NULL },
 };

+static const value_string x11_enum_dbe_SwapAction[] = {
+    {   0, "Undefined" },
+    {   1, "Background" },
+    {   2, "Untouched" },
+    {   3, "Copied" },
+    {   0, NULL },
+};
+
 static const value_string x11_enum_dpms_DPMSMode[] = {
    {   0, "On" },
    {   1, "Standby" },
@@ -558,6 +566,7 @@ static const value_string x11_enum_xinput_DeviceClassType[] = {
    {   2, "Valuator" },
    {   3, "Scroll" },
    {   8, "Touch" },
+    {   9, "Gesture" },
    {   0, NULL },
 };

@@ -610,6 +619,8 @@ static const value_string x11_enum_xinput_GrabType[] = {
    {   2, "Enter" },
    {   3, "FocusIn" },
    {   4, "TouchBegin" },
+    {   5, "GesturePinchBegin" },
+    {   6, "GestureSwipeBegin" },
    {   0, NULL },
 };


--- a/epan/dissectors/x11-extension-errors.h
+++ b/epan/dissectors/x11-extension-errors.h
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-xcb.pl
-   using xcbproto version xcb-proto-1.14-3-g7d58eed */
+   using xcbproto version xcb-proto-1.16.0-2-g1388374 */
 /*
 * Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
 *
@@ -11,11 +11,11 @@
 * SPDX-License-Identifier: GPL-2.0-or-later
 */

-const char *bigreq_errors[] = {
+static const char *bigreq_errors[] = {
  NULL
 };

-const char *composite_errors[] = {
+static const char *composite_errors[] = {
  NULL
 };

@@ -24,19 +24,24 @@ static const char *damage_errors[] = {
  NULL
 };

-const char *dpms_errors[] = {
+static const char *dbe_errors[] = {
+  "dbe-BadBuffer",
  NULL
 };

-const char *dri2_errors[] = {
+static const char *dpms_errors[] = {
  NULL
 };

-const char *dri3_errors[] = {
+static const char *dri2_errors[] = {
  NULL
 };

-const char *ge_errors[] = {
+static const char *dri3_errors[] = {
+  NULL
+};
+
+static const char *ge_errors[] = {
  NULL
 };

@@ -58,7 +63,7 @@ static const char *glx_errors[] = {
  NULL
 };

-const char *present_errors[] = {
+static const char *present_errors[] = {
  NULL
 };

@@ -84,15 +89,15 @@ static const char *render_errors[] = {
  NULL
 };

-const char *res_errors[] = {
+static const char *res_errors[] = {
  NULL
 };

-const char *screensaver_errors[] = {
+static const char *screensaver_errors[] = {
  NULL
 };

-const char *shape_errors[] = {
+static const char *shape_errors[] = {
  NULL
 };

@@ -107,15 +112,15 @@ static const char *sync_errors[] = {
  NULL
 };

-const char *xc_misc_errors[] = {
+static const char *xc_misc_errors[] = {
  NULL
 };

-const char *xevie_errors[] = {
+static const char *xevie_errors[] = {
  NULL
 };

-const char *xf86dri_errors[] = {
+static const char *xf86dri_errors[] = {
  NULL
 };

@@ -135,7 +140,7 @@ static const char *xfixes_errors[] = {
  NULL
 };

-const char *xinerama_errors[] = {
+static const char *xinerama_errors[] = {
  NULL
 };

@@ -159,11 +164,11 @@ static const char *xprint_errors[] = {
  NULL
 };

-const char *xselinux_errors[] = {
+static const char *xselinux_errors[] = {
  NULL
 };

-const char *xtest_errors[] = {
+static const char *xtest_errors[] = {
  NULL
 };

@@ -174,7 +179,7 @@ static const char *xv_errors[] = {
  NULL
 };

-const char *xvmc_errors[] = {
+static const char *xvmc_errors[] = {
  NULL
 };

--- a/epan/dissectors/x11-extension-implementation.h
+++ b/epan/dissectors/x11-extension-implementation.h
--- a/epan/dissectors/x11-glx-render-enum.h
+++ b/epan/dissectors/x11-glx-render-enum.h
 /* Do not modify this file. */
 /* It was automatically generated by ../../tools/process-x11-xcb.pl
-   using mesa version 20.1-branchpoint-2058-gf8110226baa */
+   using mesa version 24.0-branchpoint-1188-gc3062e3402f */
 /*
 * Copyright 2008, 2009, 2013, 2014 Open Text Corporation <pharris[AT]opentext.com>
 *
@@ -486,7 +486,6 @@ static const value_string mesa_enum[] = {
  { 0x802e, "MINMAX" },
  { 0x802f, "MINMAX_FORMAT" },
  { 0x8030, "MINMAX_SINK" },
-  { 0x8031, "TABLE_TOO_LARGE_EXT" },
  { 0x8032, "UNSIGNED_BYTE_3_3_2" },
  { 0x8033, "UNSIGNED_SHORT_4_4_4_4" },
  { 0x8034, "UNSIGNED_SHORT_5_5_5_1" },
@@ -630,7 +629,6 @@ static const value_string mesa_enum[] = {
  { 0x80e1, "BGRA" },
  { 0x80e8, "MAX_ELEMENTS_VERTICES" },
  { 0x80e9, "MAX_ELEMENTS_INDICES" },
-  { 0x80ed, "TEXTURE_INDEX_SIZE_EXT" },
  { 0x80f0, "CLIP_VOLUME_CLIPPING_HINT_EXT" },
  { 0x8126, "POINT_SIZE_MIN" },
  { 0x8127, "POINT_SIZE_MAX" },

--- a/epan/dissectors/x11-register-info.h
+++ b/epan/dissectors/x11-register-info.h
@@ -1843,6 +1843,39 @@
 { &hf_x11_damage_Add_region, { "region", "x11.damage.Add.region", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 { &hf_x11_damage_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(damage_extension_minor), 0, "minor opcode", HFILL }},
  
+{ &hf_x11_struct_dbe_SwapInfo, { "dbe_SwapInfo", "x11.struct.dbe_SwapInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_struct_dbe_SwapInfo_window, { "window", "x11.struct.dbe_SwapInfo.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_struct_dbe_SwapInfo_swap_action, { "swap_action", "x11.struct.dbe_SwapInfo.swap_action", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_dbe_SwapAction), 0, NULL, HFILL }},
+{ &hf_x11_struct_dbe_BufferAttributes, { "dbe_BufferAttributes", "x11.struct.dbe_BufferAttributes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_struct_dbe_BufferAttributes_window, { "window", "x11.struct.dbe_BufferAttributes.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_struct_dbe_VisualInfo, { "dbe_VisualInfo", "x11.struct.dbe_VisualInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_struct_dbe_VisualInfo_visual_id, { "visual_id", "x11.struct.dbe_VisualInfo.visual_id", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_struct_dbe_VisualInfo_depth, { "depth", "x11.struct.dbe_VisualInfo.depth", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_struct_dbe_VisualInfo_perf_level, { "perf_level", "x11.struct.dbe_VisualInfo.perf_level", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_struct_dbe_VisualInfos, { "dbe_VisualInfos", "x11.struct.dbe_VisualInfos", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_struct_dbe_VisualInfos_n_infos, { "n_infos", "x11.struct.dbe_VisualInfos.n_infos", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_struct_dbe_VisualInfos_infos, { "infos", "x11.struct.dbe_VisualInfos.infos.list", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_struct_dbe_VisualInfos_infos_item, { "infos", "x11.struct.dbe_VisualInfos.infos", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_QueryVersion_major_version, { "major_version", "x11.dbe.QueryVersion.major_version", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_QueryVersion_minor_version, { "minor_version", "x11.dbe.QueryVersion.minor_version", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_QueryVersion_reply_major_version, { "major_version", "x11.dbe.QueryVersion.reply.major_version", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_QueryVersion_reply_minor_version, { "minor_version", "x11.dbe.QueryVersion.reply.minor_version", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_AllocateBackBuffer_window, { "window", "x11.dbe.AllocateBackBuffer.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_AllocateBackBuffer_buffer, { "buffer", "x11.dbe.AllocateBackBuffer.buffer", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_AllocateBackBuffer_swap_action, { "swap_action", "x11.dbe.AllocateBackBuffer.swap_action", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_DeallocateBackBuffer_buffer, { "buffer", "x11.dbe.DeallocateBackBuffer.buffer", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_SwapBuffers_n_actions, { "n_actions", "x11.dbe.SwapBuffers.n_actions", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_SwapBuffers_actions, { "actions", "x11.dbe.SwapBuffers.actions.list", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_SwapBuffers_actions_item, { "actions", "x11.dbe.SwapBuffers.actions", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_GetVisualInfo_n_drawables, { "n_drawables", "x11.dbe.GetVisualInfo.n_drawables", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_GetVisualInfo_drawables, { "drawables", "x11.dbe.GetVisualInfo.drawables.list", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_GetVisualInfo_drawables_item, { "drawables", "x11.dbe.GetVisualInfo.drawables", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_GetVisualInfo_reply_n_supported_visuals, { "n_supported_visuals", "x11.dbe.GetVisualInfo.reply.n_supported_visuals", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_GetVisualInfo_reply_supported_visuals, { "supported_visuals", "x11.dbe.GetVisualInfo.reply.supported_visuals", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_GetBackBufferAttributes_buffer, { "buffer", "x11.dbe.GetBackBufferAttributes.buffer", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_GetBackBufferAttributes_reply_attributes, { "attributes", "x11.dbe.GetBackBufferAttributes.reply.attributes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dbe_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(dbe_extension_minor), 0, "minor opcode", HFILL }},
+
 { &hf_x11_dpms_GetVersion_client_major_version, { "client_major_version", "x11.dpms.GetVersion.client_major_version", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_dpms_GetVersion_client_minor_version, { "client_minor_version", "x11.dpms.GetVersion.client_minor_version", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_dpms_GetVersion_reply_server_major_version, { "server_major_version", "x11.dpms.GetVersion.reply.server_major_version", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -1857,6 +1890,8 @@
 { &hf_x11_dpms_ForceLevel_power_level, { "power_level", "x11.dpms.ForceLevel.power_level", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_dpms_DPMSMode), 0, NULL, HFILL }},
 { &hf_x11_dpms_Info_reply_power_level, { "power_level", "x11.dpms.Info.reply.power_level", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_dpms_DPMSMode), 0, NULL, HFILL }},
 { &hf_x11_dpms_Info_reply_state, { "state", "x11.dpms.Info.reply.state", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dpms_SelectInput_event_mask_mask_InfoNotify, { "InfoNotify", "x11.dpms.SelectInput.event_mask.InfoNotify", FT_BOOLEAN, 32, NULL, 1U << 0, NULL, HFILL }},
+{ &hf_x11_dpms_SelectInput_event_mask, { "event_mask", "x11.dpms.SelectInput.event_mask", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_dpms_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(dpms_extension_minor), 0, "minor opcode", HFILL }},
  
 { &hf_x11_struct_dri2_DRI2Buffer, { "dri2_DRI2Buffer", "x11.struct.dri2_DRI2Buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -2021,6 +2056,9 @@
 { &hf_x11_dri3_BuffersFromPixmap_reply_offsets, { "offsets", "x11.dri3.BuffersFromPixmap.reply.offsets.list", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_dri3_BuffersFromPixmap_reply_offsets_item, { "offsets", "x11.dri3.BuffersFromPixmap.reply.offsets", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_dri3_BuffersFromPixmap_reply_buffers, { "buffers", "x11.dri3.BuffersFromPixmap.reply.buffers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri3_SetDRMDeviceInUse_window, { "window", "x11.dri3.SetDRMDeviceInUse.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri3_SetDRMDeviceInUse_drmMajor, { "drmMajor", "x11.dri3.SetDRMDeviceInUse.drmMajor", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_dri3_SetDRMDeviceInUse_drmMinor, { "drmMinor", "x11.dri3.SetDRMDeviceInUse.drmMinor", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_dri3_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(dri3_extension_minor), 0, "minor opcode", HFILL }},
  
 { &hf_x11_ge_QueryVersion_client_major_version, { "client_major_version", "x11.ge.QueryVersion.client_major_version", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
@@ -4260,6 +4298,10 @@
 { &hf_x11_xfixes_CreatePointerBarrier_devices, { "devices", "x11.xfixes.CreatePointerBarrier.devices.list", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xfixes_CreatePointerBarrier_devices_item, { "devices", "x11.xfixes.CreatePointerBarrier.devices", FT_UINT16, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xfixes_DeletePointerBarrier_barrier, { "barrier", "x11.xfixes.DeletePointerBarrier.barrier", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xfixes_SetClientDisconnectMode_disconnect_mode_mask_Terminate, { "Terminate", "x11.xfixes.SetClientDisconnectMode.disconnect_mode.Terminate", FT_BOOLEAN, 32, NULL, 1U << 0, NULL, HFILL }},
+{ &hf_x11_xfixes_SetClientDisconnectMode_disconnect_mode, { "disconnect_mode", "x11.xfixes.SetClientDisconnectMode.disconnect_mode", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xfixes_GetClientDisconnectMode_reply_disconnect_mode_mask_Terminate, { "Terminate", "x11.xfixes.GetClientDisconnectMode.reply.disconnect_mode.Terminate", FT_BOOLEAN, 32, NULL, 1U << 0, NULL, HFILL }},
+{ &hf_x11_xfixes_GetClientDisconnectMode_reply_disconnect_mode, { "disconnect_mode", "x11.xfixes.GetClientDisconnectMode.reply.disconnect_mode", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xfixes_extension_minor, { "extension-minor", "x11.extension-minor", FT_UINT8, BASE_DEC, VALS(xfixes_extension_minor), 0, "minor opcode", HFILL }},
  
 { &hf_x11_struct_xinerama_ScreenInfo, { "xinerama_ScreenInfo", "x11.struct.xinerama_ScreenInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -4816,6 +4858,7 @@
 { &hf_x11_struct_xinput_DeviceClass_Scroll_increment, { "increment", "x11.struct.xinput_DeviceClass.Scroll.increment", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_xinput_DeviceClass_Touch_mode, { "mode", "x11.struct.xinput_DeviceClass.Touch.mode", FT_UINT8, BASE_HEX_DEC, VALS(x11_enum_xinput_TouchMode), 0, NULL, HFILL }},
 { &hf_x11_struct_xinput_DeviceClass_Touch_num_touches, { "num_touches", "x11.struct.xinput_DeviceClass.Touch.num_touches", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_struct_xinput_DeviceClass_Gesture_num_touches, { "num_touches", "x11.struct.xinput_DeviceClass.Gesture.num_touches", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_xinput_XIDeviceInfo, { "xinput_XIDeviceInfo", "x11.struct.xinput_XIDeviceInfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_struct_xinput_XIDeviceInfo_deviceid, { "deviceid", "x11.struct.xinput_XIDeviceInfo.deviceid", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }},
 { &hf_x11_struct_xinput_XIDeviceInfo_type, { "type", "x11.struct.xinput_XIDeviceInfo.type", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_DeviceType), 0, NULL, HFILL }},
@@ -5176,6 +5219,46 @@
 { &hf_x11_xinput_BarrierHit_root_y, { "root_y", "x11.xinput.BarrierHit.root_y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xinput_BarrierHit_dx, { "dx", "x11.xinput.BarrierHit.dx", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 { &hf_x11_xinput_BarrierHit_dy, { "dy", "x11.xinput.BarrierHit.dy", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_deviceid, { "deviceid", "x11.xinput.GesturePinchBegin.deviceid", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_time, { "time", "x11.xinput.GesturePinchBegin.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_Time), 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_detail, { "detail", "x11.xinput.GesturePinchBegin.detail", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_root, { "root", "x11.xinput.GesturePinchBegin.root", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_event, { "event", "x11.xinput.GesturePinchBegin.event", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_child, { "child", "x11.xinput.GesturePinchBegin.child", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_root_x, { "root_x", "x11.xinput.GesturePinchBegin.root_x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_root_y, { "root_y", "x11.xinput.GesturePinchBegin.root_y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_event_x, { "event_x", "x11.xinput.GesturePinchBegin.event_x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_event_y, { "event_y", "x11.xinput.GesturePinchBegin.event_y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_delta_x, { "delta_x", "x11.xinput.GesturePinchBegin.delta_x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_delta_y, { "delta_y", "x11.xinput.GesturePinchBegin.delta_y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_delta_unaccel_x, { "delta_unaccel_x", "x11.xinput.GesturePinchBegin.delta_unaccel_x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_delta_unaccel_y, { "delta_unaccel_y", "x11.xinput.GesturePinchBegin.delta_unaccel_y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_scale, { "scale", "x11.xinput.GesturePinchBegin.scale", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_delta_angle, { "delta_angle", "x11.xinput.GesturePinchBegin.delta_angle", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_sourceid, { "sourceid", "x11.xinput.GesturePinchBegin.sourceid", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_mods, { "mods", "x11.xinput.GesturePinchBegin.mods", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_group, { "group", "x11.xinput.GesturePinchBegin.group", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_flags_mask_GesturePinchCancelled, { "GesturePinchCancelled", "x11.xinput.GesturePinchBegin.flags.GesturePinchCancelled", FT_BOOLEAN, 32, NULL, 1U << 0, NULL, HFILL }},
+{ &hf_x11_xinput_GesturePinchBegin_flags, { "flags", "x11.xinput.GesturePinchBegin.flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_deviceid, { "deviceid", "x11.xinput.GestureSwipeBegin.deviceid", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_time, { "time", "x11.xinput.GestureSwipeBegin.time", FT_UINT32, BASE_HEX_DEC, VALS(x11_enum_xproto_Time), 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_detail, { "detail", "x11.xinput.GestureSwipeBegin.detail", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_root, { "root", "x11.xinput.GestureSwipeBegin.root", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_event, { "event", "x11.xinput.GestureSwipeBegin.event", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_child, { "child", "x11.xinput.GestureSwipeBegin.child", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_root_x, { "root_x", "x11.xinput.GestureSwipeBegin.root_x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_root_y, { "root_y", "x11.xinput.GestureSwipeBegin.root_y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_event_x, { "event_x", "x11.xinput.GestureSwipeBegin.event_x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_event_y, { "event_y", "x11.xinput.GestureSwipeBegin.event_y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_delta_x, { "delta_x", "x11.xinput.GestureSwipeBegin.delta_x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_delta_y, { "delta_y", "x11.xinput.GestureSwipeBegin.delta_y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_delta_unaccel_x, { "delta_unaccel_x", "x11.xinput.GestureSwipeBegin.delta_unaccel_x", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_delta_unaccel_y, { "delta_unaccel_y", "x11.xinput.GestureSwipeBegin.delta_unaccel_y", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_sourceid, { "sourceid", "x11.xinput.GestureSwipeBegin.sourceid", FT_UINT16, BASE_HEX_DEC, VALS(x11_enum_xinput_Device), 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_mods, { "mods", "x11.xinput.GestureSwipeBegin.mods", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_group, { "group", "x11.xinput.GestureSwipeBegin.group", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_flags_mask_GestureSwipeCancelled, { "GestureSwipeCancelled", "x11.xinput.GestureSwipeBegin.flags.GestureSwipeCancelled", FT_BOOLEAN, 32, NULL, 1U << 0, NULL, HFILL }},
+{ &hf_x11_xinput_GestureSwipeBegin_flags, { "flags", "x11.xinput.GestureSwipeBegin.flags", FT_UINT32, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xinput_SendExtensionEvent_destination, { "destination", "x11.xinput.SendExtensionEvent.destination", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 { &hf_x11_xinput_SendExtensionEvent_device_id, { "device_id", "x11.xinput.SendExtensionEvent.device_id", FT_UINT8, BASE_HEX_DEC, NULL, 0, NULL, HFILL }},
 { &hf_x11_xinput_SendExtensionEvent_propagate, { "propagate", "x11.xinput.SendExtensionEvent.propagate", FT_BOOLEAN, BASE_NONE, NULL, 0, NULL, HFILL }},
--- a/packaging/macosx/ChmodBPF/install-scripts/postinstall
+++ b/packaging/macosx/ChmodBPF/install-scripts/postinstall
@@ -33,4 +33,9 @@ chown root:wheel "$CHMOD_BPF_PLIST"
 # Clean up our legacy startup item if it's still around.
 rm -rf /Library/StartupItems/ChmodBPF

+# Try to bootout first, otherwise bootstrap will fail with
+#   "Bootstrap failed: 5: Input/output error"
+# if org.wireshark.ChmodBPF is already loaded.
+launchctl bootout system "$CHMOD_BPF_PLIST" > /dev/null 2>&1
+
 launchctl bootstrap system "$CHMOD_BPF_PLIST"
--- a/plugins/epan/falco_bridge/packet-falco-bridge.c
+++ b/plugins/epan/falco_bridge/packet-falco-bridge.c
@@ -779,7 +779,7 @@ dissect_sinsp_enriched(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, void
    const char* io_buffer = NULL;
    uint32_t io_buffer_len = 0;

-    const char *container_id = "<host>";
+    const char *container_id = "host";
    const char *proc_name = NULL;
    const char *fd_name = NULL;

@@ -1141,6 +1141,8 @@ const char *st_str_container_total_io = "Total";
 static void container_io_stats_tree_init(stats_tree* st _U_)
 {
    stats_tree_create_node(st, st_str_container_total_io, 0, STAT_DT_INT, TRUE);
+    stat_node_set_flags(st, st_str_container_total_io, 0, FALSE, ST_FLG_SORT_TOP);
+
 }

 static tap_packet_status container_io_stats_tree_event(stats_tree* st, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* tap_info_p, tap_flags_t flags _U_)

--- a/tools/check_spelling.py
+++ b/tools/check_spelling.py
@@ -11,6 +11,7 @@ import re
 import subprocess
 import argparse
 import signal
+import glob
 from collections import Counter

 # Looks for spelling errors among strings found in source or documentation files.
@@ -427,8 +428,10 @@ def checkFile(filename, check_comments=False):
 parser = argparse.ArgumentParser(description='Check spellings in specified files')
 parser.add_argument('--file', action='append',
                    help='specify individual file to test')
-parser.add_argument('--folder', action='store', default='',
+parser.add_argument('--folder', action='append',
                    help='specify folder to test')
+parser.add_argument('--glob', action='store', default='',
+                    help='specify glob to test - should give in "quotes"')
 parser.add_argument('--no-recurse', action='store_true', default='',
                    help='do not recurse inside chosen folder')
 parser.add_argument('--commits', action='store',
@@ -452,14 +455,15 @@ if args.file:
            exit(1)
        else:
            files.append(f)
-elif args.commits:
+if args.commits:
    # Get files affected by specified number of commits.
    command = ['git', 'diff', '--name-only', 'HEAD~' + args.commits]
    files = [f.decode('utf-8')
             for f in subprocess.check_output(command).splitlines()]
    # Filter files
    files = list(filter(lambda f : os.path.exists(f) and isAppropriateFile(f) and not isGeneratedFile(f), files))
-elif args.open:
+
+if args.open:
    # Unstaged changes.
    command = ['git', 'diff', '--name-only']
    files = [f.decode('utf-8')
@@ -475,24 +479,39 @@ elif args.open:
    for f in files_staged:
        if not f in files:
            files.append(f)
-else:
-    # By default, scan dissectors directory
-    folder = os.path.join('epan', 'dissectors')
-    # But overwrite with any folder entry.
-    if args.folder:
-        folder = args.folder
+
+if args.glob:
+    # Add specified file(s)
+    for f in glob.glob(args.glob):
+        if not os.path.isfile(f):
+            print('Chosen file', f, 'does not exist.')
+            exit(1)
+        else:
+            files.append(f)
+
+if args.folder:
+    for folder in args.folder:
        if not os.path.isdir(folder):
            print('Folder', folder, 'not found!')
            exit(1)

+        # Find files from folder.
+        print('Looking for files in', folder)
+        files += findFilesInFolder(folder, not args.no_recurse)
+
+# By default, scan dissector files.
+if not args.file and not args.open and not args.commits and not args.glob and not args.folder:
+    # By default, scan dissectors directory
+    folder = os.path.join('epan', 'dissectors')
    # Find files from folder.
    print('Looking for files in', folder)
    files = findFilesInFolder(folder, not args.no_recurse)


+
 # If scanning a subset of files, list them here.
 print('Examining:')
-if args.file or args.folder or args.commits or args.open:
+if args.file or args.folder or args.commits or args.open or args.glob:
    if files:
        print(' '.join(files), '\n')
    else:

--- a/tools/process-x11-xcb.pl
+++ b/tools/process-x11-xcb.pl
@@ -124,6 +124,7 @@ my %struct =  # Not reset; contains structures already defined.
    'xinput:ButtonClass' => 1,
    'xinput:KeyClass' => 1,
    'xinput:ScrollClass' => 1,
+    'xinput:GestureClass' => 1,
    'xinput:TouchClass' => 1,
    'xinput:ValuatorClass' => 1,

@@ -804,7 +805,7 @@ sub dissect_element($$$$$;$$)
                    }
                    my $bitmask_field = $fieldname . "_bits";
                    say $impl $indent."{";
-                    say $impl $indent."    int* const $bitmask_field [] = {";
+                    say $impl $indent."    static int* const $bitmask_field [] = {";
                    my $bit = $enum{$enum_name{$e->att('mask')}}{bit};
                    for my $val (sort { $a <=> $b } keys %$bit) {
                        my $item = $regname . '_mask_' . $$bit{$val};
@@ -1650,7 +1651,7 @@ sub xcb_start {
    %enum_name = ();
    %type_name = ();

-    print $error "const char *$header"."_errors[] = {\n";
+    print $error "static const char *$header"."_errors[] = {\n";
 }

 sub xcb {
@@ -1672,7 +1673,7 @@ sub xcb {
    print $impl "    { 0, NULL }\n";
    print $impl "};\n";

-    say $impl "const x11_event_info $event_name".'[] = {';
+    say $impl "static const x11_event_info $event_name".'[] = {';
    foreach my $e (sort {$a <=> $b} keys %event) {
        say $impl "    { \"$header-$event{$e}\", $header$event{$e} },";
    }

--- a/wiretap/busmaster.c
+++ b/wiretap/busmaster.c
@@ -75,7 +75,7 @@ busmaster_gen_packet(wtap_rec               *rec, Buffer *buf,
    {
        canfd_frame_t canfd_frame = {0};

-        canfd_frame.can_id = g_ntohl((msg->id & (is_eff ? CAN_EFF_MASK : CAN_SFF_MASK)) |
+        canfd_frame.can_id = g_htonl((msg->id & (is_eff ? CAN_EFF_MASK : CAN_SFF_MASK)) |
            (is_eff ? CAN_EFF_FLAG : 0) |
            (is_err ? CAN_ERR_FLAG : 0));
        canfd_frame.flags  = CANFD_FDF;
@@ -93,7 +93,7 @@ busmaster_gen_packet(wtap_rec               *rec, Buffer *buf,
    {
        can_frame_t can_frame = {0};

-        can_frame.can_id  = g_ntohl((msg->id & (is_eff ? CAN_EFF_MASK : CAN_SFF_MASK)) |
+        can_frame.can_id  = g_htonl((msg->id & (is_eff ? CAN_EFF_MASK : CAN_SFF_MASK)) |
            (is_rtr ? CAN_RTR_FLAG : 0) |
            (is_eff ? CAN_EFF_FLAG : 0) |
            (is_err ? CAN_ERR_FLAG : 0));
No results found