First rough approximation of ICHANNEL.

Author: wb2osz

src/atest.c

@@ -620,9 +620,9 @@ int main (int argc, char *argv[])
 	my_audio_config.adev[0].bits_per_sample = format.wbitspersample;
  	my_audio_config.adev[0].num_channels = format.nchannels;
 
-	my_audio_config.achan[0].medium = MEDIUM_RADIO;
+	my_audio_config.chan_medium[0] = MEDIUM_RADIO;
 	if (format.nchannels == 2) {
-	  my_audio_config.achan[1].medium = MEDIUM_RADIO;
+	  my_audio_config.chan_medium[1] = MEDIUM_RADIO;
 	}
 
 	text_color_set(DW_COLOR_INFO);

src/audio.h

@@ -119,32 +119,39 @@ struct audio_s {
 					/* I put it here, rather than with the rest of the link layer */
 					/* parameters because it is really a part of the HDLC layer */
 					/* and is part of the KISS TNC functionality rather than our data link layer. */
+					/* Future: not used yet. */
+
 
 	char timestamp_format[40];	/* -T option */
 					/* Precede received & transmitted frames with timestamp. */
 					/* Command line option uses "strftime" format string. */
 
 
-	/* Properties for each channel, common to receive and transmit. */
-	/* Can be different for each radio channel. */
 
 	/* originally a "channel" was always connected to an internal modem. */
 	/* In version 1.6, this is generalized so that a channel (as seen by client application) */
 	/* can be connected to something else.  Initially, this will allow application */
 	/* access to the IGate.  Later we might have network TNCs or other internal functions. */
 
+	// Properties for all channels.
 
-	struct achan_param_s {
-
-	    // Originally there was a boolean, called "valid", to indicate that the
-	    // channel is valid.  This has been replaced with the new "medium" which
-	    // will allow channels to correspond to things other than internal modems.
-
-	    enum medium_e medium;	// MEDIUM_NONE for invalid.
+	enum medium_e chan_medium[MAX_TOTAL_CHANS];
+					// MEDIUM_NONE for invalid.
 					// MEDIUM_RADIO for internal modem.  (only possibility earlier)
 					// MEDIUM_IGATE allows application access to IGate.
+					// MEDIUM_NETTNC for external TNC via TCP.
 
+	int igate_vchannel;		/* Virtual channel mapped to APRS-IS. */
+					/* -1 for none. */
+					/* Redundant but it makes things quicker and simpler */
+					/* than always searching thru above. */
+
+	/* Properties for each radio channel, common to receive and transmit. */
+	/* Can be different for each radio channel. */
+
+	struct achan_param_s {
 
+	    // What else should be moved out of structure and enlarged when NETTNC is implemented.  ???
 	    char mycall[AX25_MAX_ADDR_LEN];      /* Call associated with this radio channel. */
                                 	/* Could all be the same or different. */
 

src/ax25_pad.c

@@ -511,6 +511,13 @@ packet_t ax25_from_text (char *monitor, int strict)
 
 	  // printf ("DEBUG: get digi loop, num addr = %d, address = '%s'\n", k, pa);// FIXME
 
+	  // Hack for q construct, from APRS-IS, so it does not cause panic later.
+
+	  if ( ! strict && pa[0] == 'q' && pa[1] == 'A') {
+	    pa[0] = 'Q';
+	    pa[2] = toupper(pa[2]);
+	  }
+
 	  if ( ! ax25_parse_addr (k, pa, strict, atemp, &ssid_temp, &heard_temp)) {
 	    text_color_set(DW_COLOR_ERROR);
 	    dw_printf ("Failed to create packet from text.  Bad digipeater address\n");

src/beacon.c

@@ -163,8 +163,8 @@ void beacon_init (struct audio_s *pmodem, struct misc_config_s *pconfig, struct
 
 	  if (chan < 0) chan = 0;	/* For IGate, use channel 0 call. */
 
-	  if (g_modem_config_p->achan[chan].medium == MEDIUM_RADIO ||
-	      g_modem_config_p->achan[chan].medium == MEDIUM_NETTNC) {
+	  if (g_modem_config_p->chan_medium[chan] == MEDIUM_RADIO ||
+	      g_modem_config_p->chan_medium[chan] == MEDIUM_NETTNC) {
 
 	    if (strlen(g_modem_config_p->achan[chan].mycall) > 0 &&
 			 strcasecmp(g_modem_config_p->achan[chan].mycall, "N0CALL") != 0 &&

src/cdigipeater.c

@@ -132,7 +132,7 @@ void cdigipeater (int from_chan, packet_t pp)
 	// Connected mode is allowed only for channels with internal modem.
 	// It probably wouldn't matter for digipeating but let's keep that rule simple and consistent.
 
-	if ( from_chan < 0 || from_chan >= MAX_CHANS || save_audio_config_p->achan[from_chan].medium != MEDIUM_RADIO) {
+	if ( from_chan < 0 || from_chan >= MAX_CHANS || save_audio_config_p->chan_medium[from_chan] != MEDIUM_RADIO) {
 	  text_color_set(DW_COLOR_ERROR);
 	  dw_printf ("cdigipeater: Did not expect to receive on invalid channel %d.\n", from_chan);
 	  return;