Implement TCP Heartbeat
Some users have reported issues where the TCP link to dump1090 can be lost at times of low traffic density - typically in the middle of the night. One possible reason for this is that some routers drop the link if there is no traffic for a predetermined period. To try and resolve this, dump1090 now sends a 'null' packet consisting of 7 "0x00" bytes approximately once a minute if there is no real received traffic during this time. This packet should be discarded by the application receiving the dump1090 because it will have an invalid checksum, and ICAO address 0x000000 is also invalid. However, this null packet should be enough to keep routers alive.
This commit is contained in:
parent
4a438d6e34
commit
f7843c1691
Binary file not shown.
BIN
coaa1090.obj
BIN
coaa1090.obj
Binary file not shown.
|
@ -69,6 +69,7 @@ void modesInitConfig(void) {
|
||||||
Modes.gain = MODES_MAX_GAIN;
|
Modes.gain = MODES_MAX_GAIN;
|
||||||
Modes.freq = MODES_DEFAULT_FREQ;
|
Modes.freq = MODES_DEFAULT_FREQ;
|
||||||
Modes.check_crc = 1;
|
Modes.check_crc = 1;
|
||||||
|
Modes.net_heartbeat_rate = MODES_NET_HEARTBEAT_RATE;
|
||||||
Modes.net_output_sbs_port = MODES_NET_OUTPUT_SBS_PORT;
|
Modes.net_output_sbs_port = MODES_NET_OUTPUT_SBS_PORT;
|
||||||
Modes.net_output_raw_port = MODES_NET_OUTPUT_RAW_PORT;
|
Modes.net_output_raw_port = MODES_NET_OUTPUT_RAW_PORT;
|
||||||
Modes.net_input_raw_port = MODES_NET_INPUT_RAW_PORT;
|
Modes.net_input_raw_port = MODES_NET_INPUT_RAW_PORT;
|
||||||
|
@ -412,6 +413,7 @@ void showHelp(void) {
|
||||||
"--net-bo-port <port> TCP Beast output listen port (default: 30005)\n"
|
"--net-bo-port <port> TCP Beast output listen port (default: 30005)\n"
|
||||||
"--net-ro-size <size> TCP raw output minimum size (default: 0)\n"
|
"--net-ro-size <size> TCP raw output minimum size (default: 0)\n"
|
||||||
"--net-ro-rate <rate> TCP raw output memory flush rate (default: 0)\n"
|
"--net-ro-rate <rate> TCP raw output memory flush rate (default: 0)\n"
|
||||||
|
"--net-heartbeat <rate> TCP heartbeat rate in seconds (default: 60 sec)\n"
|
||||||
"--lat <latitude> Reference/receiver latitude for surface posn (opt)\n"
|
"--lat <latitude> Reference/receiver latitude for surface posn (opt)\n"
|
||||||
"--lon <longitude> Reference/receiver longitude for surface posn (opt)\n"
|
"--lon <longitude> Reference/receiver longitude for surface posn (opt)\n"
|
||||||
"--fix Enable single-bits error correction using CRC\n"
|
"--fix Enable single-bits error correction using CRC\n"
|
||||||
|
@ -503,7 +505,9 @@ int main(int argc, char **argv) {
|
||||||
} else if (!strcmp(argv[j],"--net-only")) {
|
} else if (!strcmp(argv[j],"--net-only")) {
|
||||||
Modes.net = 1;
|
Modes.net = 1;
|
||||||
Modes.net_only = 1;
|
Modes.net_only = 1;
|
||||||
} else if (!strcmp(argv[j],"--net-ro-size") && more) {
|
} else if (!strcmp(argv[j],"--net-heartbeat") && more) {
|
||||||
|
Modes.net_heartbeat_rate = atoi(argv[++j]) * 15;
|
||||||
|
} else if (!strcmp(argv[j],"--net-ro-size") && more) {
|
||||||
Modes.net_output_raw_size = atoi(argv[++j]);
|
Modes.net_output_raw_size = atoi(argv[++j]);
|
||||||
} else if (!strcmp(argv[j],"--net-ro-rate") && more) {
|
} else if (!strcmp(argv[j],"--net-ro-rate") && more) {
|
||||||
Modes.net_output_raw_rate = atoi(argv[++j]);
|
Modes.net_output_raw_rate = atoi(argv[++j]);
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
// MinorVer changes when additional features are added, but not for bug fixes (range 00-99)
|
// 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
|
// DayDate & Year changes for all changes, including for bug fixes. It represent the release date of the update
|
||||||
//
|
//
|
||||||
#define MODES_DUMP1090_VERSION "1.08.2302.14"
|
#define MODES_DUMP1090_VERSION "1.08.1003.14"
|
||||||
|
|
||||||
// ============================= Include files ==========================
|
// ============================= Include files ==========================
|
||||||
|
|
||||||
|
@ -163,6 +163,8 @@
|
||||||
#define MODES_INTERACTIVE_DELETE_TTL 300 // Delete from the list after 300 seconds
|
#define MODES_INTERACTIVE_DELETE_TTL 300 // Delete from the list after 300 seconds
|
||||||
#define MODES_INTERACTIVE_DISPLAY_TTL 60 // Delete from display after 60 seconds
|
#define MODES_INTERACTIVE_DISPLAY_TTL 60 // Delete from display after 60 seconds
|
||||||
|
|
||||||
|
#define MODES_NET_HEARTBEAT_RATE 900 // Each block is approx 65mS - default is > 1 min
|
||||||
|
|
||||||
#define MODES_NET_SERVICES_NUM 6
|
#define MODES_NET_SERVICES_NUM 6
|
||||||
#define MODES_NET_MAX_FD 1024
|
#define MODES_NET_MAX_FD 1024
|
||||||
#define MODES_NET_INPUT_RAW_PORT 30001
|
#define MODES_NET_INPUT_RAW_PORT 30001
|
||||||
|
@ -281,6 +283,8 @@ struct { // Internal state
|
||||||
int debug; // Debugging mode
|
int debug; // Debugging mode
|
||||||
int net; // Enable networking
|
int net; // Enable networking
|
||||||
int net_only; // Enable just networking
|
int net_only; // Enable just networking
|
||||||
|
int net_heartbeat_count; // TCP heartbeat counter
|
||||||
|
int net_heartbeat_rate; // TCP heartbeat rate
|
||||||
int net_output_sbs_port; // SBS output TCP port
|
int net_output_sbs_port; // SBS output TCP port
|
||||||
int net_output_raw_size; // Minimum Size of the output raw data
|
int net_output_raw_size; // Minimum Size of the output raw data
|
||||||
int net_output_raw_rate; // Rate (in 64mS increments) of output raw data
|
int net_output_raw_rate; // Rate (in 64mS increments) of output raw data
|
||||||
|
|
22
mode_s.c
22
mode_s.c
|
@ -1812,6 +1812,25 @@ void detectModeS(uint16_t *m, uint32_t mlen) {
|
||||||
Modes.net_output_raw_rate_count = 0;
|
Modes.net_output_raw_rate_count = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if ( (Modes.net)
|
||||||
|
&& (Modes.net_heartbeat_rate)
|
||||||
|
&& ((++Modes.net_heartbeat_count) > Modes.net_heartbeat_rate) ) {
|
||||||
|
//
|
||||||
|
// We haven't received any Mode A/C/S messages for some time. To try and keep any TCP
|
||||||
|
// links alive, send a null frame. This will help stop any routers discarding our TCP
|
||||||
|
// link which will cause an un-recoverable link error if/when a real frame arrives.
|
||||||
|
//
|
||||||
|
// Fudge up a null message
|
||||||
|
memset(&mm, 0, sizeof(mm));
|
||||||
|
mm.msgbits = MODES_SHORT_MSG_BITS;
|
||||||
|
mm.timestampMsg = Modes.timestampBlk;
|
||||||
|
|
||||||
|
// Feed output clients
|
||||||
|
modesQueueOutput(&mm);
|
||||||
|
|
||||||
|
// Reset the heartbeat counter
|
||||||
|
Modes.net_heartbeat_count = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
//=========================================================================
|
//=========================================================================
|
||||||
|
@ -1836,6 +1855,9 @@ void useModesMessage(struct modesMessage *mm) {
|
||||||
|
|
||||||
// Feed output clients
|
// Feed output clients
|
||||||
if (Modes.net) {modesQueueOutput(mm);}
|
if (Modes.net) {modesQueueOutput(mm);}
|
||||||
|
|
||||||
|
// Heartbeat not required whilst we're seeing real messages
|
||||||
|
Modes.net_heartbeat_count = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
|
|
Loading…
Reference in a new issue