added first management code

added a rough management tool
fixes in session.c

Author: ilsimo

sesman/Makefile

@@ -2,7 +2,7 @@
 
 SESMANOBJ = sesman.o config.o sig.o session.o env.o \
             os_calls.o d3des.o list.o file.o log.o access.o \
-            scp.o scp_v0.o scp_v1.o thread.o lock.o
+            scp.o scp_v0.o scp_v1.o scp_v1_mng.o thread.o lock.o
 
 SESSVCOBJ = sessvc.o os_calls.o log.o
 

sesman/Makefile.am

@@ -28,6 +28,7 @@ xrdp_sesman_SOURCES = \
   scp.c \
   scp_v0.c \
   scp_v1.c \
+  scp_v1_mng.c \
   sesman.c \
   session.c \
   sig.c \

sesman/libscp/Makefile

@@ -4,7 +4,7 @@ LIBSCPOBJ = libscp_vX.o libscp_v0.o \
 	    libscp_init.o libscp_lock.o libscp_tcp.o \
 	    libscp_session.o libscp_connection.o \
 	    os_calls.o \
-#	    libscp_v1s_mng.o libscp_v1c_mng.o
+	    libscp_v1s_mng.o libscp_v1c_mng.o
 
 CFGDIR = /etc/xrdp
 PIDDIR = /var/run

sesman/libscp/Makefile.am

@@ -13,6 +13,8 @@ libscp_la_SOURCES = \
   libscp_v0.c \
   libscp_v1c.c \
   libscp_v1s.c \
+  libscp_v1c_mng.c \
+  libscp_v1s_mng.c \
   libscp_vX.c
 
 libscp_la_LIBADD = \

sesman/libscp/libscp.h

@@ -22,7 +22,7 @@
  * @file libscp.h
  * @brief libscp main header
  * @author Simone Fedele
- * 
+ *
  */
 
 #ifndef LIBSCP_H
@@ -33,6 +33,7 @@
 #endif
 
 #include "libscp_types.h"
+#include "libscp_commands.h"
 
 #include "libscp_connection.h"
 #include "libscp_session.h"
@@ -44,6 +45,7 @@
 #include "libscp_v0.h"
 #include "libscp_v1s.h"
 #include "libscp_v1c.h"
-#include "file_loc.h"
+#include "libscp_v1s_mng.h"
+#include "libscp_v1c_mng.h"
 
 #endif

sesman/libscp/libscp_commands.h

@@ -0,0 +1,36 @@
+/*
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+   xrdp: A Remote Desktop Protocol server.
+   Copyright (C) Jay Sorg 2005-2008
+*/
+
+/**
+ *
+ * @file libscp_commands.h
+ * @brief libscp data types definitions
+ * @author Simone Fedele
+ *
+ */
+
+#ifndef LIBSCP_COMMANDS_H
+#define LIBSCP_COMMANDS_H
+
+#include "libscp_commands_mng.h"
+
+#define SCP_CMD_LOGIN        0x0001
+#define SCP_CMD_CONN_ERROR   0xFFFF
+
+#endif

sesman/libscp/libscp_commands_mng.h

@@ -0,0 +1,39 @@
+/*
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+   xrdp: A Remote Desktop Protocol server.
+   Copyright (C) Jay Sorg 2005-2008
+*/
+
+/**
+ *
+ * @file libscp_commands_mng.h
+ * @brief libscp data types definitions
+ * @author Simone Fedele
+ *
+ */
+
+#ifndef LIBSCP_COMMANDS_MNG_H
+#define LIBSCP_COMMANDS_MNG_H
+
+#define SCP_CMD_MNG_LOGIN        0x0001
+#define SCP_CMD_MNG_LOGIN_ALLOW  0x0002
+#define SCP_CMD_MNG_LOGIN_DENY   0x0003
+#define SCP_CMD_MNG_CMD_ERROR    0x0004
+#define SCP_CMD_MNG_LIST_REQ     0x0005
+#define SCP_CMD_MNG_LIST         0x0006
+#define SCP_CMD_MNG_ACTION       0x0007
+
+#endif

