Merge pull request #1 from wb2osz/master

Pulling in latest

Author: SzymonPriv

Diff for: .github/workflows/ci.yml

@@ -80,15 +80,7 @@ jobs:
               build_type: 'Release',
               cmake_extra_flags: ''
             }
-          - {
-              name: 'Ubuntu 18.04',
-              os: ubuntu-18.04,
-              cc: 'gcc',
-              cxx: 'g++',
-              arch: 'x86_64',
-              build_type: 'Release',
-              cmake_extra_flags: ''
-            }
+
     steps:
       - name: checkout
         uses: actions/checkout@v2

Diff for: .github/workflows/codeql-analysis-python.yml

@@ -0,0 +1,64 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL - Python"
+
+on:
+  push:
+    branches: [ dev ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ dev ]
+  schedule:
+    - cron: '25 8 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        setup-python-dependencies: true
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v3
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3

Diff for: .github/workflows/codeql-analysis.yml

@@ -9,7 +9,7 @@
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
 #
-name: "CodeQL"
+name: "CodeQL - CPP"
 
 on:
   push:
@@ -32,19 +32,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'cpp', 'python' ]
+        language: [ 'cpp' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
+        setup-python-dependencies: true
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
@@ -53,7 +54,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -70,4 +71,4 @@ jobs:
        make test
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3

Diff for: CHANGES.md

@@ -2,20 +2,39 @@
 # Revision History #
 
 
-## Version 1.7  --  Under Development ('dev' branch) ##
+## Version 1.7  --  October 2023 ##
+
+
+### New Documentation: ###
+
+Additional documentation location to slow down growth of main repository.  [https://github.com/wb2osz/direwolf-doc](https://github.com/wb2osz/direwolf-doc) .   These are more oriented toward achieving a goal and understanding, as opposed to the User Guide which describes the functionality.
+
+- ***APRS Digipeaters***
+
+- ***Internal Packet Routing***
+
+- ***Radio Interface Guide***
+
+- ***Successful IGate Operation***
+
+- ***Understanding APRS Packets***
 
 
 ### New Features: ###
 
-- Additional documentation location to slow down growth of main repository.  [https://github.com/wb2osz/direwolf-doc](https://github.com/wb2osz/direwolf-doc)
+
 
 - New ICHANNEL configuration option to map a KISS client application channel to APRS-IS. Packets from APRS-IS will be presented to client applications as the specified channel. Packets sent, by client applications, to that channel will go to APRS-IS rather than a radio channel.  Details in ***Internal-Packet-Routing.pdf***.
 
 - New variable speed option for gen_packets. For example,  "-v 5,0.1" would generate packets from 5% too slow to 5% too fast with increments of 0.1.  Some implementations might have imprecise timing.  Use this to test how well TNCs tolerate sloppy timing.
 
-- Improved Layer 2 Protocol [(IL2P)](https://en.wikipedia.org/wiki/FX.25_Forward_Error_Correction).  Use "-I 1" on command line to enable transmit for first channel.  Compatible with Nino TNC for 1200 and 9600 bps.
+- Improved Layer 2 Protocol [(IL2P)](https://en.wikipedia.org/wiki/FX.25_Forward_Error_Correction).    Compatible with Nino TNC for 1200 and 9600 bps.  Use "-I 1" on command line to enable transmit for first channel.  For more general case, add to config file (simplified version, see User Guide for more details):
+
+    > After:   "CHANNEL 1"   (or other channel)
+    >
+    > Add:     "IL2PTX 1"
 
-- Limited support for CM109/CM119 GPIO PTT on Windows.
+- Limited support for CM108/CM119 GPIO PTT on Windows.
 
 - Dire Wolf now advertises itself using DNS Service Discovery.  This allows suitable APRS / Packet Radio applications to find a network KISS TNC without knowing the IP address or TCP port.    Thanks to Hessu for providing this.  Currently available only for Linux and Mac OSX.  [Read all about it here.](https://github.com/hessu/aprs-specs/blob/master/TCP-KISS-DNS-SD.md)
 
@@ -30,6 +49,21 @@
     > Add:     "FX25TX 1" (or 16 or 32 or 64)
 
 
+
+### Bugs Fixed: ###
+
+- The t/m packet filter incorrectly included bulletins.  It now allows only "messages" to specific stations.  Use of t/m is discouraged.  i/180 is the preferred filter for messages to users recently heard locally.
+
+- Packet filtering now skips over any third party header before classifying packet types.
+
+- Fixed build for Alpine Linux.
+
+### Notes: ###
+
+The Windows binary distribution now uses gcc (MinGW) version 11.3.0.
+The Windows version is built for both 32 and 64 bit operating systems.
+Use the 64 bit version if possible; it runs considerably faster.
+
 ## Version 1.6  --  October 2020 ##
 
 ### New Build Procedure: ###

Diff for: CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.0)
+cmake_minimum_required(VERSION 3.5.0)
 
 project(direwolf)
 
@@ -265,9 +265,33 @@ endif(WIN32 OR CYGWIN)
 # requirements
 
 include(CheckSymbolExists)
+
 # Some platforms provide their own strlcpy & strlcat. (BSD, MacOSX)
-# Others don't so we provide our own. (Most, but not all Linux)
-# Define the preprocessor macro so libgps does not supply its own version.
+# Others don't so we provide our own. (Windows, most, but not all Linux)
+# Here we detect whether these are provided by the OS and set a symbol
+# so that:
+#  (1) libgps does not supply its own version.
+#  (2) we know whether we need to supply our own copy.
+#
+# This was all working fine until these were added to the gnu c library 2.38.
+# References:
+#  - https://www.gnu.org/software/libc/sources.html
+#  - https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=NEWS;hb=HEAD
+#
+# This test is not detecting them for glibc 2.38 resulting in a conflict.
+# Why?  Are they declared in a different file or in some strange way?
+#
+# This is how they are declared in include/string.h:
+#
+#	extern __typeof (strlcpy) __strlcpy;
+#	libc_hidden_proto (__strlcpy)
+#	extern __typeof (strlcat) __strlcat;
+#	libc_hidden_proto (__strlcat)
+#
+# Apparently cmake does not recognize this style.
+# Keep this here for BSD type systems where it behaves as expected.
+# We will need to add a hack in direwolf.h to define these if glibc version >= 2.38.
+
 check_symbol_exists(strlcpy string.h HAVE_STRLCPY)
 if(HAVE_STRLCPY)
     add_compile_options(-DHAVE_STRLCPY)

Diff for: conf/99-direwolf-cmedia.rules

@@ -28,3 +28,9 @@ SUBSYSTEM=="hidraw", ATTRS{idVendor}=="0d8c", GROUP="audio", MODE="0660"
 #
 # Read the User Guide and run the "cm108" application for more information.
 #
+
+#
+# Same thing for the "All In One Cable."
+#
+
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="7388", GROUP="audio", MODE="0660"

Diff for: conf/generic.conf

@@ -98,6 +98,11 @@
 %C%# Many people will simply use the default sound device.
 %C%# Some might want to use an alternative device by choosing it here.
 %C%#
+%C%#
+%C%# Many examples of radio interfaces and PTT options can be found in: 
+%C%# https://github.com/wb2osz/direwolf-doc/blob/main/Radio-Interface-Guide.pdf
+%C%#
+%C%#
 %R% ---------- Windows ----------
 %R%
 %W%# When the Windows version starts up, it displays something like
@@ -382,8 +387,8 @@
 %C%# This is not a global setting.
 %C%# It applies only the the most recent CHANNEL specified.
 %C%#
-%C%#	0 - Don't try to repair.
-%C%#	1 - Attempt to fix single bit error.  (default)
+%C%#	0 - Don't try to repair.  (default)
+%C%#	1 - Attempt to fix single bit error.
 %C%#
 %C%
 %C%#FIX_BITS 0
@@ -458,10 +463,10 @@
 %C%# the "#" from the beginning of the line below.
 %C%#
 %C%
-%C%#DIGIPEAT 0 0 ^WIDE[3-7]-[1-7]$|^TEST$ ^WIDE[12]-[12]$ TRACE
+%C%#DIGIPEAT 0 0 ^WIDE[3-7]-[1-7]$|^TEST$ ^WIDE[12]-[12]$
 %C%
-%C%# See User Guide for more explanation of what this means and how
-%C%# it can be customized for your particular needs.
+%C%# See User Guide and "APRS-Digipeaters.pdf" for more explanation of what
+%C%# this means and how it can be customized for your particular needs.
 %C%
 %C%
 %C%# Traditional connected mode packet radio uses a different
@@ -505,7 +510,7 @@
 %C%# To relay messages from the Internet to radio, you need to add
 %C%# one more option with the transmit channel number and a VIA path.
 %C%
-%C%#IGTXVIA 0 WIDE1-1
+%C%#IGTXVIA 0 WIDE1-1,WIDE2-1
 %C%
 %C%
 %C%# Finally, we don't want to flood the radio channel.
@@ -529,82 +534,4 @@
 %C%#
 %C%# See separate "APRStt-Implementation-Notes" document for details.
 %C%#
-%C%
-%C%#
-%C%# Sample gateway configuration based on:
-%C%#
-%C%#	http://www.aprs.org/aprstt/aprstt-coding24.txt
-%C%#	http://www.aprs.org/aprs-jamboree-2013.html
-%C%#
-%C%
-%C%# Define specific points.
-%C%
-%C%TTPOINT  B01  37^55.37N  81^7.86W
-%C%TTPOINT  B7495088  42.605237  -71.34456
-%C%TTPOINT  B934  42.605237  -71.34456
-%C%
-%C%TTPOINT B901  42.661279  -71.364452
-%C%TTPOINT B902  42.660411  -71.364419
-%C%TTPOINT B903  42.659046  -71.364452
-%C%TTPOINT B904  42.657578  -71.364602
-%C%
-%C%
-%C%# For location at given bearing and distance from starting point.
-%C%
-%C%TTVECTOR  B5bbbddd  37^55.37N  81^7.86W  0.01  mi
-%C%
-%C%# For location specified by x, y coordinates.
-%C%
-%C%TTGRID   Byyyxxx    37^50.00N  81^00.00W  37^59.99N  81^09.99W
-%C%
-%C%# UTM location for Lowell-Dracut-Tyngsborough State Forest.
-%C%
-%C%TTUTM  B6xxxyyy  19T  10  300000  4720000
-%C%
-%C%
-%C%
-%C%# Location for the corral.
-%C%
-%C%TTCORRAL   37^55.50N  81^7.00W  0^0.02N
-%C%
-%C%# Compact messages - Fixed locations xx and object yyy where
-%C%#   	Object numbers 100 - 199	= bicycle
-%C%#	Object numbers 200 - 299	= fire truck
-%C%#	Others				= dog
-%C%
-%C%TTMACRO  xx1yy  B9xx*AB166*AA2B4C5B3B0A1yy
-%C%TTMACRO  xx2yy  B9xx*AB170*AA3C4C7C3B0A2yy
-%C%TTMACRO  xxyyy  B9xx*AB180*AA3A6C4A0Ayyy
-%C%
-%C%TTMACRO  z  Cz
-%C%
-%C%# Receive on channel 0, Transmit object reports on channel 1 with optional via path.
-%C%# You probably want to put in a transmit delay on the APRStt channel so it
-%C%# it doesn't start sending a response before the user releases PTT.
-%C%# This is in 10 ms units so 100 means 1000 ms = 1 second.
-%C%
-%C%#TTOBJ 0 1 WIDE1-1
-%C%#CHANNEL 0
-%C%#DWAIT 100
-%C%
-%C%# Advertise gateway position with beacon.
-%C%
-%C%# OBEACON DELAY=0:15 EVERY=10:00 VIA=WIDE1-1 OBJNAME=WB2OSZ-tt SYMBOL=APRStt LAT=42^37.14N LONG=71^20.83W COMMENT="APRStt Gateway"
-%C%
-%C%
-%C%# Sample speech responses.
-%C%# Default is Morse code "R" for received OK and "?" for all errors.
-%C%
-%C%#TTERR  OK               SPEECH  Message Received.
-%C%#TTERR  D_MSG            SPEECH  D not implemented.
-%C%#TTERR  INTERNAL         SPEECH  Internal error.
-%C%#TTERR  MACRO_NOMATCH    SPEECH  No definition for digit sequence.
-%C%#TTERR  BAD_CHECKSUM     SPEECH  Bad checksum on call.
-%C%#TTERR  INVALID_CALL     SPEECH  Invalid callsign.
-%C%#TTERR  INVALID_OBJNAME  SPEECH  Invalid object name.
-%C%#TTERR  INVALID_SYMBOL   SPEECH  Invalid symbol.
-%C%#TTERR  INVALID_LOC      SPEECH  Invalid location.
-%C%#TTERR  NO_CALL          SPEECH  No call or object name.
-%C%#TTERR  SATSQ            SPEECH  Satellite square must be 4 digits.
-%C%#TTERR  SUFFIX_NO_CALL   SPEECH  Send full call before using suffix.
-%C%
+