1 files changed, 224 insertions, 89 deletions

diff --git a/sesman/libscp_v1s.c b/sesman/libscp_v1s.c
index 37932198..9a3e2df6 100644
--- a/sesman/libscp_v1s.c
+++ b/sesman/libscp_v1s.c
@@ -18,11 +18,11 @@
 */
 
 /**
- * 
+ *
  * @file libscp_v1s.c
  * @brief libscp version 1 server api code
  * @author Simone Fedele
- * 
+ *
  */
 
 #ifndef LIBSCP_V1S_C
@@ -39,7 +39,7 @@ enum SCP_SERVER_STATES_E scp_v1s_accept(struct SCP_CONNECTION* c, struct SCP_SES
   uint16_t cmdset;
   uint16_t cmd;
   unsigned char sz;
-  
+
   if (!skipVchk)
   {
 
@@ -60,14 +60,13 @@ enum SCP_SERVER_STATES_E scp_v1s_accept(struct SCP_CONNECTION* c, struct SCP_SES
   {
     version=1;
   }
-  
+
   in_uint32_be(c->in_s, size);
-  LOG_DBG("size: %d",size);
-  if (size<12) 
+  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)))
   {
@@ -76,14 +75,13 @@ enum SCP_SERVER_STATES_E scp_v1s_accept(struct SCP_CONNECTION* c, struct SCP_SES
 
   /* reading command set */
   in_uint16_be(c->in_s, cmdset);
-  LOG_DBG("command set: %d",cmdset);
-  
+
   /* if we are starting a management session */
   if (cmdset==SCP_COMMAND_SET_MANAGE)
   {
     return SCP_SERVER_STATE_START_MANAGE;
   }
-  
+
   /* if we started with resource sharing... */
   if (cmdset==SCP_COMMAND_SET_RSR)
   {
@@ -92,7 +90,6 @@ enum SCP_SERVER_STATES_E scp_v1s_accept(struct SCP_CONNECTION* c, struct SCP_SES
 
   /* reading command */
   in_uint16_be(c->in_s, cmd);
-  LOG_DBG("command: %d",cmd);
   if (cmd != 1)
   {
     return SCP_SERVER_STATE_SEQUENCE_ERR;
@@ -117,10 +114,8 @@ enum SCP_SERVER_STATES_E scp_v1s_accept(struct SCP_CONNECTION* c, struct SCP_SES
   in_uint8(c->in_s, session->bpp);
   in_uint8(c->in_s, session->rsr);
   in_uint8a(c->in_s, session->locale, 17);
-            session->locale[17]='\0';
+    session->locale[17]='\0';
 
-  LOG_DBG("locale: %s\n", session->locale);
- 
   in_uint8(c->in_s, session->addr_type);
   if (session->addr_type==SCP_ADDRESS_TYPE_IPV4)
   {
@@ -131,11 +126,8 @@ enum SCP_SERVER_STATES_E scp_v1s_accept(struct SCP_CONNECTION* c, struct SCP_SES
     #warning how to handle ipv6 addresses?
   }
 
-  LOG_DBG("rest: %d\n",(unsigned char)*((c->in_s->p)+2));
-  
-  /* reading hostname */ 
+  /* reading hostname */
   in_uint8(c->in_s, sz);
-  LOG_DBG("size read: %d", sz);
   session->hostname=g_malloc(sz+1,1);
   if (0==session->hostname)
   {
@@ -156,43 +148,40 @@ enum SCP_SERVER_STATES_E scp_v1s_accept(struct SCP_CONNECTION* c, struct SCP_SES
   }
   session->username[sz]='\0';
   in_uint8a(c->in_s, session->username, sz);
-  
+
   /* reading password */
   in_uint8(c->in_s, sz);
-  LOG_DBG("size read: %d", sz);
   session->password=g_malloc(sz+1,1);
-  if (0==session->password) 
+  if (0==session->password)
   {
     g_free(session->username);
     g_free(session->hostname);
-    g_free(session);    
+    g_free(session);
     return SCP_SERVER_STATE_INTERNAL_ERR;
   }
   session->password[sz]='\0';
   in_uint8a(c->in_s, session->password, sz);
 
-  LOG_DBG("password: %s - size: %d - pointer: %x", session->password, sz, session->password);
-  
   /* returning the struct */
   (*s)=session;
-  
+
   return SCP_SERVER_STATE_OK;
 }
 
-enum SCP_SERVER_STATES_E 
+enum SCP_SERVER_STATES_E
 scp_v1s_deny_connection(struct SCP_CONNECTION* c, char* reason)
 {
   int rlen;
- 
+
   init_stream(c->out_s,c->out_s->size);
-  
+
   /* forcing message not to exceed 64k */
   rlen = g_strlen(reason);
   if (rlen > 65535)
   {
     rlen = 65535;
   }
-  
+
   out_uint32_be(c->out_s, 1);
   /* packet size: 4 + 4 + 2 + 2 + 2 + strlen(reason)*/
   /* version + size + cmdset + cmd + msglen + msg */
@@ -210,7 +199,7 @@ scp_v1s_deny_connection(struct SCP_CONNECTION* c, char* reason)
   return SCP_SERVER_STATE_END;
 }
 
-enum SCP_SERVER_STATES_E 
+enum SCP_SERVER_STATES_E
 scp_v1s_request_password(struct SCP_CONNECTION* c, struct SCP_SESSION* s, char* reason)
 {
   unsigned char sz;
@@ -231,7 +220,7 @@ scp_v1s_request_password(struct SCP_CONNECTION* c, struct SCP_SESSION* s, char*
   {
     rlen = 65535;
   }
-  
+
   /* send password request */
   version=1;
   size=12;
@@ -250,24 +239,22 @@ scp_v1s_request_password(struct SCP_CONNECTION* c, struct SCP_SESSION* s, char*
   {
     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;
   }
-  
+
   in_uint32_be(c->in_s, version);
-  if (version!=1) 
+  if (version!=1)
   {
-    LOG_DBG("version: %d",version);
     return SCP_SERVER_STATE_VERSION_ERR;
   }
 
   in_uint32_be(c->in_s, size);
-  if (size<12) 
+  if (size<12)
   {
-    LOG_DBG("size: %d",size);
     return SCP_SERVER_STATE_SIZE_ERR;
   }
 
@@ -277,9 +264,17 @@ scp_v1s_request_password(struct SCP_CONNECTION* c, struct SCP_SESSION* s, char*
     return SCP_SERVER_STATE_NETWORK_ERR;
   }
 
-#warning check cmd seq
   in_uint16_be(c->in_s, cmdset);
+  if (cmdset != SCP_COMMAND_SET_DEFAULT)
+  {
+    return SCP_SERVER_STATE_SEQUENCE_ERR;
+  }
+
   in_uint16_be(c->in_s, cmd);
+  if (cmd != 4)
+  {
+    return SCP_SERVER_STATE_SEQUENCE_ERR;
+  }
 
   /* reading username */
   in_uint8(c->in_s, sz);
@@ -290,7 +285,7 @@ scp_v1s_request_password(struct SCP_CONNECTION* c, struct SCP_SESSION* s, char*
   }
   ubuf[sz]='\0';
   in_uint8a(c->in_s, ubuf, sz);
-  
+
   /* reading password */
   in_uint8(c->in_s, sz);
   pbuf=g_malloc(sz+1,1);
@@ -311,22 +306,22 @@ scp_v1s_request_password(struct SCP_CONNECTION* c, struct SCP_SESSION* s, char*
   return SCP_SERVER_STATE_OK;
 }
 
-/* 020 */ 
-enum SCP_SERVER_STATES_E 
+/* 020 */
+enum SCP_SERVER_STATES_E
 scp_v1s_request_pwd_change(struct SCP_CONNECTION* c, char* reason, char* npw)
 {
   return SCP_SERVER_STATE_INTERNAL_ERR;
 }
 
-/* 023 */ 
-enum SCP_SERVER_STATES_E 
+/* 023 */
+enum SCP_SERVER_STATES_E
 scp_v1s_pwd_change_error(struct SCP_CONNECTION* c, char* error, int retry, char* npw)
 {
   return SCP_SERVER_STATE_INTERNAL_ERR;
 }
 
-/* 030 */ 
-enum SCP_SERVER_STATES_E 
+/* 030 */
+enum SCP_SERVER_STATES_E
 scp_v1s_connect_new_session(struct SCP_CONNECTION* c, SCP_DISPLAY d)
 {
   /* send password request */
@@ -346,22 +341,33 @@ scp_v1s_connect_new_session(struct SCP_CONNECTION* c, SCP_DISPLAY d)
   if (0!=tcp_force_send(c->in_sck, c->out_s->data, 14))
   {
     return SCP_SERVER_STATE_NETWORK_ERR;
-  }	
-  
+  }
+
   return SCP_SERVER_STATE_OK;
 }
 
-/* 031 */ 
-enum SCP_SERVER_STATES_E 
-scp_v1s_reconnect_session(struct SCP_CONNECTION* c, struct SCP_DISCONNECTED_SESSION* ds,
-                          SCP_DISPLAY d)
+/* 032 */
+enum SCP_SERVER_STATES_E
+scp_v1s_connection_error(struct SCP_CONNECTION* c, char* error)
+{
+  return SCP_SERVER_STATE_INTERNAL_ERR;
+  return SCP_SERVER_STATE_END;
+}
+
+/* 040 */
+enum SCP_SERVER_STATES_E
+scp_v1s_list_sessions(struct SCP_CONNECTION* c, int sescnt, struct SCP_DISCONNECTED_SESSION* ds, SCP_SID* sid)
 {
   uint32_t version=1;
   uint32_t size=12;
-  uint16_t cmd=32;
-#warning FIXME check this command code
-
-  /* first we send a notice that we're reconnecting to an existing session */
+  uint16_t cmd=40;
+  int pktcnt;
+  int idx;
+  int sidx;
+  int pidx;
+  struct SCP_DISCONNECTED_SESSION* cds;
+
+  /* first we send a notice that we have some disconnected sessions */
   init_stream(c->out_s, c->out_s->size);
 
   out_uint32_be(c->out_s, version);                 /* version */
@@ -369,27 +375,28 @@ scp_v1s_reconnect_session(struct SCP_CONNECTION* c, struct SCP_DISCONNECTED_SESS
   out_uint16_be(c->out_s, SCP_COMMAND_SET_DEFAULT); /* cmdset  */
   out_uint16_be(c->out_s, cmd);                     /* cmd     */
 
-  if (0!=tcp_force_send(c->in_sck, c->out_s->data, 14))
+  if (0!=tcp_force_send(c->in_sck, c->out_s->data, size))
   {
     return SCP_SERVER_STATE_NETWORK_ERR;
-  }	
+  }
 
   /* then we wait for client ack */
-#warning maybe this message could say if the session should be resized on 
+#warning maybe this message could say if the session should be resized on
 #warning server side or client side
+  init_stream(c->in_s, c->in_s->size);
   if (0!=tcp_force_recv(c->in_sck, c->in_s->data, 8))
   {
     return SCP_SERVER_STATE_NETWORK_ERR;
   }
-  
+
   in_uint32_be(c->in_s, version);
-  if (version!=1) 
+  if (version!=1)
   {
     return SCP_SERVER_STATE_VERSION_ERR;
   }
 
   in_uint32_be(c->in_s, size);
-  if (size<12) 
+  if (size<12)
   {
     return SCP_SERVER_STATE_SIZE_ERR;
   }
@@ -407,58 +414,186 @@ scp_v1s_reconnect_session(struct SCP_CONNECTION* c, struct SCP_DISCONNECTED_SESS
   }
 
   in_uint16_be(c->in_s, cmd);
-#warning FIXME check this command code
-  if (cmd != 33)
+  if (cmd != 41)
   {
     return SCP_SERVER_STATE_SEQUENCE_ERR;
   }
 
+  /* calculating the number of packets to send */
+  pktcnt=sescnt/SCP_SERVER_MAX_LIST_SIZE;
+  if ((sescnt%SCP_SERVER_MAX_LIST_SIZE)!=0)
+  {
+    pktcnt++;
+  }
+
+  for (idx=0; idx<pktcnt; idx++)
+  {
+    /* ok, we send session session list */
+    init_stream(c->out_s, c->out_s->size);
+
+    /* size: ver+size+cmdset+cmd+sescnt+continue+count */
+    size=4+4+2+2+4+1+1;
+
+    /* header */
+    cmd=42;
+    s_push_layer(c->out_s, channel_hdr, 8);
+    out_uint16_be(c->out_s, SCP_COMMAND_SET_DEFAULT);
+    out_uint16_be(c->out_s, cmd);
+
+    /* session count */
+    out_uint32_be(c->out_s, sescnt);
+
+    /* setting the continue flag */
+    if ((idx+1)*SCP_SERVER_MAX_LIST_SIZE >= sescnt)
+    {
+      out_uint8(c->out_s, 0);
+      /* setting session count for this packet */
+      pidx=sescnt-(idx*SCP_SERVER_MAX_LIST_SIZE);
+      out_uint8(c->out_s, pidx);
+    }
+    else
+    {
+      out_uint8(c->out_s, 1);
+      /* setting session count for this packet */
+      pidx=SCP_SERVER_MAX_LIST_SIZE;
+      out_uint8(c->out_s, pidx);
+    }
+
+    /* adding session descriptors */
+    for (sidx=0; sidx<pidx; sidx++)
+    {
+      /* shortcut to the current session to send */
+      cds=ds+((idx)*SCP_SERVER_MAX_LIST_SIZE)+sidx;
+
+      /* session data */
+      out_uint32_be(c->out_s, cds->SID); /* session id */
+      out_uint8(c->out_s, cds->type);
+      out_uint16_be(c->out_s, cds->height);
+      out_uint16_be(c->out_s, cds->width);
+      out_uint8(c->out_s, cds->bpp);
+      out_uint8(c->out_s, cds->idle_days);
+      out_uint8(c->out_s, cds->idle_hours);
+      out_uint8(c->out_s, cds->idle_minutes);
+
+      size = size + 13;
+    }
+
+    s_pop_layer(c->out_s, channel_hdr);
+    out_uint32_be(c->out_s, version);
+    out_uint32_be(c->out_s, size);
+
+    if (0!=tcp_force_send(c->in_sck, c->out_s->data, size))
+    {
+      return SCP_SERVER_STATE_NETWORK_ERR;
+    }
+  }
+
+  /* we get the response */
+  init_stream(c->in_s, c->in_s->size);
+  if (0!=tcp_force_recv(c->in_sck, c->in_s->data, (8)))
+  {
+    return SCP_SERVER_STATE_NETWORK_ERR;
+  }
+
+  in_uint32_be(c->in_s, version);
+  if (version!=1)
+  {
+    return SCP_SERVER_STATE_VERSION_ERR;
+  }
+
+  in_uint32_be(c->in_s, size);
+  if (size<12)
+  {
+    return SCP_SERVER_STATE_SIZE_ERR;
+  }
+
+  /* rest of the packet */
+  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;
+  }
+
+  in_uint16_be(c->in_s, cmd);
+  if (cmd != SCP_COMMAND_SET_DEFAULT)
+  {
+    return SCP_SERVER_STATE_SEQUENCE_ERR;
+  }
+
+  in_uint16_be(c->in_s, cmd);
+  if (cmd == 43)
+  {
+    /* select session */
+    in_uint32_be(c->in_s, (*sid));
+
+    /* checking sid value */
+    for (idx=0; idx<sescnt; idx++)
+    {
+      /* the sid is valid */
+      if (ds[idx].SID==(*sid))
+      {
+        /* ok, session selected */
+        return SCP_SERVER_STATE_OK;
+      }
+    }
+
+    /* if we got here, the requested sid wasn't one from the list we sent */
+    /* we should kill the connection                                      */
+    return SCP_CLIENT_STATE_INTERNAL_ERR;
+  }
+  else if (cmd == 44)
+  {
+    /* cancel connection */
+    return SCP_SERVER_STATE_SELECTION_CANCEL;
+  }
+//  else if (cmd == 45)
+//  {
+//    /* force new connection */
+//    return SCP_SERVER_STATE_FORCE_NEW;
+//  }
+  else
+  {
+    /* wrong response */
+    return SCP_SERVER_STATE_SEQUENCE_ERR;
+  }
+
+  return SCP_SERVER_STATE_OK;
+}
+
+/* 046 was: 031 struct SCP_DISCONNECTED_SESSION* ds, */
+enum SCP_SERVER_STATES_E
+scp_v1s_reconnect_session(struct SCP_CONNECTION* c, SCP_DISPLAY d)
+{
+  uint32_t version = 1;
+  uint32_t size = 14;
+  uint16_t cmd = 46;
+
   /* ok, we send session data and display */
   init_stream(c->out_s, c->out_s->size);
 
-  /* size */
-  size=4+4+2+2+ \
-       2+1+2+2+1+1+1+1;
-  
   /* header */
-  cmd=31;
   out_uint32_be(c->out_s, version);
   out_uint32_be(c->out_s, size);
   out_uint16_be(c->out_s, SCP_COMMAND_SET_DEFAULT);
   out_uint16_be(c->out_s, cmd);
-  
+
   /* session data */
   out_uint16_be(c->out_s, d); /* session display */
-  out_uint8(c->out_s, ds->type);
+  /*out_uint8(c->out_s, ds->type);
   out_uint16_be(c->out_s, ds->height);
   out_uint16_be(c->out_s, ds->width);
   out_uint8(c->out_s, ds->bpp);
   out_uint8(c->out_s, ds->idle_days);
   out_uint8(c->out_s, ds->idle_hours);
-  out_uint8(c->out_s, ds->idle_minutes);
+  out_uint8(c->out_s, ds->idle_minutes);*/
   /* these last three are not really needed... */
-  
+
   if (0!=tcp_force_send(c->in_sck, c->out_s->data, size))
   {
     return SCP_SERVER_STATE_NETWORK_ERR;
-  }	
-  
-  return SCP_SERVER_STATE_OK;
-}
-
-/* 032 */ 
-enum SCP_SERVER_STATES_E 
-scp_v1s_connection_error(struct SCP_CONNECTION* c, char* error)
-{
-  return SCP_SERVER_STATE_INTERNAL_ERR;
-  return SCP_SERVER_STATE_END;
-}
+  }
 
-/* 040 */ 
-enum SCP_SERVER_STATES_E 
-scp_v1s_list_sessions(struct SCP_CONNECTION* c, int sescnt, struct SCP_DISCONNECTED_SESSION* ds, SCP_SID* sid)
-{
-  return SCP_SERVER_STATE_INTERNAL_ERR;
+  return SCP_SERVER_STATE_OK;
 }
 
 #endif