RFB should flag copies properly, and only commit output when it needs to.

[netwatch.git] / net / rfb.c

diff --git a/net/rfb.c b/net/rfb.c
index eac1bdd94b973b91f73d58d29f8d855945562039..ff0f0895b6bff8548b5c81c7a8263e3d703e6316 100644 (file)
--- a/net/rfb.c
+++ b/net/rfb.c
@@ -169,7 +169,7 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) {
        case SST_NEEDS_UPDATE:
                outputf("RFB send: sending header");
                /* Send a header */
-               state->frame_bytes = fb->curmode.xres * fb->curmode.yres * 3; /* XXX */
+               state->frame_bytes = fb->curmode.xres * fb->curmode.yres * fb->curmode.bytestride;
                hdr.msgtype = 0;
                hdr.nrects = htons(1);
                hdr.xpos = htons(0);
@@ -177,8 +177,7 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) {
                hdr.width = htons(fb->curmode.xres);
                hdr.height = htons(fb->curmode.yres);
                hdr.enctype = htonl(0);
-               tcp_write(pcb, &hdr, sizeof(hdr), 0);
-               tcp_output(pcb);
+               tcp_write(pcb, &hdr, sizeof(hdr), TCP_WRITE_FLAG_COPY);
 
                state->update_pos = 0;
                state->send_state = SST_SENDING;
@@ -186,37 +185,57 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) {
                /* FALL THROUGH */
 
        case SST_SENDING:
-               left = state->frame_bytes - state->update_pos;
 
-               if (left > tcp_sndbuf(pcb)) {
-                       sndlength = tcp_sndbuf(pcb);
-               } else {
-                       sndlength = left;
-               }
+               while (1) {
+                       unsigned char mbuf[8192 /* XXX magic */];
+                       
+                       left = state->frame_bytes - state->update_pos;
 
-               do {
-                       err = tcp_write(pcb, fb->fbaddr + state->update_pos, sndlength, 0);
-                       if (err == ERR_MEM) {
-                               outputf("RFB: ERR_MEM sending %d", sndlength);
-                               sndlength /= 2;
+                       if (left == 0) {
+                               state->send_state = SST_IDLE;
+                               break;
                        }
-               } while (err == ERR_MEM && sndlength > 1);
+                       
+                       if (left > 8192)
+                               left = 8192;
 
-               if (err == ERR_OK) {
-                       outputf("RFB: sent %d", sndlength);
-                       state->update_pos += sndlength;
-               } else {
-                       outputf("RFB: send error %d", err);
-               }
+                       if (left > tcp_mss(pcb)) {
+                               sndlength = tcp_mss(pcb);
+                       } else {
+                               sndlength = left;
+                       }
+                       
+                       memcpy(mbuf, fb->fbaddr + state->update_pos, sndlength);        /* It's OK if it becomes smaller later. */
+
+                       do {
+                               err = tcp_write(pcb, mbuf, sndlength, TCP_WRITE_FLAG_COPY /* This is my memory on the stack, thank you very much. */);
+                               if (err == ERR_MEM) {
+                                       outputf("RFB: ERR_MEM sending %d", sndlength);
+                                       sndlength /= 2;
+                               }
+                       } while (err == ERR_MEM && sndlength > 1);
+
+                       if (err == ERR_OK) {
+                               outputf("RFB: attempting send %d", sndlength);
+                       } else {
+                               outputf("RFB: send error %d", err);
+                               break;
+                       }
 
-               tcp_output(pcb);
+                       state->update_pos += sndlength;
 
-               if (state->update_pos == state->frame_bytes) {
-                       state->send_state = SST_IDLE;
+                       if (tcp_sndbuf(pcb) == 0) {
+                               break;
+                       }
                }
 
                break;
        }
+       
+       if (tcp_output(pcb) != ERR_OK)
+       {
+               outputf("RFB: tcp_output bailed in send_fsm?");
+       }
 }
 
 static err_t rfb_sent(void *arg, struct tcp_pcb *pcb, uint16_t len) {
@@ -296,7 +315,7 @@ static enum fsm_result recv_fsm(struct tcp_pcb *pcb, struct rfb_state *state) {
                state->state = ST_MAIN;
 
                outputf("RFB: Sending server info", state->version);
-               tcp_write(pcb, &server_info, sizeof(server_info), 0);
+               tcp_write(pcb, &server_info, sizeof(server_info), TCP_WRITE_FLAG_COPY);
                tcp_output(pcb);
 
                return OK;