-
Notifications
You must be signed in to change notification settings - Fork 121
fix(coap): Update to libcoap v4.3.5a (IEC-430) #627
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,6 +31,7 @@ | |
|
|
||
| #include "protocol_examples_common.h" | ||
|
|
||
| #include "coap_config.h" | ||
| #include "coap3/coap.h" | ||
|
|
||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| version: "1.0.0" | ||
| version: 1.0.0 | ||
| description: CoAP Client Example | ||
| dependencies: | ||
| espressif/coap: | ||
| version: "^4.3.0" | ||
| override_path: '../../../' | ||
| version: ^4.3.0 | ||
| override_path: ../../../ | ||
| protocol_examples_common: | ||
| path: ${IDF_PATH}/examples/common_components/protocol_examples_common |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| version: "1.0.0" | ||
| version: 1.0.0 | ||
| description: CoAP Server Example | ||
| dependencies: | ||
| espressif/coap: | ||
| version: "^4.3.0" | ||
| override_path: '../../../' | ||
| version: ^4.3.0 | ||
| override_path: ../../../ | ||
| protocol_examples_common: | ||
| path: ${IDF_PATH}/examples/common_components/protocol_examples_common |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,9 @@ | ||
| /* | ||
| * libcoap configure implementation for ESP32 platform. | ||
| * | ||
| * Uses libcoap software implementation for failover when concurrent | ||
| * configure operations are in use. | ||
| * | ||
| * coap.h -- main header file for CoAP stack of libcoap | ||
| * | ||
| * Copyright (C) 2010-2012,2015-2024 Olaf Bergmann <[email protected]> | ||
| * Copyright (C) 2010-2012,2015-2025 Olaf Bergmann <[email protected]> | ||
| * 2015 Carsten Schoenert <[email protected]> | ||
| * | ||
| * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD | ||
|
|
@@ -15,8 +12,8 @@ | |
| * of use. | ||
| */ | ||
|
|
||
| #ifndef _CONFIG_H_ | ||
| #define _CONFIG_H_ | ||
| #ifndef COAP_CONFIG_H_ | ||
| #define COAP_CONFIG_H_ | ||
|
|
||
| /* Always enabled in ESP-IDF */ | ||
| #ifndef WITH_POSIX | ||
|
|
@@ -56,11 +53,30 @@ | |
|
|
||
| #ifdef CONFIG_LWIP_IPV4 | ||
| #define COAP_IPV4_SUPPORT 1 | ||
| #endif /* CONFIG_LWIP_IPV4 */ | ||
| #else /* ! CONFIG_LWIP_IPV4 */ | ||
| struct sockaddr_in { | ||
| u8_t sin_len; | ||
| sa_family_t sin_family; | ||
| in_port_t sin_port; | ||
| struct in_addr sin_addr; | ||
| }; | ||
| #endif /* ! CONFIG_LWIP_IPV4 */ | ||
|
|
||
| #ifdef CONFIG_LWIP_IPV6 | ||
| #define COAP_IPV6_SUPPORT 1 | ||
| #endif /* CONFIG_LWIP_IPV6 */ | ||
| #else /* ! CONFIG_LWIP_IPV6 */ | ||
| struct sockaddr_in6 { | ||
| u8_t sin6_len; | ||
| sa_family_t sin6_family; | ||
| in_port_t sin6_port; | ||
| u32_t sin6_flowinfo; | ||
| struct in_addr sin6_addr; | ||
| u32_t sin6_scope_id; | ||
| }; | ||
| #ifndef INET6_ADDRSTRLEN | ||
| #define INET6_ADDRSTRLEN 40 | ||
| #endif /* INET6_ADDRSTRLEN */ | ||
| #endif /* ! CONFIG_LWIP_IPV6 */ | ||
|
|
||
| #ifdef CONFIG_COAP_ASYNC_SUPPORT | ||
| #define COAP_ASYNC_SUPPORT 1 | ||
|
|
@@ -114,4 +130,4 @@ | |
| #define COAP_MAX_LOGGING_LEVEL 0 | ||
| #endif /* ! CONFIG_COAP_DEBUGGING */ | ||
|
|
||
| #endif /* _CONFIG_H_ */ | ||
| #endif /* COAP_CONFIG_H_ */ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,7 @@ | |
| * | ||
| * coap.h -- main header file for CoAP stack of libcoap | ||
| * | ||
| * Copyright (C) 2010-2012,2015-2024 Olaf Bergmann <[email protected]> | ||
| * Copyright (C) 2010-2012,2015-2025 Olaf Bergmann <[email protected]> | ||
| * 2015 Carsten Schoenert <[email protected]> | ||
| * | ||
| * Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD | ||
|
|
@@ -56,7 +56,7 @@ struct in6_pktinfo { | |
| #define PACKAGE_VERSION "4.3.5" | ||
|
|
||
| #ifdef CONFIG_MBEDTLS_TLS_ENABLED | ||
| #define COAP_WITH_LIBMBEDTLS | ||
| #define COAP_WITH_LIBMBEDTLS 1 | ||
| #endif /* CONFIG_MBEDTLS_TLS_ENABLED */ | ||
|
|
||
| #define COAP_DEFAULT_MAX_PDU_RX_SIZE CONFIG_LWIP_TCP_MSL | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.