projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update Depends lines to reflect the dependencies on OpenSSL
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
640ec13
..
740f434
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-19,18
+19,17
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: conf.c,v 1.9.4.1
1 2000/10/11 13:42:5
2 guus Exp $
+ $Id: conf.c,v 1.9.4.1
3 2000/10/14 17:04:1
2 guus Exp $
*/
*/
-#include "config.h"
-
#include <ctype.h>
#include <errno.h>
#include <netdb.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <errno.h>
#include <netdb.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <syslog.h>
#include <xalloc.h>
#include <xalloc.h>
@@
-38,12
+37,14
@@
#include "netutl.h" /* for strtoip */
#include <utils.h> /* for cp */
#include "netutl.h" /* for strtoip */
#include <utils.h> /* for cp */
+#include "config.h"
+#include "connlist.h"
#include "system.h"
config_t *config;
int debug_lvl = 0;
int timeout = 0; /* seconds before timeout */
#include "system.h"
config_t *config;
int debug_lvl = 0;
int timeout = 0; /* seconds before timeout */
-char *conf
igfilename = NULL;
+char *conf
base = NULL; /* directory in which all config files are */
/* Will be set if HUP signal is received. It will be processed when it is safe. */
int sighup = 0;
/* Will be set if HUP signal is received. It will be processed when it is safe. */
int sighup = 0;
@@
-139,11
+140,11
@@
cp
*/
int read_config_file(config_t **base, const char *fname)
{
*/
int read_config_file(config_t **base, const char *fname)
{
- int err;
+ int err
= -1
;
FILE *fp;
char line[MAXBUFSIZE]; /* There really should not be any line longer than this... */
char *p, *q;
FILE *fp;
char line[MAXBUFSIZE]; /* There really should not be any line longer than this... */
char *p, *q;
- int i,
err = -1,
lineno = 0;
+ int i, lineno = 0;
config_t *cfg;
cp
if((fp = fopen (fname, "r")) == NULL)
config_t *cfg;
cp
if((fp = fopen (fname, "r")) == NULL)
@@
-209,6
+210,18
@@
cp
return err;
}
return err;
}
+int read_server_config()
+{
+ char *fname;
+ int x;
+cp
+ asprintf(fname, "%s/tinc.conf", confbase);
+ x = read_config_file(&config, fname);
+ free(fname);
+cp
+ return x;
+}
+
/*
Look up the value of the config option type
*/
/*
Look up the value of the config option type
*/