dig: priting of times in kdig with dnstap

src/utils/common/exec.c

@@ -129,16 +129,19 @@ static void print_footer(const size_t total_len,
                          const size_t rr_count,
                          const net_t  *net,
                          const float  elapsed,
+			 time_t       exec_time,
                          const bool   incoming)
 {
 	struct tm tm;
 	char      date[64];
 
 	// Get current timestamp.
-	time_t now = time(NULL);
-	localtime_r(&now, &tm);
+	if (exec_time == 0) {
+		exec_time = time(NULL);
+	}
 
 	// Create formated date-time string.
+	localtime_r(&exec_time, &tm);
 	strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S %Z", &tm);
 
 	// Print messages statistics.
@@ -464,6 +467,7 @@ void print_footer_xfr(const size_t  total_len,
                       const size_t  rr_count,
                       const net_t   *net,
                       const float   elapsed,
+		      const time_t  exec_time,
                       const style_t *style)
 {
 	if (style == NULL) {
@@ -472,7 +476,7 @@ void print_footer_xfr(const size_t  total_len,
 	}
 
 	if (style->show_footer) {
-		print_footer(total_len, msg_count, rr_count, net, elapsed, true);
+		print_footer(total_len, msg_count, rr_count, net, elapsed, exec_time, true);
 	}
 }
 
@@ -480,6 +484,7 @@ void print_packet(const knot_pkt_t *packet,
                   const net_t      *net,
                   const size_t     size,
                   const float      elapsed,
+		  const time_t     exec_time,
                   const bool       incoming,
                   const style_t    *style)
 {
@@ -593,7 +598,7 @@ void print_packet(const knot_pkt_t *packet,
 	// Print packet statistics.
 	if (style->show_footer) {
 		printf("\n");
-		print_footer(size, 0, 0, net, elapsed, incoming);
+		print_footer(size, 0, 0, net, elapsed, exec_time, incoming);
 	}
 }
 

src/utils/common/exec.h

@@ -75,6 +75,7 @@ void print_data_xfr(const knot_pkt_t *packet, const style_t *style);
  * \param rr_count	Total number of answer records.
  * \param net		Connection information.
  * \param elapsed	Total elapsed time.
+ * \param exec_time     Time of the packet creation.
  * \param style		Style of the otput.
  */
 void print_footer_xfr(const size_t  total_len,
@@ -82,6 +83,7 @@ void print_footer_xfr(const size_t  total_len,
                       const size_t  rr_count,
                       const net_t   *net,
                       const float   elapsed,
+                      const time_t  exec_time,
                       const style_t *style);
 
 /*!
@@ -91,6 +93,7 @@ void print_footer_xfr(const size_t  total_len,
  * \param net		Connection information.
  * \param size		Original packet wire size.
  * \param elapsed	Total elapsed time.
+ * \param exec_time     Time of the packet creation.
  * \param incoming	Indicates if the packet is input.
  * \param style		Style of the otput.
  */
@@ -98,6 +101,7 @@ void print_packet(const knot_pkt_t *packet,
                   const net_t      *net,
                   const size_t     size,
                   const float      elapsed,
+		  const time_t     exec_time,
                   const bool       incoming,
                   const style_t    *style);
 

src/utils/dig/dig_exec.c

@@ -334,7 +334,7 @@ static int process_query_packet(const knot_pkt_t        *query,
 		if (q != NULL) {
 			if (knot_pkt_parse(q, 0) == KNOT_EOK) {
 				print_packet(q, net, query->size,
-					     time_diff(&t_start, &t_query),
+					     time_diff(&t_start, &t_query), 0,
 					     false, style);
 			} else {
 				ERR("can't print query packet\n");
@@ -428,7 +428,7 @@ static int process_query_packet(const knot_pkt_t        *query,
 	}
 
 	// Print reply packet.
-	print_packet(reply, net, in_len, time_diff(&t_query, &t_end),
+	print_packet(reply, net, in_len, time_diff(&t_query, &t_end), 0,
 	             true, style);
 
 	knot_pkt_free(&reply);
@@ -579,7 +579,7 @@ static int process_packet_xfr(const knot_pkt_t        *query,
 	// Print query packet if required.
 	if (style->show_query) {
 		print_packet(query, net, query->size,
-		             time_diff(&t_start, &t_query),
+		             time_diff(&t_start, &t_query), 0,
 		             false, style);
 		printf("\n");
 	}
@@ -685,7 +685,7 @@ static int process_packet_xfr(const knot_pkt_t        *query,
 
 	// Print trailing transfer information.
 	print_footer_xfr(total_len, msg_count, rr_count, net,
-	                 time_diff(&t_query, &t_end), style);
+	                 time_diff(&t_query, &t_end), 0, style);
 
 	net_close(net);
 
@@ -754,7 +754,17 @@ static void process_query_xfr(const query_t *query)
 	knot_pkt_free(&out_packet);
 }
 
+#if USE_DNSTAP
+static float get_query_time(const Dnstap__Dnstap *frame)
+{
+	struct timeval from = {.tv_sec = frame->message->query_time_sec,
+		.tv_usec = frame->message->query_time_nsec / 1000};
 
+	struct timeval to = {.tv_sec = frame->message->response_time_sec,
+		.tv_usec = frame->message->response_time_nsec / 1000};
+	return time_diff(&from, &to);
+}
+#endif
 
 static void process_dnstap_file(const query_t *query)
 {
@@ -831,7 +841,16 @@ static void process_dnstap_file(const query_t *query)
 				net_ctx.remote_str = addrstr;
 			}
 
-			print_packet(pkt, &net_ctx, pkt->size, 0,
+			const float query_time = is_response ? get_query_time(frame) : 0.0;
+
+			time_t time = 0;
+			if (is_response) {
+				time = frame->message->response_time_sec;
+			} else {
+				time = frame->message->query_time_sec;
+			}
+
+			print_packet(pkt, &net_ctx, pkt->size, query_time, time,
 				     is_response, &query->style);
 		} else {
 			ERR("can't print query packet\n");

src/utils/nsupdate/nsupdate_exec.c

@@ -800,7 +800,7 @@ int cmd_show(const char* lp, nsupdate_params_t *params)
 	if (!params->query) return KNOT_EOK;
 	printf("Update query:\n");
 	build_query(params);
-	print_packet(params->query, NULL, 0, -1, false, &params->style);
+	print_packet(params->query, NULL, 0, -1, 0, false, &params->style);
 	printf("\n");
 	return KNOT_EOK;
 }
@@ -812,7 +812,7 @@ int cmd_answer(const char* lp, nsupdate_params_t *params)
 	/* Show current answer. */
 	if (!params->answer) return KNOT_EOK;
 	printf("\nAnswer:\n");
-	print_packet(params->answer, NULL, 0, -1, true, &params->style);
+	print_packet(params->answer, NULL, 0, -1, 0, true, &params->style);
 	return KNOT_EOK;
 }