AX.25 v2.2 connected mode.

	modified:   CHANGES.md
	modified:   Makefile.linux
	modified:   Makefile.macosx
	modified:   Makefile.win
	modified:   README.md
	modified:   atest.c
	modified:   audio.h
	new file:   ax25_link.c
	new file:   ax25_link.h
	modified:   ax25_pad.c
	modified:   ax25_pad.h
	modified:   ax25_pad2.c
	new file:   cdigipeater.c
	new file:   cdigipeater.h
	modified:   config.c
	modified:   config.h
	modified:   digipeater.c
	modified:   direwolf.c
	modified:   direwolf.h
	modified:   dlq.c
	modified:   dlq.h
	modified:   doc/Going-beyond-9600-baud.pdf
	modified:   doc/Raspberry-Pi-APRS.pdf
	modified:   doc/Raspberry-Pi-SDR-IGate.pdf
	modified:   doc/User-Guide.pdf
	modified:   gen_packets.c
	modified:   hdlc_rec.c
	modified:   hdlc_send.c
	modified:   hdlc_send.h
	modified:   igate.c
	modified:   log.c
	modified:   log.h
	modified:   multi_modem.c
	modified:   pfilter.c
	modified:   pfilter.h
	modified:   ptt.c
	modified:   recv.c
	modified:   serial_port.c
	modified:   server.c
	modified:   server.h
	modified:   symbols-new.txt
	modified:   tocalls.txt
	modified:   tq.c
	modified:   tq.h
	modified:   waypoint.c
	modified:   xid.c
	new file:   xid.h
	modified:   xmit.c

Author: wb2osz

CHANGES.md

@@ -1,6 +1,20 @@
 
 # Revision History #
 
+
+
+----------
+
+## Version 1.4  -- Development snapshot D --  November 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.
+
+
+### New Features: ###
+
+- AX.25 v2.2 connected mode.  See chapter 10 of User Guide for details.
+
+
 ----------
 
 ## Version 1.4  -- Development snapshot C --  June 2016 ##

Makefile.linux

@@ -230,12 +230,12 @@ z := $(notdir ${CURDIR})
 
 direwolf : direwolf.o config.o recv.o demod.o dsp.o demod_afsk.o demod_psk.o demod_9600.o hdlc_rec.o \
 		hdlc_rec2.o multi_modem.o rdq.o rrbb.o dlq.o \
-		fcs_calc.o ax25_pad.o \
+		fcs_calc.o ax25_pad.o  ax25_pad2.o xid.o \
 		decode_aprs.o symbols.o server.o kiss.o kissnet.o kiss_frame.o hdlc_send.o fcs_calc.o \
-		gen_tone.o audio.o audio_stats.o digipeater.o pfilter.o dedupe.o tq.o xmit.o morse.o \
+		gen_tone.o audio.o audio_stats.o digipeater.o cdigipeater.o pfilter.o dedupe.o tq.o xmit.o morse.o \
 		ptt.o beacon.o encode_aprs.o latlong.o encode_aprs.o latlong.o textcolor.o \
 		dtmf.o aprs_tt.o tt_user.o tt_text.o igate.o waypoint.o serial_port.o log.o telemetry.o \
-		dwgps.o dwgpsnmea.o dwgpsd.o dtime_now.o mheard.o \
+		dwgps.o dwgpsnmea.o dwgpsd.o dtime_now.o mheard.o ax25_link.o \
 		misc.a geotranz.a
 	$(CC) -o $@ $^ $(LDFLAGS)
 ifneq ($(enable_gpsd),)
@@ -588,7 +588,7 @@ install-rpi : dw-start.sh
 # Combine some unit tests into a single regression sanity check.
 
 
-check : dtest ttest tttexttest pftest tlmtest lltest enctest kisstest pad2test check-modem1200 check-modem300 check-modem9600 check-modem19200 check-modem2400 check-modem4800
+check : dtest ttest tttexttest pftest tlmtest lltest enctest kisstest pad2test xidtest check-modem1200 check-modem300 check-modem9600 check-modem19200 check-modem2400 check-modem4800
 
 # Can we encode and decode at popular data rates?
 
@@ -708,6 +708,15 @@ pad2test : ax25_pad2.c ax25_pad.c fcs_calc.o textcolor.o misc.a
 	rm pad2test
 
 
