"\n"
"Valid commands are:\n"
" init [name] Create initial configuration files.\n"
- " config Change configuration:\n"
- " [get] VARIABLE - print current value of VARIABLE\n"
- " [set] VARIABLE VALUE - set VARIABLE to VALUE\n"
- " add VARIABLE VALUE - add VARIABLE with the given VALUE\n"
- " del VARIABLE [VALUE] - remove VARIABLE [only ones with watching VALUE]\n"
+ " get VARIABLE Print current value of VARIABLE\n"
+ " set VARIABLE VALUE Set VARIABLE to VALUE\n"
+ " add VARIABLE VALUE Add VARIABLE with the given VALUE\n"
+ " del VARIABLE [VALUE] Remove VARIABLE [only ones with watching VALUE]\n"
" start [tincd options] Start tincd.\n"
" stop Stop tincd.\n"
" restart Restart tincd.\n"
them in.
*/
static bool ecdsa_keygen(bool ask) {
- ecdsa_t key;
+ ecdsa_t *key;
FILE *f;
char *pubname, *privname;
fprintf(stderr, "Generating ECDSA keypair:\n");
- if(!ecdsa_generate(&key)) {
+ if(!(key = ecdsa_generate())) {
fprintf(stderr, "Error during key generation!\n");
return false;
} else
fchmod(fileno(f), 0600);
#endif
- ecdsa_write_pem_private_key(&key, f);
+ if(!ecdsa_write_pem_private_key(key, f)) {
+ fprintf(stderr, "Error writing private key!\n");
+ ecdsa_free(key);
+ fclose(f);
+ return false;
+ }
fclose(f);
if(!f)
return false;
- char *pubkey = ecdsa_get_base64_public_key(&key);
+ char *pubkey = ecdsa_get_base64_public_key(key);
fprintf(f, "ECDSAPublicKey = %s\n", pubkey);
free(pubkey);
fclose(f);
+ ecdsa_free(key);
return true;
}
them in.
*/
static bool rsa_keygen(int bits, bool ask) {
- rsa_t key;
+ rsa_t *key;
FILE *f;
char *pubname, *privname;
fprintf(stderr, "Generating %d bits keys:\n", bits);
- if(!rsa_generate(&key, bits, 0x10001)) {
+ if(!(key = rsa_generate(bits, 0x10001))) {
fprintf(stderr, "Error during key generation!\n");
return false;
} else
fchmod(fileno(f), 0600);
#endif
- rsa_write_pem_private_key(&key, f);
+ if(!rsa_write_pem_private_key(key, f)) {
+ fprintf(stderr, "Error writing private key!\n");
+ fclose(f);
+ rsa_free(key);
+ return false;
+ }
fclose(f);
if(!f)
return false;
- rsa_write_pem_public_key(&key, f);
+ if(!rsa_write_pem_public_key(key, f)) {
+ fprintf(stderr, "Error writing public key!\n");
+ fclose(f);
+ rsa_free(key);
+ return false;
+ }
fclose(f);
+ rsa_free(key);
return true;
}
top(fd);
return 0;
#else
- fprintf(stderr, "This version of tincctl was compiled without support for the curses library.\n");
+ fprintf(stderr, "This version of tinc was compiled without support for the curses library.\n");
return 1;
#endif
}
return len;
}
-static char *get_my_name() {
+static char *get_my_name(bool verbose) {
FILE *f = fopen(tinc_conf, "r");
if(!f) {
- fprintf(stderr, "Could not open %s: %s\n", tinc_conf, strerror(errno));
+ if(verbose)
+ fprintf(stderr, "Could not open %s: %s\n", tinc_conf, strerror(errno));
return NULL;
}
}
fclose(f);
- fprintf(stderr, "Could not find Name in %s.\n", tinc_conf);
+ if(verbose)
+ fprintf(stderr, "Could not find Name in %s.\n", tinc_conf);
return NULL;
}
return 1;
}
+ if(strcasecmp(argv[0], "config"))
+ argv--, argc++;
+
int action = -2;
if(!strcasecmp(argv[1], "get")) {
argv++, argc--;
/* Should this go into our own host config file? */
if(!node && !(variables[i].type & VAR_SERVER)) {
- node = get_my_name();
+ node = get_my_name(true);
if(!node)
return 1;
}
FILE *f = fopen(filename, "r");
if(!f) {
- if(action < 0 || errno != ENOENT) {
- fprintf(stderr, "Could not open configuration file %s: %s\n", filename, strerror(errno));
- return 1;
- }
-
- // If it doesn't exist, create it.
- f = fopen(filename, "a+");
- if(!f) {
- fprintf(stderr, "Could not create configuration file %s: %s\n", filename, strerror(errno));
- return 1;
- } else {
- fprintf(stderr, "Created configuration file %s.\n", filename);
- }
+ fprintf(stderr, "Could not open configuration file %s: %s\n", filename, strerror(errno));
+ return 1;
}
char *tmpfile = NULL;
return 1;
}
+ if(!name)
+ name = get_my_name(false);
+
return !(rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048, true) && ecdsa_keygen(true));
}
return 1;
}
+ if(!name)
+ name = get_my_name(false);
+
return !rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048, true);
}
return 1;
}
+ if(!name)
+ name = get_my_name(false);
+
return !ecdsa_keygen(true);
}
return 1;
}
- char *name = get_my_name();
+ char *name = get_my_name(true);
if(!name)
return 1;
static const struct {
const char *command;
int (*function)(int argc, char *argv[]);
+ bool hidden;
} commands[] = {
{"start", cmd_start},
{"stop", cmd_stop},
{"pcap", cmd_pcap},
{"log", cmd_log},
{"pid", cmd_pid},
- {"config", cmd_config},
+ {"config", cmd_config, true},
+ {"add", cmd_config},
+ {"del", cmd_config},
+ {"get", cmd_config},
+ {"set", cmd_config},
{"init", cmd_init},
{"generate-keys", cmd_generate_keys},
{"generate-rsa-keys", cmd_generate_rsa_keys},
i++;
while(commands[i].command) {
- if(!strncasecmp(commands[i].command, text, strlen(text)))
+ if(!commands[i].hidden && !strncasecmp(commands[i].command, text, strlen(text)))
return xstrdup(commands[i].command);
i++;
}
}
static char *complete_config(const char *text, int state) {
- const char *sub[] = {"get", "set", "add", "del"};
static int i;
- if(!state) {
+
+ if(!state)
i = 0;
- if(!strchr(rl_line_buffer + 7, ' '))
- i = -4;
- else {
- bool found = false;
- for(int i = 0; i < 4; i++) {
- if(!strncasecmp(rl_line_buffer + 7, sub[i], strlen(sub[i])) && rl_line_buffer[7 + strlen(sub[i])] == ' ') {
- found = true;
- break;
- }
- }
- if(!found)
- return NULL;
- }
- } else {
+ else
i++;
- }
- while(i < 0 || variables[i].name) {
- if(i < 0 && !strncasecmp(sub[i + 4], text, strlen(text)))
- return xstrdup(sub[i + 4]);
- if(i >= 0) {
- char *dot = strchr(text, '.');
- if(dot) {
- if((variables[i].type & VAR_HOST) && !strncasecmp(variables[i].name, dot + 1, strlen(dot + 1))) {
- char *match;
- xasprintf(&match, "%.*s.%s", dot - text, text, variables[i].name);
- return match;
- }
- } else {
- if(!strncasecmp(variables[i].name, text, strlen(text)))
- return xstrdup(variables[i].name);
+ while(variables[i].name) {
+ char *dot = strchr(text, '.');
+ if(dot) {
+ if((variables[i].type & VAR_HOST) && !strncasecmp(variables[i].name, dot + 1, strlen(dot + 1))) {
+ char *match;
+ xasprintf(&match, "%.*s.%s", dot - text, text, variables[i].name);
+ return match;
}
+ } else {
+ if(!strncasecmp(variables[i].name, text, strlen(text)))
+ return xstrdup(variables[i].name);
}
i++;
}
matches = rl_completion_matches(text, complete_command);
else if(!strncasecmp(rl_line_buffer, "dump ", 5))
matches = rl_completion_matches(text, complete_dump);
- else if(!strncasecmp(rl_line_buffer, "config ", 7))
+ else if(!strncasecmp(rl_line_buffer, "add ", 4))
+ matches = rl_completion_matches(text, complete_config);
+ else if(!strncasecmp(rl_line_buffer, "del ", 4))
+ matches = rl_completion_matches(text, complete_config);
+ else if(!strncasecmp(rl_line_buffer, "get ", 4))
+ matches = rl_completion_matches(text, complete_config);
+ else if(!strncasecmp(rl_line_buffer, "set ", 4))
matches = rl_completion_matches(text, complete_config);
else if(!strncasecmp(rl_line_buffer, "info ", 5))
matches = rl_completion_matches(text, complete_info);
projects / tinc / blobdiff