cache bug fix

package/optware/S50smartdns

@@ -250,7 +250,7 @@ case "$1" in
 	nvram set apps_state_action=install
 	nvram set apps_u2ec_ex=2
 	;;
-	firewall-start|reload|force-reload)
+	firewall-start|reload|force-reload|reconfigure)
 	$0 restart
 	;;
 	*)

src/dns_cache.c

@@ -31,7 +31,7 @@ struct dns_cache *_dns_cache_last(void)
 
 struct dns_cache *_dns_cache_first(void)
 {
-	return list_first_entry(&dns_cache_head.cache_list, struct dns_cache, list);
+	return list_first_entry_or_null(&dns_cache_head.cache_list, struct dns_cache, list);
 }
 
 void _dns_cache_delete(struct dns_cache *dns_cache)
@@ -59,6 +59,13 @@ void dns_cache_release(struct dns_cache *dns_cache)
 	_dns_cache_delete(dns_cache);
 }
 
+void _dns_cache_remove(struct dns_cache *dns_cache)
+{
+	hash_del(&dns_cache->node);
+	list_del_init(&dns_cache->list);
+	dns_cache_release(dns_cache);
+}
+
 int dns_cache_replace(char *domain, char *cname, int cname_ttl, int ttl, dns_type_t qtype, unsigned char *addr, int addr_len)
 {
 	struct dns_cache *dns_cache = NULL;
@@ -120,6 +127,7 @@ int dns_cache_insert(char *domain, char *cname, int cname_ttl, int ttl, dns_type
 
 	dns_cache = dns_cache_lookup(domain, qtype);
 	if (dns_cache) {
+		dns_cache_delete(dns_cache);
 		dns_cache_release(dns_cache);
 		dns_cache = NULL;
 	}
@@ -170,7 +178,9 @@ int dns_cache_insert(char *domain, char *cname, int cname_ttl, int ttl, dns_type
 	if (dns_cache_head.num > dns_cache_head.size) {
 		struct dns_cache *del_cache;
 		del_cache = _dns_cache_first();
-		dns_cache_release(del_cache);
+		if (del_cache) {
+			_dns_cache_remove(del_cache);
+		}
 	}
 	pthread_mutex_unlock(&dns_cache_head.lock);
 
@@ -215,10 +225,10 @@ struct dns_cache *dns_cache_lookup(char *domain, dns_type_t qtype)
 
 	if (dns_cache_ret) {
 		if (now - dns_cache_ret->insert_time > dns_cache_ret->ttl) {
-			_dns_cache_delete(dns_cache_ret);
+			_dns_cache_remove(dns_cache_ret);
 			dns_cache_ret = NULL;
 		} else {
-			atomic_inc(&dns_cache_ret->ref);
+			dns_cache_get(dns_cache_ret);
 		}
 	}
 
@@ -244,10 +254,8 @@ int dns_cache_get_ttl(struct dns_cache *dns_cache)
 void dns_cache_delete(struct dns_cache *dns_cache)
 {
 	pthread_mutex_lock(&dns_cache_head.lock);
-	hash_del(&dns_cache->node);
-	list_del_init(&dns_cache->list);
+	_dns_cache_remove(dns_cache);
 	pthread_mutex_unlock(&dns_cache_head.lock);
-	dns_cache_release(dns_cache);
 }
 
 void dns_cache_update(struct dns_cache *dns_cache)
@@ -293,16 +301,14 @@ void dns_cache_invalidate(dns_cache_preinvalid_callback callback, int ttl_pre)
 			break;
 		}
 
-		hash_del(&dns_cache->node);
-		list_del_init(&dns_cache->list);
-		dns_cache_release(dns_cache);
+		_dns_cache_remove(dns_cache);
 	}
 	pthread_mutex_unlock(&dns_cache_head.lock);
 
 	list_for_each_entry_safe(dns_cache, tmp, &checklist, check_list)
 	{
 		callback(dns_cache);
-		list_del_init(&dns_cache->check_list);
+		dns_cache_delete(dns_cache);
 		dns_cache_release(dns_cache);
 	}
 }

src/dns_client.c

@@ -49,7 +49,7 @@
 #define DNS_MAX_HOSTNAME 256
 #define DNS_MAX_EVENTS 64
 #define DNS_HOSTNAME_LEN 128
-#define DNS_TCP_BUFFER (16 * 1024)
+#define DNS_TCP_BUFFER (32 * 1024)
 
 #ifndef TCP_FASTOPEN_CONNECT
 #define TCP_FASTOPEN_CONNECT 30
@@ -1475,7 +1475,7 @@ static int _dns_client_send_data_to_buffer(struct dns_server_info *server_info,
 static int _dns_client_send_tcp(struct dns_server_info *server_info, void *packet, unsigned short len)
 {
 	int send_len = 0;
-	unsigned char inpacket_data[DNS_IN_PACKSIZE * 2];
+	unsigned char inpacket_data[DNS_IN_PACKSIZE];
 	unsigned char *inpacket = inpacket_data;
 
 	if (len > sizeof(inpacket_data) -2 ) {
@@ -1518,7 +1518,7 @@ static int _dns_client_send_tcp(struct dns_server_info *server_info, void *packe
 static int _dns_client_send_tls(struct dns_server_info *server_info, void *packet, unsigned short len)
 {
 	int send_len = 0;
-	unsigned char inpacket_data[DNS_IN_PACKSIZE * 2];
+	unsigned char inpacket_data[DNS_IN_PACKSIZE];
 	unsigned char *inpacket = inpacket_data;
 
 	if (len > sizeof(inpacket_data) -2 ) {
@@ -1546,7 +1546,7 @@ static int _dns_client_send_tls(struct dns_server_info *server_info, void *packe
 		if (errno == EAGAIN || server_info->ssl == NULL) {
 			/* save data to buffer, and retry when EPOLLOUT is available */
 			return _dns_client_send_data_to_buffer(server_info, inpacket, len);
-		} else if (server_info->ssl) {
+		} else if (server_info->ssl && errno != ENOMEM) {
 			SSL_shutdown(server_info->ssl);
 		}
 		return -1;

src/dns_server.c

@@ -1066,11 +1066,11 @@ static int _dns_server_process_answer(struct dns_request *request, char *domain,
 				request->has_soa = 1;
 				request->rcode = packet->head.rcode;
 				dns_get_SOA(rrs, name, 128, &ttl, &request->soa);
-				tlog(TLOG_INFO, "domain: %s, qtype: %d, SOA: mname: %s, rname: %s, serial: %d, refresh: %d, retry: %d, expire: %d, minimum: %d", domain, request->qtype,
+				tlog(TLOG_DEBUG, "domain: %s, qtype: %d, SOA: mname: %s, rname: %s, serial: %d, refresh: %d, retry: %d, expire: %d, minimum: %d", domain, request->qtype,
 				request->soa.mname, request->soa.rname, request->soa.serial, request->soa.refresh, request->soa.retry, request->soa.expire, request->soa.minimum);
 			} break;
 			default:
-				tlog(TLOG_INFO, "%s, qtype: %d", name, rrs->type);
+				tlog(TLOG_DEBUG, "%s, qtype: %d", name, rrs->type);
 				break;
 			}
 		}
@@ -1394,6 +1394,9 @@ static int _dns_server_process_cache(struct dns_request *request, struct dns_pac
 
 	return 0;
 errout:
+	if (dns_cache) {
+		dns_cache_release(dns_cache);
+	}
 	return -1;
 }