ExternalVendorCode/conserver
1
0
Fork 0
mirror of https://github.com/bstansell/conserver.git synced 2024-12-23 22:52:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #82 from viraptor/macos

Browse Source
This commit is contained in:
Bryan Stansell 2022-07-15 07:59:37 -07:00 committed by GitHub
commit b7aa0508f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conserver/group.c
View File

@ -5038,7 +5038,7 @@ Spawn(GRPENT *pGE, int msfd)
struct sockaddr_in lstn_port;
# endif
# if HAVE_SETSOCKOPT
int true = 1;
int sock_opt_true = 1;
# endif
unsigned short portInc = 0;
#else
@ -5065,8 +5065,8 @@ Spawn(GRPENT *pGE, int msfd)
}
# if HAVE_SETSOCKOPT
if (setsockopt
(sfd, SOL_SOCKET, SO_REUSEADDR, (char *)&true,
sizeof(true)) < 0) {
(sfd, SOL_SOCKET, SO_REUSEADDR, (char *)&sock_opt_true,
sizeof(sock_opt_true)) < 0) {
Error("Spawn(): setsockopt(%u,SO_REUSEADDR): %s", sfd,
strerror(errno));
return;
@ -5197,7 +5197,7 @@ Spawn(GRPENT *pGE, int msfd)
}
# if HAVE_SETSOCKOPT
if (setsockopt
(sfd, SOL_SOCKET, SO_REUSEADDR, (char *)&true, sizeof(true))
(sfd, SOL_SOCKET, SO_REUSEADDR, (char *)&sock_opt_true, sizeof(sock_opt_true))
< 0) {
Error("Spawn(): setsockopt(%u,SO_REUSEADDR): %s", sfd,
strerror(errno));

10
conserver/master.c
View File

@ -690,7 +690,7 @@ Master(void)
struct sockaddr_in master_port;
# endif
# if HAVE_SETSOCKOPT
int true = 1;
int sock_opt_true = 1;
# endif
#else
struct sockaddr_un master_port;
@ -750,8 +750,8 @@ Master(void)
# if HAVE_SETSOCKOPT
if (setsockopt
(msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&true,
sizeof(true)) < 0)
(msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&sock_opt_true,
sizeof(sock_opt_true)) < 0)
goto fail;
# endif
if (!SetFlags(msfd, O_NONBLOCK, 0))
@ -821,8 +821,8 @@ Master(void)
}
# if HAVE_SETSOCKOPT
if (setsockopt
(msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&true,
sizeof(true)) < 0) {
(msfd, SOL_SOCKET, SO_REUSEADDR, (char *)&sock_opt_true,
sizeof(sock_opt_true)) < 0) {
Error("Master(): setsockopt(%u,SO_REUSEADDR): %s", msfd,
strerror(errno));
return;