+# Unit Test for XID frame encode/decode.
+
+.PHONY: xidtest
+xidtest : xid.c textcolor.o misc.a
+	$(CC) $(CFLAGS) -DXIDTEST -o $@ $^  $(LDFLAGS)
+	./xidtest
+	rm xidtest
+
+
 
 #  -----------------------------  Manual tests and experiments  ---------------------------
 

Makefile.macosx

@@ -221,14 +221,14 @@ z := $(notdir ${CURDIR})
 
 # Main application.
 
-direwolf : direwolf.o aprs_tt.o audio_portaudio.o audio_stats.o ax25_pad.o beacon.o \
+direwolf : direwolf.o aprs_tt.o audio_portaudio.o audio_stats.o ax25_link.o ax25_pad.o  ax25_pad2.o beacon.o \
 		config.o decode_aprs.o dedupe.o demod_9600.o demod_afsk.o demod_psk.o \
-		demod.o digipeater.o dlq.o dsp.o dtime_now.o dtmf.o dwgps.o \
+		demod.o digipeater.o cdigipeater.o dlq.o dsp.o dtime_now.o dtmf.o dwgps.o \
 		encode_aprs.o encode_aprs.o fcs_calc.o fcs_calc.o gen_tone.o \
 		geotranz.a hdlc_rec.o hdlc_rec2.o hdlc_send.o igate.o kiss_frame.o \
 		kiss.o kissnet.o latlong.o latlong.o log.o morse.o multi_modem.o \
 		waypoint.o serial_port.o pfilter.o ptt.o rdq.o recv.o rrbb.o server.o \
-		symbols.o telemetry.o textcolor.o tq.o tt_text.o tt_user.o xmit.o \
+		symbols.o telemetry.o textcolor.o tq.o tt_text.o tt_user.o xid.o xmit.o \
 		dwgps.o dwgpsnmea.o mheard.o
 	$(CC) $(CFLAGS) -o $@ $^ -lpthread $(LDLIBS) -lm
 

Makefile.win

@@ -16,7 +16,7 @@
 #
 
 
-all : direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients log2gpx gen_packets atest ttcalc
+all : direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients log2gpx gen_packets atest ttcalc tnctest
 
 
 # People say we need -mthreads option for threads to work properly.
@@ -39,8 +39,6 @@ CFLAGS += -g
 #CFLAGS += -fsanitize=address -fno-omit-frame-pointer
 
 
-# TODO: Development in progress.  Don't try using yet.
-#CFLAGS += -DNEW14
 
 #
 # Let's see impact of various optimization levels.
@@ -86,16 +84,14 @@ demod_afsk.o : fsk_demod_state.h
 demod_psk.o  : fsk_demod_state.h
 
 
-# later ax25_link.o 
-
 direwolf : direwolf.o config.o recv.o demod.o dsp.o demod_afsk.o demod_psk.o demod_9600.o hdlc_rec.o \
 		hdlc_rec2.o multi_modem.o rdq.o rrbb.o dlq.o \
-		fcs_calc.o ax25_pad.o ax25_pad2.o \
+		fcs_calc.o ax25_pad.o ax25_pad2.o xid.o \
 		decode_aprs.o symbols.o server.o kiss.o kissnet.o kiss_frame.o hdlc_send.o fcs_calc.o \
-		gen_tone.o morse.o audio_win.o audio_stats.o digipeater.o pfilter.o dedupe.o tq.o xmit.o \
+		gen_tone.o morse.o audio_win.o audio_stats.o digipeater.o cdigipeater.o pfilter.o dedupe.o tq.o xmit.o \
 		ptt.o beacon.o dwgps.o encode_aprs.o latlong.o textcolor.o \
 		dtmf.o aprs_tt.o tt_user.o tt_text.o igate.o waypoint.o serial_port.o log.o telemetry.o \
-		dwgps.o dwgpsnmea.o dtime_now.o mheard.o \
+		dwgps.o dwgpsnmea.o dtime_now.o mheard.o ax25_link.o \
 		dw-icon.o regex.a misc.a geotranz.a
 	$(CC) $(CFLAGS) -o $@ $^ -lwinmm -lws2_32
 
