From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Sun, 14 Dec 2008 08:26:13 +0000 (-0500)
Subject: Merge nyus.joshuawise.com:/storage/git/netwatch
X-Git-Url: http://git.joshuawise.com/netwatch.git/commitdiff_plain/81fdcc99873a7926940642e33c2e2b25b11a689c?ds=sidebyside;hp=-c

Merge nyus.joshuawise.com:/storage/git/netwatch
---

81fdcc99873a7926940642e33c2e2b25b11a689c
diff --combined net/rfb.c
index cd813eb,13f6fb4..9b9d4e9
--- a/net/rfb.c
+++ b/net/rfb.c
@@@ -126,8 -126,6 +126,8 @@@ struct rfb_state 
  	uint32_t chunk_height;
  
  	uint32_t chunk_lindex;
 +	
 +	uint32_t chunk_checksum;
  
  	uint32_t chunk_actually_sent;
  };
@@@ -190,6 -188,7 +190,6 @@@ static void send_fsm(struct tcp_pcb *pc
  	struct update_header hdr;
  	int lines_left;
  	unsigned char * lptr;
 -	uint32_t checksum;
  	int totaldim;
  	err_t err;
  
@@@ -244,16 -243,17 +244,16 @@@
  
  			/* Do we _actually_ need to send this chunk? */
  			if (fb->checksum_rect) {
 -				checksum = fb->checksum_rect(state->chunk_xpos, state->chunk_ypos,
 -						     state->chunk_width, state->chunk_height);
 +				state->chunk_checksum = fb->checksum_rect(state->chunk_xpos, state->chunk_ypos,
 +								state->chunk_width, state->chunk_height);
  
 -				if (checksum == state->checksums[state->chunk_xnum][state->chunk_ynum]) {
 -					outputf("!!!!!!! SKIPPING: %08x", checksum);
 +				if (state->chunk_checksum == state->checksums[state->chunk_xnum][state->chunk_ynum]) {
 +					outputf("!!!!!!! SKIPPING: %08x", state->chunk_checksum);
  					if (advance_chunk(state))
  						return;
  					continue;
 -				} else {
 -					state->checksums[state->chunk_xnum][state->chunk_ynum] = checksum;
  				}
 +				/* Checksum gets set in data block, AFTER the data has been sent. */
  			}
  
  			outputf("actually sent");
@@@ -290,7 -290,6 +290,7 @@@
  
  			if (lines_left == 0) {
  				state->send_state = SST_HEADER;
 +				state->checksums[state->chunk_xnum][state->chunk_ynum] = state->chunk_checksum;
  				if (advance_chunk(state))
  					return;
  				break;
@@@ -595,6 -594,8 +595,8 @@@ static err_t rfb_accept(void *arg, stru
  	state->writepos = 0;
  	state->update_requested = 0;
  	state->send_state = SST_IDLE;
+ 	state->chunk_xnum = 0;
+ 	state->chunk_ynum = 0;
  	memset(state->checksums, 0, sizeof(state->checksums));
  
  	/* XXX: update_server_info() should be called from the 64ms timer, and deal