Merge pull request #517 from dyunwei/master

wcawijngaards · web-flow · commit 5196ee03e62c · 2021-08-03T13:11:01.000+02:00
#420 breaks the mesh reply list function that need to reuse the dns answer.
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
@@ -2477,6 +2477,10 @@ static int http2_query_read_done(struct http2_session* h2_session,
 			"buffer already assigned to stream");
 		return -1;
 	}
+    
+    /* the c->buffer might be used by mesh_send_reply and no be cleard
+	 * need to be cleared before use */
+	sldns_buffer_clear(h2_session->c->buffer);
 	if(sldns_buffer_remaining(h2_session->c->buffer) <
 		sldns_buffer_remaining(h2_stream->qbuffer)) {
 		/* qbuffer will be free'd in frame close cb */
diff --git a/util/netevent.c b/util/netevent.c
@@ -4063,7 +4063,6 @@ comm_point_send_reply(struct comm_reply *repinfo)
 			}
 			repinfo->c->h2_stream = NULL;
 			repinfo->c->tcp_is_reading = 0;
-			sldns_buffer_clear(repinfo->c->buffer);
 			comm_point_stop_listening(repinfo->c);
 			comm_point_start_listening(repinfo->c, -1,
 				adjusted_tcp_timeout(repinfo->c));

Original file line number	Diff line number	Diff line change
`@@ -4063,7 +4063,6 @@ comm_point_send_reply(struct comm_reply *repinfo)`
`4063`	`4063`	`}`
`4064`	`4064`	`repinfo->c->h2_stream = NULL;`
`4065`	`4065`	`repinfo->c->tcp_is_reading = 0;`
`4066`		`- sldns_buffer_clear(repinfo->c->buffer);`
`4067`	`4066`	`comm_point_stop_listening(repinfo->c);`
`4068`	`4067`	`comm_point_start_listening(repinfo->c, -1,`
`4069`	`4068`	`adjusted_tcp_timeout(repinfo->c));`