Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-29 01:16:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

updated pair_tou test - its not vary good at the moment, more work to do.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4478 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2011-07-19 22:53:13 +00:00
parent 6722fa24c5
commit c3c6fb87be
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libretroshare/src/tests/tcponudp/Makefile
View File

@ -15,20 +15,21 @@ include $(RS_TOP_DIR)/tests/scripts/config.mk
OBJ = udptestfn.o OBJ = udptestfn.o
EXECS = udpsock_test udpsort_test udp_server test_tou EXECS = udpsock_test udpsort_test udp_server test_tou pair_tou
#pair_tou reset_tou internal_tou largefile_tou #pair_tou reset_tou internal_tou largefile_tou
TESTOBJ = udpsock_test.o udpsort_test.o udp_server.o test_tou.o TESTOBJ = udpsock_test.o udpsort_test.o udp_server.o test_tou.o pair_tou.o udptestfn.o
#TESTOBJ += pair_tou.o reset_tou.o largefile_tou.o #TESTOBJ += pair_tou.o reset_tou.o largefile_tou.o
#internal_tou.o #internal_tou.o
TESTS = udpsock_test udpsort_test udp_server test_tou TESTS = udpsock_test udpsort_test udp_server test_tou
#TESTS += pair_tou
# Unfortunately the design of tou has changed over time. # Unfortunately the design of tou has changed over time.
# and these tests cannot be performed at the moment. # and these tests cannot be performed at the moment.
#TESTS += pair_tou reset_tou largefile_tou #TESTS += reset_tou largefile_tou
#internal_tou #internal_tou
all: tests all: tests $(EXECS)
udpsock_test : $(OBJ) udpsock_test.o udpsock_test : $(OBJ) udpsock_test.o
$(CC) $(CFLAGS) -o udpsock_test udpsock_test.o $(OBJ) $(LIBS) $(CC) $(CFLAGS) -o udpsock_test udpsock_test.o $(OBJ) $(LIBS)

31
libretroshare/src/tests/tcponudp/pair_tou.cc
View File

@ -36,6 +36,7 @@
#ifndef USE_TCP_SOCKET #ifndef USE_TCP_SOCKET
#include "tcponudp/tou.h" #include "tcponudp/tou.h"
#include "tcponudp/udppeer.h"
#endif #endif
#include "util/bdnet.h" #include "util/bdnet.h"
@ -121,16 +122,29 @@ int main(int argc, char **argv)
std::cerr << "Local Address: " << laddr << std::endl; std::cerr << "Local Address: " << laddr << std::endl;
std::cerr << "Remote Address: " << raddr << std::endl; std::cerr << "Remote Address: " << raddr << std::endl;
UdpStack udps(laddr); UdpStack *udpStack1 = new UdpStack(laddr);
tou_init((void *) &udps); UdpStack *udpStack2 = new UdpStack(raddr);
UdpSubReceiver *udpReceivers[2];
int udpTypes[2];
udpReceivers[0] = new UdpPeerReceiver(udpStack1);
udpTypes[0] = TOU_RECEIVER_TYPE_UDPPEER;
udpStack1->addReceiver(udpReceivers[0]);
udpReceivers[1] = new UdpPeerReceiver(udpStack2);
udpTypes[1] = TOU_RECEIVER_TYPE_UDPPEER;
udpStack2->addReceiver(udpReceivers[1]);
tou_init((void **) udpReceivers, udpTypes, 2);
#ifdef USE_TCP_SOCKET #ifdef USE_TCP_SOCKET
int sockfd = socket(PF_INET, SOCK_STREAM, 0); int sockfd = socket(PF_INET, SOCK_STREAM, 0);
int sockfd2 = socket(PF_INET, SOCK_STREAM, 0); int sockfd2 = socket(PF_INET, SOCK_STREAM, 0);
#else #else
int sockfd = tou_socket(PF_INET, SOCK_STREAM, 0); int sockfd = tou_socket(0, TOU_RECEIVER_TYPE_UDPPEER, 0);
int sockfd2 = tou_socket(PF_INET, SOCK_STREAM, 0); int sockfd2 = tou_socket(1, TOU_RECEIVER_TYPE_UDPPEER, 0);
#endif #endif
if ((sockfd <= 0) || (sockfd2 <= 0)) if ((sockfd <= 0) || (sockfd2 <= 0))
{ {
@ -166,16 +180,17 @@ int main(int argc, char **argv)
#ifdef USE_TCP_SOCKET #ifdef USE_TCP_SOCKET
err = bind(sockfd, (struct sockaddr *) &laddr, sizeof(laddr)); err = bind(sockfd, (struct sockaddr *) &laddr, sizeof(laddr));
err2 = bind(sockfd2, (struct sockaddr *) &raddr, sizeof(raddr)); err2 = bind(sockfd2, (struct sockaddr *) &raddr, sizeof(raddr));
#else
err = tou_bind(sockfd, (struct sockaddr *) &laddr, sizeof(laddr));
err2 = tou_bind(sockfd2, (struct sockaddr *) &raddr, sizeof(raddr));
#endif
if ((err < 0) || (err2 < 0)) if ((err < 0) || (err2 < 0))
{ {
std::cerr << "Error: Cannot bind socket: "; std::cerr << "Error: Cannot bind socket: ";
std::cerr << err << std::endl; std::cerr << err << std::endl;
return -1; return -1;
} }
#else
// No more Bind in tou.
//err = tou_bind(sockfd, (struct sockaddr *) &laddr, sizeof(laddr));
//err2 = tou_bind(sockfd2, (struct sockaddr *) &raddr, sizeof(raddr));
#endif
std::cerr << "Socket1 Bound to: " << laddr << std::endl; std::cerr << "Socket1 Bound to: " << laddr << std::endl;
std::cerr << "Socket2 Bound to: " << raddr << std::endl; std::cerr << "Socket2 Bound to: " << raddr << std::endl;