Skip to content

Commit da63687

Browse files
committed
audit-log: logging group name.
1 parent 7124ca1 commit da63687

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/dns_server.c

+7-6
Original file line numberDiff line numberDiff line change
@@ -946,9 +946,10 @@ static void _dns_server_audit_log(struct dns_server_post_context *context)
946946
tm.min, tm.sec, tm.usec / 1000);
947947
}
948948

949-
tlog_printf(dns_audit, "%s%s query %s, type %d, time %lums, speed: %.1fms, result %s\n", req_time, req_host,
950-
request->domain, request->qtype, get_tick_count() - request->send_tick,
951-
((float)request->ping_time) / 10, req_result);
949+
tlog_printf(dns_audit, "%s%s query %s, type %d, time %lums, speed: %.1fms, group %s, result %s\n", req_time,
950+
req_host, request->domain, request->qtype, get_tick_count() - request->send_tick,
951+
((float)request->ping_time) / 10,
952+
request->dns_group_name[0] != '\0' ? request->dns_group_name : DNS_SERVER_GROUP_DEFAULT, req_result);
952953
}
953954

954955
static void _dns_rrs_result_log(struct dns_server_post_context *context, struct dns_ip_address *addr_map)
@@ -2389,7 +2390,7 @@ static int _dns_request_post(struct dns_server_post_context *context)
23892390

23902391
tlog(TLOG_INFO, "result: %s, client: %s, qtype: %d, id: %d, group: %s, time: %lums", request->domain,
23912392
get_host_by_addr(clientip, sizeof(clientip), (struct sockaddr *)&request->addr), request->qtype, request->id,
2392-
request->dns_group_name[0] != '\0' ? request->dns_group_name : "default",
2393+
request->dns_group_name[0] != '\0' ? request->dns_group_name : DNS_SERVER_GROUP_DEFAULT,
23932394
get_tick_count() - request->send_tick);
23942395

23952396
ret = _dns_reply_inpacket(request, context->inpacket, context->inpacket_len);
@@ -4481,7 +4482,7 @@ static int _dns_server_reply_passthrough(struct dns_server_post_context *context
44814482

44824483
tlog(TLOG_INFO, "result: %s, client: %s, qtype: %d, id: %d, group: %s, time: %lums", request->domain,
44834484
get_host_by_addr(clientip, sizeof(clientip), (struct sockaddr *)&request->addr), request->qtype,
4484-
request->id, request->dns_group_name[0] != '\0' ? request->dns_group_name : "default",
4485+
request->id, request->dns_group_name[0] != '\0' ? request->dns_group_name : DNS_SERVER_GROUP_DEFAULT,
44854486
get_tick_count() - request->send_tick);
44864487
}
44874488

@@ -8974,7 +8975,7 @@ static int _dns_server_socket(void)
89748975
for (i = 0; i < dns_conf_bind_ip_num; i++) {
89758976
struct dns_bind_ip *bind_ip = &dns_conf_bind_ip[i];
89768977
tlog(TLOG_INFO, "bind ip %s, type %d", bind_ip->ip, bind_ip->type);
8977-
8978+
89788979
switch (bind_ip->type) {
89798980
case DNS_BIND_TYPE_UDP:
89808981
if (_dns_server_socket_udp(bind_ip) != 0) {

0 commit comments

Comments
 (0)