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
Sebastian Schrader
Kea
Commits
e898091a
Commit
e898091a
authored
Sep 23, 2013
by
Marcin Siodelski
Browse files
[3173] Fixed cppcheck errors in perfdhcp.
parent
82a00e6e
Changes
6
Hide whitespace changes
Inline
Side-by-side
tests/tools/perfdhcp/command_options.cc
View file @
e898091a
...
...
@@ -500,7 +500,7 @@ CommandOptions::initialize(int argc, char** argv, bool print_cmd_line) {
// If DUID is not specified from command line we need to
// generate one.
if
(
duid_template_
.
size
()
==
0
)
{
if
(
duid_template_
.
empty
()
)
{
generateDuidTemplate
();
}
return
(
false
);
...
...
@@ -568,9 +568,9 @@ CommandOptions::decodeMac(const std::string& base) {
mac_template_
.
clear
();
// Get pieces of MAC address separated with : (or even ::)
while
(
std
::
getline
(
s1
,
token
,
':'
))
{
unsigned
int
ui
=
0
;
// Convert token to byte value using std::istringstream
if
(
token
.
length
()
>
0
)
{
unsigned
int
ui
=
0
;
try
{
// Do actual conversion
ui
=
convertHexString
(
token
);
...
...
tests/tools/perfdhcp/stats_mgr.h
View file @
e898091a
...
...
@@ -1183,7 +1183,7 @@ public:
/// \throw isc::InvalidOperation if no exchange type added to
/// track statistics.
void
printStats
()
const
{
if
(
exchanges_
.
size
()
==
0
)
{
if
(
exchanges_
.
empty
()
)
{
isc_throw
(
isc
::
InvalidOperation
,
"no exchange type added for tracking"
);
}
...
...
@@ -1238,7 +1238,7 @@ public:
/// \throw isc::InvalidOperation if no exchange type added to
/// track statistics or packets archive mode is disabled.
void
printTimestamps
()
const
{
if
(
exchanges_
.
size
()
==
0
)
{
if
(
exchanges_
.
empty
()
)
{
isc_throw
(
isc
::
InvalidOperation
,
"no exchange type added for tracking"
);
}
...
...
@@ -1261,7 +1261,7 @@ public:
///
/// \throw isc::InvalidOperation if no custom counters added for tracking.
void
printCustomCounters
()
const
{
if
(
custom_counters_
.
size
()
==
0
)
{
if
(
custom_counters_
.
empty
()
)
{
isc_throw
(
isc
::
InvalidOperation
,
"no custom counters specified"
);
}
for
(
CustomCountersMapIterator
it
=
custom_counters_
.
begin
();
...
...
tests/tools/perfdhcp/test_control.cc
View file @
e898091a
...
...
@@ -458,11 +458,11 @@ TestControl::getElapsedTime(const T& pkt1, const T& pkt2) {
uint64_t
TestControl
::
getNextExchangesNum
()
const
{
CommandOptions
&
options
=
CommandOptions
::
instance
();
// Reset number of exchanges.
uint64_t
due_exchanges
=
0
;
// Get current time.
ptime
now
(
microsec_clock
::
universal_time
());
if
(
now
>=
send_due_
)
{
// Reset number of exchanges.
uint64_t
due_exchanges
=
0
;
// If rate is specified from the command line we have to
// synchornize with it.
if
(
options
.
getRate
()
!=
0
)
{
...
...
@@ -737,7 +737,7 @@ TestControl::sendPackets(const TestControlSocket& socket,
if
(
options
.
getIpVersion
()
==
4
)
{
// No template packets means that no -T option was specified.
// We have to build packets ourselfs.
if
(
template_buffers_
.
size
()
==
0
)
{
if
(
template_buffers_
.
empty
()
)
{
sendDiscover4
(
socket
,
preload
);
}
else
{
// @todo add defines for packet type index that can be
...
...
@@ -747,7 +747,7 @@ TestControl::sendPackets(const TestControlSocket& socket,
}
else
{
// No template packets means that no -T option was specified.
// We have to build packets ourselfs.
if
(
template_buffers_
.
size
()
==
0
)
{
if
(
template_buffers_
.
empty
()
)
{
sendSolicit6
(
socket
,
preload
);
}
else
{
// @todo add defines for packet type index that can be
...
...
@@ -966,7 +966,7 @@ TestControl::readPacketTemplate(const std::string& file_name) {
// Expect even number of digits.
if
(
hex_digits
.
size
()
%
2
!=
0
)
{
isc_throw
(
OutOfRange
,
"odd number of digits in template file"
);
}
else
if
(
hex_digits
.
size
()
==
0
)
{
}
else
if
(
hex_digits
.
empty
()
)
{
isc_throw
(
OutOfRange
,
"template file "
<<
file_name
<<
" is empty"
);
}
std
::
vector
<
uint8_t
>
binary_stream
;
...
...
tests/tools/perfdhcp/tests/command_options_helper.h
View file @
e898091a
...
...
@@ -115,7 +115,7 @@ private:
// Tokenize string (space is a separator) using begin and end iteratos
std
::
vector
<
std
::
string
>
tokens
(
text_iterator
,
text_end
);
if
(
tokens
.
size
()
>
0
)
{
if
(
!
tokens
.
empty
()
)
{
// Allocate array of C-strings where we will store tokens
results
=
new
char
*
[
tokens
.
size
()];
// Store tokens in C-strings array
...
...
tests/tools/perfdhcp/tests/stats_mgr_unittest.cc
View file @
e898091a
...
...
@@ -347,7 +347,6 @@ TEST_F(StatsMgrTest, Delays) {
// Send DISCOVER, wait 2s and receive OFFER. This will affect
// counters in Stats Manager.
const
unsigned
int
delay1
=
2
;
passDOPacketsWithDelay
(
stats_mgr
,
2
,
common_transid
);
// Initially min delay is equal to MAX_DOUBLE. After first packets
...
...
tests/tools/perfdhcp/tests/test_control_unittest.cc
View file @
e898091a
...
...
@@ -1086,7 +1086,7 @@ TEST_F(TestControlTest, PacketTemplates) {
// Size of the file is 2 times larger than binary data size.
ASSERT_TRUE
(
createTemplateFile
(
file1
,
template1
,
template1
.
size
()
*
2
));
ASSERT_TRUE
(
createTemplateFile
(
file2
,
template2
,
template2
.
size
()
*
2
));
CommandOptions
&
options
=
CommandOptions
::
instance
();
NakedTestControl
tc
;
ASSERT_NO_THROW
(
...
...
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