espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-06-27 02:11:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Suren Gabrielyan
2022-10-11 16:31:57 +02:00
parent 9d45d505d5
commit 945bd17701
205 changed files with 3130 additions and 3441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.flake8
View File

@ -136,6 +136,5 @@ show_source = True
statistics = 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

2
.git-blame-ignore-revs Normal file
View File

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

26
.mypy.ini Normal file
View File

@ -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

4
.pre-commit-config.yaml
View File

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

12
ci/check_copyright_config.yaml
View File

@ -46,9 +46,19 @@ asio_component:
- Apache-2.0 - Apache-2.0
- BSL-1.0 - BSL-1.0
slim_modem_examples:
include:
- 'examples/esp_netif/slip_custom_netif/**'
allowed_licenses:
- Apache-2.0
- Unlicense
- CC0-1.0
ignore: ignore:
perform_check: no perform_check: no
include: include:
- 'components/**/docs/**' - 'components/**/docs/**'
- 'components/esp_modem/port/linux/**' - '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/**'

12
common_components/protocol_examples_common/addr_from_stdin.c
View File

@ -26,7 +26,7 @@ esp_err_t get_addr_from_stdin(int port, int sock_type, int *ip_protocol, int *ad
do { do {
fgets(host_ip, HOST_IP_SIZE, stdin); fgets(host_ip, HOST_IP_SIZE, stdin);
len = strlen(host_ip); len = strlen(host_ip);
} while (len<=1 && host_ip[0] == '\n'); } while (len <= 1 && host_ip[0] == '\n');
host_ip[len - 1] = '\0'; host_ip[len - 1] = '\0';
struct addrinfo hints, *addr_list, *cur; struct addrinfo hints, *addr_list, *cur;
@ -36,16 +36,16 @@ esp_err_t get_addr_from_stdin(int port, int sock_type, int *ip_protocol, int *ad
hints.ai_family = AF_UNSPEC; hints.ai_family = AF_UNSPEC;
hints.ai_socktype = sock_type; hints.ai_socktype = sock_type;
hints.ai_protocol = IPPROTO_TCP; hints.ai_protocol = IPPROTO_TCP;
if( getaddrinfo( host_ip, NULL, &hints, &addr_list ) != 0 ) { if ( getaddrinfo( host_ip, NULL, &hints, &addr_list ) != 0 ) {
return ESP_FAIL; return ESP_FAIL;
} }
for( cur = addr_list; cur != NULL; cur = cur->ai_next ) { for ( cur = addr_list; cur != NULL; cur = cur->ai_next ) {
memcpy(dest_addr, cur->ai_addr, sizeof(*dest_addr)); memcpy(dest_addr, cur->ai_addr, sizeof(*dest_addr));
if (cur->ai_family == AF_INET) { if (cur->ai_family == AF_INET) {
*ip_protocol = IPPROTO_IP; *ip_protocol = IPPROTO_IP;
*addr_family = AF_INET; *addr_family = AF_INET;
// add port number and return on first IPv4 match // add port number and return on first IPv4 match
((struct sockaddr_in*)dest_addr)->sin_port = htons(port); ((struct sockaddr_in *)dest_addr)->sin_port = htons(port);
freeaddrinfo( addr_list ); freeaddrinfo( addr_list );
return ESP_OK; return ESP_OK;
@ -55,8 +55,8 @@ esp_err_t get_addr_from_stdin(int port, int sock_type, int *ip_protocol, int *ad
*ip_protocol = IPPROTO_IPV6; *ip_protocol = IPPROTO_IPV6;
*addr_family = AF_INET6; *addr_family = AF_INET6;
// add port and interface number and return on first IPv6 match // add port and interface number and return on first IPv6 match
((struct sockaddr_in6*)dest_addr)->sin6_port = htons(port); ((struct sockaddr_in6 *)dest_addr)->sin6_port = htons(port);
((struct sockaddr_in6*)dest_addr)->sin6_scope_id = esp_netif_get_netif_impl_index(EXAMPLE_INTERFACE); ((struct sockaddr_in6 *)dest_addr)->sin6_scope_id = esp_netif_get_netif_impl_index(EXAMPLE_INTERFACE);
freeaddrinfo( addr_list ); freeaddrinfo( addr_list );
return ESP_OK; return ESP_OK;
} }

13
common_components/protocol_examples_common/connect.c
View File

@ -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> #include <string.h>

11
common_components/protocol_examples_common/include/addr_from_stdin.h
View File

@ -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: /* 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). 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. 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 In that case this component is used to receive a string that is evaluated and processed to output
socket structures to open a connectio 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 #pragma once

13
common_components/protocol_examples_common/include/protocol_examples_common.h
View File

@ -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 #pragma once

13
common_components/protocol_examples_common/stdin_out.c
View File

@ -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" #include "protocol_examples_common.h"

5
components/asio/docs/conf_common.py
View File

@ -1,10 +1,11 @@
from esp_docs.conf_docs import * # noqa: F403,F401 from esp_docs.conf_docs import * # noqa: F403,F401
extensions += ['sphinx_copybutton', extensions += [
'sphinx_copybutton',
# Needed as a trigger for running doxygen # Needed as a trigger for running doxygen
'esp_docs.esp_extensions.dummy_build_system', 'esp_docs.esp_extensions.dummy_build_system',
'esp_docs.esp_extensions.run_doxygen', 'esp_docs.esp_extensions.run_doxygen',
] ]
# link roles config # link roles config
github_repo = 'espressif/esp-protocols' github_repo = 'espressif/esp-protocols'

1
components/asio/docs/generate_docs
View File

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

15
components/asio/examples/asio_chat/main/asio_chat.cpp
View File

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

17
components/asio/examples/asio_chat/main/chat_message.hpp
View File

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

62
components/asio/examples/asio_chat/main/client.hpp
View File

@ -17,26 +17,23 @@
typedef std::deque<chat_message> chat_message_queue; typedef std::deque<chat_message> chat_message_queue;
class chat_client class chat_client {
{
public: public:
chat_client(asio::io_context& io_context, chat_client(asio::io_context &io_context,
const asio::ip::tcp::resolver::results_type& endpoints) const asio::ip::tcp::resolver::results_type &endpoints)
: io_context_(io_context), : io_context_(io_context),
socket_(io_context) socket_(io_context)
{ {
do_connect(endpoints); do_connect(endpoints);
} }
void write(const chat_message& msg) void write(const chat_message &msg)
{ {
asio::post(io_context_, asio::post(io_context_,
[this, msg]() [this, msg]() {
{
bool write_in_progress = !write_msgs_.empty(); bool write_in_progress = !write_msgs_.empty();
write_msgs_.push_back(msg); write_msgs_.push_back(msg);
if (!write_in_progress) if (!write_in_progress) {
{
do_write(); do_write();
} }
}); });
@ -44,17 +41,17 @@ public:
void close() void close()
{ {
asio::post(io_context_, [this]() { socket_.close(); }); asio::post(io_context_, [this]() {
socket_.close();
});
} }
private: private:
void do_connect(const asio::ip::tcp::resolver::results_type& endpoints) void do_connect(const asio::ip::tcp::resolver::results_type &endpoints)
{ {
asio::async_connect(socket_, 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(); do_read_header();
} }
}); });
@ -64,14 +61,10 @@ void do_connect(const asio::ip::tcp::resolver::results_type& endpoints)
{ {
asio::async_read(socket_, asio::async_read(socket_,
asio::buffer(read_msg_.data(), chat_message::header_length), 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(); do_read_body();
} } else {
else
{
socket_.close(); socket_.close();
} }
}); });
@ -81,14 +74,10 @@ void do_connect(const asio::ip::tcp::resolver::results_type& endpoints)
{ {
asio::async_read(socket_, asio::async_read(socket_,
asio::buffer(read_msg_.body(), read_msg_.body_length()), 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(); do_read_header();
} } else {
else
{
socket_.close(); socket_.close();
} }
}); });
@ -99,25 +88,20 @@ void do_connect(const asio::ip::tcp::resolver::results_type& endpoints)
asio::async_write(socket_, asio::async_write(socket_,
asio::buffer(write_msgs_.front().data(), asio::buffer(write_msgs_.front().data(),
write_msgs_.front().length()), 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(); write_msgs_.pop_front();
if (!write_msgs_.empty()) if (!write_msgs_.empty()) {
{
do_write(); do_write();
} }
} } else {
else
{
socket_.close(); socket_.close();
} }
}); });
} }
private: private:
asio::io_context& io_context_; asio::io_context &io_context_;
asio::ip::tcp::socket socket_; asio::ip::tcp::socket socket_;
chat_message read_msg_; chat_message read_msg_;
chat_message_queue write_msgs_; chat_message_queue write_msgs_;

79
components/asio/examples/asio_chat/main/server.hpp
View File

@ -27,41 +27,42 @@ extern std::mutex server_ready;
//---------------------------------------------------------------------- //----------------------------------------------------------------------
class chat_participant class chat_participant {
{
public: public:
virtual ~chat_participant() {} virtual ~chat_participant() {}
virtual void deliver(const chat_message& msg) = 0; virtual void deliver(const chat_message &msg) = 0;
}; };
typedef std::shared_ptr<chat_participant> chat_participant_ptr; typedef std::shared_ptr<chat_participant> chat_participant_ptr;
//---------------------------------------------------------------------- //----------------------------------------------------------------------
class chat_room class chat_room {
{
public: public:
void join(chat_participant_ptr participant) void join(chat_participant_ptr participant)
{ {
participants_.insert(participant); participants_.insert(participant);
for (auto msg: recent_msgs_) for (auto msg : recent_msgs_) {
participant->deliver(msg); participant->deliver(msg);
} }
}
void leave(chat_participant_ptr participant) void leave(chat_participant_ptr participant)
{ {
participants_.erase(participant); participants_.erase(participant);
} }
void deliver(const chat_message& msg) void deliver(const chat_message &msg)
{ {
recent_msgs_.push_back(msg); recent_msgs_.push_back(msg);
while (recent_msgs_.size() > max_recent_msgs) while (recent_msgs_.size() > max_recent_msgs) {
recent_msgs_.pop_front(); recent_msgs_.pop_front();
}
for (auto participant: participants_) for (auto participant : participants_) {
participant->deliver(msg); participant->deliver(msg);
} }
}
private: private:
std::set<chat_participant_ptr> participants_; std::set<chat_participant_ptr> participants_;
@ -74,10 +75,9 @@ private:
class chat_session class chat_session
: public chat_participant, : public chat_participant,
public std::enable_shared_from_this<chat_session> public std::enable_shared_from_this<chat_session> {
{
public: public:
chat_session(asio::ip::tcp::socket socket, chat_room& room) chat_session(asio::ip::tcp::socket socket, chat_room &room)
: socket_(std::move(socket)), : socket_(std::move(socket)),
room_(room) room_(room)
{ {
@ -89,12 +89,11 @@ public:
do_read_header(); do_read_header();
} }
void deliver(const chat_message& msg) void deliver(const chat_message &msg)
{ {
bool write_in_progress = !write_msgs_.empty(); bool write_in_progress = !write_msgs_.empty();
write_msgs_.push_back(msg); write_msgs_.push_back(msg);
if (!write_in_progress) if (!write_in_progress) {
{
do_write(); do_write();
} }
} }
@ -105,14 +104,10 @@ private:
auto self(shared_from_this()); auto self(shared_from_this());
asio::async_read(socket_, asio::async_read(socket_,
asio::buffer(read_msg_.data(), chat_message::header_length), 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(); do_read_body();
} } else {
else
{
room_.leave(shared_from_this()); room_.leave(shared_from_this());
} }
}); });
@ -123,16 +118,12 @@ private:
auto self(shared_from_this()); auto self(shared_from_this());
asio::async_read(socket_, asio::async_read(socket_,
asio::buffer(read_msg_.body(), read_msg_.body_length()), 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()); ESP_LOGD("asio-chat:", "%s", read_msg_.body());
room_.deliver(read_msg_); room_.deliver(read_msg_);
do_read_header(); do_read_header();
} } else {
else
{
room_.leave(shared_from_this()); room_.leave(shared_from_this());
} }
}); });
@ -144,36 +135,30 @@ private:
asio::async_write(socket_, asio::async_write(socket_,
asio::buffer(write_msgs_.front().data(), asio::buffer(write_msgs_.front().data(),
write_msgs_.front().length()), 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(); write_msgs_.pop_front();
if (!write_msgs_.empty()) if (!write_msgs_.empty()) {
{
do_write(); do_write();
} }
} } else {
else
{
room_.leave(shared_from_this()); room_.leave(shared_from_this());
} }
}); });
} }
asio::ip::tcp::socket socket_; asio::ip::tcp::socket socket_;
chat_room& room_; chat_room &room_;
chat_message read_msg_; chat_message read_msg_;
chat_message_queue write_msgs_; chat_message_queue write_msgs_;
}; };
//---------------------------------------------------------------------- //----------------------------------------------------------------------
class chat_server class chat_server {
{
public: public:
chat_server(asio::io_context& io_context, chat_server(asio::io_context &io_context,
const asio::ip::tcp::endpoint& endpoint) const asio::ip::tcp::endpoint &endpoint)
: acceptor_(io_context, endpoint) : acceptor_(io_context, endpoint)
{ {
do_accept(); do_accept();
@ -184,10 +169,8 @@ private:
{ {
std::lock_guard<std::mutex> guard(server_ready); std::lock_guard<std::mutex> guard(server_ready);
acceptor_.async_accept( 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(); std::make_shared<chat_session>(std::move(socket), room_)->start();
} }

9
components/asio/examples/asio_chat/pytest_example_test.py → components/asio/examples/asio_chat/pytest_asio_chat_test.py
View File

@ -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 -*- # -*- coding: utf-8 -*-
import re import re
import pytest
from pytest_embedded import Dut
def test_examples_asio_chat(dut): def test_examples_asio_chat(dut):

1
components/asio/examples/socks4/README.md
View File

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

25
components/asio/examples/socks4/main/socks4.hpp
View File

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

5
components/asio/examples/ssl_client_server/pytest_example_test.py → components/asio/examples/ssl_client_server/pytest_asio_ssl_client_server_test.py
View File

@ -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 from __future__ import unicode_literals
import pytest
from pytest_embedded import Dut
def test_examples_asio_ssl(dut): def test_examples_asio_ssl(dut):
dut.expect('Reply: GET / HTTP/1.1') dut.expect('Reply: GET / HTTP/1.1')

31
components/asio/examples/tcp_echo_server/main/echo_server.cpp
View File

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

14
components/asio/examples/tcp_echo_server/pytest_asio_tcp_server_test.py
View File

@ -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 re
import socket import socket
from pytest_embedded import Dut
def test_examples_protocol_asio_tcp_server(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' test_msg = b'echo message from client to server'
# 2. get the server IP address # 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 # 3. create tcp client and connect to server
dut.expect('ASIO engine is up and running', timeout=1) dut.expect('ASIO engine is up and running', timeout=1)
cli = socket.socket(socket.AF_INET, socket.SOCK_STREAM) cli = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@ -29,7 +32,8 @@ def test_examples_protocol_asio_tcp_server(dut):
pass pass
else: else:
print('Failure!') 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 # 5. check the client message appears also on server terminal
dut.expect(test_msg.decode()) dut.expect(test_msg.decode())

18
components/asio/examples/udp_echo_server/main/udp_echo_server.cpp
View File

@ -20,10 +20,9 @@
using asio::ip::udp; using asio::ip::udp;
class server class server {
{
public: public:
server(asio::io_context& io_context, short port) server(asio::io_context &io_context, short port)
: socket_(io_context, udp::endpoint(udp::v4(), port)) : socket_(io_context, udp::endpoint(udp::v4(), port))
{ {
do_receive(); do_receive();
@ -33,16 +32,12 @@ public:
{ {
socket_.async_receive_from( socket_.async_receive_from(
asio::buffer(data_, max_length), sender_endpoint_, 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; data_[bytes_recvd] = 0;
std::cout << data_ << std::endl; std::cout << data_ << std::endl;
do_send(bytes_recvd); do_send(bytes_recvd);
} } else {
else
{
do_receive(); do_receive();
} }
}); });
@ -52,8 +47,7 @@ public:
{ {
socket_.async_send_to( socket_.async_send_to(
asio::buffer(data_, length), sender_endpoint_, 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(); do_receive();
}); });
} }

14
components/asio/examples/udp_echo_server/pytest_asio_udp_server_test.py
View File

@ -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 re
import socket import socket
import pytest
from pytest_embedded import Dut
def test_examples_protocol_asio_udp_server(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 5. Test evaluates received test message on server stdout
""" """
test_msg = b'echo message from client to server' 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) dut.expect('ASIO engine is up and running', timeout=1)
cli = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) cli = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
cli.settimeout(30) cli.settimeout(30)
@ -28,6 +30,8 @@ def test_examples_protocol_asio_udp_server(dut):
pass pass
else: else:
print('Failure!') 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 # 5. check the client message appears also on server terminal
dut.expect(test_msg.decode()) dut.expect(test_msg.decode())

5
components/asio/port/include/esp_exception.h
View File

@ -19,12 +19,13 @@
namespace asio { namespace asio {
namespace detail { namespace detail {
template <typename Exception> template <typename Exception>
void throw_exception(const Exception& e) void throw_exception(const Exception &e)
{ {
ESP_LOGE("esp32_asio_exception", "Caught exception: %s!", e.what()); ESP_LOGE("esp32_asio_exception", "Caught exception: %s!", e.what());
abort(); abort();
} }
}} }
}
#endif // CONFIG_COMPILER_CXX_EXCEPTIONS==1 && defined (ASIO_NO_EXCEPTIONS) #endif // CONFIG_COMPILER_CXX_EXCEPTIONS==1 && defined (ASIO_NO_EXCEPTIONS)
#endif // _ESP_EXCEPTION_H_ #endif // _ESP_EXCEPTION_H_

14
components/asio/port/include/openssl_stub.hpp
View File

@ -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 // SPDX-License-Identifier: BSL-1.0
// //
@ -35,12 +35,14 @@ namespace mbedtls {
class engine; class engine;
class bio; class bio;
class shared_ctx; class shared_ctx;
} } } // namespace asio::ssl::mbedtls }
}
} // namespace asio::ssl::mbedtls
// //
// Supply OpenSSL types as aliases to mbedtls classes // Supply OpenSSL types as aliases to mbedtls classes
// //
using X509_STORE_CTX=void; using X509_STORE_CTX = void;
using BIO=asio::ssl::mbedtls::bio; using BIO = asio::ssl::mbedtls::bio;
using SSL_CTX=asio::ssl::mbedtls::shared_ctx; using SSL_CTX = asio::ssl::mbedtls::shared_ctx;
using SSL=asio::ssl::mbedtls::engine; using SSL = asio::ssl::mbedtls::engine;

8
components/asio/port/mbedtls/include/mbedtls_bio.hpp
View File

@ -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 // SPDX-License-Identifier: BSL-1.0
// //
@ -87,7 +87,7 @@ public:
return flags_ & BIO_FLAGS_READ; return flags_ & BIO_FLAGS_READ;
} }
static std::pair<std::shared_ptr<bio>, std::shared_ptr<bio>> new_pair(const char* error_location) static std::pair<std::shared_ptr<bio>, std::shared_ptr<bio>> new_pair(const char *error_location)
{ {
auto b1 = std::shared_ptr<bio>(new (std::nothrow) bio); auto b1 = std::shared_ptr<bio>(new (std::nothrow) bio);
auto b2 = std::shared_ptr<bio>(new (std::nothrow) bio); auto b2 = std::shared_ptr<bio>(new (std::nothrow) bio);
@ -110,4 +110,6 @@ private:
size_t flags_ {0}; size_t flags_ {0};
}; };
} } } // namespace asio::ssl::mbedtls }
}
} // namespace asio::ssl::mbedtls

24
components/asio/port/mbedtls/include/mbedtls_context.hpp
View File

@ -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 // SPDX-License-Identifier: BSL-1.0
// //
@ -11,13 +11,13 @@
namespace asio { namespace asio {
namespace error { namespace error {
const asio::error_category& get_mbedtls_category(); const asio::error_category &get_mbedtls_category();
} // namespace error } // namespace error
namespace ssl { namespace ssl {
namespace mbedtls { namespace mbedtls {
void throw_alloc_failure(const char* location); void throw_alloc_failure(const char *location);
const char *error_message(int error_code); const char *error_message(int error_code);
@ -26,11 +26,10 @@ enum class container {
}; };
template <typename T, typename... Args> template <typename T, typename... Args>
inline T* create(const char * location, Args &&... args) inline T *create(const char *location, Args &&... args)
{ {
T* t = new (std::nothrow) T(std::forward<Args>(args)...); T *t = new (std::nothrow) T(std::forward<Args>(args)...);
if (t == nullptr) if (t == nullptr) {
{
throw_alloc_failure(location); throw_alloc_failure(location);
} }
return t; return t;
@ -80,11 +79,10 @@ public:
*/ */
class shared_ctx { class shared_ctx {
public: public:
static SSL_CTX *create(const char* location, context_base::method m) static SSL_CTX *create(const char *location, context_base::method m)
{ {
auto wrapped = asio::ssl::mbedtls::create<shared_ctx>(location, m); auto wrapped = asio::ssl::mbedtls::create<shared_ctx>(location, m);
if (wrapped->ctx_ == nullptr) if (wrapped->ctx_ == nullptr) {
{
throw_alloc_failure(location); throw_alloc_failure(location);
} }
return wrapped; return wrapped;
@ -96,10 +94,12 @@ public:
} }
explicit shared_ctx(context_base::method m) explicit shared_ctx(context_base::method m)
:ctx_(std::shared_ptr<context>(new (std::nothrow) context(m))) { } : ctx_(std::shared_ptr<context>(new (std::nothrow) context(m))) { }
private: private:
std::shared_ptr<mbedtls::context> ctx_; std::shared_ptr<mbedtls::context> ctx_;
}; };
} } } // namespace asio::ssl::mbedtls }
}
} // namespace asio::ssl::mbedtls

