New IGate "SATGATE" option to delay packets heard directly.

	modified:   CHANGES.md
	modified:   audio.h
	modified:   ax25_pad.c
	modified:   ax25_pad.h
	modified:   config.c
	modified:   direwolf.c
	modified:   doc/User-Guide.pdf
	modified:   igate.c
	modified:   igate.h

Author: wb2osz

CHANGES.md

@@ -3,14 +3,24 @@
 
 ----------
 
+## Version 1.3  -- Development snapshot K  --  January 2016 ##
+
+### New Feature: ###
+
+- SATgate mode for IGate.  Packets heard directly are delayed before being sent
+to the Internet Server.   This favors digipeated packets because the original
+arrives later and gets dropped if there are duplicates.
+
+----------
+
 ## Version 1.3  -- Development snapshot J  --  January 2016 ##
 
 ### Bugs Fixed: ###
 
 - AGW network protocol now works properly for big-endian processors
 such as PowerPC or MIPS.
 
- - The Mac OSX build procedure is now better about locating the SDK.
+- The Mac OSX build procedure is now better about locating the SDK.
 
 
 ----------

audio.h

@@ -298,6 +298,12 @@ struct audio_s {
 #define DEFAULT_SPACE_FREQ	2200
 #define DEFAULT_BAUD		1200
 
+/* Used for sanity checking in config file and command line options. */
+/* 9600 is known to work.  */
+/* TODO: Is 19200 possible with a soundcard at 44100 samples/sec? */
+
+#define MIN_BAUD		100
+#define MAX_BAUD		10000
 
 
 /*

ax25_pad.c

@@ -219,7 +219,7 @@ int ax25memdebug_seq (packet_t this_p)
  *------------------------------------------------------------------------------*/
 
 
-static packet_t ax25_new (void) 
+packet_t ax25_new (void)
 {
 	struct packet_s *this_p;
 
@@ -1630,11 +1630,50 @@ packet_t ax25_get_nextp (packet_t this_p)
 {
 	assert (this_p->magic1 == MAGIC);
 	assert (this_p->magic2 == MAGIC);
-	
+
 	return (this_p->nextp);
 }
 
 
+/*------------------------------------------------------------------------------
+ *
+ * Name:	ax25_set_release_time
+ *
+ * Purpose:	Set release time
+ *
+ * Inputs:	this_p		- Current packet object.
+ *
+ *		release_time	- Time as returned by dtime_now().
+ *
+ *------------------------------------------------------------------------------*/
+
+void ax25_set_release_time (packet_t this_p, double release_time)
+{
+	assert (this_p->magic1 == MAGIC);
+	assert (this_p->magic2 == MAGIC);
+	
+	this_p->release_time = release_time;
+}
+
+
+
+/*------------------------------------------------------------------------------
+ *
+ * Name:	ax25_get_release_time
+ *
+ * Purpose:	Get release time.
+ *
+ *------------------------------------------------------------------------------*/
+
+double ax25_get_release_time (packet_t this_p)
+{
+	assert (this_p->magic1 == MAGIC);
+	assert (this_p->magic2 == MAGIC);
+
+	return (this_p->release_time);
+}
+
+
 
 /*------------------------------------------------------------------
  *

ax25_pad.h

@@ -73,8 +73,12 @@
 struct packet_s {
 
 	int magic1;		/* for error checking. */
+
 	int seq;		/* unique sequence number for debugging. */
 
+	double release_time;	/* Time stamp in format returned by dtime_now(). */
+				/* When to release from the SATgate mode delay queue. */
+
 #define MAGIC 0x41583235
 
 	struct packet_s *nextp;	/* Pointer to next in queue. */
@@ -145,6 +149,8 @@ typedef struct packet_s *packet_t;
 
 #ifdef AX25_PAD_C	/* Keep this hidden - implementation could change. */
 
+extern packet_t ax25_new (void);
+
 /*
  * APRS always has one control octet of 0x03 but the more
  * general AX.25 case is one or two control bytes depending on
@@ -273,8 +279,10 @@ typedef struct alevel_s {
 } alevel_t;
 
 
+#ifndef AXTEST
+// TODO: remove this?
 #define AX25MEMDEBUG 1
-
+#endif
 
 
 #if AX25MEMDEBUG	// to investigate a memory leak problem
@@ -310,6 +318,8 @@ extern void ax25_delete (packet_t pp);
 #endif
 
 
+
+
 extern int ax25_parse_addr (int position, char *in_addr, int strict, char *out_addr, int *out_ssid, int *out_heard);
 extern int ax25_check_addresses (packet_t pp);
 
@@ -344,6 +354,9 @@ extern int ax25_get_dti (packet_t this_p);
 
 extern packet_t ax25_get_nextp (packet_t this_p);
 
+extern void ax25_set_release_time (packet_t this_p, double release_time);
+extern double ax25_get_release_time (packet_t this_p);
+
 extern void ax25_format_addrs (packet_t pp, char *);
 
 extern int ax25_pack (packet_t pp, unsigned char result[AX25_MAX_PACKET_LEN]);

config.c

@@ -1121,7 +1121,7 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	      continue;
 	    }
 	    n = atoi(t);
-            if (n >= 100 && n <= 10000) {
+            if (n >= MIN_BAUD && n <= MAX_BAUD) {
 	      p_audio_config->achan[channel].baud = n;
 	      if (n != 300 && n != 1200 && n != 9600) {
 	        text_color_set(DW_COLOR_ERROR);
@@ -3720,6 +3720,34 @@ void config_init (char *fname, struct audio_s *p_audio_config,
    	    }
 	  }
 
+/*
+ * SATGATE 		- Special SATgate mode to delay packets heard directly.
+ *
+ * SATGATE [ n ]
+ */
+
+	  else if (strcasecmp(t, "SATGATE") == 0) {
+
+	    t = split(NULL,0);
+	    if (t != NULL) {
+
+	      int n = atoi(t);
+              if (n >= MIN_SATGATE_DELAY && n <= MAX_SATGATE_DELAY) {
+	        p_igate_config->satgate_delay = n;
+	      }
+	      else {
+	        p_igate_config->satgate_delay = DEFAULT_SATGATE_DELAY;
+	        text_color_set(DW_COLOR_ERROR);
+                dw_printf ("Line %d: Unreasonable SATgate delay.  Using default.\n", line);
+	      }
+	    }
+	    else {
+	      p_igate_config->satgate_delay = DEFAULT_SATGATE_DELAY;
+	    }
+	  }
+
+
+
 /*
  * ==================== All the left overs ==================== 
  */

direwolf.c

@@ -1,7 +1,7 @@
 //
 //    This file is part of Dire Wolf, an amateur radio packet TNC.
 //
-//    Copyright (C) 2011, 2012, 2013, 2014, 2015  John Langner, WB2OSZ
+//    Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016  John Langner, WB2OSZ
 //
 //    This program is free software: you can redistribute it and/or modify
 //    it under the terms of the GNU General Public License as published by
@@ -231,7 +231,7 @@ int main (int argc, char *argv[])
 	text_color_init(t_opt);
 	text_color_set(DW_COLOR_INFO);
 	//dw_printf ("Dire Wolf version %d.%d (%s) Beta Test\n", MAJOR_VERSION, MINOR_VERSION, __DATE__);
-	dw_printf ("Dire Wolf DEVELOPMENT version %d.%d %s (%s)\n", MAJOR_VERSION, MINOR_VERSION, "J", __DATE__);
+	dw_printf ("Dire Wolf DEVELOPMENT version %d.%d %s (%s)\n", MAJOR_VERSION, MINOR_VERSION, "K", __DATE__);
 	//dw_printf ("Dire Wolf version %d.%d\n", MAJOR_VERSION, MINOR_VERSION);
 
 #if defined(ENABLE_GPSD) || defined(USE_HAMLIB)