Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Sebastian Schrader
Kea
Commits
b21fcdaf
Commit
b21fcdaf
authored
Feb 24, 2017
by
Tomek Mrugalski
🛰
Browse files
[5107] Changes after review:
- typos corrected - copyright years updated - added comments
parent
3834c041
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/bin/agent/ctrl_agent_controller.cc
View file @
b21fcdaf
// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2016
-2017
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
...
...
src/bin/agent/ctrl_agent_process.cc
View file @
b21fcdaf
...
...
@@ -18,6 +18,7 @@ using namespace isc::http;
using
namespace
isc
::
process
;
// Temporarily hardcoded configuration.
/// @todo: remove once 5134 is merged.
namespace
{
const
IOAddress
SERVER_ADDRESS
(
"127.0.0.1"
);
...
...
@@ -47,14 +48,26 @@ CtrlAgentProcess::run() {
try
{
// Create response creator factory first. It will be used to generate
// response creators. Each response creator will be used to generate
// answer to specific request.
HttpResponseCreatorFactoryPtr
rcf
(
new
CtrlAgentResponseCreatorFactory
());
// Create http listener. It will open up a TCP socket and be prepared
// to accept incoming connection.
HttpListener
http_listener
(
*
getIoService
(),
SERVER_ADDRESS
,
SERVER_PORT
,
rcf
,
REQUEST_TIMEOUT
);
// Instruct the http listener to actually open socket, install callback
// and start listening.
http_listener
.
start
();
// Ok, seems we're good to go.
LOG_INFO
(
agent_logger
,
CTRL_AGENT_HTTP_SERVICE_STARTED
)
.
arg
(
SERVER_ADDRESS
.
toText
()).
arg
(
SERVER_PORT
);
// Let's process incoming data or expiring timers in a loop until
// shutdown condition is detected.
while
(
!
shouldShutdown
())
{
getIoService
()
->
run_one
();
}
...
...
src/bin/agent/tests/ctrl_agent_response_creator_unittest.cc
View file @
b21fcdaf
...
...
@@ -104,8 +104,8 @@ public:
/// @param command_arguments Command arguments (empty).
///
/// @return Returns response with a single string "bar".
ConstElementPtr
fooCommandHandler
(
const
std
::
string
&
command_name
,
const
ConstElementPtr
&
command_arguments
)
{
ConstElementPtr
fooCommandHandler
(
const
std
::
string
&
/*
command_name
*/
,
const
ConstElementPtr
&
/*
command_arguments
*/
)
{
ElementPtr
arguments
=
Element
::
createList
();
arguments
->
add
(
Element
::
create
(
"bar"
));
return
(
createAnswer
(
CONTROL_RESULT_SUCCESS
,
arguments
));
...
...
@@ -122,7 +122,7 @@ public:
};
// This test verifies that the created "empty" re
u
qest has valid type.
// This test verifies that the created "empty" req
u
est has valid type.
TEST_F
(
CtrlAgentResponseCreatorTest
,
createNewHttpRequest
)
{
// The request must be of PostHttpRequestJson type.
PostHttpRequestJsonPtr
request_json
=
boost
::
dynamic_pointer_cast
<
...
...
@@ -144,7 +144,7 @@ TEST_F(CtrlAgentResponseCreatorTest, createStockHttpResponseHighVersion) {
"HTTP/1.0 408 Request Timeout"
);
}
// Test that the server respon
s
ds with version 1.1 if request version is 1.1.
// Test that the server responds with version 1.1 if request version is 1.1.
TEST_F
(
CtrlAgentResponseCreatorTest
,
createStockHttpResponseCorrectVersion
)
{
request_
->
context
()
->
http_version_major_
=
1
;
request_
->
context
()
->
http_version_minor_
=
1
;
...
...
src/lib/http/connection.h
View file @
b21fcdaf
...
...
@@ -175,6 +175,7 @@ private:
/// @brief Stops current connection.
void
stopThisConnection
();
/// @brief returns remote address in textual form
std
::
string
getRemoteEndpointAddressAsText
()
const
;
/// @brief Timer used to detect Request Timeout.
...
...
src/lib/http/tests/response_unittests.cc
View file @
b21fcdaf
// Copyright (C) 2016 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2016
-2017
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
...
...
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