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

standardization pass: conditional statement spacing, removed NULL shorthand making checks more explicit

Browse Source
This commit is contained in:
Joseph Henry
2017-09-14 13:19:13 -07:00
parent 7c586471f4
commit cc468fe8fe
4 changed files with 210 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/client.cpp
View File

@@ -14,7 +14,7 @@ char *msg = (char*)"welcome to the machine";
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
if(argc != 5) { if (argc != 5) {
printf("\nlibzt example client\n"); printf("\nlibzt example client\n");
printf("client [config_file_path] [nwid] [remote_addr] [remote_port]\n"); printf("client [config_file_path] [nwid] [remote_addr] [remote_port]\n");
exit(0); exit(0);
@@ -43,11 +43,11 @@ int main(int argc, char **argv)
sleep(2); sleep(2);
// socket() // socket()
if((sockfd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) if ((sockfd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0)
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
// connect() // connect()
if((err = zts_connect(sockfd, (const struct sockaddr *)&in4, sizeof(in4))) < 0) if ((err = zts_connect(sockfd, (const struct sockaddr *)&in4, sizeof(in4))) < 0)
DEBUG_ERROR("error connecting to remote host (%d)", err); DEBUG_ERROR("error connecting to remote host (%d)", err);
// tx // tx

4
test/layer2.cpp
View File

@@ -37,7 +37,7 @@ unsigned short csum(unsigned short *buf, int nwords)
int main(int argc , char *argv[]) int main(int argc , char *argv[])
{ {
if(argc < 3) { if (argc < 3) {
fprintf(stderr, "usage: layer2 <zt_home_dir> <nwid>\n"); fprintf(stderr, "usage: layer2 <zt_home_dir> <nwid>\n");
return 1; return 1;
} }
@@ -51,7 +51,7 @@ int main(int argc , char *argv[])
// create socket // create socket
int fd; int fd;
if((fd = zts_socket(AF_INET, SOCK_RAW, IPPROTO_UDP)) < 0) { if ((fd = zts_socket(AF_INET, SOCK_RAW, IPPROTO_UDP)) < 0) {
printf("There was a problem creating the raw socket\n"); printf("There was a problem creating the raw socket\n");
exit(-1); exit(-1);
} }

409
test/selftest.cpp
View File

File diff suppressed because it is too large Load Diff

10
test/server.cpp
View File

@@ -12,7 +12,7 @@
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
if(argc != 4) { if (argc != 4) {
printf("\nlibzt example server\n"); printf("\nlibzt example server\n");
printf("server [config_file_path] [nwid] [bind_port]\n"); printf("server [config_file_path] [nwid] [bind_port]\n");
exit(0); exit(0);
@@ -40,19 +40,19 @@ int main(int argc, char **argv)
sleep(2); sleep(2);
// socket() // socket()
if((sockfd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0) if ((sockfd = zts_socket(AF_INET, SOCK_STREAM, 0)) < 0)
DEBUG_ERROR("error creating ZeroTier socket"); DEBUG_ERROR("error creating ZeroTier socket");
// bind() // bind()
if((err = zts_bind(sockfd, (struct sockaddr *)&in4, sizeof(struct sockaddr_in)) < 0)) if ((err = zts_bind(sockfd, (struct sockaddr *)&in4, sizeof(struct sockaddr_in)) < 0))
DEBUG_ERROR("error binding to interface (%d)", err); DEBUG_ERROR("error binding to interface (%d)", err);
// listen() // listen()
if((err = zts_listen(sockfd, 100)) < 0) if ((err = zts_listen(sockfd, 100)) < 0)
DEBUG_ERROR("error placing socket in LISTENING state (%d)", err); DEBUG_ERROR("error placing socket in LISTENING state (%d)", err);
// accept() // accept()
if((accfd = zts_accept(sockfd, (struct sockaddr *)&acc_in4, (socklen_t *)sizeof(struct sockaddr_in))) < 0) if ((accfd = zts_accept(sockfd, (struct sockaddr *)&acc_in4, (socklen_t *)sizeof(struct sockaddr_in))) < 0)
DEBUG_ERROR("error accepting connection (%d)", err); DEBUG_ERROR("error accepting connection (%d)", err);
// getpeername() // getpeername()