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

Minor update to C examples

Browse Source
This commit is contained in:
Joseph Henry
2021-05-06 01:34:53 -07:00
parent 2c666894b6
commit 613c7e8f91
4 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/c/client.c
View File

@@ -86,13 +86,13 @@ int main(int argc, char** argv)
// Data I/O // Data I/O
printf("Sending message string to server...\n"); printf("Sending message string to server...\n");
if ((bytes = zts_bsd_write(fd, msgStr, strlen(msgStr))) < 0) { if ((bytes = zts_write(fd, msgStr, strlen(msgStr))) < 0) {
printf("Error (fd=%d, ret=%d, zts_errno=%d). Exiting.\n", fd, bytes, zts_errno); printf("Error (fd=%d, ret=%d, zts_errno=%d). Exiting.\n", fd, bytes, zts_errno);
exit(1); exit(1);
} }
printf("Sent %d bytes: %s\n", bytes, msgStr); printf("Sent %d bytes: %s\n", bytes, msgStr);
printf("Reading message string from server...\n"); printf("Reading message string from server...\n");
if ((bytes = zts_bsd_read(fd, recvBuf, sizeof(recvBuf))) < 0) { if ((bytes = zts_read(fd, recvBuf, sizeof(recvBuf))) < 0) {
printf("Error (fd=%d, ret=%d, zts_errno=%d). Exiting.\n", fd, bytes, zts_errno); printf("Error (fd=%d, ret=%d, zts_errno=%d). Exiting.\n", fd, bytes, zts_errno);
exit(1); exit(1);
} }
@@ -101,6 +101,6 @@ int main(int argc, char** argv)
// Close // Close
printf("Closing sockets\n"); printf("Closing sockets\n");
zts_bsd_close(fd); zts_close(fd);
return zts_node_stop(); return zts_node_stop();
} }

8
examples/c/nonblockingclient.c
View File

@@ -65,7 +65,7 @@ int main(int argc, char** argv)
// Create socket // Create socket
if ((fd = zts_bsd_socket(ZTS_AF_INET, ZTS_SOCK_STREAM, 0)) < 0) { if ((fd = zts_socket(ZTS_AF_INET, ZTS_SOCK_STREAM, 0)) < 0) {
printf("Error (fd=%d, zts_errno=%d). Exiting.\n", fd, zts_errno); printf("Error (fd=%d, zts_errno=%d). Exiting.\n", fd, zts_errno);
exit(1); exit(1);
} }
@@ -83,14 +83,14 @@ int main(int argc, char** argv)
// Wait random intervals to send a message to the server // Wait random intervals to send a message to the server
// The non-blocking aspect of this example is server-side // The non-blocking aspect of this example is server-side
while (1) { while (1) {
if ((bytes = zts_bsd_send(fd, msgStr, strlen(msgStr), 0)) < 0) { if ((bytes = zts_send(fd, msgStr, strlen(msgStr), 0)) < 0) {
printf("Error (fd=%d, ret=%d, zts_errno=%d). Exiting.\n", fd, bytes, zts_errno); printf("Error (fd=%d, ret=%d, zts_errno=%d). Exiting.\n", fd, bytes, zts_errno);
exit(1); exit(1);
} }
printf("zts_bsd_send()=%d\n", bytes); printf("zts_send()=%d\n", bytes);
zts_util_delay((rand() % 100) * 50); zts_util_delay((rand() % 100) * 50);
} }
zts_bsd_close(fd); zts_close(fd);
return zts_node_stop(); return zts_node_stop();
} }

12
examples/c/nonblockingserver.c
View File

