X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=44159a6fecf7f16f7fd9548003f2b3df90a77367;hp=eca3c5630ef8a24061f818fb1bf2c2852e405ba3;hb=d5538ff0dd9f6531a1a319b49c32bd72597fb2c3;hpb=8211954fc3390c0fa19cca788b03336a37aa9dc0

diff --git a/blob.c b/blob.c
index eca3c563..44159a6f 100644
--- a/blob.c
+++ b/blob.c
@@ -1,11 +1,47 @@
+/*
+ * Copyright (C) 2007-2010 Andre Noll <maan@systemlinux.org>
+ *
+ * Licensed under the GPL v2. For licencing details see COPYING.
+ */
+
+/** \file blob.c Macros and functions for blob handling. */
+
+#include <regex.h>
+#include <fnmatch.h>
+#include <openssl/rc4.h>
+#include <osl.h>
+
 #include "para.h"
 #include "error.h"
+#include "crypt.h"
+#include "string.h"
 #include "afh.h"
 #include "afs.h"
-#include "string.h"
 #include "net.h"
+#include "ipc.h"
+#include "portable_io.h"
+
+/**
+ * Compare two osl objects pointing to unsigned integers of 32 bit size.
+ *
+ * \param obj1 Pointer to the first integer.
+ * \param obj2 Pointer to the second integer.
+ *
+ * \return The values required for an osl compare function.
+ *
+ * \sa osl_compare_func, osl_hash_compare().
+ */
+static int uint32_compare(const struct osl_object *obj1, const struct osl_object *obj2)
+{
+	uint32_t d1 = read_u32((const char *)obj1->data);
+	uint32_t d2 = read_u32((const char *)obj2->data);
 
-/** \file blob.c Macros and functions for blob handling. */
+	if (d1 < d2)
+		return 1;
+	if (d1 > d2)
+		return -1;
+	return 0;
+}
 
 static struct osl_column_description blob_cols[] = {
 	[BLOBCOL_ID] = {
@@ -28,6 +64,24 @@ static struct osl_column_description blob_cols[] = {
 	}
 };
 
+/** Define an osl table description for a blob table. */
+#define DEFINE_BLOB_TABLE_DESC(table_name) \
+	struct osl_table_description table_name ## _table_desc = { \
+		.name = #table_name, \
+		.num_columns = NUM_BLOB_COLUMNS, \
+		.flags = OSL_LARGE_TABLE, \
+		.column_descriptions = blob_cols \
+	};
+
+/** Define a pointer to an osl blob table with a canonical name. */
+#define DEFINE_BLOB_TABLE_PTR(table_name) struct osl_table *table_name ## _table;
+
+
+/** Define a blob table. */
+#define INIT_BLOB_TABLE(table_name) \
+	DEFINE_BLOB_TABLE_DESC(table_name); \
+	DEFINE_BLOB_TABLE_PTR(table_name);
+
 /** \cond doxygen isn't smart enough to recognize these */
 INIT_BLOB_TABLE(lyrics);
 INIT_BLOB_TABLE(images);
@@ -45,73 +99,74 @@ enum blob_ls_flags {
 	BLOB_LS_FLAG_SORT_BY_ID = 4,
 };
 
