AFG/dump1090
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #38 from hhm0/http_server_wk

Browse source 
HTTP server fixes
This commit is contained in:
MalcolmRobb 2014-10-29 15:24:33 +00:00
parent c142c1fe2e 027ab92e7a
commit da3cf96989
2 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
net_io.c
View file

@ -713,6 +713,7 @@ int handleHTTPRequest(struct client *c, char *p) {
char hdr[512]; char hdr[512];
int clen, hdrlen; int clen, hdrlen;
int httpver, keepalive; int httpver, keepalive;
int statuscode = 500;
char *url, *content; char *url, *content;
char ctype[48]; char ctype[48];
char getFile[1024]; char getFile[1024];
@ -755,22 +756,36 @@ int handleHTTPRequest(struct client *c, char *p) {
// "/" -> Our google map application. // "/" -> Our google map application.
// "/data.json" -> Our ajax request to update planes. // "/data.json" -> Our ajax request to update planes.
if (strstr(url, "/data.json")) { if (strstr(url, "/data.json")) {
statuscode = 200;
content = aircraftsToJson(&clen); content = aircraftsToJson(&clen);
//snprintf(ctype, sizeof ctype, MODES_CONTENT_TYPE_JSON); //snprintf(ctype, sizeof ctype, MODES_CONTENT_TYPE_JSON);
} else { } else {
struct stat sbuf; struct stat sbuf;
int fd = -1; int fd = -1;
char *rp, *hrp;
if (stat(getFile, &sbuf) != -1 && (fd = open(getFile, O_RDONLY)) != -1) { rp = realpath(getFile, NULL);
content = (char *) malloc(sbuf.st_size); hrp = realpath(HTMLPATH, NULL);
if (read(fd, content, sbuf.st_size) == -1) { hrp = (hrp ? hrp : HTMLPATH);
snprintf(content, sbuf.st_size, "Error reading from file: %s", strerror(errno)); clen = -1;
content = strdup("Server error occured");
if (rp && (!strncmp(hrp, rp, strlen(hrp)))) {
if (stat(getFile, &sbuf) != -1 && (fd = open(getFile, O_RDONLY)) != -1) {
content = (char *) realloc(content, sbuf.st_size);
if (read(fd, content, sbuf.st_size) != -1) {
clen = sbuf.st_size;
statuscode = 200;
}
} }
clen = sbuf.st_size;
} else { } else {
errno = ENOENT;
}
if (clen < 0) {
char buf[128]; char buf[128];
clen = snprintf(buf,sizeof(buf),"Error opening HTML file: %s", strerror(errno)); content = realloc(content, sizeof(buf));
content = strdup(buf); clen = snprintf(content,sizeof(buf),"Error opening HTML file: %s", strerror(errno));
statuscode = 404;
} }
if (fd != -1) { if (fd != -1) {
@ -794,7 +809,7 @@ int handleHTTPRequest(struct client *c, char *p) {
// Create the header and send the reply // Create the header and send the reply
hdrlen = snprintf(hdr, sizeof(hdr), hdrlen = snprintf(hdr, sizeof(hdr),
"HTTP/1.1 200 OK\r\n" "HTTP/1.1 %d \r\n"
"Server: Dump1090\r\n" "Server: Dump1090\r\n"
"Content-Type: %s\r\n" "Content-Type: %s\r\n"
"Connection: %s\r\n" "Connection: %s\r\n"
@ -802,6 +817,7 @@ int handleHTTPRequest(struct client *c, char *p) {
"Cache-Control: no-cache, must-revalidate\r\n" "Cache-Control: no-cache, must-revalidate\r\n"
"Expires: Sat, 26 Jul 1997 05:00:00 GMT\r\n" "Expires: Sat, 26 Jul 1997 05:00:00 GMT\r\n"
"\r\n", "\r\n",
statuscode,
ctype, ctype,
keepalive ? "keep-alive" : "close", keepalive ? "keep-alive" : "close",
clen); clen);

1
winstubs.h
View file

@ -75,6 +75,7 @@ _inline uint64_t strtoll(const char *p, void *e, UINT32 base) {return _atoi64(p)
_inline int inet_aton(const char * cp, DWORD * ulAddr) { *ulAddr = inet_addr(cp); return 0;} _inline int inet_aton(const char * cp, DWORD * ulAddr) { *ulAddr = inet_addr(cp); return 0;}
#define snprintf _snprintf #define snprintf _snprintf
#define vsnprintf _vsnprintf #define vsnprintf _vsnprintf
#define realpath(A, B) _fullpath(B, A, _MAX_PATH)
_inline void cls() { _inline void cls() {
HANDLE hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); HANDLE hStdOut = GetStdHandle(STD_OUTPUT_HANDLE);