@@ -69,7 +69,7 @@ int main(int argc, char** argv)
// Sockets // Sockets
printf("Creating socket...\n"); printf("Creating socket...\n");
if ((fd = zts_bsd_socket(ZTS_AF_INET, ZTS_SOCK_STREAM, 0)) < 0) { if ((fd = zts_socket(ZTS_AF_INET, ZTS_SOCK_STREAM, 0)) < 0) {
printf("Error (fd=%d, ret=%d, zts_errno=%d). Exiting.\n", fd, err, zts_errno); printf("Error (fd=%d, ret=%d, zts_errno=%d). Exiting.\n", fd, err, zts_errno);
exit(1); exit(1);
} }
@@ -82,7 +82,7 @@ int main(int argc, char** argv)
} }
printf("Listening...\n"); printf("Listening...\n");
int backlog = 100; int backlog = 100;
if ((err = zts_bsd_listen(fd, backlog)) < 0) { if ((err = zts_listen(fd, backlog)) < 0) {
printf("Error (fd=%d, ret=%d, zts_errno=%d). Exiting.\n", fd, err, zts_errno); printf("Error (fd=%d, ret=%d, zts_errno=%d). Exiting.\n", fd, err, zts_errno);
exit(1); exit(1);
} }
@@ -90,19 +90,17 @@ int main(int argc, char** argv)
int bytes = 0; int bytes = 0;
char recvBuf[128] = { 0 }; char recvBuf[128] = { 0 };
while (1) {
// Accept // Accept
// Can also use // Can also use
// zts_bsd_accept(int fd, struct zts_sockaddr* addr, zts_socklen_t* addrlen) // zts_bsd_accept(int fd, struct zts_sockaddr* addr, zts_socklen_t* addrlen)
char ipstr[ZTS_INET6_ADDRSTRLEN] = { 0 }; char remote_ipstr[ZTS_INET6_ADDRSTRLEN] = { 0 };
unsigned int port = 0; unsigned int port = 0;
printf("Accepting on listening socket...\n"); printf("Accepting on listening socket...\n");
if ((accfd = zts_accept(fd, ipstr, ZTS_INET6_ADDRSTRLEN, &port)) < 0) { if ((accfd = zts_accept(fd, remote_ipstr, ZTS_INET6_ADDRSTRLEN, &port)) < 0) {
printf("Error (fd=%d, ret=%d, zts_errno=%d). Exiting.\n", fd, err, zts_errno); printf("Error (fd=%d, ret=%d, zts_errno=%d). Exiting.\n", fd, err, zts_errno);
} }
printf("Accepted connection from %s:%d\n", ipstr, port); printf("Accepted connection from %s:%d\n", remote_ipstr, port);
}
// Data I/O // Data I/O

8
examples/c/server.c
View File

@@ -89,13 +89,13 @@ int main(int argc, char** argv)
char recvBuf[128] = { 0 }; char recvBuf[128] = { 0 };
printf("Reading message string from client...\n"); printf("Reading message string from client...\n");
if ((bytes = zts_bsd_read(accfd, recvBuf, sizeof(recvBuf))) < 0) { if ((bytes = zts_read(accfd, recvBuf, sizeof(recvBuf))) < 0) {
printf("Error (fd=%d, ret=%d, zts_errno=%d). Exiting.\n", fd, bytes, zts_errno); printf("Error (fd=%d, ret=%d, zts_errno=%d). Exiting.\n", fd, bytes, zts_errno);
exit(1); exit(1);
} }
printf("Read %d bytes: %s\n", bytes, recvBuf); printf("Read %d bytes: %s\n", bytes, recvBuf);
printf("Sending message string to client...\n"); printf("Sending message string to client...\n");
if ((bytes = zts_bsd_write(accfd, recvBuf, bytes)) < 0) { if ((bytes = zts_write(accfd, recvBuf, bytes)) < 0) {
printf("Error (fd=%d, ret=%d, zts_errno=%d). Exiting.\n", fd, bytes, zts_errno); printf("Error (fd=%d, ret=%d, zts_errno=%d). Exiting.\n", fd, bytes, zts_errno);
exit(1); exit(1);
} }
@@ -104,7 +104,7 @@ int main(int argc, char** argv)
// Close // Close
printf("Closing sockets\n"); printf("Closing sockets\n");
err = zts_bsd_close(accfd); err = zts_close(accfd);
err = zts_bsd_close(fd); err = zts_close(fd);
return zts_node_stop(); return zts_node_stop();
} }