From 4e440038326590537eeceeaf0e43cb71dc84c36d Mon Sep 17 00:00:00 2001
From: Armin Novak <armin.novak@thincast.com>
Date: Tue, 7 Sep 2021 08:03:42 +0200
Subject: [PATCH] Expose dynamic channel PDU types

---
 channels/drdynvc/client/drdynvc_main.h           | 6 ------
 include/freerdp/channels/drdynvc.h               | 9 +++++++++
 include/freerdp/server/proxy/proxy_modules_api.h | 3 +--
 libfreerdp/core/server.h                         | 6 ------
 server/proxy/pf_client.c                         | 2 +-
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/channels/drdynvc/client/drdynvc_main.h b/channels/drdynvc/client/drdynvc_main.h
index 49cf3bd20..a80e30f81 100644
--- a/channels/drdynvc/client/drdynvc_main.h
+++ b/channels/drdynvc/client/drdynvc_main.h
@@ -101,12 +101,6 @@ enum _DRDYNVC_STATE
 };
 typedef enum _DRDYNVC_STATE DRDYNVC_STATE;
 
-#define CREATE_REQUEST_PDU 0x01
-#define DATA_FIRST_PDU 0x02
-#define DATA_PDU 0x03
-#define CLOSE_REQUEST_PDU 0x04
-#define CAPABILITY_REQUEST_PDU 0x05
-
 struct drdynvc_plugin
 {
 	CHANNEL_DEF channelDef;
diff --git a/include/freerdp/channels/drdynvc.h b/include/freerdp/channels/drdynvc.h
index cf24746af..1746c1fab 100644
--- a/include/freerdp/channels/drdynvc.h
+++ b/include/freerdp/channels/drdynvc.h
@@ -27,4 +27,13 @@
 
 #define DRDYNVC_SVC_CHANNEL_NAME "drdynvc"
 
+typedef enum
+{
+	CREATE_REQUEST_PDU = 0x01,
+	DATA_FIRST_PDU = 0x02,
+	DATA_PDU = 0x03,
+	CLOSE_REQUEST_PDU = 0x04,
+	CAPABILITY_REQUEST_PDU = 0x05
+} DynamicChannelPDU;
+
 #endif /* FREERDP_CHANNEL_DRDYNVC_H */
diff --git a/include/freerdp/server/proxy/proxy_modules_api.h b/include/freerdp/server/proxy/proxy_modules_api.h
index 556034f2c..ea2fcceaf 100644
--- a/include/freerdp/server/proxy/proxy_modules_api.h
+++ b/include/freerdp/server/proxy/proxy_modules_api.h
@@ -111,8 +111,7 @@ struct proxy_plugin
 struct proxy_plugins_manager
 {
 	/* 0 used for registering a fresh new proxy plugin. */
-	BOOL(*RegisterPlugin)
-	(struct proxy_plugins_manager* mgr, const proxyPlugin* plugin);
+	BOOL (*RegisterPlugin)(struct proxy_plugins_manager* mgr, const proxyPlugin* plugin);
 
 	/* 1 used for setting plugin's per-session info. */
 	BOOL (*SetPluginData)(struct proxy_plugins_manager* mgr, const char*, proxyData*, void*);
diff --git a/libfreerdp/core/server.h b/libfreerdp/core/server.h
index 3e2552ee3..e49783d0d 100644
--- a/libfreerdp/core/server.h
+++ b/libfreerdp/core/server.h
@@ -35,12 +35,6 @@ typedef struct WTSVirtualChannelManager WTSVirtualChannelManager;
 #include "rdp.h"
 #include "mcs.h"
 
-#define CREATE_REQUEST_PDU 0x01
-#define DATA_FIRST_PDU 0x02
-#define DATA_PDU 0x03
-#define CLOSE_REQUEST_PDU 0x04
-#define CAPABILITY_REQUEST_PDU 0x05
-
 enum
 {
 	RDP_PEER_CHANNEL_TYPE_SVC = 0,
diff --git a/server/proxy/pf_client.c b/server/proxy/pf_client.c
index 30037140d..e51cb8033 100644
--- a/server/proxy/pf_client.c
+++ b/server/proxy/pf_client.c
@@ -328,7 +328,7 @@ static BOOL pf_client_receive_channel_data_hook(freerdp* instance, UINT16 channe
 					return FALSE;
 
 				cmd = data[0] >> 4;
-				if (cmd == 0x01)
+				if (cmd == CREATE_REQUEST_PDU)
 				{
 					proxyChannelDataEventInfo dev;
 					size_t len, nameLen;