#include <netinet/in.h>
#include <arpa/inet.h>
#include <atalk/logger.h>
+#include <setjmp.h>
#include <atalk/dsi.h>
#include <atalk/compat.h>
#include "fork.h"
#include "dircache.h"
-#ifdef FORCE_UIDGID
-#warning UIDGID
-#include "uid.h"
-#endif /* FORCE_UIDGID */
-
/*
* 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
* - 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 int oldsock = -1;
static void afp_dsi_close(AFPObj *obj)
{
DSI *dsi = obj->handle;
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();
*/
static void afp_dsi_die(int sig)
{
-static volatile int in_handler;
-
- if (in_handler) {
- return;
+ DSI *dsi = (DSI *)AFPobj->handle;
+
+ 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(AFPobj->handle, AFPATTN_SHUTDOWN);
afp_dsi_close(AFPobj);
}
}
+/* SIGURG handler (primary reconnect) */
static void afp_dsi_transfer_session(int sig _U_)
{
uint16_t dsiID;
exit(EXITERR_SYS);
}
- if (dsi->socket != -1)
- close(dsi->socket);
+ LOG(log_note, logtype_afpd, "afp_dsi_transfer_session: received socket fd: %i", socket);
+
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
* 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(AFPobj->handle, 1);
+ siglongjmp(recon_jmp, 1);
}
/* ------------------- */
/* 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;
}
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 (dsi->tickle < AFPobj->options.sleep) {
+ if (dsi->tickle > AFPobj->options.sleep) {
LOG(log_error, logtype_afpd, "afp_alarm: sleep time ended");
afp_dsi_die(EXITERR_CLNT);
}
}
/* if we're in the midst of processing something, don't die. */
- if ( !(dsi->flags & DSI_RUNNING) && (dsi->tickle > AFPobj->options.timeout)) {
+ if ( !(dsi->flags & DSI_RUNNING) && (dsi->tickle >= AFPobj->options.timeout)) {
LOG(log_error, logtype_afpd, "afp_alarm: child timed out, entering disconnected state");
+ dsi->proto_close(dsi);
dsi->flags |= DSI_DISCONNECTED;
return;
}
obj->exit = afp_dsi_die;
obj->reply = (int (*)()) dsi_cmdreply;
obj->attention = (int (*)(void *, AFPUserBytes)) dsi_attention;
- obj->sleep = afp_dsi_sleep;
dsi->tickle = 0;
memset(&action, 0, sizeof(action));
sigaddset(&action.sa_mask, SIGUSR1);
sigaddset(&action.sa_mask, SIGINT);
sigaddset(&action.sa_mask, SIGUSR2);
- action.sa_flags = SA_RESTART; /* dont restart, otherwi */
+ action.sa_flags = SA_RESTART;
if ((sigaction(SIGALRM, &action, NULL) < 0) ||
(setitimer(ITIMER_REAL, &dsi->timer, NULL) < 0)) {
afp_dsi_die(EXITERR_SYS);
/* get stuck here until the end */
while (1) {
+ if (sigsetjmp(recon_jmp, 1) != 0)
+ /* returning from SIGALARM handler for a primary reconnect */
+ continue;
+
+ /* Blocking read on the network socket */
cmd = dsi_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;
+ }
/* Some error on the client connection, enter disconnected state */
dsi->flags |= DSI_DISCONNECTED;
pause(); /* gets interrupted by SIGALARM or SIGURG tickle */
continue; /* continue receiving until disconnect timer expires
* or a primary reconnect succeeds */
+ } else {
+ if (oldsock != -1) {
+ /* Now, after successfully reading from the new socket after a reconnect *
+ * we can close the old socket without taking the risk of confusing the client */
+ close(oldsock);
+ oldsock = -1;
+ }
}
- dsi->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;
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 */
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;
projects / netatalk.git / blobdiff