34
components/asio/port/mbedtls/include/mbedtls_engine.hpp
View File

@ -23,7 +23,7 @@ const char *error_message(int error_code)
return error_buf; return error_buf;
} }
void throw_alloc_failure(const char* location) void throw_alloc_failure(const char *location)
{ {
asio::error_code ec( MBEDTLS_ERR_SSL_ALLOC_FAILED, asio::error::get_mbedtls_category()); asio::error_code ec( MBEDTLS_ERR_SSL_ALLOC_FAILED, asio::error::get_mbedtls_category());
asio::detail::throw_error(ec, location); asio::detail::throw_error(ec, location);
@ -62,7 +62,7 @@ public:
verify_mode_ = mode; verify_mode_ = mode;
} }
bio* ext_bio() const bio *ext_bio() const
{ {
return bio_.second.get(); return bio_.second.get();
} }
@ -95,14 +95,14 @@ public:
int write(const void *buffer, int len) int write(const void *buffer, int len)
{ {
int ret = impl_.write(buffer, len); int ret = impl_.write(buffer, len);
state_ = ret == len ? IDLE: WRITING; state_ = ret == len ? IDLE : WRITING;
return ret; return ret;
} }
int read(void *buffer, int len) int read(void *buffer, int len)
{ {
int ret = impl_.read(buffer, len); int ret = impl_.read(buffer, len);
state_ = ret == len ? IDLE: READING; state_ = ret == len ? IDLE : READING;
return ret; return ret;
} }
@ -117,7 +117,7 @@ private:
static int bio_read(void *ctx, unsigned char *buf, size_t len) static int bio_read(void *ctx, unsigned char *buf, size_t len)
{ {
auto bio = static_cast<BIO*>(ctx); auto bio = static_cast<BIO *>(ctx);
int read = bio->read(buf, len); int read = bio->read(buf, len);
if (read <= 0 && bio->should_read()) { if (read <= 0 && bio->should_read()) {
return MBEDTLS_ERR_SSL_WANT_READ; return MBEDTLS_ERR_SSL_WANT_READ;
@ -127,7 +127,7 @@ private:
static int bio_write(void *ctx, const unsigned char *buf, size_t len) static int bio_write(void *ctx, const unsigned char *buf, size_t len)
{ {
auto bio = static_cast<BIO*>(ctx); auto bio = static_cast<BIO *>(ctx);
int written = bio->write(buf, len); int written = bio->write(buf, len);
if (written <= 0 && bio->should_write()) { if (written <= 0 && bio->should_write()) {
return MBEDTLS_ERR_SSL_WANT_WRITE; return MBEDTLS_ERR_SSL_WANT_WRITE;
@ -163,25 +163,27 @@ private:
{ {
int mode = MBEDTLS_SSL_VERIFY_UNSET; int mode = MBEDTLS_SSL_VERIFY_UNSET;
if (is_client_not_server) { if (is_client_not_server) {
if (verify_mode_ & SSL_VERIFY_PEER) if (verify_mode_ & SSL_VERIFY_PEER) {
mode = MBEDTLS_SSL_VERIFY_REQUIRED; mode = MBEDTLS_SSL_VERIFY_REQUIRED;
else if (verify_mode_ == SSL_VERIFY_NONE) } else if (verify_mode_ == SSL_VERIFY_NONE) {
mode = MBEDTLS_SSL_VERIFY_NONE; mode = MBEDTLS_SSL_VERIFY_NONE;
}
} else { } 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; mode = MBEDTLS_SSL_VERIFY_REQUIRED;
else if (verify_mode_ & SSL_VERIFY_PEER) } else if (verify_mode_ & SSL_VERIFY_PEER) {
mode = MBEDTLS_SSL_VERIFY_OPTIONAL; mode = MBEDTLS_SSL_VERIFY_OPTIONAL;
else if (verify_mode_ == SSL_VERIFY_NONE) } else if (verify_mode_ == SSL_VERIFY_NONE) {
mode = MBEDTLS_SSL_VERIFY_NONE; mode = MBEDTLS_SSL_VERIFY_NONE;
} }
}
return mode; return mode;
} }
struct impl { struct impl {
static void print_error(const char* function, int error_code) static void print_error(const char *function, int error_code)
{ {
constexpr const char *TAG="mbedtls-engine-impl"; constexpr const char *TAG = "mbedtls-engine-impl";
ESP_LOGE(TAG, "%s() returned -0x%04X", function, -error_code); ESP_LOGE(TAG, "%s() returned -0x%04X", function, -error_code);
ESP_LOGI(TAG, "-0x%04X: %s", -error_code, error_message(error_code)); ESP_LOGI(TAG, "-0x%04X: %s", -error_code, error_message(error_code));
} }
@ -230,7 +232,7 @@ private:
mbedtls_x509_crt_init(&public_cert_); mbedtls_x509_crt_init(&public_cert_);
mbedtls_pk_init(&pk_key_); mbedtls_pk_init(&pk_key_);
mbedtls_x509_crt_init(&ca_cert_); mbedtls_x509_crt_init(&ca_cert_);
int ret = mbedtls_ssl_config_defaults(&conf_, is_client_not_server ? MBEDTLS_SSL_IS_CLIENT: MBEDTLS_SSL_IS_SERVER, int ret = mbedtls_ssl_config_defaults(&conf_, is_client_not_server ? MBEDTLS_SSL_IS_CLIENT : MBEDTLS_SSL_IS_SERVER,
MBEDTLS_SSL_TRANSPORT_STREAM, MBEDTLS_SSL_PRESET_DEFAULT); MBEDTLS_SSL_TRANSPORT_STREAM, MBEDTLS_SSL_PRESET_DEFAULT);
if (ret) { if (ret) {
print_error("mbedtls_ssl_config_defaults", ret); print_error("mbedtls_ssl_config_defaults", ret);
@ -290,4 +292,6 @@ private:
asio::ssl::verify_mode verify_mode_; asio::ssl::verify_mode verify_mode_;
}; };
} } } // namespace asio::ssl::mbedtls }
}
} // namespace asio::ssl::mbedtls

19
components/asio/port/mbedtls/include/mbedtls_error.hpp
View File

@ -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 // SPDX-License-Identifier: BSL-1.0
// //
@ -14,30 +14,29 @@ namespace asio {
namespace error { namespace error {
namespace detail { namespace detail {
class mbedtls_category : public asio::error_category class mbedtls_category : public asio::error_category {
{
public: public:
const char* name() const ASIO_ERROR_CATEGORY_NOEXCEPT const char *name() const ASIO_ERROR_CATEGORY_NOEXCEPT
{ {
return "asio.ssl"; return "asio.ssl";
} }
std::string message(int value) const std::string message(int value) const
{ {
const char* s = asio::ssl::mbedtls::error_message(value); const char *s = asio::ssl::mbedtls::error_message(value);
return s ? s : "asio.mbedtls error"; return s ? s : "asio.mbedtls error";
} }
}; };
} // namespace detail } // namespace detail
const asio::error_category& get_mbedtls_category() const asio::error_category &get_mbedtls_category()
{ {
static detail::mbedtls_category instance; static detail::mbedtls_category instance;
return instance; return instance;
} }
const asio::error_category& get_ssl_category() const asio::error_category &get_ssl_category()
{ {
return asio::error::get_mbedtls_category(); return asio::error::get_mbedtls_category();
} }
@ -47,9 +46,11 @@ const asio::error_category& get_ssl_category()
namespace ssl { namespace ssl {
namespace error { namespace error {
const asio::error_category& get_stream_category() const asio::error_category &get_stream_category()
{ {
return asio::error::get_mbedtls_category(); return asio::error::get_mbedtls_category();
} }
} } } // namespace asio::ssl::error }
}
} // namespace asio::ssl::error

2
components/asio/port/mbedtls/include/openssl/conf.h
View File

@ -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 // SPDX-License-Identifier: BSL-1.0
// //

2
components/asio/port/mbedtls/include/openssl/dh.h
View File

@ -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 // SPDX-License-Identifier: BSL-1.0
// //

2
components/asio/port/mbedtls/include/openssl/err.h
View File

@ -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 // SPDX-License-Identifier: BSL-1.0
// //

2
components/asio/port/mbedtls/include/openssl/rsa.h
View File

@ -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 // SPDX-License-Identifier: BSL-1.0
// //

2
components/asio/port/mbedtls/include/openssl/ssl.h
View File

@ -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 // SPDX-License-Identifier: BSL-1.0
// //

2
components/asio/port/mbedtls/include/openssl/x509v3.h
View File

@ -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 // SPDX-License-Identifier: BSL-1.0
// //

22
components/asio/port/mbedtls/src/mbedtls_context.cpp
View File

@ -4,7 +4,7 @@
// //
// SPDX-License-Identifier: BSL-1.0 // 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" #include "asio/detail/config.hpp"
@ -28,13 +28,13 @@ context::context(context::method m)
set_options(no_compression); set_options(no_compression);
} }
context::context(context&& other) context::context(context &&other)
{ {
handle_ = other.handle_; handle_ = other.handle_;
other.handle_ = 0; other.handle_ = 0;
} }
context& context::operator=(context&& other) context &context::operator=(context &&other)
{ {
context tmp(ASIO_MOVE_CAST(context)(*this)); context tmp(ASIO_MOVE_CAST(context)(*this));
handle_ = other.handle_; handle_ = other.handle_;
@ -60,14 +60,14 @@ void context::set_options(context::options o)
} }
ASIO_SYNC_OP_VOID context::set_options( ASIO_SYNC_OP_VOID context::set_options(
context::options o, asio::error_code& ec) context::options o, asio::error_code &ec)
{ {
handle_->get()->options_ = o; handle_->get()->options_ = o;
ec = asio::error_code(); ec = asio::error_code();
ASIO_SYNC_OP_VOID_RETURN(ec); ASIO_SYNC_OP_VOID_RETURN(ec);
} }
void context::add_certificate_authority(const const_buffer& ca) void context::add_certificate_authority(const const_buffer &ca)
{ {
asio::error_code ec; asio::error_code ec;
add_certificate_authority(ca, ec); add_certificate_authority(ca, ec);
@ -75,13 +75,13 @@ void context::add_certificate_authority(const const_buffer& ca)
} }
ASIO_SYNC_OP_VOID context::add_certificate_authority( ASIO_SYNC_OP_VOID context::add_certificate_authority(
const const_buffer& ca, asio::error_code& ec) const const_buffer &ca, asio::error_code &ec)
{ {
handle_->get()->ca_cert_ = ca; handle_->get()->ca_cert_ = ca;
ASIO_SYNC_OP_VOID_RETURN(asio::error_code()); ASIO_SYNC_OP_VOID_RETURN(asio::error_code());
} }
void context::use_certificate_chain(const const_buffer& chain) void context::use_certificate_chain(const const_buffer &chain)
{ {
asio::error_code ec; asio::error_code ec;
use_certificate_chain(chain, ec); use_certificate_chain(chain, ec);
@ -89,14 +89,14 @@ void context::use_certificate_chain(const const_buffer& chain)
} }
ASIO_SYNC_OP_VOID context::use_certificate_chain( ASIO_SYNC_OP_VOID context::use_certificate_chain(
const const_buffer& chain, asio::error_code& ec) const const_buffer &chain, asio::error_code &ec)
{ {
handle_->get()->cert_chain_ = chain; handle_->get()->cert_chain_ = chain;
ASIO_SYNC_OP_VOID_RETURN(asio::error_code()); ASIO_SYNC_OP_VOID_RETURN(asio::error_code());
} }
void context::use_private_key( void context::use_private_key(
const const_buffer& private_key, context::file_format format) const const_buffer &private_key, context::file_format format)
{ {
asio::error_code ec; asio::error_code ec;
use_private_key(private_key, format, ec); use_private_key(private_key, format, ec);
@ -104,8 +104,8 @@ void context::use_private_key(
} }
ASIO_SYNC_OP_VOID context::use_private_key( ASIO_SYNC_OP_VOID context::use_private_key(
const const_buffer& private_key, context::file_format format, const const_buffer &private_key, context::file_format format,
asio::error_code& ec) asio::error_code &ec)
{ {
handle_->get()->private_key_ = private_key; handle_->get()->private_key_ = private_key;
ASIO_SYNC_OP_VOID_RETURN(asio::error_code()); ASIO_SYNC_OP_VOID_RETURN(asio::error_code());

85
components/asio/port/mbedtls/src/mbedtls_engine.cpp
View File

@ -3,7 +3,7 @@
// //
// SPDX-License-Identifier: BSL-1.0 // 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" #include "asio/detail/config.hpp"
@ -24,7 +24,7 @@ namespace ssl {
namespace detail { namespace detail {
engine::engine(SSL_CTX* context) engine::engine(SSL_CTX *context)
: ssl_(nullptr) : ssl_(nullptr)
{ {
ssl_ = mbedtls::create<mbedtls::engine>("mbedtls-engine", context->get()); ssl_ = mbedtls::create<mbedtls::engine>("mbedtls-engine", context->get());
@ -35,49 +35,47 @@ engine::~engine()
delete ssl_; delete ssl_;
} }
SSL* engine::native_handle() SSL *engine::native_handle()
{ {
return ssl_; return ssl_;
} }
asio::error_code engine::set_verify_mode( asio::error_code engine::set_verify_mode(
verify_mode v, asio::error_code& ec) verify_mode v, asio::error_code &ec)
{ {
ssl_->set_verify_mode(v); ssl_->set_verify_mode(v);
return {}; return {};
} }
engine::want engine::handshake( engine::want engine::handshake(
stream_base::handshake_type type, asio::error_code& ec) stream_base::handshake_type type, asio::error_code &ec)
{ {
return perform((type == asio::ssl::stream_base::client) return perform((type == asio::ssl::stream_base::client)
? &engine::do_connect : &engine::do_accept, 0, 0, ec, 0); ? &engine::do_connect : &engine::do_accept, 0, 0, ec, 0);
} }
engine::want engine::shutdown(asio::error_code& ec) engine::want engine::shutdown(asio::error_code &ec)
{ {
return perform(&engine::do_shutdown, 0, 0, ec, 0); return perform(&engine::do_shutdown, 0, 0, ec, 0);
} }
engine::want engine::write(const asio::const_buffer& data, engine::want engine::write(const asio::const_buffer &data,
asio::error_code& ec, std::size_t& bytes_transferred) asio::error_code &ec, std::size_t &bytes_transferred)
{ {
if (data.size() == 0) if (data.size() == 0) {
{
ec = asio::error_code(); ec = asio::error_code();
return engine::want_nothing; return engine::want_nothing;
} }
return perform(&engine::do_write, return perform(&engine::do_write,
const_cast<void*>(data.data()), const_cast<void *>(data.data()),
data.size(), ec, &bytes_transferred); data.size(), ec, &bytes_transferred);
} }
engine::want engine::read(const asio::mutable_buffer& data, engine::want engine::read(const asio::mutable_buffer &data,
asio::error_code& ec, std::size_t& bytes_transferred) asio::error_code &ec, std::size_t &bytes_transferred)
{ {
if (data.size() == 0) if (data.size() == 0) {
{
ec = asio::error_code(); ec = asio::error_code();
return engine::want_nothing; return engine::want_nothing;
} }
@ -87,7 +85,7 @@ engine::want engine::read(const asio::mutable_buffer& data,
} }
asio::mutable_buffer engine::get_output( asio::mutable_buffer engine::get_output(
const asio::mutable_buffer& data) const asio::mutable_buffer &data)
{ {
int length = ssl_->ext_bio()->read(data.data(), static_cast<int>(data.size())); int length = ssl_->ext_bio()->read(data.data(), static_cast<int>(data.size()));
@ -96,7 +94,7 @@ asio::mutable_buffer engine::get_output(
} }
asio::const_buffer engine::put_input( asio::const_buffer engine::put_input(
const asio::const_buffer& data) const asio::const_buffer &data)
{ {
int length = ssl_->ext_bio()->write(data.data(), static_cast<int>(data.size())); int length = ssl_->ext_bio()->write(data.data(), static_cast<int>(data.size()));
@ -104,23 +102,22 @@ asio::const_buffer engine::put_input(
(length > 0 ? static_cast<std::size_t>(length) : 0)); (length > 0 ? static_cast<std::size_t>(length) : 0));
} }
const asio::error_code& engine::map_error_code( const asio::error_code &engine::map_error_code(
asio::error_code& ec) const asio::error_code &ec) const
{ {
// We only want to map the error::eof code. // We only want to map the error::eof code.
if (ec != asio::error::eof) if (ec != asio::error::eof) {
return ec; return ec;
}
// If there's data yet to be read, it's an error. // 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; ec = asio::ssl::error::stream_truncated;
return ec; return ec;
} }
// Otherwise, the peer should have negotiated a proper shutdown. // Otherwise, the peer should have negotiated a proper shutdown.
if (ssl_->shutdown() != 0) if (ssl_->shutdown() != 0) {
{
ec = asio::ssl::error::stream_truncated; ec = asio::ssl::error::stream_truncated;
} }
@ -129,47 +126,39 @@ const asio::error_code& engine::map_error_code(
// This is a simplified implementation of a generic ssl io operation // This is a simplified implementation of a generic ssl io operation
// original implementation using openssl's SSL object is in asio/include/asio/ssl/detail/impl/engine.ipp // original implementation using openssl's SSL object is in asio/include/asio/ssl/detail/impl/engine.ipp
engine::want engine::perform(int (engine::* op)(void*, std::size_t), engine::want engine::perform(int (engine::* op)(void *, std::size_t),
void* data, std::size_t length, asio::error_code& ec, void *data, std::size_t length, asio::error_code &ec,
std::size_t* bytes_transferred) std::size_t *bytes_transferred)
{ {
std::size_t pending_output_before = ssl_->ext_bio()->ctrl_pending(); std::size_t pending_output_before = ssl_->ext_bio()->ctrl_pending();
int result = (this->*op)(data, length); int result = (this->*op)(data, length);
std::size_t pending_output_after = ssl_->ext_bio()->ctrl_pending(); 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()); ec = asio::error_code(result, asio::error::get_mbedtls_category());
return pending_output_after > pending_output_before ? want_output : want_nothing; return pending_output_after > pending_output_before ? want_output : want_nothing;
} }
if (result == 0) if (result == 0) {
{
return pending_output_after > pending_output_before return pending_output_after > pending_output_before
? want_output : want_nothing; ? want_output : want_nothing;
} }
if (result > 0 && bytes_transferred) if (result > 0 && bytes_transferred) {
*bytes_transferred = static_cast<std::size_t>(result); *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(); ec = asio::error_code();
return want_output_and_retry; 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(); ec = asio::error_code();
return result > 0 ? want_output : want_output_and_retry; 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(); ec = asio::error_code();
return want_input_and_retry; return want_input_and_retry;
} } else if (ssl_->get_state() == mbedtls::CLOSED) {
else if (ssl_->get_state() == mbedtls::CLOSED)
{
ec = asio::error::eof; ec = asio::error::eof;
return want_nothing; return want_nothing;
} }
@ -178,27 +167,27 @@ engine::want engine::perform(int (engine::* op)(void*, std::size_t),
return want_nothing; return want_nothing;
} }
int engine::do_accept(void*, std::size_t) int engine::do_accept(void *, std::size_t)
{ {
return ssl_->accept(); return ssl_->accept();
} }
int engine::do_connect(void*, std::size_t) int engine::do_connect(void *, std::size_t)
{ {
return ssl_->connect(); return ssl_->connect();
} }
int engine::do_shutdown(void*, std::size_t) int engine::do_shutdown(void *, std::size_t)
{ {
return ssl_->shutdown(); return ssl_->shutdown();
} }
int engine::do_read(void* data, std::size_t length) int engine::do_read(void *data, std::size_t length)
{ {
return ssl_->read(data, length < INT_MAX ? static_cast<int>(length) : INT_MAX); return ssl_->read(data, length < INT_MAX ? static_cast<int>(length) : INT_MAX);
} }
int engine::do_write(void* data, std::size_t length) int engine::do_write(void *data, std::size_t length)
{ {
return ssl_->write(data, length < INT_MAX ? static_cast<int>(length) : INT_MAX); return ssl_->write(data, length < INT_MAX ? static_cast<int>(length) : INT_MAX);
} }

6
components/asio/port/src/asio_ssl_impl.cpp
View File

@ -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 // 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; return nullptr;
} }
} } } // namespace asio::ssl::detail }
}
} // namespace asio::ssl::detail

1
components/esp_modem/docs/Doxyfile
View File

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

1
components/esp_modem/docs/advanced_api.rst
View File

@ -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 - Create the DTE which uses the custom Terminal
Please refer to the implementation of the existing UART DTE. Please refer to the implementation of the existing UART DTE.

12
components/esp_modem/docs/conf.py
View File

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

5
components/esp_modem/docs/internal_docs.rst
View File

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

25
components/esp_modem/examples/ap_to_pppos/main/ap_to_pppos.c
View File

@ -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 <string.h>
#include "esp_system.h" #include "esp_system.h"
@ -18,8 +19,8 @@
#include "freertos/event_groups.h" #include "freertos/event_groups.h"
#include "network_dce.h" #include "network_dce.h"
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0) #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
#include "esp_mac.h" #include "esp_mac.h"
#include "dhcpserver/dhcpserver.h" #include "dhcpserver/dhcpserver.h"
#endif #endif
#define EXAMPLE_ESP_WIFI_SSID CONFIG_ESP_WIFI_SSID #define EXAMPLE_ESP_WIFI_SSID CONFIG_ESP_WIFI_SSID
@ -77,15 +78,15 @@ static esp_err_t set_dhcps_dns(esp_netif_t *netif, uint32_t addr)
return ESP_OK; return ESP_OK;
} }
static void wifi_event_handler(void* arg, esp_event_base_t event_base, static void wifi_event_handler(void *arg, esp_event_base_t event_base,
int32_t event_id, void* event_data) int32_t event_id, void *event_data)
{ {
if (event_id == WIFI_EVENT_AP_STACONNECTED) { if (event_id == WIFI_EVENT_AP_STACONNECTED) {
wifi_event_ap_staconnected_t* event = (wifi_event_ap_staconnected_t*) event_data; wifi_event_ap_staconnected_t *event = (wifi_event_ap_staconnected_t *) event_data;
ESP_LOGI(TAG, "station "MACSTR" join, AID=%d", ESP_LOGI(TAG, "station "MACSTR" join, AID=%d",
MAC2STR(event->mac), event->aid); MAC2STR(event->mac), event->aid);
} else if (event_id == WIFI_EVENT_AP_STADISCONNECTED) { } else if (event_id == WIFI_EVENT_AP_STADISCONNECTED) {
wifi_event_ap_stadisconnected_t* event = (wifi_event_ap_stadisconnected_t*) event_data; wifi_event_ap_stadisconnected_t *event = (wifi_event_ap_stadisconnected_t *) event_data;
ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d", ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d",
MAC2STR(event->mac), event->aid); MAC2STR(event->mac), event->aid);
} }

