X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fafp_dsi.c;h=f1e371676eac9d1213dbc7b667e6cc8c35cd9a9c;hb=a34b4264ed69791d41a8a6ea048e912ba8a8be0a;hp=3b4c01b097ea4d30876582e750c969c4fef7c1db;hpb=181e8305cdc7c058e674046650b4da8769bc5e46;p=netatalk.git diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c index 3b4c01b0..f1e37167 100644 --- a/etc/afpd/afp_dsi.c +++ b/etc/afpd/afp_dsi.c @@ -24,23 +24,30 @@ #include #endif /* HAVE_SYS_STAT_H */ #include +#include #include -#include +#include +#include +#include #include #include #include +#include +#include +#include +#include +#include +#include -#include "globals.h" #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 /* * We generally pass this from afp_over_dsi to all afp_* funcs, so it should already be @@ -52,12 +59,6 @@ */ AFPObj *AFPobj = NULL; -static struct { - AFPObj *obj; - unsigned char flags; - int tickle; -} child; - typedef struct { uint16_t DSIreqID; uint8_t AFPcommand; @@ -69,11 +70,12 @@ typedef struct { * - fix sized array * - indexed just by taking DSIreqID mod REPLAYCACHE_SIZE */ -rc_elem_t replaycache[REPLAYCACHE_SIZE]; +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; close(obj->ipc_fd); obj->ipc_fd = -1; @@ -90,11 +92,11 @@ static void afp_dsi_close(AFPObj *obj) } } - close_all_vol(); + close_all_vol(obj); if (obj->logout) (*obj->logout)(); - LOG(log_info, logtype_afpd, "AFP statistics: %.2f KB read, %.2f KB written", + LOG(log_note, logtype_afpd, "AFP statistics: %.2f KB read, %.2f KB written", dsi->read_count/1024.0, dsi->write_count/1024.0); log_dircache_stat(); @@ -107,20 +109,22 @@ static void afp_dsi_close(AFPObj *obj) */ static void afp_dsi_die(int sig) { -static volatile int in_handler; - - if (in_handler) { - return; + DSI *dsi = (DSI *)AFPobj->dsi; + + if (dsi->flags & DSI_RECONINPROG) { + /* Primary reconnect succeeded, got SIGTERM from afpd parent */ + dsi->flags &= ~DSI_RECONINPROG; + return; /* this returns to afp_disconnect */ + } + + if (dsi->flags & DSI_DISCONNECTED) { + LOG(log_note, logtype_afpd, "Disconnected session terminating"); + exit(0); } - /* it's not atomic but we don't care because it's an exit function - * ie if a signal is received here, between the test and the affectation, - * it will not return. - */ - in_handler = 1; - - dsi_attention(child.obj->handle, AFPATTN_SHUTDOWN); - afp_dsi_close(child.obj); - if (sig) /* if no signal, assume dieing because logins are disabled & + + 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)*/ LOG(log_info, logtype_afpd, "Connection terminated"); if (sig == SIGTERM || sig == SIGALRM) { @@ -131,34 +135,56 @@ static volatile int in_handler; } } +/* SIGQUIT handler */ +static void ipc_reconnect_handler(int sig _U_) +{ + DSI *dsi = (DSI *)AFPobj->dsi; + + 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 *)child.obj->handle; + DSI *dsi = (DSI *)AFPobj->dsi; - LOG(log_note, logtype_afpd, "afp_dsi_transfer_session: got SIGURG, trying to receive session"); + LOG(log_debug, logtype_afpd, "afp_dsi_transfer_session: got SIGURG, trying to receive session"); - if (readt(child.obj->ipc_fd, &dsiID, 2, 0, 2) != 2) { + if (readt(AFPobj->ipc_fd, &dsiID, 2, 0, 2) != 2) { LOG(log_error, logtype_afpd, "afp_dsi_transfer_session: couldn't receive DSI id, goodbye"); - afp_dsi_close(child.obj); + afp_dsi_close(AFPobj); exit(EXITERR_SYS); } - if ((socket = recv_fd(child.obj->ipc_fd, 1)) == -1) { + if ((socket = recv_fd(AFPobj->ipc_fd, 1)) == -1) { LOG(log_error, logtype_afpd, "afp_dsi_transfer_session: couldn't receive session fd, goodbye"); - afp_dsi_close(child.obj); + afp_dsi_close(AFPobj); exit(EXITERR_SYS); } - if (dsi->socket != -1) - close(dsi->socket); + LOG(log_debug, logtype_afpd, "afp_dsi_transfer_session: received socket fd: %i", socket); + + dsi->proto_close(dsi); dsi->socket = socket; + dsi->flags = DSI_RECONSOCKET; + dsi->datalen = 0; + dsi->eof = dsi->start = dsi->buffer; + dsi->in_write = 0; dsi->header.dsi_requestID = dsiID; - dsi->header.dsi_len = 0; - dsi->header.dsi_code = AFP_OK; dsi->header.dsi_command = DSIFUNC_CMD; - dsi->header.dsi_flags = DSIFL_REPLY; /* * The session transfer happens in the middle of FPDisconnect old session, thus we @@ -166,7 +192,7 @@ static void afp_dsi_transfer_session(int sig _U_) */ if (!dsi_cmdreply(dsi, AFP_OK)) { LOG(log_error, logtype_afpd, "dsi_cmdreply: %s", strerror(errno) ); - afp_dsi_close(child.obj); + afp_dsi_close(AFPobj); exit(EXITERR_CLNT); } @@ -176,12 +202,7 @@ static void afp_dsi_transfer_session(int sig _U_) * reading/continuing from the connected socket that was passed via the parent from * another session. The parent will terminate that session. */ -} - -/* */ -static void afp_dsi_sleep(void) -{ - dsi_sleep(child.obj->handle, 1); + siglongjmp(recon_jmp, 1); } /* ------------------- */ @@ -189,13 +210,13 @@ static void afp_dsi_timedown(int sig _U_) { struct sigaction sv; struct itimerval it; - DSI *dsi = (DSI *)child.obj->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(child.obj->handle, AFPATTN_SHUTDOWN | AFPATTN_NORECONNECT | + if (dsi_attention(AFPobj->dsi, AFPATTN_SHUTDOWN | AFPATTN_NORECONNECT | AFPATTN_MESG | AFPATTN_TIME(5)) < 0) { - DSI *dsi = (DSI *) child.obj->handle; + DSI *dsi = (DSI *)AFPobj->dsi; dsi->down_request = 1; } @@ -250,21 +271,19 @@ static void afp_dsi_debug(int sig _U_) } /* ---------------------- */ -#ifdef SERVERTEXT static void afp_dsi_getmesg (int sig _U_) { - DSI *dsi = (DSI *) child.obj->handle; + DSI *dsi = (DSI *)AFPobj->dsi; dsi->msg_request = 1; - if (dsi_attention(child.obj->handle, AFPATTN_MESG | AFPATTN_TIME(5)) < 0) + if (dsi_attention(AFPobj->dsi, AFPATTN_MESG | AFPATTN_TIME(5)) < 0) dsi->msg_request = 2; } -#endif /* SERVERTEXT */ static void alarm_handler(int sig _U_) { int err; - DSI *dsi = (DSI *) child.obj->handle; + DSI *dsi = (DSI *)AFPobj->dsi; /* we have to restart the timer because some libraries may use alarm() */ setitimer(ITIMER_REAL, &dsi->timer, NULL); @@ -272,40 +291,61 @@ static void alarm_handler(int sig _U_) /* we got some traffic from the client since the previous timer tick. */ if ((dsi->flags & DSI_DATA)) { dsi->flags &= ~DSI_DATA; - dsi->flags &= ~DSI_DISCONNECTED; - return; + return; } - child.tickle++; + dsi->tickle++; + LOG(log_maxdebug, logtype_afpd, "alarm: tickles: %u, flags: %s|%s|%s|%s|%s|%s|%s|%s|%s", + dsi->tickle, + (dsi->flags & DSI_DATA) ? "DSI_DATA" : "-", + (dsi->flags & DSI_RUNNING) ? "DSI_RUNNING" : "-", + (dsi->flags & DSI_SLEEPING) ? "DSI_SLEEPING" : "-", + (dsi->flags & DSI_EXTSLEEP) ? "DSI_EXTSLEEP" : "-", + (dsi->flags & DSI_DISCONNECTED) ? "DSI_DISCONNECTED" : "-", + (dsi->flags & DSI_DIE) ? "DSI_DIE" : "-", + (dsi->flags & DSI_NOREPLY) ? "DSI_NOREPLY" : "-", + (dsi->flags & DSI_RECONSOCKET) ? "DSI_RECONSOCKET" : "-", + (dsi->flags & DSI_RECONINPROG) ? "DSI_RECONINPROG" : "-"); if (dsi->flags & DSI_SLEEPING) { - if (child.tickle < child.obj->options.sleep) { - LOG(log_error, logtype_afpd, "afp_alarm: sleep time ended"); + if (dsi->tickle > AFPobj->options.sleep) { + LOG(log_note, logtype_afpd, "afp_alarm: sleep time ended"); afp_dsi_die(EXITERR_CLNT); } return; } if (dsi->flags & DSI_DISCONNECTED) { - if (child.tickle > child.obj->options.disconnected) { - LOG(log_error, logtype_afpd, "afp_alarm: no reconnect within 10 minutes, goodbye"); + if (geteuid() == 0) { + LOG(log_note, logtype_afpd, "afp_alarm: unauthenticated user, connection problem"); + afp_dsi_die(EXITERR_CLNT); + } + if (dsi->tickle > AFPobj->options.disconnected) { + LOG(log_error, logtype_afpd, "afp_alarm: reconnect timer expired, goodbye"); afp_dsi_die(EXITERR_CLNT); } return; } /* if we're in the midst of processing something, don't die. */ - if ( !(dsi->flags & DSI_RUNNING) && (child.tickle > child.obj->options.timeout)) { + if (dsi->tickle >= AFPobj->options.timeout) { LOG(log_error, logtype_afpd, "afp_alarm: child timed out, entering disconnected state"); - dsi->flags |= DSI_DISCONNECTED; + if (dsi_disconnect(dsi) != 0) + afp_dsi_die(EXITERR_CLNT); return; } - if ((err = pollvoltime(child.obj)) == 0) - err = dsi_tickle(child.obj->handle); + if ((err = pollvoltime(AFPobj)) == 0) + LOG(log_debug, logtype_afpd, "afp_alarm: sending DSI tickle"); + err = dsi_tickle(AFPobj->dsi); if (err <= 0) { + if (geteuid() == 0) { + LOG(log_note, logtype_afpd, "afp_alarm: unauthenticated user, connection problem"); + afp_dsi_die(EXITERR_CLNT); + } LOG(log_error, logtype_afpd, "afp_alarm: connection problem, entering disconnected state"); - dsi->flags |= DSI_DISCONNECTED; + if (dsi_disconnect(dsi) != 0) + afp_dsi_die(EXITERR_CLNT); } } @@ -321,14 +361,14 @@ static void pending_request(DSI *dsi) if (dsi->msg_request) { if (dsi->msg_request == 2) { /* didn't send it in signal handler */ - dsi_attention(child.obj->handle, AFPATTN_MESG | AFPATTN_TIME(5)); + dsi_attention(AFPobj->dsi, AFPATTN_MESG | AFPATTN_TIME(5)); } dsi->msg_request = 0; - readmessage(child.obj); + readmessage(AFPobj); } if (dsi->down_request) { dsi->down_request = 0; - dsi_attention(child.obj->handle, AFPATTN_SHUTDOWN | AFPATTN_NORECONNECT | + dsi_attention(AFPobj->dsi, AFPATTN_SHUTDOWN | AFPATTN_NORECONNECT | AFPATTN_MESG | AFPATTN_TIME(5)); } } @@ -338,34 +378,25 @@ static void pending_request(DSI *dsi) */ void afp_over_dsi(AFPObj *obj) { - DSI *dsi = (DSI *) obj->handle; + DSI *dsi = (DSI *) obj->dsi; int rc_idx; - u_int32_t err, cmd; - u_int8_t function; + uint32_t err, cmd; + uint8_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; - - obj->sleep = afp_dsi_sleep; - child.obj = obj; - child.tickle = child.flags = 0; + dsi->tickle = 0; memset(&action, 0, sizeof(action)); + sigfillset(&action.sa_mask); + action.sa_flags = SA_RESTART; /* install SIGHUP */ action.sa_handler = afp_dsi_reload; - sigemptyset( &action.sa_mask ); - sigaddset(&action.sa_mask, SIGALRM); - sigaddset(&action.sa_mask, SIGTERM); - sigaddset(&action.sa_mask, SIGUSR1); - sigaddset(&action.sa_mask, SIGINT); -#ifdef SERVERTEXT - sigaddset(&action.sa_mask, SIGUSR2); -#endif - action.sa_flags = SA_RESTART; if ( sigaction( SIGHUP, &action, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); afp_dsi_die(EXITERR_SYS); @@ -373,15 +404,6 @@ void afp_over_dsi(AFPObj *obj) /* install SIGURG */ action.sa_handler = afp_dsi_transfer_session; - sigemptyset( &action.sa_mask ); - sigaddset(&action.sa_mask, SIGALRM); - sigaddset(&action.sa_mask, SIGTERM); - sigaddset(&action.sa_mask, SIGUSR1); - sigaddset(&action.sa_mask, SIGINT); -#ifdef SERVERTEXT - sigaddset(&action.sa_mask, SIGUSR2); -#endif - action.sa_flags = SA_RESTART; if ( sigaction( SIGURG, &action, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); afp_dsi_die(EXITERR_SYS); @@ -389,46 +411,27 @@ void afp_over_dsi(AFPObj *obj) /* install SIGTERM */ action.sa_handler = afp_dsi_die; - sigemptyset( &action.sa_mask ); - sigaddset(&action.sa_mask, SIGALRM); - sigaddset(&action.sa_mask, SIGHUP); - sigaddset(&action.sa_mask, SIGUSR1); - sigaddset(&action.sa_mask, SIGINT); -#ifdef SERVERTEXT - sigaddset(&action.sa_mask, SIGUSR2); -#endif - action.sa_flags = SA_RESTART; if ( sigaction( SIGTERM, &action, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); afp_dsi_die(EXITERR_SYS); } -#ifdef SERVERTEXT - /* Added for server message support */ + /* install SIGQUIT */ + action.sa_handler = ipc_reconnect_handler; + if ( sigaction(SIGQUIT, &action, NULL ) < 0 ) { + LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); + afp_dsi_die(EXITERR_SYS); + } + + /* SIGUSR2 - server message support */ action.sa_handler = afp_dsi_getmesg; - sigemptyset( &action.sa_mask ); - sigaddset(&action.sa_mask, SIGALRM); - sigaddset(&action.sa_mask, SIGTERM); - sigaddset(&action.sa_mask, SIGUSR1); - sigaddset(&action.sa_mask, SIGHUP); - sigaddset(&action.sa_mask, SIGINT); - action.sa_flags = SA_RESTART; if ( sigaction( SIGUSR2, &action, NULL) < 0 ) { LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); afp_dsi_die(EXITERR_SYS); } -#endif /* SERVERTEXT */ /* SIGUSR1 - set down in 5 minutes */ action.sa_handler = afp_dsi_timedown; - sigemptyset( &action.sa_mask ); - sigaddset(&action.sa_mask, SIGALRM); - sigaddset(&action.sa_mask, SIGHUP); - sigaddset(&action.sa_mask, SIGTERM); - sigaddset(&action.sa_mask, SIGINT); -#ifdef SERVERTEXT - sigaddset(&action.sa_mask, SIGUSR2); -#endif action.sa_flags = SA_RESTART; if ( sigaction( SIGUSR1, &action, NULL) < 0 ) { LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); @@ -437,25 +440,14 @@ void afp_over_dsi(AFPObj *obj) /* SIGINT - enable max_debug LOGging to /tmp/afpd.PID.XXXXXX */ action.sa_handler = afp_dsi_debug; - sigfillset( &action.sa_mask ); - action.sa_flags = SA_RESTART; if ( sigaction( SIGINT, &action, NULL) < 0 ) { LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); afp_dsi_die(EXITERR_SYS); } #ifndef DEBUGGING - /* tickle handler */ + /* SIGALRM - tickle handler */ action.sa_handler = alarm_handler; - sigemptyset(&action.sa_mask); - sigaddset(&action.sa_mask, SIGHUP); - sigaddset(&action.sa_mask, SIGTERM); - sigaddset(&action.sa_mask, SIGUSR1); - sigaddset(&action.sa_mask, SIGINT); -#ifdef SERVERTEXT - sigaddset(&action.sa_mask, SIGUSR2); -#endif - action.sa_flags = SA_RESTART; /* dont restart, otherwi */ if ((sigaction(SIGALRM, &action, NULL) < 0) || (setitimer(ITIMER_REAL, &dsi->timer, NULL) < 0)) { afp_dsi_die(EXITERR_SYS); @@ -465,25 +457,88 @@ void afp_over_dsi(AFPObj *obj) if (dircache_init(obj->options.dircachesize) != 0) afp_dsi_die(EXITERR_SYS); + /* set TCP snd/rcv buf */ + if (obj->options.tcp_rcvbuf) { + if (setsockopt(dsi->socket, + SOL_SOCKET, + SO_RCVBUF, + &obj->options.tcp_rcvbuf, + sizeof(obj->options.tcp_rcvbuf)) != 0) { + LOG(log_error, logtype_dsi, "afp_over_dsi: setsockopt(SO_RCVBUF): %s", strerror(errno)); + } + } + if (obj->options.tcp_sndbuf) { + if (setsockopt(dsi->socket, + SOL_SOCKET, + SO_SNDBUF, + &obj->options.tcp_sndbuf, + sizeof(obj->options.tcp_sndbuf)) != 0) { + LOG(log_error, logtype_dsi, "afp_over_dsi: setsockopt(SO_SNDBUF): %s", strerror(errno)); + } + } + + /* set TCP_NODELAY */ + int flag = 1; + setsockopt(dsi->socket, SOL_TCP, TCP_NODELAY, &flag, sizeof(flag)); + /* get stuck here until the end */ while (1) { - cmd = dsi_receive(dsi); + if (sigsetjmp(recon_jmp, 1) != 0) + /* returning from SIGALARM handler for a primary reconnect */ + continue; + + /* Blocking read on the network socket */ + cmd = dsi_stream_receive(dsi); + if (cmd == 0) { + /* cmd == 0 is the error condition */ + if (dsi->flags & DSI_RECONSOCKET) { + /* we just got a reconnect so we immediately try again to receive on the new fd */ + dsi->flags &= ~DSI_RECONSOCKET; + continue; + } + + /* the client sometimes logs out (afp_logout) but doesn't close the DSI session */ + if (dsi->flags & DSI_AFP_LOGGED_OUT) { + LOG(log_note, logtype_afpd, "afp_over_dsi: client logged out, terminating DSI session"); + afp_dsi_close(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 */ - dsi->flags |= DSI_DISCONNECTED; - pause(); /* gets interrupted by SIGALARM or SIGURG tickle */ + if (dsi_disconnect(dsi) != 0) + afp_dsi_die(EXITERR_CLNT); + + 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 */ } - child.tickle = 0; - dsi_sleep(dsi, 0); /* wake up */ + if (!(dsi->flags & DSI_EXTSLEEP) && (dsi->flags & DSI_SLEEPING)) { + LOG(log_debug, logtype_afpd, "afp_over_dsi: got data, ending normal sleep"); + dsi->flags &= ~DSI_SLEEPING; + dsi->tickle = 0; + } if (reload_request) { reload_request = 0; - load_volumes(child.obj); - dircache_dump(); - log_dircache_stat(); + load_volumes(AFPobj, closevol); } /* The first SIGINT enables debugging, the next restores the config */ @@ -491,34 +546,41 @@ void afp_over_dsi(AFPObj *obj) static int debugging = 0; debug_request = 0; + dircache_dump(); + uuidcache_dump(); + 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); } } - if (cmd == DSIFUNC_TICKLE) { - /* timer is not every 30 seconds anymore, so we don't get killed on the client side. */ - if ((dsi->flags & DSI_DIE)) - dsi_tickle(dsi); - pending_request(dsi); - continue; - } dsi->flags |= DSI_DATA; + dsi->tickle = 0; + switch(cmd) { + case DSIFUNC_CLOSE: + LOG(log_debug, logtype_afpd, "DSI: close session request"); afp_dsi_close(obj); - LOG(log_info, logtype_afpd, "done"); - return; + LOG(log_note, logtype_afpd, "done"); + exit(0); + + case DSIFUNC_TICKLE: + dsi->flags &= ~DSI_DATA; /* thats no data in the sense we use it in alarm_handler */ + LOG(log_debug, logtype_afpd, "DSI: client tickle"); + /* timer is not every 30 seconds anymore, so we don't get killed on the client side. */ + if ((dsi->flags & DSI_DIE)) + dsi_tickle(dsi); break; case DSIFUNC_CMD: @@ -534,12 +596,12 @@ void afp_over_dsi(AFPObj *obj) function = (u_char) dsi->commands[0]; /* AFP replay cache */ - rc_idx = REPLAYCACHE_SIZE % dsi->clientID; - LOG(log_debug, logtype_afpd, "DSI request ID: %u", dsi->clientID); + rc_idx = dsi->clientID % REPLAYCACHE_SIZE; + LOG(log_debug, logtype_dsi, "DSI request ID: %u", dsi->clientID); if (replaycache[rc_idx].DSIreqID == dsi->clientID && replaycache[rc_idx].AFPcommand == function) { - LOG(log_debug, logtype_afpd, "AFP Replay Cache match: id: %u / cmd: %s", + LOG(log_note, logtype_afpd, "AFP Replay Cache match: id: %u / cmd: %s", dsi->clientID, AfpNum2name(function)); err = replaycache[rc_idx].result; /* AFP replay cache end */ @@ -561,11 +623,6 @@ void afp_over_dsi(AFPObj *obj) 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 */ @@ -580,14 +637,13 @@ void afp_over_dsi(AFPObj *obj) } /* single shot toggle that gets set by dsi_readinit. */ - if (dsi->noreply) { - dsi->noreply = 0; + 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) ); - afp_dsi_die(EXITERR_CLNT); + if (dsi_disconnect(dsi) != 0) + afp_dsi_die(EXITERR_CLNT); } break; @@ -607,11 +663,6 @@ void afp_over_dsi(AFPObj *obj) 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; @@ -620,7 +671,8 @@ void afp_over_dsi(AFPObj *obj) if (!dsi_wrtreply(dsi, err)) { LOG(log_error, logtype_afpd, "dsi_wrtreply: %s", strerror(errno) ); - afp_dsi_die(EXITERR_CLNT); + if (dsi_disconnect(dsi) != 0) + afp_dsi_die(EXITERR_CLNT); } break; @@ -637,6 +689,8 @@ void afp_over_dsi(AFPObj *obj) break; } pending_request(dsi); + + fce_pending_events(obj); } /* error */