Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Adam Osuchowski
Kea
Commits
53dec20f
Commit
53dec20f
authored
Jan 30, 2013
by
Tomek Mrugalski
🛰
Browse files
[2673] clangs-specific flags removed, fix in Dhcpv{4,6}srv::writeServerID
parent
937c982c
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/bin/dhcp4/Makefile.am
View file @
53dec20f
...
...
@@ -51,12 +51,6 @@ b10_dhcp4_SOURCES += dhcp4_srv.cc dhcp4_srv.h
nodist_b10_dhcp4_SOURCES
=
dhcp4_messages.h dhcp4_messages.cc
EXTRA_DIST
+=
dhcp4_messages.mes
if
USE_CLANGPP
# Disable unused parameter warning caused by some of the
# Boost headers when compiling with clang.
b10_dhcp4_CXXFLAGS
=
-Wno-unused-parameter
endif
b10_dhcp4_LDADD
=
$(top_builddir)
/src/lib/dhcp/libb10-dhcp++.la
b10_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/util/libb10-util.la
b10_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/dhcpsrv/libb10-dhcpsrv.la
...
...
src/bin/dhcp4/dhcp4_srv.cc
View file @
53dec20f
...
...
@@ -98,7 +98,8 @@ Dhcpv4Srv::~Dhcpv4Srv() {
IfaceMgr
::
instance
().
closeSockets
();
}
void
Dhcpv4Srv
::
shutdown
()
{
void
Dhcpv4Srv
::
shutdown
()
{
LOG_DEBUG
(
dhcp4_logger
,
DBG_DHCP4_BASIC
,
DHCP4_SHUTDOWN_REQUEST
);
shutdown_
=
true
;
}
...
...
@@ -199,7 +200,8 @@ Dhcpv4Srv::run() {
return
(
true
);
}
bool
Dhcpv4Srv
::
loadServerID
(
const
std
::
string
&
file_name
)
{
bool
Dhcpv4Srv
::
loadServerID
(
const
std
::
string
&
file_name
)
{
// load content of the file into a string
fstream
f
(
file_name
.
c_str
(),
ios
::
in
);
...
...
@@ -233,7 +235,8 @@ bool Dhcpv4Srv::loadServerID(const std::string& file_name) {
return
(
true
);
}
void
Dhcpv4Srv
::
generateServerID
()
{
void
Dhcpv4Srv
::
generateServerID
()
{
const
IfaceMgr
::
IfaceCollection
&
ifaces
=
IfaceMgr
::
instance
().
getIfaces
();
...
...
@@ -270,16 +273,19 @@ void Dhcpv4Srv::generateServerID() {
isc_throw
(
BadValue
,
"No suitable interfaces for server-identifier found"
);
}
bool
Dhcpv4Srv
::
writeServerID
(
const
std
::
string
&
file_name
)
{
bool
Dhcpv4Srv
::
writeServerID
(
const
std
::
string
&
file_name
)
{
fstream
f
(
file_name
.
c_str
(),
ios
::
out
|
ios
::
trunc
);
if
(
!
f
.
good
())
{
return
(
false
);
}
f
<<
srvidToString
(
getServerID
());
f
.
close
();
return
(
true
);
}
string
Dhcpv4Srv
::
srvidToString
(
const
OptionPtr
&
srvid
)
{
string
Dhcpv4Srv
::
srvidToString
(
const
OptionPtr
&
srvid
)
{
if
(
!
srvid
)
{
isc_throw
(
BadValue
,
"NULL pointer passed to srvidToString()"
);
}
...
...
@@ -298,7 +304,8 @@ string Dhcpv4Srv::srvidToString(const OptionPtr& srvid) {
return
(
addrs
[
0
].
toText
());
}
void
Dhcpv4Srv
::
copyDefaultFields
(
const
Pkt4Ptr
&
question
,
Pkt4Ptr
&
answer
)
{
void
Dhcpv4Srv
::
copyDefaultFields
(
const
Pkt4Ptr
&
question
,
Pkt4Ptr
&
answer
)
{
answer
->
setIface
(
question
->
getIface
());
answer
->
setIndex
(
question
->
getIndex
());
answer
->
setCiaddr
(
question
->
getCiaddr
());
...
...
@@ -327,7 +334,8 @@ void Dhcpv4Srv::copyDefaultFields(const Pkt4Ptr& question, Pkt4Ptr& answer) {
}
}
void
Dhcpv4Srv
::
appendDefaultOptions
(
Pkt4Ptr
&
msg
,
uint8_t
msg_type
)
{
void
Dhcpv4Srv
::
appendDefaultOptions
(
Pkt4Ptr
&
msg
,
uint8_t
msg_type
)
{
OptionPtr
opt
;
// add Message Type Option (type 53)
...
...
@@ -339,8 +347,8 @@ void Dhcpv4Srv::appendDefaultOptions(Pkt4Ptr& msg, uint8_t msg_type) {
// more options will be added here later
}
void
Dhcpv4Srv
::
appendRequestedOptions
(
const
Pkt4Ptr
&
question
,
Pkt4Ptr
&
msg
)
{
void
Dhcpv4Srv
::
appendRequestedOptions
(
const
Pkt4Ptr
&
question
,
Pkt4Ptr
&
msg
)
{
// Get the subnet relevant for the client. We will need it
// to get the options associated with it.
...
...
@@ -411,7 +419,8 @@ Dhcpv4Srv::appendBasicOptions(const Pkt4Ptr& question, Pkt4Ptr& msg) {
}
}
void
Dhcpv4Srv
::
assignLease
(
const
Pkt4Ptr
&
question
,
Pkt4Ptr
&
answer
)
{
void
Dhcpv4Srv
::
assignLease
(
const
Pkt4Ptr
&
question
,
Pkt4Ptr
&
answer
)
{
// We need to select a subnet the client is connected in.
Subnet4Ptr
subnet
=
selectSubnet
(
question
);
...
...
@@ -509,7 +518,8 @@ void Dhcpv4Srv::assignLease(const Pkt4Ptr& question, Pkt4Ptr& answer) {
}
}
OptionPtr
Dhcpv4Srv
::
getNetmaskOption
(
const
Subnet4Ptr
&
subnet
)
{
OptionPtr
Dhcpv4Srv
::
getNetmaskOption
(
const
Subnet4Ptr
&
subnet
)
{
uint32_t
netmask
=
getNetmask4
(
subnet
->
get
().
second
);
OptionPtr
opt
(
new
OptionInt
<
uint32_t
>
(
Option
::
V4
,
...
...
@@ -518,7 +528,8 @@ OptionPtr Dhcpv4Srv::getNetmaskOption(const Subnet4Ptr& subnet) {
return
(
opt
);
}
Pkt4Ptr
Dhcpv4Srv
::
processDiscover
(
Pkt4Ptr
&
discover
)
{
Pkt4Ptr
Dhcpv4Srv
::
processDiscover
(
Pkt4Ptr
&
discover
)
{
Pkt4Ptr
offer
=
Pkt4Ptr
(
new
Pkt4
(
DHCPOFFER
,
discover
->
getTransid
()));
...
...
@@ -536,7 +547,8 @@ Pkt4Ptr Dhcpv4Srv::processDiscover(Pkt4Ptr& discover) {
return
(
offer
);
}
Pkt4Ptr
Dhcpv4Srv
::
processRequest
(
Pkt4Ptr
&
request
)
{
Pkt4Ptr
Dhcpv4Srv
::
processRequest
(
Pkt4Ptr
&
request
)
{
Pkt4Ptr
ack
=
Pkt4Ptr
(
new
Pkt4
(
DHCPACK
,
request
->
getTransid
()));
...
...
@@ -554,7 +566,8 @@ Pkt4Ptr Dhcpv4Srv::processRequest(Pkt4Ptr& request) {
return
(
ack
);
}
void
Dhcpv4Srv
::
processRelease
(
Pkt4Ptr
&
release
)
{
void
Dhcpv4Srv
::
processRelease
(
Pkt4Ptr
&
release
)
{
// Try to find client-id
ClientIdPtr
client_id
;
...
...
@@ -622,11 +635,13 @@ void Dhcpv4Srv::processRelease(Pkt4Ptr& release) {
}
void
Dhcpv4Srv
::
processDecline
(
Pkt4Ptr
&
decline
)
{
void
Dhcpv4Srv
::
processDecline
(
Pkt4Ptr
&
decline
)
{
/// TODO: Implement this.
}
Pkt4Ptr
Dhcpv4Srv
::
processInform
(
Pkt4Ptr
&
inform
)
{
Pkt4Ptr
Dhcpv4Srv
::
processInform
(
Pkt4Ptr
&
inform
)
{
/// TODO: Currently implemented echo mode. Implement this for real
return
(
inform
);
}
...
...
@@ -662,7 +677,8 @@ Dhcpv4Srv::serverReceivedPacketName(uint8_t type) {
return
(
UNKNOWN
);
}
Subnet4Ptr
Dhcpv4Srv
::
selectSubnet
(
const
Pkt4Ptr
&
question
)
{
Subnet4Ptr
Dhcpv4Srv
::
selectSubnet
(
const
Pkt4Ptr
&
question
)
{
// Is this relayed message?
IOAddress
relay
=
question
->
getGiaddr
();
...
...
@@ -677,7 +693,8 @@ Subnet4Ptr Dhcpv4Srv::selectSubnet(const Pkt4Ptr& question) {
}
}
void
Dhcpv4Srv
::
sanityCheck
(
const
Pkt4Ptr
&
pkt
,
RequirementLevel
serverid
)
{
void
Dhcpv4Srv
::
sanityCheck
(
const
Pkt4Ptr
&
pkt
,
RequirementLevel
serverid
)
{
OptionPtr
server_id
=
pkt
->
getOption
(
DHO_DHCP_SERVER_IDENTIFIER
);
switch
(
serverid
)
{
case
FORBIDDEN
:
...
...
src/bin/dhcp4/tests/Makefile.am
View file @
53dec20f
...
...
@@ -56,12 +56,6 @@ dhcp4_unittests_SOURCES += ctrl_dhcp4_srv_unittest.cc
dhcp4_unittests_SOURCES
+=
config_parser_unittest.cc
nodist_dhcp4_unittests_SOURCES
=
../dhcp4_messages.h ../dhcp4_messages.cc
if
USE_CLANGPP
# Disable unused parameter warning caused by some of the
# Boost headers when compiling with clang.
dhcp4_unittests_CXXFLAGS
=
-Wno-unused-parameter
endif
dhcp4_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
dhcp4_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
dhcp4_unittests_LDADD
=
$(GTEST_LDADD)
...
...
src/bin/dhcp6/Makefile.am
View file @
53dec20f
...
...
@@ -53,12 +53,6 @@ b10_dhcp6_SOURCES += dhcp6_srv.cc dhcp6_srv.h
nodist_b10_dhcp6_SOURCES
=
dhcp6_messages.h dhcp6_messages.cc
EXTRA_DIST
+=
dhcp6_messages.mes
if
USE_CLANGPP
# Disable unused parameter warning caused by some of the
# Boost headers when compiling with clang.
b10_dhcp6_CXXFLAGS
=
-Wno-unused-parameter
endif
b10_dhcp6_LDADD
=
$(top_builddir)
/src/lib/asiolink/libb10-asiolink.la
b10_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/cc/libb10-cc.la
b10_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/config/libb10-cfgclient.la
...
...
src/bin/dhcp6/dhcp6_srv.cc
View file @
53dec20f
...
...
@@ -256,7 +256,8 @@ bool Dhcpv6Srv::loadServerID(const std::string& file_name) {
return
(
true
);
}
std
::
string
Dhcpv6Srv
::
duidToString
(
const
OptionPtr
&
opt
)
{
std
::
string
Dhcpv6Srv
::
duidToString
(
const
OptionPtr
&
opt
)
{
stringstream
tmp
;
OptionBuffer
data
=
opt
->
getData
();
...
...
@@ -275,16 +276,19 @@ std::string Dhcpv6Srv::duidToString(const OptionPtr& opt) {
return
tmp
.
str
();
}
bool
Dhcpv6Srv
::
writeServerID
(
const
std
::
string
&
file_name
)
{
bool
Dhcpv6Srv
::
writeServerID
(
const
std
::
string
&
file_name
)
{
fstream
f
(
file_name
.
c_str
(),
ios
::
out
|
ios
::
trunc
);
if
(
!
f
.
good
())
{
return
(
false
);
}
f
<<
duidToString
(
getServerID
());
f
.
close
();
return
(
true
);
}
void
Dhcpv6Srv
::
generateServerID
()
{
void
Dhcpv6Srv
::
generateServerID
()
{
/// @todo: This code implements support for DUID-LLT (the recommended one).
/// We should eventually add support for other DUID types: DUID-LL, DUID-EN
...
...
@@ -367,7 +371,8 @@ void Dhcpv6Srv::generateServerID() {
srvid
.
begin
(),
srvid
.
end
()));
}
void
Dhcpv6Srv
::
copyDefaultOptions
(
const
Pkt6Ptr
&
question
,
Pkt6Ptr
&
answer
)
{
void
Dhcpv6Srv
::
copyDefaultOptions
(
const
Pkt6Ptr
&
question
,
Pkt6Ptr
&
answer
)
{
// Add client-id.
OptionPtr
clientid
=
question
->
getOption
(
D6O_CLIENTID
);
if
(
clientid
)
{
...
...
@@ -377,7 +382,8 @@ void Dhcpv6Srv::copyDefaultOptions(const Pkt6Ptr& question, Pkt6Ptr& answer) {
// TODO: Should throw if there is no client-id (except anonymous INF-REQUEST)
}
void
Dhcpv6Srv
::
appendDefaultOptions
(
const
Pkt6Ptr
&
question
,
Pkt6Ptr
&
answer
)
{
void
Dhcpv6Srv
::
appendDefaultOptions
(
const
Pkt6Ptr
&
question
,
Pkt6Ptr
&
answer
)
{
// add server-id
answer
->
addOption
(
getServerID
());
...
...
@@ -393,7 +399,8 @@ void Dhcpv6Srv::appendDefaultOptions(const Pkt6Ptr& question, Pkt6Ptr& answer) {
}
void
Dhcpv6Srv
::
appendRequestedOptions
(
const
Pkt6Ptr
&
question
,
Pkt6Ptr
&
answer
)
{
void
Dhcpv6Srv
::
appendRequestedOptions
(
const
Pkt6Ptr
&
question
,
Pkt6Ptr
&
answer
)
{
// Get the subnet for a particular address.
Subnet6Ptr
subnet
=
CfgMgr
::
instance
().
getSubnet6
(
question
->
getRemoteAddr
());
if
(
!
subnet
)
{
...
...
@@ -420,7 +427,8 @@ void Dhcpv6Srv::appendRequestedOptions(const Pkt6Ptr& question, Pkt6Ptr& answer)
}
}
OptionPtr
Dhcpv6Srv
::
createStatusCode
(
uint16_t
code
,
const
std
::
string
&
text
)
{
OptionPtr
Dhcpv6Srv
::
createStatusCode
(
uint16_t
code
,
const
std
::
string
&
text
)
{
// @todo This function uses OptionCustom class to manage contents
// of the data fields. Since this this option is frequently used
// it may be good to implement dedicated class to avoid performance
...
...
@@ -446,8 +454,9 @@ OptionPtr Dhcpv6Srv::createStatusCode(uint16_t code, const std::string& text) {
return
(
option_status
);
}
void
Dhcpv6Srv
::
sanityCheck
(
const
Pkt6Ptr
&
pkt
,
RequirementLevel
clientid
,
RequirementLevel
serverid
)
{
void
Dhcpv6Srv
::
sanityCheck
(
const
Pkt6Ptr
&
pkt
,
RequirementLevel
clientid
,
RequirementLevel
serverid
)
{
Option
::
OptionCollection
client_ids
=
pkt
->
getOptions
(
D6O_CLIENTID
);
switch
(
clientid
)
{
case
MANDATORY
:
...
...
@@ -494,7 +503,8 @@ void Dhcpv6Srv::sanityCheck(const Pkt6Ptr& pkt, RequirementLevel clientid,
}
}
Subnet6Ptr
Dhcpv6Srv
::
selectSubnet
(
const
Pkt6Ptr
&
question
)
{
Subnet6Ptr
Dhcpv6Srv
::
selectSubnet
(
const
Pkt6Ptr
&
question
)
{
/// @todo: pass interface information only if received direct (non-relayed) message
...
...
@@ -510,7 +520,8 @@ Subnet6Ptr Dhcpv6Srv::selectSubnet(const Pkt6Ptr& question) {
return
(
subnet
);
}
void
Dhcpv6Srv
::
assignLeases
(
const
Pkt6Ptr
&
question
,
Pkt6Ptr
&
answer
)
{
void
Dhcpv6Srv
::
assignLeases
(
const
Pkt6Ptr
&
question
,
Pkt6Ptr
&
answer
)
{
// We need to allocate addresses for all IA_NA options in the client's
// question (i.e. SOLICIT or REQUEST) message.
...
...
@@ -579,8 +590,9 @@ void Dhcpv6Srv::assignLeases(const Pkt6Ptr& question, Pkt6Ptr& answer) {
}
}
OptionPtr
Dhcpv6Srv
::
assignIA_NA
(
const
Subnet6Ptr
&
subnet
,
const
DuidPtr
&
duid
,
Pkt6Ptr
question
,
boost
::
shared_ptr
<
Option6IA
>
ia
)
{
OptionPtr
Dhcpv6Srv
::
assignIA_NA
(
const
Subnet6Ptr
&
subnet
,
const
DuidPtr
&
duid
,
Pkt6Ptr
question
,
boost
::
shared_ptr
<
Option6IA
>
ia
)
{
// If there is no subnet selected for handling this IA_NA, the only thing to do left is
// to say that we are sorry, but the user won't get an address. As a convenience, we
// use a different status text to indicate that (compare to the same status code,
...
...
@@ -675,8 +687,9 @@ OptionPtr Dhcpv6Srv::assignIA_NA(const Subnet6Ptr& subnet, const DuidPtr& duid,
return
(
ia_rsp
);
}
OptionPtr
Dhcpv6Srv
::
renewIA_NA
(
const
Subnet6Ptr
&
subnet
,
const
DuidPtr
&
duid
,
Pkt6Ptr
question
,
boost
::
shared_ptr
<
Option6IA
>
ia
)
{
OptionPtr
Dhcpv6Srv
::
renewIA_NA
(
const
Subnet6Ptr
&
subnet
,
const
DuidPtr
&
duid
,
Pkt6Ptr
question
,
boost
::
shared_ptr
<
Option6IA
>
ia
)
{
Lease6Ptr
lease
=
LeaseMgrFactory
::
instance
().
getLease6
(
*
duid
,
ia
->
getIAID
(),
subnet
->
getID
());
...
...
@@ -719,7 +732,8 @@ OptionPtr Dhcpv6Srv::renewIA_NA(const Subnet6Ptr& subnet, const DuidPtr& duid,
return
(
ia_rsp
);
}
void
Dhcpv6Srv
::
renewLeases
(
const
Pkt6Ptr
&
renew
,
Pkt6Ptr
&
reply
)
{
void
Dhcpv6Srv
::
renewLeases
(
const
Pkt6Ptr
&
renew
,
Pkt6Ptr
&
reply
)
{
// We need to renew addresses for all IA_NA options in the client's
// RENEW message.
...
...
@@ -775,7 +789,8 @@ void Dhcpv6Srv::renewLeases(const Pkt6Ptr& renew, Pkt6Ptr& reply) {
}
}
void
Dhcpv6Srv
::
releaseLeases
(
const
Pkt6Ptr
&
release
,
Pkt6Ptr
&
reply
)
{
void
Dhcpv6Srv
::
releaseLeases
(
const
Pkt6Ptr
&
release
,
Pkt6Ptr
&
reply
)
{
// We need to release addresses for all IA_NA options in the client's
// RELEASE message.
...
...
@@ -831,9 +846,9 @@ void Dhcpv6Srv::releaseLeases(const Pkt6Ptr& release, Pkt6Ptr& reply) {
"Summary status for all processed IA_NAs"
));
}
OptionPtr
Dhcpv6Srv
::
releaseIA_NA
(
const
DuidPtr
&
duid
,
Pkt6Ptr
question
,
int
&
general_status
,
boost
::
shared_ptr
<
Option6IA
>
ia
)
{
OptionPtr
Dhcpv6Srv
::
releaseIA_NA
(
const
DuidPtr
&
duid
,
Pkt6Ptr
question
,
int
&
general_status
,
boost
::
shared_ptr
<
Option6IA
>
ia
)
{
// Release can be done in one of two ways:
// Approach 1: extract address from client's IA_NA and see if it belongs
// to this particular client.
...
...
@@ -942,8 +957,8 @@ OptionPtr Dhcpv6Srv::releaseIA_NA(const DuidPtr& duid, Pkt6Ptr question,
}
}
Pkt6Ptr
Dhcpv6Srv
::
processSolicit
(
const
Pkt6Ptr
&
solicit
)
{
Pkt6Ptr
Dhcpv6Srv
::
processSolicit
(
const
Pkt6Ptr
&
solicit
)
{
sanityCheck
(
solicit
,
MANDATORY
,
FORBIDDEN
);
...
...
@@ -958,7 +973,8 @@ Pkt6Ptr Dhcpv6Srv::processSolicit(const Pkt6Ptr& solicit) {
return
(
advertise
);
}
Pkt6Ptr
Dhcpv6Srv
::
processRequest
(
const
Pkt6Ptr
&
request
)
{
Pkt6Ptr
Dhcpv6Srv
::
processRequest
(
const
Pkt6Ptr
&
request
)
{
sanityCheck
(
request
,
MANDATORY
,
MANDATORY
);
...
...
@@ -973,7 +989,8 @@ Pkt6Ptr Dhcpv6Srv::processRequest(const Pkt6Ptr& request) {
return
(
reply
);
}
Pkt6Ptr
Dhcpv6Srv
::
processRenew
(
const
Pkt6Ptr
&
renew
)
{
Pkt6Ptr
Dhcpv6Srv
::
processRenew
(
const
Pkt6Ptr
&
renew
)
{
sanityCheck
(
renew
,
MANDATORY
,
MANDATORY
);
...
...
@@ -988,19 +1005,22 @@ Pkt6Ptr Dhcpv6Srv::processRenew(const Pkt6Ptr& renew) {
return
reply
;
}
Pkt6Ptr
Dhcpv6Srv
::
processRebind
(
const
Pkt6Ptr
&
rebind
)
{
Pkt6Ptr
Dhcpv6Srv
::
processRebind
(
const
Pkt6Ptr
&
rebind
)
{
/// @todo: Implement this
Pkt6Ptr
reply
(
new
Pkt6
(
DHCPV6_REPLY
,
rebind
->
getTransid
()));
return
reply
;
}
Pkt6Ptr
Dhcpv6Srv
::
processConfirm
(
const
Pkt6Ptr
&
confirm
)
{
Pkt6Ptr
Dhcpv6Srv
::
processConfirm
(
const
Pkt6Ptr
&
confirm
)
{
/// @todo: Implement this
Pkt6Ptr
reply
(
new
Pkt6
(
DHCPV6_REPLY
,
confirm
->
getTransid
()));
return
reply
;
}
Pkt6Ptr
Dhcpv6Srv
::
processRelease
(
const
Pkt6Ptr
&
release
)
{
Pkt6Ptr
Dhcpv6Srv
::
processRelease
(
const
Pkt6Ptr
&
release
)
{
sanityCheck
(
release
,
MANDATORY
,
MANDATORY
);
...
...
@@ -1014,13 +1034,15 @@ Pkt6Ptr Dhcpv6Srv::processRelease(const Pkt6Ptr& release) {
return
reply
;
}
Pkt6Ptr
Dhcpv6Srv
::
processDecline
(
const
Pkt6Ptr
&
decline
)
{
Pkt6Ptr
Dhcpv6Srv
::
processDecline
(
const
Pkt6Ptr
&
decline
)
{
/// @todo: Implement this
Pkt6Ptr
reply
(
new
Pkt6
(
DHCPV6_REPLY
,
decline
->
getTransid
()));
return
reply
;
}
Pkt6Ptr
Dhcpv6Srv
::
processInfRequest
(
const
Pkt6Ptr
&
infRequest
)
{
Pkt6Ptr
Dhcpv6Srv
::
processInfRequest
(
const
Pkt6Ptr
&
infRequest
)
{
/// @todo: Implement this
Pkt6Ptr
reply
(
new
Pkt6
(
DHCPV6_REPLY
,
infRequest
->
getTransid
()));
return
reply
;
...
...
src/bin/dhcp6/tests/Makefile.am
View file @
53dec20f
...
...
@@ -53,12 +53,6 @@ dhcp6_unittests_SOURCES += ../ctrl_dhcp6_srv.cc
dhcp6_unittests_SOURCES
+=
../config_parser.cc ../config_parser.h
nodist_dhcp6_unittests_SOURCES
=
../dhcp6_messages.h ../dhcp6_messages.cc
if
USE_CLANGPP
# Disable unused parameter warning caused by some of the
# Boost headers when compiling with clang.
dhcp6_unittests_CXXFLAGS
=
-Wno-unused-parameter
endif
dhcp6_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
dhcp6_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
dhcp6_unittests_LDADD
=
$(GTEST_LDADD)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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