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

Merge branch 'master' of https://www.github.com/MalcolmRobb/dump1090 into http_server_wk

Browse source
This commit is contained in:
hhm 2014-10-29 10:29:04 -04:00
parent cbab205790 c142c1fe2e
commit 027ab92e7a
1 changed files with 41 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
net_io.c
View file

@ -161,7 +161,14 @@ void modesFreeClient(struct client *c) {
} }
} }
// It's now safe to remove this client free(c);
}
//
//=========================================================================
//
// Close the client connection and mark it as closed
//
void modesCloseClient(struct client *c) {
close(c->fd); close(c->fd);
if (c->service == Modes.sbsos) { if (c->service == Modes.sbsos) {
if (Modes.stat_sbs_connections) Modes.stat_sbs_connections--; if (Modes.stat_sbs_connections) Modes.stat_sbs_connections--;
@ -174,7 +181,7 @@ void modesFreeClient(struct client *c) {
if (Modes.debug & MODES_DEBUG_NET) if (Modes.debug & MODES_DEBUG_NET)
printf("Closing client %d\n", c->fd); printf("Closing client %d\n", c->fd);
free(c); c->fd = -1;
} }
// //
//========================================================================= //=========================================================================
@ -188,6 +195,7 @@ void modesSendAllClients(int service, void *msg, int len) {
// Read next before servicing client incase the service routine deletes the client! // Read next before servicing client incase the service routine deletes the client!
struct client *next = c->next; struct client *next = c->next;
if (c->fd != -1) {
if (c->service == service) { if (c->service == service) {
#ifndef _WIN32 #ifndef _WIN32
int nwritten = write(c->fd, msg, len); int nwritten = write(c->fd, msg, len);
@ -195,9 +203,12 @@ void modesSendAllClients(int service, void *msg, int len) {
int nwritten = send(c->fd, msg, len, 0 ); int nwritten = send(c->fd, msg, len, 0 );
#endif #endif
if (nwritten != len) { if (nwritten != len) {
modesFreeClient(c); modesCloseClient(c);
} }
} }
} else {
modesFreeClient(c);
}
c = next; c = next;
} }
} }
@ -715,11 +726,12 @@ int handleHTTPRequest(struct client *c, char *p) {
httpver = (strstr(p, "HTTP/1.1") != NULL) ? 11 : 10; httpver = (strstr(p, "HTTP/1.1") != NULL) ? 11 : 10;
if (httpver == 10) { if (httpver == 10) {
// HTTP 1.0 defaults to close, unless otherwise specified. // HTTP 1.0 defaults to close, unless otherwise specified.
keepalive = strstr(p, "Connection: keep-alive") != NULL; //keepalive = strstr(p, "Connection: keep-alive") != NULL;
} else if (httpver == 11) { } else if (httpver == 11) {
// HTTP 1.1 defaults to keep-alive, unless close is specified. // HTTP 1.1 defaults to keep-alive, unless close is specified.
keepalive = strstr(p, "Connection: close") == NULL; //keepalive = strstr(p, "Connection: close") == NULL;
} }
keepalive = 0;
// Identify he URL. // Identify he URL.
p = strchr(p,' '); p = strchr(p,' ');
@ -868,6 +880,10 @@ void modesReadFromClient(struct client *c, char *sep,
nread = recv(c->fd, c->buf+c->buflen, left, 0); nread = recv(c->fd, c->buf+c->buflen, left, 0);
if (nread < 0) {errno = WSAGetLastError();} if (nread < 0) {errno = WSAGetLastError();}
#endif #endif
if (nread == 0) {
modesCloseClient(c);
return;
}
// If we didn't get all the data we asked for, then return once we've processed what we did get. // If we didn't get all the data we asked for, then return once we've processed what we did get.
if (nread != left) { if (nread != left) {
@ -878,7 +894,7 @@ void modesReadFromClient(struct client *c, char *sep,
#else #else
if ( (nread < 0) && (errno != EWOULDBLOCK)) { // Error, or end of file if ( (nread < 0) && (errno != EWOULDBLOCK)) { // Error, or end of file
#endif #endif
modesFreeClient(c); modesCloseClient(c);
return; return;
} }
if (nread <= 0) { if (nread <= 0) {
@ -926,7 +942,7 @@ void modesReadFromClient(struct client *c, char *sep,
} }
// Have a 0x1a followed by 1, 2 or 3 - pass message less 0x1a to handler. // Have a 0x1a followed by 1, 2 or 3 - pass message less 0x1a to handler.
if (handler(c, s)) { if (handler(c, s)) {
modesFreeClient(c); modesCloseClient(c);
return; return;
} }
fullmsg = 1; fullmsg = 1;
@ -942,7 +958,7 @@ void modesReadFromClient(struct client *c, char *sep,
while ((e = strstr(s, sep)) != NULL) { // end of first message if found while ((e = strstr(s, sep)) != NULL) { // end of first message if found
*e = '\0'; // The handler expects null terminated strings *e = '\0'; // The handler expects null terminated strings
if (handler(c, s)) { // Pass message to handler. if (handler(c, s)) { // Pass message to handler.
modesFreeClient(c); // Handler returns 1 on error to signal we . modesCloseClient(c); // Handler returns 1 on error to signal we .
return; // should close the client connection return; // should close the client connection
} }
s = e + strlen(sep); // Move to start of next message s = e + strlen(sep); // Move to start of next message
@ -972,6 +988,7 @@ void modesReadFromClients(void) {
// Read next before servicing client incase the service routine deletes the client! // Read next before servicing client incase the service routine deletes the client!
struct client *next = c->next; struct client *next = c->next;
if (c->fd >= 0) {
if (c->service == Modes.ris) { if (c->service == Modes.ris) {
modesReadFromClient(c,"\n",decodeHexMessage); modesReadFromClient(c,"\n",decodeHexMessage);
} else if (c->service == Modes.bis) { } else if (c->service == Modes.bis) {
@ -979,6 +996,9 @@ void modesReadFromClients(void) {
} else if (c->service == Modes.https) { } else if (c->service == Modes.https) {
modesReadFromClient(c,"\r\n\r\n",handleHTTPRequest); modesReadFromClient(c,"\r\n\r\n",handleHTTPRequest);
} }
} else {
modesFreeClient(c);
}
c = next; c = next;
} }
} }