#include "system.h"
+#ifdef HAVE_LINUX
+#include <linux/if_tun.h>
+#endif
+
#include <getopt.h>
#include "crypto.h"
char *logfilename = NULL;
struct timeval now;
+static bool verbose;
static bool readonly;
static bool writeonly;
+static int in = 0;
+static int out = 1;
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);
+ if(verbose)
+ fprintf(stderr, "Received type %d record of %hu bytes:\n", type, len);
if(!writeonly)
- fwrite(data, len, 1, stdout);
+ write(out, data, len);
return true;
}
{"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}
};
const char *program_name;
static void usage() {
- fprintf(stderr, "Usage: %s [options] my_ecdsa_key_file his_ecdsa_key_file [host] port\n\n", program_name);
+ fprintf(stderr, "Usage: %s [options] my_ed25519_key_file his_ed25519_key_file [host] port\n\n", program_name);
fprintf(stderr, "Valid options are:\n"
" -d, --datagram Enable datagram mode.\n"
" -q, --quit Quit when EOF occurs on stdin.\n"
" -r, --readonly Only send data from the socket to stdout.\n"
+#ifdef HAVE_LINUX
+ " -t, --tun Use a tun device instead of stdio.\n"
+#endif
" -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");
}
program_name = argv[0];
bool initiator = false;
bool datagram = false;
+#ifdef HAVE_LINUX
+ bool tun = false;
+#endif
int packetloss = 0;
int r;
int option_index = 0;
ecdsa_t *mykey = NULL, *hiskey = NULL;
bool quit = false;
- while((r = getopt_long(argc, argv, "dqrwL:W:", long_options, &option_index)) != EOF) {
+ while((r = getopt_long(argc, argv, "dqrtwL:W:v", long_options, &option_index)) != EOF) {
switch (r) {
case 0: /* long option */
break;
readonly = true;
break;
+ case 't': /* read only */
+#ifdef HAVE_LINUX
+ tun = true;
+#else
+ fprintf(stderr, "--tun is only supported on Linux.\n");
+ usage();
+ return 1;
+#endif
+ break;
+
case 'w': /* write only */
writeonly = true;
break;
sptps_replaywin = atoi(optarg);
break;
+ case 'v': /* be verbose */
+ verbose = true;
+ break;
+
case '?': /* wrong options */
usage();
return 1;
srand(time(NULL));
+#ifdef HAVE_LINUX
+ if(tun) {
+ in = out = open("/dev/net/tun", O_RDWR | O_NONBLOCK);
+ if(in < 0) {
+ fprintf(stderr, "Could not open tun device: %s\n", strerror(errno));
+ return 1;
+ }
+ struct ifreq ifr = {
+ .ifr_flags = IFF_TUN
+ };
+ if(ioctl(in, TUNSETIFF, &ifr)) {
+ fprintf(stderr, "Could not configure tun interface: %s\n", strerror(errno));
+ return 1;
+ }
+ ifr.ifr_name[IFNAMSIZ - 1] = 0;
+ fprintf(stderr, "Using tun interface %s\n", ifr.ifr_name);
+ }
+#endif
+
#ifdef HAVE_MINGW
static struct WSAData wsa_state;
if(WSAStartup(MAKEWORD(2, 2), &wsa_state))
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))
FD_ZERO(&fds);
#ifndef HAVE_MINGW
if(!readonly && s.instate)
- FD_SET(0, &fds);
+ FD_SET(in, &fds);
#endif
FD_SET(sock, &fds);
if(select(sock + 1, &fds, NULL, NULL, NULL) <= 0)
return 1;
- if(FD_ISSET(0, &fds)) {
- ssize_t len = read(0, buf, sizeof buf);
- fprintf(stderr, "%zd\n", len);
+ if(FD_ISSET(in, &fds)) {
+ ssize_t len = read(in, buf, sizeof buf);
if(len < 0) {
fprintf(stderr, "Could not read from stdin: %s\n", strerror(errno));
return 1;
if(len > 1)
sptps_send_record(&s, 0, buf, len);
} else
- if(!sptps_send_record(&s, buf[0] == '!' ? 1 : 0, buf, buf[0] == '\n' ? 0 : buf[0] == '*' ? sizeof buf : len))
+ if(!sptps_send_record(&s, buf[0] == '!' ? 1 : 0, buf, (len == 1 && buf[0] == '\n') ? 0 : buf[0] == '*' ? sizeof buf : len))
return 1;
}
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)
projects / tinc / blobdiff