New client side packet filter to select "messages" only to stations that have been heard nearby recently. This is now the default if no IS to RF filter is specified.

Expanded debug options so you can understand what is going on with packet filtering.

Added new document Successful-APRS-IGate-Operation.pdf with IGate background, configuration, and troubleshooting tips.

Author: wb2osz

CHANGES.md

@@ -2,6 +2,36 @@
 # Revision History #
 
 
+----------
+
+## Version 1.4  -- Development snapshot G --  January 2017 ##
+
+This is a snapshot at some semi-stable point in the development of the next version.  It is not well tested.  New features might be incomplete, poorly documented, and subject to change.
+
+
+### New Features: ###
+
+- New client side packet filter to select "messages" only to stations that have been heard nearby recently.  This is now the default if no IS to RF filter is specified.
+
+- Expanded debug options so you can understand what is going on with packet filtering.
+
+- Added new document ***Successful-APRS-IGate-Operation.pdf*** with IGate background, configuration, and troubleshooting tips.
+
+
+----------
+
+## Version 1.4  -- Development snapshot F --  December 2016 ##
+
+This is a snapshot at some semi-stable point in the development of the next version.  It is not well tested.  New features might be incomplete, poorly documented, and subject to change.
+
+
+### Bugs Fixed: ###
+
+- -p command line option caused segmentation fault with glibc >= 2.24.
+
+
+
+
 
 ----------
 

Makefile.linux

@@ -13,13 +13,25 @@ all :  $(APPS) direwolf.desktop direwolf.conf
 
 CC := gcc
 
+# Just for fun, let's see how clang compares to gcc.  First install like this:
+#	sudo apt-get update
+#	apt-cache search clang
+#	sudo apt-get install clang-3.5
+#
+# CC := clang-3.5
+
 # _XOPEN_SOURCE=600 and _DEFAULT_SOURCE=1 are needed for glibc >= 2.24.
 # Explanation here:  https://github.com/wb2osz/direwolf/issues/62
 
 # There are a few source files where it had been necessary to define __USE_XOPEN2KXSI,
 # __USE_XOPEN, or _POSIX_C_SOURCE.  Doesn't seem to be needed after adding this.
 
-CFLAGS := -O3 -pthread -Igeotranz -D_XOPEN_SOURCE=600 -D_DEFAULT_SOURCE=1
+CFLAGS := -O3 -pthread -Igeotranz -D_XOPEN_SOURCE=600 -D_DEFAULT_SOURCE=1 -Wall
+
+# That was fine for a recent Ubuntu and Raspbian Jessie.
+# However, Raspbian wheezy was then missing declaration for strsep and definition of fd_set.
+
+CFLAGS += -D_BSD_SOURCE
 
 LDFLAGS := -lm -lpthread -lrt
 
@@ -113,7 +125,26 @@ endif
 # One article said it was added with gcc 4.2 but I haven't verified that.
 #
 
-# Add -ffastmath in only if compiler version recognizes it.
+# ---------- How does clang compare? - Ubuntu x86_64  ----------
+#
+# I keep hearing a lot about "clang."  Let's see how it compares with gcc.
+# Simply use different compiler and keep all options the same.
+#
+# 	test case:	atest 02_Track_2.wav
+#
+#	gcc 4.8.4:	988 packets decoded in 40.503 seconds.  38.3 x realtime
+#			988 packets decoded in 40.403 seconds.  38.4 x realtime
+#
+#	clang 3.8.0-2:	988 packets decoded in 77.454 seconds.  20.0 x realtime
+#			988 packets decoded in 77.232 seconds.  20.1 x realtime
+#
+# I'm not impressed.  Almost twice as long. Maybe we need to try some other compiler options.
+# -march=native did not help.
+# Makefile.macosx, which uses clang, has these:
+# -fvectorize -fslp-vectorize -fslp-vectorize-aggressive
+# Those did not help.
+#
+
 
 useffast := $(shell gcc --help -v 2>/dev/null | grep ffast-math)
 ifneq ($(useffast),)
@@ -146,7 +177,7 @@ endif
 #
 
 #
-# ---------- ARM - Raspberry Pi 2  ---------- 
+# ---------- ARM - Raspberry Pi 2  ----------
 #
 # Besides the higher clock speed, the Raspberry Pi 2 has the NEON instruction set 
 # which which should make things considerably faster.  
