projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Return non-zero exit code when "tinc get" does not find the requested variable.
[tinc]
/
src
/
invitation.c
diff --git
a/src/invitation.c
b/src/invitation.c
index
110e395
..
a6996cc
100644
(file)
--- a/
src/invitation.c
+++ b/
src/invitation.c
@@
-1,6
+1,6
@@
/*
invitation.c -- Create and accept invitations
/*
invitation.c -- Create and accept invitations
- Copyright (C) 2013 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2013
-2014
Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-197,8
+197,10
@@
done:
else
xasprintf(&hostport, "%s:%s", hostname, port);
} else {
else
xasprintf(&hostport, "%s:%s", hostname, port);
} else {
- hostport = hostname;
- hostname = NULL;
+ if(strchr(hostname, ':'))
+ xasprintf(&hostport, "[%s]", hostname);
+ else
+ hostport = xstrdup(hostname);
}
free(hostname);
}
free(hostname);
@@
-248,7
+250,7
@@
int cmd_invite(int argc, char *argv[]) {
}
free(filename);
}
free(filename);
- // If a daemon is running, ensure no other nodes now about this name
+ // If a daemon is running, ensure no other nodes
k
now about this name
bool found = false;
if(connect_tincd(false)) {
sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
bool found = false;
if(connect_tincd(false)) {
sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
@@
-319,7
+321,7
@@
int cmd_invite(int argc, char *argv[]) {
free(filename);
ecdsa_t *key;
free(filename);
ecdsa_t *key;
- xasprintf(&filename, "%s" SLASH "invitations" SLASH "e
cdsa
_key.priv", confbase);
+ xasprintf(&filename, "%s" SLASH "invitations" SLASH "e
d25519
_key.priv", confbase);
// Remove the key if there are no outstanding invitations.
if(!count)
// Remove the key if there are no outstanding invitations.
if(!count)
@@
-720,7
+722,7
@@
make_names:
if(!b64key)
return false;
if(!b64key)
return false;
- xasprintf(&filename, "%s" SLASH "e
cdsa
_key.priv", confbase);
+ xasprintf(&filename, "%s" SLASH "e
d25519
_key.priv", confbase);
f = fopenmask(filename, "w", 0600);
if(!ecdsa_write_pem_private_key(key, f)) {
f = fopenmask(filename, "w", 0600);
if(!ecdsa_write_pem_private_key(key, f)) {
@@
-732,7
+734,7
@@
make_names:
fclose(f);
fclose(f);
- fprintf(fh, "E
CDSA
PublicKey = %s\n", b64key);
+ fprintf(fh, "E
d25519
PublicKey = %s\n", b64key);
sptps_send_record(&sptps, 1, b64key, strlen(b64key));
free(b64key);
sptps_send_record(&sptps, 1, b64key, strlen(b64key));
free(b64key);
@@
-904,7
+906,7
@@
int cmd_join(int argc, char *argv[]) {
if(!port || !*port)
port = "655";
if(!port || !*port)
port = "655";
- if(!b64decode(slash, hash,
18) || !b64decode(slash + 24, cookie, 18
))
+ if(!b64decode(slash, hash,
24) || !b64decode(slash + 24, cookie, 24
))
goto invalid;
// Generate a throw-away key for the invitation.
goto invalid;
// Generate a throw-away key for the invitation.