char *logfilename = NULL;
struct timeval now;
-ecdsa_t *mykey, *hiskey;
+static bool verbose;
+static bool readonly;
+static bool writeonly;
static bool send_data(void *handle, uint8_t type, const char *data, size_t len) {
char hex[len * 2 + 1];
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;
if(send(*sock, data, len, 0) != len)
return false;
}
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);
- fwrite(data, len, 1, stdout);
+ if(verbose)
+ fprintf(stderr, "Received type %d record of %hu bytes:\n", type, len);
+ if(!writeonly)
+ fwrite(data, len, 1, stdout);
return true;
}
static struct option const long_options[] = {
{"datagram", no_argument, NULL, 'd'},
- {"packet-loss", required_argument, NULL, 'l'},
- {"replay-window", required_argument, NULL, 'r'},
+ {"quit", no_argument, NULL, 'q'},
+ {"readonly", no_argument, NULL, 'r'},
+ {"writeonly", no_argument, NULL, 'w'},
+ {"packet-loss", required_argument, NULL, 'L'},
+ {"replay-window", required_argument, NULL, 'W'},
+ {"verbose", required_argument, NULL, 'v'},
{"help", no_argument, NULL, 1},
{NULL, 0, NULL, 0}
};
fprintf(stderr, "Usage: %s [options] my_ecdsa_key_file his_ecdsa_key_file [host] port\n\n", program_name);
fprintf(stderr, "Valid options are:\n"
" -d, --datagram Enable datagram mode.\n"
- " -l, --packet-loss RATE Fake packet loss of RATE percent.\n"
- " -r, --replay-window N Set replay window to N bytes.\n"
+ " -q, --quit Quit when EOF occurs on stdin.\n"
+ " -r, --readonly Only send data from the socket to stdout.\n"
+ " -w, --writeonly Only send data from stdin to the socket.\n"
+ " -L, --packet-loss RATE Fake packet loss of RATE percent.\n"
+ " -R, --replay-window N Set replay window to N bytes.\n"
+ " -v, --verbose Display debug messages.\n"
"\n");
fprintf(stderr, "Report bugs to tinc@tinc-vpn.org.\n");
}
int packetloss = 0;
int r;
int option_index = 0;
+ ecdsa_t *mykey = NULL, *hiskey = NULL;
+ bool quit = false;
- while((r = getopt_long(argc, argv, "dl:r:", long_options, &option_index)) != EOF) {
+ while((r = getopt_long(argc, argv, "dqrwL:W:v", long_options, &option_index)) != EOF) {
switch (r) {
case 0: /* long option */
break;
datagram = true;
break;
- case 'l': /* packet loss rate */
+ case 'q': /* close connection on EOF from stdin */
+ quit = true;
+ break;
+
+ case 'r': /* read only */
+ readonly = true;
+ break;
+
+ case 'w': /* write only */
+ writeonly = true;
+ break;
+
+ case 'L': /* packet loss rate */
packetloss = atoi(optarg);
break;
- case 'r': /* replay window size */
+ case 'W': /* replay window size */
sptps_replaywin = atoi(optarg);
break;
+ case 'v': /* be verbose */
+ verbose = true;
+ break;
+
case '?': /* wrong options */
usage();
return 1;
return 1;
fclose(fp);
- fprintf(stderr, "Keys loaded\n");
+ if(verbose)
+ fprintf(stderr, "Keys loaded\n");
sptps_t s;
if(!sptps_start(&s, &sock, initiator, datagram, mykey, hiskey, "sptps_test", 10, send_data, receive_record))
return 1;
while(true) {
+ if(writeonly && readonly)
+ break;
+
char buf[65535] = "";
fd_set fds;
FD_ZERO(&fds);
#ifndef HAVE_MINGW
- FD_SET(0, &fds);
+ if(!readonly && s.instate)
+ FD_SET(0, &fds);
#endif
FD_SET(sock, &fds);
if(select(sock + 1, &fds, NULL, NULL, NULL) <= 0)
fprintf(stderr, "Could not read from stdin: %s\n", strerror(errno));
return 1;
}
- if(len == 0)
- break;
+ if(len == 0) {
+ if(quit)
+ break;
+ readonly = true;
+ continue;
+ }
if(buf[0] == '#')
s.outseqno = atoi(buf + 1);
if(buf[0] == '^')
fprintf(stderr, "Connection terminated by peer.\n");
break;
}
- char hex[len * 2 + 1];
- bin2hex(buf, hex, len);
- fprintf(stderr, "Received %d bytes of data:\n%s\n", (int)len, hex);
- if((rand() % 100) < packetloss) {
- fprintf(stderr, "Dropped.\n");
+ if(verbose) {
+ char hex[len * 2 + 1];
+ bin2hex(buf, hex, len);
+ fprintf(stderr, "Received %d bytes of data:\n%s\n", (int)len, hex);
+ }
+ if(packetloss && (rand() % 100) < packetloss) {
+ if(verbose)
+ fprintf(stderr, "Dropped.\n");
continue;
}
if(!sptps_receive_data(&s, buf, len) && !datagram)