X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fafp_dsi.c;h=110b1b409506b47fcc9444ff6c425316be7fbcc0;hb=9d78f9b52ea18b442fc91c6a1e8d8b607f2f90e8;hp=fc754c668715a721e3a1386767976129355bcadf;hpb=2a12a01d9aefb04e01916f5b1bac41578a6114c5;p=netatalk.git diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c index fc754c66..110b1b40 100644 --- a/etc/afpd/afp_dsi.c +++ b/etc/afpd/afp_dsi.c @@ -1,5 +1,5 @@ /* - * $Id: afp_dsi.c,v 1.26 2002-12-04 10:59:36 didg Exp $ + * $Id: afp_dsi.c,v 1.27.2.3.2.4.2.3 2008-11-25 15:16:32 didg Exp $ * * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu) * Copyright (c) 1990,1993 Regents of The University of Michigan. @@ -47,6 +47,7 @@ extern struct oforks *writtenfork; #define CHILD_DIE (1 << 0) #define CHILD_RUNNING (1 << 1) +#define CHILD_SLEEPING (1 << 2) static struct { AFPObj *obj; @@ -55,10 +56,11 @@ static struct { } child; -static __inline__ void afp_dsi_close(AFPObj *obj) +static void afp_dsi_close(AFPObj *obj) { DSI *dsi = obj->handle; + close_all_vol(); if (obj->logout) (*obj->logout)(); @@ -71,9 +73,23 @@ static __inline__ void afp_dsi_close(AFPObj *obj) dsi_close(dsi); } -/* a little bit of code duplication. */ +/* ------------------------------- + * SIGTERM + * a little bit of code duplication. + */ static void afp_dsi_die(int sig) { +static volatile int in_handler; + + if (in_handler) { + return; + } + /* 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 & @@ -87,6 +103,14 @@ static void afp_dsi_die(int sig) } } +/* */ +static void afp_dsi_sleep(void) +{ + child.flags |= CHILD_SLEEPING; + dsi_sleep(child.obj->handle, 1); +} + +/* ------------------- */ static void afp_dsi_timedown() { struct sigaction sv; @@ -105,7 +129,7 @@ static void afp_dsi_timedown() if ( setitimer( ITIMER_REAL, &it, 0 ) < 0 ) { LOG(log_error, logtype_afpd, "afp_timedown: setitimer: %s", strerror(errno) ); - afp_dsi_die(1); + afp_dsi_die(EXITERR_SYS); } memset(&sv, 0, sizeof(sv)); sv.sa_handler = afp_dsi_die; @@ -115,48 +139,64 @@ static void afp_dsi_timedown() sv.sa_flags = SA_RESTART; if ( sigaction( SIGALRM, &sv, 0 ) < 0 ) { LOG(log_error, logtype_afpd, "afp_timedown: sigaction: %s", strerror(errno) ); - afp_dsi_die(1); + afp_dsi_die(EXITERR_SYS); } - /* ignore SIGHUP */ + /* ignore myself */ sv.sa_handler = SIG_IGN; sigemptyset( &sv.sa_mask ); sv.sa_flags = SA_RESTART; - if ( sigaction( SIGHUP, &sv, 0 ) < 0 ) { + if ( sigaction( SIGUSR1, &sv, 0 ) < 0 ) { LOG(log_error, logtype_afpd, "afp_timedown: sigaction SIGHUP: %s", strerror(errno) ); - afp_dsi_die(1); + afp_dsi_die(EXITERR_SYS); } } +/* --------------------------------- + * SIGHUP reload configuration file + * FIXME here or we wait ? +*/ +volatile int reload_request = 0; + +static void afp_dsi_reload() +{ + reload_request = 1; +} + +/* ---------------------- */ #ifdef SERVERTEXT -static void afp_dsi_getmesg (int sig) +static void afp_dsi_getmesg (int sig _U_) { - readmessage(); + readmessage(child.obj); dsi_attention(child.obj->handle, AFPATTN_MESG | AFPATTN_TIME(5)); } #endif /* SERVERTEXT */ static void alarm_handler() { -int err; + int err; + /* if we're in the midst of processing something, don't die. */ - if ((child.flags & CHILD_RUNNING) || (child.tickle++ < child.obj->options.timeout)) { + if ((child.flags & CHILD_SLEEPING) && child.tickle++ < child.obj->options.sleep) { + return; + } else if ((child.flags & CHILD_RUNNING) || (child.tickle++ < child.obj->options.timeout)) { if (!(err = pollvoltime(child.obj))) err = dsi_tickle(child.obj->handle); if (err <= 0) - afp_dsi_die(1); + afp_dsi_die(EXITERR_CLNT); } else { /* didn't receive a tickle. close connection */ LOG(log_error, logtype_afpd, "afp_alarm: child timed out"); - afp_dsi_die(1); + afp_dsi_die(EXITERR_CLNT); } } -/* - * Signal handler for SIGUSR1 - set the debug flag and +#ifdef DEBUG1 +/* --------------------------------- + * old signal handler for SIGUSR1 - set the debug flag and * redirect stdout to /afpd-debug-. */ void afp_set_debug (int sig) @@ -169,9 +209,11 @@ void afp_set_debug (int sig) return; } +#endif - -/* afp over dsi. this never returns. */ +/* ------------------------------------------- + afp over dsi. this never returns. +*/ void afp_over_dsi(AFPObj *obj) { DSI *dsi = (DSI *) obj->handle; @@ -183,51 +225,70 @@ void afp_over_dsi(AFPObj *obj) 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; - /* install SIGTERM and SIGHUP */ memset(&action, 0, sizeof(action)); - action.sa_handler = afp_dsi_timedown; + + /* 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); +#ifdef SERVERTEXT + sigaddset(&action.sa_mask, SIGUSR2); +#endif action.sa_flags = SA_RESTART; if ( sigaction( SIGHUP, &action, 0 ) < 0 ) { LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); - afp_dsi_die(1); + afp_dsi_die(EXITERR_SYS); } + /* 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); +#ifdef SERVERTEXT + sigaddset(&action.sa_mask, SIGUSR2); +#endif action.sa_flags = SA_RESTART; if ( sigaction( SIGTERM, &action, 0 ) < 0 ) { LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); - afp_dsi_die(1); + afp_dsi_die(EXITERR_SYS); } #ifdef SERVERTEXT /* Added for server message support */ action.sa_handler = afp_dsi_getmesg; sigemptyset( &action.sa_mask ); - sigaddset(&action.sa_mask, SIGUSR2); + sigaddset(&action.sa_mask, SIGALRM); + sigaddset(&action.sa_mask, SIGTERM); + sigaddset(&action.sa_mask, SIGUSR1); + sigaddset(&action.sa_mask, SIGHUP); action.sa_flags = SA_RESTART; if ( sigaction( SIGUSR2, &action, 0) < 0 ) { LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); - afp_dsi_die(1); + afp_dsi_die(EXITERR_SYS); } #endif /* SERVERTEXT */ - /* SIGUSR1 - set "debug" flag on this process. */ - action.sa_handler = afp_set_debug; + /* SIGUSR1 - set down in 5 minutes */ + action.sa_handler = afp_dsi_timedown; sigemptyset( &action.sa_mask ); - sigaddset(&action.sa_mask, SIGUSR1); + sigaddset(&action.sa_mask, SIGALRM); + sigaddset(&action.sa_mask, SIGHUP); + sigaddset(&action.sa_mask, SIGTERM); +#ifdef SERVERTEXT + sigaddset(&action.sa_mask, SIGUSR2); +#endif action.sa_flags = SA_RESTART; if ( sigaction( SIGUSR1, &action, 0) < 0 ) { LOG(log_error, logtype_afpd, "afp_over_dsi: sigaction: %s", strerror(errno) ); - afp_dsi_die(1); + afp_dsi_die(EXITERR_SYS); } /* tickle handler */ @@ -235,19 +296,33 @@ void afp_over_dsi(AFPObj *obj) sigemptyset(&action.sa_mask); sigaddset(&action.sa_mask, SIGHUP); sigaddset(&action.sa_mask, SIGTERM); + sigaddset(&action.sa_mask, SIGUSR1); +#ifdef SERVERTEXT + sigaddset(&action.sa_mask, SIGUSR2); +#endif action.sa_flags = SA_RESTART; if ((sigaction(SIGALRM, &action, NULL) < 0) || (setitimer(ITIMER_REAL, &dsi->timer, NULL) < 0)) { - afp_dsi_die(1); + afp_dsi_die(EXITERR_SYS); } +#ifdef DEBUG1 + fault_setup((void (*)(void *))afp_dsi_die); +#endif + /* get stuck here until the end */ while ((cmd = dsi_receive(dsi))) { child.tickle = 0; + child.flags &= ~CHILD_SLEEPING; + dsi_sleep(dsi, 0); /* wake up */ + if (reload_request) { + reload_request = 0; + load_volumes(child.obj); + } if (cmd == DSIFUNC_TICKLE) { - /* so we don't get killed on the client side. */ - if (child.flags & CHILD_DIE) + /* timer is not every 30 seconds anymore, so we don't get killed on the client side. */ + if ((child.flags & CHILD_DIE)) dsi_tickle(dsi); continue; } else if (!(child.flags & CHILD_DIE)) { /* reset tickle timer */ @@ -257,8 +332,10 @@ void afp_over_dsi(AFPObj *obj) case DSIFUNC_CLOSE: afp_dsi_close(obj); LOG(log_info, logtype_afpd, "done"); +#ifdef DEBUG1 if (obj->options.flags & OPTION_DEBUG ) printf("done\n"); +#endif return; break; @@ -273,10 +350,12 @@ void afp_over_dsi(AFPObj *obj) #endif /* AFS */ function = (u_char) dsi->commands[0]; +#ifdef DEBUG1 if (obj->options.flags & OPTION_DEBUG ) { printf("command: %d (%s)\n", function, AfpNum2name(function)); bprint((char *) dsi->commands, dsi->cmdlen); } +#endif /* send off an afp command. in a couple cases, we take advantage * of the fact that we're a stream-based protocol. */ @@ -305,24 +384,26 @@ void afp_over_dsi(AFPObj *obj) break; } +#ifdef DEBUG1 if (obj->options.flags & OPTION_DEBUG ) { printf( "reply: %d, %d\n", err, dsi->clientID); bprint((char *) dsi->data, dsi->datalen); } - +#endif if (!dsi_cmdreply(dsi, err)) { LOG(log_error, logtype_afpd, "dsi_cmdreply(%d): %s", dsi->socket, strerror(errno) ); - afp_dsi_die(1); + afp_dsi_die(EXITERR_CLNT); } break; case DSIFUNC_WRITE: /* FPWrite and FPAddIcon */ function = (u_char) dsi->commands[0]; +#ifdef DEBUG1 if ( obj->options.flags & OPTION_DEBUG ) { printf("(write) command: %d, %d\n", function, dsi->cmdlen); bprint((char *) dsi->commands, dsi->cmdlen); } - +#endif if ( afp_switch[ function ] != NULL ) { dsi->datalen = DSI_DATASIZ; child.flags |= CHILD_RUNNING; @@ -340,14 +421,15 @@ void afp_over_dsi(AFPObj *obj) err = AFPERR_NOOP; } +#ifdef DEBUG1 if (obj->options.flags & OPTION_DEBUG ) { printf( "(write) reply code: %d, %d\n", err, dsi->clientID); bprint((char *) dsi->data, dsi->datalen); } - +#endif if (!dsi_wrtreply(dsi, err)) { LOG(log_error, logtype_afpd, "dsi_wrtreply: %s", strerror(errno) ); - afp_dsi_die(1); + afp_dsi_die(EXITERR_CLNT); } break; @@ -364,7 +446,7 @@ void afp_over_dsi(AFPObj *obj) dsi_writeflush(dsi); break; } - +#ifdef DEBUG1 if ( obj->options.flags & OPTION_DEBUG ) { #ifdef notdef pdesc( stdout ); @@ -372,8 +454,9 @@ void afp_over_dsi(AFPObj *obj) of_pforkdesc( stdout ); fflush( stdout ); } +#endif } /* error */ - afp_dsi_die(1); + afp_dsi_die(EXITERR_CLNT); }