gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test and cosmetic changes

Browse Source
This commit is contained in:
Joseph Henry
2016-07-03 12:01:30 -05:00
parent 02473993c1
commit f661018050
16 changed files with 184 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/tcp_client.c
View File

@@ -31,12 +31,14 @@ int main(int argc , char *argv[])
}
puts("Connected\n");
char *msg = "welcome to the machine!";
while(1) {
printf("Enter message : ");
scanf("%s" , message);
// TX
if(send(sock , "welcome to the machine!" ,24 , 0) < 0) {
if(send(sock, msg, sizeof(msg), 0) < 0) {
puts("Send failed");
return 1;
}

18
tests/tcp_server.c
View File

@@ -9,18 +9,18 @@
int main(int argc , char *argv[])
{
if(argc < 2) {
printf("usage: tcp_server <port>\n");
return 1;
printf("usage: tcp_server <port>\n");
exit(0);
}
int port = atoi(argv[1]);
int socket_desc , client_sock , c , read_size;
int socket_desc, client_sock, c, read_size, port = atoi(argv[1]);
struct sockaddr_in server , client;
char client_message[2000];
socket_desc = socket(AF_INET , SOCK_STREAM , 0);
if (socket_desc == -1) {
printf("Could not create socket");
exit(0);
}
server.sin_family = AF_INET;
@@ -30,7 +30,7 @@ int main(int argc , char *argv[])
printf("binding on port %d\n", port);
if( bind(socket_desc,(struct sockaddr *)&server , sizeof(server)) < 0) {
perror("bind failed. Error");
return 1;
exit(0);
}
printf("listening\n");
listen(socket_desc , 3);
@@ -38,18 +38,16 @@ int main(int argc , char *argv[])
c = sizeof(struct sockaddr_in);
client_sock = accept(socket_desc, (struct sockaddr *)&client, (socklen_t*)&c);
if (client_sock < 0)
{
if (client_sock < 0) {
perror("accept failed");
return 1;
exit(0);
}
puts("connection accepted\n reading...\n");
// RX
int bytes_read = recv(client_sock , client_message , 2000 , 0);
printf("Read (%d) bytes\n", bytes_read);
for(int i=0; i<bytes_read; i++)
{
for(int i=0; i<bytes_read; i++) {
printf("%c", client_message[i]);
}
return 0;

23
tests/udp_client.c
View File

@@ -10,13 +10,12 @@
int main(int argc, char * argv[])
{
if(argc < 2) {
printf("usage: udp_client <port>\n");
if(argc < 3) {
printf("usage: udp_client <addr> <port>\n");
return 0;
}
int port = atoi(argv[1]);
int sock = -1, int port = atoi(argv[1]);
ssize_t n_sent;
int sock = -1;
struct sockaddr_in server;
char buf[64];
@@ -26,37 +25,35 @@ int main(int argc, char * argv[])
return 1;
}
}
server.sin_addr.s_addr = inet_addr("10.5.5.47");
// Construct address
server.sin_addr.s_addr = inet_addr(argv[1]);
server.sin_family = AF_INET;
server.sin_port = htons(port);
memcpy(buf, "Welcome to the Machine", sizeof("Welcome to the Machine"));
printf("sizeof(buf) = %d\n", sizeof(buf));
// Connect to server
if (connect(sock , (struct sockaddr *)&server , sizeof(server)) < 0) {
printf("api_test: error while connecting.\n");
return 1;
}
// TX
char data[1024];
memset(data, 0, sizeof(data));
char *msg = "Welcome to the Machine"
int count = 0;
while(1) {
count++;
usleep(1000000);
n_sent = send(sock,data,sizeof(data),0);
n_sent = send(sock,msg,sizeof(msg),0);
if (n_sent<0) {
perror("Problem sending data");
return 1;
}
if (n_sent!=sizeof(buf))
if (n_sent!=sizeof(msg))
printf("Sendto sent %d bytes\n",(int)n_sent);
printf("n_sent = %d, count = %d\n", n_sent,count);
}
// RX from server
/*
socklen_t recv_addr_len;
// Clear address info for RX test

55
tests/udp_server.c
View File

@@ -21,71 +21,52 @@ void echo( int sd ) {
while (1) {
usleep(50);
count++;
/* read a datagram from the socket (put result in bufin) */
// read a datagram from the socket (put result in bufin)
n=recvfrom(sd,bufin,MAXBUF,0,(struct sockaddr *)&remote,&len);
/* print out the address of the sender */
printf("Got a datagram from %s port %d\n", inet_ntoa(remote.sin_addr), ntohs(remote.sin_port));
// print out the address of the sender
printf("DGRAM from %s:%d\n", inet_ntoa(remote.sin_addr), ntohs(remote.sin_port));
if (n<0) {
perror("Error receiving data");
} else {
printf("GOT %d BYTES (count = %d)\n",n, count);
/* Got something, just send it back */
//sendto(sd,bufin,n,0,(struct sockaddr *)&remote,len);
// Got something, just send it back
// sendto(sd,bufin,n,0,(struct sockaddr *)&remote,len);
}
}
}
/* server main routine */
int main(int argc, char *argv[]) {
printf("DGRAM = %d\n", SOCK_DGRAM);
printf("STREAM = %d\n", SOCK_STREAM);
/*
if(argc < 2) {
printf("usage: udp_server <port>\n");
exit(0);
}
int port = atoi(argv[1]);
*/
int ld;
int ld, length, int port = atoi(argv[1]);
struct sockaddr_in skaddr;
struct sockaddr_in skaddr2;
struct sockaddr_in skaddr2;
int length;
// create socket
if ((ld = socket( PF_INET, SOCK_DGRAM, 0 )) < 0) {
printf("Problem creating socket\n");
// Create socket
if ((ld = socket( PF_INET, SOCK_DGRAM, 0)) < 0) {
printf("error creating socket\n");
exit(1);
}
// create address
// Create address
skaddr.sin_family = AF_INET;
//skaddr.sin_addr.s_addr = htonl(INADDR_ANY);
skaddr.sin_addr.s_addr = inet_addr("10.5.5.2");
skaddr.sin_port = htons(0);
// bind to address
skaddr.sin_addr.s_addr = htonl(INADDR_ANY);
skaddr.sin_port = htons(port);
// Bind to address
if (bind(ld, (struct sockaddr *) &skaddr, sizeof(skaddr))<0) {
printf("error binding\n");
exit(0);
}
/* find out what port we were assigned and print it out */
// find out what port we were assigned
length = sizeof( skaddr2 );
if (getsockname(ld, (struct sockaddr *) &skaddr2, &length)<0) {
printf("error getsockname\n");
exit(1);
}
// Display address:port to verify it was sent over RPC correctly
int port = ntohs(skaddr2.sin_port);
int ip = skaddr2.sin_addr.s_addr;
unsigned char d[4];
@@ -93,9 +74,9 @@ int main(int argc, char *argv[]) {
d[1] = (ip >> 8) & 0xFF;
d[2] = (ip >> 16) & 0xFF;
d[3] = (ip >> 24) & 0xFF;
printf(" handleBind(): %d.%d.%d.%d : %d -> Assigned: %d\n", d[0],d[1],d[2],d[3], port);
printf("Bound to address: %d.%d.%d.%d : %d\n", d[0],d[1],d[2],d[3], port);
/* echo every datagram */
// RX
echo(ld);
return(0);
}