projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix potential buffer overflow reading the PID file.
[tinc]
/
src
/
sptps_test.c
diff --git
a/src/sptps_test.c
b/src/sptps_test.c
index
79a1a85
..
7aafbbe
100644
(file)
--- a/
src/sptps_test.c
+++ b/
src/sptps_test.c
@@
-1,6
+1,6
@@
/*
sptps_test.c -- Simple Peer-to-Peer Security test program
/*
sptps_test.c -- Simple Peer-to-Peer Security test program
- Copyright (C) 2011 Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2011
-2012
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
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
@@
-18,7
+18,6
@@
*/
#include "system.h"
*/
#include "system.h"
-#include "poll.h"
#include "crypto.h"
#include "ecdsa.h"
#include "crypto.h"
#include "ecdsa.h"
@@
-26,17
+25,17
@@
#include "utils.h"
// Symbols necessary to link with logger.o
#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
;
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);
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;
const int *sock = handle;
if(send(*sock, data, len, 0) != len)
return false;
@@
-67,6
+66,12
@@
int main(int argc, char *argv[]) {
if(argc > 4)
initiator = true;
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);
struct addrinfo *ai, hint;
memset(&hint, 0, sizeof hint);
@@
-74,7
+79,7
@@
int main(int argc, char *argv[]) {
hint.ai_socktype = SOCK_STREAM;
hint.ai_protocol = IPPROTO_TCP;
hint.ai_flags = initiator ? 0 : AI_PASSIVE;
hint.ai_socktype = SOCK_STREAM;
hint.ai_protocol = 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;
if(getaddrinfo(initiator ? argv[3] : NULL, initiator ? argv[4] : argv[3], &hint, &ai) || !ai) {
fprintf(stderr, "getaddrinfo() failed: %s\n", strerror(errno));
return 1;
@@
-136,15
+141,16
@@
int main(int argc, char *argv[]) {
while(true) {
char buf[65535] = "";
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;
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));
ssize_t len = read(0, buf, sizeof buf);
if(len < 0) {
fprintf(stderr, "Could not read from stdin: %s\n", strerror(errno));
@@
-163,7
+169,7
@@
int main(int argc, char *argv[]) {
return 1;
}
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));
ssize_t len = recv(sock, buf, sizeof buf, 0);
if(len < 0) {
fprintf(stderr, "Could not read from socket: %s\n", strerror(errno));
@@
-175,7
+181,7
@@
int main(int argc, char *argv[]) {
}
char hex[len * 2 + 1];
bin2hex(buf, hex, len);
}
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;
}
if(!sptps_receive_data(&s, buf, len))
return 1;
}