CI: fixing the files to be complient with pre-commit hooks

.flake8

@@ -136,6 +136,5 @@ show_source = True
 
 statistics = True
 
-per-file-ignores =
+exclude =
-    # Sphinx conf.py files use star imports to setup config variables
+        components/asio/docs/conf_common.py
-        docs/conf_common.py: F405

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Formating according pre-commit hooks
+3e1c3cc647b6f6d4da20b3ab979879f60229bfee

.mypy.ini

@@ -0,0 +1,26 @@
+[mypy]
+
+# Specifies the Python version used to parse and check the target program
+python_version = 3.9
+
+# Disallows defining functions without type annotations or with incomplete type annotations
+# True => enforce type annotation in all function definitions
+disallow_untyped_defs = True
+
+# Shows a warning when returning a value with type Any from a function declared with a non- Any return type
+warn_return_any = True
+
+# Shows errors for missing return statements on some execution paths
+warn_no_return = True
+
+# Suppress error messages about imports that cannot be resolved
+# True => ignore all import errors
+ignore_missing_imports = True
+
+# Disallows defining functions with incomplete type annotations
+disallow_incomplete_defs = False
+
+# Directs what to do with imports when the imported module is found as a .py file and not part of the files,
+# modules and packages provided on the command line.
+# SKIP -> mypy checks only single file, not included imports
+follow_imports = skip

.pre-commit-config.yaml

@@ -20,6 +20,10 @@ repos:
     rev: v0.981
     hooks:
       - id: mypy
+        exclude: >
+           (?x)^(
+               .*.py
+           )$
   - repo: https://github.com/myint/unify
     rev: v0.5
     hooks:

ci/check_copyright_config.yaml

@@ -46,9 +46,19 @@ asio_component:
     - Apache-2.0
     - BSL-1.0
 
+slim_modem_examples:
+  include:
+    - 'examples/esp_netif/slip_custom_netif/**'
+  allowed_licenses:
+    - Apache-2.0
+    - Unlicense
+    - CC0-1.0
+
 ignore:
   perform_check: no
   include:
    - 'components/**/docs/**'
    - 'components/esp_modem/port/linux/**'
-   - 'components/asio/examples/asio_chat/main/*'
+   - 'components/asio/examples/**'
+   - 'components/mdns/**/esp_system_protocols_linux/**'
+   - 'common_components/protocol_examples_common/**'

common_components/protocol_examples_common/connect.c

@@ -1,10 +1,11 @@
-/* Common functions for protocol examples, to establish Wi-Fi or Ethernet connection.
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
+/*
-
+ *  Common functions for protocol examples, to establish Wi-Fi or Ethernet connection.
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
  */
 
 #include <string.h>

common_components/protocol_examples_common/include/addr_from_stdin.h

@@ -1,13 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
+
 /*  Common utilities for socket address input interface:
     The API get_addr_from_stdin() is mainly used by socket client examples which read IP address from stdin (if configured).
     This option is typically used in the CI, but could be enabled in the project configuration.
     In that case this component is used to receive a string that is evaluated and processed to output
     socket structures to open a connectio
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
-
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
  */
 
 #pragma once

common_components/protocol_examples_common/include/protocol_examples_common.h

@@ -1,10 +1,11 @@
-/* Common functions for protocol examples, to establish Wi-Fi or Ethernet connection.
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
+/*
-
+ * Common functions for protocol examples, to establish Wi-Fi or Ethernet connection.
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
  */
 
 #pragma once

common_components/protocol_examples_common/stdin_out.c

@@ -1,10 +1,11 @@
-/* Common functions for protocol examples, to configure stdin and stdout.
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
+/*
-
+ * Common functions for protocol examples, to configure stdin and stdout.
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
  */
 
 #include "protocol_examples_common.h"

components/asio/docs/conf_common.py

@@ -1,6 +1,7 @@
 from esp_docs.conf_docs import *  # noqa: F403,F401
 
-extensions += ['sphinx_copybutton',
+extensions += [
+    'sphinx_copybutton',
     # Needed as a trigger for running doxygen
     'esp_docs.esp_extensions.dummy_build_system',
     'esp_docs.esp_extensions.run_doxygen',

components/asio/docs/generate_docs

@@ -24,4 +24,3 @@ window.onload =(function() {
 
 })();
 </script>" >> html/index.html
-

components/asio/examples/asio_chat/main/asio_chat.cpp

@@ -53,14 +53,15 @@ void start_client(void)
 #ifdef CONFIG_EXAMPLE_CHAT_SERVER
     std::lock_guard<std::mutex> guard(server_ready);
 #endif
-    std::thread t([&io_context]() { try {
+    std::thread t([&io_context]() {
+        try {
             io_context.run();
         } catch (const std::exception &e) {
             ESP_LOGE(TAG, "Exception occured during client thread execution %s", e.what());
-                                  }
+        } catch (...) {
-                                    catch (...) {
             ESP_LOGE(TAG, "Unknown exception");
-                                   }});
+        }
+    });
     do {
         ESP_LOGI(TAG, "CLIENT: Waiting for input");
         get_string(line, sizeof(line));
@@ -99,10 +100,10 @@ extern "C" void app_main(void)
                 io_context.run();
             } catch (const std::exception &e) {
                 ESP_LOGE(TAG, "Exception occured during server thread execution %s", e.what());
-                                     }
+            } catch (...) {
-                                       catch (...) {
                 ESP_LOGE(TAG, "Unknown exception");
-                                     }});;
+            }
+        });;
 #endif
 #ifdef CONFIG_EXAMPLE_CHAT_CLIENT
         start_client();

components/asio/examples/asio_chat/main/chat_message.hpp

@@ -15,8 +15,7 @@
 #include <cstdlib>
 #include <cstring>
 
