/[rdesktop]/sourceforge.net/trunk/rdesktop/rdp.c
This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!
ViewVC logotype

Diff of /sourceforge.net/trunk/rdesktop/rdp.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 424 by forsberg, Thu Jun 19 07:29:53 2003 UTC revision 435 by astrand, Wed Jul 9 09:18:20 2003 UTC
# Line 2  Line 2 
2     rdesktop: A Remote Desktop Protocol client.     rdesktop: A Remote Desktop Protocol client.
3     Protocol services - RDP layer     Protocol services - RDP layer
4     Copyright (C) Matthew Chapman 1999-2002     Copyright (C) Matthew Chapman 1999-2002
5      
6     This program is free software; you can redistribute it and/or modify     This program is free software; you can redistribute it and/or modify
7     it under the terms of the GNU General Public License as published by     it under the terms of the GNU General Public License as published by
8     the Free Software Foundation; either version 2 of the License, or     the Free Software Foundation; either version 2 of the License, or
9     (at your option) any later version.     (at your option) any later version.
10      
11     This program is distributed in the hope that it will be useful,     This program is distributed in the hope that it will be useful,
12     but WITHOUT ANY WARRANTY; without even the implied warranty of     but WITHOUT ANY WARRANTY; without even the implied warranty of
13     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14     GNU General Public License for more details.     GNU General Public License for more details.
15      
16     You should have received a copy of the GNU General Public License     You should have received a copy of the GNU General Public License
17     along with this program; if not, write to the Free Software     along with this program; if not, write to the Free Software
18     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# Line 28  extern BOOL encryption; Line 28  extern BOOL encryption;
28  extern BOOL desktop_save;  extern BOOL desktop_save;
29  extern BOOL use_rdp5;  extern BOOL use_rdp5;
30  extern uint16 server_rdp_version;  extern uint16 server_rdp_version;
31    extern int server_bpp;
32    
33  uint8 *next_packet;  uint8 *next_packet;
34  uint32 rdp_shareid;  uint32 rdp_shareid;
# Line 178  rdp_send_logon_info(uint32 flags, char * Line 179  rdp_send_logon_info(uint32 flags, char *
179                          (flags & RDP_LOGON_BLOB ? 2 : 0) +      // Length of BLOB                          (flags & RDP_LOGON_BLOB ? 2 : 0) +      // Length of BLOB
180                          2 +     // len_program                          2 +     // len_program
181                          2 +     // len_directory                          2 +     // len_directory
182                          (0 < len_domain ? len_domain : 2) +     // domain                          (0 < len_domain ? len_domain : 2) +     // domain
183                          len_user + (flags & RDP_LOGON_AUTO ? len_password : 0) + 0 +    // We have no 512 byte BLOB. Perhaps we must?                          len_user + (flags & RDP_LOGON_AUTO ? len_password : 0) + 0 +    // We have no 512 byte BLOB. Perhaps we must?
184                          (flags & RDP_LOGON_BLOB && !(flags & RDP_LOGON_AUTO) ? 2 : 0) + // After the BLOB is a unknown int16. If there is a BLOB, that is.                          (flags & RDP_LOGON_BLOB && !(flags & RDP_LOGON_AUTO) ? 2 : 0) + // After the BLOB is a unknown int16. If there is a BLOB, that is.
185                          (0 < len_program ? len_program : 2) + (0 < len_directory ? len_directory : 2) + 2 +     // Unknown (2)                          (0 < len_program ? len_program : 2) + (0 < len_directory ? len_directory : 2) + 2 +     // Unknown (2)
# Line 434  rdp_out_order_caps(STREAM s) Line 435  rdp_out_order_caps(STREAM s)
435  static void  static void
436  rdp_out_bmpcache_caps(STREAM s)  rdp_out_bmpcache_caps(STREAM s)
437  {  {
438            int Bpp;
439          out_uint16_le(s, RDP_CAPSET_BMPCACHE);          out_uint16_le(s, RDP_CAPSET_BMPCACHE);
440          out_uint16_le(s, RDP_CAPLEN_BMPCACHE);          out_uint16_le(s, RDP_CAPLEN_BMPCACHE);
441    
442            Bpp = (server_bpp + 7) / 8;
443          out_uint8s(s, 24);      /* unused */          out_uint8s(s, 24);      /* unused */
444          out_uint16_le(s, 0x258);        /* entries */          out_uint16_le(s, 0x258);        /* entries */
445          out_uint16_le(s, 0x100);        /* max cell size */          out_uint16_le(s, 0x100 * Bpp);  /* max cell size */
446          out_uint16_le(s, 0x12c);        /* entries */          out_uint16_le(s, 0x12c);        /* entries */
447          out_uint16_le(s, 0x400);        /* max cell size */          out_uint16_le(s, 0x400 * Bpp);  /* max cell size */
448          out_uint16_le(s, 0x106);        /* entries */          out_uint16_le(s, 0x106);        /* entries */
449          out_uint16_le(s, 0x1000);       /* max cell size */          out_uint16_le(s, 0x1000 * Bpp); /* max cell size */
450  }  }
451    
452  /* Output control capability set */  /* Output control capability set */
# Line 865  rdp_main_loop(void) Line 868  rdp_main_loop(void)
868    
869                          case RDP_PDU_DEACTIVATE:                          case RDP_PDU_DEACTIVATE:
870                                  DEBUG(("RDP_PDU_DEACTIVATE\n"));                                  DEBUG(("RDP_PDU_DEACTIVATE\n"));
871                                  return True;                                  /* We thought we could detect a clean
872                                       shutdown of the session by this
873                                       packet, but it seems Windows 2003
874                                       is sending us one of these when we
875                                       reconnect to a disconnected session
876                                       return True; */
877                                  break;                                  break;
878    
879                          case RDP_PDU_DATA:                          case RDP_PDU_DATA:
# Line 879  rdp_main_loop(void) Line 887  rdp_main_loop(void)
887                                  unimpl("PDU %d\n", type);                                  unimpl("PDU %d\n", type);
888                  }                  }
889          }          }
890          return False;          return True;
891            /* We want to detect if we got a clean shutdown, but we
892               can't. Se above.  
893               return False;  */
894  }  }
895    
896  /* Establish a connection up to the RDP layer */  /* Establish a connection up to the RDP layer */
# Line 887  BOOL Line 898  BOOL
898  rdp_connect(char *server, uint32 flags, char *domain, char *password,  rdp_connect(char *server, uint32 flags, char *domain, char *password,
899              char *command, char *directory)              char *command, char *directory)
900  {  {
         if (use_rdp5)  
                 channels_init();  
   
901          if (!sec_connect(server, username))          if (!sec_connect(server, username))
902                  return False;                  return False;
903    
Legend:
Removed from v.424  
changed lines
  Added in v.435
  ViewVC Help
Powered by ViewVC 1.1.26