work on freerdp

Makefile.am

@@ -5,6 +5,7 @@ SUBDIRS = \
   rdp \
   xup \
   mc \
+  freerdp \
   libxrdp \
   xrdp \
   sesman \

configure.ac

@@ -58,6 +58,7 @@ AC_CONFIG_FILES([Makefile
                  libxrdp/Makefile
                  xup/Makefile
                  mc/Makefile
+                 freerdp/Makefile
                  xrdp/Makefile
                  sesman/Makefile
                  sesman/libscp/Makefile

freerdp/Makefile.am

@@ -0,0 +1,18 @@
+
+AM_CFLAGS = \
+  -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
+  -DXRDP_SBIN_PATH=\"${sbindir}\" \
+  -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \
+  -DXRDP_PID_PATH=\"${localstatedir}/run\"
+
+INCLUDES = \
+  -I$(top_srcdir)/common \
+  -I$(top_srcdir)/../freerdp/include/freerdp
+
+lib_LTLIBRARIES = \
+  libxrdpfreerdp.la
+
+libxrdpfreerdp_la_SOURCES = xrdp-freerdp.c
+
+libxrdpfreerdp_la_LIBADD = \
+  $(top_srcdir)/common/libcommon.la

freerdp/xrdp-freerdp.h

@@ -26,6 +26,9 @@
 #include "os_calls.h"
 #include "defines.h"
 
+/* this is the freerdp main header */
+#include "freerdp.h"
+
 #define CURRENT_MOD_VER 2
 
 struct mod
@@ -82,7 +85,7 @@ struct mod
   int (*server_send_to_channel)(struct mod* v, int channel_id,
                                 char* data, int data_len,
                                 int total_data_len, int flags);
-  int (*server_bell_trigger)(struct vnc* v);
+  int (*server_bell_trigger)(struct mod* v);
   long server_dumby[100 - 25]; /* align, 100 minus the number of server
                                   functions above */
   /* common */

mc/mc.h

@@ -82,7 +82,7 @@ struct mod
   int (*server_send_to_channel)(struct mod* v, int channel_id,
                                 char* data, int data_len,
                                 int total_data_len, int flags);
-  int (*server_bell_trigger)(struct vnc* v);
+  int (*server_bell_trigger)(struct mod* v);
   long server_dumby[100 - 25]; /* align, 100 minus the number of server
                                   functions above */
   /* common */

xrdp/xrdp.ini

@@ -45,6 +45,12 @@ ip=ask
 port=ask3389
 
 [xrdp6]
+name=freerdp-any
+lib=libxrdpfreerdp.so
+ip=ask
+port=ask3389
+
+[xrdp7]
 name=sesman-X11rdp
 lib=libxup.so
 username=ask