Skip to content
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.

Sign up for GitHub

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

Integration Candidate 2020-03-25 #401

Merged
merged 3 commits into from
Apr 3, 2020
Merged

Integration Candidate 2020-03-25 #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4a406f
fix for #349 - OS_SocketAccept() fix
CDKnightNASA Mar 19, 2020
b9ab174
Merge pull request #372 from CDKnightNASA/fix-349-socket_accept
astrogeco Apr 1, 2020
126d319
Increase version to 5.0.10 and update ReadMe
Apr 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/os/inc/osapi-version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

/**
Expand Down
2 changes: 1 addition & 1 deletion src/os/shared/osapi-sockets.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down