X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fafpd%2Fmain.c;h=1c5c4c425e4359e96e3ceea8539d574cbb52ef2c;hp=ac95bb8c3c8ed83b7519038d244b7e72234a3ead;hb=d2da4b77412a33dc2d62c7877e7b331285dadab6;hpb=26c02c0d56d76a5b775e793e8ec1ea10d0040a7b diff --git a/etc/afpd/main.c b/etc/afpd/main.c index ac95bb8c..1c5c4c42 100644 --- a/etc/afpd/main.c +++ b/etc/afpd/main.c @@ -60,7 +60,6 @@ static afp_child_t *dsi_start(AFPObj *obj, DSI *dsi, server_child *server_childr static void afp_exit(int ret) { - server_unlock(_PATH_AFPDLOCK); exit(ret); } @@ -129,7 +128,6 @@ static void afp_goaway(int sig) if (server_children) server_child_kill(server_children, CHILD_DSIFORK, sig); - server_unlock(_PATH_AFPDLOCK); _exit(0); break; @@ -221,24 +219,15 @@ int main(int ac, char **av) /* Parse argv args and initialize default options */ afp_options_parse_cmdline(&obj, ac, av); - if (check_lockfile("afpd", _PATH_AFPDLOCK) != 0) - exit(EXITERR_SYS); - - if (!(obj.options.flags & OPTION_DEBUG) && (daemonize(0, 0) != 0)) - exit(EXITERR_SYS); - - if (create_lockfile("afpd", _PATH_AFPDLOCK) != 0) + if (!(obj.cmdlineflags & OPTION_DEBUG) && (daemonize(0, 0) != 0)) exit(EXITERR_SYS); /* Log SIGBUS/SIGSEGV SBT */ fault_setup(NULL); - if (afp_config_parse(&obj) != 0) + if (afp_config_parse(&obj, "afpd") != 0) afp_exit(EXITERR_CONF); - set_processname("afpd"); - setuplog(obj.options.logconfig, obj.options.logfile); - /* Save the user's current umask */ obj.options.save_mask = umask(obj.options.umask); @@ -249,6 +238,9 @@ int main(int ac, char **av) LOG(log_error, logtype_afpd, "main: server_child alloc: %s", strerror(errno) ); afp_exit(EXITERR_SYS); } + + sigemptyset(&sigs); + pthread_sigmask(SIG_SETMASK, &sigs, NULL); memset(&sv, 0, sizeof(sv)); /* linux at least up to 2.4.22 send a SIGXFZ for vfat fs, @@ -324,7 +316,7 @@ int main(int ac, char **av) afp_exit(EXITERR_SYS); } - /* afpd.conf: not in config file: lockfile, connections, configfile + /* afp.conf: not in config file: lockfile, configfile * preference: command-line provides defaults. * config file over-writes defaults. * @@ -355,7 +347,7 @@ int main(int ac, char **av) /* watch atp, dsi sockets and ipc parent/child file descriptor. */ if (obj.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); } @@ -365,7 +357,7 @@ int main(int ac, char **av) (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; @@ -420,7 +412,7 @@ int main(int ac, char **av) } for (int i = 0; i < fdset_used; i++) { - if (fdset[i].revents & (POLLIN | POLLERR | POLLHUP)) { + if (fdset[i].revents & (POLLIN | POLLERR | POLLHUP | POLLNVAL)) { switch (polldata[i].fdtype) { case LISTEN_FD: @@ -431,7 +423,7 @@ int main(int ac, char **av) &polldata, &fdset_used, &fdset_size, - child->ipc_fds[0], + child->ipc_fd, IPC_FD, child); } @@ -441,10 +433,10 @@ 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 (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 ((obj.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); @@ -454,19 +446,20 @@ int main(int ac, char **av) 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; @@ -475,7 +468,7 @@ int main(int ac, char **av) &polldata, &fdset_used, &fdset_size, - fd[0], + recon_ipc_fd, IPC_FD, child); break; @@ -495,18 +488,14 @@ static afp_child_t *dsi_start(AFPObj *obj, DSI *dsi, server_child *server_childr { afp_child_t *child = NULL; - if (!(child = dsi_getsession(dsi, - server_children, - obj->options.tickleval))) { + if (dsi_getsession(dsi, server_children, obj->options.tickleval, &child) != 0) { LOG(log_error, logtype_afpd, "dsi_start: session error: %s", strerror(errno)); return NULL; } /* we've forked. */ - if (child->ipc_fds[0] == -1) { + if (child == NULL) { configfree(obj, dsi); - obj->ipc_fd = child->ipc_fds[1]; - free(child); afp_over_dsi(obj); /* start a session */ exit (0); }