daxi20/smartdns
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix

Browse Source
This commit is contained in:
Nick Peng
2018-11-01 22:47:33 +08:00
parent ab417a3306
commit 9ef1a7a2ef
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dns_client.c
View File

@@ -1078,7 +1078,7 @@ static int _dns_client_socket_recv(SSL *ssl, void *buf, int num)
ret = -1; ret = -1;
break; break;
case SSL_ERROR_SYSCALL: case SSL_ERROR_SYSCALL:
tlog(TLOG_DEBUG, "SSL syscall failed, %s, ", strerror(errno)); tlog(TLOG_ERROR, "SSL syscall failed, %s, ", strerror(errno));
ret = -1; ret = -1;
return ret; return ret;
default: default:
@@ -1451,6 +1451,10 @@ static int _dns_client_send_tls(struct dns_server_info *server_info, void *packe
memcpy(inpacket + 2, packet, len); memcpy(inpacket + 2, packet, len);
len += 2; len += 2;
if (server_info->status != DNS_SERVER_STATUS_CONNECTED) {
return _dns_client_send_data_to_buffer(server_info, inpacket, len);
}
send_len = _dns_client_socket_send(server_info->ssl, inpacket, len); send_len = _dns_client_socket_send(server_info->ssl, inpacket, len);
if (send_len < 0) { if (send_len < 0) {
if (errno == EAGAIN || server_info->ssl == NULL) { if (errno == EAGAIN || server_info->ssl == NULL) {

2
src/smartdns.c
View File

@@ -327,7 +327,7 @@ int main(int argc, char *argv[])
} }
signal(SIGABRT, sig_handle); signal(SIGABRT, sig_handle);
signal(SIGPIPE, sig_handle); signal(SIGPIPE, SIG_IGN);
signal(SIGBUS, sig_handle); signal(SIGBUS, sig_handle);
signal(SIGSEGV, sig_handle); signal(SIGSEGV, sig_handle);
signal(SIGILL, sig_handle); signal(SIGILL, sig_handle);