From d4a406f74d61c9625b1ed2dd9eb830f6f7981f50 Mon Sep 17 00:00:00 2001 From: Chris Knight Date: Thu, 19 Mar 2020 15:18:28 -0700 Subject: [PATCH 1/2] fix for #349 - OS_SocketAccept() fix --- src/os/shared/osapi-sockets.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/os/shared/osapi-sockets.c b/src/os/shared/osapi-sockets.c index 6e1087f0c..06a7b8b0e 100644 --- a/src/os/shared/osapi-sockets.c +++ b/src/os/shared/osapi-sockets.c @@ -237,7 +237,7 @@ int32 OS_SocketAccept(uint32 sock_id, uint32 *connsock_id, OS_SockAddr_t *Addr, /* Socket must be of the STREAM variety */ return_code = OS_ERR_INCORRECT_OBJ_TYPE; } - else if (record->refcount != 0 || (OS_stream_table[local_id].stream_state & (OS_STREAM_STATE_BOUND | OS_STREAM_STATE_CONNECTED)) != OS_STREAM_STATE_BOUND) + else if ((OS_stream_table[local_id].stream_state & (OS_STREAM_STATE_BOUND | OS_STREAM_STATE_CONNECTED)) != OS_STREAM_STATE_BOUND) { /* Socket must be bound but not connected */ return_code = OS_ERR_INCORRECT_OBJ_STATE; From 126d3191f00b1a8eff153dea24807c71919c2954 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Wed, 1 Apr 2020 10:33:54 -0400 Subject: [PATCH 2/2] Increase version to 5.0.10 and update ReadMe --- README.md | 3 ++- src/os/inc/osapi-version.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7f60a302c..f0247b791 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,8 @@ This distribution contains: Version Notes: ============== - +- 5.0.10: DEVELOPMENT + - Minor updates (see https://github.com/nasa/osal/pull/401) - 5.0.9: DEVELOPMENT - Documentation updates (see https://github.com/nasa/osal/pull/375) - 5.0.8: DEVELOPMENT diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h index 52c073047..089fd587f 100644 --- a/src/os/inc/osapi-version.h +++ b/src/os/inc/osapi-version.h @@ -20,7 +20,7 @@ #define OS_MAJOR_VERSION 5 /**< @brief Major version number */ #define OS_MINOR_VERSION 0 /**< @brief Minor version number */ -#define OS_REVISION 9 /**< @brief Revision number */ +#define OS_REVISION 10 /**< @brief Revision number */ #define OS_MISSION_REV 0 /**< @brief Mission revision */ /**