Skip to content

Bundle gmap.html directly into the code to make dump1090 independant … #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bdejean wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bundle gmap.html directly into the code to make dump1090 independant … #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9cffb2
Bundle gmap.html directly into the code to make dump1090 independant …
bdejean Jul 9, 2018
1741685
Merge branch 'antirez:master' into master
bdejean Aug 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ PROGNAME=dump1090

all: dump1090

gmap.c: gmap.html
xxd -i $^ > $@
sed -i "s/^unsigned/const unsigned/" $@

%.o: %.c
$(CC) $(CFLAGS) -c $<

dump1090: dump1090.o anet.o
$(CC) -g -o dump1090 dump1090.o anet.o $(LDFLAGS) $(LDLIBS)
dump1090: dump1090.o anet.o gmap.o
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)

clean:
rm -f *.o dump1090
40 changes: 15 additions & 25 deletions dump1090.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
#include "rtl-sdr.h"
#include "anet.h"

extern const unsigned char gmap_html[];
extern const unsigned gmap_html_len;

#define MODES_DEFAULT_RATE 2000000
#define MODES_DEFAULT_FREQ 1090000000
#define MODES_DEFAULT_WIDTH 1000
Expand Down Expand Up @@ -2250,26 +2253,8 @@ int handleHTTPRequest(struct client *c) {
content = aircraftsToJson(&clen);
ctype = MODES_CONTENT_TYPE_JSON;
} else {
struct stat sbuf;
int fd = -1;

if (stat("gmap.html",&sbuf) != -1 &&
(fd = open("gmap.html",O_RDONLY)) != -1)
{
content = malloc(sbuf.st_size);
if (read(fd,content,sbuf.st_size) == -1) {
snprintf(content,sbuf.st_size,"Error reading from file: %s",
strerror(errno));
}
clen = sbuf.st_size;
} else {
char buf[128];

clen = snprintf(buf,sizeof(buf),"Error opening HTML file: %s",
strerror(errno));
content = strdup(buf);
}
if (fd != -1) close(fd);
content = (char*) gmap_html;
clen = gmap_html_len;
ctype = MODES_CONTENT_TYPE_HTML;
}

Expand All @@ -2289,16 +2274,21 @@ int handleHTTPRequest(struct client *c) {
if (Modes.debug & MODES_DEBUG_NET)
printf("HTTP Reply header:\n%s", hdr);

int ret;
/* Send header and content. */
if (write(c->fd, hdr, hdrlen) != hdrlen ||
write(c->fd, content, clen) != clen)
{
free(content);
return 1;
ret = 1;
} else {
Modes.stat_http_requests++;
ret = !keepalive;
}
free(content);
Modes.stat_http_requests++;
return !keepalive;

if (content != (char*)gmap_html)
free(content);

return ret;
}

/* This function polls the clients using read() in order to receive new
Expand Down