CVS: rdesktop rdpsnd.c,1.27,1.28

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

Modified Files:
	rdpsnd.c 
Log Message:
Update rdpsnd_negotiate() to new information.


Index: rdpsnd.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** rdpsnd.c	6 Dec 2006 13:01:45 -0000	1.27
--- rdpsnd.c	6 Dec 2006 13:11:35 -0000	1.28
***************
*** 96,100 ****
  rdpsnd_process_negotiate(STREAM in)
  {
! 	unsigned int in_format_count, i;
  	WAVEFORMATEX *format;
  	STREAM out;
--- 96,102 ----
  rdpsnd_process_negotiate(STREAM in)
  {
! 	uint16 in_format_count, i;
! 	uint8 pad;
! 	uint16 version;
  	WAVEFORMATEX *format;
  	STREAM out;
***************
*** 103,109 ****
  	int discardcnt;
  
! 	in_uint8s(in, 14);	/* flags, volume, pitch, UDP port */
  	in_uint16_le(in, in_format_count);
! 	in_uint8s(in, 4);	/* pad, status, pad */
  
  	if (current_driver->wave_out_open())
--- 105,113 ----
  	int discardcnt;
  
! 	in_uint8s(in, 14);	/* initial bytes not valid from server */
  	in_uint16_le(in, in_format_count);
! 	in_uint8(in, pad);
! 	in_uint16_le(in, version);
! 	in_uint8s(in, 1);	/* padding */
  
  	if (current_driver->wave_out_open())
***************
*** 156,162 ****
  
  	out_uint16_le(out, format_count);
! 	out_uint8(out, 0x95);	/* pad? */
! 	out_uint16_le(out, 2);	/* status */
! 	out_uint8(out, 0x77);	/* pad? */
  
  	for (i = 0; i < format_count; i++)
--- 160,166 ----
  
  	out_uint16_le(out, format_count);
! 	out_uint8(out, 0);	/* padding */
! 	out_uint16_le(out, 2);	/* version */
! 	out_uint8(out, 0);	/* padding */
  
  	for (i = 0; i < format_count; i++)


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV