projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use backslashes on Windows.
[tinc]
/
src
/
conf.h
diff --git
a/src/conf.h
b/src/conf.h
index
be70c24
..
743851a
100644
(file)
--- a/
src/conf.h
+++ b/
src/conf.h
@@
-1,7
+1,7
@@
/*
conf.h -- header for conf.c
Copyright (C) 1998-2005 Ivo Timmermans
/*
conf.h -- header for conf.c
Copyright (C) 1998-2005 Ivo Timmermans
- 2000-20
09
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-20
12
Guus Sliepen <guus@tinc-vpn.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
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
@@
-22,6
+22,7
@@
#define __TINC_CONF_H__
#include "splay_tree.h"
#define __TINC_CONF_H__
#include "splay_tree.h"
+#include "list.h"
typedef struct config_t {
char *variable;
typedef struct config_t {
char *variable;
@@
-40,6
+41,7
@@
extern int maxtimeout;
extern bool bypass_security;
extern char *confbase;
extern char *netname;
extern bool bypass_security;
extern char *confbase;
extern char *netname;
+extern list_t *cmdline_conf;
extern void init_configuration(splay_tree_t **);
extern void exit_configuration(splay_tree_t **);
extern void init_configuration(splay_tree_t **);
extern void exit_configuration(splay_tree_t **);
@@
-54,10
+56,11
@@
extern bool get_config_string(const config_t *, char **);
extern bool get_config_address(const config_t *, struct addrinfo **);
extern bool get_config_subnet(const config_t *, struct subnet_t **);
extern bool get_config_address(const config_t *, struct addrinfo **);
extern bool get_config_subnet(const config_t *, struct subnet_t **);
-extern int read_config_file(splay_tree_t *, const char *);
+extern config_t *parse_config_line(char *, const char *, int);
+extern bool read_config_file(splay_tree_t *, const char *);
+extern void read_config_options(splay_tree_t *, const char *);
extern bool read_server_config(void);
extern bool read_server_config(void);
-extern FILE *ask_and_open(const char *, const char *, const char *);
-extern bool is_safe_path(const char *);
-extern bool disable_old_keys(FILE *);
+extern bool read_connection_config(struct connection_t *);
+extern bool append_config_file(const char *, const char *, const char *);
#endif /* __TINC_CONF_H__ */
#endif /* __TINC_CONF_H__ */