Commit 4c38d521 authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[2637] Cast uint8_t to int when logging them.

When directly logging uint8_t values they are rather printed as char,
not the integer value within the range of 0..255. Converting them to
integer guarantees that they are printed as numbers.
parent a4aa18eb
......@@ -191,7 +191,7 @@ bool Dhcpv6Srv::run() {
LOG_DEBUG(dhcp6_logger, DBG_DHCP6_DETAIL_DATA,
DHCP6_RESPONSE_DATA)
.arg(rsp->getType()).arg(rsp->toText());
.arg(static_cast<int>(rsp->getType())).arg(rsp->toText());
if (rsp->pack()) {
try {
......
......@@ -219,7 +219,7 @@ void Pkt4::check() {
uint8_t msg_type = getType();
if (msg_type > DHCPLEASEACTIVE) {
isc_throw(BadValue, "Invalid DHCP message type received: "
<< msg_type);
<< static_cast<int>(msg_type));
}
}
......@@ -230,10 +230,10 @@ uint8_t Pkt4::getType() const {
}
// Check if Message Type is specified as OptionInt<uint8_t>
boost::shared_ptr<OptionInt<uint8_t> > typeOpt =
boost::shared_ptr<OptionInt<uint8_t> > type_opt =
boost::dynamic_pointer_cast<OptionInt<uint8_t> >(generic);
if (typeOpt) {
return (typeOpt->getValue());
if (type_opt) {
return (type_opt->getValue());
}
// Try to use it as generic option
......@@ -253,7 +253,6 @@ void Pkt4::setType(uint8_t dhcp_type) {
}
}
void Pkt4::repack() {
bufferOut_.writeData(&data_[0], data_.size());
}
......@@ -263,7 +262,7 @@ Pkt4::toText() {
stringstream tmp;
tmp << "localAddr=" << local_addr_.toText() << ":" << local_port_
<< " remoteAddr=" << remote_addr_.toText()
<< ":" << remote_port_ << ", msgtype=" << getType()
<< ":" << remote_port_ << ", msgtype=" << static_cast<int>(getType())
<< ", transid=0x" << hex << transid_ << dec << endl;
for (isc::dhcp::Option::OptionCollection::iterator opt=options_.begin();
......
......@@ -155,8 +155,8 @@ Pkt6::toText() {
tmp << "localAddr=[" << local_addr_.toText() << "]:" << local_port_
<< " remoteAddr=[" << remote_addr_.toText()
<< "]:" << remote_port_ << endl;
tmp << "msgtype=" << msg_type_ << ", transid=0x" << hex << transid_
<< dec << endl;
tmp << "msgtype=" << static_cast<int>(msg_type_) << ", transid=0x" <<
hex << transid_ << dec << endl;
for (isc::dhcp::Option::OptionCollection::iterator opt=options_.begin();
opt != options_.end();
++opt) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment