projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only activate a connection upon receiving it's public key if it's an
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
146a582
..
ed60370
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-18,6
+18,9
@@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+/* Created more dynamic storage for lines read from the config file. --
+ Cris van Pelt */
+
#include "config.h"
#include <ctype.h>
#include "config.h"
#include <ctype.h>
@@
-32,6
+35,8
@@
#include "conf.h"
#include "netutl.h" /* for strtoip */
#include "conf.h"
#include "netutl.h" /* for strtoip */
+#include "system.h"
+
config_t *config;
int debug_lvl = 0;
int timeout = 0; /* seconds before timeout */
config_t *config;
int debug_lvl = 0;
int timeout = 0; /* seconds before timeout */
@@
-56,6
+61,7
@@
static internal_config_t hazahaza[] = {
{ "PingTimeout", pingtimeout, TYPE_INT },
{ "TapDevice", tapdevice, TYPE_NAME },
{ "KeyExpire", keyexpire, TYPE_INT },
{ "PingTimeout", pingtimeout, TYPE_INT },
{ "TapDevice", tapdevice, TYPE_NAME },
{ "KeyExpire", keyexpire, TYPE_INT },
+ { "VpnMask", vpnmask, TYPE_IP },
{ NULL, 0, 0 }
};
{ NULL, 0, 0 }
};
@@
-111,15
+117,27
@@
add_config_val(config_t **cfg, int argtype, char *val)
int
readconfig(const char *fname, FILE *fp)
{
int
readconfig(const char *fname, FILE *fp)
{
- char
line[81]
;
+ char
*line, *temp_buf
;
char *p, *q;
int i, lineno = 0;
config_t *cfg;
char *p, *q;
int i, lineno = 0;
config_t *cfg;
+ line = (char *)xmalloc(80 * sizeof(char));
+ temp_buf = (char *)xmalloc(80 * sizeof(char));
+
for(;;)
{
if(fgets(line, 80, fp) == NULL)
return 0;
for(;;)
{
if(fgets(line, 80, fp) == NULL)
return 0;
+
+ while(!index(line, '\n'))
+ {
+ fgets(temp_buf, (strlen(line)+1) * 80, fp);
+ if(!temp_buf)
+ break;
+ strcat(line, temp_buf);
+ line = (char *)xrealloc(line, (strlen(line)+1) * sizeof(char));
+ }
lineno++;
if((p = strtok(line, "\t\n\r =")) == NULL)
lineno++;
if((p = strtok(line, "\t\n\r =")) == NULL)
@@
-134,14
+152,14
@@
readconfig(const char *fname, FILE *fp)
if(!hazahaza[i].name)
{
if(!hazahaza[i].name)
{
- fprintf(stderr,
"%s: %d: Invalid variable name `%s'.\n"
,
+ fprintf(stderr,
_("%s: %d: Invalid variable name `%s'.\n")
,
fname, lineno, p);
return -1;
}
if(((q = strtok(NULL, "\t\n\r =")) == NULL) || q[0] == '#')
{
fname, lineno, p);
return -1;
}
if(((q = strtok(NULL, "\t\n\r =")) == NULL) || q[0] == '#')
{
- fprintf(stderr,
"%s: %d: No value given for `%s'.\n"
,
+ fprintf(stderr,
_("%s: %d: No value given for `%s'.\n")
,
fname, lineno, hazahaza[i].name);
return -1;
}
fname, lineno, hazahaza[i].name);
return -1;
}
@@
-149,7
+167,7
@@
readconfig(const char *fname, FILE *fp)
cfg = add_config_val(&config, hazahaza[i].argtype, q);
if(cfg == NULL)
{
cfg = add_config_val(&config, hazahaza[i].argtype, q);
if(cfg == NULL)
{
- fprintf(stderr,
"%s: %d: Invalid value `%s' for variable `%s'.\n"
,
+ fprintf(stderr,
_("%s: %d: Invalid value `%s' for variable `%s'.\n")
,
fname, lineno, q, hazahaza[i].name);
return -1;
}
fname, lineno, q, hazahaza[i].name);
return -1;
}
@@
-170,7
+188,7
@@
read_config_file(const char *fname)
if((fp = fopen (fname, "r")) == NULL)
{
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, sys_errlist[errno]);
return 1;
}
return 1;
}