l[len] = 0;
+ // Ignore lines with empty variable names
+ if(!*l) {
+ continue;
+ }
+
// Is it a Name?
- if(!strcasecmp(l, "Name"))
+ if(!strcasecmp(l, "Name")) {
if(strcmp(value, name)) {
break;
} else {
continue;
- } else if(!strcasecmp(l, "NetName")) {
+ }
+ } else if(!strcasecmp(l, "NetName")) {
continue;
}
return finalize_join();
case 2:
- fprintf(stderr, "Invitation succesfully accepted.\n");
+ fprintf(stderr, "Invitation successfully accepted.\n");
shutdown(sock, SHUT_RDWR);
success = true;
break;
aip = aip->ai_next;
if(!aip) {
+ freeaddrinfo(ai);
return 1;
}
}
char hisname[4096] = "";
int code, hismajor, hisminor = 0;
- if(!recvline(sock, line, sizeof(line)) || sscanf(line, "%d %4095s %d.%d", &code, hisname, &hismajor, &hisminor) < 3 || code != 0 || hismajor != PROT_MAJOR || !check_id(hisname) || !recvline(sock, line, sizeof line) || !rstrip(line) || sscanf(line, "%d ", &code) != 1 || code != ACK || strlen(line) < 3) {
+ if(!recvline(sock, line, sizeof(line)) || sscanf(line, "%d %4095s %d.%d", &code, hisname, &hismajor, &hisminor) < 3 || code != 0 || hismajor != PROT_MAJOR || !check_id(hisname) || !recvline(sock, line, sizeof(line)) || !rstrip(line) || sscanf(line, "%d ", &code) != 1 || code != ACK || strlen(line) < 3) {
fprintf(stderr, "Cannot read greeting from peer\n");
closesocket(sock);
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];