diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index da1f23ac5e..41ada87586 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -14,7 +14,7 @@ runs: steps: # Pre-configuration steps # (skip ccache for --disable-precompiled-headers because it won't use it) - # (skip ccache for optimized because built files are too architecture dependent) + # (skip ccache for optimized because built files are architecture dependent) - if: env.MODE != 'optimized' && ( ! contains(env.EXTRA_OPTIONS, '--disable-precompiled-headers') ) name: "Restore build cache of this job" uses: hendrikmuhs/ccache-action@v1.2 @@ -27,7 +27,7 @@ runs: run: > CXX=$COMPILER ./ns3 configure -d $MODE -GNinja --enable-examples --enable-tests --enable-asserts --enable-werror - --enable-modules "lorawan;applications" $EXTRA_OPTIONS + --enable-modules lorawan $EXTRA_OPTIONS # Build steps - name: "Build ns-3" shell: bash diff --git a/.github/actions/checkout-in-ns3/action.yml b/.github/actions/checkout-in-ns3/action.yml index 33f0b9c2a8..c11aa062f8 100644 --- a/.github/actions/checkout-in-ns3/action.yml +++ b/.github/actions/checkout-in-ns3/action.yml @@ -16,7 +16,7 @@ runs: wget -nv -O ns-3-dev.tar https://gitlab.com/api/v4/projects/nsnam%2Fns-3-dev/repository/archive.tar?sha=$tag tar -xf ns-3-dev.tar && cp -a ns-3-dev-$tag-*/. . && rm -R ns-3-dev.tar ns-3-dev-$tag* echo - echo "###################################################" + echo "######################################################" echo "###### WARNING! CURRENT NS-3 VERSION: $tag ######" - echo "###################################################" + echo "######################################################" shell: bash diff --git a/.github/actions/install-analysis/action.yml b/.github/actions/install-analysis/action.yml deleted file mode 100644 index ad0ce8e6ac..0000000000 --- a/.github/actions/install-analysis/action.yml +++ /dev/null @@ -1,20 +0,0 @@ -# Note: this action requires an ubuntu container and access to the repos's actions! -# (see analysis.yml) -name: "install-analysis" -description: "Installs required ubuntu packages and checks-out the repo in ns-3" - -runs: - using: "composite" - steps: - - name: "Install required system packages" - shell: bash - run: > - sudo apt update && DEBIAN_FRONTEND=noninteractive sudo apt install -y - apt-utils - git gcc g++ cmake python3 make ninja-build - curl unzip tar - ccache - lcov - wget - - name: "Checkout this repository as ns-3 module" - uses: ./.github/actions/checkout-in-ns3 diff --git a/.github/actions/install-doc/action.yml b/.github/actions/install-doc/action.yml index 4c0dcc74db..97dccf1e66 100644 --- a/.github/actions/install-doc/action.yml +++ b/.github/actions/install-doc/action.yml @@ -12,10 +12,10 @@ runs: pacman-key --init && pacman -Syu --noconfirm base-devel ninja cmake python ccache graphviz imagemagick texlive-basic texlive-bin texlive-binextra texlive-latexextra - texlive-fontutils texlive-fontsrecommended python-sphinx - wget && + texlive-fontutils texlive-fontsrecommended texlive-mathscience python-sphinx wget && pacman --noconfirm -U https://archive.archlinux.org/packages/d/dia/dia-0.97.3-9-x86_64.pkg.tar.zst && - pacman --noconfirm -U https://archive.archlinux.org/packages/d/doxygen/doxygen-1.9.6-1-x86_64.pkg.tar.zst && + wget http://www.nsnam.org/packages/doxygen-1.11.0-4-x86_64.pkg.tar.zst && + pacman --noconfirm -U doxygen-1.11.0-4-x86_64.pkg.tar.zst && mv /etc/ImageMagick-7/policy.xml /etc/ImageMagick-7/policy.xml.bak - name: "Checkout this repository as ns-3 module" uses: ./.github/actions/checkout-in-ns3 diff --git a/.github/actions/install-linting/action.yml b/.github/actions/install-linting/action.yml deleted file mode 100644 index ed4756eaa4..0000000000 --- a/.github/actions/install-linting/action.yml +++ /dev/null @@ -1,17 +0,0 @@ -# Note: this action requires an ubuntu container and access to the repos's actions! -# (see .linting.yml) -name: "install-linting" -description: "Installs required ubuntu packages and checks-out the repo in ns-3" - -runs: - using: "composite" - steps: - - name: "Install required system packages" - shell: bash - run: > - apt update && DEBIAN_FRONTEND=noninteractive apt install -y - clang cmake - clang-tidy clang-tidy-17 - git wget - - name: "Checkout this repository as ns-3 module" - uses: ./.github/actions/checkout-in-ns3 diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index 51c8c78a03..865fef72df 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -1,6 +1,6 @@ -# ns-3 CI/CD script with job for code quality and coverage +# ns-3 CI/CD script with job for code analysis # -# Contains jobs to run code quality and coverage analysis. +# Contains jobs to run code analysis tasks. name: "Run code analysis" run-name: "analysis" @@ -13,37 +13,6 @@ env: MODE: default jobs: - # CodeQL - code-ql: - runs-on: ubuntu-latest - continue-on-error: true - steps: - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v3 - with: - languages: "cpp" - # The following step is required in all jobs that use this repo's actions - - name: "Retrieve actions from repository" - uses: actions/checkout@v4 - with: - sparse-checkout: .github/actions - - name: "Install dependencies and checkout repo in ns-3" - uses: ./.github/actions/install-analysis - - name: "Build ns-3" - env: - BUILD_ID: ubuntu-codeql - COMPILER: g++ - MODE: release - EXTRA_OPTIONS: --disable-werror - uses: ./.github/actions/build - with: - store-artifacts: "false" - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 - with: - checkout_path: ${{ github.workspace }}/src/lorawan - # CodeCov code-cov: runs-on: ubuntu-latest @@ -53,13 +22,22 @@ jobs: uses: actions/checkout@v4 with: sparse-checkout: .github/actions - - name: "Install dependencies and checkout repo in ns-3" - uses: ./.github/actions/install-analysis + - name: "Install required system packages" + run: > + sudo apt update && DEBIAN_FRONTEND=noninteractive sudo apt install -y + apt-utils + git gcc g++ cmake python3 make ninja-build + curl unzip tar + ccache + lcov + wget + - name: "Checkout this repository as ns-3 module" + uses: ./.github/actions/checkout-in-ns3 - name: "Build ns-3" env: BUILD_ID: ubuntu-coverage COMPILER: g++ - MODE: release + MODE: default EXTRA_OPTIONS: --disable-werror --enable-gcov uses: ./.github/actions/build with: @@ -67,9 +45,15 @@ jobs: - name: "Extract ccache statistics" run: echo "CACHE_MISSES=`./utils/ccache-miss-rate.py`" >> $GITHUB_ENV - if: env.CACHE_MISSES != '0' - name: "Generate coverage data and submit to codecov.io" + name: "Generate coverage data" run: | ./ns3 build coverage_gcc - bash <(curl -s https://codecov.io/bash) -f build/coverage/ns3.info -R src/lorawan/ || echo "Codecov did not collect coverage reports" - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + mv build/coverage/ns3.info src/lorawan + - if: env.CACHE_MISSES != '0' + name: "Submit coverage data to codecov.io" + uses: codecov/codecov-action@v4 + with: + working-directory: src/lorawan + file: ns3.info + token: ${{ secrets.CODECOV_TOKEN }} + verbose: true diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index 5b0f003b1c..a0d7c9e209 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -16,7 +16,7 @@ jobs: image: ubuntu:rolling strategy: matrix: - version: [14, 15, 16, 17] + version: [14, 17] timeout-minutes: 60 steps: # The following step is required in all jobs that use this repo's actions @@ -56,6 +56,8 @@ jobs: container: image: python:latest timeout-minutes: 60 + env: + CI_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }} steps: - uses: actions/checkout@v4 - run: pip install codespell @@ -65,9 +67,8 @@ jobs: git remote remove upstream ; fi - run: git config --global --add safe.directory $GITHUB_WORKSPACE - # develop here is meant to be the "default branch" - - run: git remote add -t develop --no-tags -f upstream https://github.com/signetlabdei/lorawan.git - - run: git log --pretty=%B HEAD...upstream/develop ^upstream/develop > git_messages.txt + - run: git remote add -t $CI_DEFAULT_BRANCH --no-tags -f upstream https://github.com/signetlabdei/lorawan.git + - run: git log --pretty=%B HEAD...upstream/$CI_DEFAULT_BRANCH ^upstream/$CI_DEFAULT_BRANCH > git_messages.txt # Check source code and commit messages - run: codespell -f -C0 --skip="./experiments" ./ diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 80ab4d2a3d..a1549c3283 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -10,38 +10,57 @@ on: jobs: # Clang-tidy - clang-tidy-17: + clang-tidy-18: runs-on: ubuntu-latest container: image: ubuntu:rolling timeout-minutes: 180 env: CLANG_TIDY_OUTPUT: clang-tidy-output.log + CI_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }} steps: # The following step is required in all jobs that use this repo's actions - name: "Retrieve actions from repository" uses: actions/checkout@v4 with: sparse-checkout: .github/actions - - name: "Install dependencies and checkout repo in ns-3" - uses: ./.github/actions/install-linting + - name: "Install required system packages" + run: > + apt update && DEBIAN_FRONTEND=noninteractive apt install -y + clang cmake + clang-tidy clang-tidy-18 + git wget + - name: "Checkout this repository as ns-3 module" + uses: ./.github/actions/checkout-in-ns3 - name: "Configure ns-3 CMake" run: > ./ns3 configure -d debug - --enable-examples --enable-tests --enable-asserts - --enable-modules "lorawan;applications" --enable-clang-tidy - # Use a trick (git diff on empty tag) to only run clang-tidy on the lorawan module + --enable-examples --enable-tests --enable-asserts + --enable-modules lorawan + - name: "Prepare git environment" + run: > + if (git -C src/lorawan/ remote | grep -qw upstream) ; then + git -C src/lorawan/ remote remove upstream ; + fi && + git -C src/lorawan/ remote add -t $CI_DEFAULT_BRANCH --no-tags -f upstream https://github.com/signetlabdei/lorawan.git - name: "Running clang-tidy" shell: bash run: > - git -C src/lorawan/ tag empty $(git hash-object -t tree /dev/null) && - git -C src/lorawan/ diff -U0 empty - --src-prefix=a/src/lorawan/ --dst-prefix=b/src/lorawan/ | - clang-tidy-diff-17.py -path cmake-cache/ -p1 -quiet -use-color - -iregex "src\/lorawan\/.+\.(cpp|cc|cxx|c|h|hpp)" + if [[ $GITHUB_REF_NAME == $CI_DEFAULT_BRANCH ]] ; then + echo "Running full clang-tidy" ; + run-clang-tidy-18 -p cmake-cache/ -quiet "src\/lorawan\/.+\.(cpp|cc|cxx|c|h|hpp)" + 1> $CLANG_TIDY_OUTPUT + 2> /dev/null ; + else + echo "Running clang-tidy-diff" ; + git -C src/lorawan/ diff -U0 upstream/$CI_DEFAULT_BRANCH --src-prefix=a/src/lorawan/ --dst-prefix=b/src/lorawan/ | + clang-tidy-diff-18.py -path cmake-cache/ -p1 -quiet -use-color -iregex "src\/lorawan\/.+\.(cpp|cc|cxx|c|h|hpp)" 1> $CLANG_TIDY_OUTPUT - 2> /dev/null + 2> /dev/null || true ; + fi + - name: "Trim empty lines from output file" + run: sed -i '/^$/d' $CLANG_TIDY_OUTPUT - name: "Check job results" run: | (! egrep -v "file not found \[clang-diagnostic-error\]" $CLANG_TIDY_OUTPUT | egrep -A3 "error:|warning:|note:") diff --git a/.github/workflows/per-commit.yml b/.github/workflows/per-commit.yml index d30b4079e6..74f5da6fef 100644 --- a/.github/workflows/per-commit.yml +++ b/.github/workflows/per-commit.yml @@ -9,11 +9,11 @@ on: workflow_dispatch: jobs: - code-formatting: + formatting: uses: ./.github/workflows/formatting.yml - compile: - needs: code-formatting + compilation: + needs: formatting runs-on: ubuntu-latest container: image: archlinux @@ -58,15 +58,15 @@ jobs: name: "Test ns-3" uses: ./.github/actions/test - code-linting: - needs: compile + linting: + needs: compilation uses: ./.github/workflows/linting.yml documentation: - needs: code-linting + needs: linting uses: ./.github/workflows/test-doc.yml - code-analysis: + analysis: needs: documentation uses: ./.github/workflows/analysis.yml secrets: inherit diff --git a/NS3-VERSION b/NS3-VERSION index 93fc2f1bf4..494277e50c 100644 --- a/NS3-VERSION +++ b/NS3-VERSION @@ -1 +1 @@ -release ns-3.42 \ No newline at end of file +release ns-3.43 \ No newline at end of file diff --git a/README.md b/README.md index 27854b04aa..8917ff0631 100644 --- a/README.md +++ b/README.md @@ -70,11 +70,9 @@ Finally, ensure tests run smoothly with: ./test.py ``` -If the script reports that all tests passed or that just `three-gpp-propagation-loss-model` failed[^1], you are good to go. +If the script reports that all tests passed you are good to go. -If other tests fail or crash, consider filing an issue. - -[^1]: This is due to [a bug in the current ns-3 version](https://gitlab.com/nsnam/ns-3-dev/-/issues/965) when restricting compilation to the lorawan module and its dependencies. If you need to use the `three-gpp-propagation-loss-model`, you can solve this by compiling ns-3 as a whole or with the `--enable-modules "lorawan;applications"` option to reduce compilation time. +If some tests fail or crash, consider filing an issue. ## Usage examples diff --git a/examples/adr-example.cc b/examples/adr-example.cc index 215427989c..2e4167cf58 100644 --- a/examples/adr-example.cc +++ b/examples/adr-example.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2018 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/examples/aloha-throughput.cc b/examples/aloha-throughput.cc index df605fb6e6..4f823fdd68 100644 --- a/examples/aloha-throughput.cc +++ b/examples/aloha-throughput.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/examples/complete-network-example.cc b/examples/complete-network-example.cc index 7e803e6554..ff6487809d 100644 --- a/examples/complete-network-example.cc +++ b/examples/complete-network-example.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ @@ -75,6 +64,9 @@ main(int argc, char* argv[]) CommandLine cmd(__FILE__); cmd.AddValue("nDevices", "Number of end devices to include in the simulation", nDevices); cmd.AddValue("radius", "The radius (m) of the area to simulate", radiusMeters); + cmd.AddValue("realisticChannel", + "Whether to use a more realistic channel model", + realisticChannelModel); cmd.AddValue("simulationTime", "The time (s) for which to simulate", simulationTimeSeconds); cmd.AddValue("appPeriod", "The period in seconds to be used by periodically transmitting applications", diff --git a/examples/frame-counter-update.cc b/examples/frame-counter-update.cc index b18a1e9c74..68187ab6a2 100644 --- a/examples/frame-counter-update.cc +++ b/examples/frame-counter-update.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/examples/lorawan-energy-model-example.cc b/examples/lorawan-energy-model-example.cc index 7de4570a1d..798e3326a0 100644 --- a/examples/lorawan-energy-model-example.cc +++ b/examples/lorawan-energy-model-example.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/examples/network-server-example.cc b/examples/network-server-example.cc index 77fa97880e..c63563e8ea 100644 --- a/examples/network-server-example.cc +++ b/examples/network-server-example.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/examples/parallel-reception-example.cc b/examples/parallel-reception-example.cc index c42ca3898f..92a3c66f9f 100644 --- a/examples/parallel-reception-example.cc +++ b/examples/parallel-reception-example.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/examples/simple-network-example.cc b/examples/simple-network-example.cc index c1714e0b8c..04be93d92c 100644 --- a/examples/simple-network-example.cc +++ b/examples/simple-network-example.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/helper/forwarder-helper.cc b/helper/forwarder-helper.cc index 06490f5f37..09c86642af 100644 --- a/helper/forwarder-helper.cc +++ b/helper/forwarder-helper.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin * diff --git a/helper/forwarder-helper.h b/helper/forwarder-helper.h index a88b451af1..b13a659b3c 100644 --- a/helper/forwarder-helper.h +++ b/helper/forwarder-helper.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/helper/lora-helper.cc b/helper/lora-helper.cc index beb0573179..5ed66ed88b 100644 --- a/helper/lora-helper.cc +++ b/helper/lora-helper.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/helper/lora-helper.h b/helper/lora-helper.h index ead3ae49c6..9232a50b7c 100644 --- a/helper/lora-helper.h +++ b/helper/lora-helper.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/helper/lora-packet-tracker.cc b/helper/lora-packet-tracker.cc index 0102a2ae44..534a404254 100644 --- a/helper/lora-packet-tracker.cc +++ b/helper/lora-packet-tracker.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2018 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ @@ -87,8 +76,8 @@ LoraPacketTracker::MacGwReceptionCallback(Ptr packet) { if (IsUplink(packet)) { - NS_LOG_INFO("A packet was successfully received" - << " at the MAC layer of gateway " << Simulator::GetContext()); + NS_LOG_INFO("A packet was successfully received at the MAC layer of gateway " + << Simulator::GetContext()); // Find the received packet in the m_macPacketTracker auto it = m_macPacketTracker.find(packet); diff --git a/helper/lora-packet-tracker.h b/helper/lora-packet-tracker.h index 0cba94e751..e31033e6b9 100644 --- a/helper/lora-packet-tracker.h +++ b/helper/lora-packet-tracker.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2018 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/helper/lora-phy-helper.cc b/helper/lora-phy-helper.cc index e0a80d1627..19e6f12b8f 100644 --- a/helper/lora-phy-helper.cc +++ b/helper/lora-phy-helper.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/helper/lora-phy-helper.h b/helper/lora-phy-helper.h index fba501525d..249f32f5ab 100644 --- a/helper/lora-phy-helper.h +++ b/helper/lora-phy-helper.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/helper/lora-radio-energy-model-helper.cc b/helper/lora-radio-energy-model-helper.cc index 2e8da59f2c..f6e670ccb2 100644 --- a/helper/lora-radio-energy-model-helper.cc +++ b/helper/lora-radio-energy-model-helper.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Romagnolo Stefano */ diff --git a/helper/lora-radio-energy-model-helper.h b/helper/lora-radio-energy-model-helper.h index e7c5963c4c..dc14b28c03 100644 --- a/helper/lora-radio-energy-model-helper.h +++ b/helper/lora-radio-energy-model-helper.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Romagnolo Stefano */ diff --git a/helper/lorawan-mac-helper.cc b/helper/lorawan-mac-helper.cc index 4664d90f50..1fc853a16e 100644 --- a/helper/lorawan-mac-helper.cc +++ b/helper/lorawan-mac-helper.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ @@ -500,7 +489,7 @@ LorawanMacHelper::SetSpreadingFactorsUp(NodeContainer endDevices, // Get the end device sensitivity Ptr edPhy = loraNetDevice->GetPhy()->GetObject(); - const double* edSensitivity = edPhy->sensitivity; + const double* edSensitivity = EndDeviceLoraPhy::sensitivity; if (rxPower > *edSensitivity) { diff --git a/helper/lorawan-mac-helper.h b/helper/lorawan-mac-helper.h index c646021592..44e5ac7d9b 100644 --- a/helper/lorawan-mac-helper.h +++ b/helper/lorawan-mac-helper.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/helper/network-server-helper.cc b/helper/network-server-helper.cc index 8331da72df..7730773498 100644 --- a/helper/network-server-helper.cc +++ b/helper/network-server-helper.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin * diff --git a/helper/network-server-helper.h b/helper/network-server-helper.h index 831210feb5..cf91252204 100644 --- a/helper/network-server-helper.h +++ b/helper/network-server-helper.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin * diff --git a/helper/one-shot-sender-helper.cc b/helper/one-shot-sender-helper.cc index 61d8c0428f..df18482a13 100644 --- a/helper/one-shot-sender-helper.cc +++ b/helper/one-shot-sender-helper.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/helper/one-shot-sender-helper.h b/helper/one-shot-sender-helper.h index 7690060bd9..5cd28227a0 100644 --- a/helper/one-shot-sender-helper.h +++ b/helper/one-shot-sender-helper.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/helper/periodic-sender-helper.cc b/helper/periodic-sender-helper.cc index d61637e519..bab6fbbf48 100644 --- a/helper/periodic-sender-helper.cc +++ b/helper/periodic-sender-helper.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/helper/periodic-sender-helper.h b/helper/periodic-sender-helper.h index c80a3709ec..03ec570353 100644 --- a/helper/periodic-sender-helper.h +++ b/helper/periodic-sender-helper.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/adr-component.cc b/model/adr-component.cc index 42625ccbe1..7d2a86f2f3 100644 --- a/model/adr-component.cc +++ b/model/adr-component.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2018 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Matteo Perin */ diff --git a/model/building-penetration-loss.cc b/model/building-penetration-loss.cc index 4e1ae36990..d0d9b05d4e 100644 --- a/model/building-penetration-loss.cc +++ b/model/building-penetration-loss.cc @@ -1,16 +1,5 @@ /* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ @@ -116,9 +105,9 @@ BuildingPenetrationLoss::DoCalcRxPower(double txPowerDbm, } } - NS_LOG_DEBUG("Building penetration loss:" - << " externalWallLoss = " << externalWallLoss << ", tor1 = " << tor1 - << ", tor3 = " << tor3 << ", GFH = " << gfh); + NS_LOG_DEBUG("Building penetration loss: externalWallLoss = " << externalWallLoss << ", tor1 = " + << tor1 << ", tor3 = " << tor3 + << ", GFH = " << gfh); // Put together all the pieces double loss = externalWallLoss + std::max(tor1, tor3) - gfh; diff --git a/model/building-penetration-loss.h b/model/building-penetration-loss.h index cd5dab61dc..a3836d3a1b 100644 --- a/model/building-penetration-loss.h +++ b/model/building-penetration-loss.h @@ -1,16 +1,5 @@ /* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/class-a-end-device-lorawan-mac.cc b/model/class-a-end-device-lorawan-mac.cc index 6b1c2204f1..41f9cfed2c 100644 --- a/model/class-a-end-device-lorawan-mac.cc +++ b/model/class-a-end-device-lorawan-mac.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin * Martina Capuzzo @@ -115,7 +104,7 @@ ClassAEndDeviceLorawanMac::SendToPhy(Ptr packetToSend) ////////////////////////////////////////////// // Compute packet duration - Time duration = m_phy->GetOnAirTime(packetToSend, params); + Time duration = LoraPhy::GetOnAirTime(packetToSend, params); // Register the sent packet into the DutyCycleHelper m_channelHelper.AddEvent(duration, txChannel); @@ -331,8 +320,7 @@ ClassAEndDeviceLorawanMac::CloseFirstReceiveWindow() switch (phy->GetState()) { case EndDeviceLoraPhy::TX: - NS_ABORT_MSG("PHY was in TX mode when attempting to " - << "close a receive window."); + NS_ABORT_MSG("PHY was in TX mode when attempting to close a receive window."); break; case EndDeviceLoraPhy::RX: // PHY is receiving: let it finish. The Receive method will switch it back to SLEEP. @@ -467,8 +455,8 @@ ClassAEndDeviceLorawanMac::GetNextClassTransmissionDelay(Time waitingTime) if (!m_closeFirstWindow.IsExpired() || !m_closeSecondWindow.IsExpired() || !m_secondReceiveWindow.IsExpired()) { - NS_LOG_WARN("Attempting to send when there are receive windows:" - << " Transmission postponed."); + NS_LOG_WARN( + "Attempting to send when there are receive windows: Transmission postponed."); // Compute the duration of a single symbol for the second receive window data rate double tSym = pow(2, GetSfFromDataRate(GetSecondReceiveWindowDataRate())) / GetBandwidthFromDataRate(GetSecondReceiveWindowDataRate()); diff --git a/model/class-a-end-device-lorawan-mac.h b/model/class-a-end-device-lorawan-mac.h index 9a456f7d11..d85c6422e8 100644 --- a/model/class-a-end-device-lorawan-mac.h +++ b/model/class-a-end-device-lorawan-mac.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin * Martina Capuzzo diff --git a/model/correlated-shadowing-propagation-loss-model.cc b/model/correlated-shadowing-propagation-loss-model.cc index 5e4b1b1d58..1ed2801e40 100644 --- a/model/correlated-shadowing-propagation-loss-model.cc +++ b/model/correlated-shadowing-propagation-loss-model.cc @@ -1,16 +1,5 @@ /* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/correlated-shadowing-propagation-loss-model.h b/model/correlated-shadowing-propagation-loss-model.h index ba226c001d..7babdd2129 100644 --- a/model/correlated-shadowing-propagation-loss-model.h +++ b/model/correlated-shadowing-propagation-loss-model.h @@ -1,16 +1,5 @@ /* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/end-device-lora-phy.cc b/model/end-device-lora-phy.cc index c486a79f28..fcc8c1d868 100644 --- a/model/end-device-lora-phy.cc +++ b/model/end-device-lora-phy.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/end-device-lora-phy.h b/model/end-device-lora-phy.h index f6a1ece3d0..c55d460e58 100644 --- a/model/end-device-lora-phy.h +++ b/model/end-device-lora-phy.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Authors: Davide Magrin , * Michele Luvisotto diff --git a/model/end-device-lorawan-mac.cc b/model/end-device-lorawan-mac.cc index a4299cad0d..d2d436651a 100644 --- a/model/end-device-lorawan-mac.cc +++ b/model/end-device-lorawan-mac.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin * Martina Capuzzo @@ -767,10 +756,9 @@ EndDeviceLorawanMac::OnLinkAdrReq(uint8_t dataRate, txPowerOk = false; } - NS_LOG_DEBUG("Finished checking. " - << "ChannelMaskOk: " << channelMaskOk << ", " - << "DataRateOk: " << dataRateOk << ", " - << "txPowerOk: " << txPowerOk); + NS_LOG_DEBUG("Finished checking. ChannelMaskOk: " << channelMaskOk << ", " + << "DataRateOk: " << dataRateOk << ", " + << "txPowerOk: " << txPowerOk); // If all checks are successful, set parameters up ////////////////////////////////////////////////// diff --git a/model/end-device-lorawan-mac.h b/model/end-device-lorawan-mac.h index 76221ea63a..5f588f68d9 100644 --- a/model/end-device-lorawan-mac.h +++ b/model/end-device-lorawan-mac.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin * Martina Capuzzo @@ -191,29 +180,14 @@ class EndDeviceLorawanMac : public LorawanMac */ LoraDeviceAddress GetDeviceAddress(); - ///** - // * Set a value for the RX1DROffset parameter. - // * - // * This value determines the offset to use when deciding the data rate of the - // * downlink transmission during the first receive window from the - // * replyDataRateMatrix. - // * - // * \param rx1DrOffset The value to set for the offset. - // */ // void SetRx1DrOffset (uint8_t rx1DrOffset); - ///** - // * Get the value of the RX1DROffset parameter. - // * - // * \return The value of the RX1DROffset parameter. - // */ // uint8_t GetRx1DrOffset (); /** * Get the aggregated duty cycle. * - * \return A time instance containing the aggregated duty cycle in fractional. - * form. + * \return A time instance containing the aggregated duty cycle in fractional form. */ double GetAggregatedDutyCycle(); diff --git a/model/end-device-status.cc b/model/end-device-status.cc index b545b39681..e0a327e838 100644 --- a/model/end-device-status.cc +++ b/model/end-device-status.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Authors: Martina Capuzzo * Davide Magrin diff --git a/model/end-device-status.h b/model/end-device-status.h index c849a56d35..d7b6f93e02 100644 --- a/model/end-device-status.h +++ b/model/end-device-status.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2018 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Authors: Martina Capuzzo * Davide Magrin diff --git a/model/forwarder.cc b/model/forwarder.cc index e2e476b07f..7c923290c5 100644 --- a/model/forwarder.cc +++ b/model/forwarder.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/forwarder.h b/model/forwarder.h index eb79c5bdf0..e4d7133b22 100644 --- a/model/forwarder.h +++ b/model/forwarder.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/gateway-lora-phy.cc b/model/gateway-lora-phy.cc index fb78a31d88..e064b541b8 100644 --- a/model/gateway-lora-phy.cc +++ b/model/gateway-lora-phy.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/gateway-lora-phy.h b/model/gateway-lora-phy.h index 66dd032d66..3e47733149 100644 --- a/model/gateway-lora-phy.h +++ b/model/gateway-lora-phy.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/gateway-lorawan-mac.cc b/model/gateway-lorawan-mac.cc index c69e66a696..6ada4b0ce9 100644 --- a/model/gateway-lorawan-mac.cc +++ b/model/gateway-lorawan-mac.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ @@ -88,7 +77,7 @@ GatewayLorawanMac::Send(Ptr packet) params.lowDataRateOptimizationEnabled = LoraPhy::GetTSym(params) > MilliSeconds(16); // Get the duration - Time duration = m_phy->GetOnAirTime(packet, params); + Time duration = LoraPhy::GetOnAirTime(packet, params); NS_LOG_DEBUG("Duration: " << duration.GetSeconds()); diff --git a/model/gateway-lorawan-mac.h b/model/gateway-lorawan-mac.h index 65816af427..30fcc29d47 100644 --- a/model/gateway-lorawan-mac.h +++ b/model/gateway-lorawan-mac.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/gateway-status.cc b/model/gateway-status.cc index 37f11a92dd..ebbc69dfae 100644 --- a/model/gateway-status.cc +++ b/model/gateway-status.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/gateway-status.h b/model/gateway-status.h index cf3e5bfd1c..fa79d3decb 100644 --- a/model/gateway-status.h +++ b/model/gateway-status.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/hex-grid-position-allocator.cc b/model/hex-grid-position-allocator.cc index 81e71ec013..58f17db234 100644 --- a/model/hex-grid-position-allocator.cc +++ b/model/hex-grid-position-allocator.cc @@ -1,16 +1,5 @@ /* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/hex-grid-position-allocator.h b/model/hex-grid-position-allocator.h index 03cc55dc15..6f46a035a1 100644 --- a/model/hex-grid-position-allocator.h +++ b/model/hex-grid-position-allocator.h @@ -1,16 +1,5 @@ /* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/logical-lora-channel-helper.cc b/model/logical-lora-channel-helper.cc index a652ce5ed2..a43f87be5e 100644 --- a/model/logical-lora-channel-helper.cc +++ b/model/logical-lora-channel-helper.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/logical-lora-channel-helper.h b/model/logical-lora-channel-helper.h index bbef7c8b6d..25dfbb5444 100644 --- a/model/logical-lora-channel-helper.h +++ b/model/logical-lora-channel-helper.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/logical-lora-channel.cc b/model/logical-lora-channel.cc index f3d5c39e0b..f0ee4ada46 100644 --- a/model/logical-lora-channel.cc +++ b/model/logical-lora-channel.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/logical-lora-channel.h b/model/logical-lora-channel.h index 183976f540..6f75e8629d 100644 --- a/model/logical-lora-channel.h +++ b/model/logical-lora-channel.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ @@ -77,11 +66,6 @@ class LogicalLoraChannel : public Object */ double GetFrequency() const; - ///** - // * Set the frequency (MHz). - // * - // * \param frequencyMHz The center frequency this channel should be at. - // */ // void SetFrequency (double frequencyMHz); /** diff --git a/model/lora-channel.cc b/model/lora-channel.cc index 8173e3188c..fbb9757919 100644 --- a/model/lora-channel.cc +++ b/model/lora-channel.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/lora-channel.h b/model/lora-channel.h index 48d7552308..c3dace7315 100644 --- a/model/lora-channel.h +++ b/model/lora-channel.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin * diff --git a/model/lora-device-address-generator.cc b/model/lora-device-address-generator.cc index 0939213098..07e6a3af2d 100644 --- a/model/lora-device-address-generator.cc +++ b/model/lora-device-address-generator.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/lora-device-address-generator.h b/model/lora-device-address-generator.h index d59ab7a656..7b6370b94e 100644 --- a/model/lora-device-address-generator.h +++ b/model/lora-device-address-generator.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/lora-device-address.cc b/model/lora-device-address.cc index be74e5bca6..cf8c74e3de 100644 --- a/model/lora-device-address.cc +++ b/model/lora-device-address.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/lora-device-address.h b/model/lora-device-address.h index d2f72a94b0..9d07c15acb 100644 --- a/model/lora-device-address.h +++ b/model/lora-device-address.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/lora-frame-header.cc b/model/lora-frame-header.cc index 80f68acbb9..f6d8c4a3ce 100644 --- a/model/lora-frame-header.cc +++ b/model/lora-frame-header.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/lora-frame-header.h b/model/lora-frame-header.h index 843cdcce7b..db05d2eb09 100644 --- a/model/lora-frame-header.h +++ b/model/lora-frame-header.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/lora-interference-helper.cc b/model/lora-interference-helper.cc index 3de7f7a45e..647ade1b1a 100644 --- a/model/lora-interference-helper.cc +++ b/model/lora-interference-helper.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/lora-interference-helper.h b/model/lora-interference-helper.h index 3982e9ff80..6889a9a765 100644 --- a/model/lora-interference-helper.h +++ b/model/lora-interference-helper.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/lora-net-device.cc b/model/lora-net-device.cc index e1b0a4fc0f..44f92794d1 100644 --- a/model/lora-net-device.cc +++ b/model/lora-net-device.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/lora-net-device.h b/model/lora-net-device.h index 9223e68085..cdce656dc3 100644 --- a/model/lora-net-device.h +++ b/model/lora-net-device.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/lora-phy.cc b/model/lora-phy.cc index 88ab04b9dc..b893c16cae 100644 --- a/model/lora-phy.cc +++ b/model/lora-phy.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/lora-phy.h b/model/lora-phy.h index 6823816181..952d89db30 100644 --- a/model/lora-phy.h +++ b/model/lora-phy.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/lora-radio-energy-model.cc b/model/lora-radio-energy-model.cc index 911ea816f2..1bd1d91ccd 100644 --- a/model/lora-radio-energy-model.cc +++ b/model/lora-radio-energy-model.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Romagnolo Stefano */ diff --git a/model/lora-radio-energy-model.h b/model/lora-radio-energy-model.h index 376f5dd527..ba3d74659c 100644 --- a/model/lora-radio-energy-model.h +++ b/model/lora-radio-energy-model.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Authors: Romagnolo Stefano * Davide Magrin diff --git a/model/lora-tag.cc b/model/lora-tag.cc index 021e4a7440..b676b7a8aa 100644 --- a/model/lora-tag.cc +++ b/model/lora-tag.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/lora-tag.h b/model/lora-tag.h index 2ed487d9ef..d46b5d1e0d 100644 --- a/model/lora-tag.h +++ b/model/lora-tag.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/lora-tx-current-model.cc b/model/lora-tx-current-model.cc index 586c4c8c9d..d3e34aebc5 100644 --- a/model/lora-tx-current-model.cc +++ b/model/lora-tx-current-model.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Romagnolo Stefano */ diff --git a/model/lora-tx-current-model.h b/model/lora-tx-current-model.h index 61b68da87a..47e6aafecb 100644 --- a/model/lora-tx-current-model.h +++ b/model/lora-tx-current-model.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Authors: Romagnolo Stefano * Davide Magrin diff --git a/model/lora-utils.cc b/model/lora-utils.cc index 500de58090..c195b68250 100644 --- a/model/lora-utils.cc +++ b/model/lora-utils.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Romagnolo Stefano */ diff --git a/model/lora-utils.h b/model/lora-utils.h index b95b206a36..429c2aa28e 100644 --- a/model/lora-utils.h +++ b/model/lora-utils.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Romagnolo Stefano */ diff --git a/model/lorawan-mac-header.cc b/model/lorawan-mac-header.cc index f09692761e..b323b1ffdf 100644 --- a/model/lorawan-mac-header.cc +++ b/model/lorawan-mac-header.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/lorawan-mac-header.h b/model/lorawan-mac-header.h index f633dda49b..6447babe90 100644 --- a/model/lorawan-mac-header.h +++ b/model/lorawan-mac-header.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/lorawan-mac.cc b/model/lorawan-mac.cc index 551dff0461..0fa7323cf9 100644 --- a/model/lorawan-mac.cc +++ b/model/lorawan-mac.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/lorawan-mac.h b/model/lorawan-mac.h index 5d61c88166..311c57cbe9 100644 --- a/model/lorawan-mac.h +++ b/model/lorawan-mac.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/mac-command.cc b/model/mac-command.cc index a061c22660..7696dd9a22 100644 --- a/model/mac-command.cc +++ b/model/mac-command.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/mac-command.h b/model/mac-command.h index 7dc95c8b4f..08a7359e5f 100644 --- a/model/mac-command.h +++ b/model/mac-command.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/network-controller-components.cc b/model/network-controller-components.cc index 7fedd1e322..066f9fe213 100644 --- a/model/network-controller-components.cc +++ b/model/network-controller-components.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2018 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/network-controller-components.h b/model/network-controller-components.h index a16e9734c4..5402c15fc0 100644 --- a/model/network-controller-components.h +++ b/model/network-controller-components.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/network-controller.cc b/model/network-controller.cc index 9bfb302b34..dce3ccaa7a 100644 --- a/model/network-controller.cc +++ b/model/network-controller.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/network-controller.h b/model/network-controller.h index cdc4c6d4f8..f206dd73f6 100644 --- a/model/network-controller.h +++ b/model/network-controller.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/network-scheduler.h b/model/network-scheduler.h index e702e26ef9..1fb9a75446 100644 --- a/model/network-scheduler.h +++ b/model/network-scheduler.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/network-server.cc b/model/network-server.cc index d725cdf3b0..141df2d092 100644 --- a/model/network-server.cc +++ b/model/network-server.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2018 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Authors: Davide Magrin * Martina Capuzzo diff --git a/model/network-server.h b/model/network-server.h index b24abe2af0..ed86c783de 100644 --- a/model/network-server.h +++ b/model/network-server.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2018 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Authors: Davide Magrin * Martina Capuzzo diff --git a/model/network-status.cc b/model/network-status.cc index bc4835e51b..c931dea136 100644 --- a/model/network-status.cc +++ b/model/network-status.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2018 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Authors: Davide Magrin * Martina Capuzzo diff --git a/model/network-status.h b/model/network-status.h index 1aa38a1559..8c4ae6068e 100644 --- a/model/network-status.h +++ b/model/network-status.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2018 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Authors: Martina Capuzzo * Davide Magrin diff --git a/model/one-shot-sender.cc b/model/one-shot-sender.cc index c1e8f89327..af7d0000dc 100644 --- a/model/one-shot-sender.cc +++ b/model/one-shot-sender.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/one-shot-sender.h b/model/one-shot-sender.h index 9ec864a737..6ebc906f51 100644 --- a/model/one-shot-sender.h +++ b/model/one-shot-sender.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/periodic-sender.cc b/model/periodic-sender.cc index 9aa8d71b4f..113c7e4576 100644 --- a/model/periodic-sender.cc +++ b/model/periodic-sender.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/periodic-sender.h b/model/periodic-sender.h index 8df151894a..86be14f037 100644 --- a/model/periodic-sender.h +++ b/model/periodic-sender.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/simple-end-device-lora-phy.cc b/model/simple-end-device-lora-phy.cc index 60a44620ac..8ed3c11f4d 100644 --- a/model/simple-end-device-lora-phy.cc +++ b/model/simple-end-device-lora-phy.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/simple-end-device-lora-phy.h b/model/simple-end-device-lora-phy.h index 5963c1cad9..b1118c4cba 100644 --- a/model/simple-end-device-lora-phy.h +++ b/model/simple-end-device-lora-phy.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/simple-gateway-lora-phy.cc b/model/simple-gateway-lora-phy.cc index e861806a66..82786a33ca 100644 --- a/model/simple-gateway-lora-phy.cc +++ b/model/simple-gateway-lora-phy.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ @@ -191,8 +180,7 @@ SimpleGatewayLoraPhy::StartReceive(Ptr packet, } else // We have sufficient sensitivity to start receiving { - NS_LOG_INFO("Scheduling reception of a packet, " - << "occupying one demodulator"); + NS_LOG_INFO("Scheduling reception of a packet, occupying one demodulator"); // Block this resource currentPath->LockOnEvent(event); diff --git a/model/simple-gateway-lora-phy.h b/model/simple-gateway-lora-phy.h index f36b3d38f9..8ead713ed6 100644 --- a/model/simple-gateway-lora-phy.h +++ b/model/simple-gateway-lora-phy.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/sub-band.cc b/model/sub-band.cc index f5a81cf665..7602c4a6ad 100644 --- a/model/sub-band.cc +++ b/model/sub-band.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/model/sub-band.h b/model/sub-band.h index 135e2365f6..02512101ba 100644 --- a/model/sub-band.h +++ b/model/sub-band.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/test/examples-to-run.py b/test/examples-to-run.py index afdbf2b366..ce8b065c07 100644 --- a/test/examples-to-run.py +++ b/test/examples-to-run.py @@ -9,7 +9,7 @@ cpp_examples = [ ("simple-network-example", "True", "True"), ("network-server-example", "True", "True"), - ("complete-network-example", "True", "True"), + ("complete-network-example --realisticChannel", "True", "True"), ("adr-example", "True", "True"), ("lorawan-energy-model-example", "True", "True"), ("aloha-throughput", "True", "True"), diff --git a/test/lorawan-test-suite.cc b/test/lorawan-test-suite.cc index 6a037aaab8..8fb2306d8a 100644 --- a/test/lorawan-test-suite.cc +++ b/test/lorawan-test-suite.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2017 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/test/network-scheduler-test-suite.cc b/test/network-scheduler-test-suite.cc index 9c61a6cf8f..2fc69d7972 100644 --- a/test/network-scheduler-test-suite.cc +++ b/test/network-scheduler-test-suite.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2018 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/test/network-server-test-suite.cc b/test/network-server-test-suite.cc index 3bb9c62de2..436c2ad0ac 100644 --- a/test/network-server-test-suite.cc +++ b/test/network-server-test-suite.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2018 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/test/network-status-test-suite.cc b/test/network-status-test-suite.cc index 1e888c9443..ac0058af7b 100644 --- a/test/network-status-test-suite.cc +++ b/test/network-status-test-suite.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2018 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Author: Davide Magrin */ diff --git a/test/utilities.cc b/test/utilities.cc index d4fd00c449..d71f87ce04 100644 --- a/test/utilities.cc +++ b/test/utilities.cc @@ -1,18 +1,7 @@ /* * Copyright (c) 2018 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Authors: Davide Magrin */ diff --git a/test/utilities.h b/test/utilities.h index ce87ba2c16..2296652424 100644 --- a/test/utilities.h +++ b/test/utilities.h @@ -1,18 +1,7 @@ /* * Copyright (c) 2018 University of Padova * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation; - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * * Authors: Davide Magrin */