Allow single log file with fixed name rather than starting a new one each day.

Author: wb2osz

CHANGES.md

@@ -9,10 +9,11 @@ This is a snapshot of ongoing development towards version of 1.5.  Some features
 
 - Time slots for beaconing.
 
-- V20 configuration item for listing stations known not to understaand AX.25 v2.2.  This will speed up connection by going right to SABM and not trying SABME first and failing.
-
 - Documentation updates describing cheap SDR frequency inaccuracy and how to compensate for it.
 
+- Allow single log file with fixed name rather than starting a new one each day.
+
+
 ### Bugs Fixed: ###
 
 - PACLEN configuration item no longer restricts length of received frames.
@@ -31,7 +32,7 @@ This is a snapshot of ongoing development towards version of 1.5.  Some features
 
 - decode_aprs utility can now accept KISS frames and AX.25 frames as series of two digit hexadecimal numbers.
 
-- New configuration option, V20, for listing stations known to not understand AX.25 v2.2.
+- New configuration option, V20, for listing stations known to not understand AX.25 v2.2.  This will speed up connection by going right to SABM and not trying SABME first and failing.
 
 
 ### Bugs Fixed: ###

config.c

@@ -877,7 +877,8 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	strlcpy (p_misc_config->gpsnmea_port, "", sizeof(p_misc_config->gpsnmea_port));
 	strlcpy (p_misc_config->waypoint_port, "", sizeof(p_misc_config->waypoint_port));
 
-	strlcpy (p_misc_config->logdir, "", sizeof(p_misc_config->logdir));
+	p_misc_config->log_daily_names = 0;
+	strlcpy (p_misc_config->log_path, "", sizeof(p_misc_config->log_path));
 
 	/* connected mode. */
 
@@ -4283,7 +4284,7 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	  }
 
 /*
- * LOGDIR	- Directory name for storing log files.  Use "." for current working directory.
+ * LOGDIR	- Directory name for automatically named daily log files.  Use "." for current working directory.
  */
 	  else if (strcasecmp(t, "logdir") == 0) {
 	    t = split(NULL,0);
@@ -4293,7 +4294,12 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	      continue;
 	    }
 	    else {
-	      strlcpy (p_misc_config->logdir, t, sizeof(p_misc_config->logdir));
+	      if (strlen(p_misc_config->log_path) > 0) {
+	        text_color_set(DW_COLOR_ERROR);
+	        dw_printf ("Config file: LOGDIR on line %d is replacing an earlier LOGDIR or LOGFILE.\n", line);
+	      }
+	      p_misc_config->log_daily_names = 1;
+	      strlcpy (p_misc_config->log_path, t, sizeof(p_misc_config->log_path));
 	    }
 	    t = split(NULL,0);
 	    if (t != NULL) {
@@ -4302,6 +4308,31 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	    }
 	  }
 
+/*
+ * LOGFILE	- Log file name, including any directory part.
+ */
+	  else if (strcasecmp(t, "logfile") == 0) {
+	    t = split(NULL,0);
+	    if (t == NULL) {
+	      text_color_set(DW_COLOR_ERROR);
+	      dw_printf ("Config file: Missing file name for LOGFILE on line %d.\n", line);
+	      continue;
+	    }
+	    else {
+	      if (strlen(p_misc_config->log_path) > 0) {
+	        text_color_set(DW_COLOR_ERROR);
+	        dw_printf ("Config file: LOGFILE on line %d is replacing an earlier LOGDIR or LOGFILE.\n", line);
+	      }
+	      p_misc_config->log_daily_names = 0;
+	      strlcpy (p_misc_config->log_path, t, sizeof(p_misc_config->log_path));
+	    }
+	    t = split(NULL,0);
+	    if (t != NULL) {
+	      text_color_set(DW_COLOR_ERROR);
+	      dw_printf ("Config file: LOGFILE on line %d should have file name and nothing more.\n", line);
+	    }
+	  }
+
 /*
  * BEACON channel delay every message
  *

config.h

@@ -77,7 +77,9 @@ struct misc_config_s {
 #define WPT_FORMAT_KENWOOD      0x08		/* K	$PKWDWPL */
 
 
-	char logdir[80];	/* Directory for saving activity logs. */
+	int log_daily_names;	/* True to generate new log file each day. */
+
+	char log_path[80];	/* Either directory or full file name depending on above. */
 
 	int sb_configured;	/* TRUE if SmartBeaconing is configured. */
 	int sb_fast_speed;	/* MPH */

direwolf.c

@@ -194,7 +194,8 @@ int main (int argc, char *argv[])
 	struct igate_config_s igate_config;
 	int r_opt = 0, n_opt = 0, b_opt = 0, B_opt = 0, D_opt = 0;	/* Command line options. */
 	char P_opt[16];
-	char l_opt[80];
+	char l_opt_logdir[80];
+	char L_opt_logfile[80];
 	char input_file[80];
 	// char timestamp[16];
 
@@ -215,7 +216,8 @@ int main (int argc, char *argv[])
 	int E_tx_opt = 0;		/* "-E n" Error rate % for clobbering trasmit frames. */
 	int E_rx_opt = 0;		/* "-E Rn" Error rate % for clobbering receive frames. */
 
-	strlcpy(l_opt, "", sizeof(l_opt));
+	strlcpy(l_opt_logdir, "", sizeof(l_opt_logdir));
+	strlcpy(L_opt_logfile, "", sizeof(L_opt_logfile));
 	strlcpy(P_opt, "", sizeof(P_opt));
 
 #if __WIN32__
@@ -356,7 +358,7 @@ int main (int argc, char *argv[])
 
 	  /* ':' following option character means arg is required. */
 
-          c = getopt_long(argc, argv, "P:B:D:c:pxr:b:n:d:q:t:Ul:Sa:E:",
+          c = getopt_long(argc, argv, "P:B:D:c:pxr:b:n:d:q:t:Ul:L:Sa:E:",
                         long_options, &option_index);
           if (c == -1)
             break;
@@ -532,11 +534,17 @@ int main (int argc, char *argv[])
 	    exit (0);
 	    break;
 
-          case 'l':				/* -l for log file directory name */
+          case 'l':				/* -l for log directory with daily files */
 
-	    strlcpy (l_opt, optarg, sizeof(l_opt));
+	    strlcpy (l_opt_logdir, optarg, sizeof(l_opt_logdir));
             break;
 
+          case 'L':				/* -L for log file name with full path */
+
+	    strlcpy (L_opt_logfile, optarg, sizeof(L_opt_logfile));
+            break;
+
+
 	  case 'S':				/* Print symbol tables and exit. */
 
 	    symbols_init ();
@@ -674,8 +682,19 @@ int main (int argc, char *argv[])
 	audio_config.recv_error_rate = E_rx_opt;
 
 
-	if (strlen(l_opt) > 0) {
-	  strlcpy (misc_config.logdir, l_opt, sizeof(misc_config.logdir));
+	if (strlen(l_opt_logdir) > 0 && strlen(L_opt_logfile) > 0) {
+          text_color_set(DW_COLOR_ERROR);
+	  dw_printf ("Logging options -l and -L can't be used together.  Pick one or the other.\n");
+	  exit(1);
+	}
+
+	if (strlen(L_opt_logfile) > 0) {
+	  misc_config.log_daily_names = 0;
+	  strlcpy (misc_config.log_path, L_opt_logfile, sizeof(misc_config.log_path));
+	}
+	else if (strlen(l_opt_logdir) > 0) {
+	  misc_config.log_daily_names = 1;
+	  strlcpy (misc_config.log_path, l_opt_logdir, sizeof(misc_config.log_path));
 	}
 
 	misc_config.enable_kiss_pt = enable_pseudo_terminal;
@@ -794,7 +813,7 @@ int main (int argc, char *argv[])
  * log the tracker beacon transmissions with fake channel 999.
  */
 
-	log_init(misc_config.logdir);
+	log_init(misc_config.log_daily_names, misc_config.log_path);
 	mheard_init (d_m_opt);
 	beacon_init (&audio_config, &misc_config, &igate_config);