projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix handling partial SPTPS messages in sptps_test.
[tinc]
/
src
/
invitation.c
diff --git
a/src/invitation.c
b/src/invitation.c
index
d6f00a5
..
4a262a8
100644
(file)
--- a/
src/invitation.c
+++ b/
src/invitation.c
@@
-769,13
+769,19
@@
make_names:
l[len] = 0;
l[len] = 0;
+ // Ignore lines with empty variable names
+ if(!*l) {
+ continue;
+ }
+
// Is it a Name?
// Is it a Name?
- if(!strcasecmp(l, "Name"))
+ if(!strcasecmp(l, "Name"))
{
if(strcmp(value, name)) {
break;
} else {
continue;
if(strcmp(value, name)) {
break;
} else {
continue;
- } else if(!strcasecmp(l, "NetName")) {
+ }
+ } else if(!strcasecmp(l, "NetName")) {
continue;
}
continue;
}
@@
-1059,7
+1065,7
@@
static bool invitation_receive(void *handle, uint8_t type, const void *msg, uint
return finalize_join();
case 2:
return finalize_join();
case 2:
- fprintf(stderr, "Invitation succesfully accepted.\n");
+ fprintf(stderr, "Invitation succes
s
fully accepted.\n");
shutdown(sock, SHUT_RDWR);
success = true;
break;
shutdown(sock, SHUT_RDWR);
success = true;
break;
@@
-1195,6
+1201,7
@@
next:
aip = aip->ai_next;
if(!aip) {
aip = aip->ai_next;
if(!aip) {
+ freeaddrinfo(ai);
return 1;
}
}
return 1;
}
}
@@
-1240,6
+1247,8
@@
next:
goto next;
}
goto next;
}
+ freeaddrinfo(ai);
+
// Check if the hash of the key he gave us matches the hash in the URL.
char *fingerprint = line + 2;
char hishash[64];
// Check if the hash of the key he gave us matches the hash in the URL.
char *fingerprint = line + 2;
char hishash[64];