From 4f8a3120a8c034fd138f91dd9669253b7d60ca44 Mon Sep 17 00:00:00 2001 From: Olivier Bilodeau Date: Thu, 13 Jun 2024 15:14:55 -0400 Subject: [PATCH] refactor: package name aligned with directory name --- format/pyrdp/pdu/client_data.go | 2 +- format/pyrdp/pdu/client_info.go | 2 +- format/pyrdp/pdu/clipboard_data.go | 2 +- format/pyrdp/pdu/fastpath_input.go | 2 +- format/pyrdp/pdu/util.go | 2 +- format/pyrdp/pyrdp.go | 40 +++++++++++++++--------------- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/format/pyrdp/pdu/client_data.go b/format/pyrdp/pdu/client_data.go index a5d2a7c4..c1eda86a 100644 --- a/format/pyrdp/pdu/client_data.go +++ b/format/pyrdp/pdu/client_data.go @@ -1,7 +1,7 @@ // Copyright (c) 2022-2023 GoSecure Inc. // Copyright (c) 2024 Flare Systems // Licensed under the MIT License -package pyrdp +package pdu import ( "github.com/wader/fq/pkg/decode" diff --git a/format/pyrdp/pdu/client_info.go b/format/pyrdp/pdu/client_info.go index b53fe254..38e78b0b 100644 --- a/format/pyrdp/pdu/client_info.go +++ b/format/pyrdp/pdu/client_info.go @@ -1,7 +1,7 @@ // Copyright (c) 2022-2023 GoSecure Inc. // Copyright (c) 2024 Flare Systems // Licensed under the MIT License -package pyrdp +package pdu import ( "github.com/wader/fq/pkg/decode" diff --git a/format/pyrdp/pdu/clipboard_data.go b/format/pyrdp/pdu/clipboard_data.go index 088568f1..f40d0a35 100644 --- a/format/pyrdp/pdu/clipboard_data.go +++ b/format/pyrdp/pdu/clipboard_data.go @@ -1,7 +1,7 @@ // Copyright (c) 2022-2023 GoSecure Inc. // Copyright (c) 2024 Flare Systems // Licensed under the MIT License -package pyrdp +package pdu import ( "github.com/wader/fq/pkg/decode" diff --git a/format/pyrdp/pdu/fastpath_input.go b/format/pyrdp/pdu/fastpath_input.go index 3e50f36f..a557553a 100644 --- a/format/pyrdp/pdu/fastpath_input.go +++ b/format/pyrdp/pdu/fastpath_input.go @@ -1,7 +1,7 @@ // Copyright (c) 2022-2023 GoSecure Inc. // Copyright (c) 2024 Flare Systems // Licensed under the MIT License -package pyrdp +package pdu import ( "github.com/wader/fq/pkg/decode" diff --git a/format/pyrdp/pdu/util.go b/format/pyrdp/pdu/util.go index 095a94ff..70e5f628 100644 --- a/format/pyrdp/pdu/util.go +++ b/format/pyrdp/pdu/util.go @@ -1,6 +1,6 @@ // Copyright (c) 2022-2023 GoSecure Inc. // Licensed under the MIT License -package pyrdp +package pdu import ( "fmt" diff --git a/format/pyrdp/pyrdp.go b/format/pyrdp/pyrdp.go index da5c115e..4299a880 100644 --- a/format/pyrdp/pyrdp.go +++ b/format/pyrdp/pyrdp.go @@ -13,7 +13,7 @@ import ( "time" "github.com/wader/fq/format" - pyrdp "github.com/wader/fq/format/pyrdp/pdu" + pyrdp_pdu "github.com/wader/fq/format/pyrdp/pdu" "github.com/wader/fq/pkg/decode" "github.com/wader/fq/pkg/interp" "github.com/wader/fq/pkg/scalar" @@ -69,26 +69,26 @@ var pduTypesMap = scalar.UintMapSymStr{ } var pduParsersMap = map[uint16]interface{}{ - PDU_FAST_PATH_INPUT: pyrdp.ParseFastPathInput, - // PDU_FAST_PATH_OUTPUT: pyrdp.ParseFastPathOut, - PDU_CLIENT_INFO: pyrdp.ParseClientInfo, - // PDU_SLOW_PATH_PDU: pyrdp.ParseSlowPathPDU, + PDU_FAST_PATH_INPUT: pyrdp_pdu.ParseFastPathInput, + // PDU_FAST_PATH_OUTPUT: pyrdp_pdu.ParseFastPathOut, + PDU_CLIENT_INFO: pyrdp_pdu.ParseClientInfo, + // PDU_SLOW_PATH_PDU: pyrdp_pdu.ParseSlowPathPDU, PDU_CONNECTION_CLOSE: noParse, - PDU_CLIPBOARD_DATA: pyrdp.ParseClipboardData, - PDU_CLIENT_DATA: pyrdp.ParseClientData, - // PDU_MOUSE_MOVE: pyrdp.ParseMouseMove, - // PDU_MOUSE_BUTTON: pyrdp.ParseMouseButton, - // PDU_MOUSE_WHEEL: pyrdp.ParseMouseWheel, - // PDU_KEYBOARD: pyrdp.ParseKeyboard, - // PDU_TEXT: pyrdp.ParseText, - // PDU_FORWARDING_STATE: pyrdp.ParseForwardingState, - // PDU_BITMAP: pyrdp.ParseBitmap, - // PDU_DEVICE_MAPPING: pyrdp.ParseDeviceMapping, - // PDU_DIRECTORY_LISTING_REQUEST: pyrdp.ParseDirectoryListingRequest, - // PDU_DIRECTORY_LISTING_RESPONSE: pyrdp.ParseDirectoryListingResponse, - // PDU_FILE_DOWNLOAD_REQUEST: pyrdp.ParseFileDownloadRequest, - // PDU_FILE_DOWNLOAD_RESPONSE: pyrdp.ParseFileDownloadResponse, - // PDU_FILE_DOWNLOAD_COMPLETE: pyrdp.ParseFileDownloadComplete, + PDU_CLIPBOARD_DATA: pyrdp_pdu.ParseClipboardData, + PDU_CLIENT_DATA: pyrdp_pdu.ParseClientData, + // PDU_MOUSE_MOVE: pyrdp_pdu.ParseMouseMove, + // PDU_MOUSE_BUTTON: pyrdp_pdu.ParseMouseButton, + // PDU_MOUSE_WHEEL: pyrdp_pdu.ParseMouseWheel, + // PDU_KEYBOARD: pyrdp_pdu.ParseKeyboard, + // PDU_TEXT: pyrdp_pdu.ParseText, + // PDU_FORWARDING_STATE: pyrdp_pdu.ParseForwardingState, + // PDU_BITMAP: pyrdp_pdu.ParseBitmap, + // PDU_DEVICE_MAPPING: pyrdp_pdu.ParseDeviceMapping, + // PDU_DIRECTORY_LISTING_REQUEST: pyrdp_pdu.ParseDirectoryListingRequest, + // PDU_DIRECTORY_LISTING_RESPONSE: pyrdp_pdu.ParseDirectoryListingResponse, + // PDU_FILE_DOWNLOAD_REQUEST: pyrdp_pdu.ParseFileDownloadRequest, + // PDU_FILE_DOWNLOAD_RESPONSE: pyrdp_pdu.ParseFileDownloadResponse, + // PDU_FILE_DOWNLOAD_COMPLETE: pyrdp_pdu.ParseFileDownloadComplete, } func init() {