From 99dd2903521e9d60aed433de655b88945ad1061b Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Fri, 26 Jun 2015 17:54:23 +0100 Subject: [PATCH] Rebuild a basic faup1090 using the reworked network services bits. This is a from-scratch reimplementation that should be functionally equivalent to the Flightaware version that was based on dump1090_mr and had its fingers deep in the network code. This version should be a little less invasive / fragile.. --- .gitignore | 1 + Makefile | 3 + faup1090.c | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 207 insertions(+) create mode 100644 faup1090.c diff --git a/.gitignore b/.gitignore index 35355ea..d3aca82 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ frames.js *.orig untrackedDeveloperSettings.js view1090 +faup1090 diff --git a/Makefile b/Makefile index bc69f67..73a01d1 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,9 @@ dump1090: dump1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o crc.o demo view1090: view1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o crc.o stats.o cpr.o icao_filter.o track.o util.o $(CC) -g -o $@ $^ $(LIBS) $(LDFLAGS) +faup1090: faup1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o crc.o stats.o cpr.o icao_filter.o track.o util.o + $(CC) -g -o $@ $^ $(LIBS) $(LDFLAGS) + clean: rm -f *.o dump1090 view1090 cprtests crctests diff --git a/faup1090.c b/faup1090.c new file mode 100644 index 0000000..0750471 --- /dev/null +++ b/faup1090.c @@ -0,0 +1,203 @@ +// Part of dump1090, a Mode S message decoder for RTLSDR devices. +// +// faup1090.c: cut down version that just does 30005 -> 10001 forwarding +// +// Copyright (c) 2014,2015 Oliver Jowett +// +// This file is free software: you may copy, redistribute and/or modify it +// under the terms of the GNU General Public License as published by the +// Free Software Foundation, either version 2 of the License, or (at your +// option) any later version. +// +// This file is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +// This file incorporates work covered by the following copyright and +// permission notice: +// +// Copyright (C) 2012 by Salvatore Sanfilippo +// +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "dump1090.h" + +#include +#include + +// +// =============================== Initialization =========================== +// +static void faupInitConfig(void) { + // Default everything to zero/NULL + memset(&Modes, 0, sizeof(Modes)); + + // Now initialise things that should not be 0/NULL to their defaults + Modes.nfix_crc = 1; + Modes.check_crc = 1; + Modes.net = 1; + Modes.net_heartbeat_interval = MODES_NET_HEARTBEAT_INTERVAL; + Modes.net_fatsv_port = MODES_NET_OUTPUT_FA_TSV_PORT; + Modes.maxRange = 1852 * 300; // 300NM default max range + Modes.quiet = 1; + Modes.net_output_flush_size = MODES_OUT_FLUSH_SIZE; + Modes.net_output_flush_interval = 200; // milliseconds +} + +// +//========================================================================= +// +static void faupInit(void) { + // Validate the users Lat/Lon home location inputs + if ( (Modes.fUserLat > 90.0) // Latitude must be -90 to +90 + || (Modes.fUserLat < -90.0) // and + || (Modes.fUserLon > 360.0) // Longitude must be -180 to +360 + || (Modes.fUserLon < -180.0) ) { + Modes.fUserLat = Modes.fUserLon = 0.0; + } else if (Modes.fUserLon > 180.0) { // If Longitude is +180 to +360, make it -180 to 0 + Modes.fUserLon -= 360.0; + } + // If both Lat and Lon are 0.0 then the users location is either invalid/not-set, or (s)he's in the + // Atlantic ocean off the west coast of Africa. This is unlikely to be correct. + // Set the user LatLon valid flag only if either Lat or Lon are non zero. Note the Greenwich meridian + // is at 0.0 Lon,so we must check for either fLat or fLon being non zero not both. + // Testing the flag at runtime will be much quicker than ((fLon != 0.0) || (fLat != 0.0)) + Modes.bUserFlags &= ~MODES_USER_LATLON_VALID; + if ((Modes.fUserLat != 0.0) || (Modes.fUserLon != 0.0)) { + Modes.bUserFlags |= MODES_USER_LATLON_VALID; + } + + // Prepare error correction tables + modesChecksumInit(1); + icaoFilterInit(); +} + +// +// ================================ Main ==================================== +// +static void showHelp(void) { + printf( +"-----------------------------------------------------------------------------\n" +"| faup1090 ModeS conversion %45s |\n" +"-----------------------------------------------------------------------------\n" +"--net-bind-address IP address to bind to (default: Any; Use 127.0.0.1 for private)\n" +"--net-bo-ipaddr IP address to connect to for Beast data (default: 127.0.0.1)\n" +"--net-bo-port Port to connect for Beast data (default: 30005)\n" +"--net-fatsv-port FlightAware TSV output port (default: 10001)\n" +"--lat Reference/receiver latitude for surface posn (opt)\n" +"--lon Reference/receiver longitude for surface posn (opt)\n" +"--max-range Absolute maximum range for position decoding (in nm, default: 300)\n" +"--help Show this help\n" +"\n", +MODES_DUMP1090_VARIANT " " MODES_DUMP1090_VERSION + ); +} + +// +//========================================================================= +// +// This function is called a few times every second by main in order to +// perform tasks we need to do continuously, like accepting new clients +// from the net, refreshing the screen in interactive mode, and so forth +// +static void backgroundTasks(void) { + icaoFilterExpire(); + trackPeriodicUpdate(); + modesNetPeriodicWork(); +} + +// +//========================================================================= +// +int main(int argc, char **argv) { + int j; + char *bo_connect_ipaddr = "127.0.0.1"; + int bo_connect_port = MODES_NET_OUTPUT_BEAST_PORT; + struct client *c; + struct net_service *s; + + // Set sane defaults + faupInitConfig(); + + // Parse the command line options + for (j = 1; j < argc; j++) { + int more = j+1 < argc; // There are more arguments + + if (!strcmp(argv[j],"--net-bo-port") && more) { + bo_connect_port = atoi(argv[++j]); + } else if (!strcmp(argv[j],"--net-bo-ipaddr") && more) { + bo_connect_ipaddr = argv[++j]; + } else if (!strcmp(argv[j],"--net-bind-address") && more) { + Modes.net_bind_address = strdup(argv[++j]); + } else if (!strcmp(argv[j],"--net-fatsv-port") && more) { + Modes.net_fatsv_port = atoi(argv[++j]); + } else if (!strcmp(argv[j],"--lat") && more) { + Modes.fUserLat = atof(argv[++j]); + } else if (!strcmp(argv[j],"--lon") && more) { + Modes.fUserLon = atof(argv[++j]); + } else if (!strcmp(argv[j],"--max-range") && more) { + Modes.maxRange = atof(argv[++j]) * 1852.0; // convert to metres + } else if (!strcmp(argv[j],"--help")) { + showHelp(); + exit(0); + } else { + fprintf(stderr, + "Unknown or not enough arguments for option '%s'.\n\n", + argv[j]); + showHelp(); + exit(1); + } + } + + // Initialization + faupInit(); + modesInitNet(); + + // Set up connection + s = makeBeastInputService(); + c = serviceConnect(s, bo_connect_ipaddr, bo_connect_port); + if (!c) { + fprintf (stderr, + "faup1090: failed to connect to %s:%d (is dump1090 running?): %s\n", + bo_connect_ipaddr, bo_connect_port, Modes.aneterr); + exit (1); + } + + // Run it until we've lost the connection. + while (!Modes.exit && s->connections) { + backgroundTasks(); + usleep(100000); + } + + return 0; +} +// +//========================================================================= +//