X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/rigol/blobdiff_plain/713be7a43ed11947c358fc67c11b9df7b0be204c..7df76f49adf30ac260c99649678b084c9b6c282b:/rigold.c diff --git a/rigold.c b/rigold.c index 974a814..6e383b7 100644 --- a/rigold.c +++ b/rigold.c @@ -6,10 +6,13 @@ #include #include #include +#include #include "scope.h" #include "commands.h" +#define TIMEOUT 4 + static int send_binary(int s, char *buf, int len) { int ret; @@ -34,7 +37,7 @@ static int send_text(int s, char *buf) static void serve_index(int s, struct scope *sc) { - send_text(s, "HTTP/1.0 200 OK"); + send_text(s, "HTTP/1.0 200 OK\n"); send_text(s, "Content-type: text/html\n\n"); send_text(s, ""); send_text(s, scope_idn(sc)); @@ -57,7 +60,7 @@ static void serve_lcd(int s, struct scope *sc) return; - send_text(s, "HTTP/1.0 200 OK"); + send_text(s, "HTTP/1.0 200 OK\n"); send_text(s, "Content-type: image/png\n"); snprintf(buf, sizeof(buf), "Content-length: %u\n\n", imglen); send_text(s, buf); @@ -65,16 +68,37 @@ static void serve_lcd(int s, struct scope *sc) free(png); } +int is_eor(char *buf) +{ + int eor = 0; + + /* This does not completely work, when the request is split + in multiple packets... */ + if (strstr(buf, "\x0d\x0a\x0d\x0a")) { + eor = 1; + } else if (strstr(buf, "\x0a\x0a")) { + eor = 1; + } else if (strcmp(buf, "\x0d\x0a") == 0) { + eor = 1; + } else if (strcmp(buf, "\x0a") == 0) { + eor = 1; + } + + return eor; +} + + static void parse_request(int s, struct scope *sc) { int ret; - char buf[1024]; - char file[1024]; + int eor; + char buf[4096]; + char file[4096]; const char delim[] = " \t\x0d\x0a"; - const char crlf[] = "\x0d\x0a"; char *saveptr; char *token; + alarm(TIMEOUT); ret=read(s, buf, sizeof(buf)-1); if (ret == -1) { perror("read"); @@ -82,6 +106,8 @@ static void parse_request(int s, struct scope *sc) } buf[ret] = 0; + eor = is_eor(buf); + token = strtok_r(buf, delim, &saveptr); if (token == NULL) return; @@ -92,21 +118,17 @@ static void parse_request(int s, struct scope *sc) bzero(&file, sizeof(file)); strncpy(file, token, sizeof(file)-1); - do { - token = strtok_r(NULL, crlf, &saveptr); - /* TODO: FIXME */ - #if 0 - if (token == NULL) { - ret=read(s, buf, sizeof(buf)-1); - if (ret == -1) { - perror("read"); - return; - } - buf[ret] = 0; - token = strtok_r(buf, crlf, &saveptr); + while (!eor) { + alarm(TIMEOUT); + ret=read(s, buf, sizeof(buf)-1); + if (ret == -1) { + perror("read"); + return; } - #endif - } while(token != NULL); + buf[ret] = 0; + eor = is_eor(buf); + } + alarm(0); if (strcmp("/", file) == 0) { serve_index(s, sc); @@ -115,8 +137,21 @@ static void parse_request(int s, struct scope *sc) } } +void sighandler(int sig) +{ + switch(sig) { + case SIGPIPE: + break; + case SIGALRM: + default: + printf("Signal %d received\n", sig); + break; + } +} + int main(int argc, char **argv) { + struct sigaction act; int sock, csock; int opt; socklen_t slen; @@ -125,6 +160,25 @@ int main(int argc, char **argv) unsigned short port = 8088; sc = initscope(); + if (sc == NULL) { + printf("Scope not found!\n"); + exit(EXIT_FAILURE); + } + + bzero(&act, sizeof(act)); + act.sa_handler = sighandler; + act.sa_flags = SA_RESTART; + if (sigaction(SIGPIPE, &act, NULL) == -1) { + perror("sigaction"); + exit(EXIT_FAILURE); + } + + bzero(&act, sizeof(act)); + act.sa_handler = sighandler; + if (sigaction(SIGALRM, &act, NULL) == -1) { + perror("sigaction"); + exit(EXIT_FAILURE); + } if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) { perror("socket");