diff options
Diffstat (limited to '')
-rw-r--r-- | src/mds-registry/mds-registry.c | 82 |
1 files changed, 2 insertions, 80 deletions
diff --git a/src/mds-registry/mds-registry.c b/src/mds-registry/mds-registry.c index b0c6962..28dd368 100644 --- a/src/mds-registry/mds-registry.c +++ b/src/mds-registry/mds-registry.c @@ -17,6 +17,8 @@ */ #include "mds-registry.h" +#include "util.h" + #include <libmdsserver/macros.h> #include <libmdsserver/util.h> #include <libmdsserver/mds-message.h> @@ -549,30 +551,6 @@ int handle_message(void) /** - * Convert a client ID string into a client ID integer - * - * @param str The client ID string - * @return The client ID integer - */ -uint64_t parse_client_id(const char* str) -{ - char client_words[22]; - char* client_high; - char* client_low; - uint64_t client; - - strcpy(client_high = client_words, str); - client_low = rawmemchr(client_words, ':'); - *client_low++ = '\0'; - client = (uint64_t)atoll(client_high); - client <<= 32; - client |= (uint64_t)atoll(client_low); - - return client; -} - - -/** * Add a protocol to the registry * * @param has_key Whether the command is already in the registry @@ -832,59 +810,3 @@ int list_registry(const char* recv_client_id, const char* recv_message_id) return -1; } - -/** - * Free a key from a table - * - * @param obj The key - */ -void reg_table_free_key(size_t obj) -{ - char* command = (char*)(void*)obj; - free(command); -} - - -/** - * Free a value from a table - * - * @param obj The value - */ -void reg_table_free_value(size_t obj) -{ - client_list_t* list = (client_list_t*)(void*)obj; - client_list_destroy(list); - free(list); -} - - -/** - * Send a full message even if interrupted - * - * @param message The message to send - * @param length The length of the message - * @return Non-zero on success - */ -int full_send(const char* message, size_t length) -{ - size_t sent; - - while (length > 0) - { - sent = send_message(socket_fd, message, length); - if (sent > length) - { - eprint("Sent more of a message than exists in the message, aborting."); - return -1; - } - else if ((sent < length) && (errno != EINTR)) - { - perror(*argv); - return -1; - } - message += sent; - length -= sent; - } - return 0; -} - |