X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=blob.c;h=707c6c6254b88a359a5297c469a1f3105528e5bc;hp=f0133c3b5d53b7c916f1662b158ac5073a74af8f;hb=4a0c8e1fb760134609dcf2c06cd1b9b76953d606;hpb=2aa98426fca67a8b9c075ca7efea54aef18c0380 diff --git a/blob.c b/blob.c index f0133c3b..707c6c62 100644 --- a/blob.c +++ b/blob.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 Andre Noll + * Copyright (C) 2007-2011 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,7 +8,6 @@ #include #include -#include #include #include "para.h" @@ -17,7 +16,6 @@ #include "string.h" #include "afh.h" #include "afs.h" -#include "net.h" #include "ipc.h" #include "portable_io.h" @@ -82,12 +80,13 @@ static struct osl_column_description blob_cols[] = { DEFINE_BLOB_TABLE_DESC(table_name); \ DEFINE_BLOB_TABLE_PTR(table_name); -/** \cond doxygen isn't smart enough to recognize these */ +/* doxygen isn't smart enough to recognize these */ +/** \cond blob_table */ INIT_BLOB_TABLE(lyrics); INIT_BLOB_TABLE(images); INIT_BLOB_TABLE(moods); INIT_BLOB_TABLE(playlists); -/** \endcond */ +/** \endcond blob_table */ /** Flags that may be passed to the \p ls functions of each blob type. */ enum blob_ls_flags { @@ -132,7 +131,7 @@ static void com_lsblob_callback(struct osl_table *table, struct lsblob_action_data lbad = { .flags = *(uint32_t *)query->data, .pb = { - .max_size = SHMMAX, + .max_size = shm_get_shmmax(), .private_data = &fd, .max_size_handler = pass_buffer_as_shm } @@ -162,7 +161,7 @@ static void com_lsblob_callback(struct osl_table *table, free(lbad.pb.buf); } -static int com_lsblob(callback_function *f, struct rc4_context *rc4c, int argc, char * const * const argv) +static int com_lsblob(callback_function *f, struct stream_cipher_context *scc, int argc, char * const * const argv) { uint32_t flags = 0; struct osl_object options = {.data = &flags, .size = sizeof(flags)}; @@ -193,7 +192,7 @@ static int com_lsblob(callback_function *f, struct rc4_context *rc4c, int argc, // if (argc > i) // return -E_BLOB_SYNTAX; return send_option_arg_callback_request(&options, argc - i, - argv + i, f, rc4_send_result, rc4c); + argv + i, f, sc_send_result, scc); } static int cat_blob(struct osl_table *table, struct osl_row *row, @@ -226,13 +225,13 @@ static void com_catblob_callback(struct osl_table *table, int fd, for_each_matching_row(&pmd); } -static int com_catblob(callback_function *f, struct rc4_context *rc4c, int argc, +static int com_catblob(callback_function *f, struct stream_cipher_context *scc, int argc, char * const * const argv) { if (argc < 2) return -E_BLOB_SYNTAX; return send_standard_callback_request(argc - 1, argv + 1, f, - rc4_send_result, rc4c); + sc_send_result, scc); } /** Used for removing rows from a blob table. */ @@ -263,7 +262,7 @@ static void com_rmblob_callback(struct osl_table *table, int fd, struct rmblob_data rmbd = { .num_removed = 0, .pb = { - .max_size = SHMMAX, + .max_size = shm_get_shmmax(), .private_data = &fd, .max_size_handler = pass_buffer_as_shm } @@ -295,13 +294,13 @@ out: free(rmbd.pb.buf); } -static int com_rmblob(callback_function *f, struct rc4_context *rc4c, int argc, +static int com_rmblob(callback_function *f, struct stream_cipher_context *scc, 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); + sc_send_result, scc); } static void com_addblob_callback(struct osl_table *table, __a_unused int fd, @@ -377,7 +376,7 @@ out: * 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) +static int fd2buf(struct stream_cipher_context *scc, unsigned max_size, struct osl_object *obj) { const size_t chunk_size = 1024; size_t size = 2048, received = 0; @@ -385,7 +384,7 @@ static int fd2buf(struct rc4_context *rc4c, unsigned max_size, struct osl_object char *buf = para_malloc(size); for (;;) { - ret = rc4_recv_bin_buffer(rc4c, buf + received, chunk_size); + ret = sc_recv_bin_buffer(scc, buf + received, chunk_size); if (ret <= 0) break; received += ret; @@ -407,7 +406,7 @@ static int fd2buf(struct rc4_context *rc4c, unsigned max_size, struct osl_object /* * 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 scc 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. @@ -417,14 +416,14 @@ static int fd2buf(struct rc4_context *rc4c, unsigned max_size, struct osl_object * 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 + * file descriptor given by \a scc. 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, +static int stdin_command(struct stream_cipher_context *scc, struct osl_object *arg_obj, callback_function *f, unsigned max_len, callback_result_handler *result_handler, void *private_result_data) @@ -432,10 +431,10 @@ static int stdin_command(struct rc4_context *rc4c, struct osl_object *arg_obj, struct osl_object query, stdin_obj; int ret; - ret = rc4_send_buffer(rc4c, AWAITING_DATA_MSG); + ret = sc_send_buffer(scc, AWAITING_DATA_MSG); if (ret < 0) return ret; - ret = fd2buf(rc4c, max_len, &stdin_obj); + ret = fd2buf(scc, max_len, &stdin_obj); if (ret < 0) return ret; query.size = arg_obj->size + stdin_obj.size; @@ -448,7 +447,7 @@ static int stdin_command(struct rc4_context *rc4c, struct osl_object *arg_obj, return ret; } -static int com_addblob(callback_function *f, struct rc4_context *rc4c, int argc, +static int com_addblob(callback_function *f, struct stream_cipher_context *scc, int argc, char * const * const argv) { struct osl_object arg_obj; @@ -459,7 +458,7 @@ static int com_addblob(callback_function *f, struct rc4_context *rc4c, int argc, 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); + return stdin_command(scc, &arg_obj, f, 10 * 1024 * 1024, NULL, NULL); } /* FIXME: Print output to client, not to log file */ @@ -485,7 +484,7 @@ out: PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); } -static int com_mvblob(callback_function *f, __a_unused struct rc4_context *rc4c, +static int com_mvblob(callback_function *f, __a_unused struct stream_cipher_context *scc, int argc, char * const * const argv) { if (argc != 3) @@ -499,9 +498,9 @@ static int com_mvblob(callback_function *f, __a_unused struct rc4_context *rc4c, { \ return com_ ## cmd_name ## blob_callback(table_name ## _table, fd, query); \ } \ - int com_ ## cmd_name ## cmd_prefix(struct rc4_context *rc4c, int argc, char * const * const argv) \ + int com_ ## cmd_name ## cmd_prefix(struct stream_cipher_context *scc, int argc, char * const * const argv) \ { \ - return com_ ## cmd_name ## blob(com_ ## cmd_name ## cmd_prefix ## _callback, rc4c, argc, argv); \ + return com_ ## cmd_name ## blob(com_ ## cmd_name ## cmd_prefix ## _callback, scc, argc, argv); \ } static int blob_get_name_by_id(struct osl_table *table, uint32_t id, @@ -599,7 +598,7 @@ static int blob_get_name_and_def_by_row(struct osl_table *table, /** Define the \p close function for this blob type. */ #define DEFINE_BLOB_CLOSE(table_name) \ - void table_name ## _close(void) \ + static void table_name ## _close(void) \ { \ osl_close_table(table_name ## _table, OSL_MARK_CLEAN); \ table_name ## _table = NULL; \ @@ -607,7 +606,7 @@ static int blob_get_name_and_def_by_row(struct osl_table *table, /** Define the \p create function for this blob type. */ #define DEFINE_BLOB_CREATE(table_name) \ - int table_name ## _create(const char *dir) \ + static int table_name ## _create(const char *dir) \ { \ table_name ## _table_desc.dir = dir; \ return osl_create_table(&table_name ## _table_desc); \ @@ -629,7 +628,7 @@ static int blob_open(struct osl_table **table, } #define DEFINE_BLOB_OPEN(table_name) \ - int table_name ## _open(const char *dir) \ + static int table_name ## _open(const char *dir) \ { \ return blob_open(&table_name ## _table, \ &table_name ## _table_desc, dir); \ @@ -664,9 +663,10 @@ static int blob_open(struct osl_table **table, 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 */ +/* doxygen isn't smart enough to recognize these */ +/** \cond blob_function */ DEFINE_BLOB_FUNCTIONS(lyrics, lyr); DEFINE_BLOB_FUNCTIONS(images, img); DEFINE_BLOB_FUNCTIONS(moods, mood); DEFINE_BLOB_FUNCTIONS(playlists, pl); -/** \endcond */ +/** \endcond blob_function */