From b9c8603931203f5d94091f7a05a5967304b62fbd Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 20 Apr 2014 04:36:34 +0200 Subject: Make conf global --- src/config.h | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'src/config.h') diff --git a/src/config.h b/src/config.h index a13ddc0..60663f4 100644 --- a/src/config.h +++ b/src/config.h @@ -29,20 +29,21 @@ #include "fastd.h" -void fastd_config_protocol(fastd_context_t *ctx, fastd_config_t *conf, const char *name); -void fastd_config_method(fastd_context_t *ctx, fastd_config_t *conf, const char *name); -void fastd_config_cipher(fastd_context_t *ctx, fastd_config_t *conf, const char *name, const char *impl); -void fastd_config_mac(fastd_context_t *ctx, fastd_config_t *conf, const char *name, const char *impl); -void fastd_config_add_log_file(fastd_context_t *ctx, fastd_config_t *conf, const char *name, fastd_loglevel_t level); -void fastd_config_bind_address(fastd_context_t *ctx, fastd_config_t *conf, const fastd_peer_address_t *address, const char *bindtodev, bool default_v4, bool default_v6); -void fastd_config_peer_group_push(fastd_context_t *ctx, fastd_config_t *conf, const char *name); -void fastd_config_peer_group_pop(fastd_context_t *ctx, fastd_config_t *conf); -void fastd_config_release(fastd_context_t *ctx, fastd_config_t *conf); -void fastd_configure(fastd_context_t *ctx, fastd_config_t *conf, int argc, char *const argv[]); -void fastd_config_check(fastd_context_t *ctx, fastd_config_t *conf); -void fastd_config_load_peer_dirs(fastd_context_t *ctx, fastd_config_t *conf); -void fastd_config_handle_options(fastd_context_t *ctx, fastd_config_t *conf, int argc, char *const argv[]); -void fastd_config_verify(fastd_context_t *ctx, fastd_config_t *conf); - -void fastd_add_peer_dir(fastd_context_t *ctx, fastd_config_t *conf, const char *dir); -bool fastd_read_config(fastd_context_t *ctx, fastd_config_t *conf, const char *filename, bool peer_config, int depth); +void fastd_config_protocol(fastd_context_t *ctx, const char *name); +void fastd_config_method(fastd_context_t *ctx, const char *name); +void fastd_config_cipher(fastd_context_t *ctx, const char *name, const char *impl); +void fastd_config_mac(fastd_context_t *ctx, const char *name, const char *impl); +void fastd_config_add_log_file(fastd_context_t *ctx, const char *name, fastd_loglevel_t level); +void fastd_config_bind_address(fastd_context_t *ctx, const fastd_peer_address_t *address, const char *bindtodev, bool default_v4, bool default_v6); +void fastd_config_peer_group_push(fastd_context_t *ctx, const char *name); +void fastd_config_peer_group_pop(fastd_context_t *ctx); +void fastd_config_release(fastd_context_t *ctx); +void fastd_config_handle_options(fastd_context_t *ctx, int argc, char *const argv[]); +void fastd_config_verify(fastd_context_t *ctx); + +void fastd_configure(fastd_context_t *ctx, int argc, char *const argv[]); +void fastd_config_check(fastd_context_t *ctx); +void fastd_config_load_peer_dirs(fastd_context_t *ctx); + +void fastd_add_peer_dir(fastd_context_t *ctx, const char *dir); +bool fastd_read_config(fastd_context_t *ctx, const char *filename, bool peer_config, int depth); -- cgit v1.2.3