pyrdp: Less symbol stuttering

wader · Jun 14, 2024 · 9874077 · 9874077
1 parent 3966035
commit 9874077
Show file tree

Hide file tree

Showing 4 changed files with 430 additions and 430 deletions.
diff --git a/format/pyrdp/pdu/client_data.go b/format/pyrdp/pdu/client_data.go
@@ -25,19 +25,19 @@ const (
 )
 
 var RDPVersionMap = scalar.UintMapSymStr{
-	RDP4:     "rdp4",
-	RDP5:     "rdp5",
-	RDP10:    "rdp10",
-	RDP10_1:  "rdp10_1",
-	RDP10_2:  "rdp10_2",
-	RDP10_3:  "rdp10_3",
-	RDP10_4:  "rdp10_4",
-	RDP10_5:  "rdp10_5",
-	RDP10_6:  "rdp10_6",
-	RDP10_7:  "rdp10_7",
-	RDP10_8:  "rdp10_8",
-	RDP10_9:  "rdp10_9",
-	RDP10_10: "rdp10_10",
+	RDP4:     "4",
+	RDP5:     "5",
+	RDP10:    "10",
+	RDP10_1:  "10_1",
+	RDP10_2:  "10_2",
+	RDP10_3:  "10_3",
+	RDP10_4:  "10_4",
+	RDP10_5:  "10_5",
+	RDP10_6:  "10_6",
+	RDP10_7:  "10_7",
+	RDP10_8:  "10_8",
+	RDP10_9:  "10_9",
+	RDP10_10: "10_10",
 }
 
 const (
@@ -48,10 +48,10 @@ const (
 )
 
 var clientDataMap = scalar.UintMapSymStr{
-	CLIENT_CORE:     "client_core",
-	CLIENT_SECURITY: "client_security",
-	CLIENT_NETWORK:  "client_network",
-	CLIENT_CLUSTER:  "client_cluster",
+	CLIENT_CORE:     "core",
+	CLIENT_SECURITY: "security",
+	CLIENT_NETWORK:  "network",
+	CLIENT_CLUSTER:  "cluster",
 }
 
 func ParseClientData(d *decode.D, length int64) {

diff --git a/format/pyrdp/pdu/clipboard_data.go b/format/pyrdp/pdu/clipboard_data.go
@@ -30,24 +30,24 @@ const (
 )
 
 var cbTypesMap = scalar.UintMapSymStr{
-	CB_MONITOR_READY:         "cb_monitor_ready",
-	CB_FORMAT_LIST:           "cb_format_list",
-	CB_FORMAT_LIST_RESPONSE:  "cb_format_list_response",
-	CB_FORMAT_DATA_REQUEST:   "cb_format_data_request",
-	CB_FORMAT_DATA_RESPONSE:  "cb_format_data_response",
-	CB_TEMP_DIRECTORY:        "cb_temp_directory",
-	CB_CLIP_CAPS:             "cb_clip_caps",
-	CB_FILECONTENTS_REQUEST:  "cb_filecontents_request",
-	CB_FILECONTENTS_RESPONSE: "cb_filecontents_response",
-	CB_LOCK_CLIPDATA:         "cb_lock_clipdata",
-	CB_UNLOCK_CLIPDATA:       "cb_unlock_clipdata",
+	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",
 }
 
 var cbFlagsMap = scalar.UintMapSymStr{
 	NONE:             "none",
-	CB_RESPONSE_OK:   "cb_response_ok",
-	CB_RESPONSE_FAIL: "cb_response_fail",
-	CB_ASCII_NAMES:   "cb_ascii_names",
+	CB_RESPONSE_OK:   "response_ok",
+	CB_RESPONSE_FAIL: "response_fail",
+	CB_ASCII_NAMES:   "ascii_names",
 }
 
 var cbParseFnMap = map[uint16]interface{}{

diff --git a/format/pyrdp/pyrdp.go b/format/pyrdp/pyrdp.go
@@ -60,26 +60,26 @@ const (
 )
 
 var pduTypesMap = scalar.UintMapSymStr{
-	PDU_FAST_PATH_INPUT:            "pdu_fastpath_input",
-	PDU_FAST_PATH_OUTPUT:           "pdu_fastpath_output",
-	PDU_CLIENT_INFO:                "pdu_client_info",
-	PDU_SLOW_PATH_PDU:              "pdu_slow_path_pdu",
-	PDU_CONNECTION_CLOSE:           "pdu_connection_close",
-	PDU_CLIPBOARD_DATA:             "pdu_clipboard_data",
-	PDU_CLIENT_DATA:                "pdu_client_data",
-	PDU_MOUSE_MOVE:                 "pdu_mouse_move",
-	PDU_MOUSE_BUTTON:               "pdu_mouse_button",
-	PDU_MOUSE_WHEEL:                "pdu_mouse_wheel",
-	PDU_KEYBOARD:                   "pdu_keyboard",
-	PDU_TEXT:                       "pdu_text",
-	PDU_FORWARDING_STATE:           "pdu_forwarding_state",
-	PDU_BITMAP:                     "pdu_bitmap",
-	PDU_DEVICE_MAPPING:             "pdu_device_mapping",
-	PDU_DIRECTORY_LISTING_REQUEST:  "pdu_directory_listing_request",
-	PDU_DIRECTORY_LISTING_RESPONSE: "pdu_directory_listing_response",
-	PDU_FILE_DOWNLOAD_REQUEST:      "pdu_file_download_request",
-	PDU_FILE_DOWNLOAD_RESPONSE:     "pdu_file_download_response",
-	PDU_FILE_DOWNLOAD_COMPLETE:     "pdu_file_download_complete",
+	PDU_FAST_PATH_INPUT:            "fastpath_input",
+	PDU_FAST_PATH_OUTPUT:           "fastpath_output",
+	PDU_CLIENT_INFO:                "client_info",
+	PDU_SLOW_PATH_PDU:              "slow_path_pdu",
+	PDU_CONNECTION_CLOSE:           "connection_close",
+	PDU_CLIPBOARD_DATA:             "clipboard_data",
+	PDU_CLIENT_DATA:                "client_data",
+	PDU_MOUSE_MOVE:                 "mouse_move",
+	PDU_MOUSE_BUTTON:               "mouse_button",
+	PDU_MOUSE_WHEEL:                "mouse_wheel",
+	PDU_KEYBOARD:                   "keyboard",
+	PDU_TEXT:                       "text",
+	PDU_FORWARDING_STATE:           "forwarding_state",
+	PDU_BITMAP:                     "bitmap",
+	PDU_DEVICE_MAPPING:             "device_mapping",
+	PDU_DIRECTORY_LISTING_REQUEST:  "directory_listing_request",
+	PDU_DIRECTORY_LISTING_RESPONSE: "directory_listing_response",
+	PDU_FILE_DOWNLOAD_REQUEST:      "file_download_request",
+	PDU_FILE_DOWNLOAD_RESPONSE:     "file_download_response",
+	PDU_FILE_DOWNLOAD_COMPLETE:     "file_download_complete",
 }
 
 var pduParsersMap = map[uint16]interface{}{