-/** Data passed to \p com_lsbob_callback(). */
-struct com_lsblob_options {
-	/** Given flags for the ls command. */
+/** Structure passed to the \p print_blob function. */
+struct lsblob_action_data {
+	/** The flags given at the command line. */
 	uint32_t flags;
+	/** Message buffer. */
+	struct para_buffer pb;
 };
 
-/** Structure passed to the \p print_blob loop function. */
-struct lsblob_loop_data {
-	struct com_lsblob_options *opts;
-	struct para_buffer *pb;
-	struct osl_table *table;
-};
-
-static int print_blob(struct osl_row *row, void *loop_data)
+static int print_blob(struct osl_table *table, struct osl_row *row,
+		const char *name, void *data)
 {
+	struct lsblob_action_data *lbad = data;
 	struct osl_object obj;
-	char *name;
 	uint32_t id;
 	int ret;
-	struct lsblob_loop_data *lld = loop_data;
 
-	ret = osl_get_object(lld->table, row, BLOBCOL_NAME, &obj);
-	if (ret < 0)
-		return ret;
-	name = obj.data;
-	if (!*name) /* ignore dummy row */
-		return 1;
-	ret = osl_get_object(lld->table, row, BLOBCOL_ID, &obj);
-	if (ret < 0)
+	if (!(lbad->flags & BLOB_LS_FLAG_LONG))
+		return para_printf(&lbad->pb, "%s\n", name);
+	ret = osl(osl_get_object(table, row, BLOBCOL_ID, &obj));
+	if (ret < 0) {
+		para_printf(&lbad->pb, "%s: %s\n", name, para_strerror(-ret));
 		return ret;
+	}
 	id = *(uint32_t *)obj.data;
-	if (lld->opts->flags & BLOB_LS_FLAG_LONG)
-		para_printf(lld->pb, "%u\t%s\n", id, name);
-	else
-		para_printf(lld->pb, "%s\n", name);
-	return 1;
+	return para_printf(&lbad->pb, "%u\t%s\n", id, name);
 }
 
-int com_lsblob_callback(struct osl_table *table,
-		const struct osl_object *query, struct osl_object *ls_output)
+static void com_lsblob_callback(struct osl_table *table,
+		int fd, const struct osl_object *query)
 {
-	struct para_buffer pb = {.buf = NULL};
-	struct lsblob_loop_data lld = {.opts = query->data, .pb = &pb, .table = table};
+	struct lsblob_action_data lbad = {
+		.flags = *(uint32_t *)query->data,
+		.pb = {
+			.max_size = SHMMAX,
+			.private_data = &fd,
+			.max_size_handler = pass_buffer_as_shm
+		}
+	};
+	struct pattern_match_data pmd = {
+		.table = table,
+		.patterns = {.data = (char *)query->data + sizeof(uint32_t),
+			.size = query->size - sizeof(uint32_t)},
+		.pm_flags = PM_NO_PATTERN_MATCHES_EVERYTHING | PM_SKIP_EMPTY_NAME,
+		.match_col_num = BLOBCOL_NAME,
+		.data = &lbad,
+		.action = print_blob,
+	};
 	int ret;
 
-	if (lld.opts->flags & BLOB_LS_FLAG_REVERSE) {
-		if (lld.opts->flags & BLOB_LS_FLAG_SORT_BY_ID)
-			ret = osl_rbtree_loop(lld.table, BLOBCOL_ID, &lld, print_blob);
-		else
-			ret = osl_rbtree_loop_reverse(lld.table, BLOBCOL_NAME, &lld, print_blob);
-	} else {
-		if (lld.opts->flags & BLOB_LS_FLAG_SORT_BY_ID)
-			ret = osl_rbtree_loop_reverse(lld.table, BLOBCOL_ID, &lld, print_blob);
-		else
-			ret = osl_rbtree_loop(lld.table, BLOBCOL_NAME, &lld, print_blob);
-	}
-	ls_output->data = pb.buf;
-	ls_output->size = pb.size;
-	return ret;
+	if (lbad.flags & BLOB_LS_FLAG_REVERSE)
+		pmd.pm_flags |= PM_REVERSE_LOOP;
+	if (!(lbad.flags & BLOB_LS_FLAG_SORT_BY_ID))
+		pmd.loop_col_num = BLOBCOL_NAME;
+	else
+		pmd.loop_col_num = BLOBCOL_ID;
+	ret = for_each_matching_row(&pmd);
+	if (ret < 0)
+		para_printf(&lbad.pb, "%s\n", para_strerror(-ret));
+	if (lbad.pb.offset)
+		pass_buffer_as_shm(lbad.pb.buf, lbad.pb.offset, &fd);
+	free(lbad.pb.buf);
 }
 
-static int com_lsblob(callback_function *f, int fd, int argc, const char **argv)
+static int com_lsblob(callback_function *f, struct rc4_context *rc4c, int argc, char * const * const argv)
 {
-	struct com_lsblob_options clbo = {.flags = 0};
-	struct osl_object query = {.data = &clbo, .size = sizeof(clbo)},
-		ls_output;
-	int i, ret;
+	uint32_t flags = 0;
+	struct osl_object options = {.data = &flags, .size = sizeof(flags)};
+	int i;
 
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
@@ -122,67 +177,135 @@ static int com_lsblob(callback_function *f, int fd, int argc, const char **argv)
 			break;
 		}
 		if (!strcmp(arg, "-l")) {
-			clbo.flags |= BLOB_LS_FLAG_LONG;
+			flags |= BLOB_LS_FLAG_LONG;
 			continue;
 		}
 		if (!strcmp(arg, "-i")) {
-			clbo.flags |= BLOB_LS_FLAG_SORT_BY_ID;
+			flags |= BLOB_LS_FLAG_SORT_BY_ID;
 			continue;
 		}
 		if (!strcmp(arg, "-r")) {
-			clbo.flags |= BLOB_LS_FLAG_REVERSE;
+			flags |= BLOB_LS_FLAG_REVERSE;
 			continue;
 		}
+		break;
 	}
