CVS: rdesktop rdesktop.c,1.113,1.114 rdp.c,1.68,1.69 rdp5.c,1.12,1.13

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18436

Modified Files:
	rdesktop.c rdp.c rdp5.c 
Log Message:
added option for rdp compression

Index: rdesktop.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** rdesktop.c	9 Aug 2004 13:50:40 -0000	1.113
--- rdesktop.c	11 Sep 2004 22:57:42 -0000	1.114
***************
*** 123,126 ****
--- 123,127 ----
  	fprintf(stderr, "   -X: embed into another window with a given id.\n");
  	fprintf(stderr, "   -a: connection colour depth\n");
+ 	fprintf(stderr, "   -z: enable rdp compression\n");
  	fprintf(stderr, "   -x: RDP5 experience (m[odem 28.8], b[roadband], l[an] or hex nr.)\n");
  	fprintf(stderr, "   -P: use persistent bitmap caching\n");
***************
*** 364,368 ****
  
  	while ((c = getopt(argc, argv,
! 			   VNCOPT "u:d:s:c:p:n:k:g:fbBeEmCDKS:T:NX:a:x:Pr:045h?")) != -1)
  	{
  		switch (c)
--- 365,369 ----
  
  	while ((c = getopt(argc, argv,
! 			   VNCOPT "u:d:s:c:p:n:k:g:fbBeEmzCDKS:T:NX:a:x:Pr:045h?")) != -1)
  	{
  		switch (c)
***************
*** 525,530 ****
  				break;
  
! 			case 'x':
  
  				if (strncmp("modem", optarg, 1) == 0)
  				{
--- 526,535 ----
  				break;
  
! 			case 'z':
! 				DEBUG(("rdp compression enabled\n"));
! 				flags |= RDP_COMPRESSION;
! 				break;
  
+ 			case 'x':
  				if (strncmp("modem", optarg, 1) == 0)
  				{
***************
*** 848,852 ****
  xrealloc(void *oldmem, int size)
  {
! 	void *mem = realloc(oldmem, size);
  	if (mem == NULL)
  	{
--- 853,861 ----
  xrealloc(void *oldmem, int size)
  {
! 	void * mem;
! 
! 	if (size < 1)
! 		size = 1;
! 	mem = realloc(oldmem, size);
  	if (mem == NULL)
  	{

Index: rdp.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdp.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** rdp.c	12 Jul 2004 21:07:39 -0000	1.68
--- rdp.c	11 Sep 2004 22:57:42 -0000	1.69
***************
*** 1072,1075 ****
--- 1072,1076 ----
  	uint16 clen;
  	uint32 len;
+ 	static int max_size;
  
  	uint32 roff, rlen;
***************
*** 1086,1090 ****
  	if (ctype & RDP_MPPC_COMPRESSED)
  	{
! 
  		if (mppc_expand(s->p, clen, ctype, &roff, &rlen) == -1)
  			error("error while decompressing packet\n");
--- 1087,1092 ----
  	if (ctype & RDP_MPPC_COMPRESSED)
  	{
! 		if (len > RDP_MPPC_DICT_SIZE)
! 		  error("error decompressed packet size exceeds max\n");
  		if (mppc_expand(s->p, clen, ctype, &roff, &rlen) == -1)
  			error("error while decompressing packet\n");

Index: rdp5.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdp5.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** rdp5.c	5 Jul 2004 19:09:07 -0000	1.12
--- rdp5.c	11 Sep 2004 22:57:42 -0000	1.13
***************
*** 61,65 ****
  		if (ctype & RDP_MPPC_COMPRESSED)
  		{
! 
  			if (mppc_expand(s->p, length, ctype, &roff, &rlen) == -1)
  				error("error while decompressing packet\n");
--- 61,66 ----
  		if (ctype & RDP_MPPC_COMPRESSED)
  		{
! 			if (length > RDP_MPPC_DICT_SIZE)
! 			  error("error decompressed packet size exceeds max\n");
  			if (mppc_expand(s->p, length, ctype, &roff, &rlen) == -1)
  				error("error while decompressing packet\n");



-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM. 
Deadline: Sept. 13. Go here: http://sf.net/ppc_contest.php