Fix #969, socket accept using incorrect record#971
Merged
astrogeco merged 2 commits intonasa:integration-candidatefrom Apr 28, 2021
Merged
Fix #969, socket accept using incorrect record#971astrogeco merged 2 commits intonasa:integration-candidatefrom
astrogeco merged 2 commits intonasa:integration-candidatefrom
Conversation
jphickey
added
CCB:FastTrack
CCB:Ready
The OS_SocketAccept call was using the incorrect token, using the server/acceptor socket when it should have used the connection socket. The bug overwrote data in the acceptor socket, but it would only cause an issue when the user attempted to use the server socket to accept a second connection, but the tests only performed a single connection. This also improves the network-api-test to do multiple connections, re-using the same acceptor socket between them.
jphickey
force-pushed
the
fix-969-socket-accept
branch
from
a69d920 to
479c021
Compare
Contributor
Author
|
Re-Pushed to fix formatting..... |
skliper
approved these changes
Apr 27, 2021
Contributor
|
Ping @excaliburtb |
The stream test was sending an 8-bit count pattern to validate the connection, but was not using the provided API to do so. This provides the exact same test but uses the provided API from UtAssert to implement it, rather than duplicating the logic. Notably, this also confirms that the tool functions work as expected, since there were no other OSAL tests using this API.
Contributor
Author
|
Updated this PR, I added a second commit which changes the explicit test of the count pattern to utilize the provided |
Contributor
|
Do we want approval from @excaliburtb before merge? |
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Apr 28, 2021
nasa/osal#972, update documentation for read/write nasa/osal#966, add "handler" feature to utassert stub API nasa/osal#953, Adds local makefile and bundle/local unit test actions with coverage verification nasa/osal#971, socket accept using incorrect record
Contributor
@astrogeco Explicit external approval not required. Feel free to merge. |
astrogeco
removed
the
CCB:Ready
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Apr 29, 2021
Combines: nasa/cFE#1431 nasa/osal#975 nasa/sample_lib#61 Includes: nasa/cFE#1379, memory pool pointer type nasa/cFE#1289, ES child task functional test nasa/cFE#1289, typo in macro name nasa/cFE#1286, Remove broken BUILDDIR reference nasa/cFE#1305, remove option for "osal_compatible" nasa/cFE#1374, CFE_SUCCESS constant type nasa/cFE#1316, Remove Unused Error Codes nasa/cFE#1370, better warning about malformed startup line nasa/cFE#1373, check status of call to `CFE_ES_CDS_CachePreload` nasa/cFE#1384, update documentation for `CFE_ES_DeleteCDS` nasa/cFE#1385, exception logic when app/task is not found nasa/cFE#1372, error if alignment size not a power of two nasa/cFE#1368, remove unneeded CFE_ES_SYSLOG_APPEND macro nasa/cFE#1382, improve documentation for resourceID patterns nasa/cFE#1371, assert `CFE_RESOURCEID_MAX` is a bitmask nasa/osal#972, update documentation for read/write nasa/osal#966, add "handler" feature to utassert stub API nasa/osal#953, Adds local makefile and bundle/local unit test actions with coverage verification nasa/osal#971, socket accept using incorrect record nasa/osal#959, move async console option nasa/sample_lib#60, replace direct ref to ArgPtr with macro
jphickey
pushed a commit
to jphickey/osal
that referenced
this pull request
Aug 10, 2022
Fix nasa#970, strncpy warning
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Describe the contribution
This improves the network-api-test to do multiple connections, re-using the same acceptor socket between them.
As reported in #969, the OS_SocketAccept call was using the incorrect token, using the server/acceptor socket when it should have used the connection socket.
The bug overwrote data in the acceptor socket, but it would only cause an issue when the user attempted to use the server socket to accept a second connection, but the tests only performed a single connection.
With the improvement to network-api-test to run multiple connections, it now reveals the bug in the test. Without the fix, the test failed on the second connection. With the fix to OS_SocketAccept to use the correct token, the test passes fine again.
Fixes #969
Testing performed
Build and sanity check CFE, run all unit tests (particularly network-api-test).
Expected behavior changes
OS_SocketAccept() does not clobber the server socket, allows it to be re-used for additional connection(s) as intended.
System(s) tested on
Ubuntu 20.04
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.