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.11 2000/10/11 13:42:52 guus Exp $
+ $Id: conf.c,v 1.9.4.15 2000/10/16 16:33:29 guus Exp $
*/
-#include "config.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 "netutl.h" /* for strtoip */
#include <utils.h> /* for cp */
+#include "config.h"
+#include "connlist.h"
#include "system.h"
-config_t *config;
+config_t *config = NULL;
int debug_lvl = 0;
int timeout = 0; /* seconds before timeout */
-char *configfilename = NULL;
+char *confbase = NULL; /* directory in which all config files are */
+char *netname = NULL; /* name of the vpn network */
/* Will be set if HUP signal is received. It will be processed when it is safe. */
int sighup = 0;
{ "ConnectTo", connectto, TYPE_NAME },
{ "PingTimeout", pingtimeout, TYPE_INT },
{ "TapDevice", tapdevice, TYPE_NAME },
+ { "TapSubnet", tapsubnet, TYPE_IP },
{ "PrivateKey", privatekey, TYPE_NAME },
{ "KeyExpire", keyexpire, TYPE_INT },
{ "Hostnames", resolve_dns, TYPE_BOOL },
cp
p = (config_t*)xmalloc(sizeof(*p));
p->data.val = 0;
-
+
switch(argtype)
{
case TYPE_INT:
if(p->data.val)
{
- if(*cfg)
- {
- r = *cfg;
- while(r->next)
- r = r->next;
- r->next = p;
- }
- else
- *cfg = p;
- p->next = NULL;
+ p->next = *cfg;
+ *cfg = p;
+cp
return p;
}
-
- free(p);
+ else
+ {
+ free(p);
cp
- return NULL;
+ return NULL;
+ }
}
/*
*/
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;
- int i, err = -1, lineno = 0;
+ int i, lineno = 0;
config_t *cfg;
cp
if((fp = fopen (fname, "r")) == NULL)
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
*/
const config_t *get_config_val(config_t *p, which_t type)
{
cp
- for(p = config; p != NULL; p = p->next)
+ for(; p != NULL; p = p->next)
if(p->which == type)
- return p;
+ break;
cp
- /* Not found */
- return NULL;
+ return p;
}
/*
const config_t *get_next_config_val(config_t *p, which_t type, int index)
{
cp
- for(p = config; p != NULL; p = p->next)
+ for(; p != NULL; p = p->next)
if(p->which == type)
if(--index < 0)
- return p;
+ break;
cp
- /* Not found */
- return NULL;
+ return p;
}
/*