From 580b9a62e635dca05d1703dcaab2f14b8cb0cf3b Mon Sep 17 00:00:00 2001 From: l30022887 Date: Wed, 9 Oct 2024 11:19:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=99=BE=E5=BA=A6?= =?UTF-8?q?=E9=9C=80=E6=B1=828=E5=8F=B0=E8=99=9A=E6=8B=9F=E6=9C=BA?= =?UTF-8?q?=E5=B9=B6=E5=8F=91=E7=83=AD=E8=BF=81=E7=A7=BB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qtfs/config/rexec/whitelist | 2 +- qtfs/ipc/uds_main.c | 7 ++++++- qtfs/rexec/rexec_sock.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/qtfs/config/rexec/whitelist b/qtfs/config/rexec/whitelist index b7f34b5..6a959d6 100644 --- a/qtfs/config/rexec/whitelist +++ b/qtfs/config/rexec/whitelist @@ -1 +1 @@ -/usr/bin/qemu-kvm +/usr/bin/qemu-kvm diff --git a/qtfs/ipc/uds_main.c b/qtfs/ipc/uds_main.c index 65468b8..abc2622 100644 --- a/qtfs/ipc/uds_main.c +++ b/qtfs/ipc/uds_main.c @@ -255,6 +255,8 @@ int uds_set_nonblock(int fd) int uds_build_tcp_connection(struct uds_conn_arg *arg) { int family = AF_VSOCK; + int retry = 3; + int ret = 0; if (arg->cs > UDS_SOCKET_SERVER) { uds_err("cs type %d is error.", arg->cs); return -1; @@ -305,7 +307,10 @@ int uds_build_tcp_connection(struct uds_conn_arg *arg) sock_addr.svm_port = p_uds_var->vsock.peerport; sock_addr.svm_cid = p_uds_var->vsock.peercid; #endif - if (connect(arg->sockfd, (struct sockaddr *)&sock_addr, sizeof(sock_addr)) < 0) { + do { + ret = connect(arg->sockfd, (struct sockaddr *)&sock_addr, sizeof(sock_addr)); + } while ((ret != 0) && (retry--)); + if (ret < 0) { goto close_and_return; } arg->connfd = sock_fd; diff --git a/qtfs/rexec/rexec_sock.c b/qtfs/rexec/rexec_sock.c index e8750c5..f7495e5 100644 --- a/qtfs/rexec/rexec_sock.c +++ b/qtfs/rexec/rexec_sock.c @@ -37,7 +37,7 @@ int rexec_build_unix_connection(struct rexec_conn_arg *arg) { - const int sock_max_conn = 5; + const int sock_max_conn = 32; if (arg->cs > REXEC_SOCK_SERVER) { rexec_err("cs type %d is error.", arg->cs); return -1; -- Gitee From 0eda1545524d367104ed69460f85db4a13a334e5 Mon Sep 17 00:00:00 2001 From: l30022887 Date: Wed, 9 Oct 2024 11:55:00 +0800 Subject: [PATCH 2/2] fix table --- qtfs/ipc/uds_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qtfs/ipc/uds_main.c b/qtfs/ipc/uds_main.c index abc2622..4bc01a9 100644 --- a/qtfs/ipc/uds_main.c +++ b/qtfs/ipc/uds_main.c @@ -255,8 +255,8 @@ int uds_set_nonblock(int fd) int uds_build_tcp_connection(struct uds_conn_arg *arg) { int family = AF_VSOCK; - int retry = 3; - int ret = 0; + int retry = 3; + int ret = 0; if (arg->cs > UDS_SOCKET_SERVER) { uds_err("cs type %d is error.", arg->cs); return -1; @@ -307,9 +307,9 @@ int uds_build_tcp_connection(struct uds_conn_arg *arg) sock_addr.svm_port = p_uds_var->vsock.peerport; sock_addr.svm_cid = p_uds_var->vsock.peercid; #endif - do { - ret = connect(arg->sockfd, (struct sockaddr *)&sock_addr, sizeof(sock_addr)); - } while ((ret != 0) && (retry--)); + do { + ret = connect(arg->sockfd, (struct sockaddr *)&sock_addr, sizeof(sock_addr)); + } while ((ret != 0) && (retry--)); if (ret < 0) { goto close_and_return; } -- Gitee