Parcourir la source

bugfix: fix some bugs

Nick Peng il y a 1 an
Parent
commit
79c5e0aa76
4 fichiers modifiés avec 4 ajouts et 4 suppressions
  1. 1 1
      src/dns_client.c
  2. 1 1
      src/dns_server.c
  3. 2 1
      src/lib/conf.c
  4. 0 1
      src/tlog.c

+ 1 - 1
src/dns_client.c

@@ -615,7 +615,7 @@ static struct dns_server_group *_dns_client_get_dnsserver_group(const char *grou
 		goto use_default;
 		goto use_default;
 	} else {
 	} else {
 		if (list_empty(&group->head)) {
 		if (list_empty(&group->head)) {
-			tlog(TLOG_INFO, "group %s not exist, use default group.", group_name);
+			tlog(TLOG_DEBUG, "group %s not exist, use default group.", group_name);
 			goto use_default;
 			goto use_default;
 		}
 		}
 	}
 	}

+ 1 - 1
src/dns_server.c

@@ -3209,7 +3209,7 @@ static struct dns_client_rules *_dns_server_get_client_rules_by_mac(uint8_t *net
 
 
 	item = _dns_server_neighbor_cache_get_item(netaddr, netaddr_len);
 	item = _dns_server_neighbor_cache_get_item(netaddr, netaddr_len);
 	if (_dns_server_neighbor_cache_is_valid(item) == 0) {
 	if (_dns_server_neighbor_cache_is_valid(item) == 0) {
-		if (item->has_mac) {
+		if (item->has_mac == 0) {
 			return NULL;
 			return NULL;
 		}
 		}
 		group_mac = dns_server_rule_group_mac_get(item->mac);
 		group_mac = dns_server_rule_group_mac_get(item->mac);

+ 2 - 1
src/lib/conf.c

@@ -417,7 +417,8 @@ static int load_conf_file(const char *file, struct config_item *items, conf_erro
 
 
 		line_len = 0;
 		line_len = 0;
 		is_last_line_wrap = 0;
 		is_last_line_wrap = 0;
-
+		key[0] = '\0';
+		value[0] = '\0';
 		filed_num = sscanf(line, "%63s %8191[^\r\n]s", key, value);
 		filed_num = sscanf(line, "%63s %8191[^\r\n]s", key, value);
 		if (filed_num <= 0) {
 		if (filed_num <= 0) {
 			continue;
 			continue;

+ 0 - 1
src/tlog.c

@@ -459,7 +459,6 @@ static int _tlog_root_log_buffer(char *buff, int maxlen, void *userptr, const ch
         if (len + 1 < maxlen - 1) {
         if (len + 1 < maxlen - 1) {
             *(buff + len) = '\0';
             *(buff + len) = '\0';
             len++;
             len++;
-            log_len++;
         }
         }
         log_head->len = log_len;
         log_head->len = log_len;
     }
     }