j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Add some checks when changing configuration.

Browse source
This commit is contained in:
Guus Sliepen 2012-07-21 15:02:17 +02:00
parent cc0c35267f
commit dea722c4ac
1 changed files with 107 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
src/tincctl.c
View file

@ -973,12 +973,65 @@ static char *get_my_name() {
return NULL; return NULL;
} }
static char *hostvariables[] = { #define VAR_SERVER 1 /* Should be in tinc.conf */
"Address", #define VAR_HOST 2 /* Can be in host config file */
"Port", #define VAR_MULTIPLE 4 /* Multiple statements allowed */
"PublicKey", #define VAR_OBSOLETE 8 /* Should not be used anymore */
"Subnet",
NULL, static struct {
const char *name;
int type;
} const variables[] = {
/* Server configuration */
{"AddressFamily", VAR_SERVER},
{"BindToAddress", VAR_SERVER | VAR_MULTIPLE},
{"BindToInterface", VAR_SERVER},
{"Broadcast", VAR_SERVER},
{"ConnectTo", VAR_SERVER | VAR_MULTIPLE},
{"DecrementTTL", VAR_SERVER},
{"Device", VAR_SERVER},
{"DeviceType", VAR_SERVER},
{"DirectOnly", VAR_SERVER},
{"ECDSAPrivateKeyFile", VAR_SERVER},
{"ExperimentalProtocol", VAR_SERVER},
{"Forwarding", VAR_SERVER},
{"GraphDumpFile", VAR_SERVER},
{"Hostnames", VAR_SERVER},
{"IffOneQueue", VAR_SERVER},
{"Interface", VAR_SERVER},
{"KeyExpire", VAR_SERVER},
{"LocalDiscovery", VAR_SERVER},
{"MACExpire", VAR_SERVER},
{"MaxTimeout", VAR_SERVER},
{"Mode", VAR_SERVER},
{"Name", VAR_SERVER},
{"PingInterval", VAR_SERVER},
{"PingTimeout", VAR_SERVER},
{"PriorityInheritance", VAR_SERVER},
{"PrivateKey", VAR_SERVER | VAR_OBSOLETE},
{"PrivateKeyFile", VAR_SERVER},
{"ProcessPriority", VAR_SERVER},
{"ReplayWindow", VAR_SERVER},
{"StrictSubnets", VAR_SERVER},
{"TunnelServer", VAR_SERVER},
{"UDPRcvBuf", VAR_SERVER},
{"UDPSndBuf", VAR_SERVER},
/* Host configuration */
{"Address", VAR_HOST | VAR_MULTIPLE},
{"Cipher", VAR_SERVER | VAR_HOST},
{"ClampMSS", VAR_SERVER | VAR_HOST},
{"Compression", VAR_SERVER | VAR_HOST},
{"Digest", VAR_SERVER | VAR_HOST},
{"IndirectData", VAR_SERVER | VAR_HOST},
{"MACLength", VAR_SERVER | VAR_HOST},
{"PMTU", VAR_SERVER | VAR_HOST},
{"PMTUDiscovery", VAR_SERVER | VAR_HOST},
{"Port", VAR_HOST},
{"PublicKey", VAR_SERVER | VAR_HOST | VAR_OBSOLETE},
{"PublicKeyFile", VAR_SERVER | VAR_HOST | VAR_OBSOLETE},
{"Subnet", VAR_HOST | VAR_MULTIPLE},
{"TCPOnly", VAR_SERVER | VAR_HOST},
{NULL, 0}
}; };
static int cmd_config(int argc, char *argv[]) { static int cmd_config(int argc, char *argv[]) {
@ -1040,16 +1093,47 @@ static int cmd_config(int argc, char *argv[]) {
return 1; return 1;
} }
// Should this go into our own host config file? /* Some simple checks. */
if(!node) { bool found = false;
for(int i = 0; hostvariables[i]; i++) {
if(!strcasecmp(hostvariables[i], variable)) { for(int i = 0; variables[i].name; i++) {
node = get_my_name(); if(strcasecmp(variables[i].name, variable))
if(!node) continue;
return 1;
break; found = true;
variable = (char *)variables[i].name;
/* Discourage use of obsolete variables. */
if(variables[i].type & VAR_OBSOLETE && action >= 0) {
if(force) {
fprintf(stderr, "Warning: %s is an obsolete variable!\n", variable);
} else {
fprintf(stderr, "%s is an obsolete variable! Use --force to use it anyway.\n", variable);
return 1;
} }
} }
/* Don't put server variables in host config files */
if(node && !(variables[i].type & VAR_HOST) && action >= 0) {
if(force) {
fprintf(stderr, "Warning: %s is not a host configuration variable!\n", variable);
} else {
fprintf(stderr, "%s is not a host configuration variable! Use --force to use it anyway.\n", variable);
return 1;
}
}
/* Should this go into our own host config file? */
if(!node && !(variables[i].type & VAR_SERVER)) {
node = get_my_name();
if(!node)
return 1;
}
break;
} }
if(node && !check_id(node)) { if(node && !check_id(node)) {
@ -1057,6 +1141,15 @@ static int cmd_config(int argc, char *argv[]) {
return 1; return 1;
} }
if(!found && action >= 0) {
if(force) {
fprintf(stderr, "Warning: %s is not a known configuration variable!\n", variable);
} else {
fprintf(stderr, "%s: is not a known configuration variable! Use --force to use it anyway.\n", variable);
return 1;
}
}
// Open the right configuration file. // Open the right configuration file.
char *filename; char *filename;
if(node) if(node)