diff --git a/Release/dump1090.exe b/Release/dump1090.exe index f7a9cd1..cd4dcd0 100644 Binary files a/Release/dump1090.exe and b/Release/dump1090.exe differ diff --git a/Release/view1090.exe b/Release/view1090.exe index b6aacff..c4855b7 100644 Binary files a/Release/view1090.exe and b/Release/view1090.exe differ diff --git a/dump1090-win.1.08.0905.14.zip b/dump1090-win.1.08.0905.14.zip new file mode 100644 index 0000000..675d115 Binary files /dev/null and b/dump1090-win.1.08.0905.14.zip differ diff --git a/dump1090.bat b/dump1090.bat new file mode 100644 index 0000000..777769b --- /dev/null +++ b/dump1090.bat @@ -0,0 +1 @@ +dump1090.exe --interactive --net --net-ro-port 30002 --net-beast --mlat diff --git a/dump1090.dsp b/dump1090.dsp index 652d18e..d64d0d1 100644 --- a/dump1090.dsp +++ b/dump1090.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ws2_32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /machine:I386 /out:"./dump1090.exe" !ELSEIF "$(CFG)" == "dump1090 - Win32 Debug" diff --git a/dump1090.exe b/dump1090.exe new file mode 100644 index 0000000..cd4dcd0 Binary files /dev/null and b/dump1090.exe differ diff --git a/dump1090.h b/dump1090.h index 815d6f4..52b2933 100644 --- a/dump1090.h +++ b/dump1090.h @@ -37,7 +37,7 @@ // MinorVer changes when additional features are added, but not for bug fixes (range 00-99) // DayDate & Year changes for all changes, including for bug fixes. It represent the release date of the update // -#define MODES_DUMP1090_VERSION "1.08.2504.14" +#define MODES_DUMP1090_VERSION "1.08.0905.14" // ============================= Include files ========================== diff --git a/net_io.c b/net_io.c index 98ce394..9f430a7 100644 --- a/net_io.c +++ b/net_io.c @@ -721,12 +721,7 @@ int handleHTTPRequest(struct client *c, char *p) { if (stat(getFile, &sbuf) != -1 && (fd = open(getFile, O_RDONLY)) != -1) { content = (char *) malloc(sbuf.st_size); -#ifndef _WIN32 if (read(fd, content, sbuf.st_size) == -1) { -#else - if (recv(fd, content, sbuf.st_size, 0) == -1) { - errno = WSAGetLastError(); -#endif snprintf(content, sbuf.st_size, "Error reading from file: %s", strerror(errno)); } clen = sbuf.st_size; @@ -832,7 +827,11 @@ void modesReadFromClient(struct client *c, char *sep, if (nread != left) { bContinue = 0; } +#ifndef _WIN32 if ( (nread < 0) && (errno != EAGAIN)) { // Error, or end of file +#else + if ( (nread < 0) && (errno != EWOULDBLOCK)) { // Error, or end of file +#endif modesFreeClient(c); } if (nread <= 0) { diff --git a/winstubs.h b/winstubs.h index 5a6d575..f416668 100644 --- a/winstubs.h +++ b/winstubs.h @@ -101,6 +101,7 @@ _inline int gettimeofday(struct timeval *tv, struct timezone *tz) { #define STDIN_FILENO 0 #define EINPROGRESS WSAEINPROGRESS +#define EWOULDBLOCK WSAEWOULDBLOCK #ifdef __cplusplus }