@@ -200,10 +231,27 @@ endif
 # cause compatibility issues for those with older computers.
 #
 
+# ---------- How does clang compare? - ARM - Raspberry Pi 2  ----------
+#
+# I keep hearing a lot about "clang."  Let's see how it compares with gcc.
+# Simply use different compiler and keep all options the same.
+#
+# 	test case:	atest 02_Track_2.wav
+#
+#	gcc 4.9.2-10:	988 packets decoded in 353.025 seconds.  4.4 x realtime
+#			988 packets decoded in 352.752 seconds.  4.4 x realtime
+#
+#	clang 3.5.0-10:	988 packets decoded in 825.879 seconds.  1.9 x realtime
+#			988 packets decoded in 831.469 seconds.  1.9 x realtime
+#
+# There might be a different set of options which produce faster code
+# but the initial test doesn't look good.  About 2.3 times as slow.
 
 # If you want to use OSS (for FreeBSD, OpenBSD) instead of
 # ALSA (for Linux), comment out (or remove) the two lines below.
 
+# TODO:  Can we automate this somehow?
+
 CFLAGS += -DUSE_ALSA
 LDFLAGS += -lasound
 
@@ -220,6 +268,8 @@ endif
 
 
 # Uncomment following lines to enable hamlib support.
+# TODO:  automate this too.  See if hamlib has been installed.
+
 #CFLAGS += -DUSE_HAMLIB
 #LDFLAGS += -lhamlib
 

Makefile.macosx

@@ -77,6 +77,12 @@ CC := $(DARWIN_CC) -m32 $(SYS_LIBS) $(SYS_MIN)
 
 CFLAGS := -Os -pthread -Igeotranz -D_XOPEN_SOURCE=600 -D_DEFAULT_SOURCE=1 $(EXTRA_CFLAGS)
 
+# That was fine for a recent Ubuntu and Raspbian Jessie.
+# However, Raspbian wheezy was then missing declaration for strsep and definition of fd_set.
+
+CFLAGS += -D_BSD_SOURCE
+
+
 # $(info $$CC is [${CC}])
 
 #

Makefile.win

@@ -26,19 +26,30 @@ all : direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients log2gpx gen_pa
 # -Ofast was added in gcc 4.6 which was the MinGW version back in 2012.
 
 CC := gcc
-CFLAGS :=    -Wall -Ofast -march=pentium3 -msse -Iregex -Iutm -Igeotranz -mthreads -DUSE_REGEX_STATIC
-#CFLAGS :=   -Wall        -march=pentium3 -msse -Iregex -Iutm -Igeotranz -mthreads -DUSE_REGEX_STATIC
+CFLAGS := -Ofast -march=pentium3 -msse -Iregex -Iutm -Igeotranz -mthreads -DUSE_REGEX_STATIC -Wall -Wlogical-op
 AR := ar
 
 CFLAGS += -g
 
-# For version 1.4, we upgrade from 4.6.2 to 4.9.3.
+# For version 1.4, we upgrade from gcc 4.6.2 to 4.9.3.
 
 # gcc 4.8 adds these.  Try them just for fun.
 # No, it needs libasan which is not on Windows.
 #CFLAGS += -fsanitize=address -fno-omit-frame-pointer
 
+# Helpful for the demodulators.  Overkill for non-hot spots.
+#CFLAGS += -Wdouble-promotion
 
+# Don't have the patience for this right now.
+#CFLAGS += -Wextra
+
+# Continue working on these.
+CFLAGS += -Wsign-compare
+CFLAGS += -Wuninitialized
+CFLAGS += -Wold-style-declaration
+# CFLAGS += -fdelete-null-pointer-checks -Wnull-dereference  ---not recognized
+#CFLAGS += -Wold-style-definition
+#-Wmissing-prototypes
 
 #
 # Let's see impact of various optimization levels.
@@ -178,7 +189,7 @@ log2gpx : log2gpx.c textcolor.o misc.a
 
 # Test application to generate sound.
 
-gen_packets : gen_packets.o  ax25_pad.o hdlc_send.o fcs_calc.o gen_tone.o morse.o textcolor.o dsp.o misc.a regex.a
+gen_packets : gen_packets.o  ax25_pad.o hdlc_send.o fcs_calc.o gen_tone.o morse.o dtmf.o textcolor.o dsp.o misc.a regex.a
 	$(CC) $(CFLAGS) -o $@ $^
 
 