-	if (argc > i)
-		return -E_BLOB_SYNTAX;
-	ret = send_option_arg_callback_request(&query, argc - i,
-		argv + i, f, &ls_output);
-	if (ret >= 0 && ls_output.data)
-		send_buffer(fd, (char *)ls_output.data);
-	free(ls_output.data);
-	return ret;
+//	if (argc > i)
+//		return -E_BLOB_SYNTAX;
+	return send_option_arg_callback_request(&options, argc - i,
+		argv + i, f, rc4_send_result, rc4c);
 }
 
-static int com_catblob_callback(struct osl_table *table,
-		const struct osl_object *query, struct osl_object *output)
+static int cat_blob(struct osl_table *table, struct osl_row *row,
+		__a_unused const char *name, void *data)
 {
+	int ret = 0, ret2;
 	struct osl_object obj;
-	int ret;
-	struct osl_row *row;
 
-	ret = osl_get_row(table, BLOBCOL_NAME, query, &row);
+	ret = osl(osl_open_disk_object(table, row, BLOBCOL_DEF, &obj));
 	if (ret < 0)
 		return ret;
-	ret = osl_open_disk_object(table, row, BLOBCOL_DEF, &obj);
-	if (ret < 0)
-		return ret;
-	output->data = para_malloc(obj.size);
-	output->size = obj.size;
-	memcpy(output->data, obj.data, obj.size);
-	return osl_close_disk_object(&obj);
+	if (obj.size)
+		ret = pass_buffer_as_shm(obj.data, obj.size, data);
+	ret2 = osl(osl_close_disk_object(&obj));
+	return (ret < 0)? ret : ret2;
 }
-static int com_catblob(callback_function *f, int fd, int argc,
-		const char **argv)
+
+static void com_catblob_callback(struct osl_table *table, int fd,
+		const struct osl_object *query)
 {
-	struct osl_object cat_output = {.data = NULL};
-	int ret;
+	struct pattern_match_data pmd = {
+		.table = table,
+		.patterns = *query,
+		.loop_col_num = BLOBCOL_NAME,
+		.match_col_num = BLOBCOL_NAME,
+		.pm_flags = PM_SKIP_EMPTY_NAME,
+		.data = &fd,
+		.action = cat_blob
+	};
+	for_each_matching_row(&pmd);
+}
 