sesman/libscp/libscp_session.c

@@ -50,6 +50,7 @@ scp_session_create()
   s->password = 0;
   s->hostname = 0;
   s->errstr = 0;
+  s->mng = 0;
   s->locale[0]='\0';
 
   return s;
@@ -69,6 +70,12 @@ scp_session_set_type(struct SCP_SESSION* s, tui8 type)
       break;
     case SCP_SESSION_TYPE_MANAGE:
       s->type = SCP_SESSION_TYPE_MANAGE;
+      s->mng = g_malloc(sizeof(struct SCP_MNG_DATA),1);
+      if (NULL == s->mng)
+      {
+        log_message(s_log, LOG_LEVEL_ERROR, "[session:%d] set_type: internal error", __LINE__);
+        return 1;
+      }
       break;
     default:
       log_message(s_log, LOG_LEVEL_WARNING, "[session:%d] set_type: unknown type", __LINE__);
@@ -311,25 +318,31 @@ scp_session_destroy(struct SCP_SESSION* s)
   if (s->username)
   {
     g_free(s->username);
-    s->username=0;
+    s->username = 0;
   }
 
   if (s->password)
   {
     g_free(s->password);
-    s->password=0;
+    s->password = 0;
   }
 
   if (s->hostname)
   {
     g_free(s->hostname);
-    s->hostname=0;
+    s->hostname = 0;
   }
 
   if (s->errstr)
   {
     g_free(s->errstr);
-    s->errstr=0;
+    s->errstr = 0;
+  }
+
+  if (s->mng)
+  {
+    g_free(s->mng);
+    s->mng = 0;
   }
 
   g_free(s);

sesman/libscp/libscp_types.h

@@ -56,7 +56,7 @@
 
 #define SCP_SERVER_MAX_LIST_SIZE 100
 
-#define free_session(s) {g_free((s)->username); g_free((s)->password); g_free((s)->hostname); g_free(s);}
+#include "libscp_types_mng.h"
 
 struct SCP_CONNECTION
 {
@@ -80,8 +80,9 @@ struct SCP_SESSION
   tui8  addr_type;
   tui32 ipv4addr;
   tui8  ipv6addr[16];
-  tui16 display;
+  SCP_DISPLAY display;
   char* errstr;
+  struct SCP_MNG_DATA* mng;
 };
 
 struct SCP_DISCONNECTED_SESSION
@@ -135,6 +136,8 @@ enum SCP_SERVER_STATES_E
   SCP_SERVER_STATE_SELECTION_CANCEL,
   /*SCP_SERVER_STATE_FORCE_NEW,*/
   SCP_SERVER_STATE_START_MANAGE,
+  SCP_SERVER_STATE_MNG_LISTREQ,
+  SCP_SERVER_STATE_MNG_ACTION,
   SCP_SERVER_STATE_END
 };
 

sesman/libscp/libscp_types_mng.h

@@ -0,0 +1,48 @@
+/*
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+   xrdp: A Remote Desktop Protocol server.
+   Copyright (C) Jay Sorg 2005-2008
+*/
+
+/**
+ *
+ * @file libscp_types_mng.h
+ * @brief libscp data types definitions
+ * @author Simone Fedele
+ *
+ */
+
+#ifndef LIBSCP_TYPES_MNG_H
+#define LIBSCP_TYPES_MNG_H
+
+#include "os_calls.h"
+#include "parse.h"
+#include "arch.h"
+#include "log.h"
+
+enum SCP_MNG_COMMAND
+{
+  SCP_MNG_CMD_KILL,
+  SCP_MNG_CMD_DISCONNECT
+};
+
+struct SCP_MNG_DATA
+{
+  enum SCP_MNG_COMMAND cmd;
+  SCP_SID sid;
+};
+
+#endif