@@ -219,7 +230,7 @@ utm.o : geotranz/utm.c
 # functions supplied by the gnu C library.
 # For the native WIN32 version, we need to use our own copy.
 # These were copied from http://gnuwin32.sourceforge.net/packages/regex.htm
-#
+# Consider upgrading from https://www.gnu.org/software/libc/sources.html
 
 regex.a : regex.o
 	ar -cr $@ $^	
@@ -228,7 +239,8 @@ regex.o : regex/regex.c
 	$(CC) $(CFLAGS) -Dbool=int -Dtrue=1 -Dfalse=0 -c -o $@ $^
 
 
-# There are several string functios found in Linux
+
+# There are several string functions found in Linux
 # but not on Windows.  Need to provide our own copy.
 
 misc.a : strsep.o strtok_r.o strcasestr.o strlcpy.o strlcat.o
@@ -256,7 +268,7 @@ strlcat.o : misc/strlcat.c
 # Combine some unit tests into a single regression sanity check.
 
 
-check : dtest ttest tttexttest pftest tlmtest lltest enctest kisstest pad2test xidtest check-modem1200 check-modem300 check-modem9600 check-modem19200 check-modem2400 check-modem4800
+check : dtest ttest tttexttest pftest tlmtest lltest enctest kisstest pad2test xidtest dtmftest check-modem1200 check-modem300 check-modem9600 check-modem19200 check-modem2400 check-modem4800
 
 # Can we encode and decode at popular data rates?
 # Verify that single bit fixup increases the count.
@@ -273,7 +285,15 @@ check-modem300 : gen_packets atest
 	atest -B300 -F1 -L71 -G75 test3.wav
 	rm test3.wav
 
+#FIXME: test full amplitude.
+
 check-modem9600 : gen_packets atest
+	gen_packets -B9600 -a 170 -o test96.wav
+	sleep 1
+	atest -B9600 -F0 -L4 -G4 test96.wav
+	sleep 1
+	rm test96.wav
+	sleep 1
 	gen_packets -B9600 -n 100 -o test96.wav
 	sleep 1
 	atest -B9600 -F0 -L50 -G54 test96.wav
@@ -282,6 +302,12 @@ check-modem9600 : gen_packets atest
 	rm test96.wav
 
 check-modem19200 : gen_packets atest
+	gen_packets -r 96000 -B19200 -a 170 -o test19.wav
+	sleep 1
+	atest -B19200 -F0 -L4 test19.wav
+	sleep 1
+	rm test19.wav
+	sleep 1
 	gen_packets -r 96000 -B19200 -n 100 -o test19.wav
 	sleep 1
 	atest -B19200 -F0 -L55 -G59 test19.wav
@@ -333,8 +359,8 @@ atest9 : atest.c demod.c dsp.c demod_afsk.c demod_psk.c demod_9600.c hdlc_rec.c
 # Unit test for inner digipeater algorithm
 
 .PHONY: dtest
-dtest : digipeater.c dedupe.c \
-		pfilter.o ax25_pad.o fcs_calc.o tq.o textcolor.o \
+dtest : digipeater.c dedupe.c pfilter.c \
+		ax25_pad.o fcs_calc.o tq.o textcolor.o \
 		decode_aprs.o dwgpsnmea.o dwgps.o serial_port.o latlong.o telemetry.o symbols.o tt_text.o misc.a regex.a
 	$(CC) $(CFLAGS) -DDIGITEST -o $@ $^
 	./dtest
@@ -417,6 +443,13 @@ xidtest : xid.c textcolor.o misc.a
 	./xidtest
 	rm xidtest.exe
 
+# Unit Test for DTMF encode/decode.
+
+.PHONY: dtmftest
+dtmftest : dtmf.c textcolor.o
+	$(CC) $(CFLAGS) -DDTMF_TEST -o $@ $^
+	./dtmftest
+	rm dtmftest.exe
 
 
 # ------------------------------ Other manual testing & experimenting  -------------------------------
