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

picotcp udp updates

Browse Source
This commit is contained in:
Joseph Henry
2016-12-05 10:28:02 -08:00
parent 152938d7e7
commit e640cd016b
16 changed files with 263 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/api_test/tcpclient4.c
View File

@@ -41,7 +41,6 @@ int main(int argc , char *argv[])
while(1)
{
sleep(1);
// TX
if(send(sock, msg, strlen(msg), 0) < 0) {
printf("send failed");

22
tests/api_test/udpclient4.c
View File

@@ -23,7 +23,7 @@ void error(char *msg) {
}
int main(int argc, char **argv) {
int sockfd, portno, n;
int sock, portno, n;
int serverlen;
struct sockaddr_in serveraddr;
struct hostent *server;
@@ -39,8 +39,8 @@ int main(int argc, char **argv) {
portno = atoi(argv[2]);
/* socket: create the socket */
sockfd = socket(AF_INET, SOCK_DGRAM, 0);
if (sockfd < 0)
sock = socket(AF_INET, SOCK_DGRAM, 0);
if (sock < 0)
error("ERROR opening socket");
/* gethostbyname: get the server's DNS entry */
@@ -59,31 +59,27 @@ int main(int argc, char **argv) {
/* get a message from the user */
char *msg = "A message to the server!\0";
fcntl(sockfd, F_SETFL, O_NONBLOCK);
fcntl(sock, F_SETFL, O_NONBLOCK);
long count = 0;
while(1)
{
count++;
printf("\nTX(%lu)...\n", count);
usleep(10000);
printf("\n\n\nTX(%lu)...\n", count);
sleep(1);
//usleep(10000);
//bzero(buf, BUFSIZE);
//printf("\nPlease enter msg: ");
//fgets(buf, BUFSIZE, stdin);
/* send the message to the server */
serverlen = sizeof(serveraddr);
printf("A\n");
n = sendto(sockfd, msg, strlen(msg), 0, (struct sockaddr *)&serveraddr, serverlen);
printf("B\n");
n = sendto(sock, msg, strlen(msg), 0, (struct sockaddr *)&serveraddr, serverlen);
//if (n < 0)
// error("ERROR in sendto");
/* print the server's reply */
printf("C\n");
memset(buf, 0, sizeof(buf));
printf("D\n");
n = recvfrom(sockfd, buf, BUFSIZE, 0, (struct sockaddr *)&serveraddr, (socklen_t *)&serverlen);
printf("E\n");
n = recvfrom(sock, buf, BUFSIZE, 0, (struct sockaddr *)&serveraddr, (socklen_t *)&serverlen);
//if (n < 0)
// printf("ERROR in recvfrom: %d", n);
printf("Echo from server: %s", buf);

53
tests/api_test/udpclient6.c
View File

@@ -12,63 +12,32 @@
int main(int argc, char* argv[])
{
int sock;
int status;
struct addrinfo sainfo, *psinfo;
struct sockaddr_in6 sin6;
socklen_t sin6len;
struct hostent *server;
char buffer[MAXBUF];
sin6len = sizeof(struct sockaddr_in6);
int sock, portno, n;
struct sockaddr_in6 serv_addr;
if(argc < 2)
printf("Specify a port number\n"), exit(1);
sock = socket(PF_INET6, SOCK_DGRAM,0);
memset(&sin6, 0, sizeof(struct sockaddr_in6));
sin6.sin6_port = htons(0);
sin6.sin6_family = AF_INET6;
sin6.sin6_addr = in6addr_any;
portno = atoi(argv[2]);
server = gethostbyname2(argv[1],AF_INET6);
memset((char *) &serv_addr, 0, sizeof(serv_addr));
serv_addr.sin6_flowinfo = 0;
serv_addr.sin6_family = AF_INET6;
memmove((char *) &serv_addr.sin6_addr.s6_addr, (char *) server->h_addr, server->h_length);
serv_addr.sin6_port = htons(portno);
status = bind(sock, (struct sockaddr *)&sin6, sin6len);
if(-1 == status)
perror("bind"), exit(1);
memset(&sainfo, 0, sizeof(struct addrinfo));
memset(&sin6, 0, sin6len);
sainfo.ai_flags = 0;
sainfo.ai_family = PF_INET6;
sainfo.ai_socktype = SOCK_DGRAM;
sainfo.ai_protocol = IPPROTO_UDP;
status = getaddrinfo("ip6-localhost", argv[1], &sainfo, &psinfo);
switch (status)
{
case EAI_FAMILY: printf("family\n");
break;
case EAI_SOCKTYPE: printf("stype\n");
break;
case EAI_BADFLAGS: printf("flag\n");
break;
case EAI_NONAME: printf("noname\n");
break;
case EAI_SERVICE: printf("service\n");
break;
}
sprintf(buffer,"Ciao");
status = sendto(sock, buffer, strlen(buffer), 0,
(struct sockaddr *)psinfo->ai_addr, sin6len);
status = sendto(sock, buffer, strlen(buffer), 0, (const struct sockaddr *)&serv_addr, sizeof(serv_addr));
printf("buffer : %s \t%d\n", buffer, status);
// free memory
freeaddrinfo(psinfo);
psinfo = NULL;
shutdown(sock, 2);
close(sock);
return 0;
}

29
tests/api_test/udpserver4.c
View File

@@ -11,7 +11,7 @@
#define MAXBUF 1024*1024
void echo( int sd ) {
void echo(int sock) {
char bufin[MAXBUF];
struct sockaddr_in remote;
int n;
@@ -19,10 +19,11 @@ void echo( int sd ) {
long count = 0;
while (1) {
usleep(50);
sleep(1);
//usleep(50);
count++;
// read a datagram from the socket (put result in bufin)
n=recvfrom(sd,bufin,MAXBUF,0,(struct sockaddr *)&remote,&len);
n=recvfrom(sock,bufin,MAXBUF,0,(struct sockaddr *)&remote,&len);
// print out the address of the sender
printf("DGRAM from %s:%d\n", inet_ntoa(remote.sin_addr), ntohs(remote.sin_port));
@@ -31,7 +32,8 @@ void echo( int sd ) {
} else {
printf("GOT %d BYTES (count = %ld)\n", n, count);
// Got something, just send it back
// sendto(sd,bufin,n,0,(struct sockaddr *)&remote,len);
// sendto(sock,bufin,n,0,(struct sockaddr *)&remote,len);
printf("RX = %s\n", bufin);
}
}
}
@@ -42,13 +44,13 @@ int main(int argc, char *argv[]) {
printf("usage: udp_server <port>\n");
return 0;
}
int ld, port = atoi(argv[1]);
int sock, port = atoi(argv[1]);
socklen_t len;
struct sockaddr_in skaddr;
struct sockaddr_in skaddr2;
// Create socket
if ((ld = socket( PF_INET, SOCK_DGRAM, 0)) < 0) {
if ((sock = socket( PF_INET, SOCK_DGRAM, 0)) < 0) {
printf("error creating socket\n");
return 0;
}
@@ -57,17 +59,18 @@ int main(int argc, char *argv[]) {
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) {
if (bind(sock, (struct sockaddr *) &skaddr, sizeof(skaddr))<0) {
printf("error binding\n");
return 0;
}
// find out what port we were assigned
len = sizeof( skaddr2 );
if (getsockname(ld, (struct sockaddr *) &skaddr2, &len)<0) {
printf("error getsockname\n");
return 0;
}
//if (getsockname(sock, (struct sockaddr *) &skaddr2, &len)<0) {
// printf("error getsockname\n");
// return 0;
//}
// Display address:port to verify it was sent over RPC correctly
/*
port = ntohs(skaddr2.sin_port);
int ip = skaddr2.sin_addr.s_addr;
unsigned char d[4];
@@ -76,8 +79,8 @@ int main(int argc, char *argv[]) {
d[2] = (ip >> 16) & 0xFF;
d[3] = (ip >> 24) & 0xFF;
printf("bound to address: %d.%d.%d.%d : %d\n", d[0],d[1],d[2],d[3], port);
*/
// RX
echo(ld);
echo(sock);
return(0);
}

27
tests/api_test/udpserver6.c
View File

@@ -9,37 +9,34 @@
#define MAXBUF 65536
int main()
int main(int argc, char *argv[])
{
int sock;
int status;
int n;
struct sockaddr_in6 sin6;
socklen_t sin6len;
char buffer[MAXBUF];
sock = socket(PF_INET6, SOCK_DGRAM,0);
sin6len = sizeof(struct sockaddr_in6);
memset(&sin6, 0, sin6len);
/* just use the first address returned in the structure */
sin6.sin6_port = htons(0);
sin6.sin6_port = htons(atoi(argv[1]));
sin6.sin6_family = AF_INET6;
sin6.sin6_addr = in6addr_any;
status = bind(sock, (struct sockaddr *)&sin6, sin6len);
if(-1 == status)
n = bind(sock, (struct sockaddr *)&sin6, sin6len);
if(-1 == n)
perror("bind"), exit(1);
status = getsockname(sock, (struct sockaddr *)&sin6, &sin6len);
//n = getsockname(sock, (struct sockaddr *)&sin6, &sin6len);
//printf("%d\n", ntohs(sin6.sin6_port));
printf("%d\n", ntohs(sin6.sin6_port));
status = recvfrom(sock, buffer, MAXBUF, 0,
(struct sockaddr *)&sin6, &sin6len);
printf("buffer : %s\n", buffer);
while (1) {
sleep(1);
n = recvfrom(sock, buffer, MAXBUF, 0, (struct sockaddr *)&sin6, &sin6len);
printf("n = %d, buffer : %s\n", n, buffer);
}
shutdown(sock, 2);
close(sock);