From 7d3c1d100ea38605bf5d11459f5a678be99fffab Mon Sep 17 00:00:00 2001 From: wb2osz Date: Wed, 23 Mar 2022 18:38:53 -0400 Subject: [PATCH 01/15] Create codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 73 +++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 00000000..7134f213 --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,73 @@ +# 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" + +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: [ 'cpp', '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@v2 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: ${{ matrix.language }} + # 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@v1 + + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl + + # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + - run: | + mkdir build + cd build + cmake -DUNITTEST=1 .. + make + make test + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 From a86395c550bb3761abccc3c409b7bde231437392 Mon Sep 17 00:00:00 2001 From: SzymonPriv Date: Tue, 25 Apr 2023 12:13:43 +0100 Subject: [PATCH 02/15] log how a packet was decoded Simple changes to modify the log messages to say whether a packet was decoded as APRS, FX.25, IL2P or AX.25. This is useful when transitioning from AX.25 to IL2P (as the OARC packet network is doing currently), as it makes it obvious why a given station isn't able to say access a BPQ node ;-) This should probably be hidden in a command line parameter, I'm easy either way, this is just a suggestion --- src/direwolf.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/direwolf.c b/src/direwolf.c index 6215e96b..39a9a9c5 100644 --- a/src/direwolf.c +++ b/src/direwolf.c @@ -1324,9 +1324,19 @@ void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alev else { if (ax25_is_aprs(pp)) { text_color_set(DW_COLOR_REC); + dw_printf("[APRS] "); } else { text_color_set(DW_COLOR_DECODED); + if (is_fx25) { // really means 'FEC enabled' + if (X_fx25_xmit_enable > 0) { + dw_printf("[FX.25] "); + } else { + dw_printf("[IL2P] "); + } + } else { + dw_printf("[AX.25] "); + } } if (audio_config.achan[chan].num_subchan > 1 && audio_config.achan[chan].num_slicers == 1) { From fd6668e8c3fd4352d8c83186ee6b0efb2a31e722 Mon Sep 17 00:00:00 2001 From: SzymonPriv Date: Tue, 25 Apr 2023 12:49:58 +0100 Subject: [PATCH 03/15] Whoops, pasted wrong change --- src/direwolf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/direwolf.c b/src/direwolf.c index 39a9a9c5..9d019b89 100644 --- a/src/direwolf.c +++ b/src/direwolf.c @@ -1329,7 +1329,7 @@ void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alev else { text_color_set(DW_COLOR_DECODED); if (is_fx25) { // really means 'FEC enabled' - if (X_fx25_xmit_enable > 0) { + if (audio_config.achan[0].layer2_xmit == LAYER2_FX25) { dw_printf("[FX.25] "); } else { dw_printf("[IL2P] "); From 7552105282fd0b5962f54d6fd2b99a6991003dca Mon Sep 17 00:00:00 2001 From: Rafael Gustavo da Cunha Pereira Pinto Date: Tue, 5 Mar 2024 08:58:50 -0300 Subject: [PATCH 04/15] Update codeql-analysis.yml to v2 --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 7134f213..5eb1f566 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -42,7 +42,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -53,7 +53,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@v2 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -70,4 +70,4 @@ jobs: make test - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 From 0a1670f7c277135fa98a5ee2757276e46144c501 Mon Sep 17 00:00:00 2001 From: Rafael Gustavo da Cunha Pereira Pinto Date: Tue, 5 Mar 2024 09:01:48 -0300 Subject: [PATCH 05/15] Update codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5eb1f566..b2492841 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -19,6 +19,7 @@ on: branches: [ dev ] schedule: - cron: '25 8 * * 4' + workflow_dispatch: jobs: analyze: From c499496bbc237d0efdcacec5786607f5e17c1c7e Mon Sep 17 00:00:00 2001 From: Rafael Gustavo da Cunha Pereira Pinto Date: Tue, 5 Mar 2024 09:07:45 -0300 Subject: [PATCH 06/15] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84aeb738..182a9b4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.0) +cmake_minimum_required(VERSION 3.5.0) project(direwolf) From 7935054ee3b9fe1937cd3d852edf250c2c6ad813 Mon Sep 17 00:00:00 2001 From: Rafael Gustavo da Cunha Pereira Pinto Date: Tue, 5 Mar 2024 09:18:16 -0300 Subject: [PATCH 07/15] Update codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b2492841..4239b3eb 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -39,11 +39,11 @@ jobs: 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@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -54,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@v2 + uses: github/codeql-action/autobuild@v3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -71,4 +71,4 @@ jobs: make test - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 From 9ae4edcabfeec9061c6d0bf2e1b6c778a1f2901f Mon Sep 17 00:00:00 2001 From: Rafael Gustavo da Cunha Pereira Pinto Date: Tue, 5 Mar 2024 14:13:53 -0300 Subject: [PATCH 08/15] Update codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 4239b3eb..021dbe55 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -46,6 +46,7 @@ jobs: uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} + setup-python-dependencies: false # 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. From 3f3fed216b6eb55fc1a3ccacd7003386955bc4be Mon Sep 17 00:00:00 2001 From: Rafael Gustavo da Cunha Pereira Pinto Date: Tue, 5 Mar 2024 14:18:29 -0300 Subject: [PATCH 09/15] Update codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 021dbe55..956bb39e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -46,7 +46,7 @@ jobs: uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} - setup-python-dependencies: false + 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. From 3aa8097461118e5246da2e2f5275cbb04c839627 Mon Sep 17 00:00:00 2001 From: Rafael Gustavo da Cunha Pereira Pinto Date: Wed, 6 Mar 2024 09:39:20 -0300 Subject: [PATCH 10/15] removing python from codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 956bb39e..edd6a96b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -33,7 +33,7 @@ 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 From 21048d5d1a8e4db4ebb07e1c62ce2126cc2c4feb Mon Sep 17 00:00:00 2001 From: Rafael Gustavo da Cunha Pereira Pinto Date: Wed, 6 Mar 2024 09:40:16 -0300 Subject: [PATCH 11/15] Create codeql-analysis-python.yml --- .github/workflows/codeql-analysis-python.yml | 65 ++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 .github/workflows/codeql-analysis-python.yml diff --git a/.github/workflows/codeql-analysis-python.yml b/.github/workflows/codeql-analysis-python.yml new file mode 100644 index 00000000..35cf0404 --- /dev/null +++ b/.github/workflows/codeql-analysis-python.yml @@ -0,0 +1,65 @@ +# 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" + +on: + push: + branches: [ dev ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ dev ] + schedule: + - cron: '25 8 * * 4' + workflow_dispatch: + +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 From e7b4650935adab423ed1f3772767d9a5fd71775c Mon Sep 17 00:00:00 2001 From: Rafael Gustavo da Cunha Pereira Pinto Date: Wed, 6 Mar 2024 09:40:45 -0300 Subject: [PATCH 12/15] Update codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index edd6a96b..d445a168 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.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: From c5c7d4a44d471bee0bbc19115b9f9c0264a61754 Mon Sep 17 00:00:00 2001 From: Rafael Gustavo da Cunha Pereira Pinto Date: Wed, 6 Mar 2024 09:41:05 -0300 Subject: [PATCH 13/15] Update codeql-analysis-python.yml --- .github/workflows/codeql-analysis-python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis-python.yml b/.github/workflows/codeql-analysis-python.yml index 35cf0404..15a4c0b6 100644 --- a/.github/workflows/codeql-analysis-python.yml +++ b/.github/workflows/codeql-analysis-python.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 - Python" on: push: From 41e78513762237546ddc68ce4e1b39665a6c7144 Mon Sep 17 00:00:00 2001 From: Rafael Gustavo da Cunha Pereira Pinto Date: Wed, 6 Mar 2024 09:43:44 -0300 Subject: [PATCH 14/15] Update codeql-analysis-python.yml --- .github/workflows/codeql-analysis-python.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/codeql-analysis-python.yml b/.github/workflows/codeql-analysis-python.yml index 15a4c0b6..a47a8f8d 100644 --- a/.github/workflows/codeql-analysis-python.yml +++ b/.github/workflows/codeql-analysis-python.yml @@ -19,7 +19,6 @@ on: branches: [ dev ] schedule: - cron: '25 8 * * 4' - workflow_dispatch: jobs: analyze: From 69407ccf84c443d7da93ef9a63a1ebe7eaf88fce Mon Sep 17 00:00:00 2001 From: Rafael Gustavo da Cunha Pereira Pinto Date: Wed, 6 Mar 2024 09:43:59 -0300 Subject: [PATCH 15/15] Update codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d445a168..a86300f3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -19,7 +19,6 @@ on: branches: [ dev ] schedule: - cron: '25 8 * * 4' - workflow_dispatch: jobs: analyze: