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 ae26d0bac81d32c8408bca9a7f3ed0b070872670..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 <tables.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
@@ -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);
-       mem_free(state);
        mem_free(state->blockbuf);
+       mem_free(state);
        tcp_close(pcb);
        outputf("close_conn: done");
 }
@@ -644,7 +655,7 @@ static err_t rfb_accept(void *arg, struct tcp_pcb *pcb, err_t err) {
        return ERR_OK;
 }
 
-void rfb_init() {
+static void rfb_init() {
        struct tcp_pcb *pcb;
 
        init_server_info();
@@ -654,3 +665,5 @@ void rfb_init() {
        pcb = tcp_listen(pcb);
        tcp_accept(pcb, rfb_accept);
 }
+
+PROTOCOL(rfb_init);