aboutsummaryrefslogtreecommitdiff
path: root/src/socket.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/socket.c')
-rw-r--r--src/socket.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/src/socket.c b/src/socket.c
index 3223a65..90833e5 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -136,8 +136,7 @@ create_socket (struct pies_url *url, int socket_type,
{
if (errno != ENOENT)
{
- logmsg (LOG_ERR, _("%s: cannot stat socket: %s"),
- url->string, strerror (errno));
+ logfuncall ("stat", url->string, errno);
return -1;
}
}
@@ -151,8 +150,7 @@ create_socket (struct pies_url *url, int socket_type,
}
if (/*rmsocket && */ unlink (url->path))
{
- logmsg (LOG_ERR, _("%s: cannot unlink: %s"),
- url->path, strerror (errno));
+ logfuncall ("unlink", url->path, errno);
return -1;
}
}
@@ -204,8 +202,7 @@ create_socket (struct pies_url *url, int socket_type,
fd = socket (addr.sa.sa_family, socket_type, url->proto);
if (fd == -1)
{
- logmsg (LOG_ERR, _("%s: cannot create socket: %s"),
- url->string, strerror (errno));
+ logfuncall ("socket", url->string, errno);
return -1;
}
@@ -214,7 +211,7 @@ create_socket (struct pies_url *url, int socket_type,
&& setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *) &rc,
sizeof (rc)) == -1)
{
- logmsg (LOG_ERR, _("%s: set reuseaddr failed (%s)"),
+ logmsg (LOG_ERR, _("%s: set reuseaddr failed: %s"),
url->string, strerror (errno));
close (fd);
return -1;
@@ -228,12 +225,12 @@ create_socket (struct pies_url *url, int socket_type,
else
switch_back = 0;
rc = bind (fd, &addr.sa, socklen);
+ if (rc < 0)
+ logfuncall ("bind", NULL, errno);
if (switch_back)
switch_eids (&uid, &gid, &umaskval);
if (rc < 0)
{
- logmsg (LOG_ERR, _("%s: cannot bind: %s"),
- url->string, strerror (errno));
close (fd);
return -1;
}
@@ -354,8 +351,7 @@ pass_fd (const char *socket_name, int fd, unsigned maxtime)
case EAGAIN:
continue;
}
- logmsg (LOG_ERR, _("%s: connect failed: %s"),
- socket_name, strerror (errno));
+ logfuncall ("connect", socket_name, errno);
break;
}
state = fds_connected;
@@ -378,7 +374,7 @@ pass_fd (const char *socket_name, int fd, unsigned maxtime)
{
if (errno == EINTR)
continue;
- logmsg (LOG_ERR, _("select failed: %s"), strerror (errno));
+ logfuncall ("select", NULL, errno);
break;
}
state = fds_ready;

Return to:

Send suggestions and report system problems to the System administrator.