/[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 945 by astrand, Tue Aug 2 09:29:41 2005 UTC revision 1042 by astrand, Tue Jan 24 12:40:24 2006 UTC
# Line 44  extern BOOL g_polygon_ellipse_orders; Line 44  extern BOOL g_polygon_ellipse_orders;
44  extern BOOL g_use_rdp5;  extern BOOL g_use_rdp5;
45  extern uint16 g_server_rdp_version;  extern uint16 g_server_rdp_version;
46  extern uint32 g_rdp5_performanceflags;  extern uint32 g_rdp5_performanceflags;
47  extern int g_server_bpp;  extern int g_server_depth;
48  extern int g_width;  extern int g_width;
49  extern int g_height;  extern int g_height;
50  extern BOOL g_bitmap_cache;  extern BOOL g_bitmap_cache;
# Line 55  uint32 g_rdp_shareid; Line 55  uint32 g_rdp_shareid;
55    
56  extern RDPCOMP g_mppc_dict;  extern RDPCOMP g_mppc_dict;
57    
58    /* Session Directory support */
59    extern BOOL g_redirect;
60    extern char g_redirect_server[64];
61    extern char g_redirect_domain[16];
62    extern char g_redirect_password[64];
63    extern char g_redirect_username[64];
64    extern char g_redirect_cookie[128];
65    extern uint32 g_redirect_flags;
66    /* END Session Directory support */
67    
68  #if WITH_DEBUG  #if WITH_DEBUG
69  static uint32 g_packetno;  static uint32 g_packetno;
70  #endif  #endif
# Line 71  rdp_recv(uint8 * type) Line 81  rdp_recv(uint8 * type)
81          uint16 length, pdu_type;          uint16 length, pdu_type;
82          uint8 rdpver;          uint8 rdpver;
83    
84          if ((rdp_s == NULL) || (g_next_packet >= rdp_s->end))          if ((rdp_s == NULL) || (g_next_packet >= rdp_s->end) || (g_next_packet == NULL))
85          {          {
86                  rdp_s = sec_recv(&rdpver);                  rdp_s = sec_recv(&rdpver);
87                  if (rdp_s == NULL)                  if (rdp_s == NULL)
# Line 260  rdp_in_unistr(STREAM s, char *string, in Line 270  rdp_in_unistr(STREAM s, char *string, in
270                          g_iconv_works = False;                          g_iconv_works = False;
271                          return rdp_in_unistr(s, string, uni_len);                          return rdp_in_unistr(s, string, uni_len);
272                  }                  }
273    
274                    /* we must update the location of the current STREAM for future reads of s->p */
275                    s->p += uni_len;
276    
277                  return pout - string;                  return pout - string;
278          }          }
279          else          else
# Line 606  rdp_out_bitmap_caps(STREAM s) Line 620  rdp_out_bitmap_caps(STREAM s)
620          out_uint16_le(s, RDP_CAPSET_BITMAP);          out_uint16_le(s, RDP_CAPSET_BITMAP);
621          out_uint16_le(s, RDP_CAPLEN_BITMAP);          out_uint16_le(s, RDP_CAPLEN_BITMAP);
622    
623          out_uint16_le(s, g_server_bpp); /* Preferred BPP */          out_uint16_le(s, g_server_depth);       /* Preferred colour depth */
624          out_uint16_le(s, 1);    /* Receive 1 BPP */          out_uint16_le(s, 1);    /* Receive 1 BPP */
625          out_uint16_le(s, 1);    /* Receive 4 BPP */          out_uint16_le(s, 1);    /* Receive 4 BPP */
626          out_uint16_le(s, 1);    /* Receive 8 BPP */          out_uint16_le(s, 1);    /* Receive 8 BPP */
# Line 670  rdp_out_bmpcache_caps(STREAM s) Line 684  rdp_out_bmpcache_caps(STREAM s)
684          out_uint16_le(s, RDP_CAPSET_BMPCACHE);          out_uint16_le(s, RDP_CAPSET_BMPCACHE);
685          out_uint16_le(s, RDP_CAPLEN_BMPCACHE);          out_uint16_le(s, RDP_CAPLEN_BMPCACHE);
686    
687          Bpp = (g_server_bpp + 7) / 8;          Bpp = (g_server_depth + 7) / 8; /* bytes per pixel */
688          out_uint8s(s, 24);      /* unused */          out_uint8s(s, 24);      /* unused */
689          out_uint16_le(s, 0x258);        /* entries */          out_uint16_le(s, 0x258);        /* entries */
690          out_uint16_le(s, 0x100 * Bpp);  /* max cell size */          out_uint16_le(s, 0x100 * Bpp);  /* max cell size */
# Line 867  rdp_process_general_caps(STREAM s) Line 881  rdp_process_general_caps(STREAM s)
881  static void  static void
882  rdp_process_bitmap_caps(STREAM s)  rdp_process_bitmap_caps(STREAM s)
883  {  {
884          uint16 width, height, bpp;          uint16 width, height, depth;
885    
886          in_uint16_le(s, bpp);          in_uint16_le(s, depth);
887          in_uint8s(s, 6);          in_uint8s(s, 6);
888    
889          in_uint16_le(s, width);          in_uint16_le(s, width);
890          in_uint16_le(s, height);          in_uint16_le(s, height);
891    
892          DEBUG(("setting desktop size and bpp to: %dx%dx%d\n", width, height, bpp));          DEBUG(("setting desktop size and depth to: %dx%dx%d\n", width, height, depth));
893    
894          /*          /*
895           * The server may limit bpp and change the size of the desktop (for           * The server may limit depth and change the size of the desktop (for
896           * example when shadowing another session).           * example when shadowing another session).
897           */           */
898          if (g_server_bpp != bpp)          if (g_server_depth != depth)
899          {          {
900                  warning("colour depth changed from %d to %d\n", g_server_bpp, bpp);                  warning("Remote desktop does not support colour depth %d; falling back to %d\n",
901                  g_server_bpp = bpp;                          g_server_depth, depth);
902                    g_server_depth = depth;
903          }          }
904          if (g_width != width || g_height != height)          if (g_width != width || g_height != height)
905          {          {
906                  warning("screen size changed from %dx%d to %dx%d\n", g_width, g_height,                  warning("Remote desktop changed from %dx%d to %dx%d.\n", g_width, g_height,
907                          width, height);                          width, height);
908                  g_width = width;                  g_width = width;
909                  g_height = height;                  g_height = height;
# Line 1284  process_data_pdu(STREAM s, uint32 * ext_ Line 1299  process_data_pdu(STREAM s, uint32 * ext_
1299          return False;          return False;
1300  }  }
1301    
1302    /* Process redirect PDU from Session Directory */
1303    static BOOL
1304    process_redirect_pdu(STREAM s /*, uint32 * ext_disc_reason */ )
1305    {
1306            uint32 len;
1307    
1308            /* these 2 bytes are unknown, seem to be zeros */
1309            in_uint8s(s, 2);
1310    
1311            /* read connection flags */
1312            in_uint32_le(s, g_redirect_flags);
1313    
1314            /* read length of ip string */
1315            in_uint32_le(s, len);
1316    
1317            /* read ip string */
1318            rdp_in_unistr(s, g_redirect_server, len);
1319    
1320            /* read length of cookie string */
1321            in_uint32_le(s, len);
1322    
1323            /* read cookie string (plain ASCII) */
1324            in_uint8a(s, g_redirect_cookie, len);
1325            g_redirect_cookie[len] = 0;
1326    
1327            /* read length of username string */
1328            in_uint32_le(s, len);
1329    
1330            /* read username string */
1331            rdp_in_unistr(s, g_redirect_username, len);
1332    
1333            /* read length of domain string */
1334            in_uint32_le(s, len);
1335    
1336            /* read domain string */
1337            rdp_in_unistr(s, g_redirect_domain, len);
1338    
1339            /* read length of password string */
1340            in_uint32_le(s, len);
1341    
1342            /* read password string */
1343            rdp_in_unistr(s, g_redirect_password, len);
1344    
1345            g_redirect = True;
1346    
1347            return True;
1348    }
1349    
1350  /* Process incoming packets */  /* Process incoming packets */
1351  /* nevers gets out of here till app is done */  /* nevers gets out of here till app is done */
1352  void  void
# Line 1317  rdp_loop(BOOL * deactivated, uint32 * ex Line 1380  rdp_loop(BOOL * deactivated, uint32 * ex
1380                                  DEBUG(("RDP_PDU_DEACTIVATE\n"));                                  DEBUG(("RDP_PDU_DEACTIVATE\n"));
1381                                  *deactivated = True;                                  *deactivated = True;
1382                                  break;                                  break;
1383                            case RDP_PDU_REDIRECT:
1384                                    return process_redirect_pdu(s);
1385                                    break;
1386                          case RDP_PDU_DATA:                          case RDP_PDU_DATA:
1387                                  disc = process_data_pdu(s, ext_disc_reason);                                  disc = process_data_pdu(s, ext_disc_reason);
1388                                  break;                                  break;
# Line 1344  rdp_connect(char *server, uint32 flags, Line 1410  rdp_connect(char *server, uint32 flags,
1410          return True;          return True;
1411  }  }
1412    
1413    /* Establish a reconnection up to the RDP layer */
1414    BOOL
1415    rdp_reconnect(char *server, uint32 flags, char *domain, char *password,
1416                  char *command, char *directory, char *cookie)
1417    {
1418            if (!sec_reconnect(server))
1419                    return False;
1420    
1421            rdp_send_logon_info(flags, domain, g_username, password, command, directory);
1422            return True;
1423    }
1424    
1425    /* Called during redirection to reset the state to support redirection */
1426    void
1427    rdp_reset_state(void)
1428    {
1429            g_next_packet = NULL;   /* reset the packet information */
1430            g_rdp_shareid = 0;
1431            sec_reset_state();
1432    }
1433    
1434  /* Disconnect from the RDP layer */  /* Disconnect from the RDP layer */
1435  void  void
1436  rdp_disconnect(void)  rdp_disconnect(void)
Legend:
Removed from v.945  
changed lines
  Added in v.1042
  ViewVC Help
Powered by ViewVC 1.1.26