From 5a338fdcf3a5f33c7bebba55373172cf0bf2e00e Mon Sep 17 00:00:00 2001 From: Frank Lahm Date: Tue, 19 Jul 2011 11:57:35 +0200 Subject: [PATCH] More robust IPC reconnect error handling --- etc/afpd/main.c | 5 +++-- libatalk/util/server_child.c | 4 +++- libatalk/util/server_ipc.c | 11 ++++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/etc/afpd/main.c b/etc/afpd/main.c index 63452d9e..06f3ee16 100644 --- a/etc/afpd/main.c +++ b/etc/afpd/main.c @@ -441,7 +441,7 @@ int main(int ac, char **av) child = (afp_child_t *)polldata[i].data; LOG(log_debug, logtype_afpd, "main: IPC request from child[%u]", child->pid); - if ((ret = ipc_server_read(server_children, child->ipc_fds[0])) == 0) { + if (ipc_server_read(server_children, child->ipc_fds[0]) != 0) { fdset_del_fd(&fdset, &polldata, &fdset_used, &fdset_size, child->ipc_fds[0]); close(child->ipc_fds[0]); child->ipc_fds[0] = -1; @@ -461,8 +461,9 @@ int main(int ac, char **av) if (readt(fd[0], &pid, sizeof(pid_t), 0, 1) != sizeof(pid_t)) { LOG(log_error, logtype_afpd, "main: readt: %s", strerror(errno)); close(fd[0]); + break; } - LOG(log_note, logtype_afpd, "main: IPC reconnect from [%u]", pid); + LOG(log_note, logtype_afpd, "main: IPC reconnect from pid [%u]", pid); if ((child = server_child_add(server_children, CHILD_DSIFORK, pid, fd)) == NULL) { LOG(log_error, logtype_afpd, "main: server_child_add"); close(fd[0]); diff --git a/libatalk/util/server_child.c b/libatalk/util/server_child.c index 7d04e050..016029f8 100644 --- a/libatalk/util/server_child.c +++ b/libatalk/util/server_child.c @@ -135,8 +135,10 @@ afp_child_t *server_child_add(server_child *children, int forkid, pid_t pid, uin /* it's possible that the child could have already died before the * pthread_sigmask. we need to check for this. */ - if (kill(pid, 0) < 0) + if (kill(pid, 0) < 0) { + LOG(log_error, logtype_default, "server_child_add: no such process pid [%d]", pid); goto exit; + } fork = (server_child_fork *) children->fork + forkid; diff --git a/libatalk/util/server_ipc.c b/libatalk/util/server_ipc.c index 87ffa776..451ea01a 100644 --- a/libatalk/util/server_ipc.c +++ b/libatalk/util/server_ipc.c @@ -217,18 +217,18 @@ int reconnect_ipc(AFPObj *obj) * @args children (rw) pointer to our structure with all childs * @args fd (r) IPC socket with child * - * @returns number of bytes transfered, -1 on error, 0 on EOF + * @returns -1 on error, 0 on success */ int ipc_server_read(server_child *children, int fd) { - int ret = 0; + int ret; struct ipc_header ipc; char buf[IPC_MAXMSGSIZE], *p; if ((ret = read(fd, buf, IPC_HEADERLEN)) != IPC_HEADERLEN) { LOG(log_error, logtype_afpd, "Reading IPC header failed (%i of %u bytes read): %s", ret, IPC_HEADERLEN, strerror(errno)); - return ret; + return -1; } p = buf; @@ -255,7 +255,7 @@ int ipc_server_read(server_child *children, int fd) if ((ret = read(fd, buf, ipc.len)) != (int) ipc.len) { LOG(log_info, logtype_afpd, "Reading IPC message failed (%u of %u bytes read): %s", ret, ipc.len, strerror(errno)); - return ret; + return -1; } } ipc.msg = buf; @@ -271,6 +271,7 @@ int ipc_server_read(server_child *children, int fd) if (readt(fd, &ipc.DSI_requestID, 2, 0, 2) != 2) { LOG (log_error, logtype_afpd, "ipc_read(%s:child[%u]): couldnt read DSI id: %s", ipc_cmd_str[ipc.command], ipc.child_pid, strerror(errno)); + return -1; } if ((ipc.afp_socket = recv_fd(fd, 1)) == -1) { LOG (log_error, logtype_afpd, "ipc_read(%s:child[%u]): recv_fd: %s", @@ -296,7 +297,7 @@ int ipc_server_read(server_child *children, int fd) return -1; } - return ret; + return 0; } /* ----------------- */ -- 2.39.2