X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fafpd%2Fafp_dsi.c;h=8529177d6cf85588270148e1cca524cbcb64d54a;hp=390039f7baa2f3c2b15ef674ae04414bd1ea2f5a;hb=a49b66d98f3de80884b15f68285f4b602db19885;hpb=8b9b8877d1d19d2490f691d0d4f091e4398cbd30 diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c index 390039f7..8529177d 100644 --- a/etc/afpd/afp_dsi.c +++ b/etc/afpd/afp_dsi.c @@ -24,16 +24,19 @@ #include #endif /* HAVE_SYS_STAT_H */ #include +#include #include -#include #include +#include +#include #include #include #include #include #include #include +#include #include #include "switch.h" @@ -46,6 +49,10 @@ #include "uid.h" #endif /* FORCE_UIDGID */ +#ifndef SOL_TCP +#define SOL_TCP IPPROTO_TCP +#endif + /* * We generally pass this from afp_over_dsi to all afp_* funcs, so it should already be * available everywhere. Unfortunately some funcs (eg acltoownermode) need acces to it @@ -73,7 +80,8 @@ static sigjmp_buf recon_jmp; static void afp_dsi_close(AFPObj *obj) { DSI *dsi = obj->handle; - + sigset_t sigs; + close(obj->ipc_fd); obj->ipc_fd = -1; @@ -90,8 +98,13 @@ static void afp_dsi_close(AFPObj *obj) } close_all_vol(); - if (obj->logout) + + 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); @@ -137,21 +150,18 @@ static void ipc_reconnect_handler(int sig _U_) { DSI *dsi = (DSI *)AFPobj->handle; - LOG(log_note, logtype_afpd, "ipc_reconnect_handler: got SIGQUIT, trying IPC reconnect"); - if (reconnect_ipc(AFPobj) != 0) { LOG(log_error, logtype_afpd, "ipc_reconnect_handler: failed IPC reconnect"); afp_dsi_close(AFPobj); exit(EXITERR_SYS); } - LOG(log_note, logtype_afpd, "ipc_reconnect_handler: resending client ID"); 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: done"); + LOG(log_note, logtype_afpd, "ipc_reconnect_handler: IPC reconnect done"); } /* SIGURG handler (primary reconnect) */ @@ -328,7 +338,7 @@ static void alarm_handler(int sig _U_) } /* if we're in the midst of processing something, don't die. */ - if ( !(dsi->flags & DSI_RUNNING) && (dsi->tickle >= AFPobj->options.timeout)) { + if (dsi->tickle >= AFPobj->options.timeout) { LOG(log_error, logtype_afpd, "afp_alarm: child timed out, entering disconnected state"); if (dsi_disconnect(dsi) != 0) afp_dsi_die(EXITERR_CLNT); @@ -373,24 +383,11 @@ static void pending_request(DSI *dsi) } } -/* ------------------------------------------- - 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; 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; @@ -453,6 +450,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->handle; + int rc_idx; + u_int32_t err, cmd; + u_int8_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); @@ -477,6 +493,10 @@ void afp_over_dsi(AFPObj *obj) } } + /* set TCP_NODELAY */ + int flag = 1; + setsockopt(dsi->socket, SOL_TCP, TCP_NODELAY, &flag, sizeof(flag)); + /* get stuck here until the end */ while (1) { if (sigsetjmp(recon_jmp, 1) != 0) @@ -484,7 +504,7 @@ void afp_over_dsi(AFPObj *obj) continue; /* Blocking read on the network socket */ - cmd = dsi_receive(dsi); + cmd = dsi_stream_receive(dsi); if (cmd == 0) { /* cmd == 0 is the error condition */ @@ -501,18 +521,27 @@ 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); + exit(0); + } /* Some error on the client connection, enter disconnected state */ if (dsi_disconnect(dsi) != 0) afp_dsi_die(EXITERR_CLNT); - pause(); /* gets interrupted by SIGALARM or SIGURG tickle */ + while (dsi->flags & DSI_DISCONNECTED) + pause(); /* gets interrupted by SIGALARM or SIGURG tickle */ continue; /* continue receiving until disconnect timer expires * or a primary reconnect succeeds */ } @@ -584,7 +613,7 @@ void afp_over_dsi(AFPObj *obj) /* AFP replay cache */ rc_idx = dsi->clientID % REPLAYCACHE_SIZE; - LOG(log_debug, logtype_afpd, "DSI request ID: %u", dsi->clientID); + LOG(log_debug, logtype_dsi, "DSI request ID: %u", dsi->clientID); if (replaycache[rc_idx].DSIreqID == dsi->clientID && replaycache[rc_idx].AFPcommand == function) { @@ -632,9 +661,7 @@ void afp_over_dsi(AFPObj *obj) if (dsi->flags & DSI_NOREPLY) { dsi->flags &= ~DSI_NOREPLY; break; - } - - if (!dsi_cmdreply(dsi, err)) { + } else if (!dsi_cmdreply(dsi, err)) { LOG(log_error, logtype_afpd, "dsi_cmdreply(%d): %s", dsi->socket, strerror(errno) ); if (dsi_disconnect(dsi) != 0) afp_dsi_die(EXITERR_CLNT); @@ -688,6 +715,8 @@ void afp_over_dsi(AFPObj *obj) break; } pending_request(dsi); + + fce_pending_events(obj); } /* error */