From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 21 Jun 2007 12:04:00 +0000 (+0000)
Subject: Use new ldns_buffer_copy();
X-Git-Tag: release-0.4~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b3f0026fe62efa8067376eac589ae08bd36c06f;p=thirdparty%2Funbound.git

Use new ldns_buffer_copy();


git-svn-id: file:///svn/unbound/trunk@416 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/services/outside_network.c b/services/outside_network.c
index 375645021..2f144e9d2 100644
--- a/services/outside_network.c
+++ b/services/outside_network.c
@@ -1020,22 +1020,12 @@ serviced_callbacks(struct serviced_query* sq, int error, struct comm_point* c,
 		 * may send outgoing queries that overwrite the buffer.
 		 * use secondary buffer to store the query.
 		 * This is a data copy, but faster than packet to server */
-		log_assert(ldns_buffer_capacity(sq->outnet->udp_second) >=
-			ldns_buffer_limit(c->buffer));
-		ldns_buffer_clear(sq->outnet->udp_second);
-		ldns_buffer_write(sq->outnet->udp_second, 
-			ldns_buffer_begin(c->buffer),
-			ldns_buffer_limit(c->buffer));
-		ldns_buffer_flip(sq->outnet->udp_second);
+		ldns_buffer_copy(sq->outnet->udp_second, c->buffer);
 	}
 	while(p) {
 		n = p->next;
 		if(dobackup && c) {
-			ldns_buffer_clear(c->buffer);
-			ldns_buffer_write(c->buffer, 
-			ldns_buffer_begin(sq->outnet->udp_second),
-			ldns_buffer_limit(sq->outnet->udp_second));
-			ldns_buffer_flip(c->buffer);
+			ldns_buffer_copy(c->buffer, sq->outnet->udp_second);
 		}
 		(void)(*p->cb)(c, p->cb_arg, error, rep);
 		p = n;