@@ -529,7 +562,7 @@ walk96 : walk96.c dwgps.o dwgpsnmea.o kiss_frame.o \
 		xmit.o hdlc_send.o gen_tone.o ptt.o tq.o \
 		hdlc_rec.o hdlc_rec2.o rrbb.o dsp.o audio_win.o \
 		multi_modem.o demod.o demod_afsk.o demod_psk.c demod_9600.o rdq.o \
-		server.o morse.o audio_stats.o dtime_now.o dlq.o \
+		server.o morse.o dtmf.o audio_stats.o dtime_now.o dlq.o \
 		regex.a misc.a 
 	$(CC) $(CFLAGS) -DWALK96 -o $@ $^ -lwinmm -lws2_32
 

ax25_pad.c

@@ -1820,6 +1820,64 @@ void ax25_format_addrs (packet_t this_p, char *result)
 }
 
 
+/*------------------------------------------------------------------
+ *
+ * Function:	ax25_format_via_path
+ *
+ * Purpose:	Format via path addresses suitable for printing.
+ *
+ * Inputs:	Current packet.
+ *
+ *		result_size	- Number of bytes available for result.
+ *				  We can have up to 8 addresses x 9 characters
+ *				  plus 7 commas, possible *, and nul = 81 minimum.
+ *
+ * Outputs:	result	- Digipeater field addresses combined into a single string of the form:
+ *
+ *				"repeater, repeater ..."
+ *
+ *			An asterisk is displayed after the last digipeater
+ *			with the "H" bit set.  e.g.  If we hear RPT2,
+ *
+ *			RPT1,RPT2*,RPT3
+ *
+ *			No asterisk means the source is being heard directly.
+ *
+ *------------------------------------------------------------------*/
+
+void ax25_format_via_path (packet_t this_p, char *result, size_t result_size)
+{
+	int i;
+	int heard;
+	char stemp[AX25_MAX_ADDR_LEN];
+
+	assert (this_p->magic1 == MAGIC);
+	assert (this_p->magic2 == MAGIC);
+	*result = '\0';
+
+	/* Don't get upset if no addresses.  */
+	/* This will allow packets that do not comply to AX.25 format. */
+
+	if (this_p->num_addr == 0) {
+	  return;
+	}
+
+	heard = ax25_get_heard(this_p);
+
+	for (i=(int)AX25_REPEATER_1; i<this_p->num_addr; i++) {
+	  if (i > (int)AX25_REPEATER_1) {
+	    strlcat (result, ",", result_size);
+	  }
+	  ax25_get_addr_with_ssid (this_p, i, stemp);
+	  strlcat (result, stemp, result_size);
+	  if (i == heard) {
+	    strlcat (result, "*", result_size);
+	  }
+	}
+
+} /* end ax25_format_via_path */
+
+
 /*------------------------------------------------------------------
  *
  * Function:	ax25_pack

ax25_pad.h

@@ -410,6 +410,7 @@ extern double ax25_get_release_time (packet_t this_p);
 extern void ax25_set_modulo (packet_t this_p, int modulo);
 
 extern void ax25_format_addrs (packet_t pp, char *);
+extern void ax25_format_via_path (packet_t this_p, char *result, size_t result_size);
 
 extern int ax25_pack (packet_t pp, unsigned char result[AX25_MAX_PACKET_LEN]);
 

beacon.c

@@ -954,7 +954,7 @@ static void beacon_send (int j, dwgps_info_t *gpsinfo)
 
 		  case SENDTO_RECV:
 
-	            /* Simulated reception. */
+	            /* Simulated reception from radio. */
 
 		    memset (&alevel, 0xff, sizeof(alevel));
 	            dlq_rec_frame (g_misc_config_p->beacon[j].sendto_chan, 0, 0, pp, alevel, 0, "");

cdigipeater.c

@@ -241,14 +241,6 @@ static packet_t cdigipeat_match (int from_chan, packet_t pp, char *mycall_rec, c
 	if (filter_str != NULL) {
 
 	  if (pfilter(from_chan, to_chan, filter_str, pp, 0) != 1) {
-
-// Take out debug message?
-// Actually it turns out to be useful.
-// Maybe add a quiet option to suppress it.
-//#if DEBUG
-	    text_color_set(DW_COLOR_INFO);
-	    dw_printf ("Packet was rejected for digipeating from channel %d to %d by cfilter: %s\n", from_chan, to_chan, filter_str);
-//#endif
 	    return(NULL);
 	  }
 	}