Only memcpy as much as we need to when we need to.

[netwatch.git] / net / rfb.c

diff --git a/net/rfb.c b/net/rfb.c
index eff9c41dc6267decbe69f3752246d962e16f2121..1f620f0dcec9d8354f7a049f31a7044eac857472 100644 (file)
--- a/net/rfb.c
+++ b/net/rfb.c
@@ -164,8 +164,7 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) {
                        break;
                }
        
                        break;
                }
        

-               /* potential FALL THROUGH */
-
+               /* FALL THROUGH to SST_NEEDS_UPDATE*/

        case SST_NEEDS_UPDATE:
                outputf("RFB send: sending header");
                /* Send a header */
        case SST_NEEDS_UPDATE:
                outputf("RFB send: sending header");
                /* Send a header */


@@ -177,16 +176,13 @@ 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);
                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;
 
 
                state->update_pos = 0;
                state->send_state = SST_SENDING;
 

-               /* FALL THROUGH */
-
+               /* FALL THROUGH to SST_SENDING*/

        case SST_SENDING:
        case SST_SENDING:

-

                while (1) {
                        left = state->frame_bytes - state->update_pos;
 
                while (1) {
                        left = state->frame_bytes - state->update_pos;
 


@@ -194,30 +190,22 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) {
                                state->send_state = SST_IDLE;
                                break;
                        }
                                state->send_state = SST_IDLE;
                                break;
                        }

+                       
+                       if (left > 8192)        /* Sounds good enough to me. */
+                               left = 8192;

 
 

-                       if (left > tcp_mss(pcb)) {
-                               sndlength = tcp_mss(pcb);
-                       } else {
-                               sndlength = left;
-                       }
-
+                       sndlength = left;

                        do {
                        do {

-                               err = tcp_write(pcb, fb->fbaddr + state->update_pos, sndlength, 0);
-                               if (err == ERR_MEM) {
-                                       outputf("RFB: ERR_MEM sending %d", sndlength);
+                               err = tcp_write(pcb, fb->fbaddr + state->update_pos, sndlength, TCP_WRITE_FLAG_COPY /* The card can't DMA from there. */);
+                               if (err == ERR_MEM)             /* Back down until lwip says we've got space. */

                                        sndlength /= 2;
                                        sndlength /= 2;

-                               }

                        } while (err == ERR_MEM && sndlength > 1);
 
                        } while (err == ERR_MEM && sndlength > 1);
 

-                       if (err == ERR_OK) {
-                               outputf("RFB: attempting send %d", sndlength);
-                       } else {
-                               outputf("RFB: send error %d", err);
-                               break;
-                       }
-
-                       if (tcp_output(pcb) != ERR_OK) {
-                               outputf("RFB: tcp_output has had enough");
+                       if (err != ERR_OK) {
+                               if (err != ERR_MEM)
+                                       outputf("RFB: send error %d", err);
+                               
+                               /* We'll just give up for now and come back when we have space later. */

                                break;
                        }
 
                                break;
                        }
 


@@ -230,6 +218,9 @@ static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) {
 
                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) {
 }
 
 static err_t rfb_sent(void *arg, struct tcp_pcb *pcb, uint16_t len) {


@@ -309,7 +300,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);
                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;
                tcp_output(pcb);
 
                return OK;


@@ -347,7 +338,6 @@ static enum fsm_result recv_fsm(struct tcp_pcb *pcb, struct rfb_state *state) {
                        for (i = 0; i < ntohs(req->num); i++) {
                                outputf("RFB: Encoding: %d", ntohl(req->encodings[i]));
                                /* XXX ... */
                        for (i = 0; i < ntohs(req->num); i++) {
                                outputf("RFB: Encoding: %d", ntohl(req->encodings[i]));
                                /* XXX ... */

-

                        }
 
                        state->readpos += pktsize;
                        }
 
                        state->readpos += pktsize;


@@ -454,7 +444,7 @@ static err_t rfb_recv(void *arg, struct tcp_pcb *pcb,
                case OK:
                        outputf("RFB FSM: ok");
 
                case OK:
                        outputf("RFB FSM: ok");
 

-                       /* Might as well send now... */
+                       /* Kick off a send. */

                        if (state->send_state == SST_IDLE
                            && state->update_requested) {
                                send_fsm(pcb, state);
                        if (state->send_state == SST_IDLE
                            && state->update_requested) {
                                send_fsm(pcb, state);