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

[netwatch.git] / net / rfb.c

diff --git a/net/rfb.c b/net/rfb.c
index 7b92208b25113d88bb1ef91750e6a299f45f7f84..4f030921709bd0992e0f568a461c32d9716ebf58 100644 (file)
--- a/net/rfb.c
+++ b/net/rfb.c
@@ -366,10 +366,10 @@ enum fsm_result {
 static enum fsm_result recv_fsm(struct tcp_pcb *pcb, struct rfb_state *state) {
        int i;
        int pktsize;
 static enum fsm_result recv_fsm(struct tcp_pcb *pcb, struct rfb_state *state) {
        int i;
        int pktsize;

-
+/*

        outputf("RFB FSM: st %d rp %d wp %d", state->state, state->readpos,
                state->writepos);
        outputf("RFB FSM: st %d rp %d wp %d", state->state, state->readpos,
                state->writepos);

-
+*/

        switch(state->state) {
        case ST_BEGIN:
                if (state->writepos < 12) return NEEDMORE;
        switch(state->state) {
        case ST_BEGIN:
                if (state->writepos < 12) return NEEDMORE;


@@ -552,7 +552,9 @@ static err_t rfb_recv(void *arg, struct tcp_pcb *pcb,
        }
 
        copylen = pbuf_copy_partial(p, state->data + state->writepos, p->tot_len, 0);
        }
 
        copylen = pbuf_copy_partial(p, state->data + state->writepos, p->tot_len, 0);

+/*

        outputf("RFB: Processing %d, wp %d, cp %d", p->tot_len, state->writepos, copylen);
        outputf("RFB: Processing %d, wp %d, cp %d", p->tot_len, state->writepos, copylen);

+*/

        state->writepos += p->tot_len;
 
        tcp_recved(pcb, p->tot_len);
        state->writepos += p->tot_len;
 
        tcp_recved(pcb, p->tot_len);


@@ -565,8 +567,6 @@ static err_t rfb_recv(void *arg, struct tcp_pcb *pcb,
                        goto doneprocessing;
 
                case OK:
                        goto doneprocessing;
 
                case OK:

-                       outputf("RFB FSM: ok");
-

                        if (state->readpos == state->writepos) {
                                state->readpos = 0;
                                state->writepos = 0;
                        if (state->readpos == state->writepos) {
                                state->readpos = 0;
                                state->writepos = 0;