13
components/esp_modem/examples/ap_to_pppos/main/network_dce.c
View File

@ -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> #include <string.h>

16
components/esp_modem/examples/ap_to_pppos/main/network_dce.cpp
View File

@ -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" #include "cxx_include/esp_modem_dte.hpp"
@ -92,8 +93,9 @@ public:
bool check_signal() bool check_signal()
{ {
int rssi, ber; 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 false;
}
return rssi != 99 && rssi > 5; return rssi != 99 && rssi > 5;
} }

13
components/esp_modem/examples/ap_to_pppos/main/network_dce.h
View File

@ -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 #pragma once

5
components/esp_modem/examples/linux_modem/main/modem_main.cpp
View File

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

1
components/esp_modem/examples/modem_console/Makefile
View File

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

13
components/esp_modem/examples/modem_console/main/console_helper.cpp
View File

@ -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" #include "console_helper.hpp"

13
components/esp_modem/examples/modem_console/main/console_helper.hpp
View File

@ -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 #pragma once

18
components/esp_modem/examples/modem_console/main/httpget_handle.c
View File

@ -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> #include <stdio.h>
@ -19,7 +21,7 @@ static const char *TAG = "modem_console_httpget";
static esp_err_t http_event_handler(esp_http_client_event_t *evt) static esp_err_t http_event_handler(esp_http_client_event_t *evt)
{ {
switch(evt->event_id) { switch (evt->event_id) {
case HTTP_EVENT_ERROR: case HTTP_EVENT_ERROR:
ESP_LOGD(TAG, "HTTP_EVENT_ERROR"); ESP_LOGD(TAG, "HTTP_EVENT_ERROR");
break; break;
@ -76,7 +78,7 @@ static int do_http_client(int argc, char **argv)
if (http_args.hex->count > 0) { if (http_args.hex->count > 0) {
// show hex data from http-get // show hex data from http-get
config.user_data = (void*)true; config.user_data = (void *)true;
} }

13
components/esp_modem/examples/modem_console/main/modem_console_main.cpp
View File

@ -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> #include <cstdio>

13
components/esp_modem/examples/modem_console/main/my_module_dce.hpp
View File

@ -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 #pragma once

14
components/esp_modem/examples/modem_console/main/ping_handle.c
View File

@ -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> #include <stdio.h>

2
components/esp_modem/examples/pppos_client/CMakeLists.txt
View File

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

7
components/esp_modem/examples/pppos_client/main/pppos_client_main.c
View File

@ -1,3 +1,8 @@
/*
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Unlicense OR CC0-1.0
*/
/* PPPoS Client Example /* PPPoS Client Example
This example code is in the Public Domain (or CC0 licensed, at your option.) This example code is in the Public Domain (or CC0 licensed, at your option.)
@ -273,7 +278,7 @@ void app_main(void)
ESP_LOGI(TAG, "USB demo finished. Disconnect and connect the modem to run it again"); ESP_LOGI(TAG, "USB demo finished. Disconnect and connect the modem to run it again");
xEventGroupWaitBits(event_group, USB_DISCONNECTED_BIT, pdFALSE, pdFALSE, portMAX_DELAY); xEventGroupWaitBits(event_group, USB_DISCONNECTED_BIT, pdFALSE, pdFALSE, portMAX_DELAY);
CHECK_USB_DISCONNECTION(event_group); // dce will be destroyed here CHECK_USB_DISCONNECTION(event_group); // dce will be destroyed here
} // while (1) } // while (1)
#else #else
// UART DTE clean-up // UART DTE clean-up
esp_modem_destroy(dce); esp_modem_destroy(dce);

2
components/esp_modem/examples/simple_cmux_client/CMakeLists.txt
View File

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

8
components/esp_modem/examples/simple_cmux_client/main/simple_cmux_client_main.cpp
View File

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

13
components/esp_modem/examples/simple_cmux_client/main/simple_mqtt_client.cpp
View File

@ -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> #include <memory>

13
components/esp_modem/examples/simple_cmux_client/main/simple_mqtt_client.hpp
View File

@ -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 #pragma once

18
components/esp_modem/include/cxx_include/esp_modem_api.hpp
View File

@ -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 #pragma once

31
components/esp_modem/include/cxx_include/esp_modem_buffer.hpp
View File

@ -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 #pragma once
@ -22,15 +14,15 @@ namespace esp_modem {
*/ */
struct unique_buffer { struct unique_buffer {
explicit unique_buffer(size_t size); explicit unique_buffer(size_t size);
unique_buffer (unique_buffer const&) = delete; unique_buffer (unique_buffer const &) = delete;
unique_buffer& operator=(unique_buffer const&) = delete; unique_buffer &operator=(unique_buffer const &) = delete;
unique_buffer(unique_buffer&& other) noexcept unique_buffer(unique_buffer &&other) noexcept
{ {
data = std::move(other.data); data = std::move(other.data);
size = other.size; size = other.size;
consumed = 0; consumed = 0;
} }
unique_buffer& operator=(unique_buffer&& other) noexcept unique_buffer &operator=(unique_buffer &&other) noexcept
{ {
if (&other == this) { if (&other == this) {
return *this; return *this;
@ -40,7 +32,10 @@ struct unique_buffer {
consumed = 0; consumed = 0;
return *this; return *this;
} }
[[nodiscard]] uint8_t *get() const { return data.get(); } [[nodiscard]] uint8_t *get() const
{
return data.get();
}
std::unique_ptr<uint8_t[]> data; std::unique_ptr<uint8_t[]> data;
size_t size{}; size_t size{};

20
components/esp_modem/include/cxx_include/esp_modem_cmux.hpp
View File

@ -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 #pragma once
@ -55,7 +47,7 @@ class CMuxInstance;
*/ */
class CMux { class CMux {
public: public:
explicit CMux(std::shared_ptr<Terminal> t, unique_buffer&& b): explicit CMux(std::shared_ptr<Terminal> t, unique_buffer &&b):
term(std::move(t)), payload_start(nullptr), total_payload_size(0), buffer(std::move(b)) {} term(std::move(t)), payload_start(nullptr), total_payload_size(0), buffer(std::move(b)) {}
~CMux() = default; ~CMux() = default;

20
components/esp_modem/include/cxx_include/esp_modem_command_library.hpp
View File

@ -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 #pragma once
@ -47,7 +39,7 @@ command_result get_battery_status_sim7xxx(CommandableIf *t, int &voltage, int &b
command_result set_gnss_power_mode_sim76xx(CommandableIf *t, int mode); command_result set_gnss_power_mode_sim76xx(CommandableIf *t, int mode);
command_result power_down_sim76xx(CommandableIf *t); command_result power_down_sim76xx(CommandableIf *t);
command_result power_down_sim70xx(CommandableIf *t); command_result power_down_sim70xx(CommandableIf *t);
command_result set_network_bands_sim76xx(CommandableIf *t, const std::string& mode, const int* bands, int size); command_result set_network_bands_sim76xx(CommandableIf *t, const std::string &mode, const int *bands, int size);
command_result power_down_sim8xx(CommandableIf *t); command_result power_down_sim8xx(CommandableIf *t);
command_result set_data_mode_sim8xx(CommandableIf *t); command_result set_data_mode_sim8xx(CommandableIf *t);

18
components/esp_modem/include/cxx_include/esp_modem_dce.hpp
View File

@ -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 #pragma once

18
components/esp_modem/include/cxx_include/esp_modem_dce_factory.hpp
View File

@ -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 #pragma once
#include "esp_log.h" #include "esp_log.h"

28
components/esp_modem/include/cxx_include/esp_modem_dce_module.hpp
View File

@ -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 #pragma once
@ -82,11 +74,13 @@ public:
Task::Delay(1000); // Mandatory 1s pause before Task::Delay(1000); // Mandatory 1s pause before
int retry = 0; int retry = 0;
while (retry++ < 3) { while (retry++ < 3) {
if (set_command_mode() == command_result::OK) if (set_command_mode() == command_result::OK) {
return true; return true;
}
Task::Delay(1000); // Mandatory 1s pause after escape Task::Delay(1000); // Mandatory 1s pause after escape
if (sync() == command_result::OK) if (sync() == command_result::OK) {
return true; return true;
}
Task::Delay(1000); // Mandatory 1s pause before escape Task::Delay(1000); // Mandatory 1s pause before escape
} }
return false; return false;
@ -107,7 +101,7 @@ public:
/** /**
* @brief Simplified version of operator name (without the ACT, which is included in the command library) * @brief Simplified version of operator name (without the ACT, which is included in the command library)
*/ */
command_result get_operator_name(std::string& name) command_result get_operator_name(std::string &name)
{ {
int dummy_act; int dummy_act;
return get_operator_name(name, dummy_act); return get_operator_name(name, dummy_act);
@ -140,7 +134,7 @@ public:
command_result get_battery_status(int &voltage, int &bcs, int &bcl) override; command_result get_battery_status(int &voltage, int &bcs, int &bcl) override;
command_result power_down() override; command_result power_down() override;
command_result set_gnss_power_mode(int mode) override; command_result set_gnss_power_mode(int mode) override;
command_result set_network_bands(const std::string& mode, const int* bands, int size) override; command_result set_network_bands(const std::string &mode, const int *bands, int size) override;
}; };
/** /**

28
components/esp_modem/include/cxx_include/esp_modem_dte.hpp
View File

@ -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 #pragma once
@ -106,8 +98,14 @@ protected:
/** /**
* @brief Allows for locking the DTE * @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 */ friend class Scoped<DTE>; /*!< Declaring "Scoped<DTE> lock(dte)" locks this instance */
private: private:
static const size_t GOT_LINE = SignalGroup::bit0; /*!< Bit indicating response available */ static const size_t GOT_LINE = SignalGroup::bit0; /*!< Bit indicating response available */

41
components/esp_modem/include/cxx_include/esp_modem_exception.hpp
View File

@ -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 #pragma once
@ -51,35 +43,44 @@ private:
#define ESP_MODEM_THROW(exception) do { exception; abort(); } while(0) #define ESP_MODEM_THROW(exception) do { exception; abort(); } while(0)
class esp_err_exception { 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: 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 #endif
static inline std::string make_message(const std::string& filename, int line, const std::string& message = "ERROR") static inline std::string make_message(const std::string &filename, int line, const std::string &message = "ERROR")
{ {
std::string text = filename + ":" + std::to_string(line) + " " + message; std::string text = filename + ":" + std::to_string(line) + " " + message;
return text; return text;
} }
static inline void throw_if_false(const std::string& filename, int line, bool condition, const std::string& message) static inline void throw_if_false(const std::string &filename, int line, bool condition, const std::string &message)
{ {
if (!condition) { if (!condition) {
ESP_MODEM_THROW(esp_err_exception(make_message(filename, line, message))); ESP_MODEM_THROW(esp_err_exception(make_message(filename, line, message)));
} }
} }
static inline void throw_if_error(const std::string& filename, int line, esp_err_t err, const std::string& message) static inline void throw_if_error(const std::string &filename, int line, esp_err_t err, const std::string &message)
{ {
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_MODEM_THROW(esp_err_exception(make_message(filename, line, message), err)); ESP_MODEM_THROW(esp_err_exception(make_message(filename, line, message), err));
} }
} }
static inline void throw_if_error(const std::string& filename, int line, esp_err_t err) static inline void throw_if_error(const std::string &filename, int line, esp_err_t err)
{ {
if (err != ESP_OK) { if (err != ESP_OK) {
ESP_MODEM_THROW(esp_err_exception(make_message(filename, line), err)); ESP_MODEM_THROW(esp_err_exception(make_message(filename, line), err));

18
components/esp_modem/include/cxx_include/esp_modem_netif.hpp
View File

@ -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 #pragma once

18
components/esp_modem/include/cxx_include/esp_modem_primitives.hpp
View File

@ -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 #pragma once

18
components/esp_modem/include/cxx_include/esp_modem_terminal.hpp
View File

@ -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 #pragma once

34
components/esp_modem/include/cxx_include/esp_modem_types.hpp
View File

@ -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 #pragma once
@ -68,10 +60,10 @@ struct PdpContext {
class CommandableIf { class CommandableIf {
public: public:
CommandableIf() = default; CommandableIf() = default;
CommandableIf(const CommandableIf&) = delete; CommandableIf(const CommandableIf &) = delete;
CommandableIf& operator=(const CommandableIf&) = delete; CommandableIf &operator=(const CommandableIf &) = delete;
CommandableIf(CommandableIf&&) = delete; CommandableIf(CommandableIf &&) = delete;
CommandableIf& operator=(CommandableIf&&) = delete; CommandableIf &operator=(CommandableIf &&) = delete;
virtual ~CommandableIf() = default; virtual ~CommandableIf() = default;
/** /**
* @brief Sends custom AT command * @brief Sends custom AT command
@ -90,10 +82,10 @@ public:
class ModuleIf { class ModuleIf {
public: public:
ModuleIf() = default; ModuleIf() = default;
ModuleIf(const ModuleIf&) = delete; ModuleIf(const ModuleIf &) = delete;
ModuleIf& operator=(const ModuleIf&) = delete; ModuleIf &operator=(const ModuleIf &) = delete;
ModuleIf(ModuleIf&&) = delete; ModuleIf(ModuleIf &&) = delete;
ModuleIf& operator=(ModuleIf&&) = delete; ModuleIf &operator=(ModuleIf &&) = delete;
virtual ~ModuleIf() = default; virtual ~ModuleIf() = default;
/** /**
* @brief Sets the data mode up (provides the necessary configuration to connect to the cellular network) * @brief Sets the data mode up (provides the necessary configuration to connect to the cellular network)

20
components/esp_modem/include/esp_modem_api.h
View File

@ -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 #pragma once
@ -26,7 +18,7 @@ extern "C" {
#define ESP_MODEM_DECLARE_DCE_COMMAND(name, return_type, num, ...) \ #define ESP_MODEM_DECLARE_DCE_COMMAND(name, return_type, num, ...) \
esp_err_t esp_modem_ ## name(esp_modem_dce_t *dce, ##__VA_ARGS__); esp_err_t esp_modem_ ## name(esp_modem_dce_t *dce, ##__VA_ARGS__);
DECLARE_ALL_COMMAND_APIS(declares esp_modem_<API>(esp_modem_t * dce, ...);) DECLARE_ALL_COMMAND_APIS(declares esp_modem_<API>(esp_modem_t *dce, ...);)
#undef ESP_MODEM_DECLARE_DCE_COMMAND #undef ESP_MODEM_DECLARE_DCE_COMMAND

33
components/esp_modem/include/esp_modem_c_api_types.h
View File

@ -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 #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 * @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_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_DATA, /**< Used for switching to PPP mode for the modem to connect to a network */
ESP_MODEM_MODE_CMUX, /**< Multiplexed terminal mode */ 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 * @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_GENETIC, /**< The most generic device */
ESP_MODEM_DCE_SIM7600, ESP_MODEM_DCE_SIM7600,
ESP_MODEM_DCE_SIM7070, ESP_MODEM_DCE_SIM7070,
@ -63,8 +53,7 @@ typedef enum esp_modem_dce_device
/** /**
* @brief Terminal errors * @brief Terminal errors
*/ */
typedef enum esp_modem_terminal_error typedef enum esp_modem_terminal_error {
{
ESP_MODEM_TERMINAL_BUFFER_OVERFLOW, ESP_MODEM_TERMINAL_BUFFER_OVERFLOW,
ESP_MODEM_TERMINAL_CHECKSUM_ERROR, ESP_MODEM_TERMINAL_CHECKSUM_ERROR,
ESP_MODEM_TERMINAL_UNEXPECTED_CONTROL_FLOW, ESP_MODEM_TERMINAL_UNEXPECTED_CONTROL_FLOW,
@ -105,7 +94,7 @@ esp_modem_dce_t *esp_modem_new_dev(esp_modem_dce_device_t module, const esp_mode
* *
* @param dce DCE to destroy * @param dce DCE to destroy
*/ */
void esp_modem_destroy(esp_modem_dce_t * dce); void esp_modem_destroy(esp_modem_dce_t *dce);
/** /**
* @brief Set DTE's error callback * @brief Set DTE's error callback
@ -114,7 +103,7 @@ void esp_modem_destroy(esp_modem_dce_t * dce);
* @param[in] err_cb Error callback * @param[in] err_cb Error callback
* @return ESP_OK on success, ESP_FAIL on failure * @return ESP_OK on success, ESP_FAIL on failure
*/ */
esp_err_t esp_modem_set_error_cb(esp_modem_dce_t * dce, esp_modem_terminal_error_cbt err_cb); esp_err_t esp_modem_set_error_cb(esp_modem_dce_t *dce, esp_modem_terminal_error_cbt err_cb);
/** /**
* @brief Set operation mode for this DCE * @brief Set operation mode for this DCE
@ -122,7 +111,7 @@ esp_err_t esp_modem_set_error_cb(esp_modem_dce_t * dce, esp_modem_terminal_error
* @param mode Desired MODE * @param mode Desired MODE
* @return ESP_OK on success, ESP_FAIL on failure * @return ESP_OK on success, ESP_FAIL on failure
*/ */
esp_err_t esp_modem_set_mode(esp_modem_dce_t * dce, esp_modem_dce_mode_t mode); esp_err_t esp_modem_set_mode(esp_modem_dce_t *dce, esp_modem_dce_mode_t mode);
/** /**
* @} * @}

20
components/esp_modem/include/esp_modem_config.h
View File

@ -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 #pragma once
@ -70,7 +62,7 @@ struct esp_modem_vfs_resource;
*/ */
struct esp_modem_vfs_term_config { struct esp_modem_vfs_term_config {
int fd; /*!< Already created file descriptor */ int fd; /*!< Already created file descriptor */
void (*deleter)(int, struct esp_modem_vfs_resource*); /*!< Custom close function for the fd */ void (*deleter)(int, struct esp_modem_vfs_resource *); /*!< Custom close function for the fd */
struct esp_modem_vfs_resource *resource; /*!< Resource attached to the VFS (need for clenaup) */ struct esp_modem_vfs_resource *resource; /*!< Resource attached to the VFS (need for clenaup) */
}; };

20
components/esp_modem/include/esp_modem_dce_config.h
View File

@ -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 #pragma once
@ -37,7 +29,7 @@ typedef struct esp_modem_dce_config esp_modem_dce_config_t;
* @brief DCE configuration structure * @brief DCE configuration structure
*/ */
struct esp_modem_dce_config { struct esp_modem_dce_config {
const char* apn; /*!< APN: Logical name of the Access point */ const char *apn; /*!< APN: Logical name of the Access point */
}; };
/** /**

18
components/esp_modem/include/esp_private/c_api_wrapper.hpp
View File

@ -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 * @file c_api_wrapper.hpp

2
components/esp_modem/include/generate/esp_modem_command_declare.inc
View File

@ -324,7 +324,7 @@ public:
#define ESP_MODEM_DECLARE_DCE_COMMAND(name, return_type, TEMPLATE_ARG, ...) return_type esp_modem_ ## name (__VA_ARGS__); #define ESP_MODEM_DECLARE_DCE_COMMAND(name, return_type, TEMPLATE_ARG, ...) return_type esp_modem_ ## name (__VA_ARGS__);
#endif #endif
DECLARE_ALL_COMMAND_APIS() DECLARE_ALL_COMMAND_APIS()
#ifdef __cplusplus #ifdef __cplusplus
}; };

18
components/esp_modem/include/vfs_resource/vfs_create.hpp
View File

@ -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 #pragma once

8
components/esp_modem/port/linux/esp_event_mock/esp_event_mock.c
View File

@ -14,15 +14,15 @@
#include "esp_err.h" #include "esp_err.h"
#include "esp_event.h" #include "esp_event.h"
const char * WIFI_EVENT = "WIFI_EVENT"; const char *WIFI_EVENT = "WIFI_EVENT";
const char * IP_EVENT = "IP_EVENT"; const char *IP_EVENT = "IP_EVENT";
esp_err_t esp_event_handler_register(const char * event_base, int32_t event_id, void* event_handler, void* event_handler_arg) esp_err_t esp_event_handler_register(const char *event_base, int32_t event_id, void *event_handler, void *event_handler_arg)
{ {
return ESP_OK; return ESP_OK;
} }
esp_err_t esp_event_handler_unregister(const char * event_base, int32_t event_id, void* event_handler) esp_err_t esp_event_handler_unregister(const char *event_base, int32_t event_id, void *event_handler)
{ {
return ESP_OK; return ESP_OK;
} }

12
components/esp_modem/port/linux/esp_event_mock/include/esp_event.h
View File

@ -18,10 +18,10 @@
#include "esp_err.h" #include "esp_err.h"
typedef void * system_event_t; typedef void *system_event_t;
extern const char * WIFI_EVENT; extern const char *WIFI_EVENT;
extern const char * IP_EVENT; extern const char *IP_EVENT;
#define ESP_EVENT_ANY_BASE NULL /**< register handler for any event base */ #define ESP_EVENT_ANY_BASE NULL /**< register handler for any event base */
#define ESP_EVENT_ANY_ID -1 /**< register handler for any event id */ #define ESP_EVENT_ANY_ID -1 /**< register handler for any event id */
@ -33,8 +33,8 @@ typedef struct {
int ip_index; /*!< IPv6 address index */ int ip_index; /*!< IPv6 address index */
} ip_event_got_ip6_t; } ip_event_got_ip6_t;
esp_err_t esp_event_handler_register(const char * event_base, int32_t event_id, void* event_handler, void* event_handler_arg); esp_err_t esp_event_handler_register(const char *event_base, int32_t event_id, void *event_handler, void *event_handler_arg);
esp_err_t esp_event_handler_unregister(const char * event_base, int32_t event_id, void* event_handler); esp_err_t esp_event_handler_unregister(const char *event_base, int32_t event_id, void *event_handler);
typedef void * QueueHandle_t; typedef void *QueueHandle_t;

3
components/esp_modem/port/linux/esp_event_mock/include/esp_event_base.h
View File

@ -22,5 +22,4 @@ typedef enum {
IP_EVENT_GOT_IP6 IP_EVENT_GOT_IP6
} mdns_used_event_t; } mdns_used_event_t;
typedef void * esp_event_base_t; typedef void *esp_event_base_t;

1
components/esp_modem/port/linux/esp_netif_linux/CMakeLists.txt
View File

@ -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} INCLUDE_DIRS include ${LWIP_INCLUDE_DIRS}
PRIV_INCLUDE_DIRS . PRIV_INCLUDE_DIRS .
REQUIRES esp_system_protocols_linux) REQUIRES esp_system_protocols_linux)

4
components/esp_modem/port/linux/esp_netif_linux/include/esp_netif.h
View File

@ -39,8 +39,8 @@ struct esp_netif_driver_ifconfig {
}; };
struct esp_netif_config { struct esp_netif_config {
const char * dev_name; /**< Name of the file device */ const char *dev_name; /**< Name of the file device */
const char * if_name; /**< Network interface name */ const char *if_name; /**< Network interface name */
}; };
struct esp_netif_obj { struct esp_netif_obj {

2
components/esp_modem/port/linux/esp_netif_linux/include/esp_netif_ip_addr.h
View File

@ -158,7 +158,7 @@ typedef struct {
* *
* @return IPv6 type in form of enum esp_ip6_addr_type_t * @return IPv6 type in form of enum esp_ip6_addr_type_t
*/ */
esp_ip6_addr_type_t esp_netif_ip6_get_addr_type(esp_ip6_addr_t* ip6_addr); esp_ip6_addr_type_t esp_netif_ip6_get_addr_type(esp_ip6_addr_t *ip6_addr);
#ifdef __cplusplus #ifdef __cplusplus
} }

12
components/esp_modem/port/linux/esp_netif_linux/ip4_stub.c
View File

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

20
components/esp_modem/port/linux/esp_netif_linux/ip6_stub.c
View File

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

14
components/esp_modem/port/linux/esp_netif_linux/tun_io.c
View File

@ -23,9 +23,8 @@ static void ppp_link_status_cb(ppp_pcb *pcb, int err_code, void *ctx)
struct netif *pppif = ppp_netif(pcb); struct netif *pppif = ppp_netif(pcb);
LWIP_UNUSED_ARG(ctx); LWIP_UNUSED_ARG(ctx);
switch(err_code) { switch (err_code) {
case PPPERR_NONE: /* No error. */ case PPPERR_NONE: { /* No error. */
{
#if LWIP_DNS #if LWIP_DNS
const ip_addr_t *ns; const ip_addr_t *ns;
#endif /* LWIP_DNS */ #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) 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; esp_netif_t *netif = (esp_netif_t *)ctx;
if (netif->transmit) if (netif->transmit) {
return netif->transmit(netif->ctx, (uint8_t*)data, len); return netif->transmit(netif->ctx, (uint8_t *)data, len);
}
return 0; return 0;
} }
@ -131,7 +131,7 @@ int ppp_netif_init(esp_netif_t *netif)
sys_timeouts_init(); sys_timeouts_init();
// init and start connection attempts on PPP interface // init and start connection attempts on PPP interface
ppp = pppos_create(&pppos_netif, ppp_output_cb, ppp_link_status_cb, (void*)netif); ppp = pppos_create(&pppos_netif, ppp_output_cb, ppp_link_status_cb, (void *)netif);
if (ppp == NULL) { if (ppp == NULL) {
return 0; return 0;
} }
@ -175,7 +175,7 @@ int tun_read(void)
FD_SET(esp_netif->fd, &fds); FD_SET(esp_netif->fd, &fds);
struct timeval tv = { .tv_usec = 0, .tv_sec = 1 }; struct timeval tv = { .tv_usec = 0, .tv_sec = 1 };
if (select(esp_netif->fd +1, &fds, NULL, NULL, &tv) <= 0) { if (select(esp_netif->fd + 1, &fds, NULL, NULL, &tv) <= 0) {
sys_check_timeouts(); sys_check_timeouts();
return 0; return 0;
} }

1
components/esp_modem/port/linux/esp_system_protocols_linux/include/esp_log.h
View File

@ -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) printf(LOG_COLOR_D); printf("(%s) ", TAG); printf(__VA_ARGS__); printf(LOG_RESET_COLOR "\n"); } while(0)
#define ESP_LOGV(TAG, ...) do { \ #define ESP_LOGV(TAG, ...) do { \
printf(LOG_COLOR_V); printf("(%s) ", TAG); printf(__VA_ARGS__); printf(LOG_RESET_COLOR "\n"); } while(0) printf(LOG_COLOR_V); printf("(%s) ", TAG); printf(__VA_ARGS__); printf(LOG_RESET_COLOR "\n"); } while(0)

1
components/esp_modem/port/linux/esp_system_protocols_linux/include/machine/endian.h
View File

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

18
components/esp_modem/private_include/exception_stub.hpp
View File

@ -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 #pragma once

22
components/esp_modem/private_include/uart_compat.h
View File

@ -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 #pragma once
@ -22,12 +14,12 @@
* @brief This is a compatible header, which just takes care of different data ptr type * @brief This is a compatible header, which just takes care of different data ptr type
* across different IDF version in driver/uart * across different IDF version in driver/uart
*/ */
static inline int uart_write_bytes_compat(uart_port_t uart_num, const void* src, size_t size) static inline int uart_write_bytes_compat(uart_port_t uart_num, const void *src, size_t size)
{ {
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0) #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0)
const void *data = src; const void *data = src;
#else #else
auto *data = reinterpret_cast<const char*>(src); auto *data = reinterpret_cast<const char *>(src);
#endif #endif
return uart_write_bytes(uart_num, data, size); return uart_write_bytes(uart_num, data, size);
} }

18
components/esp_modem/private_include/uart_resource.hpp
View File

@ -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 #pragma once

19
components/esp_modem/private_include/uart_terminal.hpp
View File

@ -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 #pragma once
@ -23,4 +15,3 @@ namespace esp_modem {
std::unique_ptr<Terminal> create_uart_terminal(const esp_modem_dte_config *config); std::unique_ptr<Terminal> create_uart_terminal(const esp_modem_dte_config *config);
} // namespace esp_modem } // namespace esp_modem

18
components/esp_modem/private_include/vfs_termial.hpp
View File

@ -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 #pragma once

18
components/esp_modem/src/esp_modem_api.cpp
View File

@ -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 <cassert>
#include "esp_log.h" #include "esp_log.h"

18
components/esp_modem/src/esp_modem_api_target.cpp
View File

@ -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 <cassert>
#include "esp_log.h" #include "esp_log.h"

26
components/esp_modem/src/esp_modem_c_api.cpp
View File

@ -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 <cassert>
#include "cxx_include/esp_modem_dte.hpp" #include "cxx_include/esp_modem_dte.hpp"
@ -72,7 +64,7 @@ extern "C" void esp_modem_destroy(esp_modem_dce_t *dce_wrap)
} }
} }
extern "C" esp_err_t esp_modem_set_error_cb(esp_modem_dce_t * dce_wrap, esp_modem_terminal_error_cbt err_cb) extern "C" esp_err_t esp_modem_set_error_cb(esp_modem_dce_t *dce_wrap, esp_modem_terminal_error_cbt err_cb)
{ {
if (dce_wrap == nullptr || dce_wrap->dce == nullptr || dce_wrap->dte == nullptr) { if (dce_wrap == nullptr || dce_wrap->dce == nullptr || dce_wrap->dte == nullptr) {
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
@ -274,7 +266,7 @@ extern "C" esp_err_t esp_modem_power_down(esp_modem_dce_t *dce_wrap)
return command_response_to_esp_err(dce_wrap->dce->power_down()); return command_response_to_esp_err(dce_wrap->dce->power_down());
} }
extern "C" esp_err_t esp_modem_set_operator(esp_modem_dce_t *dce_wrap, int mode, int format, const char* oper) extern "C" esp_err_t esp_modem_set_operator(esp_modem_dce_t *dce_wrap, int mode, int format, const char *oper)
{ {
if (dce_wrap == nullptr || dce_wrap->dce == nullptr) { if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
@ -341,7 +333,7 @@ extern "C" esp_err_t esp_modem_set_preferred_mode(esp_modem_dce_t *dce_wrap, int
return command_response_to_esp_err(dce_wrap->dce->set_preferred_mode(mode)); return command_response_to_esp_err(dce_wrap->dce->set_preferred_mode(mode));
} }
extern "C" esp_err_t esp_modem_set_network_bands(esp_modem_dce_t *dce_wrap, const char* mode, const int* bands, int size) extern "C" esp_err_t esp_modem_set_network_bands(esp_modem_dce_t *dce_wrap, const char *mode, const int *bands, int size)
{ {
if (dce_wrap == nullptr || dce_wrap->dce == nullptr) { if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
@ -350,7 +342,7 @@ extern "C" esp_err_t esp_modem_set_network_bands(esp_modem_dce_t *dce_wrap, cons
return command_response_to_esp_err(dce_wrap->dce->set_network_bands(mode, bands, size)); return command_response_to_esp_err(dce_wrap->dce->set_network_bands(mode, bands, size));
} }
extern "C" esp_err_t esp_modem_get_network_system_mode(esp_modem_dce_t *dce_wrap, int* p_mode) extern "C" esp_err_t esp_modem_get_network_system_mode(esp_modem_dce_t *dce_wrap, int *p_mode)
{ {
if (dce_wrap == nullptr || dce_wrap->dce == nullptr) { if (dce_wrap == nullptr || dce_wrap->dce == nullptr) {
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;

Some files were not shown because too many files have changed in this diff Show More