Skip to content

Commit 7772709

Browse files
committed
⬆️ Update sh2lib to latest HEAD from idf-extra-components
1 parent e8c59f4 commit 7772709

File tree

7 files changed

+674
-450
lines changed

7 files changed

+674
-450
lines changed

requests/src/request_manager.cpp

Lines changed: 33 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
#include <cstdlib>
2121
#include <cstring>
2222

23+
#ifdef REQUESTS_USE_SH2LIB
2324
#include <http_parser.h>
25+
#endif // REQUESTS_USE_SH2LIB
2426

2527
#include "esp_log.h"
2628

@@ -85,8 +87,6 @@ auto data_recv_cb(sh2lib_handle *handle, const char* data, size_t len, int flags
8587
auto data_send_cb(sh2lib_handle* handle, char* buf, size_t len, uint32_t* data_flags)
8688
-> int;
8789

88-
sh2lib_callbacks callbacks{data_send_cb, header_recv_cb, data_recv_cb};
89-
9090
// Implementation:
9191
auto data_recv_cb(sh2lib_handle *handle, const char* data, size_t len, int flags)
9292
-> int
@@ -113,8 +113,6 @@ auto data_send_cb(sh2lib_handle* handle, char* buf, size_t len, uint32_t* data_f
113113
{
114114
auto* userdata = handle->userdata;
115115

116-
int retval = 0;
117-
118116
auto send_chunk = static_cast<RequestHandler*>(userdata)->read_callback(len);
119117
if (not send_chunk.empty())
120118
{
@@ -211,15 +209,23 @@ auto RequestManager::fetch(
211209
// Only create a new request intent if an old one is not found
212210
if (existing_handler == requests.end())
213211
{
212+
#ifdef REQUESTS_USE_SH2LIB
213+
HandleImpl* _handle = new HandleImpl;
214+
_handle->hd = static_cast<sh2lib_handle*>(malloc(sizeof(sh2lib_handle)));
215+
#endif
214216
const auto& inserted = requests.emplace(
215217
std::move(HandleImplPtr{
216218
#ifdef REQUESTS_USE_CURL
217219
curl_easy_init(),
218220
curl_easy_cleanup
219221
#endif // REQUESTS_USE_CURL
220222
#ifdef REQUESTS_USE_SH2LIB
221-
new sh2lib_handle,
222-
sh2lib_free
223+
_handle,
224+
[](HandleImpl* handle)
225+
{
226+
sh2lib_free(handle->hd);
227+
delete handle;
228+
}
223229
#endif // REQUESTS_USE_SH2LIB
224230
}),
225231
std::move(RequestHandler{
@@ -395,7 +401,8 @@ auto RequestManager::send(
395401
#endif // REQUESTS_USE_CURL
396402

397403
#ifdef REQUESTS_USE_SH2LIB
398-
auto* hd = handle;
404+
auto* cfg = &(handle->cfg);
405+
auto* hd = handle->hd;
399406

400407
handler.body_sent_byte_count = 0;
401408

@@ -440,18 +447,20 @@ auto RequestManager::send(
440447
mbedtls_x509_crt* _cacerts = esp_tls_get_global_ca_store();
441448
if (_cacerts != nullptr)
442449
{
450+
cfg->uri = req->uri()->c_str();
451+
cfg->cacert_buf = _cacerts->raw.p;
452+
cfg->cacert_bytes = static_cast<unsigned int>(_cacerts->raw.len);
443453
handler.connected = (
444454
sh2lib_connect(
445-
hd,
446-
req->uri()->c_str(),
447-
_cacerts
455+
cfg,
456+
hd
448457
) == 0
449458
);
450459

451460
if (handler.connected)
452461
{
453462
// Create pointer so handle callback can access handler methods
454-
handle->userdata = &handler;
463+
handle->hd->userdata = &handler;
455464

456465
// Set the cached connected hostname
457466
handler.connected_hostname.assign(
@@ -474,16 +483,16 @@ auto RequestManager::send(
474483
};
475484

476485
std::vector<nghttp2_nv> nva_vec = {
477-
SH2LIB_MAKE_NV(":method", req->method()->c_str(), flags),
486+
SH2LIB_MAKE_NV(":method", req->method()->c_str()),
478487
{
479488
(uint8_t*)(":path"),
480489
(uint8_t*)(handler._path.data()),
481490
strlen(":path"),
482491
handler._path.size(),
483492
flags
484493
},
485-
SH2LIB_MAKE_NV(":scheme", "https", flags),
486-
SH2LIB_MAKE_NV(":authority", handler.connected_hostname.c_str(), flags),
494+
SH2LIB_MAKE_NV(":scheme", "https"),
495+
SH2LIB_MAKE_NV(":authority", handler.connected_hostname.c_str()),
487496
};
488497

489498
for (const auto* hdr : *(req->headers()))
@@ -498,15 +507,17 @@ auto RequestManager::send(
498507
}
499508

500509
// Make the request
510+
auto retval = false;
501511
if (req->method()->string_view() == "GET")
502512
{
503513
// Use GET (default)
504-
auto retval = sh2lib_do_get_with_nv(
514+
retval = sh2lib_do_get_with_nv(
505515
hd,
506516
nva_vec.data(),
507517
nva_vec.size(),
508-
&callbacks
518+
data_recv_cb
509519
);
520+
return retval;
510521
}
511522
else {
512523
// Add content length header with request body size
@@ -521,13 +532,16 @@ auto RequestManager::send(
521532
});
522533

523534
// Use a custom (user-supplied) HTTP method (e.g. PATCH)
524-
auto retval = sh2lib_do_putpost_with_nv(
535+
retval = sh2lib_do_putpost_with_nv(
525536
hd,
526537
nva_vec.data(),
527538
nva_vec.size(),
528-
&callbacks
539+
data_send_cb,
540+
data_recv_cb
529541
);
530542
}
543+
544+
return retval;
531545
}
532546
else {
533547
ESP_LOGE(TAG, "%s %s: not connected", req->method()->c_str(), req->uri()->c_str());
@@ -673,7 +687,7 @@ auto RequestManager::wait_any()
673687

674688
if (handle)
675689
{
676-
auto* hd = handle.get();
690+
auto* hd = handle.get()->hd;
677691
auto ok = (sh2lib_execute(hd) >= 0);
678692

679693
if (handler.finished)

requests/src/request_manager.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,10 @@ class RequestManager
5050
using HandleImpl = CURL;
5151
#endif // REQUESTS_USE_CURL
5252
#ifdef REQUESTS_USE_SH2LIB
53-
using HandleImpl = sh2lib_handle;
53+
struct HandleImpl{
54+
sh2lib_config_t cfg;
55+
sh2lib_handle* hd;
56+
};
5457
#endif // REQUESTS_USE_SH2LIB
5558
using HandleImplPtr = std::unique_ptr<HandleImpl, void(*)(HandleImpl*)>;
5659

sh2lib/CMakeLists.txt

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
idf_component_register(
2-
SRCS
3-
"sh2lib.c"
4-
INCLUDE_DIRS
5-
"."
6-
REQUIRES
7-
"nghttp"
8-
PRIV_REQUIRES
9-
"esp-tls"
10-
"lwip"
11-
)
1+
idf_component_register(SRCS "sh2lib.c"
2+
INCLUDE_DIRS .
3+
REQUIRES http_parser
4+
PRIV_REQUIRES lwip esp-tls)
5+
target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")

sh2lib/LICENSE

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

sh2lib/idf_component.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: "1.0.3"
2+
description: HTTP2 TLS Abstraction Layer
3+
url: https://github.com/espressif/idf-extra-components/tree/master/sh2lib
4+
dependencies:
5+
idf: ">=5.0"
6+
espressif/nghttp: ">=1.41.0"

0 commit comments

Comments
 (0)