Apply patches from jdpotter@google.com, as submitted to NetWatch Maintainer Team...

[netwatch.git] / net / rfb.c

diff --git a/net/rfb.c b/net/rfb.c
index 4f030921709bd0992e0f568a461c32d9716ebf58..514dfc71e0837b4061984c2a6a065a873d948531 100644 (file)
--- a/net/rfb.c
+++ b/net/rfb.c
@@ -1,3 +1,13 @@
+/* rfb.c
+ * Remote framebuffer server
+ * NetWatch system management mode administration console
+ *
+ * Copyright (c) 2008 Jacob Potter and Joshua Wise.  All rights reserved.
+ * This program is free software; you can redistribute and/or modify it under
+ * the terms found in the file LICENSE in the root of this source tree.
+ *
+ */
+
 #include <stdint.h>
 #include <minilib.h>
 #include <output.h>
@@ -181,7 +191,7 @@ static int advance_chunk(struct rfb_state *state) {
                state->chunk_ynum = 0;
                state->send_state = SST_IDLE;
                if (!(state->chunk_actually_sent))
-                       state->try_in_a_bit = 2;
+                       state->try_in_a_bit = 1;
                        return 1;
        }
 
@@ -333,13 +343,13 @@ static err_t rfb_sent(void *arg, struct tcp_pcb *pcb, uint16_t len) {
 
 static err_t rfb_poll(void *arg, struct tcp_pcb *pcb) {
        struct rfb_state *state = arg;
-       send_fsm(pcb, state);
        if (state->try_in_a_bit) {
                state->try_in_a_bit--;
                if (!(state->try_in_a_bit)) {
                        state->update_requested = 1;
                }
        }
+       send_fsm(pcb, state);
 /*
        stats_display();
 */
@@ -351,8 +361,8 @@ static void close_conn(struct tcp_pcb *pcb, struct rfb_state *state) {
        tcp_arg(pcb, NULL);
        tcp_sent(pcb, NULL);
        tcp_recv(pcb, NULL);
-       mem_free(state);
        mem_free(state->blockbuf);
+       mem_free(state);
        tcp_close(pcb);
        outputf("close_conn: done");
 }
@@ -428,7 +438,6 @@ static enum fsm_result recv_fsm(struct tcp_pcb *pcb, struct rfb_state *state) {
        case ST_MAIN:
                if (state->writepos < 1) return NEEDMORE;
 
-               outputf("RFB: cmd %d", state->data[0]);
                switch (state->data[0]) {
 
                case SET_PIXEL_FORMAT:
@@ -552,9 +561,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);
-/*
+
        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);