From 92ad156496fac6d018c25c4aeed02f5233eaad9c Mon Sep 17 00:00:00 2001
From: Mattias Wadman <mattias.wadman@gmail.com>
Date: Sun, 16 Jun 2024 22:36:57 +0200
Subject: [PATCH] pyrdp: Reorganize pdu consts a bit

---
 format/pyrdp/pdu/clipboard_data.go | 68 +++++++++++++++---------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/format/pyrdp/pdu/clipboard_data.go b/format/pyrdp/pdu/clipboard_data.go
index 076d4c8f..8ef64993 100644
--- a/format/pyrdp/pdu/clipboard_data.go
+++ b/format/pyrdp/pdu/clipboard_data.go
@@ -10,48 +10,50 @@ import (
 
 const (
 	// Message types.
-	CB_MONITOR_READY         = 0x0001
-	CB_FORMAT_LIST           = 0x0002
-	CB_FORMAT_LIST_RESPONSE  = 0x0003
-	CB_FORMAT_DATA_REQUEST   = 0x0004
-	CB_FORMAT_DATA_RESPONSE  = 0x0005
-	CB_TEMP_DIRECTORY        = 0x0006
-	CB_CLIP_CAPS             = 0x0007
-	CB_FILECONTENTS_REQUEST  = 0x0008
-	CB_FILECONTENTS_RESPONSE = 0x0009
-	CB_LOCK_CLIPDATA         = 0x000a
-	CB_UNLOCK_CLIPDATA       = 0x000b
-
-	// Message flags.
-	NONE             = 0
-	CB_RESPONSE_OK   = 0x0001
-	CB_RESPONSE_FAIL = 0x0002
-	CB_ASCII_NAMES   = 0x0004
+	CB_TYPE_MONITOR_READY         = 0x0001
+	CB_TYPE_FORMAT_LIST           = 0x0002
+	CB_TYPE_FORMAT_LIST_RESPONSE  = 0x0003
+	CB_TYPE_FORMAT_DATA_REQUEST   = 0x0004
+	CB_TYPE_FORMAT_DATA_RESPONSE  = 0x0005
+	CB_TYPE_TEMP_DIRECTORY        = 0x0006
+	CB_TYPE_CLIP_CAPS             = 0x0007
+	CB_TYPE_FILECONTENTS_REQUEST  = 0x0008
+	CB_TYPE_FILECONTENTS_RESPONSE = 0x0009
+	CB_TYPE_LOCK_CLIPDATA         = 0x000a
+	CB_TYPE_UNLOCK_CLIPDATA       = 0x000b
 )
 
 var cbTypesMap = scalar.UintMapSymStr{
-	CB_MONITOR_READY:         "monitor_ready",
-	CB_FORMAT_LIST:           "format_list",
-	CB_FORMAT_LIST_RESPONSE:  "format_list_response",
-	CB_FORMAT_DATA_REQUEST:   "format_data_request",
-	CB_FORMAT_DATA_RESPONSE:  "format_data_response",
-	CB_TEMP_DIRECTORY:        "temp_directory",
-	CB_CLIP_CAPS:             "clip_caps",
-	CB_FILECONTENTS_REQUEST:  "filecontents_request",
-	CB_FILECONTENTS_RESPONSE: "filecontents_response",
-	CB_LOCK_CLIPDATA:         "lock_clipdata",
-	CB_UNLOCK_CLIPDATA:       "unlock_clipdata",
+	CB_TYPE_MONITOR_READY:         "monitor_ready",
+	CB_TYPE_FORMAT_LIST:           "format_list",
+	CB_TYPE_FORMAT_LIST_RESPONSE:  "format_list_response",
+	CB_TYPE_FORMAT_DATA_REQUEST:   "format_data_request",
+	CB_TYPE_FORMAT_DATA_RESPONSE:  "format_data_response",
+	CB_TYPE_TEMP_DIRECTORY:        "temp_directory",
+	CB_TYPE_CLIP_CAPS:             "clip_caps",
+	CB_TYPE_FILECONTENTS_REQUEST:  "filecontents_request",
+	CB_TYPE_FILECONTENTS_RESPONSE: "filecontents_response",
+	CB_TYPE_LOCK_CLIPDATA:         "lock_clipdata",
+	CB_TYPE_UNLOCK_CLIPDATA:       "unlock_clipdata",
 }
 
+const (
+	// Message flags.
+	CB_FLAG_NONE          = 0
+	CB_FLAG_RESPONSE_OK   = 0x0001
+	CB_FLAG_RESPONSE_FAIL = 0x0002
+	CB_FLAG_ASCII_NAMES   = 0x0004
+)
+
 var cbFlagsMap = scalar.UintMapSymStr{
-	NONE:             "none",
-	CB_RESPONSE_OK:   "response_ok",
-	CB_RESPONSE_FAIL: "response_fail",
-	CB_ASCII_NAMES:   "ascii_names",
+	CB_FLAG_NONE:          "none",
+	CB_FLAG_RESPONSE_OK:   "response_ok",
+	CB_FLAG_RESPONSE_FAIL: "response_fail",
+	CB_FLAG_ASCII_NAMES:   "ascii_names",
 }
 
 var cbParseFnMap = map[uint16]interface{}{
-	CB_FORMAT_DATA_RESPONSE: parseCbFormatDataResponse,
+	CB_TYPE_FORMAT_DATA_RESPONSE: parseCbFormatDataResponse,
 }
 
 func parseClipboardData(d *decode.D, length int64) {