struct rlimit rlim;
if (getrlimit(RLIMIT_NOFILE, &rlim) != 0) {
- LOG(log_error, logtype_afpd, "setlimits: %s", strerror(errno));
- exit(1);
+ LOG(log_warning, logtype_afpd, "setlimits: reading current limits failed: %s", strerror(errno));
+ return -1;
}
if (rlim.rlim_cur != RLIM_INFINITY && rlim.rlim_cur < 65535) {
rlim.rlim_cur = 65535;
if (rlim.rlim_max != RLIM_INFINITY && rlim.rlim_max < 65535)
rlim.rlim_max = 65535;
if (setrlimit(RLIMIT_NOFILE, &rlim) != 0) {
- LOG(log_error, logtype_afpd, "setlimits: %s", strerror(errno));
- exit(1);
+ LOG(log_warning, logtype_afpd, "setlimits: increasing limits failed: %s", strerror(errno));
+ return -1;
}
}
return 0;
/* watch atp, dsi sockets and ipc parent/child file descriptor. */
if (default_options.flags & OPTION_KEEPSESSIONS) {
- LOG(log_note, logtype_afpd, "Activating continous service");
+ LOG(log_note, logtype_afpd, "Activating continuous service");
disasociated_ipc_fd = ipc_server_uds(_PATH_AFP_IPC);
}
(void)setlimits();
afp_child_t *child;
- int fd[2]; /* we only use one, but server_child_add expects [2] */
+ int recon_ipc_fd;
pid_t pid;
int saveerrno;
&polldata,
&fdset_used,
&fdset_size,
- child->ipc_fds[0],
+ child->ipc_fd,
IPC_FD,
child);
}
child = (afp_child_t *)polldata[i].data;
LOG(log_debug, logtype_afpd, "main: IPC request from child[%u]", child->pid);
- 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;
+ if (ipc_server_read(server_children, child->ipc_fd) != 0) {
+ fdset_del_fd(&fdset, &polldata, &fdset_used, &fdset_size, child->ipc_fd);
+ close(child->ipc_fd);
+ child->ipc_fd = -1;
if ((default_options.flags & OPTION_KEEPSESSIONS) && child->disasociated) {
LOG(log_note, logtype_afpd, "main: removing reattached child[%u]", child->pid);
server_child_remove(server_children, CHILD_DSIFORK, child->pid);
case DISASOCIATED_IPC_FD:
LOG(log_debug, logtype_afpd, "main: IPC reconnect request");
- if ((fd[0] = accept(disasociated_ipc_fd, NULL, NULL)) == -1) {
+ if ((recon_ipc_fd = accept(disasociated_ipc_fd, NULL, NULL)) == -1) {
LOG(log_error, logtype_afpd, "main: accept: %s", strerror(errno));
break;
}
- if (readt(fd[0], &pid, sizeof(pid_t), 0, 1) != sizeof(pid_t)) {
+ if (readt(recon_ipc_fd, &pid, sizeof(pid_t), 0, 1) != sizeof(pid_t)) {
LOG(log_error, logtype_afpd, "main: readt: %s", strerror(errno));
- close(fd[0]);
+ close(recon_ipc_fd);
break;
}
LOG(log_note, logtype_afpd, "main: IPC reconnect from pid [%u]", pid);
- if ((child = server_child_add(server_children, CHILD_DSIFORK, pid, fd)) == NULL) {
+
+ if ((child = server_child_add(server_children, CHILD_DSIFORK, pid, recon_ipc_fd)) == NULL) {
LOG(log_error, logtype_afpd, "main: server_child_add");
- close(fd[0]);
+ close(recon_ipc_fd);
break;
}
child->disasociated = 1;
&polldata,
&fdset_used,
&fdset_size,
- fd[0],
+ recon_ipc_fd,
IPC_FD,
child);
break;