diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/mds-registry/mds-registry.c | 82 | ||||
| -rw-r--r-- | src/mds-registry/mds-registry.h | 31 | ||||
| -rw-r--r-- | src/mds-registry/util.c | 111 | ||||
| -rw-r--r-- | src/mds-registry/util.h | 60 |
5 files changed, 174 insertions, 112 deletions
@@ -20,7 +20,7 @@ OBJ_mds-server_ = mds-server interception-condition client multicast \ queued-interception globals signals interceptors \ sending slavery reexec receiving -OBJ_mds-registry_ = mds-registry +OBJ_mds-registry_ = mds-registry util OBJ_mds-server = $(foreach O,$(OBJ_mds-server_),obj/mds-server/$(O).o) OBJ_mds-registry = $(foreach O,$(OBJ_mds-registry_),obj/mds-registry/$(O).o) 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; -} - diff --git a/src/mds-registry/mds-registry.h b/src/mds-registry/mds-registry.h index 6f9355d..010b5e3 100644 --- a/src/mds-registry/mds-registry.h +++ b/src/mds-registry/mds-registry.h @@ -33,14 +33,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); - -/** * Perform an action over the registry * * @param length The length of the received message @@ -63,29 +55,6 @@ int registry_action(size_t length, int action, const char* recv_client_id, const */ int list_registry(const char* recv_client_id, const char* recv_message_id); -/** - * Free a key from a table - * - * @param obj The key - */ -void reg_table_free_key(size_t obj); - -/** - * Free a value from a table - * - * @param obj The value - */ -void reg_table_free_value(size_t obj); - -/** - * 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); - #endif diff --git a/src/mds-registry/util.c b/src/mds-registry/util.c new file mode 100644 index 0000000..c497121 --- /dev/null +++ b/src/mds-registry/util.c @@ -0,0 +1,111 @@ +/** + * mds — A micro-display server + * Copyright © 2014 Mattias Andrée (maandree@member.fsf.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include "util.h" + +#include "../mds-base.h" + +#include <libmdsserver/util.h> +#include <libmdsserver/macros.h> +#include <libmdsserver/client-list.h> + +#include <stdlib.h> +#include <stdio.h> +#include <errno.h> +#include <string.h> + + + +/** + * 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; +} + + +/** + * 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; +} + diff --git a/src/mds-registry/util.h b/src/mds-registry/util.h new file mode 100644 index 0000000..0cc04e6 --- /dev/null +++ b/src/mds-registry/util.h @@ -0,0 +1,60 @@ +/** + * mds — A micro-display server + * Copyright © 2014 Mattias Andrée (maandree@member.fsf.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#ifndef MDS_MDS_REGISTRY_UTIL_H +#define MDS_MDS_REGISTRY_UTIL_H + + +#include <stddef.h> +#include <stdint.h> + + +/** + * 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); + +/** + * Free a key from a table + * + * @param obj The key + */ +void reg_table_free_key(size_t obj); + +/** + * Free a value from a table + * + * @param obj The value + */ +void reg_table_free_value(size_t obj); + +/** + * 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); + + +#endif + + |