#include <atalk/logger.h>
#include <atalk/cnid_dbd_private.h>
#include <atalk/paths.h>
-#include <atalk/volinfo.h>
#include <atalk/compat.h>
+#include <atalk/errchk.h>
+#include <atalk/bstrlib.h>
+#include <atalk/netatalk_conf.h>
+#include <atalk/volume.h>
#include "usockfd.h"
#define DEFAULTPORT "4700"
struct server {
- struct volinfo *volinfo;
+ char *v_path;
pid_t pid;
time_t tm; /* When respawned last */
int count; /* Times respawned in the last TESTTIME secondes */
static struct server srv[MAXVOLS];
-/* Default logging config: log to syslog with level log_note */
-static char logconfig[MAXPATHLEN + 21 + 1] = "default log_note";
-
static void daemon_exit(int i)
{
server_unlock(_PATH_CNID_METAD_LOCK);
daemon_exit(0);
}
-static struct server *test_usockfn(struct volinfo *volinfo)
+static struct server *test_usockfn(const char *path)
{
int i;
+
for (i = 0; i < maxvol; i++) {
- if ((srv[i].volinfo) && (strcmp(srv[i].volinfo->v_path, volinfo->v_path) == 0)) {
+ if (srv[i].v_path && STRCMP(path, ==, srv[i].v_path))
return &srv[i];
- }
}
+
return NULL;
}
/* -------------------- */
-static int maybe_start_dbd(char *dbdpn, struct volinfo *volinfo)
+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 = volinfo->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(volinfo);
+ 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].volinfo == NULL && i < MAXVOLS) {
+ if (srv[i].v_path == NULL && i < MAXVOLS) {
up = &srv[i];
- up->volinfo = volinfo;
- retainvolinfo(volinfo);
+ 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->volinfo->v_path);
- ret = execlp(dbdpn, dbdpn, "-d", volpath, buf1, buf2, logconfig, NULL);
+ up->v_path);
+ ret = execlp(dbdpn, dbdpn, "-F", obj->options.configfile, "-p", volpath, "-t", buf1, "-l", buf2, "-d", NULL);
} else {
- ret = execlp(dbdpn, dbdpn, volpath, buf1, buf2, logconfig, NULL);
+ ret = execlp(dbdpn, dbdpn, "-F", obj->options.configfile, "-p", volpath, "-t", buf1, "-l", buf2, NULL);
}
/* Yikes! We're still here, so exec failed... */
LOG(log_error, logtype_cnid, "Fatal error in exec: %s", strerror(errno));
}
/* ------------------ */
-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;
int err = 0;
int debug = 0;
int ret;
- char *loglevel = NULL;
- char *logfile = NULL;
sigset_t set;
- struct volinfo *volinfo;
-
- set_processname("cnid_metad");
+ AFPObj obj = { 0 };
+ struct vol *vol;
- while (( cc = getopt( argc, argv, "vVds:p:h:u:g:l:f:")) != -1 ) {
+ while (( cc = getopt( argc, argv, "dF:vV")) != -1 ) {
switch (cc) {
- case 'v':
- case 'V':
- printf("cnid_metad (Netatalk %s)\n", VERSION);
- return -1;
case 'd':
debug = 1;
break;
- case 'h':
- host = strdup(optarg);
- break;
- case 'u':
- uid = user_to_uid (optarg);
- if (!uid) {
- LOG(log_error, logtype_cnid, "main: bad user %s", optarg);
- err++;
- }
- break;
- case 'g':
- gid =group_to_gid (optarg);
- if (!gid) {
- LOG(log_error, logtype_cnid, "main: bad group %s", optarg);
- err++;
- }
- break;
- case 'p':
- port = strdup(optarg);
- break;
- case 's':
- dbdpn = strdup(optarg);
- break;
- case 'l':
- loglevel = strdup(optarg);
- break;
- case 'f':
- logfile = strdup(optarg);
+ case 'F':
+ obj.cmdlineconfigfile = strdup(optarg);
break;
+ case 'v':
+ case 'V':
+ printf("cnid_metad (Netatalk %s)\n", VERSION);
+ return -1;
default:
- err++;
- break;
+ printf("cnid_metad [-dvV] [-F alternate configfile ]\n");
+ return -1;
}
}
if (create_lockfile("cnid_metad", _PATH_CNID_METAD_LOCK))
return -1;
- if (loglevel) {
- strlcpy(logconfig + 8, loglevel, 13);
- free(loglevel);
- strcat(logconfig, " ");
- }
- if (logfile) {
- strlcat(logconfig, logfile, MAXPATHLEN);
- free(logfile);
- }
- setuplog(logconfig);
+ if (afp_config_parse(&obj) != 0)
+ daemon_exit(1);
- if (err) {
- LOG(log_error, logtype_cnid, "main: bad arguments");
+ set_processname("cnid_metad");
+ setuplog(obj.options.logconfig, obj.options.logfile);
+
+ if (load_volumes(&obj, NULL) != 0)
daemon_exit(1);
- }
(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 (WIFEXITED(status)) {
- LOG(log_info, logtype_cnid, "cnid_dbd pid %i exited with exit code %i",
+ LOG(log_info, logtype_cnid, "cnid_dbd[%i] exited with exit code %i",
pid, WEXITSTATUS(status));
}
else if (WIFSIGNALED(status)) {
- LOG(log_info, logtype_cnid, "cnid_dbd pid %i exited with signal %i",
+ LOG(log_info, logtype_cnid, "cnid_dbd[%i] got signal %i",
pid, WTERMSIG(status));
}
sigchild = 0;
}
volpath[len] = '\0';
- /* Load .volinfo file */
- if ((volinfo = allocvolinfo(volpath)) == NULL) {
- LOG(log_severe, logtype_cnid, "allocvolinfo(\"%s\"): %s",
- volpath, strerror(errno));
+ 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 (set_dbdir(volinfo->v_dbpath) < 0) {
+ if ((vol = getvolbypath(&obj, volpath)) == NULL) {
+ LOG(log_severe, logtype_cnid, "main: no volume for path \"%s\"", volpath);
goto loop_end;
}
- maybe_start_dbd(dbdpn, volinfo);
+ LOG(log_maxdebug, logtype_cnid, "main: dbpath: %s", vol->v_dbpath);
- (void)closevolinfo(volinfo);
+ if (set_dbdir(vol->v_dbpath, volpath) < 0) {
+ goto loop_end;
+ }
+ maybe_start_dbd(&obj, dbdpn, vol->v_path);
loop_end:
close(rqstfd);
}
projects / netatalk.git / blobdiff