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.32 2000/12/03 12:22:19 zarq Exp $
+ $Id: conf.c,v 1.9.4.35 2000/12/22 21:34:20 guus Exp $
*/
#include "config.h"
{ "Interface", config_interface, TYPE_NAME },
{ "InterfaceIP", config_interfaceip, TYPE_IP },
{ "KeyExpire", config_keyexpire, TYPE_INT },
+ { "MyVirtualIP", config_dummy, TYPE_IP },
+ { "MyOwnVPNIP", config_dummy, TYPE_IP },
{ "Name", config_name, TYPE_NAME },
{ "PingTimeout", config_pingtimeout, TYPE_INT },
{ "PrivateKey", config_privatekey, TYPE_NAME },
+ { "PrivateKeyFile", config_privatekeyfile, TYPE_NAME },
{ "TapDevice", config_tapdevice, TYPE_NAME },
+ { "VpnMask", config_dummy, TYPE_IP },
/* Host configuration file keywords */
{ "Address", config_address, TYPE_NAME },
{ "IndirectData", config_indirectdata, TYPE_BOOL },
{ "Port", config_port, TYPE_INT },
{ "PublicKey", config_publickey, TYPE_NAME },
+ { "PublicKeyFile", config_publickeyfile, TYPE_NAME },
{ "RestrictAddress", config_restrictaddress, TYPE_BOOL },
{ "RestrictHosts", config_restricthosts, TYPE_BOOL },
{ "RestrictPort", config_restrictport, TYPE_BOOL },
given, and buf needs to be expanded, the var pointed to by buflen
will be increased.
*/
-char *readline(FILE *fp, char *buf, size_t *buflen)
+char *readline(FILE *fp, char **buf, size_t *buflen)
{
char *newline = NULL;
char *p;
if((buf != NULL) && (buflen != NULL))
{
size = *buflen;
- line = buf;
+ line = *buf;
}
else
{
}
if((buf != NULL) && (buflen != NULL))
- *buf = size;
+ {
+ *buflen = size;
+ *buf = line;
+ }
return line;
}
*/
int read_config_file(config_t **base, const char *fname)
{
- int err = -1;
+ int err = -2; /* Parse error */
FILE *fp;
char *buffer, *line;
char *p, *q;
cp
if((fp = fopen (fname, "r")) == NULL)
- return -1;
+ {
+ syslog(LOG_ERR, _("Cannot open config file %s: %m"), fname);
+ return -1;
+ }
bufsize = 100;
buffer = xmalloc(bufsize);
for(;;)
{
- if((line = readline(fp, buffer, &bufsize)) == NULL)
+
+ if((line = readline(fp, &buffer, &bufsize)) == NULL)
{
err = -1;
break;
if(((q = strtok(NULL, "\t\n\r =")) == NULL) || q[0] == '#')
{
- fprintf(stderr, _("No value for variable `%s' on line %d while reading config file %s"),
+ syslog(LOG_ERR, _("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)
{
- fprintf(stderr, _("Invalid value for variable `%s' on line %d while reading config file %s"),
+ syslog(LOG_ERR, _("Invalid value for variable `%s' on line %d while reading config file %s"),
hazahaza[i].name, lineno, fname);
break;
}
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);