j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Make sptps_test less verbose by default.

Browse source
This commit is contained in:
Guus Sliepen 2013-10-22 21:19:41 +02:00
parent 7da999f4ae
commit a5bcb29fdf
1 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/sptps_test.c
View file

@ -33,13 +33,15 @@ bool send_meta(void *c, const char *msg , int len) { return false; }
char *logfilename = NULL; char *logfilename = NULL;
struct timeval now; struct timeval now;
static bool verbose;
static bool readonly; static bool readonly;
static bool writeonly; static bool writeonly;
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 char *data, size_t len) {
char hex[len * 2 + 1]; char hex[len * 2 + 1];
bin2hex(data, hex, len); bin2hex(data, hex, len);
fprintf(stderr, "Sending %d bytes of data:\n%s\n", (int)len, hex); if(verbose)
fprintf(stderr, "Sending %d bytes of data:\n%s\n", (int)len, hex);
const int *sock = handle; const int *sock = handle;
if(send(*sock, data, len, 0) != len) if(send(*sock, data, len, 0) != len)
return false; return false;
@ -47,7 +49,8 @@ static bool send_data(void *handle, uint8_t type, const char *data, size_t len)
} }
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 char *data, uint16_t len) {
fprintf(stderr, "Received type %d record of %hu bytes:\n", type, len); if(verbose)
fprintf(stderr, "Received type %d record of %hu bytes:\n", type, len);
if(!writeonly) if(!writeonly)
fwrite(data, len, 1, stdout); fwrite(data, len, 1, stdout);
return true; return true;
@ -60,6 +63,7 @@ static struct option const long_options[] = {
{"writeonly", no_argument, NULL, 'w'}, {"writeonly", no_argument, NULL, 'w'},
{"packet-loss", required_argument, NULL, 'L'}, {"packet-loss", required_argument, NULL, 'L'},
{"replay-window", required_argument, NULL, 'W'}, {"replay-window", required_argument, NULL, 'W'},
{"verbose", required_argument, NULL, 'v'},
{"help", no_argument, NULL, 1}, {"help", no_argument, NULL, 1},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
}; };
@ -75,6 +79,7 @@ static void usage() {
" -w, --writeonly Only send data from stdin to the socket.\n" " -w, --writeonly Only send data from stdin to the socket.\n"
" -L, --packet-loss RATE Fake packet loss of RATE percent.\n" " -L, --packet-loss RATE Fake packet loss of RATE percent.\n"
" -R, --replay-window N Set replay window to N bytes.\n" " -R, --replay-window N Set replay window to N bytes.\n"
" -v, --verbose Display debug messages.\n"
"\n"); "\n");
fprintf(stderr, "Report bugs to tinc@tinc-vpn.org.\n"); fprintf(stderr, "Report bugs to tinc@tinc-vpn.org.\n");
} }
@ -89,7 +94,7 @@ int main(int argc, char *argv[]) {
ecdsa_t *mykey = NULL, *hiskey = NULL; ecdsa_t *mykey = NULL, *hiskey = NULL;
bool quit = false; bool quit = false;
while((r = getopt_long(argc, argv, "dqrwL:W:", long_options, &option_index)) != EOF) { while((r = getopt_long(argc, argv, "dqrwL:W:v", long_options, &option_index)) != EOF) {
switch (r) { switch (r) {
case 0: /* long option */ case 0: /* long option */
break; break;
@ -118,6 +123,10 @@ int main(int argc, char *argv[]) {
sptps_replaywin = atoi(optarg); sptps_replaywin = atoi(optarg);
break; break;
case 'v': /* be verbose */
verbose = true;
break;
case '?': /* wrong options */ case '?': /* wrong options */
usage(); usage();
return 1; return 1;
@ -230,7 +239,8 @@ int main(int argc, char *argv[]) {
return 1; return 1;
fclose(fp); fclose(fp);
fprintf(stderr, "Keys loaded\n"); if(verbose)
fprintf(stderr, "Keys loaded\n");
sptps_t s; sptps_t s;
if(!sptps_start(&s, &sock, initiator, datagram, mykey, hiskey, "sptps_test", 10, send_data, receive_record)) if(!sptps_start(&s, &sock, initiator, datagram, mykey, hiskey, "sptps_test", 10, send_data, receive_record))
@ -254,7 +264,6 @@ int main(int argc, char *argv[]) {
if(FD_ISSET(0, &fds)) { if(FD_ISSET(0, &fds)) {
ssize_t len = read(0, buf, sizeof buf); ssize_t len = read(0, buf, sizeof buf);
fprintf(stderr, "%zd\n", len);
if(len < 0) { if(len < 0) {
fprintf(stderr, "Could not read from stdin: %s\n", strerror(errno)); fprintf(stderr, "Could not read from stdin: %s\n", strerror(errno));
return 1; return 1;
@ -288,11 +297,14 @@ int main(int argc, char *argv[]) {
fprintf(stderr, "Connection terminated by peer.\n"); fprintf(stderr, "Connection terminated by peer.\n");
break; break;
} }
char hex[len * 2 + 1]; if(verbose) {
bin2hex(buf, hex, len); char hex[len * 2 + 1];
fprintf(stderr, "Received %d bytes of data:\n%s\n", (int)len, hex); bin2hex(buf, hex, len);
if((rand() % 100) < packetloss) { fprintf(stderr, "Received %d bytes of data:\n%s\n", (int)len, hex);
fprintf(stderr, "Dropped.\n"); }
if(packetloss && (rand() % 100) < packetloss) {
if(verbose)
fprintf(stderr, "Dropped.\n");
continue; continue;
} }
if(!sptps_receive_data(&s, buf, len) && !datagram) if(!sptps_receive_data(&s, buf, len) && !datagram)