o added support for dynamic virtual channels

o added echo test routine in simple.c for testing DVC using Microsoft's ECHO protocol

1 files changed, 46 insertions, 28 deletions

diff --git a/sesman/chansrv/chansrv.h b/sesman/chansrv/chansrv.h
index ba593461..78efe29a 100644
--- a/sesman/chansrv/chansrv.h
+++ b/sesman/chansrv/chansrv.h
@@ -2,6 +2,7 @@
  * xrdp: A Remote Desktop Protocol server.
  *
  * Copyright (C) Jay Sorg 2009-2012
+ * Copyright (C) Laxmikant Rashinkar 2009-2012
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,60 +20,77 @@
 #if !defined(CHANSRV_H)
 #define CHANSRV_H
 
+#include <stdint.h>
 #include "arch.h"
 #include "parse.h"
 #include "log.h"
 
+#define MAX_DVC_CHANNELS 32
+
 struct chan_out_data
 {
-  struct stream* s;
-  struct chan_out_data* next;
+    struct stream *s;
+    struct chan_out_data *next;
 };
 
 struct chan_item
 {
-  int id;
-  int flags;
-  char name[16];
-  struct chan_out_data* head;
-  struct chan_out_data* tail;
+    int id;
+    int flags;
+    char name[16];
+    struct chan_out_data *head;
+    struct chan_out_data *tail;
+};
+
+/* data in struct trans::callback_data */
+struct xrdp_api_data
+{
+    int  chan_id;
+    char header[64];
+    int  flags;
+
+    /* for dynamic virtual channels */
+    struct trans *transp;
+    uint32_t      dvc_chan_id;
+    int           is_connected;
 };
 
-int APP_CC
-send_channel_data(int chan_id, char* data, int size);
-int APP_CC
-main_cleanup(void);
+int APP_CC send_channel_data(int chan_id, char *data, int size);
+int APP_CC main_cleanup(void);
+int APP_CC find_empty_slot_in_dvc_channels();
+struct xrdp_api_data *APP_CC struct_from_dvc_chan_id(uint32_t dvc_chan_id);
+int remove_struct_with_chan_id(uint32_t dvc_chan_id);
 
 #define LOG_LEVEL 5
 
 #define LOG(_a, _params) \
-{ \
-  if (_a < LOG_LEVEL) \
-  { \
-    g_write("xrdp-chansrv [%10.10u]: ", g_time3()); \
-    g_writeln _params ; \
-  } \
-}
+    { \
+        if (_a < LOG_LEVEL) \
+        { \
+            g_write("xrdp-chansrv [%10.10u]: ", g_time3()); \
+            g_writeln _params ; \
+        } \
+    }
 
 #define LOGM(_args) do { log_message _args ; } while (0)
 
 #ifndef GSET_UINT8
 #define GSET_UINT8(_ptr, _offset, _data) \
-  *((unsigned char*) (((unsigned char*)(_ptr)) + (_offset))) = (unsigned char)(_data)
+    *((unsigned char*) (((unsigned char*)(_ptr)) + (_offset))) = (unsigned char)(_data)
 #define GGET_UINT8(_ptr, _offset) \
-  (*((unsigned char*) (((unsigned char*)(_ptr)) + (_offset))))
+    (*((unsigned char*) (((unsigned char*)(_ptr)) + (_offset))))
 #define GSET_UINT16(_ptr, _offset, _data) \
-  GSET_UINT8(_ptr, _offset, _data); \
-  GSET_UINT8(_ptr, (_offset) + 1, (_data) >> 8)
+    GSET_UINT8(_ptr, _offset, _data); \
+    GSET_UINT8(_ptr, (_offset) + 1, (_data) >> 8)
 #define GGET_UINT16(_ptr, _offset) \
-  (GGET_UINT8(_ptr, _offset)) | \
-  ((GGET_UINT8(_ptr, (_offset) + 1)) << 8)
+    (GGET_UINT8(_ptr, _offset)) | \
+    ((GGET_UINT8(_ptr, (_offset) + 1)) << 8)
 #define GSET_UINT32(_ptr, _offset, _data) \
-  GSET_UINT16(_ptr, _offset, _data); \
-  GSET_UINT16(_ptr, (_offset) + 2, (_data) >> 16)
+    GSET_UINT16(_ptr, _offset, _data); \
+    GSET_UINT16(_ptr, (_offset) + 2, (_data) >> 16)
 #define GGET_UINT32(_ptr, _offset) \
-  (GGET_UINT16(_ptr, _offset)) | \
-  ((GGET_UINT16(_ptr, (_offset) + 2)) << 16)
+    (GGET_UINT16(_ptr, _offset)) | \
+    ((GGET_UINT16(_ptr, (_offset) + 2)) << 16)
 #endif
 
 #endif