From: franklahm Date: Tue, 29 Dec 2009 09:58:45 +0000 (+0000) Subject: Remove db3 files X-Git-Tag: branch-symlink-start~2 X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=0ca9763b7c90d60dc01a333d775936c476a39b8f Remove db3 files --- diff --git a/libatalk/cnid/db3/.cvsignore b/libatalk/cnid/db3/.cvsignore deleted file mode 100644 index 0d0371d7..00000000 --- a/libatalk/cnid/db3/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -Makefile -Makefile.in -*.lo -*.la -.deps -.libs diff --git a/libatalk/cnid/db3/Makefile.am b/libatalk/cnid/db3/Makefile.am deleted file mode 100644 index ddf0d43a..00000000 --- a/libatalk/cnid/db3/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# Makefile.am for libatalk/cnid/ - -libcnid_db3_la_SOURCES = cnid_db3_add.c \ - cnid_db3_close.c \ - cnid_db3_delete.c \ - cnid_db3_get.c \ - cnid_db3_lookup.c \ - cnid_db3_open.c \ - cnid_db3_resolve.c \ - cnid_db3_update.c \ - cnid_db3.h -libcnid_db3_la_LIBADD = @BDB_LIBS@ -libcnid_db3_la_CFLAGS = @BDB_CFLAGS@ - -if USE_DB3_BACKEND -noinst_LTLIBRARIES = libcnid_db3.la -endif - -noinst_HEADERS = cnid_db3_meta.h cnid_db3_private.h -EXTRA_DIST = README cnid_db3_meta.c cnid_db3_nextid.c diff --git a/libatalk/cnid/db3/README b/libatalk/cnid/db3/README deleted file mode 100644 index b39889bf..00000000 --- a/libatalk/cnid/db3/README +++ /dev/null @@ -1,35 +0,0 @@ -the catalog database keeps track of three mappings: - CNID -> dev/ino and did/name - dev/ino -> CNID - did/name -> CNID - -dev/ino is used to keep track of magically moved files. did/name is -for quick lookups of CNIDs. - -NOTE: the database will append a nul byte to the end of name. in -addition, name should be given as it appears on disk. this allows the -creation of cnid updating/cleaning programs that don't have to deal -with knowing what the particular codepage is. - -here's the ritual: - 1) open a volume. call cnid_open. - 2) every time you need a CNID, call cnid_add(). it will - automatically look for an existing cnid and add a new one - if one isn't already there. you can pass a hint if you - want. the only use this has right now is to enable - consistency between AFP and HFS. in the future, it would - allow people to write conversion utilities that - pre-instantiate a database without needing to re-assign - CNIDs. - 3) if you want to just look for a CNID without automatically - adding one in, you have two choices: - a) cnid_resolve takes a CNID, returns name, and - over-writes the CNID given with the parent DID. this - is good for FPResolveID. - b) cnid_lookup returns a CNID corresponding to the - dev/ino,did/name keys. it will auto-update the catalog - database if there's a discrepancy. - NOTE: cnid_add calls this before adding a new CNID. - 4) when you delete a file or directory, you need to call - cnid_delete with the CNID for that file/directory. - 5) call cnid_close when closing the volume. diff --git a/libatalk/cnid/db3/cnid_db3.h b/libatalk/cnid/db3/cnid_db3.h deleted file mode 100644 index 59840a37..00000000 --- a/libatalk/cnid/db3/cnid_db3.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * interface for database access to cnids. i do it this way to abstract - * things a bit in case we want to change the underlying implementation. - */ - -#ifndef _ATALK_CNID_DB3__H -#define _ATALK_CNID_DB3__H 1 - -#include -#include -#include -#include - -#include -#include - -static int db3_txn_abort(DB_TXN *db_txn) -{ - int ret; -#if DB_VERSION_MAJOR >= 4 - ret = db_txn->abort(db_txn); -#else - ret = txn_abort(db_txn); -#endif - return ret; -} - -/* -------------------- */ -static int db3_txn_begin(DB_ENV *db_env, DB_TXN *parent, DB_TXN **db_txn, u_int32_t flags) -{ - int ret; -#if DB_VERSION_MAJOR >= 4 - ret = db_env->txn_begin(db_env, parent, db_txn, flags); -#else - ret = txn_begin(db_env, paren, db_txn, flags); -#endif - return ret; -} - -/* -------------------- */ -static int db3_txn_commit(DB_TXN *db_txn, u_int32_t flags) -{ - int ret; -#if DB_VERSION_MAJOR >= 4 - ret = db_txn->commit(db_txn, flags); -#else - ret = txn_commit(db_txn, flags); -#endif - return ret; -} - -/* ----------------------- - cnid_open.c -*/ -extern struct _cnid_module cnid_db3_module; -extern struct _cnid_db *cnid_db3_open (const char *, mode_t, u_int32_t flags); - -/* cnid_close.c */ -extern void cnid_db3_close (struct _cnid_db *); - -/* cnid_add.c */ -extern cnid_t cnid_db3_add (struct _cnid_db *, const struct stat *, const cnid_t, - char *, const size_t, cnid_t); - -/* cnid_get.c */ -extern cnid_t cnid_db3_get (struct _cnid_db *, const cnid_t, char *, const size_t); -extern char *cnid_db3_resolve (struct _cnid_db *, cnid_t *, void *, size_t ); -extern cnid_t cnid_db3_lookup (struct _cnid_db *, const struct stat *, const cnid_t, - char *, const size_t); - -/* cnid_update.c */ -extern int cnid_db3_update (struct _cnid_db *, const cnid_t, const struct stat *, - const cnid_t, char *, size_t); - -/* cnid_delete.c */ -extern int cnid_db3_delete (struct _cnid_db *, const cnid_t); - -/* cnid_nextid.c */ -extern cnid_t cnid_db3_nextid (struct _cnid_db *); - -extern int cnid_db3_lock (void *); -extern int cnid_db3_unlock (void *); - -#endif /* include/atalk/cnid_db3.h */ - diff --git a/libatalk/cnid/db3/cnid_db3_add.c b/libatalk/cnid/db3/cnid_db3_add.c deleted file mode 100644 index 1cbdf2dc..00000000 --- a/libatalk/cnid/db3/cnid_db3_add.c +++ /dev/null @@ -1,285 +0,0 @@ -/* - * $Id: cnid_db3_add.c,v 1.5 2009-10-29 13:38:16 didg Exp $ - * - * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu) - * All Rights Reserved. See COPYRIGHT. - * - * cnid_add (db, dev, ino, did, name, hint): - * add a name to the CNID database. we use both dev/ino and did/name - * to keep track of things. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ - -#ifdef CNID_BACKEND_DB3 - -#include -#include -#include -#include -#ifdef HAVE_UNISTD_H -#include -#endif /* HAVE_UNISTD_H */ -#ifdef HAVE_FCNTL_H -#include -#endif /* HAVE_FCNTL_H */ -#include -#include -#ifdef HAVE_SYS_TIME_H -#include -#endif /* HAVE_SYS_TIME_H */ - -#ifdef HAVE_DB4_DB_H -#include -#else -#include -#endif -#include - -#include -#include "cnid_db3.h" -#include - -#include "cnid_db3_private.h" - -/* add an entry to the CNID databases. we do this as a transaction - * to prevent messiness. */ -static int add_cnid(CNID_private *db, DBT *key, DBT *data) { - DBT altkey, altdata; - DB_TXN *tid; - int rc, ret; - - memset(&altkey, 0, sizeof(altkey)); - memset(&altdata, 0, sizeof(altdata)); - -retry: - if ((rc = db3_txn_begin(db->dbenv, NULL, &tid, 0)) != 0) { - return rc; - } - - /* main database */ - if ((rc = db->db_cnid->put(db->db_cnid, tid, key, data, DB_NOOVERWRITE))) { - if (rc == DB_LOCK_DEADLOCK) { - if ((ret = db3_txn_abort(tid)) != 0) { - return ret; - } - goto retry; - } - goto abort; - } - - /* dev/ino database */ - altkey.data = data->data; - altkey.size = CNID_DEVINO_LEN; - altdata.data = key->data; - altdata.size = key->size; - if ((rc = db->db_devino->put(db->db_devino, tid, &altkey, &altdata, 0))) { - if (rc == DB_LOCK_DEADLOCK) { - if ((ret = db3_txn_abort(tid)) != 0) { - return ret; - } - goto retry; - } - goto abort; - } - - /* did/name database */ - altkey.data = (char *) data->data + CNID_DEVINO_LEN; - altkey.size = data->size - CNID_DEVINO_LEN; - if ((rc = db->db_didname->put(db->db_didname, tid, &altkey, &altdata, 0))) { - if (rc == DB_LOCK_DEADLOCK) { - if ((ret = db3_txn_abort(tid)) != 0) { - return ret; - } - goto retry; - } - goto abort; - } - - if ((rc = db3_txn_commit(tid, 0)) != 0) { - LOG(log_error, logtype_default, "add_cnid: Failed to commit transaction: %s", db_strerror(rc)); - return rc; - } - - return 0; - -abort: - if ((ret = db3_txn_abort(tid)) != 0) { - return ret; - } - return rc; -} - -/* ---------------------- */ -static cnid_t get_cnid(CNID_private *db) -{ - DBT rootinfo_key, rootinfo_data; - DB_TXN *tid; - int rc; - cnid_t hint,id; - - memset(&rootinfo_key, 0, sizeof(rootinfo_key)); - memset(&rootinfo_data, 0, sizeof(rootinfo_data)); - rootinfo_key.data = ROOTINFO_KEY; - rootinfo_key.size = ROOTINFO_KEYLEN; - -retry: - if ((rc = db3_txn_begin(db->dbenv, NULL, &tid, 0)) != 0) { - LOG(log_error, logtype_default, "cnid_add: Failed to begin transaction: %s", db_strerror(rc)); - errno = CNID_ERR_DB; - return CNID_INVALID; - } - switch (rc = db->db_didname->get(db->db_didname, tid, &rootinfo_key, - &rootinfo_data, DB_RMW)) { - case DB_LOCK_DEADLOCK: - if ((rc = db3_txn_abort(tid)) != 0) { - LOG(log_error, logtype_default, "cnid_add: txn_abort: %s", db_strerror(rc)); - errno = CNID_ERR_DB; - return CNID_INVALID; - } - goto retry; - case 0: - memcpy(&hint, rootinfo_data.data, sizeof(hint)); - id = ntohl(hint); - /* If we've hit the max CNID allowed, we return a fatal error. CNID - * needs to be recycled before proceding. */ - if (++id == CNID_INVALID) { - db3_txn_abort(tid); - LOG(log_error, logtype_default, "cnid_add: FATAL: Cannot add CNID. CNID database has reached its limit."); - errno = CNID_ERR_MAX; - return CNID_INVALID; - } - hint = htonl(id); -/* #ifdef DEBUG */ -#if 0 - LOG(log_debug9, logtype_default, "cnid_add: Found rootinfo for did %u, name %s as %u", ntohl(did), name, ntohl(hint)); -#endif - break; - case DB_NOTFOUND: - hint = htonl(CNID_START); -/* #ifdef DEBUG */ -#if 0 - LOG(log_debug9, logtype_default, "cnid_add: Using CNID_START for did %u, name %s", ntohl(did), name); -#endif - break; - default: - LOG(log_error, logtype_default, "cnid_add: Unable to lookup rootinfo: %s", db_strerror(rc)); - goto cleanup_abort; - } - - rootinfo_data.data = &hint; - rootinfo_data.size = sizeof(hint); - - switch (rc = db->db_didname->put(db->db_didname, tid, &rootinfo_key, &rootinfo_data, 0)) { - case DB_LOCK_DEADLOCK: - if ((rc = db3_txn_abort(tid)) != 0) { - LOG(log_error, logtype_default, "cnid_add: txn_abort: %s", db_strerror(rc)); - errno = CNID_ERR_DB; - return CNID_INVALID; - } - goto retry; - case 0: - /* The transaction finished, commit it. */ - if ((rc = db3_txn_commit(tid, 0)) != 0) { - LOG(log_error, logtype_default, "cnid_add: Unable to commit transaction: %s", db_strerror(rc)); - errno = CNID_ERR_DB; - return CNID_INVALID; - } - break; - default: - LOG(log_error, logtype_default, "cnid_add: Unable to update rootinfo: %s", db_strerror(rc)); - goto cleanup_abort; - } - return hint; - -cleanup_abort: - db3_txn_abort(tid); - errno = CNID_ERR_DB; - return CNID_INVALID; -} - -/* ------------------------ */ -cnid_t cnid_db3_add(struct _cnid_db *cdb, const struct stat *st, - const cnid_t did, char *name, const size_t len, - cnid_t hint) -{ - CNID_private *db; - DBT key, data; - cnid_t id; - int rc; - - if (!cdb || !(db = cdb->_private) || !st || !name) { - errno = CNID_ERR_PARAM; - return CNID_INVALID; - } - - /* Do a lookup. */ - id = cnid_db3_lookup(cdb, st, did, name, len); - /* ... Return id if it is valid, or if Rootinfo is read-only. */ - if (id || (db->flags & CNIDFLAG_DB_RO)) { -#ifdef DEBUG - LOG(log_debug9, logtype_default, "cnid_add: Looked up did %u, name %s as %u", ntohl(did), name, ntohl(id)); -#endif - return id; - } - - /* Initialize our DBT data structures. */ - memset(&key, 0, sizeof(key)); - memset(&data, 0, sizeof(data)); - - /* Just tickle hint, and the key will change (gotta love pointers). */ - key.data = &hint; - key.size = sizeof(hint); - - if ((data.data = make_cnid_data(st, did, name, len)) == NULL) { - LOG(log_error, logtype_default, "cnid_add: Path name is too long"); - errno = CNID_ERR_PATH; - return CNID_INVALID; - } - - data.size = CNID_HEADER_LEN + len + 1; - - /* Start off with the hint. It should be in network byte order. - * We need to make sure that somebody doesn't add in restricted - * cnid's to the database. */ - if (ntohl(hint) >= CNID_START) { - /* If the key doesn't exist, add it in. Don't fiddle with nextID. */ - rc = add_cnid(db, &key, &data); - switch (rc) { - case DB_KEYEXIST: /* Need to use RootInfo after all. */ - break; - default: - LOG(log_error, logtype_default, "cnid_add: Unable to add CNID %u: %s", ntohl(hint), db_strerror(rc)); - errno = CNID_ERR_DB; - return CNID_INVALID; - case 0: -#ifdef DEBUG - LOG(log_debug9, logtype_default, "cnid_add: Used hint for did %u, name %s as %u", ntohl(did), name, ntohl(hint)); -#endif - return hint; - } - } - hint = get_cnid(db); - if (hint == 0) { - errno = CNID_ERR_DB; - return CNID_INVALID; - } - - /* Now we need to add the CNID data to the databases. */ - rc = add_cnid(db, &key, &data); - if (rc) { - LOG(log_error, logtype_default, "cnid_add: Failed to add CNID for %s to database using hint %u: %s", name, ntohl(hint), db_strerror(rc)); - errno = CNID_ERR_DB; - return CNID_INVALID; - } - -#ifdef DEBUG - LOG(log_debug9, logtype_default, "cnid_add: Returned CNID for did %u, name %s as %u", ntohl(did), name, ntohl(hint)); -#endif - - return hint; -} - -#endif /* CNID_BACKEND_DB3 */ diff --git a/libatalk/cnid/db3/cnid_db3_close.c b/libatalk/cnid/db3/cnid_db3_close.c deleted file mode 100644 index 3eabb319..00000000 --- a/libatalk/cnid/db3/cnid_db3_close.c +++ /dev/null @@ -1,113 +0,0 @@ -/* - * $Id: cnid_db3_close.c,v 1.4 2009-10-29 13:38:16 didg Exp $ - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ - -#ifdef CNID_BACKEND_DB3 - -#ifdef HAVE_UNISTD_H -#include -#endif /* HAVE_UNISTD_H */ -#ifdef HAVE_FCNTL_H -#include -#endif /* HAVE_FCNTL_H */ -#include -#include -#ifdef HAVE_DB4_DB_H -#include -#else -#include -#endif -#include -#include - -#include "cnid_db3_private.h" -#include "cnid_db3.h" - -void cnid_db3_close(struct _cnid_db *cdb) { - CNID_private *db; - int rc; - - if (!cdb) { - LOG(log_error, logtype_afpd, "cnid_close called with NULL argument !"); - return; - } - - if (!(db = cdb->_private)) { - return; - } - - /* Flush the transaction log and delete the log file if we can. */ - if ((db->lockfd > -1) && ((db->flags & CNIDFLAG_DB_RO) == 0)) { - struct flock lock; - - lock.l_type = F_WRLCK; - lock.l_whence = SEEK_SET; - lock.l_start = lock.l_len = 0; - if (fcntl(db->lockfd, F_SETLK, &lock) == 0) { - char **list, **first; - - - /* Checkpoint the databases until we can checkpoint no - * more. */ -#if DB_VERSION_MAJOR >= 4 -#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 - db->dbenv->txn_checkpoint(db->dbenv, 0, 0, 0); -#else - rc = db->dbenv->txn_checkpoint(db->dbenv, 0, 0, 0); -#endif /* DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 */ -#else - rc = txn_checkpoint(db->dbenv, 0, 0, 0); -#endif /* DB_VERSION_MAJOR >= 4 */ -#if DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 1) - while (rc == DB_INCOMPLETE) { -#if DB_VERSION_MAJOR >= 4 - rc = db->dbenv->txn_checkpoint(db->dbenv, 0, 0, 0); -#else - rc = txn_checkpoint(db->dbenv, 0, 0, 0); -#endif /* DB_VERSION_MAJOR >= 4 */ - } -#endif /* DB_VERSION_MAJOR < 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR < 1) */ - -#if DB_VERSION_MAJOR >= 4 - if ((rc = db->dbenv->log_archive(db->dbenv, &list, DB_ARCH_ABS)) != 0) { -#elif DB_VERSION_MINOR > 2 - if ((rc = log_archive(db->dbenv, &list, DB_ARCH_ABS)) != 0) { -#else /* DB_VERSION_MINOR < 2 */ - if ((rc = log_archive(db->dbenv, &list, DB_ARCH_ABS, NULL)) != 0) { -#endif /* DB_VERSION_MINOR */ - LOG(log_error, logtype_default, "cnid_close: Unable to archive logfiles: %s", db_strerror(rc)); - } - - if (list != NULL) { - for (first = list; *list != NULL; ++list) { - if ((rc = remove(*list)) != 0) { -#ifdef DEBUG - LOG(log_debug9, logtype_default, "cnid_close: failed to remove %s: %s", *list, strerror(rc)); -#endif - } - } - free(first); - } - } - (void)remove(db->lock_file); - } - - db->db_didname->close(db->db_didname, 0); - db->db_devino->close(db->db_devino, 0); - db->db_cnid->close(db->db_cnid, 0); - db->dbenv->close(db->dbenv, 0); - - if (db->lockfd > -1) { - close(db->lockfd); /* This will also release any locks we have. */ - } - - free(db); - free(cdb->volpath); - free(cdb); -} - -#endif /* CNID_BACKEND_DB3 */ diff --git a/libatalk/cnid/db3/cnid_db3_delete.c b/libatalk/cnid/db3/cnid_db3_delete.c deleted file mode 100644 index 04182475..00000000 --- a/libatalk/cnid/db3/cnid_db3_delete.c +++ /dev/null @@ -1,159 +0,0 @@ -/* - * $Id: cnid_db3_delete.c,v 1.4 2009-10-29 13:38:16 didg Exp $ - * - * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu) - * All Rights Reserved. See COPYRIGHT. - * - * cnid_delete: delete a CNID from the database - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ - -#ifdef CNID_BACKEND_DB3 - -#include -#include -#include -#include - -#ifdef HAVE_DB4_DB_H -#include -#else -#include -#endif -#include -#include -#include "cnid_db3.h" - -#include "cnid_db3_private.h" - -int cnid_db3_delete(struct _cnid_db *cdb, const cnid_t id) { - CNID_private *db; - DBT key, data; - DB_TXN *tid; - int rc, found = 0; - - if (!cdb || !(db = cdb->_private) || !id || (db->flags & CNIDFLAG_DB_RO)) { - return -1; - } - - memset(&key, 0, sizeof(key)); - memset(&data, 0, sizeof(data)); - - /* Get from ain CNID database. */ - key.data = (cnid_t *)&id; - key.size = sizeof(id); - while (!found) { - rc = db->db_cnid->get(db->db_cnid, NULL, &key, &data, 0); - switch (rc) { - case 0: - found = 1; - break; - case DB_LOCK_DEADLOCK: - break; - case DB_NOTFOUND: -#ifdef DEBUG - LOG(log_debug9, logtype_default, "cnid_delete: CNID %u not in database", - ntohl(id)); -#endif - return 0; - default: - LOG(log_error, logtype_default, "cnid_delete: Unable to delete entry: %s", - db_strerror(rc)); - return rc; - } - } - -retry: - if ((rc = db3_txn_begin(db->dbenv, NULL, &tid, 0)) != 0) { - LOG(log_error, logtype_default, "cnid_delete: Failed to begin transaction: %s", - db_strerror(rc)); - return rc; - } - - /* Now delete from the main CNID database. */ - key.data = (cnid_t *)&id; - key.size = sizeof(id); - if ((rc = db->db_cnid->del(db->db_cnid, tid, &key, 0))) { - int ret; - if ((ret = db3_txn_abort(tid)) != 0) { - LOG(log_error, logtype_default, "cnid_delete: txn_abort: %s", db_strerror(ret)); - return ret; - } - switch (rc) { - case DB_LOCK_DEADLOCK: - goto retry; - default: - goto abort_err; - } - } - - /* Now delete from dev/ino database. */ - key.data = data.data; - key.size = CNID_DEVINO_LEN; - if ((rc = db->db_devino->del(db->db_devino, tid, &key, 0))) { - switch (rc) { - case DB_LOCK_DEADLOCK: - if ((rc = db3_txn_abort(tid)) != 0) { - LOG(log_error, logtype_default, "cnid_delete: txn_abort: %s", - db_strerror(rc)); - return rc; - } - goto retry; - case DB_NOTFOUND: - /* Quietly fall through if the entry isn't found. */ - break; - default: - if ((rc = db3_txn_abort(tid)) != 0) { - LOG(log_error, logtype_default, "cnid_delete: txn_abort: %s", - db_strerror(rc)); - return rc; - } - goto abort_err; - } - } - - /* Get data from the did/name database. - * TODO Also handle did/macname, did/shortname, and did/longname. */ - key.data = (char *)data.data + CNID_DEVINO_LEN; - key.size = data.size - CNID_DEVINO_LEN; - if ((rc = db->db_didname->del(db->db_didname, tid, &key, 0))) { - switch (rc) { - case DB_LOCK_DEADLOCK: - if ((rc = db3_txn_abort(tid)) != 0) { - LOG(log_error, logtype_default, "cnid_delete: txn_abort: %s", - db_strerror(rc)); - return rc; - } - goto retry; - case DB_NOTFOUND: - break; - default: - if ((rc = db3_txn_abort(tid)) != 0) { - LOG(log_error, logtype_default, "cnid_delete: txn_abort: %s", - db_strerror(rc)); - return rc; - } - goto abort_err; - } - } - -#ifdef DEBUG - LOG(log_debug9, logtype_default, "cnid_delete: Deleting CNID %u", ntohl(id)); -#endif - if ((rc = db3_txn_commit(tid, 0)) != 0) { - LOG(log_error, logtype_default, "cnid_delete: Failed to commit transaction: %s", - db_strerror(rc)); - return rc; - } - return 0; - -abort_err: - LOG(log_error, logtype_default, "cnid_delete: Unable to delete CNID %u: %s", - ntohl(id), db_strerror(rc)); - return rc; -} - -#endif /* CNID_BACKEND_DB3 */ diff --git a/libatalk/cnid/db3/cnid_db3_get.c b/libatalk/cnid/db3/cnid_db3_get.c deleted file mode 100644 index a885667c..00000000 --- a/libatalk/cnid/db3/cnid_db3_get.c +++ /dev/null @@ -1,75 +0,0 @@ -/* - * $Id: cnid_db3_get.c,v 1.5 2009-10-29 13:38:16 didg Exp $ - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ - -#ifdef CNID_BACKEND_DB3 - -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_DB4_DB_H -#include -#else -#include -#endif -#include -#include -#include "cnid_db3.h" - -#include "cnid_db3_private.h" - -/* Return CNID for a given did/name. */ -cnid_t cnid_db3_get(struct _cnid_db *cdb, const cnid_t did, char *name, const size_t len) -{ - char start[CNID_DID_LEN + MAXPATHLEN + 1], *buf; - CNID_private *db; - DBT key, data; - cnid_t id; - int rc; - - if (!cdb || !(db = cdb->_private) || (len > MAXPATHLEN)) { - // FIXME: shall we report some error ! - return 0; - } - - memset(&key, 0, sizeof(key)); - memset(&data, 0, sizeof(data)); - - buf = start; - memcpy(buf, &did, sizeof(did)); - buf += sizeof(did); - memcpy(buf, name, len); - *(buf + len) = '\0'; /* Make it a C-string. */ - key.data = start; - key.size = CNID_DID_LEN + len + 1; - - while ((rc = db->db_didname->get(db->db_didname, NULL, &key, &data, 0))) { - if (rc == DB_LOCK_DEADLOCK) { - continue; - } - - if (rc != DB_NOTFOUND) { - LOG(log_error, logtype_default, "cnid_get: Unable to get CNID %u, name %s: %s", - ntohl(did), name, db_strerror(rc)); - } - - return 0; - } - - memcpy(&id, data.data, sizeof(id)); -#ifdef DEBUG - LOG(log_debug9, logtype_default, "cnid_get: Returning CNID for %u, name %s as %u", - ntohl(did), name, ntohl(id)); -#endif - return id; -} - -#endif /* CNID_BACKEND_DB3 */ diff --git a/libatalk/cnid/db3/cnid_db3_lookup.c b/libatalk/cnid/db3/cnid_db3_lookup.c deleted file mode 100644 index 43e22c19..00000000 --- a/libatalk/cnid/db3/cnid_db3_lookup.c +++ /dev/null @@ -1,148 +0,0 @@ - -/* - * $Id: cnid_db3_lookup.c,v 1.5 2009-10-29 13:38:16 didg Exp $ - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ - -#ifdef CNID_BACKEND_DB3 - -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_DB4_DB_H -#include -#else -#include -#endif -#include -#include -#include "cnid_db3.h" - -#include "cnid_db3_private.h" - -#define LOGFILEMAX 100 /* kbytes */ -#define CHECKTIMEMAX 30 /* minutes */ - -/* This returns the CNID corresponding to a particular file. It will - * also fix up the various databases if there's a problem. */ -cnid_t cnid_db3_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, char *name, const size_t len) -{ - unsigned char *buf; - CNID_private *db; - DBT key, devdata, diddata; - int devino = 1, didname = 1; - cnid_t id = 0; - int rc; - - if (!cdb || !(db = cdb->_private) || !st || !name) { - return 0; - } - - /* Do a little checkpointing if necessary. I stuck it here as cnid_lookup - * gets called when we do directory lookups. Only do this if we're using - * a read-write database. */ - if ((db->flags & CNIDFLAG_DB_RO) == 0) { -#ifdef DEBUG - LOG(log_debug9, logtype_default, "cnid_lookup: Running database checkpoint"); -#endif -#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) - if ((rc = db->dbenv->txn_checkpoint(db->dbenv, LOGFILEMAX, CHECKTIMEMAX, 0))) { - LOG(log_error, logtype_default, "cnid_lookup: txn_checkpoint: %s", db_strerror(rc)); - return 0; - } -#else -#if DB_VERSION_MAJOR >= 4 - switch (rc = db->dbenv->txn_checkpoint(db->dbenv, LOGFILEMAX, CHECKTIMEMAX, 0)) { -#else - switch (rc = txn_checkpoint(db->dbenv, LOGFILEMAX, CHECKTIMEMAX, 0)) { -#endif /* DB_VERSION_MAJOR >= 4 */ - case 0: - case DB_INCOMPLETE: - break; - default: - LOG(log_error, logtype_default, "cnid_lookup: txn_checkpoint: %s", db_strerror(rc)); - return 0; - } -#endif /* DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) */ - } - - if ((buf = make_cnid_data(st, did, name, len)) == NULL) { - LOG(log_error, logtype_default, "cnid_lookup: Pathname is too long"); - return 0; - } - - memset(&key, 0, sizeof(key)); - memset(&devdata, 0, sizeof(devdata)); - memset(&diddata, 0, sizeof(diddata)); - - /* Look for a CNID. We have two options: dev/ino or did/name. If we - * only get a match in one of them, that means a file has moved. */ - key.data = buf; - key.size = CNID_DEVINO_LEN; - while ((rc = db->db_devino->get(db->db_devino, NULL, &key, &devdata, 0))) { - if (rc == DB_LOCK_DEADLOCK) { - continue; - } - - if (rc == DB_NOTFOUND) { - devino = 0; - break; - } - - LOG(log_error, logtype_default, "cnid_lookup: Unable to get CNID dev %u, ino %u: %s", - st->st_dev, st->st_ino, db_strerror(rc)); - return 0; - } - - /* did/name now */ - key.data = buf + CNID_DEVINO_LEN; - key.size = CNID_DID_LEN + len + 1; - while ((rc = db->db_didname->get(db->db_didname, NULL, &key, &diddata, 0))) { - if (rc == DB_LOCK_DEADLOCK) { - continue; - } - - if (rc == DB_NOTFOUND) { - didname = 0; - break; - } - - LOG(log_error, logtype_default, "cnid_lookup: Unable to get CNID %u, name %s: %s", - ntohl(did), name, db_strerror(rc)); - return 0; - } - - /* Set id. Honor did/name over dev/ino as dev/ino isn't necessarily - * 1-1. */ - if (didname) { - memcpy(&id, diddata.data, sizeof(id)); - } else if (devino) { - memcpy(&id, devdata.data, sizeof(id)); - } - - /* Either entries are in both databases or neither of them. */ - if ((devino && didname) || !(devino || didname)) { -#ifdef DEBUG - LOG(log_debug9, logtype_default, "cnid_lookup: Looked up did %u, name %s, as %u", ntohl(did), name, ntohl(id)); -#endif - return id; - } - - /* Fix up the database. */ - cnid_db3_update(cdb, id, st, did, name, len); -#ifdef DEBUG - LOG(log_debug9, logtype_default, "cnid_lookup: Looked up did %u, name %s, as %u (needed update)", ntohl(did), name, - ntohl(id)); -#endif - return id; -} - - -#endif /* CNID_BACKEND_DB3 */ diff --git a/libatalk/cnid/db3/cnid_db3_meta.c b/libatalk/cnid/db3/cnid_db3_meta.c deleted file mode 100644 index 5b51ce5b..00000000 --- a/libatalk/cnid/db3/cnid_db3_meta.c +++ /dev/null @@ -1,9 +0,0 @@ -/* - * $Id: cnid_db3_meta.c,v 1.2 2005-04-28 20:49:59 bfernhomberg Exp $ - * - * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu) - * All Rights Reserved. See COPYRIGHT. - * - * deal with metadata - * - */ diff --git a/libatalk/cnid/db3/cnid_db3_meta.h b/libatalk/cnid/db3/cnid_db3_meta.h deleted file mode 100644 index f2426b54..00000000 --- a/libatalk/cnid/db3/cnid_db3_meta.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * $Id: cnid_db3_meta.h,v 1.2 2005-04-28 20:49:59 bfernhomberg Exp $ - */ - -#define CNID_META_CNID_LEN 4 -#define CNID_META_MDATE_LEN 4 /* space for 8 */ -#define CNID_META_CDATE_LEN 4 /* space for 8 */ -#define CNID_META_BDATE_LEN 4 /* ditto */ -#define CNID_META_ADATE_LEN 4 /* ditto */ -#define CNID_META_AFPI_LEN 4 /* plus permission bits */ -#define CNID_META_FINDERI_LEN 32 -#define CNID_META_PRODOSI_LEN 8 -#define CNID_META_RFORKLEN_LEN 4 /* space for 8 */ -#define CNID_META_MACNAME_LEN 32 /* maximum size */ -#define CNID_META_SHORTNAME_LEN 12 /* max size (8.3) */ -#define CNID_META_FILLER_LEN 4 - -#define CNID_META_CNID_OFF 0 -#define CNID_META_MDATE_OFF (CNID_META_CNID_OFF + CNID_META_CNID_LEN + \ - CNID_META_FILLER_LEN) -#define CNID_META_CDATE_OFF (CNID_META_MDATE_OFF + CNID_META_MDATE_LEN + \ - CNID_META_FILLER_LEN) -#define CNID_META_BDATE_OFF (CNID_META_CDATE_OFF + CNID_META_CDATE_LEN + \ - CNID_META_FILLER_LEN) -#define CNID_META_ADATE_OFF (CNID_META_BDATE_OFF + CNID_META_BDATE_LEN + \ - CNID_META_FILLER_LEN) -#define CNID_META_AFPI_OFF (CNID_META_ADATE_OFF + CNID_META_ADATE_LEN) -#define CNID_META_FINDERI_OFF (CNID_META_AFPI_OFF + CNID_META_AFPI_LEN) -#define CNID_META_PRODOSI_OFF (CNID_META_FINDERI_OFF + CNID_META_FINDERI_LEN) -#define CNID_META_RFORKLEN_OFF (CNID_META_PRODOSI_OFF + CNID_META_PRODOSI_LEN) -#define CNID_META_MACNAME_OFF (CNID_META_RFORKLEN_OFF + \ - CNID_META_RFORKLEN_LEN) -#define CNID_META_SHORTNAME_OFF (CNID_META_MACNAME_OFF + - - -#define cnid_meta_clear(a) -#define cnid_meta_get(id) - -#define cnid_meta_cnid(a) -#define cnid_meta_modifydate(a) -#define cnid_meta_createdate(a) -#define cnid_meta_backupdate(a) -#define cnid_meta_accessdate(a) -#define cnid_meta_afpi(a) -#define cnid_meta_finderi(a) -#define cnid_meta_prodosi(a) -#define cnid_meta_rforklen(a) -#define cnid_meta_macname(a) -#define cnid_meta_shortname(a) -#define cnid_meta_longname(a) - diff --git a/libatalk/cnid/db3/cnid_db3_nextid.c b/libatalk/cnid/db3/cnid_db3_nextid.c deleted file mode 100644 index bf6115a9..00000000 --- a/libatalk/cnid/db3/cnid_db3_nextid.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * $Id: cnid_db3_nextid.c,v 1.2 2005-04-28 20:49:59 bfernhomberg Exp $ - */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ - -#ifdef CNID_BACKEND_DB3 - -#ifdef unused - -#ifdef HAVE_DB4_DB_H -#include -#else -#include -#endif - -#include -#include "cnid_db3.h" - -#include - -#include "cnid_db3_private.h" - -/* return the next id. we use the fact that ad files are memory - * mapped. */ -cnid_t cnid_db3_nextid(struct _cnid_db *cdb) -{ - CNID_private *db; - cnid_t id; - - if (!cdb || !(db = cdb->_private)) - return 0; - - memcpy(&id, ad_entry(&db->rootinfo, ADEID_DID), sizeof(id)); - return id; -} -#endif - -#endif /* CNID_BACKEND_DB3 */ diff --git a/libatalk/cnid/db3/cnid_db3_open.c b/libatalk/cnid/db3/cnid_db3_open.c deleted file mode 100644 index 92798b78..00000000 --- a/libatalk/cnid/db3/cnid_db3_open.c +++ /dev/null @@ -1,522 +0,0 @@ - -/* - * $Id: cnid_db3_open.c,v 1.5 2009-11-24 12:18:19 didg Exp $ - * - * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu) - * All Rights Reserved. See COPYRIGHT. - * - * CNID database support. - * - * here's the deal: - * 1) afpd already caches did's. - * 2) the database stores cnid's as both did/name and dev/ino pairs. - * 3) RootInfo holds the value of the NextID. - * 4) the cnid database gets called in the following manner -- - * start a database: - * cnid = cnid_open(root_dir); - * - * allocate a new id: - * newid = cnid_add(cnid, dev, ino, parent did, - * name, id); id is a hint for a specific id. pass 0 if you don't - * care. if the id is already assigned, you won't get what you - * requested. - * - * given an id, get a did/name and dev/ino pair. - * name = cnid_get(cnid, &id); given an id, return the corresponding - * info. - * return code = cnid_delete(cnid, id); delete an entry. - * - * with AFP, CNIDs 0-2 have special meanings. here they are: - * 0 -- invalid cnid - * 1 -- parent of root directory (handled by afpd) - * 2 -- root directory (handled by afpd) - * - * CNIDs 4-16 are reserved according to page 31 of the AFP 3.0 spec so, - * CNID_START begins at 17. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ - -#ifdef CNID_BACKEND_DB3 - -#include -#include -#include -#ifdef HAVE_UNISTD_H -#include -#endif /* HAVE_UNISTD_H */ -#ifdef HAVE_FCNTL_H -#include -#endif /* HAVE_FCNTL_H */ -#include -#include -#include -#ifdef HAVE_SYS_TIME_H -#include -#endif /* HAVE_SYS_TIME_H */ - -#ifdef HAVE_DB4_DB_H -#include -#else -#include -#endif - -#include -#include -#include "cnid_db3.h" -#include - -#include "cnid_db3_private.h" - -#ifndef MIN -#define MIN(a, b) ((a) < (b) ? (a) : (b)) -#endif /* ! MIN */ - -#define DBHOME ".AppleDB" -#define DBCNID "cnid.db" -#define DBDEVINO "devino.db" -#define DBDIDNAME "didname.db" /* did/full name mapping */ -#define DBLOCKFILE "cnid.lock" -#define DBRECOVERFILE "cnid.dbrecover" -#define DBCLOSEFILE "cnid.close" - -#define DBHOMELEN 8 -#define DBLEN 10 - -/* we version the did/name database so that we can change the format - * if necessary. the key is in the form of a did/name pair. in this case, - * we use 0/0. */ -#define DBVERSION_KEY "\0\0\0\0\0" -#define DBVERSION_KEYLEN 5 -#define DBVERSION1 0x00000001U -#define DBVERSION DBVERSION1 - -#if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1) -#define DBOPTIONS (DB_CREATE | DB_INIT_MPOOL | DB_INIT_LOCK | \ -DB_INIT_LOG | DB_INIT_TXN) -#else /* DB_VERSION_MINOR < 1 */ - -/*#define DBOPTIONS (DB_CREATE | DB_INIT_MPOOL | DB_INIT_LOCK | \ -DB_INIT_LOG | DB_INIT_TXN | DB_TXN_NOSYNC)*/ -#define DBOPTIONS (DB_CREATE | DB_INIT_MPOOL | DB_INIT_LOCK | \ -DB_INIT_LOG | DB_INIT_TXN) -#endif /* DB_VERSION_MINOR */ - -/* Let's try and use the youngest lock detector if present. - * If we can't do that, then let BDB use its default deadlock detector. */ -#if defined DB_LOCK_YOUNGEST -#define DEAD_LOCK_DETECT DB_LOCK_YOUNGEST -#else /* DB_LOCK_YOUNGEST */ -#define DEAD_LOCK_DETECT DB_LOCK_DEFAULT -#endif /* DB_LOCK_YOUNGEST */ - -#define MAXITER 0xFFFF /* maximum number of simultaneously open CNID - * databases. */ - -#if 0 -/* ----------------------- - * bandaid for LanTest performance pb. for now not used, cf. ifdef 0 below -*/ -static int my_yield(void) -{ - struct timeval t; - int ret; - - t.tv_sec = 0; - t.tv_usec = 1000; - ret = select(0, NULL, NULL, NULL, &t); - return 0; -} -#endif - -/* --------------- */ -static int my_open(DB * p, const char *f, const char *d, DBTYPE t, u_int32_t flags, int mode) -{ -#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) - return p->open(p, NULL, f, d, t, flags | DB_AUTO_COMMIT, mode); -#else - return p->open(p, f, d, t, flags, mode); -#endif -} - -#if 0 -/* --------------- - * XXX not used -*/ - -/* the first compare that's always done. */ -static int compare_did(const DBT * a, const DBT * b) -{ - u_int32_t dida, didb; - - memcpy(&dida, a->data, sizeof(dida)); - memcpy(&didb, b->data, sizeof(didb)); - return dida - didb; -} - -/* sort did's and then names. this is for unix paths. - * i.e., did/unixname lookups. */ -#if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1) -static int compare_unix(DB * db _U_, const DBT * a, const DBT * b) -#else /* DB_VERSION_MINOR < 1 */ -static int compare_unix(const DBT * a, const DBT * b) -#endif /* DB_VERSION_MINOR */ -{ - u_int8_t *sa, *sb; - int len, ret; - - /* sort by did */ - if ((ret = compare_did(a, b))) - return ret; - - sa = (u_int8_t *) a->data + 4; /* shift past did */ - sb = (u_int8_t *) b->data + 4; - for (len = MIN(a->size, b->size); len-- > 4; sa++, sb++) - if ((ret = (*sa - *sb))) - return ret; /* sort by lexical ordering */ - - return a->size - b->size; /* sort by length */ -} - -/* sort did's and then names. this is for macified paths (i.e., - * did/macname, and did/shortname. i think did/longname needs a - * unicode table to work. also, we can't use strdiacasecmp as that - * returns a match if a < b. */ -#if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1) -static int compare_mac(DB * db _U_, const DBT * a, const DBT * b) -#else /* DB_VERSION_MINOR < 1 */ -static int compare_mac(const DBT * a, const DBT * b) -#endif /* DB_VERSION_MINOR */ -{ - u_int8_t *sa, *sb; - int len, ret; - - /* sort by did */ - if ((ret = compare_did(a, b))) - return ret; - - sa = (u_int8_t *) a->data + 4; - sb = (u_int8_t *) b->data + 4; - for (len = MIN(a->size, b->size); len-- > 4; sa++, sb++) - if ((ret = (_diacasemap[*sa] - _diacasemap[*sb]))) - return ret; /* sort by lexical ordering */ - - return a->size - b->size; /* sort by length */ -} - -/* for unicode names -- right now it's the same as compare_mac. */ -#if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1) -static int compare_unicode(DB * db, const DBT * a, const DBT * b) -#else /* DB_VERSION_MINOR < 1 */ -static int compare_unicode(const DBT * a, const DBT * b) -#endif /* DB_VERSION_MINOR */ -{ -#if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1) - return compare_mac(db, a, b); -#else /* DB_VERSION_MINOR < 1 */ - return compare_mac(a, b); -#endif /* DB_VERSION_MINOR */ -} -#endif - -static struct _cnid_db *cnid_db3_new(const char *volpath) -{ - struct _cnid_db *cdb; - - if ((cdb = (struct _cnid_db *) calloc(1, sizeof(struct _cnid_db))) == NULL) - return NULL; - - if ((cdb->volpath = strdup(volpath)) == NULL) { - free(cdb); - return NULL; - } - - cdb->flags = CNID_FLAG_PERSISTENT; - - cdb->cnid_add = cnid_db3_add; - cdb->cnid_delete = cnid_db3_delete; - cdb->cnid_get = cnid_db3_get; - cdb->cnid_lookup = cnid_db3_lookup; - cdb->cnid_nextid = NULL; /*cnid_db3_nextid;*/ - cdb->cnid_resolve = cnid_db3_resolve; - cdb->cnid_update = cnid_db3_update; - cdb->cnid_close = cnid_db3_close; - - return cdb; -} - -struct _cnid_db *cnid_db3_open(const char *dir, mode_t mask, u_int32_t flags _U_) -{ - struct stat st; - struct flock lock; - char path[MAXPATHLEN + 1]; - CNID_private *db; - struct _cnid_db *cdb; - DBT key, data; - DB_TXN *tid = NULL; - int open_flag, len; - int rc; - - if (!dir) { - return NULL; - } - - /* this checks .AppleDB */ - if ((len = strlen(dir)) > (MAXPATHLEN - DBLEN - 1)) { - LOG(log_error, logtype_default, "cnid_open: Pathname too large: %s", dir); - return NULL; - } - - if ((cdb = cnid_db3_new(dir)) == NULL) { - LOG(log_error, logtype_default, "cnid_open: Unable to allocate memory for database"); - return NULL; - } - - if ((db = (CNID_private *) calloc(1, sizeof(CNID_private))) == NULL) { - LOG(log_error, logtype_default, "cnid_open: Unable to allocate memory for database"); - goto fail_cdb; - } - - cdb->_private = (void *) db; - db->magic = CNID_DB_MAGIC; - - strcpy(path, dir); - if (path[len - 1] != '/') { - strcat(path, "/"); - len++; - } - - strcpy(path + len, DBHOME); - if ((stat(path, &st) < 0) && (ad_mkdir(path, 0777 & ~mask) < 0)) { - LOG(log_error, logtype_default, "cnid_open: DBHOME mkdir failed for %s", path); - goto fail_adouble; - } - - lock.l_type = F_WRLCK; - lock.l_whence = SEEK_SET; - /* Make sure cnid.lock goes in .AppleDB. */ - strcat(path, "/"); - len++; - - /* Search for a byte lock. This allows us to cleanup the log files - * at cnid_close() in a clean fashion. - * - * NOTE: This won't work if multiple volumes for the same user refer - * to the sahe directory. */ - strcat(path, DBLOCKFILE); - strcpy(db->lock_file, path); - if ((db->lockfd = open(path, O_RDWR | O_CREAT, 0666 & ~mask)) > -1) { - lock.l_start = 0; - lock.l_len = 1; - while (fcntl(db->lockfd, F_SETLK, &lock) < 0) { - if (++lock.l_start > MAXITER) { - LOG(log_error, logtype_default, - "cnid_open: Cannot establish logfile cleanup for database environment %s lock (lock failed)", path); - close(db->lockfd); - db->lockfd = -1; - break; - } - } - } else { - LOG(log_error, logtype_default, - "cnid_open: Cannot establish logfile cleanup lock for database environment %s (open() failed)", path); - } - - path[len + DBHOMELEN] = '\0'; - open_flag = DB_CREATE; - - /* Print out the version of BDB we're linked against. */ - LOG(log_info, logtype_default, "CNID DB initializing using %s", db_version(NULL, NULL, NULL)); - - /* We need to be able to open the database environment with full - * transaction, logging, and locking support if we ever hope to - * be a true multi-acess file server. */ - if ((rc = db_env_create(&db->dbenv, 0)) != 0) { - LOG(log_error, logtype_default, "cnid_open: db_env_create: %s", db_strerror(rc)); - goto fail_lock; - } - - /* Setup internal deadlock detection. */ - if ((rc = db->dbenv->set_lk_detect(db->dbenv, DEAD_LOCK_DETECT)) != 0) { - LOG(log_error, logtype_default, "cnid_open: set_lk_detect: %s", db_strerror(rc)); - goto fail_lock; - } - -#if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1) -#if 0 - /* Take care of setting the DB_TXN_NOSYNC flag in db3 > 3.1.x. */ - if ((rc = db->dbenv->set_flags(db->dbenv, DB_TXN_NOSYNC, 1)) != 0) { - LOG(log_error, logtype_default, "cnid_open: set_flags: %s", db_strerror(rc)); - goto fail_lock; - } -#endif -#endif /* DB_VERSION_MINOR > 1 */ - - /* Open the database environment. */ - if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) { - if (rc == DB_RUNRECOVERY) { - /* This is the mother of all errors. We _must_ fail here. */ - LOG(log_error, logtype_default, - "cnid_open: CATASTROPHIC ERROR opening database environment %s. Run db_recovery -c immediately", path); - goto fail_lock; - } - - /* We can't get a full transactional environment, so multi-access - * is out of the question. Let's assume a read-only environment, - * and try to at least get a shared memory pool. */ - if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) { - /* Nope, not a MPOOL, either. Last-ditch effort: we'll try to - * open the environment with no flags. */ - if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) { - LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s", path, db_strerror(rc)); - goto fail_lock; - } - } - db->flags |= CNIDFLAG_DB_RO; - open_flag = DB_RDONLY; - LOG(log_info, logtype_default, "cnid_open: Obtained read-only database environment %s", path); - } - /* did/name reverse mapping. We use a BTree for this one. */ - if ((rc = db_create(&db->db_didname, db->dbenv, 0)) != 0) { - LOG(log_error, logtype_default, "cnid_open: Failed to create did/name database: %s", db_strerror(rc)); - goto fail_appinit; - } - - /*db->db_didname->set_bt_compare(db->db_didname, &compare_unix); */ - if ((rc = my_open(db->db_didname, DBDIDNAME, NULL, DB_BTREE, open_flag, 0666 & ~mask))) { - LOG(log_error, logtype_default, "cnid_open: Failed to open did/name database: %s", db_strerror(rc)); - goto fail_appinit; - } - - /* Check for version. This way we can update the database if we need - * to change the format in any way. */ - memset(&key, 0, sizeof(key)); - memset(&data, 0, sizeof(data)); - key.data = DBVERSION_KEY; - key.size = DBVERSION_KEYLEN; - - dbversion_retry: - if ((rc = db3_txn_begin(db->dbenv, NULL, &tid, 0)) != 0) { - LOG(log_error, logtype_default, "cnid_open: txn_begin: failed to check db version: %s", db_strerror(rc)); - goto fail_appinit; - } - - while ((rc = db->db_didname->get(db->db_didname, tid, &key, &data, DB_RMW))) { - int ret; - - switch (rc) { - case DB_LOCK_DEADLOCK: - if ((ret = db3_txn_abort(tid)) != 0) { - LOG(log_error, logtype_default, "cnid_open: txn_abort: %s", db_strerror(ret)); - goto fail_appinit; - } - goto dbversion_retry; - case DB_NOTFOUND: - { - u_int32_t version = htonl(DBVERSION); - - data.data = &version; - data.size = sizeof(version); - } - - if ((ret = db->db_didname->put(db->db_didname, tid, &key, &data, DB_NOOVERWRITE))) { - if (ret == DB_LOCK_DEADLOCK) { - if ((ret = db3_txn_abort(tid)) != 0) { - LOG(log_error, logtype_default, "cnid_open: txn_abort: %s", db_strerror(ret)); - goto fail_appinit; - } - goto dbversion_retry; - } else if (ret == DB_RUNRECOVERY) { - /* At this point, we don't care if the transaction aborts - * successfully or not. */ - db3_txn_abort(tid); - LOG(log_error, logtype_default, "cnid_open: Error putting new version: %s", db_strerror(ret)); - goto fail_appinit; - } - } - break; /* while loop */ - default: - db3_txn_abort(tid); - LOG(log_error, logtype_default, "cnid_open: Failed to check db version: %s", db_strerror(rc)); - goto fail_appinit; - } - } - - if ((rc = db3_txn_commit(tid, 0)) != 0) { - LOG(log_error, logtype_default, "cnid_open: Failed to commit db version: %s", db_strerror(rc)); - goto fail_appinit; - } - - /* TODO In the future we might check for version number here. */ -#if 0 - memcpy(&version, data.data, sizeof(version)); - if (version != ntohl(DBVERSION)) { - /* Do stuff here. */ - } -#endif /* 0 */ - - /* dev/ino reverse mapping. Use a hash for this one. */ - if ((rc = db_create(&db->db_devino, db->dbenv, 0)) != 0) { - LOG(log_error, logtype_default, "cnid_open: Failed to create dev/ino database: %s", db_strerror(rc)); - goto fail_appinit; - } - - if ((rc = my_open(db->db_devino, DBDEVINO, NULL, DB_BTREE, open_flag, 0666 & ~mask))) { - LOG(log_error, logtype_default, "cnid_open: Failed to open devino database: %s", db_strerror(rc)); - goto fail_appinit; - } - - /* Main CNID database. Use a hash for this one. */ - if ((rc = db_create(&db->db_cnid, db->dbenv, 0)) != 0) { - LOG(log_error, logtype_default, "cnid_open: Failed to create cnid database: %s", db_strerror(rc)); - goto fail_appinit; - } - - if ((rc = my_open(db->db_cnid, DBCNID, NULL, DB_BTREE, open_flag, 0666 & ~mask))) { - LOG(log_error, logtype_default, "cnid_open: Failed to open dev/ino database: %s", db_strerror(rc)); - goto fail_appinit; - } - -#if 0 - db_env_set_func_yield(my_yield); -#endif - return cdb; - - fail_appinit: - if (db->db_didname) - db->db_didname->close(db->db_didname, 0); - if (db->db_devino) - db->db_devino->close(db->db_devino, 0); - if (db->db_cnid) - db->db_cnid->close(db->db_cnid, 0); - LOG(log_error, logtype_default, "cnid_open: Failed to setup CNID DB environment"); - db->dbenv->close(db->dbenv, 0); - - fail_lock: - if (db->lockfd > -1) { - close(db->lockfd); - (void) remove(db->lock_file); - } - - fail_adouble: - - free(db); - - fail_cdb: - if (cdb->volpath != NULL) - free(cdb->volpath); - free(cdb); - - return NULL; -} - -struct _cnid_module cnid_db3_module = { - "db3", - {NULL, NULL}, - cnid_db3_open, - CNID_FLAG_BLOCK -}; - -#endif /* CNID_BACKEND_DB3 */ diff --git a/libatalk/cnid/db3/cnid_db3_private.h b/libatalk/cnid/db3/cnid_db3_private.h deleted file mode 100644 index 98f99498..00000000 --- a/libatalk/cnid/db3/cnid_db3_private.h +++ /dev/null @@ -1,129 +0,0 @@ -/* - * $Id: cnid_db3_private.h,v 1.4 2008-12-03 18:35:44 didg Exp $ - */ - -#ifndef LIBATALK_CNID_PRIVATE_H -#define LIBATALK_CNID_PRIVATE_H 1 - -#include -#include -#include -#ifdef HAVE_UNISTD_H -#include -#endif /* HAVE_UNISTD_H */ -#include -#include - -#include -#include "cnid_db3.h" - -#define CNID_DB_MAGIC 0x434E4944U /* CNID */ -#define CNID_DATA_MAGIC 0x434E4945U /* CNIE */ - -#define CNID_DEVINO_LEN 8 -#define CNID_DID_LEN 4 -#define CNID_HEADER_LEN (CNID_DEVINO_LEN + CNID_DID_LEN) - -#define CNID_START 17 - -#define CNIDFLAG_ROOTINFO_RO (1 << 0) -#define CNIDFLAG_DB_RO (1 << 1) - -/* the key is in the form of a did/name pair. in this case, - * we use 0/RootInfo. */ -#define ROOTINFO_KEY "\0\0\0\0RootInfo" -#define ROOTINFO_KEYLEN 12 - -typedef struct CNID_private { - u_int32_t magic; - DB *db_cnid; - DB *db_didname; - DB *db_devino; - DB_ENV *dbenv; - int lockfd, flags; - char lock_file[MAXPATHLEN + 1]; -} CNID_private; - -/* on-disk data format (in network byte order where appropriate) -- - * db_cnid: (key: cnid) - * name size (in bytes) - * dev 4 - * ino 4 - * did 4 - * unix name strlen(name) + 1 - * - * db_didname: (key: did/unix name) - * -- this also caches the bits of .AppleDouble used by FPGetFilDirParam - * so that we don't have to open the header file. - * NOTE: FPCatSearch has to search through all of the directories as - * this stuff doesn't get entered until needed. - * if the entire volume is in the database, though, we can use - * cursor operations to make this faster. - * - * version number is stored with did/name key of 0/0 - * - * cnid 4 - * modfiller 4 (dates only use 4 bytes right now, but we leave space - * moddate 4 for 8. moddate is also used to keep this info - * createfiller 4 up-to-date.) - * createdate 4 - * backfiller 4 - * backupdate 4 - * accfiller 4 (unused) - * accdate 4 (unused) - * AFP info 4 (stores a couple permission bits as well) - * finder info 32 - * prodos info 8 - * rforkfiller 4 - * rforklen 4 - * macname 32 (nul-terminated) - * shortname 12 (nul-terminated) - * longname longnamelen (nul-terminated) - * --------------- - * 132 bytes + longnamelen - * - * db_devino: (key: dev/ino) - * -- this is only used for consistency checks and isn't 1-1 - * cnid 4 - * - * these correspond to the different path types. longname is for the - * 255 unicode character names (path type == ?), macname is for the - * 32-character names (path type == 2), and shortname is for the - * 8+3-character names (path type == 1). - * - * db_longname: (key: did/longname) - * name namelen = strlen(name) + 1 - * - * db_macname: (key: did/macname) - * name namelen = strlen(name) + 1 - * - * db_shortname: (key: did/shortname) - * name namelen = strlen(name) + 1 - */ - -/* construct db_cnid data. NOTE: this is not re-entrant. */ -static inline unsigned char *make_cnid_data(const struct stat *st, - const cnid_t did, - const char *name, const size_t len) -{ - static unsigned char start[CNID_HEADER_LEN + MAXPATHLEN + 1]; - unsigned char *buf = start; - u_int32_t i; - - if (len > MAXPATHLEN) - return NULL; - - i = htonl(st->st_dev); - buf = memcpy(buf, &i, sizeof(i)); - i = htonl(st->st_ino); - buf = memcpy(buf + sizeof(i), &i, sizeof(i)); - /* did is already in network byte order */ - buf = memcpy(buf + sizeof(i), &did, sizeof(did)); - buf = memcpy(buf + sizeof(did), name, len); - *(buf + len) = '\0'; - buf += len + 1; - - return start; -} - -#endif /* atalk/cnid/cnid_private.h */ diff --git a/libatalk/cnid/db3/cnid_db3_resolve.c b/libatalk/cnid/db3/cnid_db3_resolve.c deleted file mode 100644 index c456abd2..00000000 --- a/libatalk/cnid/db3/cnid_db3_resolve.c +++ /dev/null @@ -1,70 +0,0 @@ -/* - * $Id: cnid_db3_resolve.c,v 1.5 2009-10-29 13:38:16 didg Exp $ - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ - -#ifdef CNID_BACKEND_DB3 - -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_DB4_DB_H -#include -#else -#include -#endif -#include -#include -#include "cnid_db3.h" - -#include "cnid_db3_private.h" - -/* Return the did/name pair corresponding to a CNID. */ -char *cnid_db3_resolve(struct _cnid_db *cdb, cnid_t *id, void *buffer, size_t len) { - CNID_private *db; - DBT key, data; - int rc; - - if (!cdb || !(db = cdb->_private) || !id || !(*id)) { - return NULL; - } - - memset(&key, 0, sizeof(key)); - memset(&data, 0, sizeof(data)); - - data.data = buffer; - data.ulen = len; - data.flags = DB_DBT_USERMEM; - - key.data = id; - key.size = sizeof(cnid_t); - while ((rc = db->db_cnid->get(db->db_cnid, NULL, &key, &data, 0))) { - if (rc == DB_LOCK_DEADLOCK) { - continue; - } - - if (rc != DB_NOTFOUND) { - LOG(log_error, logtype_default, "cnid_resolve: Unable to get did/name: %s", - db_strerror(rc)); - } - - *id = 0; - return NULL; - } - - memcpy(id, (char *)data.data + CNID_DEVINO_LEN, sizeof(cnid_t)); -#ifdef DEBUG - LOG(log_debug9, logtype_default, "cnid_resolve: Returning id = %u, did/name = %s", - ntohl(*id), (char *)data.data + CNID_HEADER_LEN); -#endif - return (char *)data.data + CNID_HEADER_LEN; -} - -#endif /* CNID_BACKEND_DB3 */ diff --git a/libatalk/cnid/db3/cnid_db3_update.c b/libatalk/cnid/db3/cnid_db3_update.c deleted file mode 100644 index 7294971b..00000000 --- a/libatalk/cnid/db3/cnid_db3_update.c +++ /dev/null @@ -1,159 +0,0 @@ -/* - * $Id: cnid_db3_update.c,v 1.3 2005-05-03 14:55:13 didg Exp $ - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ - -#ifdef CNID_BACKEND_DB3 - -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_DB4_DB_H -#include -#else -#include -#endif -#include -#include -#include "cnid_db3.h" - -#include "cnid_db3_private.h" - -/* cnid_update: takes the given cnid and updates the metadata. To - * handle the did/name data, there are a bunch of functions to get - * and set the various fields. */ -int cnid_db3_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st, - const cnid_t did, char *name, const size_t len - /*, const char *info, const int infolen*/) -{ - CNID_private *db; - DBT key, data, altdata; - DB_TXN *tid; - int rc; - - if (!cdb || !(db = cdb->_private) || !id || !st || !name || (db->flags & CNIDFLAG_DB_RO)) { - return -1; - } - - memset(&key, 0, sizeof(key)); - memset(&altdata, 0, sizeof(altdata)); - -retry: - if ((rc = db3_txn_begin(db->dbenv, NULL, &tid, 0))) { - LOG(log_error, logtype_default, "cnid_update: Failed to begin transaction: %s", db_strerror(rc)); - return rc; - } - - /* Get the old info. */ - key.data = (cnid_t *)&id; - key.size = sizeof(id); - memset(&data, 0, sizeof(data)); - if ((rc = db->db_cnid->get(db->db_cnid, tid, &key, &data, DB_RMW))) { - db3_txn_abort(tid); - switch (rc) { - case DB_LOCK_DEADLOCK: - goto retry; - case DB_NOTFOUND: - /* Silently fail here. We're allowed to do this since this CNID - * might have been deleted out from under us, or someone has - * called cnid_lookup then cnid_update (which is redundant). */ - return 0; - default: - goto update_err; - } - } - - /* Delete the old dev/ino mapping. */ - key.data = data.data; - key.size = CNID_DEVINO_LEN; - if ((rc = db->db_devino->del(db->db_devino, tid, &key, 0))) { - switch (rc) { - case DB_LOCK_DEADLOCK: - db3_txn_abort(tid); - goto retry; - case DB_NOTFOUND: - break; - default: - db3_txn_abort(tid); - goto update_err; - } - } - - /* Delete the old did/name mapping. */ - key.data = (char *) data.data + CNID_DEVINO_LEN; - key.size = data.size - CNID_DEVINO_LEN; - if ((rc = db->db_didname->del(db->db_didname, tid, &key, 0))) { - switch (rc) { - case DB_LOCK_DEADLOCK: - db3_txn_abort(tid); - goto retry; - case DB_NOTFOUND: - break; - default: - db3_txn_abort(tid); - goto update_err; - } - } - - /* Make a new entry. */ - data.data = make_cnid_data(st, did, name, len); - data.size = CNID_HEADER_LEN + len + 1; - - /* Update the old CNID with the new info. */ - key.data = (cnid_t *) &id; - key.size = sizeof(id); - if ((rc = db->db_cnid->put(db->db_cnid, tid, &key, &data, 0))) { - db3_txn_abort(tid); - switch (rc) { - case DB_LOCK_DEADLOCK: - goto retry; - default: - goto update_err; - } - } - - /* Put in a new dev/ino mapping. */ - key.data = data.data; - key.size = CNID_DEVINO_LEN; - altdata.data = (cnid_t *) &id; - altdata.size = sizeof(id); - if ((rc = db->db_devino->put(db->db_devino, tid, &key, &altdata, 0))) { - db3_txn_abort(tid); - switch (rc) { - case DB_LOCK_DEADLOCK: - goto retry; - default: - goto update_err; - } - } - - /* put in a new did/name mapping. */ - key.data = (char *) data.data + CNID_DEVINO_LEN; - key.size = data.size - CNID_DEVINO_LEN; - if ((rc = db->db_didname->put(db->db_didname, tid, &key, &altdata, 0))) { - db3_txn_abort(tid); - switch (rc) { - case DB_LOCK_DEADLOCK: - goto retry; - default: - goto update_err; - } - } - - - return db3_txn_commit(tid, 0); - -update_err: - LOG(log_error, logtype_default, "cnid_update: Unable to update CNID %u: %s", - ntohl(id), db_strerror(rc)); - return -1; -} - -#endif /* CNID_BACKEND_DB3 */