/*
sptps_test.c -- Simple Peer-to-Peer Security test program
- Copyright (C) 2011-2014 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2011-2022 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
#include <linux/if_tun.h>
#endif
-#include <getopt.h>
-
-#ifdef HAVE_MINGW
-#include <pthread.h>
-#endif
-
#include "crypto.h"
#include "ecdsa.h"
+#include "meta.h"
+#include "protocol.h"
#include "sptps.h"
#include "utils.h"
+#include "names.h"
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
#define closesocket(s) close(s)
#endif
// Symbols necessary to link with logger.o
-bool send_request(void *c, const char *msg, ...) {
+bool send_request(struct connection_t *c, const char *msg, ...) {
(void)c;
(void)msg;
return false;
}
-struct list_t *connection_list = NULL;
+list_t connection_list;
-bool send_meta(void *c, const char *msg, int len) {
+bool send_meta(struct connection_t *c, const void *msg, size_t len) {
(void)c;
(void)msg;
(void)len;
return false;
}
-char *logfilename = NULL;
bool do_detach = false;
struct timeval now;
static bool writeonly;
static int in = 0;
static int out = 1;
-static int addressfamily = AF_UNSPEC;
+int addressfamily = AF_UNSPEC;
static bool send_data(void *handle, uint8_t type, const void *data, size_t len) {
(void)type;
- char hex[len * 2 + 1];
+ char *hex = alloca(len * 2 + 1);
bin2hex(data, hex, len);
if(verbose) {
- fprintf(stderr, "Sending %zu bytes of data:\n%s\n", len, hex);
+ fprintf(stderr, "Sending %lu bytes of data:\n%s\n", (unsigned long)len, hex);
}
const int *sock = handle;
+ const char *p = data;
+
+ while(len) {
+ ssize_t sent = send(*sock, p, len, 0);
- if((size_t)send(*sock, data, len, 0) != len) {
- return false;
+ if(sent <= 0) {
+ fprintf(stderr, "Error sending data: %s\n", strerror(errno));
+ return false;
+ }
+
+ p += sent;
+ len -= sent;
}
return true;
fprintf(stderr, "Received type %d record of %u bytes:\n", type, len);
}
- if(!writeonly) {
- write(out, data, len);
+ if(writeonly) {
+ return true;
+ }
+
+ const char *p = data;
+
+ while(len) {
+ ssize_t written = write(out, p, len);
+
+ if(written <= 0) {
+ fprintf(stderr, "Error writing received data: %s\n", strerror(errno));
+ return false;
+ }
+
+ p += written;
+ len -= written;
}
return true;
{NULL, 0, NULL, 0}
};
-const char *program_name;
-
-static void usage() {
- 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"
+static void usage(void) {
+ static const char *message =
+ "Usage: %s [options] my_ed25519_key_file his_ed25519_key_file [host] port\n"
+ "\n"
+ "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"
" -v, --verbose Display debug messages.\n"
" -4 Use IPv4.\n"
" -6 Use IPv6.\n"
- "\n");
- fprintf(stderr, "Report bugs to tinc@tinc-vpn.org.\n");
+ "\n"
+ "Report bugs to tinc@tinc-vpn.org.\n";
+
+ fprintf(stderr, message, program_name);
}
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
int stdin_sock_fd = -1;
// separate thread between the stdin and the sptps loop way below. This thread
// reads stdin and sends its content to the main thread through a TCP socket,
// which can be properly select()'ed.
-void *stdin_reader_thread(void *arg) {
+static DWORD WINAPI stdin_reader_thread(LPVOID arg) {
struct sockaddr_in sa;
socklen_t sa_size = sizeof(sa);
fprintf(stderr, "New connection received from :%d\n", ntohs(sa.sin_port));
}
- uint8_t buf[1024];
+ char buf[1024];
ssize_t nread;
while((nread = read(STDIN_FILENO, buf, sizeof(buf))) > 0) {
fprintf(stderr, "Read %lld bytes from input\n", nread);
}
- uint8_t *start = buf;
+ char *start = buf;
ssize_t nleft = nread;
while(nleft) {
closesocket(stdin_sock_fd);
stdin_sock_fd = -1;
+ return 0;
}
-int start_input_reader() {
+static int start_input_reader(void) {
if(stdin_sock_fd != -1) {
fprintf(stderr, "stdin thread can only be started once.\n");
return -1;
fprintf(stderr, "stdin thread is listening on :%d\n", ntohs(connect_sa.sin_port));
}
- pthread_t th;
- int err = pthread_create(&th, NULL, stdin_reader_thread, NULL);
-
- if(err) {
- fprintf(stderr, "Could not start reader thread: %s\n", strerror(err));
+ if(!CreateThread(NULL, 0, stdin_reader_thread, NULL, 0, NULL)) {
+ fprintf(stderr, "Could not start reader thread: %d\n", GetLastError());
goto server_err;
}
return -1;
}
-#endif // HAVE_MINGW
+#endif // HAVE_WINDOWS
int main(int argc, char *argv[]) {
program_name = argv[0];
#endif
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
static struct WSAData wsa_state;
if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
} else {
fprintf(stderr, "Listening...\n");
- uint8_t buf[65536];
+ char buf[65536];
struct sockaddr addr;
socklen_t addrlen = sizeof(addr);
return 1;
}
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
if(!readonly) {
in = start_input_reader();
}
if(FD_ISSET(in, &fds)) {
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
ssize_t len = recv(in, buf, readsize, 0);
#else
ssize_t len = read(in, buf, readsize);
}
if(len == 0) {
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
shutdown(in, SD_SEND);
closesocket(in);
#endif
}
if(verbose) {
- char hex[len * 2 + 1];
+ char *hex = alloca(len * 2 + 1);
bin2hex(buf, hex, len);
- fprintf(stderr, "Received %zd bytes of data:\n%s\n", len, hex);
+ fprintf(stderr, "Received %ld bytes of data:\n%s\n", (long)len, hex);
}
- if(packetloss && prng(100) < packetloss) {
+ if(packetloss && (int)prng(100) < packetloss) {
if(verbose) {
fprintf(stderr, "Dropped.\n");
}