@@ -260,7 +256,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 check-modem1200 check-modem300 check-modem9600 check-modem19200 check-modem2400 check-modem4800
+check : dtest ttest tttexttest pftest tlmtest lltest enctest kisstest pad2test xidtest 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.
@@ -317,6 +313,7 @@ atest : atest.c fsk_fast_filter.h demod.c demod_afsk.c demod_psk.c demod_9600.c
 		rrbb.o fcs_calc.o ax25_pad.o decode_aprs.o \
 		dwgpsnmea.o dwgps.o serial_port.o latlong.c \
 		symbols.c tt_text.c textcolor.c telemetry.c dtime_now.o \
+		decode_aprs.o log.o \
 		misc.a regex.a
 	echo " " > tune.h
 	$(CC) $(CFLAGS) -o $@ $^
@@ -412,10 +409,23 @@ pad2test : ax25_pad2.c ax25_pad.c fcs_calc.o textcolor.o regex.a misc.a
 	./pad2test
 	rm pad2test.exe
 
+# Unit Test for XID frame encode/decode.
+
+.PHONY: xidtest
+xidtest : xid.c textcolor.o misc.a
+	$(CC) $(CFLAGS) -DXIDTEST -o $@ $^
+	./xidtest
+	rm xidtest.exe
+
+
 
 # ------------------------------ Other manual testing & experimenting  -------------------------------
 
 
+tnctest : tnctest.c textcolor.o dtime_now.o serial_port.o misc.a
+	$(CC) $(CFLAGS) -o $@ $^ -lwinmm -lws2_32
+
+
 # For tweaking the demodulator.
 
 demod.o      : tune.h

README.md

@@ -42,6 +42,8 @@ Decodes more than 1000 error-free frames from [WA8LMF TNC Test CD](http://wa8lmf
 
 - Includes separate raw packet decoder, decode_aprs.
 
+- AX.25 v2.2 connected mode.  (New in version 1.4.)
+
 - Open source so you can see how it works and make your own modifications.
 
 - Runs in 3 different environments:
@@ -95,4 +97,4 @@ Here are some good places to share information:
 - [TAPR aprssig](http://www.tapr.org/pipermail/aprssig/)
 
 
-
+The github "issues" section is for reporting software defects and enhancement requests.  It is NOT a place to ask questions or have general discussions.  Please use one of the locations above.

atest.c

@@ -743,6 +743,24 @@ void dlq_rec_frame (int chan, int subchan, int slice, packet_t pp, alevel_t alev
 	ax25_safe_print ((char *)pinfo, info_len, 0);
 	dw_printf ("\n");
 
+#if 1		// temp experiment  	TODO: remove this.
+
+#include "decode_aprs.h"
+#include "log.h"
+
+	if (ax25_is_aprs(pp)) {
+
+	  decode_aprs_t A;
+
+	  decode_aprs (&A, pp, 0);
+
+	  // Temp experiment to see how different systems set the RR bits in the source and destination.
+	  // log_rr_bits (&A, pp);
+
+	}
+#endif
+
+
 	ax25_delete (pp);
 
 } /* end fake dlq_append */

audio.h

@@ -89,6 +89,14 @@ struct audio_s {
 					/* statistics reports.  This is set by */
 					/* the "-a" option.  0 to disable feature. */
 
+	int xmit_error_rate;		/* For testing purposes, we can generate frames with an invalid CRC */
+					/* to simulate corruption while going over the air. */
+					/* This is the probability, in per cent, of randomly corrupting it. */
+					/* Normally this is 0.  25 would mean corrupt it 25% of the time. */
+
+	int recv_error_rate;		/* Similar but the % probablity of dropping a received frame. */
+
+
 	/* Properties for each audio channel, common to receive and transmit. */
 	/* Can be different for each radio channel. */
 
@@ -166,18 +174,20 @@ struct audio_s {
 	    int passall;		/* Allow thru even with bad CRC. */
 
 
+
 	/* Additional properties for transmit. */
 
 	/* Originally we had control outputs only for PTT. */
 	/* In version 1.2, we generalize this to allow others such as DCD. */
+	/* In version 1.4 we add CON for connected to another station. */
 	/* Index following structure by one of these: */
 
 
 #define OCTYPE_PTT 0
 #define OCTYPE_DCD 1
-#define OCTYPE_FUTURE 2
+#define OCTYPE_CON 2
 
-#define NUM_OCTYPES 4		/* number of values above */
+#define NUM_OCTYPES 4		/* number of values above.   WHY IS THIS NOT 3? */
 
 	    struct {