always use the passed fd in generated saferead() and safewrite() functions #272
Conversation
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
josuah
approved these changes
Mar 25, 2024
| @@ -5,11 +5,11 @@ | |||
|
|
|||
| extern ssize_t timeoutwrite(int t, int fd, const void *buf, size_t len); | |||
|
|
|||
| #define GEN_SAFE_TIMEOUTWRITE(funcname,tout,writefd,doexit) \ | |||
| #define GEN_SAFE_TIMEOUTWRITE(funcname,tout,doexit) \ | |||
| ssize_t funcname(int fd, const void *buf, size_t len) \ | |||
There was a problem hiding this comment.
The fd argument was never used there. Maybe an omission or a change of mind mid-way...
This sounds like pursuing some work, makes sense to me.
Thank you!
There was a problem hiding this comment.
Not entirely. Some callers passed "fd" as the "writefd" macro argument, so they actually used the fd passed to the function. And now just all do.
The "to" and "from" substdios are initialized with fd -1 because the socket is dynamically allocated at runtime. That is why the passed fd in the saferead() and safewrite() functions was ignored and the socket descriptor was always used. Update the fd in the substdios once the socket is allocated and then use the provided fd.
The "to" and "from" substdios are initialized with fd -1 because the socket is dynamically allocated at runtime. That is why the passed fd in the saferead() and safewrite() functions was ignored and the socket descriptor was always used. Update the fd in the substdios once the socket is allocated and then use the provided fd.
…ator macros All instances now use the fd that is passed through the interface, so this can be removed from the macro.
DerDakon
force-pushed
the
Dakon/safewrite-fd
branch
from
8aeb025
to
adf7662
Compare
mbhangui
approved these changes
Apr 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #270.
There were situations where the generated functions would ignore the fd that was passed as their argument because if was always "-1". This happened when the substdio was statically initialized but a socket was dynamically allocated at runtime and was actually used for communication. Update the substdio when the socket is known, and then just use the passed fd.