Commit ba30f1b4 authored by Francis Dupont's avatar Francis Dupont

[5449] Extra fixes

parent 222bf8e9
// Copyright (C) 2011-2017 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2011-2018 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
......@@ -765,7 +765,7 @@ Dhcpv4Srv::run_one() {
// we were interrupted. And we don't want to print a message every
// second.
} catch (const SignalInterruptOnSelect) {
} catch (const SignalInterruptOnSelect&) {
// Packet reception interrupted because a signal has been received.
// This is not an error because we might have received a SIGTERM,
// SIGINT, SIGHUP or SIGCHLD which are handled by the server. For
......
// Copyright (C) 2011-2017 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2011-2018 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
......@@ -432,7 +432,7 @@ void Dhcpv6Srv::run_one() {
// second.
} catch (const SignalInterruptOnSelect) {
} catch (const SignalInterruptOnSelect&) {
// Packet reception interrupted because a signal has been received.
// This is not an error because we might have received a SIGTERM,
// SIGINT or SIGHUP which are handled by the server. For signals
......
// Copyright (C) 2011-2017 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2011-2018 Internet Systems Consortium, Inc. ("ISC")
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
......@@ -538,6 +538,9 @@ Pkt6::getMACFromDUID() {
}
uint8_t hlen = opt_duid->getData().size();
if (!hlen) {
return (mac);
}
vector<uint8_t> hw_addr(hlen, 0);
std::vector<unsigned char> duid_data = opt_duid->getData();
......
Markdown is supported
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