Add OC_API annotations to oc_buffer_settings.h #647
There are no files selected for viewing
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,176 @@ | ||
| /**************************************************************************** | ||
| * | ||
| * Copyright (c) 2017 Intel Corporation | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"), | ||
| * you may not use this file except in compliance with the License. | ||
| * 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 "oc_buffer_settings.h" | ||
| #include "port/oc_log_internal.h" | ||
| #include "util/oc_features.h" | ||
|
|
||
| #include <stddef.h> | ||
|
|
||
| #ifdef OC_DYNAMIC_ALLOCATION | ||
|
|
||
| #include "messaging/coap/conf.h" | ||
|
|
||
| #ifdef OC_INOUT_BUFFER_SIZE | ||
| static size_t _OC_MTU_SIZE = OC_INOUT_BUFFER_SIZE; | ||
| #else /* OC_INOUT_BUFFER_SIZE */ | ||
| static size_t _OC_MTU_SIZE = 2048 + COAP_MAX_HEADER_SIZE; | ||
| #endif /* !OC_INOUT_BUFFER_SIZE */ | ||
| #ifdef OC_APP_DATA_BUFFER_SIZE | ||
| static size_t _OC_MAX_APP_DATA_SIZE = 7168; | ||
| static size_t _OC_MIN_APP_DATA_SIZE = 7168; | ||
| #else /* OC_APP_DATA_BUFFER_SIZE */ | ||
| static size_t _OC_MAX_APP_DATA_SIZE = 7168; | ||
| #ifdef OC_REP_ENCODING_REALLOC | ||
| static size_t _OC_MIN_APP_DATA_SIZE = 256; | ||
| #else /* OC_REP_ENCODING_REALLOC */ | ||
| static size_t _OC_MIN_APP_DATA_SIZE = 7168; | ||
| #endif /* !OC_REP_ENCODING_REALLOC */ | ||
| #endif /* !OC_APP_DATA_BUFFER_SIZE */ | ||
| static size_t _OC_BLOCK_SIZE = 1024; // FIX | ||
|
There was a problem hiding this comment. Address the The line: static size_t _OC_BLOCK_SIZE = 1024; // FIXincludes a |
||
|
|
||
| int | ||
| oc_set_mtu_size(size_t mtu_size) | ||
| { | ||
| (void)mtu_size; | ||
| #ifdef OC_INOUT_BUFFER_SIZE | ||
| return -1; | ||
| #else /* !OC_INOUT_BUFFER_SIZE */ | ||
| #ifdef OC_BLOCK_WISE | ||
| if (mtu_size < (COAP_MAX_HEADER_SIZE + 16)) { | ||
| return -1; | ||
| } | ||
| #ifdef OC_OSCORE | ||
| _OC_MTU_SIZE = mtu_size + COAP_MAX_HEADER_SIZE; | ||
| #else /* OC_OSCORE */ | ||
| _OC_MTU_SIZE = mtu_size; | ||
| #endif /* !OC_OSCORE */ | ||
| mtu_size -= COAP_MAX_HEADER_SIZE; | ||
| size_t i; | ||
| for (i = 10; i >= 4 && (mtu_size >> i) == 0; i--) | ||
| ; | ||
| _OC_BLOCK_SIZE = ((size_t)1) << i; | ||
| #endif /* OC_BLOCK_WISE */ | ||
| return 0; | ||
| #endif /* OC_INOUT_BUFFER_SIZE */ | ||
| } | ||
|
|
||
| long | ||
| oc_get_mtu_size(void) | ||
| { | ||
| return (long)_OC_MTU_SIZE; | ||
| } | ||
|
|
||
| void | ||
| oc_set_max_app_data_size(size_t size) | ||
| { | ||
| #ifdef OC_APP_DATA_BUFFER_SIZE | ||
| (void)size; | ||
| #else /* !OC_APP_DATA_BUFFER_SIZE */ | ||
| _OC_MAX_APP_DATA_SIZE = size; | ||
| #ifndef OC_REP_ENCODING_REALLOC | ||
| _OC_MIN_APP_DATA_SIZE = size; | ||
| #endif /* !OC_REP_ENCODING_REALLOC */ | ||
| #ifndef OC_BLOCK_WISE | ||
| _OC_BLOCK_SIZE = size; | ||
| _OC_MTU_SIZE = size + COAP_MAX_HEADER_SIZE; | ||
| #endif /* !OC_BLOCK_WISE */ | ||
| #endif /* OC_APP_DATA_BUFFER_SIZE */ | ||
| } | ||
|
|
||
| long | ||
| oc_get_max_app_data_size(void) | ||
| { | ||
| return (long)_OC_MAX_APP_DATA_SIZE; | ||
| } | ||
Danielius1922 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| void | ||
| oc_set_min_app_data_size(size_t size) | ||
| { | ||
| #if defined(OC_APP_DATA_BUFFER_SIZE) || !defined(OC_REP_ENCODING_REALLOC) | ||
| (void)size; | ||
| #else /* !OC_APP_DATA_BUFFER_SIZE && !OC_REP_ENCODING_REALLOC */ | ||
| _OC_MIN_APP_DATA_SIZE = size; | ||
| #endif /* OC_APP_DATA_BUFFER_SIZE || !OC_REP_ENCODING_REALLOC */ | ||
| } | ||
|
|
||
| long | ||
| oc_get_min_app_data_size(void) | ||
| { | ||
| return (long)_OC_MIN_APP_DATA_SIZE; | ||
| } | ||
|
|
||
| long | ||
| oc_get_block_size(void) | ||
| { | ||
| return (long)_OC_BLOCK_SIZE; | ||
| } | ||
|
|
||
| #else /* !OC_DYNAMIC_ALLOCATION */ | ||
|
|
||
| int | ||
| oc_set_mtu_size(size_t mtu_size) | ||
| { | ||
| (void)mtu_size; | ||
| OC_WRN("Dynamic memory not available"); | ||
| return -1; | ||
| } | ||
|
|
||
| long | ||
| oc_get_mtu_size(void) | ||
| { | ||
| OC_WRN("Dynamic memory not available"); | ||
| return -1; | ||
| } | ||
|
|
||
| void | ||
| oc_set_max_app_data_size(size_t size) | ||
| { | ||
| (void)size; | ||
| OC_WRN("Dynamic memory not available"); | ||
| } | ||
|
|
||
| long | ||
| oc_get_max_app_data_size(void) | ||
| { | ||
| OC_WRN("Dynamic memory not available"); | ||
| return -1; | ||
| } | ||
|
|
||
| void | ||
| oc_set_min_app_data_size(size_t size) | ||
| { | ||
| (void)size; | ||
| OC_WRN("Dynamic memory not available"); | ||
| } | ||
|
|
||
| long | ||
| oc_get_min_app_data_size(void) | ||
| { | ||
| OC_WRN("Dynamic memory not available"); | ||
| return -1; | ||
| } | ||
|
|
||
| long | ||
| oc_get_block_size(void) | ||
| { | ||
| OC_WRN("Dynamic memory not available"); | ||
| return -1; | ||
| } | ||
Danielius1922 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| #endif /* OC_DYNAMIC_ALLOCATION */ | ||
This file contains 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 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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Clarify application data size settings.
The initialization of
_OC_MAX_APP_DATA_SIZEand_OC_MIN_APP_DATA_SIZEhas some redundancy:OC_APP_DATA_BUFFER_SIZEis defined, both sizes are set to7168._OC_MAX_APP_DATA_SIZEis set to7168, but_OC_MIN_APP_DATA_SIZEmay be either256or7168based onOC_REP_ENCODING_REALLOC.Consider refactoring this section to eliminate redundancy and improve readability. Additionally, ensure that the default sizes are appropriate for the application's requirements.