projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Oops. I did some VERY wrong things with readline(). Fixed now.
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
11a9ca0
..
e0cc11e
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.
27 2000/11/30 00:24:13
zarq Exp $
+ $Id: conf.c,v 1.9.4.
33 2000/12/05 08:56:44
zarq Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-58,25
+58,25
@@
int sighup = 0;
*/
static internal_config_t hazahaza[] = {
/* Main configuration file keywords */
*/
static internal_config_t hazahaza[] = {
/* Main configuration file keywords */
- { "Name", config_name, TYPE_NAME },
{ "ConnectTo", config_connectto, TYPE_NAME },
{ "ConnectTo", config_connectto, TYPE_NAME },
- { "PingTimeout", config_pingtimeout, TYPE_INT },
- { "TapDevice", config_tapdevice, TYPE_NAME },
- { "PrivateKey", config_privatekey, TYPE_NAME },
- { "KeyExpire", config_keyexpire, TYPE_INT },
{ "Hostnames", config_hostnames, TYPE_BOOL },
{ "Interface", config_interface, TYPE_NAME },
{ "InterfaceIP", config_interfaceip, TYPE_IP },
{ "Hostnames", config_hostnames, TYPE_BOOL },
{ "Interface", config_interface, TYPE_NAME },
{ "InterfaceIP", config_interfaceip, TYPE_IP },
+ { "KeyExpire", config_keyexpire, TYPE_INT },
+ { "Name", config_name, TYPE_NAME },
+ { "PingTimeout", config_pingtimeout, TYPE_INT },
+ { "PrivateKey", config_privatekey, TYPE_NAME },
+ { "TapDevice", config_tapdevice, TYPE_NAME },
/* Host configuration file keywords */
{ "Address", config_address, TYPE_NAME },
/* Host configuration file keywords */
{ "Address", config_address, TYPE_NAME },
+ { "IndirectData", config_indirectdata, TYPE_BOOL },
{ "Port", config_port, TYPE_INT },
{ "PublicKey", config_publickey, TYPE_NAME },
{ "Port", config_port, TYPE_INT },
{ "PublicKey", config_publickey, TYPE_NAME },
- { "Subnet", config_subnet, TYPE_IP }, /* Use IPv4 subnets only for now */
- { "RestrictHosts", config_restricthosts, TYPE_BOOL },
- { "RestrictSubnets", config_restrictsubnets, TYPE_BOOL },
{ "RestrictAddress", config_restrictaddress, TYPE_BOOL },
{ "RestrictAddress", config_restrictaddress, TYPE_BOOL },
+ { "RestrictHosts", config_restricthosts, TYPE_BOOL },
{ "RestrictPort", config_restrictport, TYPE_BOOL },
{ "RestrictPort", config_restrictport, TYPE_BOOL },
- { "IndirectData", config_indirectdata, TYPE_BOOL },
+ { "RestrictSubnets", config_restrictsubnets, TYPE_BOOL },
+ { "Subnet", config_subnet, TYPE_IP }, /* Use IPv4 subnets only for now */
{ "TCPonly", config_tcponly, TYPE_BOOL },
{ NULL, 0, 0 }
};
{ "TCPonly", config_tcponly, TYPE_BOOL },
{ NULL, 0, 0 }
};
@@
-137,8
+137,13
@@
cp
Read exactly one line and strip the trailing newline if any. If the
file was on EOF, return NULL. Otherwise, return all the data in a
dynamically allocated buffer.
Read exactly one line and strip the trailing newline if any. If the
file was on EOF, return NULL. Otherwise, return all the data in a
dynamically allocated buffer.
+
+ If line is non-NULL, it will be used as an initial buffer, to avoid
+ unnecessary mallocing each time this function is called. If buf is
+ given, and buf needs to be expanded, the var pointed to by buflen
+ will be increased.
*/
*/
-char *readline(FILE *fp)
+char *readline(FILE *fp
, char **buf, size_t *buflen
)
{
char *newline = NULL;
char *p;
{
char *newline = NULL;
char *p;
@@
-153,11
+158,21
@@
char *readline(FILE *fp)
if(feof(fp))
return NULL;
if(feof(fp))
return NULL;
-
- size = 100;
+
+ if((buf != NULL) && (buflen != NULL))
+ {
+ size = *buflen;
+ line = *buf;
+ }
+ else
+ {
+ size = 100;
+ line = xmalloc(size);
+ }
+
maxlen = size;
maxlen = size;
- line = xmalloc(size);
idx = line;
idx = line;
+ *idx = 0;
for(;;)
{
errno = 0;
for(;;)
{
errno = 0;
@@
-190,6
+205,11
@@
char *readline(FILE *fp)
}
}
}
}
+ if((buf != NULL) && (buflen != NULL))
+ {
+ *buflen = size;
+ *buf = line;
+ }
return line;
}
return line;
}
@@
-199,24
+219,36
@@
char *readline(FILE *fp)
*/
int read_config_file(config_t **base, const char *fname)
{
*/
int read_config_file(config_t **base, const char *fname)
{
- int err = -
1;
+ int err = -
2; /* Parse error */
FILE *fp;
FILE *fp;
- char *line;
+ char *
buffer, *
line;
char *p, *q;
int i, lineno = 0;
config_t *cfg;
char *p, *q;
int i, lineno = 0;
config_t *cfg;
+ size_t bufsize;
+
cp
if((fp = fopen (fname, "r")) == NULL)
return -1;
cp
if((fp = fopen (fname, "r")) == NULL)
return -1;
+ bufsize = 100;
+ buffer = xmalloc(bufsize);
+
for(;;)
{
for(;;)
{
- if((line = readline(fp)) == NULL)
+
+ if((line = readline(fp, &buffer, &bufsize)) == NULL)
{
err = -1;
break;
}
{
err = -1;
break;
}
-
+
+ if(feof(fp))
+ {
+ err = 0;
+ break;
+ }
+
lineno++;
if((p = strtok(line, "\t =")) == NULL)
lineno++;
if((p = strtok(line, "\t =")) == NULL)
@@
-231,33
+263,32
@@
cp
if(!hazahaza[i].name)
{
if(!hazahaza[i].name)
{
- syslog(LOG_ERR, _("Invalid variable name on line %d while reading config file %s"),
- lineno, fname);
+ syslog(LOG_ERR, _("Invalid variable name
`%s'
on line %d while reading config file %s"),
+
p,
lineno, fname);
break;
}
if(((q = strtok(NULL, "\t\n\r =")) == NULL) || q[0] == '#')
{
break;
}
if(((q = strtok(NULL, "\t\n\r =")) == NULL) || q[0] == '#')
{
- fprintf(stderr, _("No value for variable on line %d while reading config file %s"),
- lineno, fname);
+ fprintf(stderr, _("No value for variable
`%s'
on line %d while reading config file %s"),
+
hazahaza[i].name,
lineno, fname);
break;
}
cfg = add_config_val(base, hazahaza[i].argtype, q);
if(cfg == NULL)
{
break;
}
cfg = add_config_val(base, hazahaza[i].argtype, q);
if(cfg == NULL)
{
- fprintf(stderr, _("Invalid value for variable on line %d while reading config file %s"),
- lineno, fname);
+ fprintf(stderr, _("Invalid value for variable
`%s'
on line %d while reading config file %s"),
+
hazahaza[i].name,
lineno, fname);
break;
}
cfg->which = hazahaza[i].which;
if(!config)
config = cfg;
break;
}
cfg->which = hazahaza[i].which;
if(!config)
config = cfg;
- free(line);
}
}
- free(
line
);
+ free(
buffer
);
fclose (fp);
cp
return err;
fclose (fp);
cp
return err;
@@
-270,7
+301,7
@@
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)
+ if(x
== -1) /* System error */
{
fprintf(stderr, _("Failed to read `%s': %m\n"),
fname);
{
fprintf(stderr, _("Failed to read `%s': %m\n"),
fname);
@@
-330,7
+361,6
@@
int isadir(const char* f)
int is_safe_path(const char *file)
{
char *p;
int is_safe_path(const char *file)
{
char *p;
- char *fn = xstrdup(file);
struct stat s;
p = strrchr(file, '/');
struct stat s;
p = strrchr(file, '/');
@@
-356,12
+386,14
@@
int is_safe_path(const char *file)
}
*p = '/';
}
*p = '/';
- if(stat(file, &s) < 0)
+ if(stat(file, &s) < 0
&& errno != ENOENT
)
{
fprintf(stderr, _("Couldn't stat `%s': %m\n"),
file);
return 0;
}
{
fprintf(stderr, _("Couldn't stat `%s': %m\n"),
file);
return 0;
}
+ if(errno == ENOENT)
+ return 1;
if(s.st_uid != geteuid())
{
fprintf(stderr, _("`%s' is owned by UID %d instead of %d.\n"),
if(s.st_uid != geteuid())
{
fprintf(stderr, _("`%s' is owned by UID %d instead of %d.\n"),
@@
-406,7
+438,7
@@
FILE *ask_and_safe_open(const char* filename, const char* what)
fprintf(stdout, _("Please enter a file to save %s to [%s]: "),
what, filename);
fflush(stdout); /* Don't wait for a newline */
fprintf(stdout, _("Please enter a file to save %s to [%s]: "),
what, filename);
fflush(stdout); /* Don't wait for a newline */
- if((fn = readline(stdin)) == NULL)
+ if((fn = readline(stdin
, NULL, NULL
)) == NULL)
{
fprintf(stderr, _("Error while reading stdin: %m\n"));
return NULL;
{
fprintf(stderr, _("Error while reading stdin: %m\n"));
return NULL;