projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small fixes for the documentation.
[tinc]
/
src
/
sptps_test.c
diff --git
a/src/sptps_test.c
b/src/sptps_test.c
index
3ec9f98
..
9452ed1
100644
(file)
--- a/
src/sptps_test.c
+++ b/
src/sptps_test.c
@@
-1,6
+1,6
@@
/*
sptps_test.c -- Simple Peer-to-Peer Security test program
/*
sptps_test.c -- Simple Peer-to-Peer Security test program
- Copyright (C) 2011-201
3 Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2011-201
4 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
@@
-35,6
+35,7
@@
bool send_request(void *c, const char *msg, ...) { return false; }
struct list_t *connection_list = NULL;
bool send_meta(void *c, const char *msg , int len) { return false; }
char *logfilename = NULL;
struct list_t *connection_list = NULL;
bool send_meta(void *c, const char *msg , int len) { return false; }
char *logfilename = NULL;
+bool do_detach = false;
struct timeval now;
static bool verbose;
struct timeval now;
static bool verbose;
@@
-43,7
+44,7
@@
static bool writeonly;
static int in = 0;
static int out = 1;
static int in = 0;
static int out = 1;
-static bool send_data(void *handle, uint8_t type, const
char
*data, size_t len) {
+static bool send_data(void *handle, uint8_t type, const
void
*data, size_t len) {
char hex[len * 2 + 1];
bin2hex(data, hex, len);
if(verbose)
char hex[len * 2 + 1];
bin2hex(data, hex, len);
if(verbose)
@@
-54,7
+55,7
@@
static bool send_data(void *handle, uint8_t type, const char *data, size_t len)
return true;
}
return true;
}
-static bool receive_record(void *handle, uint8_t type, const
char
*data, uint16_t len) {
+static bool receive_record(void *handle, uint8_t type, const
void
*data, uint16_t len) {
if(verbose)
fprintf(stderr, "Received type %d record of %hu bytes:\n", type, len);
if(!writeonly)
if(verbose)
fprintf(stderr, "Received type %d record of %hu bytes:\n", type, len);
if(!writeonly)
@@
-210,13
+211,13
@@
int main(int argc, char *argv[]) {
hint.ai_flags = initiator ? 0 : AI_PASSIVE;
if(getaddrinfo(initiator ? argv[3] : NULL, initiator ? argv[4] : argv[3], &hint, &ai) || !ai) {
hint.ai_flags = initiator ? 0 : AI_PASSIVE;
if(getaddrinfo(initiator ? argv[3] : NULL, initiator ? argv[4] : argv[3], &hint, &ai) || !ai) {
- fprintf(stderr, "getaddrinfo() failed: %s\n", s
trerror(
errno));
+ fprintf(stderr, "getaddrinfo() failed: %s\n", s
ockstrerror(sock
errno));
return 1;
}
int sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
if(sock < 0) {
return 1;
}
int sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
if(sock < 0) {
- fprintf(stderr, "Could not create socket: %s\n", s
trerror(
errno));
+ fprintf(stderr, "Could not create socket: %s\n", s
ockstrerror(sock
errno));
return 1;
}
return 1;
}
@@
-225,26
+226,26
@@
int main(int argc, char *argv[]) {
if(initiator) {
if(connect(sock, ai->ai_addr, ai->ai_addrlen)) {
if(initiator) {
if(connect(sock, ai->ai_addr, ai->ai_addrlen)) {
- fprintf(stderr, "Could not connect to peer: %s\n", s
trerror(
errno));
+ fprintf(stderr, "Could not connect to peer: %s\n", s
ockstrerror(sock
errno));
return 1;
}
fprintf(stderr, "Connected\n");
} else {
if(bind(sock, ai->ai_addr, ai->ai_addrlen)) {
return 1;
}
fprintf(stderr, "Connected\n");
} else {
if(bind(sock, ai->ai_addr, ai->ai_addrlen)) {
- fprintf(stderr, "Could not bind socket: %s\n", s
trerror(
errno));
+ fprintf(stderr, "Could not bind socket: %s\n", s
ockstrerror(sock
errno));
return 1;
}
if(!datagram) {
if(listen(sock, 1)) {
return 1;
}
if(!datagram) {
if(listen(sock, 1)) {
- fprintf(stderr, "Could not listen on socket: %s\n", s
trerror(
errno));
+ fprintf(stderr, "Could not listen on socket: %s\n", s
ockstrerror(sock
errno));
return 1;
}
fprintf(stderr, "Listening...\n");
sock = accept(sock, NULL, NULL);
if(sock < 0) {
return 1;
}
fprintf(stderr, "Listening...\n");
sock = accept(sock, NULL, NULL);
if(sock < 0) {
- fprintf(stderr, "Could not accept connection: %s\n", s
trerror(
errno));
+ fprintf(stderr, "Could not accept connection: %s\n", s
ockstrerror(sock
errno));
return 1;
}
} else {
return 1;
}
} else {
@@
-255,12
+256,12
@@
int main(int argc, char *argv[]) {
socklen_t addrlen = sizeof addr;
if(recvfrom(sock, buf, sizeof buf, MSG_PEEK, &addr, &addrlen) <= 0) {
socklen_t addrlen = sizeof addr;
if(recvfrom(sock, buf, sizeof buf, MSG_PEEK, &addr, &addrlen) <= 0) {
- fprintf(stderr, "Could not read from socket: %s\n", s
trerror(
errno));
+ fprintf(stderr, "Could not read from socket: %s\n", s
ockstrerror(sock
errno));
return 1;
}
if(connect(sock, &addr, addrlen)) {
return 1;
}
if(connect(sock, &addr, addrlen)) {
- fprintf(stderr, "Could not accept connection: %s\n", s
trerror(
errno));
+ fprintf(stderr, "Could not accept connection: %s\n", s
ockstrerror(sock
errno));
return 1;
}
}
return 1;
}
}
@@
-271,11
+272,19
@@
int main(int argc, char *argv[]) {
crypto_init();
FILE *fp = fopen(argv[1], "r");
crypto_init();
FILE *fp = fopen(argv[1], "r");
+ if(!fp) {
+ fprintf(stderr, "Could not open %s: %s\n", argv[1], strerror(errno));
+ return 1;
+ }
if(!(mykey = ecdsa_read_pem_private_key(fp)))
return 1;
fclose(fp);
fp = fopen(argv[2], "r");
if(!(mykey = ecdsa_read_pem_private_key(fp)))
return 1;
fclose(fp);
fp = fopen(argv[2], "r");
+ if(!fp) {
+ fprintf(stderr, "Could not open %s: %s\n", argv[2], strerror(errno));
+ return 1;
+ }
if(!(hiskey = ecdsa_read_pem_public_key(fp)))
return 1;
fclose(fp);
if(!(hiskey = ecdsa_read_pem_public_key(fp)))
return 1;
fclose(fp);
@@
-331,7
+340,7
@@
int main(int argc, char *argv[]) {
if(FD_ISSET(sock, &fds)) {
ssize_t len = recv(sock, buf, sizeof buf, 0);
if(len < 0) {
if(FD_ISSET(sock, &fds)) {
ssize_t len = recv(sock, buf, sizeof buf, 0);
if(len < 0) {
- fprintf(stderr, "Could not read from socket: %s\n", s
trerror(
errno));
+ fprintf(stderr, "Could not read from socket: %s\n", s
ockstrerror(sock
errno));
return 1;
}
if(len == 0) {
return 1;
}
if(len == 0) {
@@
-348,8
+357,19
@@
int main(int argc, char *argv[]) {
fprintf(stderr, "Dropped.\n");
continue;
}
fprintf(stderr, "Dropped.\n");
continue;
}
- if(!sptps_receive_data(&s, buf, len) && !datagram)
- return 1;
+ char *bufp = buf;
+ while(len) {
+ size_t done = sptps_receive_data(&s, bufp, len);
+ if(!done) {
+ if(!datagram)
+ return 1;
+ } else {
+ break;
+ }
+
+ bufp += done;
+ len -= done;
+ }
}
}
}
}