-	if (argc != 2)
-		return -E_BLOB_SYNTAX;
-	if (!*argv[1]) /* empty name is reserved of the dummy row */
+static int com_catblob(callback_function *f, struct rc4_context *rc4c, int argc,
+		char * const * const argv)
+{
+	if (argc < 2)
 		return -E_BLOB_SYNTAX;
-	ret = send_standard_callback_request(1, argv + 1, f, &cat_output);
-	if (ret >= 0 && cat_output.data)
-		ret = send_buffer(fd, (char *)cat_output.data);
-	free(cat_output.data);
-	return ret;
+	return send_standard_callback_request(argc - 1, argv + 1, f,
+		rc4_send_result, rc4c);
+}
+
+/** Used for removing rows from a blob table. */
+struct rmblob_data {
+	/** Message buffer. */
+	struct para_buffer pb;
+	/** Number of removed blobs. */
+	unsigned num_removed;
+};
+
+static int remove_blob(struct osl_table *table, struct osl_row *row,
+		const char *name, void *data)
+{
+	struct rmblob_data *rmbd = data;
+	int ret = osl(osl_del_row(table, row));
+	if (ret < 0) {
+		para_printf(&rmbd->pb, "%s: %s\n", name, para_strerror(-ret));
+		return ret;
+	}
+	rmbd->num_removed++;
+	return 1;
+}
+
+static void com_rmblob_callback(struct osl_table *table, int fd,
+		const struct osl_object *query)
+{
+	int ret, ret2 = 0;
+	struct rmblob_data rmbd = {
+		.num_removed = 0,
+		.pb = {
+			.max_size = SHMMAX,
+			.private_data = &fd,
+			.max_size_handler = pass_buffer_as_shm
+		}
+	};
+	struct pattern_match_data pmd = {
+		.table = table,
+		.patterns = *query,
+		.loop_col_num = BLOBCOL_NAME,
+		.match_col_num = BLOBCOL_NAME,
+		.pm_flags = PM_SKIP_EMPTY_NAME,
+		.data = &rmbd,
+		.action = remove_blob
+	};
+	ret = for_each_matching_row(&pmd);
+	if (ret < 0) {
+		ret2 = para_printf(&rmbd.pb, "%s\n", para_strerror(-ret));
+		if (ret2 < 0)
+			goto out;
+	}
+	if (!rmbd.num_removed)
+		ret2 = para_printf(&rmbd.pb, "no matches, nothing removed\n");
+	else {
+		ret2 = para_printf(&rmbd.pb, "removed %d blobs\n", rmbd.num_removed);
+		afs_event(BLOB_RENAME, NULL, table);
+	}
+out:
+	if (ret2 >= 0 && rmbd.pb.offset)
+		pass_buffer_as_shm(rmbd.pb.buf, rmbd.pb.offset, &fd);
+	free(rmbd.pb.buf);
+}
 
+static int com_rmblob(callback_function *f, struct rc4_context *rc4c, int argc,
+		char * const * const argv)
+{
+	if (argc < 2)
+		return -E_MOOD_SYNTAX;
+	return send_option_arg_callback_request(NULL, argc - 1, argv + 1, f,
+		rc4_send_result, rc4c);
 }
 
