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.34 2000/12/06 13:33:48 zarq 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 },
{ "TapDevice", config_tapdevice, TYPE_NAME },
+ { "VpnMask", config_dummy, TYPE_IP },
/* Host configuration file keywords */
{ "Address", config_address, TYPE_NAME },
{ "IndirectData", config_indirectdata, 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;
for(;;)
{
- if((line = readline(fp, buffer, &bufsize)) == NULL)
+
+ if((line = readline(fp, &buffer, &bufsize)) == NULL)
{
err = -1;
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);