/*
sptps_test.c -- Simple Peer-to-Peer Security test program
- Copyright (C) 2011 Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2011-2013 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 "system.h"
-#include "poll.h"
#include "crypto.h"
#include "ecdsa.h"
#include "utils.h"
// Symbols necessary to link with logger.o
-char *logfilename;
-char *connection_tree;
-char *send_request;
-char *send_meta;
+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 timeval now;
-ecdsa_t mykey, hiskey;
+ecdsa_t *mykey, *hiskey;
-static bool send_data(void *handle, 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];
bin2hex(data, hex, len);
- fprintf(stderr, "Sending %zu bytes of data:\n%s\n", len, hex);
+ 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;
if(argc > 4)
initiator = true;
+#ifdef HAVE_MINGW
+ static struct WSAData wsa_state;
+ if(WSAStartup(MAKEWORD(2, 2), &wsa_state))
+ return 1;
+#endif
+
struct addrinfo *ai, hint;
memset(&hint, 0, sizeof hint);
hint.ai_family = AF_UNSPEC;
- hint.ai_socktype = SOCK_STREAM;
- hint.ai_protocol = IPPROTO_TCP;
+ hint.ai_socktype = datagram ? SOCK_DGRAM : SOCK_STREAM;
+ hint.ai_protocol = datagram ? IPPROTO_UDP : IPPROTO_TCP;
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", strerror(errno));
return 1;
}
- int sock = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
+ int sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
if(sock < 0) {
fprintf(stderr, "Could not create socket: %s\n", strerror(errno));
return 1;
fprintf(stderr, "Could not bind socket: %s\n", strerror(errno));
return 1;
}
- if(listen(sock, 1)) {
- fprintf(stderr, "Could not listen on socket: %s\n", strerror(errno));
- return 1;
- }
- fprintf(stderr, "Listening...\n");
- sock = accept(sock, NULL, NULL);
- if(sock < 0) {
- fprintf(stderr, "Could not accept connection: %s\n", strerror(errno));
- return 1;
+ if(!datagram) {
+ if(listen(sock, 1)) {
+ fprintf(stderr, "Could not listen on socket: %s\n", strerror(errno));
+ return 1;
+ }
+ fprintf(stderr, "Listening...\n");
+
+ sock = accept(sock, NULL, NULL);
+ if(sock < 0) {
+ fprintf(stderr, "Could not accept connection: %s\n", strerror(errno));
+ return 1;
+ }
+ } else {
+ fprintf(stderr, "Listening...\n");
+
+ char buf[65536];
+ struct sockaddr addr;
+ 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", strerror(errno));
+ return 1;
+ }
+
+ if(connect(sock, &addr, addrlen)) {
+ fprintf(stderr, "Could not accept connection: %s\n", strerror(errno));
+ return 1;
+ }
}
fprintf(stderr, "Connected\n");
crypto_init();
FILE *fp = fopen(argv[1], "r");
- if(!ecdsa_read_pem_private_key(&mykey, fp))
+ if(!(mykey = ecdsa_read_pem_private_key(fp)))
return 1;
fclose(fp);
fp = fopen(argv[2], "r");
- if(!ecdsa_read_pem_public_key(&hiskey, fp))
+ if(!(hiskey = ecdsa_read_pem_public_key(fp)))
return 1;
fclose(fp);
while(true) {
char buf[65535] = "";
- struct pollfd fds[2];
- fds[0].fd = 0;
- fds[0].events = POLLIN;
- fds[1].fd = sock;
- fds[1].events = POLLIN;
- if(poll(fds, 2, -1) < 0)
+ fd_set fds;
+ FD_ZERO(&fds);
+#ifndef HAVE_MINGW
+ FD_SET(0, &fds);
+#endif
+ FD_SET(sock, &fds);
+ if(select(sock + 1, &fds, NULL, NULL, NULL) <= 0)
return 1;
- if(fds[0].revents) {
+ if(FD_ISSET(0, &fds)) {
ssize_t len = read(0, buf, sizeof buf);
if(len < 0) {
fprintf(stderr, "Could not read from stdin: %s\n", strerror(errno));
return 1;
}
- if(fds[1].revents) {
+ 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", strerror(errno));
}
char hex[len * 2 + 1];
bin2hex(buf, hex, len);
- fprintf(stderr, "Received %zd bytes of data:\n%s\n", len, hex);
+ fprintf(stderr, "Received %d bytes of data:\n%s\n", (int)len, hex);
if(!sptps_receive_data(&s, buf, len))
return 1;
}