-static int com_addblob_callback(struct osl_table *table,
-		const struct osl_object *query,
-		__a_unused struct osl_object *result)
+static void com_addblob_callback(struct osl_table *table, __a_unused int fd,
+		const struct osl_object *query)
 {
 	struct osl_object objs[NUM_BLOB_COLUMNS];
 	char *name = query->data;
@@ -191,9 +314,9 @@ static int com_addblob_callback(struct osl_table *table,
 	unsigned num_rows;
 	int ret;
 
-	ret = osl_get_num_rows(table, &num_rows);
+	ret = osl(osl_get_num_rows(table, &num_rows));
 	if (ret < 0)
-		return ret;
+		goto out;
 	if (!num_rows) { /* this is the first entry ever added */
 		/* insert dummy row containing the id */
 		id = 2; /* this entry will be entry #1, so 2 is the next */
@@ -203,23 +326,36 @@ static int com_addblob_callback(struct osl_table *table,
 		objs[BLOBCOL_NAME].size = 1;
 		objs[BLOBCOL_DEF].data = "";
 		objs[BLOBCOL_DEF].size = 1;
-		ret = osl_add_row(table, objs);
+		ret = osl(osl_add_row(table, objs));
 		if (ret < 0)
-			return ret;
-	} else { /* get id of the dummy row and increment it */
+			goto out;
+	} else {
+		/* check if name already exists */
 		struct osl_row *row;
-		struct osl_object obj = {.data = "", .size = 1};
-		ret = osl_get_row(table, BLOBCOL_NAME, &obj, &row);
+		struct osl_object obj = {.data = name, .size = name_len};
+		ret = osl(osl_get_row(table, BLOBCOL_NAME, &obj, &row));
+		if (ret < 0 && ret != -OSL_ERRNO_TO_PARA_ERROR(E_OSL_RB_KEY_NOT_FOUND))
+			goto out;
+		if (ret >= 0) { /* we already have a blob with this name */
+			obj.data = name + name_len;
+			obj.size = query->size - name_len;
+			ret = osl(osl_update_object(table, row, BLOBCOL_DEF, &obj));
+			goto out;
+		}
+		/* new blob, get id of the dummy row and increment it */
+		obj.data = "";
+		obj.size = 1;
+		ret = osl(osl_get_row(table, BLOBCOL_NAME, &obj, &row));
 		if (ret < 0)
-			return ret;
-		ret = osl_get_object(table, row, BLOBCOL_ID, &obj);
+			goto out;
+		ret = osl(osl_get_object(table, row, BLOBCOL_ID, &obj));
 		if (ret < 0)
-			return ret;
+			goto out;
 		id = *(uint32_t *)obj.data + 1;
 		obj.data = &id;
-		ret = osl_update_object(table, row, BLOBCOL_ID, &obj);
+		ret = osl(osl_update_object(table, row, BLOBCOL_ID, &obj));
 		if (ret < 0)
-			return ret;
+			goto out;
 	}
 	id--;
 	objs[BLOBCOL_ID].data = &id;
@@ -228,93 +364,144 @@ static int com_addblob_callback(struct osl_table *table,
 	objs[BLOBCOL_NAME].size = name_len;
 	objs[BLOBCOL_DEF].data = name + name_len;
 	objs[BLOBCOL_DEF].size = query->size - name_len;
-	return osl_add_row(table, objs);
+	ret = osl(osl_add_row(table, objs));
+	if (ret < 0)
+		goto out;
+	afs_event(BLOB_ADD, NULL, table);
+out:
+	if (ret < 0)
+		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 }
 
-static int com_addblob(callback_function *f, __a_unused int fd, int argc,
-		const char **argv)
+/*
+ * write input from fd to dynamically allocated buffer,
+ * but maximal max_size byte.
+ */
+static int fd2buf(struct rc4_context *rc4c, unsigned max_size, struct osl_object *obj)
 {
-	struct osl_object arg_obj;
+	const size_t chunk_size = 1024;
+	size_t size = 2048, received = 0;
+	int ret;
+	char *buf = para_malloc(size);
 
-	if (argc != 2)
-		return -E_BLOB_SYNTAX;
-	if (!*argv[1]) /* empty name is reserved for the dummy row */
-		return -E_BLOB_SYNTAX;
-	PARA_NOTICE_LOG("argv[1]: %s\n", argv[1]);
-	arg_obj.size = strlen(argv[1]) + 1;
-	arg_obj.data = (char *)argv[1];
-	return stdin_command(&arg_obj, f, 10 * 1024 * 1024, NULL);
+	for (;;) {
+		ret = rc4_recv_bin_buffer(rc4c, buf + received, chunk_size);
+		if (ret <= 0)
+			break;
+		received += ret;
+		if (received + chunk_size >= size) {
+			size *= 2;
+			ret = -E_INPUT_TOO_LARGE;
+			if (size > max_size)
+				break;
+			buf = para_realloc(buf, size);
+		}
+	}
+	obj->data = buf;
+	obj->size = received;
+	if (ret < 0)
+		free(buf);
+	return ret;
 }
 
-static int com_rmblob_callback(struct osl_table *table,
-		const struct osl_object *query,
-		__a_unused struct osl_object *result)
+/*
+ * Read data from a file descriptor, and send it to the afs process.
+ *
+ * \param rc4c crypt context containing the file descriptor to read data from.
+ * \param arg_obj Pointer to the arguments to \a f.
+ * \param f The callback function.
+ * \param max_len Don't read more than that many bytes from stdin.
+ * \param result_handler See \ref send_callback_request.
+ * \param private_result_data See \ref send_callback_request.
+ *
+ * This function is used by commands that wish to let para_server store
+ * arbitrary data specified by the user (for instance the add_blob family of
+ * commands). First, at most \a max_len bytes are read and decrypted from the
+ * file descriptor given by \a rc4c. The result is concatenated with the buffer
+ * given by \a arg_obj, and the combined buffer is made available to the afs
+ * process via the callback method. See \ref send_callback_request for details.
+ *
+ * \return Negative on errors, the return value of the underlying call to
+ * send_callback_request() otherwise.
+ */
+static int stdin_command(struct rc4_context *rc4c, struct osl_object *arg_obj,
+		callback_function *f, unsigned max_len,
+		callback_result_handler *result_handler,
+		void *private_result_data)
 {
-	char *p = query->data;
-	size_t len;
+	struct osl_object query, stdin_obj;
 	int ret;
 
-	for (; p < (char *)query->data + query->size; p += len + 1) {
-		struct osl_row *row;
-		struct osl_object obj;
-
-		len = strlen(p);
-		obj.data = p;
-		obj.size = len + 1;
-		ret = osl_get_row(table, BLOBCOL_NAME, &obj, &row);
-		if (ret < 0)
-			return ret;
-		ret = osl_del_row(table, row);
-		if (ret < 0)
-			return ret;
-	}
-	return 1;
+	ret = rc4_send_buffer(rc4c, AWAITING_DATA_MSG);
+	if (ret < 0)
+		return ret;
+	ret = fd2buf(rc4c, max_len, &stdin_obj);
+	if (ret < 0)
+		return ret;
+	query.size = arg_obj->size + stdin_obj.size;
+	query.data = para_malloc(query.size);
+	memcpy(query.data, arg_obj->data, arg_obj->size);
+	memcpy((char *)query.data + arg_obj->size, stdin_obj.data, stdin_obj.size);
+	free(stdin_obj.data);
+	ret = send_callback_request(f, &query, result_handler, private_result_data);
+	free(query.data);
+	return ret;
 }
 
-static int com_rmblob(callback_function *f, __a_unused int fd, int argc,
-		const char **argv)
+static int com_addblob(callback_function *f, struct rc4_context *rc4c, int argc,
+		char * const * const argv)
 {
-	if (argc < 2)
-		return -E_MOOD_SYNTAX;
-	return send_option_arg_callback_request(NULL, argc - 1, argv + 1, f,
-		NULL);
+	struct osl_object arg_obj;
+
+	if (argc != 2)
+		return -E_BLOB_SYNTAX;
+	if (!*argv[1]) /* empty name is reserved for the dummy row */
+		return -E_BLOB_SYNTAX;
+	arg_obj.size = strlen(argv[1]) + 1;
+	arg_obj.data = (char *)argv[1];
+	return stdin_command(rc4c, &arg_obj, f, 10 * 1024 * 1024, NULL, NULL);
 }
 
-static int com_mvblob_callback(struct osl_table *table,
-		const struct osl_object *query,
-		__a_unused struct osl_object *result)
+/* FIXME: Print output to client, not to log file */
+static void com_mvblob_callback(struct osl_table *table, __a_unused int fd,
+		const struct osl_object *query)
 {
 	char *src = (char *) query->data;
 	struct osl_object obj = {.data = src, .size = strlen(src) + 1};
 	char *dest = src + obj.size;
 	struct osl_row *row;
-	int ret = osl_get_row(table, BLOBCOL_NAME, &obj, &row);
+	int ret = osl(osl_get_row(table, BLOBCOL_NAME, &obj, &row));
 
 	if (ret < 0)
-		return ret;
+		goto out;
 	obj.data = dest;
 	obj.size = strlen(dest) + 1;
-	return osl_update_object(table, row, BLOBCOL_NAME, &obj);
+	ret = osl(osl_update_object(table, row, BLOBCOL_NAME, &obj));
+	if (ret < 0)
+		goto out;
+	afs_event(BLOB_RENAME, NULL, table);
+out:
+	if (ret < 0)
+		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 }
 
-static int com_mvblob(callback_function *f,  __a_unused int fd,
-		int argc, const char **argv)
+static int com_mvblob(callback_function *f, __a_unused struct rc4_context *rc4c,
+		int argc, char * const * const argv)
 {
 	if (argc != 3)
 		return -E_MOOD_SYNTAX;
 	return send_option_arg_callback_request(NULL, argc - 1, argv + 1, f,
-		NULL);
+		NULL, NULL);
 }
 
 #define DEFINE_BLOB_COMMAND(cmd_name, table_name, cmd_prefix) \
-	static int com_ ## cmd_name ## cmd_prefix ## _callback(const struct osl_object *query, \
-			struct osl_object *output) \
+	static void com_ ## cmd_name ## cmd_prefix ## _callback(int fd, const struct osl_object *query) \
 	{ \
-		return com_ ## cmd_name ## blob_callback(table_name ## _table, query, output); \
+		return com_ ## cmd_name ## blob_callback(table_name ## _table, fd, query); \
 	} \
-	int com_ ## cmd_name ## cmd_prefix(__a_unused int fd, int argc, const char **argv) \
+	int com_ ## cmd_name ## cmd_prefix(struct rc4_context *rc4c, int argc, char * const * const argv) \
 	{ \
-		return com_ ## cmd_name ## blob(com_ ## cmd_name ## cmd_prefix ## _callback, fd, argc, argv); \
+		return com_ ## cmd_name ## blob(com_ ## cmd_name ## cmd_prefix ## _callback, rc4c, argc, argv); \
 	}
 
 static int blob_get_name_by_id(struct osl_table *table, uint32_t id,
@@ -327,15 +514,16 @@ static int blob_get_name_by_id(struct osl_table *table, uint32_t id,
 	*name = NULL;
 	if (!id)
 		return 1;
-	ret = osl_get_row(table, BLOBCOL_ID, &obj, &row);
+	ret = osl(osl_get_row(table, BLOBCOL_ID, &obj, &row));
 	if (ret < 0)
 		return ret;
-	ret = osl_get_object(table, row, BLOBCOL_NAME, &obj);
+	ret = osl(osl_get_object(table, row, BLOBCOL_NAME, &obj));
 	if (ret < 0)
 		return ret;
 	*name = (char *)obj.data;
 	return 1;
 }
+
 /** Define the \p get_name_by_id function for this blob type. */
 #define DEFINE_GET_NAME_BY_ID(table_name, cmd_prefix) \
 	int cmd_prefix ## _get_name_by_id(uint32_t id, char **name) \
@@ -343,49 +531,138 @@ static int blob_get_name_by_id(struct osl_table *table, uint32_t id,
 		return blob_get_name_by_id(table_name ## _table, id, name); \
 	}
 
-/** Define the \p shutdown function for this blob type. */
-#define DEFINE_BLOB_SHUTDOWN(table_name) \
-	void table_name ## _shutdown(enum osl_close_flags flags) \
+
+static int blob_get_def_by_name(struct osl_table *table, char *name,
+		struct osl_object *def)
+{
+	struct osl_row *row;
+	struct osl_object obj = {.data = name, .size = strlen(name) + 1};
+	int ret;
+
+	def->data = NULL;
+	if (!*name)
+		return 1;
+	ret = osl(osl_get_row(table, BLOBCOL_NAME, &obj, &row));
+	if (ret < 0)
+		return ret;
+	return osl(osl_open_disk_object(table, row, BLOBCOL_DEF, def));
+}
+
+/** Define the \p get_def_by_id function for this blob type. */
+#define DEFINE_GET_DEF_BY_NAME(table_name, cmd_prefix) \
+	int cmd_prefix ## _get_def_by_name(char *name, struct osl_object *def) \
 	{ \
-		osl_close_table(table_name ## _table, flags); \
-		table_name ## _table = NULL; \
+		return blob_get_def_by_name(table_name ## _table, name, def); \
 	}
 
-static int blob_init(struct osl_table **table,
-		const struct osl_table_description *desc,
-		struct table_info *ti)
+static int blob_get_def_by_id(struct osl_table *table, uint32_t id,
+		struct osl_object *def)
 {
+	struct osl_row *row;
+	struct osl_object obj = {.data = &id, .size = sizeof(id)};
 	int ret;
 
-	ti->desc = desc;
-	ret = osl_open_table(ti->desc, &ti->table);
-	if (ret >= 0) {
-		*table = ti->table;
+	def->data = NULL;
+	if (!id)
+		return 1;
+	ret = osl(osl_get_row(table, BLOBCOL_ID, &obj, &row));
+	if (ret < 0)
 		return ret;
+	return osl(osl_open_disk_object(table, row, BLOBCOL_DEF, def));
+}
+
+/** Define the \p get_def_by_id function for this blob type. */
+#define DEFINE_GET_DEF_BY_ID(table_name, cmd_prefix) \
+	int cmd_prefix ## _get_def_by_id(uint32_t id, struct osl_object *def) \
+	{ \
+		return blob_get_def_by_id(table_name ## _table, id, def); \
+	}
+
+static int blob_get_name_and_def_by_row(struct osl_table *table,
+		const struct osl_row *row, char **name, struct osl_object *def)
+{
+	struct osl_object obj;
+	int ret = osl(osl_get_object(table, row, BLOBCOL_NAME, &obj));
+	if (ret < 0)
+		return ret;
+	*name = obj.data;
+	return osl(osl_open_disk_object(table, row, BLOBCOL_DEF, def));
+}
+/** Define the \p get_name_and_def_by_row function for this blob type. */
+#define DEFINE_GET_NAME_AND_DEF_BY_ROW(table_name, cmd_prefix) \
+	int cmd_prefix ## _get_name_and_def_by_row(const struct osl_row *row, \
+		char **name, struct osl_object *def) \
+	{ \
+		return blob_get_name_and_def_by_row(table_name ## _table, \
+			row, name, def); \
 	}
+
+/** Define the \p close function for this blob type. */
+#define DEFINE_BLOB_CLOSE(table_name) \
+	static void table_name ## _close(void) \
+	{ \
+		osl_close_table(table_name ## _table, OSL_MARK_CLEAN); \
+		table_name ## _table = NULL; \
+	}
+
+/** Define the \p create function for this blob type. */
+#define DEFINE_BLOB_CREATE(table_name) \
+	static int table_name ## _create(const char *dir) \
+	{ \
+		table_name ## _table_desc.dir = dir; \
+		return osl_create_table(&table_name ## _table_desc); \
+	}
+
+static int blob_open(struct osl_table **table,
+		struct osl_table_description *desc,
+		const char *dir)
+{
+	int ret;
+	desc->dir = dir;
+	ret = osl(osl_open_table(desc, table));
+	if (ret >= 0)
+		return ret;
 	*table = NULL;
-	return ret == -E_NOENT? 1 : ret;
+	if (ret >= 0 || ret == -OSL_ERRNO_TO_PARA_ERROR(E_OSL_NOENT))
+		return 1;
+	return ret;
 }
 
+#define DEFINE_BLOB_OPEN(table_name) \
+	static int table_name ## _open(const char *dir) \
+	{ \
+		return blob_open(&table_name ## _table, \
+			&table_name ## _table_desc, dir); \
+	}
+
+
 /** Define the \p init function for this blob type. */
 #define DEFINE_BLOB_INIT(table_name) \
-	int table_name ## _init(struct table_info *ti) \
+	void table_name ## _init(struct afs_table *t) \
 	{ \
-		return blob_init(&table_name ## _table, \
-			&table_name ## _table_desc, ti); \
+		t->open = table_name ## _open; \
+		t->close = table_name ## _close; \
+		t->create = table_name ## _create;\
+		t->event_handler = table_name ##_event_handler; \
+		table_name ## _table = NULL; \
 	}
 
 
 /** Define all functions for this blob type. */
 #define DEFINE_BLOB_FUNCTIONS(table_name, cmd_prefix) \
+	DEFINE_BLOB_OPEN(table_name) \
+	DEFINE_BLOB_CLOSE(table_name) \
+	DEFINE_BLOB_CREATE(table_name) \
+	DEFINE_BLOB_INIT(table_name) \
 	DEFINE_BLOB_COMMAND(ls, table_name, cmd_prefix) \
 	DEFINE_BLOB_COMMAND(cat, table_name, cmd_prefix) \
 	DEFINE_BLOB_COMMAND(add, table_name, cmd_prefix) \
 	DEFINE_BLOB_COMMAND(rm, table_name, cmd_prefix) \
 	DEFINE_BLOB_COMMAND(mv, table_name, cmd_prefix) \
 	DEFINE_GET_NAME_BY_ID(table_name, cmd_prefix); \
-	DEFINE_BLOB_SHUTDOWN(table_name); \
-	DEFINE_BLOB_INIT(table_name);
+	DEFINE_GET_DEF_BY_ID(table_name, cmd_prefix); \
+	DEFINE_GET_DEF_BY_NAME(table_name, cmd_prefix); \
+	DEFINE_GET_NAME_AND_DEF_BY_ROW(table_name, cmd_prefix); \
 
 /** \cond doxygen isn't smart enough to recognize these */
 DEFINE_BLOB_FUNCTIONS(lyrics, lyr);