#define DEFAULTPORT "4700"
struct server {
- struct vol *vol;
+ char *v_path;
pid_t pid;
time_t tm; /* When respawned last */
int count; /* Times respawned in the last TESTTIME secondes */
daemon_exit(0);
}
-static struct server *test_usockfn(const struct vol *vol)
+static struct server *test_usockfn(const char *path)
{
int i;
- if (!(vol->v_flags & AFPVOL_OPEN))
- return NULL;
-
for (i = 0; i < maxvol; i++) {
- if (vol->v_vid == srv[i].vol->v_vid)
+ if (srv[i].v_path && STRCMP(path, ==, srv[i].v_path))
return &srv[i];
}
}
/* -------------------- */
-static int maybe_start_dbd(const AFPObj *obj, char *dbdpn, struct vol *vol)
+static int maybe_start_dbd(const AFPObj *obj, char *dbdpn, const char *volpath)
{
pid_t pid;
struct server *up;
time_t t;
char buf1[8];
char buf2[8];
- char *volpath = vol->v_path;
- LOG(log_debug, logtype_cnid, "maybe_start_dbd: Volume: \"%s\"", volpath);
+ LOG(log_debug, logtype_cnid, "maybe_start_dbd(\"%s\"): BEGIN", volpath);
- up = test_usockfn(vol);
+ up = test_usockfn(volpath);
if (up && up->pid) {
/* we already have a process, send our fd */
+ LOG(log_debug, logtype_cnid, "maybe_start_dbd: cnid_dbd[%d] already serving", up->pid);
if (send_fd(up->control_fd, rqstfd) < 0) {
/* FIXME */
return -1;
return 0;
}
- LOG(log_maxdebug, logtype_cnid, "maybe_start_dbd: no cnid_dbd for that volume yet");
+ LOG(log_debug, logtype_cnid, "maybe_start_dbd: no cnid_dbd serving yet");
time(&t);
if (!up) {
/* find an empty slot (i < maxvol) or the first free slot (i == maxvol)*/
for (i = 0; i <= maxvol; i++) {
- if (srv[i].vol == NULL && i < MAXVOLS) {
+ if (srv[i].v_path == NULL && i < MAXVOLS) {
up = &srv[i];
- up->vol = vol;
- vol->v_flags |= AFPVOL_OPEN;
+ if ((up->v_path = strdup(volpath)) == NULL)
+ return -1;
up->tm = t;
up->count = 0;
if (i == maxvol)
/* there's a pb with the db inform child, it will delete the db */
LOG(log_warning, logtype_cnid,
"Multiple attempts to start CNID db daemon for \"%s\" failed, wiping the slate clean...",
- up->vol->v_path);
+ up->v_path);
ret = execlp(dbdpn, dbdpn, "-F", obj->options.configfile, "-p", volpath, "-t", buf1, "-l", buf2, "-d", NULL);
} else {
ret = execlp(dbdpn, dbdpn, "-F", obj->options.configfile, "-p", volpath, "-t", buf1, "-l", buf2, NULL);
}
/* ------------------ */
-static int set_dbdir(char *dbdir)
+static int set_dbdir(const char *dbdir, const char *vpath)
{
- int len;
+ EC_INIT;
+ int status;
struct stat st;
+ bstring oldpath, newpath, cmd = NULL;
- len = strlen(dbdir);
+ EC_NULL_LOG( oldpath = bformat("%s/%s/", vpath, DBHOME) );
+ EC_NULL_LOG( newpath = bformat("%s/%s/", dbdir, DBHOME) );
- if (stat(dbdir, &st) < 0 && mkdir(dbdir, 0755) < 0) {
+ if (lstat(dbdir, &st) < 0 && mkdir(dbdir, 0755) < 0) {
LOG(log_error, logtype_cnid, "set_dbdir: mkdir failed for %s", dbdir);
return -1;
}
- if (dbdir[len - 1] != '/') {
- strcat(dbdir, "/");
- len++;
+ if (lstat(bdata(oldpath), &st) == 0 && lstat(bdata(newpath), &st) != 0 && errno == ENOENT) {
+ /* There's an .AppleDB in the volume root, we move it */
+ EC_NULL_LOG( cmd = bformat("mv '%s' '%s'", bdata(oldpath), dbdir) );
+ LOG(log_debug, logtype_cnid, "set_dbdir: cmd: %s", bdata(cmd));
+ if (WEXITSTATUS(system(bdata(cmd))) != 0) {
+ LOG(log_error, logtype_cnid, "set_dbdir: moving CNID db from \"%s\" to \"%s\" failed",
+ bdata(oldpath), dbdir);
+ EC_FAIL;
+ }
}
- strcpy(dbdir + len, DBHOME);
- if (stat(dbdir, &st) < 0 && mkdir(dbdir, 0755 ) < 0) {
- LOG(log_error, logtype_cnid, "set_dbdir: mkdir failed for %s", dbdir);
+
+ if (lstat(bdata(newpath), &st) < 0 && mkdir(bdata(newpath), 0755 ) < 0) {
+ LOG(log_error, logtype_cnid, "set_dbdir: mkdir failed for %s", bdata(newpath));
return -1;
}
- return 0;
+
+EC_CLEANUP:
+ bdestroy(oldpath);
+ bdestroy(newpath);
+ bdestroy(cmd);
+ EC_EXIT;
}
/* ------------------ */
pid_t pid;
int status;
char *dbdpn = _PATH_CNID_DBD;
- char *host = DEFAULTHOST;
- char *port = DEFAULTPORT;
+ char *host;
+ char *port;
int i;
int cc;
uid_t uid = 0;
(void)setlimits();
+ host = iniparser_getstrdup(obj.iniconfig, INISEC_GLOBAL, "cnid listen", "localhost:4700");
+ if (port = strrchr(host, ':'))
+ *port++ = 0;
+ else
+ port = DEFAULTPORT;
if ((srvfd = tsockfd_create(host, port, 10)) < 0)
daemon_exit(1);
+ LOG(log_note, logtype_afpd, "CNID Server listening on %s:%s", host, port);
+
/* switch uid/gid */
if (uid || gid) {
LOG(log_debug, logtype_cnid, "Setting uid/gid to %i/%i", uid, gid);
if (srv[i].pid == pid) {
srv[i].pid = 0;
close(srv[i].control_fd);
- srv[i].vol->v_flags &= ~AFPVOL_OPEN;
break;
}
}
}
volpath[len] = '\0';
+ LOG(log_debug, logtype_cnid, "main: request for volume: %s", volpath);
+
+ if (load_volumes(&obj, NULL) != 0) {
+ LOG(log_severe, logtype_cnid, "main: error reloading config");
+ goto loop_end;
+ }
- if ((vol = getvolbypath(volpath)) == NULL) {
- LOG(log_severe, logtype_cnid, "getvolbypath(\"%s\"): %s", volpath, strerror(errno));
+ if ((vol = getvolbypath(&obj, volpath)) == NULL) {
+ LOG(log_severe, logtype_cnid, "main: no volume for path \"%s\"", volpath);
goto loop_end;
}
- if (set_dbdir(vol->v_dbpath) < 0) {
+ LOG(log_maxdebug, logtype_cnid, "main: dbpath: %s", vol->v_dbpath);
+
+ if (set_dbdir(vol->v_dbpath, volpath) < 0) {
goto loop_end;
}
- maybe_start_dbd(&obj, dbdpn, vol);
+ maybe_start_dbd(&obj, dbdpn, vol->v_path);
loop_end:
close(rqstfd);
}
projects / netatalk.git / blobdiff