-class chat_message
+class chat_message {
-{
 public:
     static constexpr std::size_t header_length = 4;
     static constexpr std::size_t max_body_length = 512;
@@ -59,17 +58,17 @@ public:
     void body_length(std::size_t new_length)
     {
         body_length_ = new_length;
-    if (body_length_ > max_body_length)
+        if (body_length_ > max_body_length) {
             body_length_ = max_body_length;
         }
+    }
 
     bool decode_header()
     {
         char header[header_length + 1] = "";
         std::strncat(header, data_, header_length);
         body_length_ = std::atoi(header);
-    if (body_length_ > max_body_length)
+        if (body_length_ > max_body_length) {
-    {
             body_length_ = 0;
             return false;
         }

components/asio/examples/asio_chat/main/client.hpp

@@ -17,8 +17,7 @@
 
 typedef std::deque<chat_message> chat_message_queue;
 
-class chat_client
+class chat_client {
-{
 public:
     chat_client(asio::io_context &io_context,
                 const asio::ip::tcp::resolver::results_type &endpoints)
@@ -31,12 +30,10 @@ public:
     void write(const chat_message &msg)
     {
         asio::post(io_context_,
-        [this, msg]()
+        [this, msg]() {
-        {
             bool write_in_progress = !write_msgs_.empty();
             write_msgs_.push_back(msg);
-          if (!write_in_progress)
+            if (!write_in_progress) {
-          {
                 do_write();
             }
         });
@@ -44,17 +41,17 @@ public:
 
     void close()
     {
-    asio::post(io_context_, [this]() { socket_.close(); });
+        asio::post(io_context_, [this]() {
+            socket_.close();
+        });
     }
 
 private:
     void do_connect(const asio::ip::tcp::resolver::results_type &endpoints)
     {
         asio::async_connect(socket_, endpoints,
-          [this](std::error_code ec, asio::ip::tcp::endpoint)
+        [this](std::error_code ec, asio::ip::tcp::endpoint) {
-          {
+            if (!ec) {
-            if (!ec)
-            {
                 do_read_header();
             }
         });
@@ -64,14 +61,10 @@ void do_connect(const asio::ip::tcp::resolver::results_type& endpoints)
     {
         asio::async_read(socket_,
                          asio::buffer(read_msg_.data(), chat_message::header_length),
-          [this](std::error_code ec, std::size_t /*length*/)
+        [this](std::error_code ec, std::size_t /*length*/) {
-          {
+            if (!ec && read_msg_.decode_header()) {
-            if (!ec && read_msg_.decode_header())
-            {
                 do_read_body();
-            }
+            } else {
-            else
-            {
                 socket_.close();
             }
         });
@@ -81,14 +74,10 @@ void do_connect(const asio::ip::tcp::resolver::results_type& endpoints)
     {
         asio::async_read(socket_,
                          asio::buffer(read_msg_.body(), read_msg_.body_length()),
-          [this](std::error_code ec, std::size_t /*length*/)
+        [this](std::error_code ec, std::size_t /*length*/) {
-          {
+            if (!ec) {
-            if (!ec)
-            {
                 do_read_header();
-            }
+            } else {
-            else
-            {
                 socket_.close();
             }
         });
@@ -99,18 +88,13 @@ void do_connect(const asio::ip::tcp::resolver::results_type& endpoints)
         asio::async_write(socket_,
                           asio::buffer(write_msgs_.front().data(),
                                        write_msgs_.front().length()),
-          [this](std::error_code ec, std::size_t /*length*/)
+        [this](std::error_code ec, std::size_t /*length*/) {
-          {
+            if (!ec) {
-            if (!ec)
-            {
                 write_msgs_.pop_front();
-              if (!write_msgs_.empty())
+                if (!write_msgs_.empty()) {
-              {
                     do_write();
                 }
-            }
+            } else {
-            else
-            {
                 socket_.close();
             }
         });

components/asio/examples/asio_chat/main/server.hpp

@@ -27,8 +27,7 @@ extern std::mutex server_ready;
 //----------------------------------------------------------------------
 
 
-class chat_participant
+class chat_participant {
-{
 public:
     virtual ~chat_participant() {}
     virtual void deliver(const chat_message &msg) = 0;
@@ -38,15 +37,15 @@ typedef std::shared_ptr<chat_participant> chat_participant_ptr;
 
 //----------------------------------------------------------------------
 
-class chat_room
+class chat_room {
-{
 public:
     void join(chat_participant_ptr participant)
     {
         participants_.insert(participant);
-    for (auto msg: recent_msgs_)
+        for (auto msg : recent_msgs_) {
             participant->deliver(msg);
         }
+    }
 
     void leave(chat_participant_ptr participant)
     {
@@ -56,12 +55,14 @@ public:
     void deliver(const chat_message &msg)
     {
         recent_msgs_.push_back(msg);
-    while (recent_msgs_.size() > max_recent_msgs)
+        while (recent_msgs_.size() > max_recent_msgs) {
             recent_msgs_.pop_front();
+        }
 
-    for (auto participant: participants_)
+        for (auto participant : participants_) {
             participant->deliver(msg);
         }
+    }
 
 private:
     std::set<chat_participant_ptr> participants_;
@@ -74,8 +75,7 @@ private:
 
 class chat_session
     : public chat_participant,
-    public std::enable_shared_from_this<chat_session>
+      public std::enable_shared_from_this<chat_session> {
-{
 public:
     chat_session(asio::ip::tcp::socket socket, chat_room &room)
         : socket_(std::move(socket)),
@@ -93,8 +93,7 @@ public:
     {
         bool write_in_progress = !write_msgs_.empty();
         write_msgs_.push_back(msg);
-    if (!write_in_progress)
+        if (!write_in_progress) {
-    {
             do_write();
         }
     }
@@ -105,14 +104,10 @@ private:
         auto self(shared_from_this());
         asio::async_read(socket_,
                          asio::buffer(read_msg_.data(), chat_message::header_length),
-        [this, self](std::error_code ec, std::size_t /*length*/)
+        [this, self](std::error_code ec, std::size_t /*length*/) {
-        {
+            if (!ec && read_msg_.decode_header()) {
-          if (!ec && read_msg_.decode_header())
-          {
                 do_read_body();
-          }
+            } else {
-          else
-          {
                 room_.leave(shared_from_this());
             }
         });
@@ -123,16 +118,12 @@ private:
         auto self(shared_from_this());
         asio::async_read(socket_,
                          asio::buffer(read_msg_.body(), read_msg_.body_length()),
-         [this, self](std::error_code ec, std::size_t /*length*/)
+        [this, self](std::error_code ec, std::size_t /*length*/) {
-         {
+            if (!ec) {
-           if (!ec)
-           {
                 ESP_LOGD("asio-chat:", "%s", read_msg_.body());
                 room_.deliver(read_msg_);
                 do_read_header();
-           }
+            } else {
-           else
-           {
                 room_.leave(shared_from_this());
             }
         });
@@ -144,18 +135,13 @@ private:
         asio::async_write(socket_,
                           asio::buffer(write_msgs_.front().data(),
                                        write_msgs_.front().length()),
-         [this, self](std::error_code ec, std::size_t /*length*/)
+        [this, self](std::error_code ec, std::size_t /*length*/) {
-         {
+            if (!ec) {
-           if (!ec)
-           {
                 write_msgs_.pop_front();
-             if (!write_msgs_.empty())
+                if (!write_msgs_.empty()) {
-             {
                     do_write();
                 }
-           }
+            } else {
-           else
-           {
                 room_.leave(shared_from_this());
             }
         });
@@ -169,8 +155,7 @@ private:
 
 //----------------------------------------------------------------------
 
-class chat_server
+class chat_server {
-{
 public:
     chat_server(asio::io_context &io_context,
                 const asio::ip::tcp::endpoint &endpoint)
@@ -184,10 +169,8 @@ private:
     {
         std::lock_guard<std::mutex> guard(server_ready);
         acceptor_.async_accept(
-       [this](std::error_code ec, asio::ip::tcp::socket socket)
+        [this](std::error_code ec, asio::ip::tcp::socket socket) {
-       {
+            if (!ec) {
-         if (!ec)
-         {
                 std::make_shared<chat_session>(std::move(socket), room_)->start();
             }
 

components/asio/examples/asio_chat/pytest_asio_chat_test.py

@@ -1,14 +1,9 @@
-# This example code is in the Public Domain (or CC0 licensed, at your option.)
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
-
+# SPDX-License-Identifier: Unlicense OR CC0-1.0
-# Unless required by applicable law or agreed to in writing, this
-# software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied.
 
 # -*- coding: utf-8 -*-
 
 import re
-import pytest
-from pytest_embedded import Dut
 
 
 def test_examples_asio_chat(dut):

components/asio/examples/socks4/README.md

@@ -70,4 +70,3 @@ ssh -N -v -D 0.0.0.0:1080 localhost
 # Async operations composition and automatic lifetime control
 
 For documentation about the structure of this example look into [async\_request README](../async_request/README.md).
-

components/asio/examples/socks4/main/socks4.hpp

@@ -20,11 +20,9 @@ namespace socks4 {
 
 const unsigned char version = 0x04;
 
-class request
+class request {
-{
 public:
-  enum command_type
+    enum command_type {
-  {
         connect = 0x01,
         bind = 0x02
     };
@@ -37,8 +35,7 @@ public:
           null_byte_(0)
     {
         // Only IPv4 is supported by the SOCKS 4 protocol.
-    if (endpoint.protocol() != asio::ip::tcp::v4())
+        if (endpoint.protocol() != asio::ip::tcp::v4()) {
-    {
             throw asio::system_error(
                 asio::error::address_family_not_supported);
         }
@@ -54,8 +51,7 @@ public:
 
     std::array<asio::const_buffer, 7> buffers() const
     {
-    return
+        return {
-    {
             {
                 asio::buffer(&version_, 1),
                 asio::buffer(&command_, 1),
@@ -78,11 +74,9 @@ private:
     unsigned char null_byte_;
 };
 
-class reply
+class reply {
-{
 public:
-  enum status_type
+    enum status_type {
-  {
         request_granted = 0x5a,
         request_failed = 0x5b,
         request_failed_no_identd = 0x5c,
@@ -97,8 +91,7 @@ public:
 
     std::array<asio::mutable_buffer, 5> buffers()
     {
-    return
+        return {
-    {
             {
                 asio::buffer(&null_byte_, 1),
                 asio::buffer(&status_, 1),

components/asio/examples/ssl_client_server/pytest_asio_ssl_client_server_test.py

@@ -1,8 +1,7 @@
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Unlicense OR CC0-1.0
 from __future__ import unicode_literals
 
-import pytest
-from pytest_embedded import Dut
-
 
 def test_examples_asio_ssl(dut):
     dut.expect('Reply: GET / HTTP/1.1')

components/asio/examples/tcp_echo_server/main/echo_server.cpp

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 #include "asio.hpp"
 #include <string>
 #include <iostream>
@@ -8,8 +13,7 @@
 using asio::ip::tcp;
 
 class session
-  : public std::enable_shared_from_this<session>
+    : public std::enable_shared_from_this<session> {
-{
 public:
     session(tcp::socket socket)
         : socket_(std::move(socket))
@@ -26,10 +30,8 @@ private:
     {
         auto self(shared_from_this());
         socket_.async_read_some(asio::buffer(data_, max_length),
-        [this, self](std::error_code ec, std::size_t length)
+        [this, self](std::error_code ec, std::size_t length) {
-        {
+            if (!ec) {
-          if (!ec)
-          {
                 data_[length] = 0;
                 std::cout << data_ << std::endl;
                 do_write(length);
@@ -41,10 +43,8 @@ private:
     {
         auto self(shared_from_this());
         asio::async_write(socket_, asio::buffer(data_, length),
-        [this, self](std::error_code ec, std::size_t length)
+        [this, self](std::error_code ec, std::size_t length) {
-        {
+            if (!ec) {
-          if (!ec)
-          {
                 do_read();
             }
         });
@@ -55,8 +55,7 @@ private:
     char data_[max_length];
 };
 
-class server
+class server {
-{
 public:
     server(asio::io_context &io_context, short port)
         : acceptor_(io_context, tcp::endpoint(tcp::v4(), port))
@@ -68,10 +67,8 @@ private:
     void do_accept()
     {
         acceptor_.async_accept(
-        [this](std::error_code ec, tcp::socket socket)
+        [this](std::error_code ec, tcp::socket socket) {
-        {
+            if (!ec) {
-          if (!ec)
-          {
                 std::make_shared<session>(std::move(socket))->start();
             }
 

components/asio/examples/tcp_echo_server/pytest_asio_tcp_server_test.py

@@ -1,7 +1,7 @@
-import os
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Unlicense OR CC0-1.0
 import re
 import socket
-from pytest_embedded import Dut
 
 
 def test_examples_protocol_asio_tcp_server(dut):
@@ -15,7 +15,10 @@ def test_examples_protocol_asio_tcp_server(dut):
     """
     test_msg = b'echo message from client to server'
     # 2. get the server IP address
-    data = dut.expect(re.compile(b' IPv4 address: ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)'), timeout=30).group(1).decode()
+    data = dut.expect(
+        re.compile(
+            b' IPv4 address: ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)'),  # noqa: W605
+        timeout=30).group(1).decode()
     # 3. create tcp client and connect to server
     dut.expect('ASIO engine is up and running', timeout=1)
     cli = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -29,7 +32,8 @@ def test_examples_protocol_asio_tcp_server(dut):
         pass
     else:
         print('Failure!')
-        raise ValueError('Wrong data received from asi tcp server: {} (expected:{})'.format(data, test_msg))
+        raise ValueError(
+            'Wrong data received from asi tcp server: {} (expected:{})'.format(
+                data, test_msg))
     # 5. check the client message appears also on server terminal
     dut.expect(test_msg.decode())
-

components/asio/examples/udp_echo_server/main/udp_echo_server.cpp

@@ -20,8 +20,7 @@
 
 using asio::ip::udp;
 
-class server
+class server {
-{
 public:
     server(asio::io_context &io_context, short port)
         : socket_(io_context, udp::endpoint(udp::v4(), port))
@@ -33,16 +32,12 @@ public:
     {
         socket_.async_receive_from(
             asio::buffer(data_, max_length), sender_endpoint_,
-        [this](std::error_code ec, std::size_t bytes_recvd)
+        [this](std::error_code ec, std::size_t bytes_recvd) {
-        {
+            if (!ec && bytes_recvd > 0) {
-          if (!ec && bytes_recvd > 0)
-          {
                 data_[bytes_recvd] = 0;
                 std::cout << data_ << std::endl;
                 do_send(bytes_recvd);
-          }
+            } else {
-          else
-          {
                 do_receive();
             }
         });
@@ -52,8 +47,7 @@ public:
     {
         socket_.async_send_to(
             asio::buffer(data_, length), sender_endpoint_,
-        [this](std::error_code /*ec*/, std::size_t  bytes /*bytes_sent*/)
+        [this](std::error_code /*ec*/, std::size_t  bytes /*bytes_sent*/) {
-        {
             do_receive();
         });
     }

components/asio/examples/udp_echo_server/pytest_asio_udp_server_test.py

@@ -1,9 +1,8 @@
-import os
+# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Unlicense OR CC0-1.0
 import re
 import socket
 
-import pytest
-from pytest_embedded import Dut
 
 def test_examples_protocol_asio_udp_server(dut):
     """
@@ -15,7 +14,10 @@ def test_examples_protocol_asio_udp_server(dut):
       5. Test evaluates received test message on server stdout
     """
     test_msg = b'echo message from client to server'
-    data = dut.expect(re.compile(b' IPv4 address: ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)'), timeout=30).group(1).decode()
+    data = dut.expect(
+        re.compile(
+            b' IPv4 address: ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)'),  # noqa: W605
+        timeout=30).group(1).decode()
     dut.expect('ASIO engine is up and running', timeout=1)
     cli = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
     cli.settimeout(30)
@@ -28,6 +30,8 @@ def test_examples_protocol_asio_udp_server(dut):
         pass
     else:
         print('Failure!')
-        raise ValueError('Wrong data received from asio udp server: {} (expected:{})'.format(data, test_msg))
+        raise ValueError(
+            'Wrong data received from asio udp server: {} (expected:{})'.
+            format(data, test_msg))
     # 5. check the client message appears also on server terminal
     dut.expect(test_msg.decode())

components/asio/port/include/esp_exception.h

@@ -24,7 +24,8 @@ void throw_exception(const Exception& e)
     ESP_LOGE("esp32_asio_exception", "Caught exception: %s!", e.what());
     abort();
 }
-}}
+}
+}
 #endif // CONFIG_COMPILER_CXX_EXCEPTIONS==1 && defined (ASIO_NO_EXCEPTIONS)
 
 #endif // _ESP_EXCEPTION_H_

components/asio/port/include/openssl_stub.hpp

@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+// SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
 //
 // SPDX-License-Identifier: BSL-1.0
 //
@@ -35,7 +35,9 @@ namespace mbedtls {
 class engine;
 class bio;
 class shared_ctx;
-} } } // namespace asio::ssl::mbedtls
+}
+}
+} // namespace asio::ssl::mbedtls
 
 //
 // Supply OpenSSL types as aliases to mbedtls classes

components/asio/port/mbedtls/include/mbedtls_bio.hpp

@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+// SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
 //
 // SPDX-License-Identifier: BSL-1.0
 //
@@ -110,4 +110,6 @@ private:
     size_t flags_ {0};
 };
 
-} } } // namespace asio::ssl::mbedtls
+}
+}
+} // namespace asio::ssl::mbedtls

components/asio/port/mbedtls/include/mbedtls_context.hpp

@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+// SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
 //
 // SPDX-License-Identifier: BSL-1.0
 //
@@ -29,8 +29,7 @@ template <typename T, typename... Args>
 inline T *create(const char *location, Args &&... args)
 {
     T *t = new (std::nothrow) T(std::forward<Args>(args)...);
-    if (t == nullptr)
+    if (t == nullptr) {
-    {
         throw_alloc_failure(location);
     }
     return t;
@@ -83,8 +82,7 @@ public:
     static SSL_CTX *create(const char *location, context_base::method m)
     {
         auto wrapped = asio::ssl::mbedtls::create<shared_ctx>(location, m);
-        if (wrapped->ctx_ == nullptr)
+        if (wrapped->ctx_ == nullptr) {
-        {
             throw_alloc_failure(location);
         }
         return wrapped;
@@ -102,4 +100,6 @@ private:
     std::shared_ptr<mbedtls::context> ctx_;
 };
 
-} } } // namespace asio::ssl::mbedtls
+}
+}
+} // namespace asio::ssl::mbedtls

components/asio/port/mbedtls/include/mbedtls_engine.hpp

@@ -163,18 +163,20 @@ private:
     {
         int mode = MBEDTLS_SSL_VERIFY_UNSET;
         if (is_client_not_server) {
-            if (verify_mode_ & SSL_VERIFY_PEER)
+            if (verify_mode_ & SSL_VERIFY_PEER) {
                 mode = MBEDTLS_SSL_VERIFY_REQUIRED;
-            else if (verify_mode_ == SSL_VERIFY_NONE)
+            } else if (verify_mode_ == SSL_VERIFY_NONE) {
                 mode = MBEDTLS_SSL_VERIFY_NONE;
+            }
         } else {
-            if (verify_mode_ & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)
+            if (verify_mode_ & SSL_VERIFY_FAIL_IF_NO_PEER_CERT) {
                 mode = MBEDTLS_SSL_VERIFY_REQUIRED;
-            else if (verify_mode_ & SSL_VERIFY_PEER)
+            } else if (verify_mode_ & SSL_VERIFY_PEER) {
                 mode = MBEDTLS_SSL_VERIFY_OPTIONAL;
-            else if (verify_mode_ == SSL_VERIFY_NONE)
+            } else if (verify_mode_ == SSL_VERIFY_NONE) {
                 mode = MBEDTLS_SSL_VERIFY_NONE;
             }
+        }
         return mode;
     }
 
@@ -290,4 +292,6 @@ private:
     asio::ssl::verify_mode verify_mode_;
 };
 
-} } } // namespace asio::ssl::mbedtls
+}
+}
+} // namespace asio::ssl::mbedtls

components/asio/port/mbedtls/include/mbedtls_error.hpp

@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+// SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
 //
 // SPDX-License-Identifier: BSL-1.0
 //
@@ -14,8 +14,7 @@ namespace asio {
 namespace error {
 namespace detail {
 
-class mbedtls_category : public asio::error_category
+class mbedtls_category : public asio::error_category {
-{
 public:
     const char *name() const ASIO_ERROR_CATEGORY_NOEXCEPT
     {
@@ -52,4 +51,6 @@ const asio::error_category& get_stream_category()
     return asio::error::get_mbedtls_category();
 }
 
-} } } // namespace asio::ssl::error
+}
+}
+} // namespace asio::ssl::error

components/asio/port/mbedtls/include/openssl/conf.h

@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+// SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
 //
 // SPDX-License-Identifier: BSL-1.0
 //

components/asio/port/mbedtls/include/openssl/dh.h

@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+// SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
 //
 // SPDX-License-Identifier: BSL-1.0
 //

components/asio/port/mbedtls/include/openssl/err.h

@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+// SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
 //
 // SPDX-License-Identifier: BSL-1.0
 //

components/asio/port/mbedtls/include/openssl/rsa.h

@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+// SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
 //
 // SPDX-License-Identifier: BSL-1.0
 //

components/asio/port/mbedtls/include/openssl/ssl.h

@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+// SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
 //
 // SPDX-License-Identifier: BSL-1.0
 //

components/asio/port/mbedtls/include/openssl/x509v3.h

@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+// SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
 //
 // SPDX-License-Identifier: BSL-1.0
 //

components/asio/port/mbedtls/src/mbedtls_context.cpp

@@ -4,7 +4,7 @@
 //
 // SPDX-License-Identifier: BSL-1.0
 //
-// SPDX-FileContributor: 2021 Espressif Systems (Shanghai) CO LTD
+// SPDX-FileContributor: 2021-2022 Espressif Systems (Shanghai) CO LTD
 //
 
 #include "asio/detail/config.hpp"

components/asio/port/mbedtls/src/mbedtls_engine.cpp

@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: BSL-1.0
 //
-// SPDX-FileContributor: 2021 Espressif Systems (Shanghai) CO LTD
+// SPDX-FileContributor: 2021-2022 Espressif Systems (Shanghai) CO LTD
 //
 
 #include "asio/detail/config.hpp"
@@ -62,8 +62,7 @@ engine::want engine::shutdown(asio::error_code& ec)
 engine::want engine::write(const asio::const_buffer &data,
                            asio::error_code &ec, std::size_t &bytes_transferred)
 {
-    if (data.size() == 0)
+    if (data.size() == 0) {
-    {
         ec = asio::error_code();
         return engine::want_nothing;
     }
@@ -76,8 +75,7 @@ engine::want engine::write(const asio::const_buffer& data,
 engine::want engine::read(const asio::mutable_buffer &data,
                           asio::error_code &ec, std::size_t &bytes_transferred)
 {
-    if (data.size() == 0)
+    if (data.size() == 0) {
-    {
         ec = asio::error_code();
         return engine::want_nothing;
     }
@@ -108,19 +106,18 @@ const asio::error_code& engine::map_error_code(
     asio::error_code &ec) const
 {
     // We only want to map the error::eof code.
-    if (ec != asio::error::eof)
+    if (ec != asio::error::eof) {
         return ec;
+    }
 
     // If there's data yet to be read, it's an error.
-    if (ssl_->ext_bio()->wpending())
+    if (ssl_->ext_bio()->wpending()) {
-    {
         ec = asio::ssl::error::stream_truncated;
         return ec;
     }
 
     // Otherwise, the peer should have negotiated a proper shutdown.
-    if (ssl_->shutdown() != 0)
+    if (ssl_->shutdown() != 0) {
-    {
         ec = asio::ssl::error::stream_truncated;
     }
 
@@ -138,38 +135,30 @@ engine::want engine::perform(int (engine::* op)(void*, std::size_t),
 
     std::size_t pending_output_after = ssl_->ext_bio()->ctrl_pending();
 
-    if (mbedtls::error_codes::is_error(result))
+    if (mbedtls::error_codes::is_error(result)) {
-    {
         ec = asio::error_code(result, asio::error::get_mbedtls_category());
         return pending_output_after > pending_output_before ? want_output : want_nothing;
     }
 
-    if (result == 0)
+    if (result == 0) {
-    {
         return pending_output_after > pending_output_before
                ? want_output : want_nothing;
     }
 
-    if (result > 0 && bytes_transferred)
+    if (result > 0 && bytes_transferred) {
         *bytes_transferred = static_cast<std::size_t>(result);
+    }
 
-    if (mbedtls::error_codes::want_write(result))
+    if (mbedtls::error_codes::want_write(result)) {
-    {
         ec = asio::error_code();
         return want_output_and_retry;
-    }
+    } else if (pending_output_after > pending_output_before) {
-    else if (pending_output_after > pending_output_before)
-    {
         ec = asio::error_code();
         return result > 0 ? want_output : want_output_and_retry;
-    }
+    } else if (mbedtls::error_codes::want_read(result)) {
-    else if (mbedtls::error_codes::want_read(result))
-    {
         ec = asio::error_code();
         return want_input_and_retry;
-    }
+    } else if (ssl_->get_state() == mbedtls::CLOSED) {
-    else if (ssl_->get_state() == mbedtls::CLOSED)
-    {
         ec = asio::error::eof;
         return want_nothing;
     }

components/asio/port/src/asio_ssl_impl.cpp

@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+// SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -17,4 +17,6 @@ asio::detail::shared_ptr<openssl_init_base::do_init> openssl_init_base::instance
     return nullptr;
 }
 
-} } } // namespace asio::ssl::detail
+}
+}
+} // namespace asio::ssl::detail

components/esp_modem/docs/Doxyfile

@@ -2522,4 +2522,3 @@ DOT_CLEANUP            = YES
 #DOT_GRAPH_MAX_NODES  = 100
 #MAX_DOT_GRAPH_DEPTH  = 0
 #DOT_TRANSPARENT      = YES
-

components/esp_modem/docs/advanced_api.rst

@@ -46,4 +46,3 @@ a custom DTE object and supply it into :ref:`the DCE factory<dce_factory>`. The
 - Create the DTE which uses the custom Terminal
 
 Please refer to the implementation of the existing UART DTE.
-

components/esp_modem/docs/conf.py

@@ -2,11 +2,6 @@
 #
 # English Language RTD & Sphinx config file
 #
-import os
-import os.path
-import re
-import subprocess
-import sys
 
 # General information about the project.
 project = u'esp-modem'
@@ -18,11 +13,12 @@ language = 'en'
 
 extensions = ['breathe', 'recommonmark']
 
-
 breathe_projects = {'esp_modem': 'xml'}
 
-breathe_default_project = "esp_modem"
+breathe_default_project = 'esp_modem'
 
 source_suffix = ['.rst', '.md']
 
-source_parsers = {'.md': 'recommonmark.parser.CommonMarkParser', }
+source_parsers = {
+    '.md': 'recommonmark.parser.CommonMarkParser',
+}

components/esp_modem/docs/internal_docs.rst

@@ -115,8 +115,3 @@ Modem types
 
 .. doxygengroup:: ESP_MODEM_TYPES
    :members:
-
-
-
-
-

components/esp_modem/examples/ap_to_pppos/main/ap_to_pppos.c

@@ -1,10 +1,11 @@
-/*  softAP to PPPoS Example
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
+/*
-
+ *  softAP to PPPoS Example
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
 */
 #include <string.h>
 #include "esp_system.h"

components/esp_modem/examples/ap_to_pppos/main/network_dce.c

@@ -1,10 +1,11 @@
-/*  softAP to PPPoS Example (network_dce)
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
+/*
-
+ * softAP to PPPoS Example (network_dce)
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
 */
 
 #include <string.h>

components/esp_modem/examples/ap_to_pppos/main/network_dce.cpp

@@ -1,10 +1,11 @@
-/*  softAP to PPPoS Example (network_dce)
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
+/*
-
+ *  softAP to PPPoS Example (network_dce)
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
 */
 
 #include "cxx_include/esp_modem_dte.hpp"
@@ -92,8 +93,9 @@ public:
     bool check_signal()
     {
         int rssi, ber;
-        if (dce_commands::get_signal_quality(dte.get(), rssi, ber) != command_result::OK)
+        if (dce_commands::get_signal_quality(dte.get(), rssi, ber) != command_result::OK) {
             return false;
+        }
         return rssi != 99 && rssi > 5;
     }
 

components/esp_modem/examples/ap_to_pppos/main/network_dce.h

@@ -1,10 +1,11 @@
-/*  softAP to PPPoS Example (network_dce)
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
+/*
-
+ * softAP to PPPoS Example (network_dce)
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
 */
 
 #pragma once

components/esp_modem/examples/linux_modem/main/modem_main.cpp

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 #include <memory>
 #include <cassert>
 #include <unistd.h>

components/esp_modem/examples/modem_console/Makefile

@@ -8,4 +8,3 @@ PROJECT_NAME := modem-console
 EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
 
 include $(IDF_PATH)/make/project.mk
-

components/esp_modem/examples/modem_console/main/console_helper.cpp

@@ -1,10 +1,11 @@
-/* Modem console example
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
+/*
-
+ * Modem console example
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
 */
 
 #include "console_helper.hpp"

components/esp_modem/examples/modem_console/main/console_helper.hpp

@@ -1,10 +1,11 @@
-/* Modem console example
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
+/*
-
+ * Modem console example
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
 */
 
 #pragma once

components/esp_modem/examples/modem_console/main/httpget_handle.c

@@ -1,10 +1,12 @@
-/* Modem console example
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
+/*
-
+ * Modem console example
-   Unless required by applicable law or agreed to in writing, this
+ *
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
 */
 
 #include <stdio.h>

components/esp_modem/examples/modem_console/main/modem_console_main.cpp

@@ -1,10 +1,11 @@
-/* Modem console example
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
+/*
-
+ * Modem console example
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
 */
 
 #include <cstdio>

components/esp_modem/examples/modem_console/main/my_module_dce.hpp

@@ -1,10 +1,11 @@
-/* Modem console example: Custom DCE
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
+/*
-
+ * Modem console example: Custom DCE
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
 */
 
 #pragma once

components/esp_modem/examples/modem_console/main/ping_handle.c

@@ -1,10 +1,10 @@
-/* Ping handle example
+/*
-
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
+ *
-
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
-   Unless required by applicable law or agreed to in writing, this
+ */
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+/*
-   CONDITIONS OF ANY KIND, either express or implied.
+ * Ping handle example
 */
 
 #include <stdio.h>

components/esp_modem/examples/pppos_client/CMakeLists.txt

@@ -6,5 +6,3 @@ set(EXTRA_COMPONENT_DIRS "../..")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(pppos_client)
-
-

components/esp_modem/examples/pppos_client/main/pppos_client_main.c

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 /* PPPoS Client Example
 
    This example code is in the Public Domain (or CC0 licensed, at your option.)

components/esp_modem/examples/simple_cmux_client/CMakeLists.txt

@@ -6,5 +6,3 @@ set(EXTRA_COMPONENT_DIRS "../.." $ENV{IDF_PATH}/examples/cxx/experimental/experi
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(simple_cmux_client)
-
-

components/esp_modem/examples/simple_cmux_client/main/simple_cmux_client_main.cpp

@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 /* PPPoS Client Example
 
    This example code is in the Public Domain (or CC0 licensed, at your option.)
@@ -96,8 +101,7 @@ extern "C" void app_main(void)
 #endif
     assert(dce);
 
-    if(dte_config.uart_config.flow_control == ESP_MODEM_FLOW_CONTROL_HW)
+    if (dte_config.uart_config.flow_control == ESP_MODEM_FLOW_CONTROL_HW) {
-    {
         if (command_result::OK != dce->set_flow_control(2, 2)) {
             ESP_LOGE(TAG, "Failed to set the set_flow_control mode");
             return;

components/esp_modem/examples/simple_cmux_client/main/simple_mqtt_client.cpp

@@ -1,10 +1,11 @@
-/* PPPoS Client Example
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
+/*
-
+ * PPPoS Client Example
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
 */
 
 #include <memory>

components/esp_modem/examples/simple_cmux_client/main/simple_mqtt_client.hpp

@@ -1,10 +1,11 @@
-/* PPPoS Client Example
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
+/*
-
+ * PPPoS Client Example
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
 */
 #pragma once
 

components/esp_modem/include/cxx_include/esp_modem_api.hpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 

components/esp_modem/include/cxx_include/esp_modem_buffer.hpp

@@ -1,16 +1,8 @@
-// Copyright 2022 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 
@@ -40,7 +32,10 @@ struct unique_buffer {
         consumed = 0;
         return *this;
     }
-    [[nodiscard]] uint8_t *get() const { return data.get(); }
+    [[nodiscard]] uint8_t *get() const
+    {
+        return data.get();
+    }
 
     std::unique_ptr<uint8_t[]> data;
     size_t size{};

components/esp_modem/include/cxx_include/esp_modem_cmux.hpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 

components/esp_modem/include/cxx_include/esp_modem_command_library.hpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 

components/esp_modem/include/cxx_include/esp_modem_dce.hpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 

components/esp_modem/include/cxx_include/esp_modem_dce_factory.hpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 #include "esp_log.h"

components/esp_modem/include/cxx_include/esp_modem_dce_module.hpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 
@@ -82,11 +74,13 @@ public:
             Task::Delay(1000); // Mandatory 1s pause before
             int retry = 0;
             while (retry++ < 3) {
-                if (set_command_mode() == command_result::OK)
+                if (set_command_mode() == command_result::OK) {
                     return true;
+                }
                 Task::Delay(1000); // Mandatory 1s pause after escape
-                if (sync() == command_result::OK)
+                if (sync() == command_result::OK) {
                     return true;
+                }
                 Task::Delay(1000); // Mandatory 1s pause before escape
             }
             return false;

components/esp_modem/include/cxx_include/esp_modem_dte.hpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 
@@ -106,8 +98,14 @@ protected:
     /**
      * @brief Allows for locking the DTE
      */
-    void lock()     { internal_lock.lock();   }
+    void lock()
-    void unlock()   { internal_lock.unlock(); }
+    {
+        internal_lock.lock();
+    }
+    void unlock()
+    {
+        internal_lock.unlock();
+    }
     friend class Scoped<DTE>;                               /*!< Declaring "Scoped<DTE> lock(dte)" locks this instance */
 private:
     static const size_t GOT_LINE = SignalGroup::bit0;       /*!< Bit indicating response available */

components/esp_modem/include/cxx_include/esp_modem_exception.hpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 
@@ -51,10 +43,19 @@ private:
 #define ESP_MODEM_THROW(exception) do { exception; abort(); } while(0)
 
 class esp_err_exception {
-    void print(std::string msg) { ESP_LOGE("ESP_MODEM_THROW", "%s\n", msg.c_str()); }
+    void print(std::string msg)
+    {
+        ESP_LOGE("ESP_MODEM_THROW", "%s\n", msg.c_str());
+    }
 public:
-    explicit esp_err_exception(std::string msg) { print(std::move(msg)); }
+    explicit esp_err_exception(std::string msg)
-    explicit esp_err_exception(std::string msg, esp_err_t err) { print(std::move(msg)); }
+    {
+        print(std::move(msg));
+    }
+    explicit esp_err_exception(std::string msg, esp_err_t err)
+    {
+        print(std::move(msg));
+    }
 };
 
 #endif

components/esp_modem/include/cxx_include/esp_modem_netif.hpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 

components/esp_modem/include/cxx_include/esp_modem_primitives.hpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 

components/esp_modem/include/cxx_include/esp_modem_terminal.hpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 

components/esp_modem/include/cxx_include/esp_modem_types.hpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 

components/esp_modem/include/esp_modem_api.h

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 

components/esp_modem/include/esp_modem_c_api_types.h

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 
@@ -40,8 +32,7 @@ typedef struct esp_modem_PdpContext_t {
 /**
  * @brief DCE mode: This enum is used to set desired operation mode of the DCE
  */
-typedef enum esp_modem_dce_mode
+typedef enum esp_modem_dce_mode {
-{
     ESP_MODEM_MODE_COMMAND,  /**< Default mode after modem startup, used for sending AT commands */
     ESP_MODEM_MODE_DATA,     /**< Used for switching to PPP mode for the modem to connect to a network */
     ESP_MODEM_MODE_CMUX,     /**< Multiplexed terminal mode */
@@ -50,8 +41,7 @@ typedef enum esp_modem_dce_mode
 /**
  * @brief DCE devices: Enum list of supported devices
  */
-typedef enum esp_modem_dce_device
+typedef enum esp_modem_dce_device {
-{
     ESP_MODEM_DCE_GENETIC,  /**< The most generic device */
     ESP_MODEM_DCE_SIM7600,
     ESP_MODEM_DCE_SIM7070,
@@ -63,8 +53,7 @@ typedef enum esp_modem_dce_device
 /**
  * @brief Terminal errors
  */
-typedef enum esp_modem_terminal_error
+typedef enum esp_modem_terminal_error {
-{
     ESP_MODEM_TERMINAL_BUFFER_OVERFLOW,
     ESP_MODEM_TERMINAL_CHECKSUM_ERROR,
     ESP_MODEM_TERMINAL_UNEXPECTED_CONTROL_FLOW,

components/esp_modem/include/esp_modem_config.h

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 

components/esp_modem/include/esp_modem_dce_config.h

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 

components/esp_modem/include/esp_private/c_api_wrapper.hpp

@@ -1,16 +1,8 @@
-// Copyright 2022 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 /**
  * @file c_api_wrapper.hpp

components/esp_modem/include/vfs_resource/vfs_create.hpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 

components/esp_modem/port/linux/esp_event_mock/include/esp_event_base.h

@@ -23,4 +23,3 @@ typedef enum {
 } mdns_used_event_t;
 
 typedef void *esp_event_base_t;
-

components/esp_modem/port/linux/esp_netif_linux/CMakeLists.txt

@@ -20,4 +20,3 @@ idf_component_register(SRCS esp_netif_linux.cpp tun_io.c ip4_stub.c ip6_stub.c $
                        INCLUDE_DIRS include ${LWIP_INCLUDE_DIRS}
                        PRIV_INCLUDE_DIRS .
                        REQUIRES esp_system_protocols_linux)
-

components/esp_modem/port/linux/esp_netif_linux/ip4_stub.c

@@ -4,14 +4,20 @@ err_t
 ip4_output_if(struct pbuf *p, const ip4_addr_t *src, const ip4_addr_t *dest,
               u8_t ttl, u8_t tos,
               u8_t proto, struct netif *netif)
-{ return ERR_OK; }
+{
+    return ERR_OK;
+}
 
 struct netif *
 ip4_route(const ip4_addr_t *dest)
-{ return NULL; }
+{
+    return NULL;
+}
 
 err_t
 ip4_output_if_src(struct pbuf *p, const ip4_addr_t *src, const ip4_addr_t *dest,
                   u8_t ttl, u8_t tos,
                   u8_t proto, struct netif *netif)
-{ return ERR_OK; }
+{
+    return ERR_OK;
+}

components/esp_modem/port/linux/esp_netif_linux/ip6_stub.c

@@ -4,22 +4,32 @@ err_t
 ip6_output_if(struct pbuf *p, const ip6_addr_t *src, const ip6_addr_t *dest,
               u8_t hl, u8_t tc,
               u8_t nexth, struct netif *netif)
-{ return ERR_OK; }
+{
+    return ERR_OK;
+}
 
 struct netif *
 ip6_route(const ip6_addr_t *src, const ip6_addr_t *dest)
-{ return NULL; }
+{
+    return NULL;
+}
 
 err_t
 ip6_output_if_src(struct pbuf *p, const ip6_addr_t *src, const ip6_addr_t *dest,
                   u8_t hl, u8_t tc,
                   u8_t nexth, struct netif *netif)
-{ return ERR_OK; }
+{
+    return ERR_OK;
+}
 
 const ip_addr_t *
 ip6_select_source_address(struct netif *netif, const ip6_addr_t *dest)
-{ return NULL; }
+{
+    return NULL;
+}
 
 err_t
 ip6_options_add_hbh_ra(struct pbuf *p, u8_t nexth, u8_t value)
-{ return ERR_OK; }
+{
+    return ERR_OK;
+}

components/esp_modem/port/linux/esp_netif_linux/tun_io.c

@@ -24,8 +24,7 @@ static void ppp_link_status_cb(ppp_pcb *pcb, int err_code, void *ctx)
     LWIP_UNUSED_ARG(ctx);
 
     switch (err_code) {
-        case PPPERR_NONE:               /* No error. */
+    case PPPERR_NONE: {             /* No error. */
-        {
 #if LWIP_DNS
         const ip_addr_t *ns;
 #endif /* LWIP_DNS */
@@ -108,8 +107,9 @@ static void ppp_link_status_cb(ppp_pcb *pcb, int err_code, void *ctx)
 static u32_t ppp_output_cb(struct ppp_pcb_s *pcb, const void *data, u32_t len, void *ctx)
 {
     esp_netif_t *netif = (esp_netif_t *)ctx;
-    if (netif->transmit)
+    if (netif->transmit) {
         return netif->transmit(netif->ctx, (uint8_t *)data, len);
+    }
     return  0;
 }
 

components/esp_modem/port/linux/esp_system_protocols_linux/include/esp_log.h

@@ -44,4 +44,3 @@ printf(LOG_COLOR_I); printf("(%s) ", TAG); printf(__VA_ARGS__); printf(LOG_RESET
 printf(LOG_COLOR_D); printf("(%s) ", TAG); printf(__VA_ARGS__); printf(LOG_RESET_COLOR "\n"); } while(0)
 #define ESP_LOGV(TAG, ...)  do { \
 printf(LOG_COLOR_V); printf("(%s) ", TAG); printf(__VA_ARGS__); printf(LOG_RESET_COLOR "\n"); } while(0)
-

components/esp_modem/port/linux/esp_system_protocols_linux/include/machine/endian.h

@@ -14,4 +14,3 @@
 #pragma once
 
 #include_next "endian.h"
-

components/esp_modem/private_include/exception_stub.hpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 

components/esp_modem/private_include/uart_compat.h

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 

components/esp_modem/private_include/uart_resource.hpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 

components/esp_modem/private_include/uart_terminal.hpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 
@@ -23,4 +15,3 @@ namespace esp_modem {
 std::unique_ptr<Terminal> create_uart_terminal(const esp_modem_dte_config *config);
 
 }  // namespace esp_modem
-

components/esp_modem/private_include/vfs_termial.hpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #pragma once
 

components/esp_modem/src/esp_modem_api.cpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #include <cassert>
 #include "esp_log.h"

components/esp_modem/src/esp_modem_api_target.cpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #include <cassert>
 #include "esp_log.h"

components/esp_modem/src/esp_modem_c_api.cpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #include <cassert>
 #include "cxx_include/esp_modem_dte.hpp"

components/esp_modem/src/esp_modem_cmux.cpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #include <cstring>
 #include <unistd.h>
@@ -85,11 +77,13 @@ void CMux::send_disconnect(size_t i)
 {
     if (i == 0) {   // control terminal
         uint8_t frame[] = {
-                SOF_MARKER, 0x3, 0xEF, 0x5, 0xC3, 0x1, 0xF2, SOF_MARKER };
+            SOF_MARKER, 0x3, 0xEF, 0x5, 0xC3, 0x1, 0xF2, SOF_MARKER
+        };
         term->write(frame, 8);
     } else {        // separate virtual terminal
         uint8_t frame[] = {
-                SOF_MARKER, 0x3, FT_DISC | PF, 0x1, 0, SOF_MARKER };
+            SOF_MARKER, 0x3, FT_DISC | PF, 0x1, 0, SOF_MARKER
+        };
         frame[1] |= i << 2;
         frame[4] = 0xFF - fcs_crc(frame);
         term->write(frame, sizeof(frame));

components/esp_modem/src/esp_modem_command_library.cpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #include <charconv>
 #include <list>

components/esp_modem/src/esp_modem_dce.cpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #include <list>
 #include <unistd.h>
@@ -44,8 +36,7 @@ bool DCE_Mode::set_unsafe(DTE *dte, ModuleIf *device, Netif &netif, modem_mode m
     switch (m) {
     case modem_mode::UNDEF:
         break;
-    case modem_mode::COMMAND_MODE:
+    case modem_mode::COMMAND_MODE: {
-        {
         if (mode == modem_mode::COMMAND_MODE) {
             return false;
         }
@@ -62,14 +53,16 @@ bool DCE_Mode::set_unsafe(DTE *dte, ModuleIf *device, Netif &netif, modem_mode m
         auto signal = std::make_shared<SignalGroup>();
         std::weak_ptr<SignalGroup> weak_signal = signal;
         dte->set_read_cb([weak_signal](uint8_t *data, size_t len) -> bool {
-                if (memchr(data, '\n', len)) {
+            if (memchr(data, '\n', len))
+            {
                 ESP_LOG_BUFFER_HEXDUMP("esp-modem: debug_data", data, len, ESP_LOG_DEBUG);
                 const auto pass = std::list<std::string_view>({"NO CARRIER", "DISCONNECTED"});
                 std::string_view response((char *) data, len);
                 for (auto &it : pass)
                     if (response.find(it) != std::string::npos) {
-                            if (auto signal = weak_signal.lock())
+                        if (auto signal = weak_signal.lock()) {
                             signal->set(1);
+                        }
                         return true;
                     }
             }

components/esp_modem/src/esp_modem_dte.cpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #include <cstring>
 #include "esp_log.h"

components/esp_modem/src/esp_modem_factory.cpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #include <functional>
 #include "cxx_include/esp_modem_types.hpp"

components/esp_modem/src/esp_modem_modules.cpp

@@ -1,16 +1,8 @@
-// Copyright 2021 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #include "cxx_include/esp_modem_api.hpp"
 #include "cxx_include/esp_modem_dce_module.hpp"