浏览代码

ipset: fix ipset issue when response-mode is fastest-response

Nick Peng 3 周之前
父节点
当前提交
885f677225
共有 2 个文件被更改,包括 4 次插入2 次删除
  1. 4 1
      src/dns_client/client_tls.c
  2. 0 1
      src/dns_server/dns_server.c

+ 4 - 1
src/dns_client/client_tls.c

@@ -62,8 +62,11 @@ static ssize_t _ssl_write_ext2(struct dns_server_info *server, SSL *ssl, const v
 
 #if defined(OSSL_QUIC1_VERSION) && !defined(OPENSSL_NO_QUIC)
 	ret = SSL_write_ex2(ssl, buff, num, flags, &written);
-#else
+#elif OPENSSL_VERSION_NUMBER >= 0x10101000L
 	ret = SSL_write_ex(ssl, buff, num, &written);
+#else
+	ret = SSL_write(ssl, buff, num);
+	written = ret;
 #endif
 	pthread_mutex_unlock(&server->lock);
 

+ 0 - 1
src/dns_server/dns_server.c

@@ -165,7 +165,6 @@ static int dns_server_resolve_callback(const char *domain, dns_result_type rtype
 				context.reply_ttl = _dns_server_get_reply_ttl(request, ttl);
 				context.cache_ttl = _dns_server_get_conf_ttl(request, ttl);
 				request->ip_ttl = context.cache_ttl;
-				context.no_check_add_ip = 1;
 				_dns_server_reply_passthrough(&context);
 				request->cname[0] = 0;
 				request->has_ip = 0;