diff options
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/fastd.h | 30 | ||||
| -rw-r--r-- | src/log.c (renamed from src/printf.c) | 2 | ||||
| -rw-r--r-- | src/log.h | 60 |
4 files changed, 66 insertions, 28 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 628465b..e7fb940 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,9 +24,9 @@ add_executable(fastd handshake.c hkdf_sha256.c lex.c + log.c options.c peer.c - printf.c random.c receive.c resolve.c diff --git a/src/fastd.h b/src/fastd.h index 90f1f8f..3df0ad1 100644 --- a/src/fastd.h +++ b/src/fastd.h @@ -30,6 +30,7 @@ #include "compat.h" #include "types.h" #include "dlist.h" +#include "log.h" #include <errno.h> #include <stdarg.h> @@ -307,12 +308,9 @@ void fastd_socket_close(fastd_context_t *ctx, fastd_socket_t *sock); void fastd_socket_error(fastd_context_t *ctx, fastd_socket_t *sock); void fastd_setfd(const fastd_context_t *ctx, int fd, int set, int unset); -void fastd_setfl(const fastd_context_t *ctx, int fd, int set, int unset) -; -void fastd_resolve_peer(fastd_context_t *ctx, fastd_peer_t *peer, fastd_remote_t *remote); +void fastd_setfl(const fastd_context_t *ctx, int fd, int set, int unset); -int fastd_vsnprintf(const fastd_context_t *ctx, char *buffer, size_t size, const char *format, va_list ap); -void fastd_logf(const fastd_context_t *ctx, fastd_loglevel_t level, const char *format, ...); +void fastd_resolve_peer(fastd_context_t *ctx, fastd_peer_t *peer, fastd_remote_t *remote); void fastd_tuntap_open(fastd_context_t *ctx); fastd_buffer_t fastd_tuntap_read(fastd_context_t *ctx); @@ -331,27 +329,6 @@ static inline int fastd_rand(fastd_context_t *ctx, int min, int max) { return (r%(max-min) + min); } -#define FASTD_DEFAULT_LOG_LEVEL LL_VERBOSE - - -#define pr_fatal(ctx, args...) fastd_logf(ctx, LL_FATAL, args) -#define pr_error(ctx, args...) fastd_logf(ctx, LL_ERROR, args) -#define pr_warn(ctx, args...) fastd_logf(ctx, LL_WARN, args) -#define pr_info(ctx, args...) fastd_logf(ctx, LL_INFO, args) -#define pr_verbose(ctx, args...) fastd_logf(ctx, LL_VERBOSE, args) -#define pr_debug(ctx, args...) fastd_logf(ctx, LL_DEBUG, args) -#define pr_debug2(ctx, args...) fastd_logf(ctx, LL_DEBUG2, args) - -#define pr_error_errno(ctx, message) pr_error(ctx, "%s: %s", message, strerror(errno)) -#define pr_warn_errno(ctx, message) pr_warn(ctx, "%s: %s", message, strerror(errno)) -#define pr_debug_errno(ctx, message) pr_debug(ctx, "%s: %s", message, strerror(errno)) -#define pr_debug2_errno(ctx, message) pr_debug2(ctx, "%s: %s", message, strerror(errno)) - -#define exit_fatal(ctx, args...) do { pr_fatal(ctx, args); abort(); } while(0) -#define exit_bug(ctx, message) exit_fatal(ctx, "BUG: %s", message) -#define exit_error(ctx, args...) do { pr_error(ctx, args); exit(1); } while(0) -#define exit_errno(ctx, message) exit_error(ctx, "%s: %s", message, strerror(errno)) - #define container_of(ptr, type, member) ({ \ const __typeof__(((type *)0)->member) *_mptr = (ptr); \ @@ -368,6 +345,7 @@ static inline size_t alignto(size_t l, size_t a) { return block_count(l, a)*a; } + static inline fastd_buffer_t fastd_buffer_alloc(const fastd_context_t *ctx, size_t len, size_t head_space, size_t tail_space) { size_t base_len = head_space+len+tail_space; void *ptr; @@ -95,7 +95,7 @@ static size_t snprint_peer_str(const fastd_context_t *ctx, char *buffer, size_t } } -int fastd_vsnprintf(const fastd_context_t *ctx, char *buffer, size_t size, const char *format, va_list ap) { +static int fastd_vsnprintf(const fastd_context_t *ctx, char *buffer, size_t size, const char *format, va_list ap) { char *buffer_start = buffer; char *buffer_end = buffer+size; diff --git a/src/log.h b/src/log.h new file mode 100644 index 0000000..9a6c6b7 --- /dev/null +++ b/src/log.h @@ -0,0 +1,60 @@ +/* + Copyright (c) 2012-2013, Matthias Schiffer <mschiffer@universe-factory.net> + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + + +#ifndef _FASTD_LOG_H_ +#define _FASTD_LOG_H_ + +#include "types.h" + +#include <stdlib.h> +#include <string.h> + + +#define FASTD_DEFAULT_LOG_LEVEL LL_VERBOSE + + +void fastd_logf(const fastd_context_t *ctx, fastd_loglevel_t level, const char *format, ...); + +#define pr_fatal(ctx, args...) fastd_logf(ctx, LL_FATAL, args) +#define pr_error(ctx, args...) fastd_logf(ctx, LL_ERROR, args) +#define pr_warn(ctx, args...) fastd_logf(ctx, LL_WARN, args) +#define pr_info(ctx, args...) fastd_logf(ctx, LL_INFO, args) +#define pr_verbose(ctx, args...) fastd_logf(ctx, LL_VERBOSE, args) +#define pr_debug(ctx, args...) fastd_logf(ctx, LL_DEBUG, args) +#define pr_debug2(ctx, args...) fastd_logf(ctx, LL_DEBUG2, args) + +#define pr_error_errno(ctx, message) pr_error(ctx, "%s: %s", message, strerror(errno)) +#define pr_warn_errno(ctx, message) pr_warn(ctx, "%s: %s", message, strerror(errno)) +#define pr_debug_errno(ctx, message) pr_debug(ctx, "%s: %s", message, strerror(errno)) +#define pr_debug2_errno(ctx, message) pr_debug2(ctx, "%s: %s", message, strerror(errno)) + +#define exit_fatal(ctx, args...) do { pr_fatal(ctx, args); abort(); } while(0) +#define exit_bug(ctx, message) exit_fatal(ctx, "BUG: %s", message) +#define exit_error(ctx, args...) do { pr_error(ctx, args); exit(1); } while(0) +#define exit_errno(ctx, message) exit_error(ctx, "%s: %s", message, strerror(errno)) + +#endif /* _FASTD_LOG_H_ */ + |