projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More fixes for Windows.
[tinc]
/
src
/
sptps_test.c
diff --git
a/src/sptps_test.c
b/src/sptps_test.c
index
30cc33c
..
9db63ff
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
@@
-25,14
+25,15
@@
#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;
+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 %d bytes of data:\n%s\n", (int)len, hex);
char hex[len * 2 + 1];
bin2hex(data, hex, len);
fprintf(stderr, "Sending %d bytes of data:\n%s\n", (int)len, hex);
@@
-79,7
+80,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;