|
@@ -36,7 +36,7 @@
|
|
|
|
|
|
#include <dns/edns.h>
|
|
#include <dns/edns.h>
|
|
#include <dns/exceptions.h>
|
|
#include <dns/exceptions.h>
|
|
-#include <dns/messagerendererhandle.h>
|
|
+#include <dns/messagerenderer.h>
|
|
#include <dns/name.h>
|
|
#include <dns/name.h>
|
|
#include <dns/question.h>
|
|
#include <dns/question.h>
|
|
#include <dns/opcode.h>
|
|
#include <dns/opcode.h>
|
|
@@ -99,7 +99,7 @@ public:
|
|
|
|
|
|
IOService io_service_;
|
|
IOService io_service_;
|
|
|
|
|
|
- MessageRendererHandle renderer_handle_;
|
|
+ MessageRenderer renderer_;
|
|
/// Currently non-configurable, but will be.
|
|
/// Currently non-configurable, but will be.
|
|
static const uint16_t DEFAULT_LOCAL_UDPSIZE = 4096;
|
|
static const uint16_t DEFAULT_LOCAL_UDPSIZE = 4096;
|
|
|
|
|
|
@@ -557,18 +557,18 @@ AuthSrvImpl::processNormalQuery(const IOMessage& io_message, MessagePtr message,
|
|
return (true);
|
|
return (true);
|
|
}
|
|
}
|
|
|
|
|
|
- renderer_handle_.setBuffer(buffer.get());
|
|
+ renderer_.clear();
|
|
|
|
+ renderer_.setBuffer(buffer.get());
|
|
const bool udp_buffer =
|
|
const bool udp_buffer =
|
|
(io_message.getSocket().getProtocol() == IPPROTO_UDP);
|
|
(io_message.getSocket().getProtocol() == IPPROTO_UDP);
|
|
- renderer_handle_.setLengthLimit(udp_buffer ? remote_bufsize : 65535);
|
|
+ renderer_.setLengthLimit(udp_buffer ? remote_bufsize : 65535);
|
|
if (tsig_context.get() != NULL) {
|
|
if (tsig_context.get() != NULL) {
|
|
- message->toWire(renderer_handle_.getRenderer(), *tsig_context);
|
|
+ message->toWire(renderer_, *tsig_context);
|
|
} else {
|
|
} else {
|
|
- message->toWire(renderer_handle_.getRenderer());
|
|
+ message->toWire(renderer_);
|
|
}
|
|
}
|
|
- renderer_handle_.setBuffer(NULL);
|
|
|
|
LOG_DEBUG(auth_logger, DBG_AUTH_MESSAGES, AUTH_SEND_NORMAL_RESPONSE)
|
|
LOG_DEBUG(auth_logger, DBG_AUTH_MESSAGES, AUTH_SEND_NORMAL_RESPONSE)
|
|
- .arg(renderer_handle_.getLength()).arg(message->toText());
|
|
+ .arg(renderer_.getLength()).arg(message->toText());
|
|
|
|
|
|
return (true);
|
|
return (true);
|
|
}
|
|
}
|
|
@@ -687,13 +687,13 @@ AuthSrvImpl::processNotify(const IOMessage& io_message, MessagePtr message,
|
|
message->setHeaderFlag(Message::HEADERFLAG_AA);
|
|
message->setHeaderFlag(Message::HEADERFLAG_AA);
|
|
message->setRcode(Rcode::NOERROR());
|
|
message->setRcode(Rcode::NOERROR());
|
|
|
|
|
|
- renderer_handle_.setBuffer(buffer.get());
|
|
+ renderer_.clear();
|
|
|
|
+ renderer_.setBuffer(buffer.get());
|
|
if (tsig_context.get() != NULL) {
|
|
if (tsig_context.get() != NULL) {
|
|
- message->toWire(renderer_handle_.getRenderer(), *tsig_context);
|
|
+ message->toWire(renderer_, *tsig_context);
|
|
} else {
|
|
} else {
|
|
- message->toWire(renderer_handle_.getRenderer());
|
|
+ message->toWire(renderer_);
|
|
}
|
|
}
|
|
- renderer_handle_.setBuffer(NULL);
|
|
|
|
return (true);
|
|
return (true);
|
|
}
|
|
}
|
|
|
|
|