Add cellular library submodule path and demo (#695)

* [Cellular] Add cellulr lib submodule and demo app

* [Cellular] Fix memory violation in transport layer and add using LoggingPrintf

* Update FreeRTOS Cellular Interface

* Change the mbedtls usage in FreeRTOS-Plus

* [Cellular] Fix missing spell

* [Cellular] Add manifest.yml

* Fix missing spell

* Update manifest.yml

* [Cellular] Add integration test

* Modify the demo log level to LOG_INFO

* Update cellular interface

* The modification of the folder structure for cellular library

* Rename the naming of demo

* Adjust the location of using_mbedtls and socket_wrapper

* Adjust project setting for relocating using_mbedtls and socket_wrapper

* Turn off PSM mode

* Add start marker for CI validation.

* The modification for mbedtls platform send/recv function for cellular

* Change the project file due to the changes of mbedtls platform send/recv function for cellular

* Fix missing newline and remove unused file

* Add missing configuration.

* Make cellular and freertos tcp plus use the same transport implementation

* Add comment for the macro MBEDTLS_SSL_SEND and MBEDTLS_SSL_RECV

* Make changes from the github comment.
This commit is contained in:
andysun2015 2021-11-10 11:38:44 +08:00 committed by GitHub
parent 223d2d0e21
commit 957fb26dbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
142 changed files with 45928 additions and 14758 deletions

View file

@ -0,0 +1,96 @@
/*
* FreeRTOS V202107.00
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
* the Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
* https://www.FreeRTOS.org
* https://github.com/FreeRTOS
*
*/
/**
* @file mbedtls_bio_freertos_cellular.c
* @brief Implements mbed TLS platform send/receive functions for cellular.
*/
/* FreeRTOS includes. */
#include "FreeRTOS.h"
#include "FreeRTOS_Sockets.h"
/* mbed TLS includes. */
#include "mbedtls_config.h"
#include "threading_alt.h"
#include "mbedtls/entropy.h"
#include "mbedtls/ssl.h"
/*-----------------------------------------------------------*/
/**
* @brief Sends data over cellular sockets.
*
* @param[in] ctx The network context containing the socket handle.
* @param[in] buf Buffer containing the bytes to send.
* @param[in] len Number of bytes to send from the buffer.
*
* @return Number of bytes sent on success; else a negative value.
*/
int mbedtls_cellular_send( void * ctx,
const unsigned char * buf,
size_t len )
{
configASSERT( ctx != NULL );
configASSERT( buf != NULL );
return Sockets_Send( ( Socket_t ) ctx, buf, len );
}
/*-----------------------------------------------------------*/
/**
* @brief Receives data from cellular socket.
*
* @param[in] ctx The network context containing the socket handle.
* @param[out] buf Buffer to receive bytes into.
* @param[in] len Number of bytes to receive from the network.
*
* @return Number of bytes received if successful; Negative value on error.
*/
int mbedtls_cellular_recv( void * ctx,
unsigned char * buf,
size_t len )
{
int recvStatus = 0;
int returnStatus = -1;
configASSERT( ctx != NULL );
configASSERT( buf != NULL );
recvStatus = Sockets_Recv( ( Socket_t ) ctx, buf, len );
if( recvStatus < 0 )
{
returnStatus = MBEDTLS_ERR_SSL_INTERNAL_ERROR;
}
else
{
returnStatus = recvStatus;
}
return returnStatus;
}

View file

@ -0,0 +1,136 @@
/*
* FreeRTOS V202107.00
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
* the Software, and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
* https://www.FreeRTOS.org
* https://github.com/FreeRTOS
*
*/
/**
* @file mbedtls_bio_freertos_plus_tcp.c
* @brief Implements mbed TLS platform send/receive functions for freertos plus tcp.
*/
/* FreeRTOS includes. */
#include "FreeRTOS.h"
#include "FreeRTOS_Sockets.h"
/* mbed TLS includes. */
#include "mbedtls_config.h"
#include "threading_alt.h"
#include "mbedtls/entropy.h"
#include "mbedtls/ssl.h"
/*-----------------------------------------------------------*/
/**
* @brief Sends data over FreeRTOS+TCP sockets.
*
* @param[in] ctx The network context containing the socket handle.
* @param[in] buf Buffer containing the bytes to send.
* @param[in] len Number of bytes to send from the buffer.
*
* @return Number of bytes sent on success; else a negative value.
*/
int mbedtls_platform_send( void * ctx,
const unsigned char * buf,
size_t len )
{
BaseType_t sendStatus = 0;
int returnStatus = -1;
configASSERT( ctx != NULL );
configASSERT( buf != NULL );
sendStatus = FreeRTOS_send( ( Socket_t ) ctx, buf, len, 0 );
switch( sendStatus )
{
/* Socket was closed or just got closed. */
case -pdFREERTOS_ERRNO_ENOTCONN:
/* Not enough memory for the socket to create either an Rx or Tx stream. */
case -pdFREERTOS_ERRNO_ENOMEM:
/* Socket is not valid, is not a TCP socket, or is not bound. */
case -pdFREERTOS_ERRNO_EINVAL:
/* Socket received a signal, causing the read operation to be aborted. */
case -pdFREERTOS_ERRNO_EINTR:
returnStatus = MBEDTLS_ERR_SSL_INTERNAL_ERROR;
break;
/* A timeout occurred before any data could be sent. */
case -pdFREERTOS_ERRNO_ENOSPC:
returnStatus = MBEDTLS_ERR_SSL_TIMEOUT;
break;
default:
returnStatus = ( int ) sendStatus;
break;
}
return returnStatus;
}
/*-----------------------------------------------------------*/
/**
* @brief Receives data from FreeRTOS+TCP socket.
*
* @param[in] ctx The network context containing the socket handle.
* @param[out] buf Buffer to receive bytes into.
* @param[in] len Number of bytes to receive from the network.
*
* @return Number of bytes received if successful; Negative value on error.
*/
int mbedtls_platform_recv( void * ctx,
unsigned char * buf,
size_t len )
{
BaseType_t recvStatus = 0;
int returnStatus = -1;
configASSERT( ctx != NULL );
configASSERT( buf != NULL );
recvStatus = FreeRTOS_recv( ( Socket_t ) ctx, buf, len, 0 );
switch( recvStatus )
{
/* No data could be sent because the socket was or just got closed. */
case -pdFREERTOS_ERRNO_ENOTCONN:
/* No data could be sent because there was insufficient memory. */
case -pdFREERTOS_ERRNO_ENOMEM:
/* No data could be sent because xSocket was not a valid TCP socket. */
case -pdFREERTOS_ERRNO_EINVAL:
returnStatus = MBEDTLS_ERR_SSL_INTERNAL_ERROR;
break;
/* A timeout occurred before any data could be received. */
case 0:
returnStatus = MBEDTLS_ERR_SSL_WANT_READ;
break;
default:
returnStatus = ( int ) recvStatus;
break;
}
return returnStatus;
}

View file

@ -98,107 +98,6 @@ void mbedtls_platform_free( void * ptr )
/*-----------------------------------------------------------*/
/**
* @brief Sends data over FreeRTOS+TCP sockets.
*
* @param[in] ctx The network context containing the socket handle.
* @param[in] buf Buffer containing the bytes to send.
* @param[in] len Number of bytes to send from the buffer.
*
* @return Number of bytes sent on success; else a negative value.
*/
int mbedtls_platform_send( void * ctx,
const unsigned char * buf,
size_t len )
{
Socket_t socket;
BaseType_t sendStatus = 0;
int returnStatus = -1;
configASSERT( ctx != NULL );
configASSERT( buf != NULL );
socket = ( Socket_t ) ctx;
sendStatus = FreeRTOS_send( socket, buf, len, 0 );
switch( sendStatus )
{
/* Socket was closed or just got closed. */
case -pdFREERTOS_ERRNO_ENOTCONN:
/* Not enough memory for the socket to create either an Rx or Tx stream. */
case -pdFREERTOS_ERRNO_ENOMEM:
/* Socket is not valid, is not a TCP socket, or is not bound. */
case -pdFREERTOS_ERRNO_EINVAL:
/* Socket received a signal, causing the read operation to be aborted. */
case -pdFREERTOS_ERRNO_EINTR:
returnStatus = MBEDTLS_ERR_SSL_INTERNAL_ERROR;
break;
/* A timeout occurred before any data could be sent. */
case -pdFREERTOS_ERRNO_ENOSPC:
returnStatus = MBEDTLS_ERR_SSL_TIMEOUT;
break;
default:
returnStatus = ( int ) sendStatus;
break;
}
return returnStatus;
}
/*-----------------------------------------------------------*/
/**
* @brief Receives data from FreeRTOS+TCP socket.
*
* @param[in] ctx The network context containing the socket handle.
* @param[out] buf Buffer to receive bytes into.
* @param[in] len Number of bytes to receive from the network.
*
* @return Number of bytes received if successful; Negative value on error.
*/
int mbedtls_platform_recv( void * ctx,
unsigned char * buf,
size_t len )
{
Socket_t socket;
BaseType_t recvStatus = 0;
int returnStatus = -1;
configASSERT( ctx != NULL );
configASSERT( buf != NULL );
socket = ( Socket_t ) ctx;
recvStatus = FreeRTOS_recv( socket, buf, len, 0 );
switch( recvStatus )
{
/* No data could be sent because the socket was or just got closed. */
case -pdFREERTOS_ERRNO_ENOTCONN:
/* No data could be sent because there was insufficient memory. */
case -pdFREERTOS_ERRNO_ENOMEM:
/* No data could be sent because xSocket was not a valid TCP socket. */
case -pdFREERTOS_ERRNO_EINVAL:
returnStatus = MBEDTLS_ERR_SSL_INTERNAL_ERROR;
break;
/* A timeout occurred before any data could be received. */
case 0:
returnStatus = MBEDTLS_ERR_SSL_WANT_READ;
break;
default:
returnStatus = ( int ) recvStatus;
break;
}
return returnStatus;
}
/*-----------------------------------------------------------*/
/**
* @brief Creates a mutex.
*