abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-05-06 16:36:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/guanzhi/GmSSL

Browse Source
This commit is contained in:
Zhi Guan
2024-06-18 09:26:04 +08:00
parent d65e963b2a 19a4b6894f
commit b1b6c1797e
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tools/tlcp_client.c
View File

@@ -245,6 +245,8 @@ bad:
goto end; goto end;
} }
} }
read_stdin = 0;
} }
for (;;) { for (;;) {
@@ -252,22 +254,33 @@ bad:
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(conn.sock, &fds); FD_SET(conn.sock, &fds);
if (read_stdin)
if (read_stdin) {
#ifdef WIN32 #ifdef WIN32
FD_SET(_fileno, &fds); // in WIN32, first arg type is SOCKET, maybe typedef of uint if (fgets(buf, sizeof(buf), stdin)) {
if (tls_send(&conn, (uint8_t *)buf, strlen(buf), &len) != 1) {
fprintf(stderr, "%s: send error\n", prog);
goto end;
}
} else {
if (!feof(stdin)) {
fprintf(stderr, "%s: length of input line exceeds buffer size\n", prog);
goto end;
}
read_stdin = 0;
}
#else #else
FD_SET(STDIN_FILENO, &fds); // in POSIX, first arg type is int FD_SET(STDIN_FILENO, &fds); // in POSIX, first arg type is int
#endif #endif
}
if (select(conn.sock + 1, &fds, NULL, NULL, NULL) < 0) { if (select(conn.sock + 1, &fds, NULL, NULL, NULL) < 0) {
fprintf(stderr, "%s: select error\n", prog); fprintf(stderr, "%s: select error\n", prog);
goto end; goto end;
} }
#ifdef WIN32 #ifdef WIN32
if (read_stdin && FD_ISSET(_fileno, &fds)) {
#else #else
if (read_stdin && FD_ISSET(STDIN_FILENO, &fds)) { if (read_stdin && FD_ISSET(STDIN_FILENO, &fds)) {
#endif
if (fgets(buf, sizeof(buf), stdin)) { if (fgets(buf, sizeof(buf), stdin)) {
if (tls_send(&conn, (uint8_t *)buf, strlen(buf), &len) != 1) { if (tls_send(&conn, (uint8_t *)buf, strlen(buf), &len) != 1) {
@@ -282,6 +295,7 @@ bad:
read_stdin = 0; read_stdin = 0;
} }
} }
#endif
if (FD_ISSET(conn.sock, &fds)) { if (FD_ISSET(conn.sock, &fds)) {
int rv; int rv;