adding missing license notes

4 files changed, 232 insertions, 59 deletions

diff --git a/sesman/libscp_v0.c b/sesman/libscp_v0.c
index 363b2550..4e8815fd 100644
--- a/sesman/libscp_v0.c
+++ b/sesman/libscp_v0.c
@@ -106,9 +106,10 @@ enum SCP_SERVER_STATES_E scp_v0s_accept(struct SCP_CONNECTION* c, struct SCP_SES
   if (code == 0 || code == 10) 
   {
     session = g_malloc(sizeof(struct SCP_SESSION),1);
-    if (0 == session) return SCP_SERVER_STATE_INTERNAL_ERR;
-    
-    g_printf("session %x\n",session);
+    if (0 == session)
+    {
+      return SCP_SERVER_STATE_INTERNAL_ERR;
+    }
     
     session->version=version;
     
@@ -124,14 +125,23 @@ enum SCP_SERVER_STATES_E scp_v0s_accept(struct SCP_CONNECTION* c, struct SCP_SES
     /* reading username */
     in_uint16_be(c->in_s, sz);
     session->username=g_malloc(sz+1,0);
-    if (0==session->username) return SCP_SERVER_STATE_INTERNAL_ERR;
+    if (0==session->username)
+    {
+      g_free(session);
+      return SCP_SERVER_STATE_INTERNAL_ERR;
+    }
     session->username[sz]='\0';
     in_uint8a(c->in_s, session->username, sz);
 
     /* reading password */
     in_uint16_be(c->in_s, sz);
     session->password=g_malloc(sz+1,0);
-    if (0==session->password) return SCP_SERVER_STATE_INTERNAL_ERR;
+    if (0==session->password)
+    {
+      g_free(session->username);
+      g_free(session);
+      return SCP_SERVER_STATE_INTERNAL_ERR;
+    }
     session->password[sz]='\0';
     in_uint8a(c->in_s, session->password, sz);
 
@@ -145,8 +155,6 @@ enum SCP_SERVER_STATES_E scp_v0s_accept(struct SCP_CONNECTION* c, struct SCP_SES
     return SCP_SERVER_STATE_SEQUENCE_ERR;
   }
 
-  //reset_stream(c->in_s);
-  //reset_stream(c->out_s);
   (*s)=session;
   return SCP_SERVER_STATE_OK;
 }
diff --git a/sesman/libscp_v1c.h b/sesman/libscp_v1c.h
index 0d7d299f..b85b7508 100644
--- a/sesman/libscp_v1c.h
+++ b/sesman/libscp_v1c.h
@@ -1,25 +1,47 @@
-#include "scp.h"
+/*
+   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.
 
-#ifndef SCP_V1C_H
-#define SCP_V1C_H
+   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.
 
-enum SCP_CLIENY_STATES_E
+   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-2006
+*/
+
+/**
+ * 
+ * @file libscp_v1c.h
+ * @brief libscp version 1 client api declarations
+ * @author Simone Fedele
+ * 
+ */
+
+#ifndef LIBSCP_V1C_H
+#define LIBSCP_V1C_H
+
+#include "libscp_types.h"
+
+enum SCP_CLIENt_STATES_E
 {
   SCP_CLIENT_STATE_NO,
   SCP_CLIENT_STATE_WRONGPWD,
   SCP_CLIENT_STATE_PWDCHG_REQ,
   SCP_CLIENT_STATE_PWDCHG_CANCEL,
-  SCP_CLIENT_STATE_,
-
+  SCP_CLIENT_STATE_
 };
 
 /* client API */
-/**
- *
- *
- */
 /* 001 */ SCP_CLIENT_STATES_E scp_v1c_connect(struct SCP_CONNECTION* c, struct SCP_SESSION* s);
-	ritorna errore: o il display
+/* 004 */ SCP_CLIENT_STATES_E scp_v1c_resend_credentials(struct SCP_CONNECTION* c, struct SCP_SESSION* s);
 
 /* 021 */ SCP_CLIENT_STATES_E scp_v1c_pwd_change(struct SCP_CONNECTION* c, char* newpass);
 /* 022 */ SCP_CLIENT_STATES_E scp_v1c_pwd_change_cancel(struct SCP_CONNECTION* c);
diff --git a/sesman/libscp_v1s.c b/sesman/libscp_v1s.c
index 0ff6e8ec..47f6b376 100644
--- a/sesman/libscp_v1s.c
+++ b/sesman/libscp_v1s.c
@@ -1,3 +1,29 @@
+/*
+   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-2006
+*/
+
+/**
+ * 
+ * @file libscp_v1s.c
+ * @brief libscp version 1 server api code
+ * @author Simone Fedele
+ * 
+ */
 
 #ifndef LIBSCP_V1S_C
 #define LIBSCP_V1S_C
@@ -37,11 +63,12 @@ enum SCP_SERVER_STATES_E scp_v1s_accept(struct SCP_CONNECTION* c, struct SCP_SES
     return SCP_SERVER_STATE_SIZE_ERR;
   }
   
+  init_stream(c->in_s, c->in_s->size);
   if (0!=tcp_force_recv(c->in_sck, c->in_s->data, (size-8)))
   {
     return SCP_SERVER_STATE_NETWORK_ERR;
   }
-  
+
   /* reading command set */
   in_uint16_be(c->in_s, cmdset);
   
@@ -63,15 +90,17 @@ enum SCP_SERVER_STATES_E scp_v1s_accept(struct SCP_CONNECTION* c, struct SCP_SES
   {
     return SCP_SERVER_STATE_SEQUENCE_ERR;
   }
-	  
+
   session = g_malloc(sizeof(struct SCP_SESSION),1);
   if (0 == session) return SCP_SERVER_STATE_INTERNAL_ERR;
 
   in_uint8(c->in_s, session->type);
   if ((session->type != SCP_SESSION_TYPE_XVNC) && (session->type != SCP_SESSION_TYPE_XRDP))
   {
+    g_free(session);
     return SCP_SERVER_STATE_SESSION_TYPE_ERR;
   }
+
   in_uint16_be(c->in_s,session->height);
   in_uint16_be(c->in_s, session->width);
   in_uint8(c->in_s, session->bpp);
@@ -92,25 +121,40 @@ enum SCP_SERVER_STATES_E scp_v1s_accept(struct SCP_CONNECTION* c, struct SCP_SES
   /* reading hostname */ 
   in_uint8(c->in_s, sz);
   session->hostname=g_malloc(sz+1,1);
-  if (0==session->hostname) return SCP_SERVER_STATE_INTERNAL_ERR;
+  if (0==session->hostname)
+  {
+    g_free(session);
+    return SCP_SERVER_STATE_INTERNAL_ERR;
+  }
   session->hostname[sz]='\0';
   in_uint8a(c->in_s, session->hostname, sz);
 
   /* reading username */
   in_uint8(c->in_s, sz);
   session->username=g_malloc(sz+1,1);
-  if (0==session->username) return SCP_SERVER_STATE_INTERNAL_ERR;
+  if (0==session->username)
+  {
+    g_free(session->hostname);
+    g_free(session);
+    return SCP_SERVER_STATE_INTERNAL_ERR;
+  }
   session->username[sz]='\0';
   in_uint8a(c->in_s, session->username, sz);
   
   /* reading password */
   in_uint8(c->in_s, sz);
   session->password=g_malloc(sz+1,1);
-  if (0==session->password) return SCP_SERVER_STATE_INTERNAL_ERR;
+  if (0==session->password) 
+  {
+    g_free(session->username);
+    g_free(session->hostname);
+    g_free(session);    
+    return SCP_SERVER_STATE_INTERNAL_ERR;
+  }
   session->password[sz]='\0';
   in_uint8a(c->in_s, session->password, sz);
 
-  //leggo lo stream e ritorno la struttura
+  /* returning the struct */
   *s=session;
   
   return SCP_SERVER_STATE_OK;
@@ -144,53 +188,97 @@ enum SCP_SERVER_STATES_E scp_v1s_deny_connection(struct SCP_CONNECTION* c, char*
   return SCP_SERVER_STATE_END;
 }
 
-enum SCP_SERVER_STATES_E scp_v1s_request_password(struct SCP_CONNECTION* c, char** pwd, char** user)
+enum SCP_SERVER_STATES_E scp_v1s_request_password(struct SCP_CONNECTION* c, struct SCP_SESSION* s, char* reason)
 {
   unsigned char sz;
+  char *ubuf;
+  char *pbuf;
   uint32_t version;
   uint32_t size;
   uint16_t cmdset;
   uint16_t cmd;
+  int rlen;
 
+  init_stream(c->in_s, c->in_s->size);
+  init_stream(c->out_s, c->out_s->size);
+
+  /* forcing message not to exceed 64k */
+  rlen = g_strlen(reason);
+  if (rlen > 65535)
+  {
+    rlen = 65535;
+  }
+  
+  /* send password request */
   version=1;
   size=12;
   cmdset=0;
-  cmd=3;  
-  
-  /* send password request */
-  out_uint32_be(c->out_s, 1);                       /* version */
-  out_uint32_be(c->out_s, 12);                      /* size    */
+  cmd=3;
+
+  out_uint32_be(c->out_s, version);                 /* version */
+  out_uint32_be(c->out_s, 14+rlen);                 /* size    */
   out_uint16_be(c->out_s, SCP_COMMAND_SET_DEFAULT); /* cmdset  */
-  out_uint16_be(c->out_s, 3);                       /* cmd     */
+  out_uint16_be(c->out_s, cmd);                     /* cmd     */
+
+  out_uint16_be(c->out_s, rlen);
+  out_uint8p(c->out_s, reason, rlen);
 
-  if (0!=tcp_force_send(c->in_sck, c->out_s->data, 12))
+  if (0!=tcp_force_send(c->in_sck, c->out_s->data, 14+rlen))
   {
     return SCP_SERVER_STATE_NETWORK_ERR;
   }
   
   /* receive password & username */
+  if (0!=tcp_force_recv(c->in_sck, c->in_s->data, 8))
+  {
+    return SCP_SERVER_STATE_NETWORK_ERR;
+  }
+#warning check version
+
+  in_uint32_be(c->in_s, size);
+  if (size<12) 
+  {
+    return SCP_SERVER_STATE_SIZE_ERR;
+  }
+
+  init_stream(c->in_s, c->in_s->size);
+  if (0!=tcp_force_recv(c->in_sck, c->in_s->data, (size-8)))
+  {
+    return SCP_SERVER_STATE_NETWORK_ERR;
+  }
+
 #warning check cmd seq
-/*  tcp_force_recv()
-  in_uint32_be()
-  in_uint32_be
-  in_uint16_be
-  in_uint16_be*/
-  
+  in_uint16_be(c->in_s, cmdset);
+  in_uint16_be(c->in_s, cmd);
+
   /* reading username */
   in_uint8(c->in_s, sz);
-  (*user)=g_malloc(sz+1,1);
-  if (0==(*user)) return SCP_SERVER_STATE_INTERNAL_ERR;
-  (*user)[sz]='\0';
-  in_uint8a(c->in_s, (*user), sz);
+  ubuf=g_malloc(sz+1,1);
+  if (0==ubuf)
+  {
+    return SCP_SERVER_STATE_INTERNAL_ERR;
+  }
+  ubuf[sz]='\0';
+  in_uint8a(c->in_s, ubuf, sz);
   
   /* reading password */
   in_uint8(c->in_s, sz);
-  (*pwd)=g_malloc(sz+1,1);
-  if (0==(*pwd)) return SCP_SERVER_STATE_INTERNAL_ERR;
-  (*pwd)[sz]='\0';
-  in_uint8a(c->in_s, (*pwd), sz);
-  
-  return SCP_SERVER_STATE_INTERNAL_ERR;
+  pbuf=g_malloc(sz+1,1);
+  if (0==pbuf)
+  {
+    g_free(ubuf);
+    return SCP_SERVER_STATE_INTERNAL_ERR;
+  }
+  pbuf[sz]='\0';
+  in_uint8a(c->in_s, pbuf, sz);
+
+  /* replacing username and password */
+  g_free(s->username);
+  g_free(s->password);
+  s->username=ubuf;
+  s->password=pbuf;
+
+  return SCP_SERVER_STATE_OK;
 }
 
 /* 020 */ 
diff --git a/sesman/libscp_v1s.h b/sesman/libscp_v1s.h
index 241afba7..d61392d1 100644
--- a/sesman/libscp_v1s.h
+++ b/sesman/libscp_v1s.h
@@ -1,20 +1,75 @@
+/*
+   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-2006
+*/
+
+/**
+ * 
+ * @file libscp_v1s.h
+ * @brief libscp version 1 server api declarations
+ * @author Simone Fedele
+ * 
+ */
 
 #ifndef LIBSCP_V1S_H
 #define LIBSCP_V1S_H
 
 #include "libscp_types.h"
-//#include "os_calls.h"
-//#include "tcp.h"
 
 /* server API */
-/* ... */ enum SCP_SERVER_STATES_E scp_v1s_accept(struct SCP_CONNECTION* c, struct SCP_SESSION** s, int skipVchk);          
-/* 002 */ enum SCP_SERVER_STATES_E scp_v1s_deny_connection(struct SCP_CONNECTION* c, char* reason);
-
-/* 020 */ enum SCP_SERVER_STATES_E scp_v1s_request_pwd_change(struct SCP_CONNECTION* c, char* reason, char* npw);
-/* 023 */ enum SCP_SERVER_STATES_E scp_v1s_pwd_change_error(struct SCP_CONNECTION* s, char* error, int retry, char* npw);
-/* 030 */ enum SCP_SERVER_STATES_E scp_v1s_connect_new_session(struct SCP_CONNECTION* s, SCP_DISPLAY d);
-/* 031 */ enum SCP_SERVER_STATES_E scp_v1s_reconnect_session(struct SCP_CONNECTION* s, SCP_DISPLAY d);
-/* 032 */ enum SCP_SERVER_STATES_E scp_v1s_connection_error(struct SCP_CONNECTION* s, char* error);
-/* 040 */ enum SCP_SERVER_STATES_E scp_v1s_list_sessions(struct SCP_CONNECTION* s, int sescnt, struct SCP_DISCONNECTED_SESSION** ds, SCP_SID* sid);
+/**
+ *
+ * @brief processes the stream using scp version 1
+ * @param c connection descriptor
+ * @param s pointer to session descriptor pointer
+ * @param skipVchk if set to !0 skips the version control (to be used after 
+ *                 scp_vXs_accept() )
+ *
+ * this function places in *s the address of a newely allocated SCP_SESSION structure
+ * that should be free()d
+ */
+enum SCP_SERVER_STATES_E scp_v1s_accept(struct SCP_CONNECTION* c, struct SCP_SESSION** s, int skipVchk);          
+
+/**
+ *
+ * @brief denies connection to sesman
+ * @param c connection descriptor
+ * @param reason pointer to a string containinge the reason for denying connection
+ */
+/* 002 */ 
+enum SCP_SERVER_STATES_E scp_v1s_deny_connection(struct SCP_CONNECTION* c, char* reason);
+
+/* 020 */ 
+enum SCP_SERVER_STATES_E scp_v1s_request_pwd_change(struct SCP_CONNECTION* c, char* reason, char* npw);
+
+/* 023 */ 
+enum SCP_SERVER_STATES_E scp_v1s_pwd_change_error(struct SCP_CONNECTION* s, char* error, int retry, char* npw);
+
+/* 030 */ 
+enum SCP_SERVER_STATES_E scp_v1s_connect_new_session(struct SCP_CONNECTION* s, SCP_DISPLAY d);
+
+/* 031 */ 
+enum SCP_SERVER_STATES_E scp_v1s_reconnect_session(struct SCP_CONNECTION* s, SCP_DISPLAY d);
+
+/* 032 */ 
+enum SCP_SERVER_STATES_E scp_v1s_connection_error(struct SCP_CONNECTION* s, char* error);
+
+/* 040 */ 
+enum SCP_SERVER_STATES_E scp_v1s_list_sessions(struct SCP_CONNECTION* s, int sescnt, struct
+                                               SCP_DISCONNECTED_SESSION** ds, SCP_SID* sid);
 
 #endif