X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincctl.c;h=784c6a94759abe3e8b3a3c9e1303729f163c450b;hp=7d82dc442037329ac9bdb1080e897da48196e541;hb=c388527e341658dc915dd67c90bbc9b52b8539c0;hpb=5c5548fc7185cc1462602dadcd39a53cef481d29 diff --git a/src/tincctl.c b/src/tincctl.c index 7d82dc44..784c6a94 100644 --- a/src/tincctl.c +++ b/src/tincctl.c @@ -296,7 +296,7 @@ static int fullread(int fd, void *data, size_t datalen) { int rv, len = 0; while(len < datalen) { - rv = read(fd, data + len, datalen - len); + rv = recv(fd, data + len, datalen - len, 0); if(rv == -1 && errno == EINTR) continue; else if(rv == -1) @@ -478,8 +478,6 @@ int main(int argc, char *argv[], char *envp[]) { return 1; } - fprintf(stderr, "Got socket %d\n", fd); - unsigned long arg = 0; if(ioctlsocket(fd, FIONBIO, &arg) != 0) { @@ -529,8 +527,6 @@ int main(int argc, char *argv[], char *envp[]) { return 1; } - fprintf(stderr, "Connected!\n"); - if(fullread(fd, &greeting, sizeof greeting) == -1) { fprintf(stderr, "Cannot read greeting from control socket: %s\n", sockstrerror(sockerrno));