Skip to content

Change the function signature of safe_[get|set]sockopt #8331

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

Merged
maskit merged 2 commits into from
Jan 26, 2022
Merged

Change the function signature of safe_[get|set]sockopt #8331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddc6b35
Change the function signature of safe_[get|set]sockopt
maskit Sep 17, 2021
0d8e9dd
Add const
maskit Sep 28, 2021
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
4 changes: 2 additions & 2 deletions include/tscore/ink_sock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@

#include "tscore/ink_apidefs.h"

int safe_setsockopt(int s, int level, int optname, char *optval, int optlevel);
int safe_getsockopt(int s, int level, int optname, char *optval, int *optlevel);
int safe_setsockopt(int s, int level, int optname, const void *optval, int optlevel);
int safe_getsockopt(int s, int level, int optname, void *optval, int *optlevel);
Copy link
Copy Markdown
Contributor

@bryancall bryancall Sep 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you are going to mirror the setsockopt API then shouldn't it be const void * and socklen_t for the length?

Copy link
Copy Markdown
Member Author

@maskit maskit Sep 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I kept my change minimal.

If I change int * to socklen_t * I have to deal with the error below at all places that call safe_getsockopt. I could just reinterpret_cast at all the places but I guess some of the places can declare variables as unsigned int and don't need any casts. I don't want to check and fix that.

/Users/mkitajo/src/github.com/trafficserver/iocore/eventsystem/P_UnixSocketManager.h:482:11: error: no matching function for call to 'safe_getsockopt'
  r     = safe_getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&bsz, &bszsz);
          ^~~~~~~~~~~~~~~
../../include/tscore/ink_sock.h:38:5: note: candidate function not viable: no known conversion from 'int *' to 'socklen_t *' (aka 'unsigned int *') for 5th argument
int safe_getsockopt(int s, int level, int optname, void *optval, socklen_t *optlevel);
    ^

I added const for optval for now.

int safe_bind(int s, struct sockaddr const *name, int namelen);
int safe_listen(int s, int backlog);
int safe_getsockname(int s, struct sockaddr *name, int *namelen);
Expand Down
4 changes: 2 additions & 2 deletions src/tscore/ink_sock.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ check_valid_sockaddr(sockaddr *sa, char *file, int line)
#endif

int
safe_setsockopt(int s, int level, int optname, char *optval, int optlevel)
safe_setsockopt(int s, int level, int optname, const void *optval, int optlevel)
{
int r;
do {
Expand All @@ -69,7 +69,7 @@ safe_setsockopt(int s, int level, int optname, char *optval, int optlevel)
}

int
safe_getsockopt(int s, int level, int optname, char *optval, int *optlevel)
safe_getsockopt(int s, int level, int optname, void *optval, int *optlevel)
{
int r;
do {
Expand Down