/[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 733 by jsorg71, Mon Jul 5 19:09:07 2004 UTC revision 831 by jdmeijer, Tue Mar 8 00:43:10 2005 UTC
# Line 1  Line 1 
1  /* -*- c-basic-offset: 8 -*-  /* -*- c-basic-offset: 8 -*-
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-2005
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
# Line 58  rdp_recv(uint8 * type) Line 58  rdp_recv(uint8 * type)
58                  rdp_s = sec_recv(&rdpver);                  rdp_s = sec_recv(&rdpver);
59                  if (rdp_s == NULL)                  if (rdp_s == NULL)
60                          return NULL;                          return NULL;
61                  if (rdpver != 3)                  if (rdpver == 0xff)
62                    {
63                            g_next_packet = rdp_s->end;
64                            *type = 0;
65                            return rdp_s;
66                    }
67                    else if (rdpver != 3)
68                  {                  {
69                          /* rdp5_process should move g_next_packet ok */                          /* rdp5_process should move g_next_packet ok */
70                          rdp5_process(rdp_s);                          rdp5_process(rdp_s);
# Line 380  static void Line 386  static void
386  rdp_enum_bmpcache2(void)  rdp_enum_bmpcache2(void)
387  {  {
388          STREAM s;          STREAM s;
389          uint8 idlist[BMPCACHE2_NUM_PSTCELLS * sizeof(BITMAP_ID)];          HASH_KEY keylist[BMPCACHE2_NUM_PSTCELLS];
390          uint32 nids, offset, count, flags;          uint32 num_keys, offset, count, flags;
391    
392          offset = 0;          offset = 0;
393          nids = pstcache_enumerate(2, idlist);          num_keys = pstcache_enumerate(2, keylist);
394    
395          while (offset < nids)          while (offset < num_keys)
396          {          {
397                  count = MIN(nids - offset, 169);                  count = MIN(num_keys - offset, 169);
398    
399                  s = rdp_init_data(24 + count * sizeof(BITMAP_ID));                  s = rdp_init_data(24 + count * sizeof(HASH_KEY));
400    
401                  flags = 0;                  flags = 0;
402                  if (offset == 0)                  if (offset == 0)
403                          flags |= PDU_FLAG_FIRST;                          flags |= PDU_FLAG_FIRST;
404                  if (nids - offset <= 169)                  if (num_keys - offset <= 169)
405                          flags |= PDU_FLAG_LAST;                          flags |= PDU_FLAG_LAST;
406    
407                  /* header */                  /* header */
# Line 405  rdp_enum_bmpcache2(void) Line 411  rdp_enum_bmpcache2(void)
411                  out_uint16_le(s, 0);                  out_uint16_le(s, 0);
412                  out_uint16_le(s, 0);                  out_uint16_le(s, 0);
413                  out_uint16_le(s, 0);                  out_uint16_le(s, 0);
414                  out_uint16_le(s, nids);                  out_uint16_le(s, num_keys);
415                  out_uint32_le(s, 0);                  out_uint32_le(s, 0);
416                  out_uint32_le(s, flags);                  out_uint32_le(s, flags);
417    
418                  /* list */                  /* list */
419                  out_uint8a(s, idlist + offset * sizeof(BITMAP_ID),                  out_uint8a(s, keylist[offset], count * sizeof(HASH_KEY));
                                 count * sizeof(BITMAP_ID));  
420    
421                  s_mark_end(s);                  s_mark_end(s);
422                  rdp_send_data(s, 0x2b);                  rdp_send_data(s, 0x2b);
# Line 490  rdp_out_order_caps(STREAM s) Line 495  rdp_out_order_caps(STREAM s)
495  {  {
496          uint8 order_caps[32];          uint8 order_caps[32];
497    
   
498          memset(order_caps, 0, 32);          memset(order_caps, 0, 32);
499          order_caps[0] = 1;      /* dest blt */          order_caps[0] = 1;      /* dest blt */
500          order_caps[1] = 1;      /* pat blt */          order_caps[1] = 1;      /* pat blt */
501          order_caps[2] = 1;      /* screen blt */          order_caps[2] = 1;      /* screen blt */
502          order_caps[3] = (g_bitmap_cache ? 1 : 0);       /* memblt */          order_caps[3] = (g_bitmap_cache ? 1 : 0);       /* memblt */
503            order_caps[4] = 0;      /* triblt */
504          order_caps[8] = 1;      /* line */          order_caps[8] = 1;      /* line */
505          order_caps[9] = 1;      /* line */          order_caps[9] = 1;      /* line */
506          order_caps[10] = 1;     /* rect */          order_caps[10] = 1;     /* rect */
507          order_caps[11] = (g_desktop_save == False ? 0 : 1);     /* desksave */          order_caps[11] = (g_desktop_save == False ? 0 : 1);     /* desksave */
508          order_caps[13] = 1;     /* memblt */          order_caps[13] = 1;     /* memblt */
509          order_caps[14] = 1;     /* triblt */          order_caps[14] = 1;     /* triblt */
510            order_caps[20] = 1;     /* polygon */
511            order_caps[21] = 1;     /* polygon2 */
512          order_caps[22] = 1;     /* polyline */          order_caps[22] = 1;     /* polyline */
513            order_caps[25] = 1;     /* ellipse */
514            order_caps[26] = 1;     /* ellipse2 */
515          order_caps[27] = 1;     /* text2 */          order_caps[27] = 1;     /* text2 */
516          out_uint16_le(s, RDP_CAPSET_ORDER);          out_uint16_le(s, RDP_CAPSET_ORDER);
517          out_uint16_le(s, RDP_CAPLEN_ORDER);          out_uint16_le(s, RDP_CAPLEN_ORDER);
# Line 561  rdp_out_bmpcache2_caps(STREAM s) Line 570  rdp_out_bmpcache2_caps(STREAM s)
570          {          {
571                  out_uint32_le(s, BMPCACHE2_C2_CELLS);                  out_uint32_le(s, BMPCACHE2_C2_CELLS);
572          }          }
573          out_uint8s(s, 20);              /* other bitmap caches not used */          out_uint8s(s, 20);      /* other bitmap caches not used */
574  }  }
575    
576  /* Output control capability set */  /* Output control capability set */
# Line 652  static uint8 caps_0x10[] = { Line 661  static uint8 caps_0x10[] = {
661    
662  /* Output unknown capability sets */  /* Output unknown capability sets */
663  static void  static void
664  rdp_out_unknown_caps(STREAM s, uint16 id, uint16 length, uint8 *caps)  rdp_out_unknown_caps(STREAM s, uint16 id, uint16 length, uint8 * caps)
665  {  {
666          out_uint16_le(s, id);          out_uint16_le(s, id);
667          out_uint16_le(s, length);          out_uint16_le(s, length);
# Line 672  rdp_send_confirm_active(void) Line 681  rdp_send_confirm_active(void)
681                  RDP_CAPLEN_BMPCACHE + RDP_CAPLEN_COLCACHE +                  RDP_CAPLEN_BMPCACHE + RDP_CAPLEN_COLCACHE +
682                  RDP_CAPLEN_ACTIVATE + RDP_CAPLEN_CONTROL +                  RDP_CAPLEN_ACTIVATE + RDP_CAPLEN_CONTROL +
683                  RDP_CAPLEN_POINTER + RDP_CAPLEN_SHARE +                  RDP_CAPLEN_POINTER + RDP_CAPLEN_SHARE +
684                  0x58 + 0x08 + 0x08 + 0x34 /* unknown caps */ +                  0x58 + 0x08 + 0x08 + 0x34 /* unknown caps */  +
685                  4 /* w2k fix, why? */ ;                  4 /* w2k fix, why? */ ;
686    
687          s = sec_init(sec_flags, 6 + 14 + caplen + sizeof(RDP_SOURCE));          s = sec_init(sec_flags, 6 + 14 + caplen + sizeof(RDP_SOURCE));
# Line 700  rdp_send_confirm_active(void) Line 709  rdp_send_confirm_active(void)
709          rdp_out_pointer_caps(s);          rdp_out_pointer_caps(s);
710          rdp_out_share_caps(s);          rdp_out_share_caps(s);
711    
712          rdp_out_unknown_caps(s, 0x0d, 0x58, caps_0x0d); /* international? */          rdp_out_unknown_caps(s, 0x0d, 0x58, caps_0x0d); /* international? */
713          rdp_out_unknown_caps(s, 0x0c, 0x08, caps_0x0c);          rdp_out_unknown_caps(s, 0x0c, 0x08, caps_0x0c);
714          rdp_out_unknown_caps(s, 0x0e, 0x08, caps_0x0e);          rdp_out_unknown_caps(s, 0x0e, 0x08, caps_0x0e);
715          rdp_out_unknown_caps(s, 0x10, 0x34, caps_0x10); /* glyph cache? */          rdp_out_unknown_caps(s, 0x10, 0x34, caps_0x10); /* glyph cache? */
716                                    
717          s_mark_end(s);          s_mark_end(s);
718          sec_send(s, sec_flags);          sec_send(s, sec_flags);
719  }  }
# Line 748  rdp_process_bitmap_caps(STREAM s) Line 757  rdp_process_bitmap_caps(STREAM s)
757          if (g_width != width || g_height != height)          if (g_width != width || g_height != height)
758          {          {
759                  warning("screen size changed from %dx%d to %dx%d\n", g_width, g_height,                  warning("screen size changed from %dx%d to %dx%d\n", g_width, g_height,
760                                  width, height);                          width, height);
761                  g_width = width;                  g_width = width;
762                  g_height = height;                  g_height = height;
763                  ui_resize_window();                  ui_resize_window();
# Line 1086  process_data_pdu(STREAM s, uint32 * ext_ Line 1095  process_data_pdu(STREAM s, uint32 * ext_
1095    
1096          if (ctype & RDP_MPPC_COMPRESSED)          if (ctype & RDP_MPPC_COMPRESSED)
1097          {          {
1098                    if (len > RDP_MPPC_DICT_SIZE)
1099                            error("error decompressed packet size exceeds max\n");
1100                  if (mppc_expand(s->p, clen, ctype, &roff, &rlen) == -1)                  if (mppc_expand(s->p, clen, ctype, &roff, &rlen) == -1)
1101                          error("error while decompressing packet\n");                          error("error while decompressing packet\n");
1102    

Legend:
Removed from v.733  
changed lines
  Added in v.831

  ViewVC Help
Powered by ViewVC 1.1.26