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 2000/05/30 11:18:12 zarq Exp $
+ $Id: conf.c,v 1.9.4.9 2000/09/06 11:49:03 guus Exp $
*/
#include "conf.h"
#include "netutl.h" /* for strtoip */
+#include <utils.h> /* for cp */
#include "system.h"
config_t *config;
int debug_lvl = 0;
int timeout = 0; /* seconds before timeout */
+char *configfilename = NULL;
+
+/* Will be set if HUP signal is received. It will be processed when it is safe. */
+int sighup = 0;
typedef struct internal_config_t {
char *name;
*/
static internal_config_t hazahaza[] = {
{ "AllowConnect", allowconnect, TYPE_BOOL }, /* Is not used anywhere. Remove? */
- { "ConnectTo", upstreamip, TYPE_IP },
+ { "ConnectTo", upstreamip, TYPE_NAME },
{ "ConnectPort", upstreamport, TYPE_INT },
{ "ListenPort", listenport, TYPE_INT },
{ "MyOwnVPNIP", myvpnip, TYPE_IP },
{ "KeyExpire", keyexpire, TYPE_INT },
{ "VpnMask", vpnmask, TYPE_IP },
{ "Hostnames", resolve_dns, TYPE_BOOL },
+ { "IndirectData", indirectdata, TYPE_BOOL },
+ { "TCPonly", tcponly, TYPE_BOOL },
+ { "Interface", interface, TYPE_NAME },
+ { "InterfaceIP", interfaceip, TYPE_IP },
{ NULL, 0, 0 }
};
config_t *
add_config_val(config_t **cfg, int argtype, char *val)
{
- config_t *p;
+ config_t *p, *r;
char *q;
-
+cp
p = (config_t*)xmalloc(sizeof(*p));
p->data.val = 0;
p->data.val = 0;
}
+ p->argtype = argtype;
+
if(p->data.val)
{
- p->next = *cfg;
- *cfg = p;
+ if(*cfg)
+ {
+ r = *cfg;
+ while(r->next)
+ r = r->next;
+ r->next = p;
+ }
+ else
+ *cfg = p;
+ p->next = NULL;
return p;
}
free(p);
+cp
return NULL;
}
char *p, *q;
int i, lineno = 0;
config_t *cfg;
-
+cp
line = (char *)xmalloc(80 * sizeof(char));
temp_buf = (char *)xmalloc(80 * sizeof(char));
if(!config)
config = cfg;
}
+cp
+ return 0;
}
/*
int
read_config_file(const char *fname)
{
+ int err;
FILE *fp;
-
+cp
if((fp = fopen (fname, "r")) == NULL)
{
- fprintf(stderr, _("Could not open %s: %s\n"), fname, sys_errlist[errno]);
+ fprintf(stderr, _("Could not open %s: %s\n"), fname, strerror(errno));
return 1;
}
- if(readconfig(fname, fp))
- return -1;
-
+ err = readconfig(fname, fp);
fclose (fp);
-
- return 0;
+cp
+ return err;
}
/*
get_config_val(which_t type)
{
config_t *p;
-
+cp
for(p = config; p != NULL; p = p->next)
if(p->which == type)
return p;
+cp
+ /* Not found */
+ return NULL;
+}
+/*
+ Support for multiple config lines.
+ Index is used to get a specific value, 0 being the first, 1 the second etc.
+*/
+const config_t *
+get_next_config_val(which_t type, int index)
+{
+ config_t *p;
+cp
+ for(p = config; p != NULL; p = p->next)
+ if(p->which == type)
+ if(--index < 0)
+ return p;
+cp
/* Not found */
return NULL;
}
+
+/*
+ Remove the complete configuration tree.
+*/
+void clear_config()
+{
+ config_t *p, *next;
+cp
+ for(p = config; p != NULL; p = next)
+ {
+ next = p->next;
+ if(p->data.ptr && (p->argtype == TYPE_NAME))
+ {
+ free(p->data.ptr);
+ }
+ free(p);
+ }
+ config = NULL;
+cp
+}