#include <stdlib.h>
#include <string.h>
#include <strings.h>
-#include <usb.h>
+#include <unistd.h>
+#include <signal.h>
-#include "usbtmc.h"
+#include "scope.h"
#include "commands.h"
+#define TIMEOUT 4
+
static int send_binary(int s, char *buf, int len)
{
int ret;
return send_binary(s, buf, strlen(buf));
}
-static void serve_index(int s)
+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, "<html><head><title>Rigol DS1000</title></head><body bgcolor=\"#ffffff\" text=\"#000000\">\n");
+ send_text(s, "<html><head><title>");
+ send_text(s, scope_idn(sc));
+ send_text(s, "</title></head><body bgcolor=\"#ffffff\" text=\"#000000\">\n");
send_text(s, "<img src=\"/lcd.png\" height=\"234\" width=\"320\">\n");
send_text(s, "</body></html>\n");
}
-static void serve_lcd(int s, struct usb_dev_handle *sc)
+static void serve_lcd(int s, struct scope *sc)
{
char buf[256];
int imglen;
unsigned char *png;
- usbtmc_claim(sc);
+ claimscope(sc);
png = get_lcd(sc, &imglen, 0);
- usbtmc_release(sc);
+ releasescope(sc);
if (png == NULL)
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);
free(png);
}
-static void parse_request(int s, struct usb_dev_handle *sc)
+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");
}
buf[ret] = 0;
+ eor = is_eor(buf);
+
token = strtok_r(buf, delim, &saveptr);
if (token == NULL)
return;
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);
+ serve_index(s, sc);
} else if (strcmp("/lcd.png", file) == 0) {
serve_lcd(s, 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;
- struct usb_dev_handle *sc;
+ struct scope *sc;
struct sockaddr_in sin, clientsin;
unsigned short port = 8088;
- sc = usbtmc_initscope();
+ 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");
close(csock);
}
- usbtmc_close(sc);
+ closescope(sc);
return 0;
}
projects / rigol / blobdiff