projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- route.c will contain the routing logic.
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
4fc374f
..
641ce3f
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-19,7
+19,7
@@
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
4 2000/10/15 00:59:34 guus
Exp $
+ $Id: conf.c,v 1.9.4.1
6 2000/10/22 13:47:41 zarq
Exp $
*/
*/
@@
-90,7
+90,7
@@
add_config_val(config_t **cfg, int argtype, char *val)
cp
p = (config_t*)xmalloc(sizeof(*p));
p->data.val = 0;
cp
p = (config_t*)xmalloc(sizeof(*p));
p->data.val = 0;
-
+
switch(argtype)
{
case TYPE_INT:
switch(argtype)
{
case TYPE_INT:
@@
-214,6
+214,11
@@
int read_server_config()
cp
asprintf(&fname, "%s/tinc.conf", confbase);
x = read_config_file(&config, fname);
cp
asprintf(&fname, "%s/tinc.conf", confbase);
x = read_config_file(&config, fname);
+ if(x != 0)
+ {
+ fprintf(stderr, _("Failed to read `%s': %m\n"),
+ fname);
+ }
free(fname);
cp
return x;
free(fname);
cp
return x;
@@
-225,7
+230,7
@@
cp
const config_t *get_config_val(config_t *p, which_t type)
{
cp
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)
break;
cp
if(p->which == type)
break;
cp
@@
-239,7
+244,7
@@
cp
const config_t *get_next_config_val(config_t *p, which_t type, int index)
{
cp
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)
break;
if(p->which == type)
if(--index < 0)
break;