This repository has been archived by the owner on Jun 30, 2020. It is now read-only.
Use fstat() to check if there is a socket or not #31
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
Codecov Report
@@ Coverage Diff @@
## master #31 +/- ##
==========================================
+ Coverage 64.87% 65.73% +0.86%
==========================================
Files 13 13
Lines 1170 1179 +9
==========================================
+ Hits 759 775 +16
+ Misses 411 404 -7
Continue to review full report at Codecov.
|
frozencemetery
suggested changes
Mar 27, 2019
bin/main.c
Outdated
|
|
||
| for (int i = 0; i < 2; i++) { | ||
| if (!pfds[i].revents) | ||
| continue; | ||
|
|
||
| ret = read(pfds[i].fd, buffer, sizeof(buffer)); | ||
| if (fstat(pfds[i].fd, &st)) { | ||
| fprintf(stderr, "Error in fstat.\n"); |
There was a problem hiding this comment.
Also log what the error is.
bin/non.c
Outdated
| struct stat st; | ||
|
|
||
| if (fstat(fd, &st)) { | ||
| fprintf(stderr, "Error in fstat.\n"); |
bin/main.c
Outdated
| if (S_ISSOCK(st.st_mode)) { | ||
| ret = recv(pfds[i].fd, buffer, sizeof(buffer), 0); | ||
| } else { | ||
| ret = read(pfds[i].fd, buffer, sizeof(buffer)); |
DK-DARKmatter
force-pushed
the
socketcheck
branch
from
bad47ff
to
db4a765
Compare
npmccallum
suggested changes
Apr 4, 2019
| } | ||
|
|
||
| if (S_ISSOCK(st.st_mode)) { | ||
| ret = recv(pfds[i].fd, buffer, sizeof(buffer), 0); |
There was a problem hiding this comment.
Also, don't use braces for a single-line if statement.
| if (S_ISSOCK(st.st_mode)) { | ||
| ret = recv(pfds[i].fd, buffer, sizeof(buffer), 0); | ||
| } else { | ||
| ret = read(pfds[i].fd, buffer, sizeof(buffer)); |
There was a problem hiding this comment.
Also, don't use braces for a single-line if statement.
bin/non.c
Outdated
|
|
||
| if (fstat(fd, &st)) { | ||
| fprintf(stderr, "Error in fstat. Errno is %d\n", errno); | ||
| return -1; |
There was a problem hiding this comment.
Also, don't use braces for a single-line if statement.
bin/non.c
Outdated
| } | ||
|
|
||
| if (S_ISSOCK(st.st_mode)) { | ||
| ret = send(fd, buf, len, 0); |
There was a problem hiding this comment.
Also, don't use braces for a single-line if statement.
bin/non.c
Outdated
| if (S_ISSOCK(st.st_mode)) { | ||
| ret = send(fd, buf, len, 0); | ||
| } else { | ||
| ret = write(fd, buf, len); |
There was a problem hiding this comment.
Also, don't use braces for a single-line if statement.
DK-DARKmatter
force-pushed
the
socketcheck
branch
from
db4a765
to
950ddf3
Compare
frozencemetery
suggested changes
Apr 5, 2019
bin/main.c
Outdated
|
|
||
| for (int i = 0; i < 2; i++) { | ||
| if (!pfds[i].revents) | ||
| continue; | ||
|
|
||
| ret = read(pfds[i].fd, buffer, sizeof(buffer)); | ||
| if (fstat(pfds[i].fd, &st)) { | ||
| fprintf(stderr, "Error in fstat. Errno is %d\n", errno); |
There was a problem hiding this comment.
%m or strerror, please.
bin/non.c
Outdated
| struct stat st; | ||
|
|
||
| if (fstat(fd, &st)) { | ||
| fprintf(stderr, "Error in fstat. Errno is %d\n", errno); |
recv/send function can only be applied to a socket. We can use fstat() function to check if the fd is a socket or not. If so, we would like to use recv/send function to replace read/write. Related to:enarx-archive#30 Signed-off-by: Ke Zhao <[email protected]>
DK-DARKmatter
force-pushed
the
socketcheck
branch
from
950ddf3
to
6588580
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
recv/send function can only be applied to a socket.
We can use fstat() function to check if the fd is a socket or not.
If so, we would like to use recv/send function to replace read/write.
Related to:#30
Signed-off-by: Ke Zhao [email protected]