hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove the unnecessary log of ussl_loop

Browse Source
This commit is contained in:
496148326@qq.com
2023-08-24 14:10:23 +00:00
committed by ob-robot
parent 3c49ecf0e6
commit 44e77d6cf7
5 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
deps/ussl-hook/loop/handle-event.c vendored
View File

@ -314,7 +314,7 @@ static int remove_from_epoll_and_dispatch(acceptfd_sk_t *s, uint64_t gid)
return err; return err;
} }
void get_src_addr(int fd, char *buf, int len) void ussl_get_peer_addr(int fd, char *buf, int len)
{ {
struct sockaddr_storage addr; struct sockaddr_storage addr;
socklen_t sock_len = sizeof(addr); socklen_t sock_len = sizeof(addr);
@ -361,7 +361,7 @@ static int acceptfd_handle_first_readable_event(acceptfd_sk_t *s)
ssize_t rbytes = recv(s->fd, buf, sizeof(buf), MSG_PEEK); ssize_t rbytes = recv(s->fd, buf, sizeof(buf), MSG_PEEK);
negotiation_head_t *h = (typeof(h))buf; negotiation_head_t *h = (typeof(h))buf;
char src_addr[IP_STRING_MAX_LEN] = {0}; char src_addr[IP_STRING_MAX_LEN] = {0};
get_src_addr(s->fd, src_addr, IP_STRING_MAX_LEN); ussl_get_peer_addr(s->fd, src_addr, IP_STRING_MAX_LEN);
if (0 == rbytes) { if (0 == rbytes) {
handle_acceptfd_error(s, &err); handle_acceptfd_error(s, &err);
} else if (rbytes < 0) { } else if (rbytes < 0) {
@ -465,7 +465,7 @@ static int acceptfd_handle_ssl_event(acceptfd_sk_t *s)
{ {
int ret = 0; int ret = 0;
char src_addr[IP_STRING_MAX_LEN] = {0}; char src_addr[IP_STRING_MAX_LEN] = {0};
get_src_addr(s->fd, src_addr, IP_STRING_MAX_LEN); ussl_get_peer_addr(s->fd, src_addr, IP_STRING_MAX_LEN);
ret = ssl_do_handshake(s->fd); ret = ssl_do_handshake(s->fd);
if (0 == ret) { if (0 == ret) {
ussl_log_info("ssl_do_handshake succ, fd:%d, client_gid:%lu, src_addr:%s", s->fd, s->fd_info.client_gid, src_addr); ussl_log_info("ssl_do_handshake succ, fd:%d, client_gid:%lu, src_addr:%s", s->fd, s->fd_info.client_gid, src_addr);

2
deps/ussl-hook/loop/handle-event.h vendored
View File

@ -19,6 +19,6 @@
extern int clientfd_sk_handle_event(clientfd_sk_t *s); extern int clientfd_sk_handle_event(clientfd_sk_t *s);
extern int acceptfd_sk_handle_event(acceptfd_sk_t *s); extern int acceptfd_sk_handle_event(acceptfd_sk_t *s);
extern void get_src_addr(int fd, char *buf, int len); extern void ussl_get_peer_addr(int fd, char *buf, int len);
#endif // USSL_HOOK_LOOP_HANDLE_EVENT_ #endif // USSL_HOOK_LOOP_HANDLE_EVENT_

2
deps/ussl-hook/loop/ussl_listenfd.c vendored
View File

@ -35,7 +35,7 @@ void ussl_on_accept(int fd, ussl_sf_t *sf, ussl_eloop_t *ep)
add_succ = 1; add_succ = 1;
add_to_timeout_list(&accept_sk->timeout_link); add_to_timeout_list(&accept_sk->timeout_link);
char src_addr[IP_STRING_MAX_LEN] = {0}; char src_addr[IP_STRING_MAX_LEN] = {0};
get_src_addr(fd, src_addr, IP_STRING_MAX_LEN); ussl_get_peer_addr(fd, src_addr, IP_STRING_MAX_LEN);
ussl_log_info("accept new connection, fd:%d, src_addr:%s", fd, src_addr); ussl_log_info("accept new connection, fd:%d, src_addr:%s", fd, src_addr);
} }
} }

2
deps/ussl-hook/ssl/ssl_config.c vendored
View File

@ -429,7 +429,7 @@ static SSL_CTX *ob_ssl_create_ssl_ctx(const ssl_config_item_t *ssl_config, int t
if (CLIENT == type) { if (CLIENT == type) {
verify_flag = SSL_VERIFY_NONE; verify_flag = SSL_VERIFY_NONE;
} else { } else {
verify_flag = SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE; verify_flag = SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT;
} }
if (ssl_config->is_sm) { if (ssl_config->is_sm) {

16
deps/ussl-hook/ussl-loop.c vendored
View File

@ -166,26 +166,22 @@ void check_and_handle_timeout_event()
if (CLIENT_SOCK == type) { if (CLIENT_SOCK == type) {
clientfd_sk_t *client_sk = ussl_structof(p, clientfd_sk_t, timeout_link); clientfd_sk_t *client_sk = ussl_structof(p, clientfd_sk_t, timeout_link);
if (cur_time - client_sk->start_time > TIMEOUT_THRESHOLD_SEC) { if (cur_time - client_sk->start_time > TIMEOUT_THRESHOLD_SEC) {
ussl_log_warn("clientfd timeout, fd:%d", client_sk->fd); char dst_addr[IP_STRING_MAX_LEN] = {0};
ussl_get_peer_addr(client_sk->fd, dst_addr, IP_STRING_MAX_LEN);
ussl_log_warn("clientfd timeout, fd:%d, dst_addr:%s", client_sk->fd, dst_addr);
ussl_dlink_delete(&client_sk->ready_link); ussl_dlink_delete(&client_sk->ready_link);
ussl_dlink_delete(p); ussl_dlink_delete(p);
handle_client_timeout_event(client_sk); handle_client_timeout_event(client_sk);
} else {
char src_addr[IP_STRING_MAX_LEN] = {0};
get_src_addr(client_sk->fd, src_addr, IP_STRING_MAX_LEN);
ussl_log_info("fd is in processing, fd:%d, type:clientfd, peer_addr:%s", client_sk->fd, src_addr);
} }
} else { } else {
acceptfd_sk_t *accept_sk = ussl_structof(p, acceptfd_sk_t, timeout_link); acceptfd_sk_t *accept_sk = ussl_structof(p, acceptfd_sk_t, timeout_link);
if (cur_time - accept_sk->start_time > TIMEOUT_THRESHOLD_SEC) { if (cur_time - accept_sk->start_time > TIMEOUT_THRESHOLD_SEC) {
ussl_log_warn("acceptfd timeout, fd:%d", accept_sk->fd); char src_addr[IP_STRING_MAX_LEN] = {0};
ussl_get_peer_addr(accept_sk->fd, src_addr, IP_STRING_MAX_LEN);
ussl_log_warn("acceptfd timeout, fd:%d, src_addr:%s", accept_sk->fd, src_addr);
ussl_dlink_delete(&accept_sk->ready_link); ussl_dlink_delete(&accept_sk->ready_link);
ussl_dlink_delete(p); ussl_dlink_delete(p);
handle_server_timeout_event(accept_sk); handle_server_timeout_event(accept_sk);
} else {
char src_addr[IP_STRING_MAX_LEN] = {0};
get_src_addr(accept_sk->fd, src_addr, IP_STRING_MAX_LEN);
ussl_log_info("fd is in processing, fd:%d, type:acceptfd, peer_addr:%s", accept_sk->fd, src_addr);
} }
} }
} }