X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/7da36fbdd33af46634d7ac7a6ebae1ea213f64dd..2e581707f488e66ecce37a7343c813e071fd6beb:/net/rfb.c diff --git a/net/rfb.c b/net/rfb.c index 65323d1..39efeff 100644 --- a/net/rfb.c +++ b/net/rfb.c @@ -3,7 +3,10 @@ #include #include +#include "../aseg-paging/keyboard.h" + #include "lwip/tcp.h" +#include "lwip/stats.h" #include "rfb.h" @@ -14,7 +17,10 @@ #define POINTER_EVENT 5 #define CLIENT_CUT_TEXT 6 -#define RFB_BUF_SIZE 2048 +#define RFB_BUF_SIZE 512 + +#define SCREEN_CHUNKS_X 4 +#define SCREEN_CHUNKS_Y 8 struct pixel_format { uint8_t bpp; @@ -75,6 +81,17 @@ struct text_event_pkt { char text[]; }; +struct update_header { + uint8_t msgtype; + uint8_t padding; + uint16_t nrects; + uint16_t xpos; + uint16_t ypos; + uint16_t width; + uint16_t height; + int32_t enctype; +}; + struct rfb_state { enum { ST_BEGIN, @@ -89,31 +106,49 @@ struct rfb_state { int writepos; char next_update_incremental; + char update_requested; + struct fb_update_req client_interest_area; - int needs_updated; + enum { + SST_IDLE, + SST_NEEDS_UPDATE, + SST_SENDING + } send_state; + + uint32_t checksums[SCREEN_CHUNKS_X][SCREEN_CHUNKS_Y]; + + uint32_t chunk_xnum; + uint32_t chunk_ynum; + uint32_t chunk_xpos; + uint32_t chunk_ypos; + uint32_t chunk_width; + uint32_t chunk_height; + + uint32_t chunk_lindex; }; static struct server_init_message server_info; static void init_server_info() { - server_info.name_length = 8; + server_info.name_length = htonl(8); memcpy(server_info.name_string, "NetWatch", 8); } static void update_server_info() { if (fb != NULL) { - server_info.fb_width = fb->curmode.xres; - server_info.fb_height = fb->curmode.yres; + outputf("RFB: setting fmt %d", fb->curmode.format); + server_info.fb_width = htons(fb->curmode.xres); + server_info.fb_height = htons(fb->curmode.yres); switch (fb->curmode.format) { case FB_RGB888: server_info.fmt.bpp = 32; server_info.fmt.depth = 24; server_info.fmt.big_endian = 0; server_info.fmt.true_color = 1; - server_info.fmt.red_max = 255; - server_info.fmt.green_max = 255; - server_info.fmt.blue_max = 255; + server_info.fmt.red_max = htons(255); + server_info.fmt.green_max = htons(255); + server_info.fmt.blue_max = htons(255); server_info.fmt.red_shift = 0; server_info.fmt.green_shift = 8; server_info.fmt.blue_shift = 16; @@ -122,9 +157,185 @@ static void update_server_info() { outputf("RFB: unknown fb fmt %d", fb->curmode.format); break; } + } else { + outputf("RFB: fb null"); } } +static void send_fsm(struct tcp_pcb *pcb, struct rfb_state *state) { + struct update_header hdr; + int lines_left; + char * lptr; + uint32_t checksum; + int totaldim; + err_t err; + + switch (state->send_state) { + case SST_IDLE: + /* Nothing to do */ + if (state->update_requested) { + outputf("RFB send: update requested"); + state->update_requested = 0; + state->send_state = SST_NEEDS_UPDATE; + } else { + break; + } + + /* FALL THROUGH to SST_NEEDS_UPDATE */ + + case SST_NEEDS_UPDATE: + + state->chunk_xnum = 0; + state->chunk_ynum = 0; + state->chunk_width = 0; + state->chunk_height = 0; + state->chunk_lindex = 0; + state->send_state = SST_SENDING; + + /* FALL THROUGH to SST_SENDING */ + + case SST_SENDING: + + while (1) { + lines_left = state->chunk_height - state->chunk_lindex; + + if (lines_left == 0) { + /* Advance to the next chunk if necessary. If + * state->chunk_height is zero, then we are + * arriving here for the first time from + * SST_NEEDS_UPDATE. */ + + if (state->chunk_height != 0) { + state->chunk_xnum += 1; + } + + if (state->chunk_xnum == SCREEN_CHUNKS_X) { + state->chunk_ynum += 1; + state->chunk_xnum = 0; + } + + if (state->chunk_ynum == SCREEN_CHUNKS_Y) { + state->send_state = SST_IDLE; + outputf("RFB: Screen update done! %d", state->update_requested); + break; + } + + /* Calculate the width and height for this chunk, remembering + * that if SCREEN_CHUNKS_[XY] do not evenly divide the width and + * height, we may need to have shorter chunks at the edge of + * the screen. */ + + state->chunk_width = fb->curmode.xres / SCREEN_CHUNKS_X; + if (fb->curmode.xres % SCREEN_CHUNKS_X != 0) + state->chunk_width += 1; + state->chunk_xpos = state->chunk_width * state->chunk_xnum; + totaldim = state->chunk_width * (state->chunk_xnum + 1); + if (totaldim > fb->curmode.xres) { + state->chunk_width -= (totaldim - fb->curmode.xres); + } + + state->chunk_height = fb->curmode.yres / SCREEN_CHUNKS_Y; + if (fb->curmode.yres % SCREEN_CHUNKS_Y != 0) + state->chunk_height += 1; + state->chunk_ypos = state->chunk_height + * state->chunk_ynum; + totaldim = state->chunk_height * (state->chunk_ynum + 1); + if (totaldim > fb->curmode.yres) { + state->chunk_height -= (totaldim - fb->curmode.yres); + } + + if (fb->checksum_rect) { + checksum = fb->checksum_rect(state->chunk_xpos, state->chunk_ypos, + state->chunk_width, state->chunk_height); + + if (checksum == state->checksums[state->chunk_xnum][state->chunk_ynum]) { + state->chunk_lindex = state->chunk_height; + continue; + } else { + state->checksums[state->chunk_xnum][state->chunk_ynum] = checksum; + } + } +/* + outputf("RFB send: sending header"); +*/ + /* Send a header */ + hdr.msgtype = 0; + state->chunk_lindex = 0; + hdr.nrects = htons(1); + hdr.xpos = htons(state->chunk_xpos); + hdr.ypos = htons(state->chunk_ypos); + hdr.width = htons(state->chunk_width); + hdr.height= htons(state->chunk_height); + hdr.enctype = htonl(0); + lines_left = state->chunk_height; + + err = tcp_write(pcb, &hdr, sizeof(hdr), TCP_WRITE_FLAG_COPY); + + if (err != ERR_OK) { + if (err != ERR_MEM) + outputf("RFB: header send error %d", err); + + /* Crap. Reset chunk_height to 0 so that next time around, + * we'll recalculate this chunk (not advance) and try to + * send the header again. + */ + state->chunk_height = 0; + } + } + + do { + lptr = fb->fbaddr + + (fb->curmode.xres * fb->curmode.bytestride + * (state->chunk_ypos + state->chunk_lindex)) + + (state->chunk_xpos * fb->curmode.bytestride); + + /* The network card can't DMA from video RAM, + * so use TCP_WRITE_FLAG_COPY. */ + err = tcp_write(pcb, lptr, + fb->curmode.bytestride * state->chunk_width, + TCP_WRITE_FLAG_COPY); + + if (err == ERR_OK) { + state->chunk_lindex += 1; + } + + } while (err == ERR_OK && state->chunk_lindex < state->chunk_height); + + if (err != ERR_OK) { + if (err != ERR_MEM) + outputf("RFB: send error %d", err); + + break; + } + + if (tcp_sndbuf(pcb) == 0) { + 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) { + struct rfb_state *state = arg; + send_fsm(pcb, state); + return ERR_OK; +} + +static err_t rfb_poll(void *arg, struct tcp_pcb *pcb) { + struct rfb_state *state = arg; + state->update_requested = 1; + send_fsm(pcb, state); +/* + stats_display(); +*/ + return ERR_OK; +} + static void close_conn(struct tcp_pcb *pcb, struct rfb_state *state) { tcp_arg(pcb, NULL); tcp_sent(pcb, NULL); @@ -140,6 +351,11 @@ enum fsm_result { }; 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); switch(state->state) { case ST_BEGIN: @@ -165,25 +381,33 @@ static enum fsm_result recv_fsm(struct tcp_pcb *pcb, struct rfb_state *state) { state->readpos += 12; state->state = ST_CLIENTINIT; - /* We support one security type, currently "none". */ + /* We support one security type, currently "none". + * Send that and SecurityResult. */ if (state->version >= 7) { - tcp_write(pcb, "\x01\x01", 2, 0); + tcp_write(pcb, "\x01\x01\x00\x00\x00\x00", 6, 0); } else { - tcp_write(pcb, "\x01", 1, 0); + tcp_write(pcb, "\x01\x00\x00\x00\x00", 5, 0); } - /* ... and go right ahead and send SecurityResult message. */ - tcp_write(pcb, "\x00\x00\x00\x01", 4, 0); tcp_output(pcb); return OK; case ST_CLIENTINIT: - if (state->writepos < 1) return NEEDMORE; - state->readpos += 1; + if (state->version >= 7) { + /* Ignore the security type and ClientInit */ + if (state->writepos < 2) return NEEDMORE; + state->readpos += 2; + } else { + /* Just ClientInit */ + if (state->writepos < 1) return NEEDMORE; + state->readpos += 1; + } + state->state = ST_MAIN; - tcp_write(pcb, &server_info, sizeof(server_info), 0); + outputf("RFB: Sending server info", state->version); + tcp_write(pcb, &server_info, sizeof(server_info), TCP_WRITE_FLAG_COPY); tcp_output(pcb); return OK; @@ -191,12 +415,14 @@ 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: /* SetPixelFormat */ if (state->writepos < (sizeof(struct pixel_format) + 4)) return NEEDMORE; + outputf("RFB: SetPixelFormat"); /* struct pixel_format * new_fmt = (struct pixel_format *)(&state->data[4]); @@ -211,20 +437,25 @@ static enum fsm_result recv_fsm(struct tcp_pcb *pcb, struct rfb_state *state) { struct set_encs_req * req = (struct set_encs_req *)state->data; - if (state->writepos < (sizeof(struct set_encs_req) - + 4 * req->num)) - return NEEDMORE; + pktsize = sizeof(struct set_encs_req) + (4 * ntohs(req->num)); - /* XXX ... */ + outputf("RFB: SetEncodings [%d]", ntohs(req->num)); + if (state->writepos < pktsize) return NEEDMORE; + + for (i = 0; i < ntohs(req->num); i++) { + outputf("RFB: Encoding: %d", ntohl(req->encodings[i])); + /* XXX ... */ + } - state->readpos += (4 * req->num) + sizeof(struct set_encs_req); + state->readpos += pktsize; return OK; case FB_UPDATE_REQUEST: if (state->writepos < sizeof(struct fb_update_req)) return NEEDMORE; + outputf("RFB: UpdateRequest"); - state->needs_updated = 1; + state->update_requested = 1; memcpy(&state->client_interest_area, state->data, sizeof(struct fb_update_req)); @@ -235,7 +466,10 @@ static enum fsm_result recv_fsm(struct tcp_pcb *pcb, struct rfb_state *state) { if (state->writepos < sizeof(struct key_event_pkt)) return NEEDMORE; - /* XXX stub */ + struct key_event_pkt * p = (struct key_event_pkt *)state->data; + + outputf("RFB: Key: %d (%c)", htonl(p->keysym), (htonl(p->keysym) & 0xFF)); + kbd_inject_keysym(htonl(p->keysym), p->downflag); state->readpos += sizeof(struct key_event_pkt); return OK; @@ -243,6 +477,7 @@ static enum fsm_result recv_fsm(struct tcp_pcb *pcb, struct rfb_state *state) { case POINTER_EVENT: if (state->writepos < sizeof(struct pointer_event_pkt)) return NEEDMORE; + outputf("RFB: Pointer"); /* XXX stub */ @@ -252,6 +487,7 @@ static enum fsm_result recv_fsm(struct tcp_pcb *pcb, struct rfb_state *state) { case CLIENT_CUT_TEXT: if (state->writepos < sizeof(struct text_event_pkt)) return NEEDMORE; + outputf("RFB: Cut Text"); struct text_event_pkt * pkt = (struct text_event_pkt *)state->data; @@ -302,16 +538,27 @@ static err_t rfb_recv(void *arg, struct tcp_pcb *pcb, outputf("RFB: Processing %d", p->tot_len); pbuf_copy_partial(p, state->data + state->writepos, p->tot_len, 0); + state->writepos += p->tot_len; + tcp_recved(pcb, p->tot_len); pbuf_free(p); while (1) { switch (recv_fsm(pcb, state)) { case NEEDMORE: + outputf("RFB FSM: blocking"); /* Need more data */ return ERR_OK; case OK: + outputf("RFB FSM: ok"); + + /* Kick off a send. */ + if (state->send_state == SST_IDLE + && state->update_requested) { + send_fsm(pcb, state); + } + if (state->readpos == state->writepos) { state->readpos = 0; state->writepos = 0; @@ -339,6 +586,12 @@ static err_t rfb_accept(void *arg, struct tcp_pcb *pcb, err_t err) { state = (struct rfb_state *)mem_malloc(sizeof(struct rfb_state)); + state->state = ST_BEGIN; + state->readpos = 0; + state->writepos = 0; + state->update_requested = 0; + state->send_state = SST_IDLE; + /* XXX: update_server_info() should be called from the 64ms timer, and deal * with screen resizes appropriately. */ update_server_info(); @@ -351,9 +604,10 @@ static err_t rfb_accept(void *arg, struct tcp_pcb *pcb, err_t err) { tcp_arg(pcb, state); tcp_recv(pcb, rfb_recv); + tcp_sent(pcb, rfb_sent); + tcp_poll(pcb, rfb_poll, 1); /* tcp_err(pcb, rfb_err); - tcp_poll(pcb, rfb_poll, 2); */ tcp_write(pcb, "RFB 003.008\n", 12, 0); tcp_output(pcb);