X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fafp_dsi.c;h=63d2f286499db68372e57bfa1e285e7fa9273b06;hb=87c02d4df072d4b069b2e75462b2ee95eeb1fe7a;hp=8379f5bca3706f79997f9b7001275986c1eb407c;hpb=c3a0032fd581b227e6bcec08fba7c218f49e526a;p=netatalk.git diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c index 8379f5bc..63d2f286 100644 --- a/etc/afpd/afp_dsi.c +++ b/etc/afpd/afp_dsi.c @@ -37,18 +37,15 @@ #include #include #include - #include +#include +#include + #include "switch.h" #include "auth.h" #include "fork.h" #include "dircache.h" -#ifdef FORCE_UIDGID -#warning UIDGID -#include "uid.h" -#endif /* FORCE_UIDGID */ - #ifndef SOL_TCP #define SOL_TCP IPPROTO_TCP #endif @@ -79,8 +76,9 @@ static rc_elem_t replaycache[REPLAYCACHE_SIZE]; static sigjmp_buf recon_jmp; static void afp_dsi_close(AFPObj *obj) { - DSI *dsi = obj->handle; - + DSI *dsi = obj->dsi; + sigset_t sigs; + close(obj->ipc_fd); obj->ipc_fd = -1; @@ -96,9 +94,13 @@ static void afp_dsi_close(AFPObj *obj) } } - close_all_vol(); - if (obj->logout) + close_all_vol(obj); + if (obj->logout) { + /* Block sigs, PAM/systemd/whoever might send us a SIG??? in (*obj->logout)() -> pam_close_session() */ + sigfillset(&sigs); + pthread_sigmask(SIG_BLOCK, &sigs, NULL); (*obj->logout)(); + } LOG(log_note, logtype_afpd, "AFP statistics: %.2f KB read, %.2f KB written", dsi->read_count/1024.0, dsi->write_count/1024.0); @@ -113,7 +115,7 @@ static void afp_dsi_close(AFPObj *obj) */ static void afp_dsi_die(int sig) { - DSI *dsi = (DSI *)AFPobj->handle; + DSI *dsi = (DSI *)AFPobj->dsi; if (dsi->flags & DSI_RECONINPROG) { /* Primary reconnect succeeded, got SIGTERM from afpd parent */ @@ -126,7 +128,7 @@ static void afp_dsi_die(int sig) exit(0); } - dsi_attention(AFPobj->handle, AFPATTN_SHUTDOWN); + dsi_attention(AFPobj->dsi, AFPATTN_SHUTDOWN); afp_dsi_close(AFPobj); if (sig) /* if no signal, assume dieing because logins are disabled & don't log it (maintenance mode)*/ @@ -139,31 +141,12 @@ static void afp_dsi_die(int sig) } } -/* SIGQUIT handler */ -static void ipc_reconnect_handler(int sig _U_) -{ - DSI *dsi = (DSI *)AFPobj->handle; - - if (reconnect_ipc(AFPobj) != 0) { - LOG(log_error, logtype_afpd, "ipc_reconnect_handler: failed IPC reconnect"); - afp_dsi_close(AFPobj); - exit(EXITERR_SYS); - } - - if (ipc_child_write(AFPobj->ipc_fd, IPC_GETSESSION, AFPobj->sinfo.clientid_len, AFPobj->sinfo.clientid) != 0) { - LOG(log_error, logtype_afpd, "ipc_reconnect_handler: failed IPC ID resend"); - afp_dsi_close(AFPobj); - exit(EXITERR_SYS); - } - LOG(log_note, logtype_afpd, "ipc_reconnect_handler: IPC reconnect done"); -} - /* SIGURG handler (primary reconnect) */ static void afp_dsi_transfer_session(int sig _U_) { uint16_t dsiID; int socket; - DSI *dsi = (DSI *)AFPobj->handle; + DSI *dsi = (DSI *)AFPobj->dsi; LOG(log_debug, logtype_afpd, "afp_dsi_transfer_session: got SIGURG, trying to receive session"); @@ -214,13 +197,13 @@ static void afp_dsi_timedown(int sig _U_) { struct sigaction sv; struct itimerval it; - DSI *dsi = (DSI *)AFPobj->handle; + DSI *dsi = (DSI *)AFPobj->dsi; dsi->flags |= DSI_DIE; /* shutdown and don't reconnect. server going down in 5 minutes. */ setmessage("The server is going down for maintenance."); - if (dsi_attention(AFPobj->handle, AFPATTN_SHUTDOWN | AFPATTN_NORECONNECT | + if (dsi_attention(AFPobj->dsi, AFPATTN_SHUTDOWN | AFPATTN_NORECONNECT | AFPATTN_MESG | AFPATTN_TIME(5)) < 0) { - DSI *dsi = (DSI *)AFPobj->handle; + DSI *dsi = (DSI *)AFPobj->dsi; dsi->down_request = 1; } @@ -277,17 +260,17 @@ static void afp_dsi_debug(int sig _U_) /* ---------------------- */ static void afp_dsi_getmesg (int sig _U_) { - DSI *dsi = (DSI *)AFPobj->handle; + DSI *dsi = (DSI *)AFPobj->dsi; dsi->msg_request = 1; - if (dsi_attention(AFPobj->handle, AFPATTN_MESG | AFPATTN_TIME(5)) < 0) + if (dsi_attention(AFPobj->dsi, AFPATTN_MESG | AFPATTN_TIME(5)) < 0) dsi->msg_request = 2; } static void alarm_handler(int sig _U_) { int err; - DSI *dsi = (DSI *)AFPobj->handle; + DSI *dsi = (DSI *)AFPobj->dsi; /* we have to restart the timer because some libraries may use alarm() */ setitimer(ITIMER_REAL, &dsi->timer, NULL); @@ -341,7 +324,7 @@ static void alarm_handler(int sig _U_) if ((err = pollvoltime(AFPobj)) == 0) LOG(log_debug, logtype_afpd, "afp_alarm: sending DSI tickle"); - err = dsi_tickle(AFPobj->handle); + err = dsi_tickle(AFPobj->dsi); if (err <= 0) { if (geteuid() == 0) { LOG(log_note, logtype_afpd, "afp_alarm: unauthenticated user, connection problem"); @@ -365,36 +348,23 @@ static void pending_request(DSI *dsi) if (dsi->msg_request) { if (dsi->msg_request == 2) { /* didn't send it in signal handler */ - dsi_attention(AFPobj->handle, AFPATTN_MESG | AFPATTN_TIME(5)); + dsi_attention(AFPobj->dsi, AFPATTN_MESG | AFPATTN_TIME(5)); } dsi->msg_request = 0; readmessage(AFPobj); } if (dsi->down_request) { dsi->down_request = 0; - dsi_attention(AFPobj->handle, AFPATTN_SHUTDOWN | AFPATTN_NORECONNECT | + dsi_attention(AFPobj->dsi, AFPATTN_SHUTDOWN | AFPATTN_NORECONNECT | AFPATTN_MESG | AFPATTN_TIME(5)); } } -/* ------------------------------------------- - afp over dsi. this never returns. -*/ -void afp_over_dsi(AFPObj *obj) +void afp_over_dsi_sighandlers(AFPObj *obj) { - DSI *dsi = (DSI *) obj->handle; - int rc_idx; - u_int32_t err, cmd; - u_int8_t function; + DSI *dsi = (DSI *) obj->dsi; struct sigaction action; - AFPobj = obj; - dsi->AFPobj = obj; - obj->exit = afp_dsi_die; - obj->reply = (int (*)()) dsi_cmdreply; - obj->attention = (int (*)(void *, AFPUserBytes)) dsi_attention; - dsi->tickle = 0; - memset(&action, 0, sizeof(action)); sigfillset(&action.sa_mask); action.sa_flags = SA_RESTART; @@ -421,7 +391,7 @@ void afp_over_dsi(AFPObj *obj) } /* install SIGQUIT */ - action.sa_handler = ipc_reconnect_handler; + action.sa_handler = afp_dsi_die; if ( sigaction(SIGQUIT, &action, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); afp_dsi_die(EXITERR_SYS); @@ -457,6 +427,25 @@ void afp_over_dsi(AFPObj *obj) afp_dsi_die(EXITERR_SYS); } #endif /* DEBUGGING */ +} + +/* ------------------------------------------- + afp over dsi. this never returns. +*/ +void afp_over_dsi(AFPObj *obj) +{ + DSI *dsi = (DSI *) obj->dsi; + int rc_idx; + uint32_t err, cmd; + uint8_t function; + + AFPobj = obj; + obj->exit = afp_dsi_die; + obj->reply = (int (*)()) dsi_cmdreply; + obj->attention = (int (*)(void *, AFPUserBytes)) dsi_attention; + dsi->tickle = 0; + + afp_over_dsi_sighandlers(obj); if (dircache_init(obj->options.dircachesize) != 0) afp_dsi_die(EXITERR_SYS); @@ -485,6 +474,12 @@ void afp_over_dsi(AFPObj *obj) int flag = 1; setsockopt(dsi->socket, SOL_TCP, TCP_NODELAY, &flag, sizeof(flag)); + /* Initialize Spotlight */ + if ((obj->options.flags & OPTION_SPOTLIGHT) && (obj->options.slmod_path)) + sl_mod_load(obj->options.slmod_path); + + ipc_child_state(obj, DSI_RUNNING); + /* get stuck here until the end */ while (1) { if (sigsetjmp(recon_jmp, 1) != 0) @@ -509,15 +504,6 @@ void afp_over_dsi(AFPObj *obj) exit(0); } -#if 0 - /* got ECONNRESET in read from client => exit*/ - if (dsi->flags & DSI_GOT_ECONNRESET) { - LOG(log_note, logtype_afpd, "afp_over_dsi: client connection reset"); - afp_dsi_close(obj); - exit(0); - } -#endif - if (dsi->flags & DSI_RECONINPROG) { LOG(log_note, logtype_afpd, "afp_over_dsi: failed reconnect"); afp_dsi_close(obj); @@ -528,8 +514,11 @@ void afp_over_dsi(AFPObj *obj) if (dsi_disconnect(dsi) != 0) afp_dsi_die(EXITERR_CLNT); + ipc_child_state(obj, DSI_DISCONNECTED); + while (dsi->flags & DSI_DISCONNECTED) pause(); /* gets interrupted by SIGALARM or SIGURG tickle */ + ipc_child_state(obj, DSI_RUNNING); continue; /* continue receiving until disconnect timer expires * or a primary reconnect succeeds */ } @@ -538,6 +527,7 @@ void afp_over_dsi(AFPObj *obj) LOG(log_debug, logtype_afpd, "afp_over_dsi: got data, ending normal sleep"); dsi->flags &= ~DSI_SLEEPING; dsi->tickle = 0; + ipc_child_state(obj, DSI_RUNNING); } if (reload_request) { @@ -555,15 +545,15 @@ void afp_over_dsi(AFPObj *obj) if (debugging) { if (obj->options.logconfig) - setuplog(obj->options.logconfig); + setuplog(obj->options.logconfig, obj->options.logfile); else - setuplog("default log_note"); + setuplog("default:note", NULL); debugging = 0; } else { char logstr[50]; debugging = 1; - sprintf(logstr, "default log_maxdebug /tmp/afpd.%u.XXXXXX", getpid()); - setuplog(logstr); + sprintf(logstr, "/tmp/afpd.%u.XXXXXX", getpid()); + setuplog("default:maxdebug", logstr); } } @@ -618,20 +608,17 @@ void afp_over_dsi(AFPObj *obj) LOG(log_debug, logtype_afpd, "<== Start AFP command: %s", AfpNum2name(function)); + AFP_AFPFUNC_START(function, (char *)AfpNum2name(function)); err = (*afp_switch[function])(obj, - (char *)&dsi->commands, dsi->cmdlen, + (char *)dsi->commands, dsi->cmdlen, (char *)&dsi->data, &dsi->datalen); + AFP_AFPFUNC_DONE(function, (char *)AfpNum2name(function)); LOG(log_debug, logtype_afpd, "==> Finished AFP command: %s -> %s", AfpNum2name(function), AfpErr2name(err)); dir_free_invalid_q(); -#ifdef FORCE_UIDGID - /* bring everything back to old euid, egid */ - if (obj->force_uid) - restore_uidgid ( &obj->uidgid ); -#endif /* FORCE_UIDGID */ dsi->flags &= ~DSI_RUNNING; /* Add result to the AFP replay cache */ @@ -664,19 +651,18 @@ void afp_over_dsi(AFPObj *obj) LOG(log_debug, logtype_afpd, "<== Start AFP command: %s", AfpNum2name(function)); + AFP_AFPFUNC_START(function, (char *)AfpNum2name(function)); + err = (*afp_switch[function])(obj, - (char *)&dsi->commands, dsi->cmdlen, + (char *)dsi->commands, dsi->cmdlen, (char *)&dsi->data, &dsi->datalen); + AFP_AFPFUNC_DONE(function, (char *)AfpNum2name(function)); + LOG(log_debug, logtype_afpd, "==> Finished AFP command: %s -> %s", AfpNum2name(function), AfpErr2name(err)); dsi->flags &= ~DSI_RUNNING; -#ifdef FORCE_UIDGID - /* bring everything back to old euid, egid */ - if (obj->force_uid) - restore_uidgid ( &obj->uidgid ); -#endif /* FORCE_UIDGID */ } else { LOG(log_error, logtype_afpd, "(write) bad function %x", function); dsi->datalen = 0;