Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISC Open Source Projects
Kea
Commits
ba30f1b4
Commit
ba30f1b4
authored
May 31, 2018
by
Francis Dupont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[5449] Extra fixes
parent
222bf8e9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
5 deletions
+8
-5
src/bin/dhcp4/dhcp4_srv.cc
src/bin/dhcp4/dhcp4_srv.cc
+2
-2
src/bin/dhcp6/dhcp6_srv.cc
src/bin/dhcp6/dhcp6_srv.cc
+2
-2
src/lib/dhcp/pkt6.cc
src/lib/dhcp/pkt6.cc
+4
-1
No files found.
src/bin/dhcp4/dhcp4_srv.cc
View file @
ba30f1b4
// Copyright (C) 2011-201
7
Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2011-201
8
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
...
...
src/bin/dhcp6/dhcp6_srv.cc
View file @
ba30f1b4
// Copyright (C) 2011-201
7
Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2011-201
8
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
...
...
src/lib/dhcp/pkt6.cc
View file @
ba30f1b4
// Copyright (C) 2011-201
7
Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2011-201
8
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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment