Remove demapper from pagingstub.c, since that code is now elsewhere. Correct locatio...

[netwatch.git] / net / rfb.c

diff --git a/net/rfb.c b/net/rfb.c
index 4f030921709bd0992e0f568a461c32d9716ebf58..de816887f5481932e2d98b3f84f28e8b86a2f09a 100644 (file)
--- a/net/rfb.c
+++ b/net/rfb.c
@@ -1,13 +1,24 @@
+/* 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>
 #include <fb.h>
 #include <keyboard.h>
 #include <stdint.h>
 #include <minilib.h>
 #include <output.h>
 #include <fb.h>
 #include <keyboard.h>

+#include <tables.h>

 
 #include "lwip/tcp.h"
 #include "lwip/stats.h"
 
 
 #include "lwip/tcp.h"
 #include "lwip/stats.h"
 

-#include "rfb.h"
+#define RFB_PORT               5900

 
 #define SET_PIXEL_FORMAT       0
 #define SET_ENCODINGS          2
 
 #define SET_PIXEL_FORMAT       0
 #define SET_ENCODINGS          2


@@ -181,7 +192,7 @@ static int advance_chunk(struct rfb_state *state) {
                state->chunk_ynum = 0;
                state->send_state = SST_IDLE;
                if (!(state->chunk_actually_sent))
                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;
        }
 
                        return 1;
        }
 


@@ -333,13 +344,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;
 
 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;
                }
        }
        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();
 */
 /*
        stats_display();
 */


@@ -351,8 +362,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);
        tcp_arg(pcb, NULL);
        tcp_sent(pcb, NULL);
        tcp_recv(pcb, NULL);

-       mem_free(state);

        mem_free(state->blockbuf);
        mem_free(state->blockbuf);

+       mem_free(state);

        tcp_close(pcb);
        outputf("close_conn: done");
 }
        tcp_close(pcb);
        outputf("close_conn: done");
 }


@@ -428,7 +439,6 @@ static enum fsm_result recv_fsm(struct tcp_pcb *pcb, struct rfb_state *state) {
        case ST_MAIN:
                if (state->writepos < 1) return NEEDMORE;
 
        case ST_MAIN:
                if (state->writepos < 1) return NEEDMORE;
 

-               outputf("RFB: cmd %d", state->data[0]);

                switch (state->data[0]) {
 
                case SET_PIXEL_FORMAT:
                switch (state->data[0]) {
 
                case SET_PIXEL_FORMAT:


@@ -552,9 +562,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);


@@ -645,7 +655,7 @@ static err_t rfb_accept(void *arg, struct tcp_pcb *pcb, err_t err) {
        return ERR_OK;
 }
 
        return ERR_OK;
 }
 

-void rfb_init() {
+static void rfb_init() {

        struct tcp_pcb *pcb;
 
        init_server_info();
        struct tcp_pcb *pcb;
 
        init_server_info();


@@ -655,3 +665,5 @@ void rfb_init() {
        pcb = tcp_listen(pcb);
        tcp_accept(pcb, rfb_accept);
 }
        pcb = tcp_listen(pcb);
        tcp_accept(pcb, rfb_accept);
 }

+
+PROTOCOL(rfb_init);