Skip to content

Commit aa5ccbc

Browse files
author
Razvan Becheriu
committed
[#3694] throw error when switching from/to TLS
1 parent de694a0 commit aa5ccbc

16 files changed

+86
-67
lines changed

‎doc/sphinx/arm/agent.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,9 @@ Configuring only one or two string parameters results in an error.
259259
mutually authenticated, but there is no proof they are the same as
260260
for the HTTP authentication.
261261

262+
A different address or port must be specified when using the "config-set"
263+
command to switch from HTTP to HTTPS or from HTTPS to HTTP.
264+
262265
The :iscman:`kea-shell` tool also supports TLS.
263266

264267
.. _agent-launch:

‎doc/sphinx/arm/ddns.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,8 @@ password, these values can be read from files. The syntax is extended by:
428428

429429
Since Kea-2.7.6 Kea supports multiple HTTP/HTTPS connections.
430430
Both IPv4 and IPv6 addresses can be used.
431+
A different address or port must be specified when using the "config-set"
432+
command to switch from HTTP to HTTPS or from HTTPS to HTTP.
431433

432434
When files are used, they are read when the configuration is loaded,
433435
to detect configuration errors as soon as possible.

‎doc/sphinx/arm/dhcp4-srv.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7922,6 +7922,8 @@ password, these values can be read from files. The syntax is extended by:
79227922

79237923
Since Kea-2.7.6 Kea supports multiple HTTP/HTTPS connections.
79247924
Both IPv4 and IPv6 addresses can be used.
7925+
A different address or port must be specified when using the "config-set"
7926+
command to switch from HTTP to HTTPS or from HTTPS to HTTP.
79257927

79267928
When files are used, they are read when the configuration is loaded,
79277929
to detect configuration errors as soon as possible.

‎doc/sphinx/arm/dhcp6-srv.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7723,6 +7723,8 @@ password, these values can be read from files. The syntax is extended by:
77237723

77247724
Since Kea-2.7.6 Kea supports multiple HTTP/HTTPS connections.
77257725
Both IPv4 and IPv6 addresses can be used.
7726+
A different address or port must be specified when using the "config-set"
7727+
command to switch from HTTP to HTTPS or from HTTPS to HTTP.
77267728

77277729
When files are used, they are read when the configuration is loaded,
77287730
to detect configuration errors as soon as possible.

‎src/bin/agent/ca_messages.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ extern const isc::log::MessageID CTRL_AGENT_CONFIG_CHECK_FAIL = "CTRL_AGENT_CONF
1515
extern const isc::log::MessageID CTRL_AGENT_CONFIG_FAIL = "CTRL_AGENT_CONFIG_FAIL";
1616
extern const isc::log::MessageID CTRL_AGENT_CONFIG_SYNTAX_WARNING = "CTRL_AGENT_CONFIG_SYNTAX_WARNING";
1717
extern const isc::log::MessageID CTRL_AGENT_FAILED = "CTRL_AGENT_FAILED";
18-
extern const isc::log::MessageID CTRL_AGENT_HTTPS_SERVICE_REUSED = "CTRL_AGENT_HTTPS_SERVICE_REUSED";
18+
extern const isc::log::MessageID CTRL_AGENT_HTTPS_SERVICE_REUSE_FAILED = "CTRL_AGENT_HTTPS_SERVICE_REUSE_FAILED";
1919
extern const isc::log::MessageID CTRL_AGENT_HTTPS_SERVICE_STARTED = "CTRL_AGENT_HTTPS_SERVICE_STARTED";
2020
extern const isc::log::MessageID CTRL_AGENT_HTTPS_SERVICE_UPDATED = "CTRL_AGENT_HTTPS_SERVICE_UPDATED";
21-
extern const isc::log::MessageID CTRL_AGENT_HTTP_SERVICE_REUSED = "CTRL_AGENT_HTTP_SERVICE_REUSED";
21+
extern const isc::log::MessageID CTRL_AGENT_HTTP_SERVICE_REUSE_FAILED = "CTRL_AGENT_HTTP_SERVICE_REUSE_FAILED";
2222
extern const isc::log::MessageID CTRL_AGENT_HTTP_SERVICE_STARTED = "CTRL_AGENT_HTTP_SERVICE_STARTED";
2323
extern const isc::log::MessageID CTRL_AGENT_RUN_EXIT = "CTRL_AGENT_RUN_EXIT";
2424
extern const isc::log::MessageID CTRL_AGENT_STARTED = "CTRL_AGENT_STARTED";
@@ -37,10 +37,10 @@ const char* values[] = {
3737
"CTRL_AGENT_CONFIG_FAIL", "Control Agent configuration failed: %1",
3838
"CTRL_AGENT_CONFIG_SYNTAX_WARNING", "Control Agent configuration syntax warning: %1",
3939
"CTRL_AGENT_FAILED", "application experienced a fatal error: %1",
40-
"CTRL_AGENT_HTTPS_SERVICE_REUSED", "reused HTTPS service bound to address %1:%2",
40+
"CTRL_AGENT_HTTPS_SERVICE_REUSE_FAILED", "failed to reuse HTTPS service bound to address %1:%2",
4141
"CTRL_AGENT_HTTPS_SERVICE_STARTED", "HTTPS service bound to address %1:%2",
4242
"CTRL_AGENT_HTTPS_SERVICE_UPDATED", "reused HTTPS service bound to address %1:%2 and updated TLS settings",
43-
"CTRL_AGENT_HTTP_SERVICE_REUSED", "reused HTTP service bound to address %1:%2",
43+
"CTRL_AGENT_HTTP_SERVICE_REUSE_FAILED", "failed to reused HTTP service bound to address %1:%2",
4444
"CTRL_AGENT_HTTP_SERVICE_STARTED", "HTTP service bound to address %1:%2",
4545
"CTRL_AGENT_RUN_EXIT", "application is exiting the event loop",
4646
"CTRL_AGENT_STARTED", "Kea Control Agent version %1 started",

‎src/bin/agent/ca_messages.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ extern const isc::log::MessageID CTRL_AGENT_CONFIG_CHECK_FAIL;
1616
extern const isc::log::MessageID CTRL_AGENT_CONFIG_FAIL;
1717
extern const isc::log::MessageID CTRL_AGENT_CONFIG_SYNTAX_WARNING;
1818
extern const isc::log::MessageID CTRL_AGENT_FAILED;
19-
extern const isc::log::MessageID CTRL_AGENT_HTTPS_SERVICE_REUSED;
19+
extern const isc::log::MessageID CTRL_AGENT_HTTPS_SERVICE_REUSE_FAILED;
2020
extern const isc::log::MessageID CTRL_AGENT_HTTPS_SERVICE_STARTED;
2121
extern const isc::log::MessageID CTRL_AGENT_HTTPS_SERVICE_UPDATED;
22-
extern const isc::log::MessageID CTRL_AGENT_HTTP_SERVICE_REUSED;
22+
extern const isc::log::MessageID CTRL_AGENT_HTTP_SERVICE_REUSE_FAILED;
2323
extern const isc::log::MessageID CTRL_AGENT_HTTP_SERVICE_STARTED;
2424
extern const isc::log::MessageID CTRL_AGENT_RUN_EXIT;
2525
extern const isc::log::MessageID CTRL_AGENT_STARTED;

‎src/bin/agent/ca_messages.mes

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ error. The error was displayed and the configuration parsing resumed.
4343
This is a fatal error message issued when the Control Agent application
4444
encounters an unrecoverable error from within the event loop.
4545

46-
% CTRL_AGENT_HTTPS_SERVICE_REUSED reused HTTPS service bound to address %1:%2
47-
This informational message indicates that the server has reused existing
48-
HTTPS service on the specified address and port. Note that any change in
49-
the TLS setup was ignored.
46+
% CTRL_AGENT_HTTPS_SERVICE_REUSE_FAILED failed to reuse HTTPS service bound to address %1:%2
47+
This error message indicates that the server has failed reusing existing
48+
HTTPS service on the specified address and port. The server can not swith from
49+
HTTPS to HTTP sockets using the same address and port.
5050

5151
% CTRL_AGENT_HTTPS_SERVICE_STARTED HTTPS service bound to address %1:%2
5252
This informational message indicates that the server has started HTTPS service
@@ -58,9 +58,10 @@ This informational message indicates that the server has reused existing
5858
HTTPS service on the specified address and port. Note that any change in
5959
the TLS setup has been applied.
6060

61-
% CTRL_AGENT_HTTP_SERVICE_REUSED reused HTTP service bound to address %1:%2
62-
This informational message indicates that the server has reused existing
63-
HTTP service on the specified address and port.
61+
% CTRL_AGENT_HTTP_SERVICE_REUSE_FAILED failed to reused HTTP service bound to address %1:%2
62+
This error message indicates that the server has failed reusing existing
63+
HTTP service on the specified address and port. The server can not swith from
64+
HTTP to HTTPS sockets using the same address and port.
6465

6566
% CTRL_AGENT_HTTP_SERVICE_STARTED HTTP service bound to address %1:%2
6667
This informational message indicates that the server has started HTTP service

‎src/bin/agent/ca_process.cc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,11 @@ CtrlAgentProcess::configure(isc::data::ConstElementPtr config_set,
145145
if (listener->getTlsContext()) {
146146
if (ctx->getTrustAnchor().empty()) {
147147
// Can not switch from HTTPS to HTTP
148-
LOG_ERROR(agent_logger, CTRL_AGENT_HTTPS_SERVICE_REUSED)
148+
LOG_ERROR(agent_logger, CTRL_AGENT_HTTPS_SERVICE_REUSE_FAILED)
149149
.arg(server_address.toText())
150150
.arg(server_port);
151+
isc_throw(BadValue,
152+
"Can not switch from HTTPS to HTTP sockets using the same address and port.");
151153
} else {
152154
// Apply TLS settings each time.
153155
TlsContextPtr tls_context;
@@ -167,9 +169,11 @@ CtrlAgentProcess::configure(isc::data::ConstElementPtr config_set,
167169
}
168170
} else if (!ctx->getTrustAnchor().empty()) {
169171
// Can not switch from HTTP to HTTPS
170-
LOG_ERROR(agent_logger, CTRL_AGENT_HTTP_SERVICE_REUSED)
172+
LOG_ERROR(agent_logger, CTRL_AGENT_HTTP_SERVICE_REUSE_FAILED)
171173
.arg(server_address.toText())
172174
.arg(server_port);
175+
isc_throw(BadValue,
176+
"Can not switch from HTTP to HTTPS sockets using the same address and port.");
173177
}
174178
}
175179
// If the connection can be reused, mark it as usable.

‎src/bin/agent/tests/ca_controller_unittests.cc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -583,8 +583,8 @@ TEST_F(CtrlAgentControllerTest, noListenerChangeHttps) {
583583
EXPECT_FALSE(process->isListening());
584584
}
585585

586-
// Verify that the reload will reuse listener
587-
TEST_F(CtrlAgentControllerTest, ignoreHttpToHttpsSwitch) {
586+
// Verify that the reload will issue an error
587+
TEST_F(CtrlAgentControllerTest, handleHttpToHttpsSwitch) {
588588
string ca_dir(string(TEST_CA_DIR));
589589

590590
// This configuration should be used to override the initial configuration.
@@ -653,9 +653,9 @@ TEST_F(CtrlAgentControllerTest, ignoreHttpToHttpsSwitch) {
653653
EXPECT_EQ("127.0.0.1", ctx->getHttpHost());
654654
EXPECT_EQ(8081, ctx->getHttpPort());
655655

656-
// The forwarding configuration should have been updated.
657-
testUnixSocketInfo("dhcp4", "/second/dhcp4/socket");
658-
testUnixSocketInfo("dhcp6", "/second/dhcp6/socket");
656+
// The forwarding configuration should have not been updated.
657+
testUnixSocketInfo("dhcp4", "/first/dhcp4/socket");
658+
testUnixSocketInfo("dhcp6", "/first/dhcp6/socket");
659659

660660
CtrlAgentProcessPtr process = getCtrlAgentProcess();
661661
ASSERT_TRUE(process);
@@ -664,8 +664,8 @@ TEST_F(CtrlAgentControllerTest, ignoreHttpToHttpsSwitch) {
664664
EXPECT_FALSE(process->isListening());
665665
}
666666

667-
// Verify that the reload will reuse listener
668-
TEST_F(CtrlAgentControllerTest, ignoreHttpsToHttpSwitch) {
667+
// Verify that the reload will issue an error
668+
TEST_F(CtrlAgentControllerTest, handleHttpsToHttpSwitch) {
669669
string ca_dir(string(TEST_CA_DIR));
670670
ostringstream agent_st;
671671
agent_st << "{"
@@ -753,9 +753,9 @@ TEST_F(CtrlAgentControllerTest, ignoreHttpsToHttpSwitch) {
753753
EXPECT_EQ("127.0.0.1", ctx->getHttpHost());
754754
EXPECT_EQ(8081, ctx->getHttpPort());
755755

756-
// The forwarding configuration should have been updated.
757-
testUnixSocketInfo("dhcp4", "/second/dhcp4/socket");
758-
testUnixSocketInfo("dhcp6", "/second/dhcp6/socket");
756+
// The forwarding configuration should have not been updated.
757+
testUnixSocketInfo("dhcp4", "/first/dhcp4/socket");
758+
testUnixSocketInfo("dhcp6", "/first/dhcp6/socket");
759759

760760
CtrlAgentProcessPtr process = getCtrlAgentProcess();
761761
ASSERT_TRUE(process);

‎src/bin/d2/tests/d2_http_command_unittest.cc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2149,8 +2149,8 @@ TEST_F(HttpsCtrlChannelD2Test, noListenerChange) {
21492149
EXPECT_EQ(1, keys->size());
21502150
}
21512151

2152-
// Verify that the "config-set" command will reuse listener
2153-
TEST_F(HttpCtrlChannelD2Test, ignoreHttpToHttpsSwitch) {
2152+
// Verify that the "config-set" command will exit with an error
2153+
TEST_F(HttpCtrlChannelD2Test, handleHttpToHttpsSwitch) {
21542154

21552155
string d2_cfg_txt =
21562156
" { \n"
@@ -2235,20 +2235,20 @@ TEST_F(HttpCtrlChannelD2Test, ignoreHttpToHttpsSwitch) {
22352235
EXPECT_EQ(listener, HttpCommandMgr::instance().getHttpListener().get());
22362236
ASSERT_FALSE(HttpCommandMgr::instance().getHttpListener()->getTlsContext());
22372237

2238-
// Verify the configuration was successful.
2239-
EXPECT_NE(response.find("\"result\": 0"), std::string::npos);
2240-
EXPECT_NE(response.find("\"text\": \"Configuration applied successfully.\""),
2238+
// Verify the configuration was rejected.
2239+
EXPECT_NE(response.find("\"result\": 1"), std::string::npos);
2240+
EXPECT_NE(response.find("\"text\": \"Can not switch from HTTP to HTTPS sockets using the same address and port.\""),
22412241
std::string::npos);
22422242

2243-
// Check that the config was applied.
2243+
// Check that the config was not applied.
22442244
d2_context = cfg_mgr->getD2CfgContext();
22452245
keys = d2_context->getKeys();
22462246
ASSERT_TRUE(keys);
22472247
EXPECT_EQ(1, keys->size());
22482248
}
22492249

2250-
// Verify that the "config-set" command will reuse listener
2251-
TEST_F(HttpsCtrlChannelD2Test, ignoreHttpsToHttpSwitch) {
2250+
// Verify that the "config-set" command will exit with an error
2251+
TEST_F(HttpsCtrlChannelD2Test, handleHttpsToHttpSwitch) {
22522252

22532253
string ca_dir(string(TEST_CA_DIR));
22542254
ostringstream d2_st;
@@ -2343,11 +2343,11 @@ TEST_F(HttpsCtrlChannelD2Test, ignoreHttpsToHttpSwitch) {
23432343
// The TLS settings have not changed
23442344
EXPECT_EQ(context, HttpCommandMgr::instance().getHttpListener()->getTlsContext().get());
23452345

2346-
// Verify the configuration was successful.
2347-
EXPECT_EQ("[ { \"arguments\": { \"hash\": \"029AE1208415D6911B5651A6F82D054F55B7877D2589CFD1DCEB5BFFCD3B13A3\" }, \"result\": 0, \"text\": \"Configuration applied successfully.\" } ]",
2346+
// Verify the configuration was rejected.
2347+
EXPECT_EQ("[ { \"result\": 1, \"text\": \"Can not switch from HTTPS to HTTP sockets using the same address and port.\" } ]",
23482348
response);
23492349

2350-
// Check that the config was applied.
2350+
// Check that the config was not applied.
23512351
d2_context = cfg_mgr->getD2CfgContext();
23522352
keys = d2_context->getKeys();
23532353
ASSERT_TRUE(keys);

‎src/bin/dhcp4/tests/http_control_socket_unittest.cc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3654,8 +3654,8 @@ TEST_F(HttpsCtrlChannelDhcpv4Test, noListenerChange) {
36543654
CfgMgr::instance().clear();
36553655
}
36563656

3657-
// Verify that the "config-set" command will reuse listener
3658-
TEST_F(HttpCtrlChannelDhcpv4Test, ignoredHttpToHttpsSwitch) {
3657+
// Verify that the "config-set" command will exit with an error
3658+
TEST_F(HttpCtrlChannelDhcpv4Test, handleHttpToHttpsSwitch) {
36593659
createHttpChannelServer();
36603660

36613661
// Define strings to permutate the config arguments
@@ -3788,8 +3788,8 @@ TEST_F(HttpCtrlChannelDhcpv4Test, ignoredHttpToHttpsSwitch) {
37883788
EXPECT_EQ(listener, HttpCommandMgr::instance().getHttpListener().get());
37893789
ASSERT_FALSE(HttpCommandMgr::instance().getHttpListener()->getTlsContext());
37903790

3791-
EXPECT_NE(response.find("\"result\": 0"), std::string::npos);
3792-
EXPECT_NE(response.find("\"text\": \"Configuration successful.\""),
3791+
EXPECT_NE(response.find("\"result\": 1"), std::string::npos);
3792+
EXPECT_NE(response.find("\"text\": \"Can not switch from HTTP to HTTPS sockets using the same address and port.\""),
37933793
std::string::npos);
37943794

37953795
// Check that the config was not lost
@@ -3800,8 +3800,8 @@ TEST_F(HttpCtrlChannelDhcpv4Test, ignoredHttpToHttpsSwitch) {
38003800
CfgMgr::instance().clear();
38013801
}
38023802

3803-
// Verify that the "config-set" command will reuse listener
3804-
TEST_F(HttpsCtrlChannelDhcpv4Test, ignoreHttpsToHttpSwitch) {
3803+
// Verify that the "config-set" command will exit with an error
3804+
TEST_F(HttpsCtrlChannelDhcpv4Test, handleHttpsToHttpSwitch) {
38053805
createHttpChannelServer();
38063806

38073807
// Define strings to permutate the config arguments
@@ -3943,8 +3943,8 @@ TEST_F(HttpsCtrlChannelDhcpv4Test, ignoreHttpsToHttpSwitch) {
39433943
ASSERT_TRUE(HttpCommandMgr::instance().getHttpListener()->getTlsContext());
39443944
EXPECT_EQ(context, HttpCommandMgr::instance().getHttpListener()->getTlsContext().get());
39453945

3946-
EXPECT_NE(response.find("\"result\": 0"), std::string::npos);
3947-
EXPECT_NE(response.find("\"text\": \"Configuration successful.\""),
3946+
EXPECT_NE(response.find("\"result\": 1"), std::string::npos);
3947+
EXPECT_NE(response.find("\"text\": \"Can not switch from HTTPS to HTTP sockets using the same address and port.\""),
39483948
std::string::npos);
39493949

39503950
// Check that the config was not lost

‎src/bin/dhcp6/tests/http_control_socket_unittest.cc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3665,8 +3665,8 @@ TEST_F(HttpsCtrlChannelDhcpv6Test, noListenerChange) {
36653665
CfgMgr::instance().clear();
36663666
}
36673667

3668-
// Verify that the "config-set" command will reuse listener
3669-
TEST_F(HttpCtrlChannelDhcpv6Test, ignoreHttpToHttpsSwitch) {
3668+
// Verify that the "config-set" command will exit with an error
3669+
TEST_F(HttpCtrlChannelDhcpv6Test, handleHttpToHttpsSwitch) {
36703670
createHttpChannelServer();
36713671

36723672
// Define strings to permutate the config arguments
@@ -3800,8 +3800,8 @@ TEST_F(HttpCtrlChannelDhcpv6Test, ignoreHttpToHttpsSwitch) {
38003800
EXPECT_EQ(listener, HttpCommandMgr::instance().getHttpListener().get());
38013801
ASSERT_FALSE(HttpCommandMgr::instance().getHttpListener()->getTlsContext());
38023802

3803-
EXPECT_NE(response.find("\"result\": 0"), std::string::npos);
3804-
EXPECT_NE(response.find("\"text\": \"Configuration successful.\""),
3803+
EXPECT_NE(response.find("\"result\": 1"), std::string::npos);
3804+
EXPECT_NE(response.find("\"text\": \"Can not switch from HTTP to HTTPS sockets using the same address and port.\""),
38053805
std::string::npos);
38063806

38073807
// Check that the config was not lost
@@ -3812,8 +3812,8 @@ TEST_F(HttpCtrlChannelDhcpv6Test, ignoreHttpToHttpsSwitch) {
38123812
CfgMgr::instance().clear();
38133813
}
38143814

3815-
// Verify that the "config-set" command will reuse listener
3816-
TEST_F(HttpsCtrlChannelDhcpv6Test, ignoreHttpsToHttpSwitch) {
3815+
// Verify that the "config-set" command will exit with an error
3816+
TEST_F(HttpsCtrlChannelDhcpv6Test, handleHttpsToHttpSwitch) {
38173817
createHttpChannelServer();
38183818

38193819
// Define strings to permutate the config arguments
@@ -3956,8 +3956,8 @@ TEST_F(HttpsCtrlChannelDhcpv6Test, ignoreHttpsToHttpSwitch) {
39563956
ASSERT_TRUE(HttpCommandMgr::instance().getHttpListener()->getTlsContext());
39573957
EXPECT_EQ(context, HttpCommandMgr::instance().getHttpListener()->getTlsContext().get());
39583958

3959-
EXPECT_NE(response.find("\"result\": 0"), std::string::npos);
3960-
EXPECT_NE(response.find("\"text\": \"Configuration successful.\""),
3959+
EXPECT_NE(response.find("\"result\": 1"), std::string::npos);
3960+
EXPECT_NE(response.find("\"text\": \"Can not switch from HTTPS to HTTP sockets using the same address and port.\""),
39613961
std::string::npos);
39623962

39633963
// Check that the config was not lost

‎src/lib/config/config_messages.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ extern const isc::log::MessageID COMMAND_SOCKET_WRITE_FAIL = "COMMAND_SOCKET_WRI
3434
extern const isc::log::MessageID COMMAND_WATCH_SOCKET_CLEAR_ERROR = "COMMAND_WATCH_SOCKET_CLEAR_ERROR";
3535
extern const isc::log::MessageID COMMAND_WATCH_SOCKET_CLOSE_ERROR = "COMMAND_WATCH_SOCKET_CLOSE_ERROR";
3636
extern const isc::log::MessageID COMMAND_WATCH_SOCKET_MARK_READY_ERROR = "COMMAND_WATCH_SOCKET_MARK_READY_ERROR";
37-
extern const isc::log::MessageID HTTP_COMMAND_MGR_HTTPS_SERVICE_REUSED = "HTTP_COMMAND_MGR_HTTPS_SERVICE_REUSED";
37+
extern const isc::log::MessageID HTTP_COMMAND_MGR_HTTPS_SERVICE_REUSE_FAILED = "HTTP_COMMAND_MGR_HTTPS_SERVICE_REUSE_FAILED";
3838
extern const isc::log::MessageID HTTP_COMMAND_MGR_HTTPS_SERVICE_UPDATED = "HTTP_COMMAND_MGR_HTTPS_SERVICE_UPDATED";
39-
extern const isc::log::MessageID HTTP_COMMAND_MGR_HTTP_SERVICE_REUSED = "HTTP_COMMAND_MGR_HTTP_SERVICE_REUSED";
39+
extern const isc::log::MessageID HTTP_COMMAND_MGR_HTTP_SERVICE_REUSE_FAILED = "HTTP_COMMAND_MGR_HTTP_SERVICE_REUSE_FAILED";
4040
extern const isc::log::MessageID HTTP_COMMAND_MGR_SERVICE_STARTED = "HTTP_COMMAND_MGR_SERVICE_STARTED";
4141
extern const isc::log::MessageID HTTP_COMMAND_MGR_SERVICE_STOPPING = "HTTP_COMMAND_MGR_SERVICE_STOPPING";
4242

@@ -73,9 +73,9 @@ const char* values[] = {
7373
"COMMAND_WATCH_SOCKET_CLEAR_ERROR", "watch socket failed to clear: %1",
7474
"COMMAND_WATCH_SOCKET_CLOSE_ERROR", "watch socket failed to close: %1",
7575
"COMMAND_WATCH_SOCKET_MARK_READY_ERROR", "watch socket failed to mark ready: %1",
76-
"HTTP_COMMAND_MGR_HTTPS_SERVICE_REUSED", "reused HTTPS service bound to address %1:%2",
76+
"HTTP_COMMAND_MGR_HTTPS_SERVICE_REUSE_FAILED", "failed to reused HTTPS service bound to address %1:%2",
7777
"HTTP_COMMAND_MGR_HTTPS_SERVICE_UPDATED", "reused HTTPS service bound to address %1:%2 and updated TLS settings",
78-
"HTTP_COMMAND_MGR_HTTP_SERVICE_REUSED", "reused HTTP service bound to address %1:%2",
78+
"HTTP_COMMAND_MGR_HTTP_SERVICE_REUSE_FAILED", "failed to reused HTTP service bound to address %1:%2",
7979
"HTTP_COMMAND_MGR_SERVICE_STARTED", "started %1 service bound to address %2 port %3",
8080
"HTTP_COMMAND_MGR_SERVICE_STOPPING", "Server is stopping %1 service %2",
8181
NULL

0 commit comments

Comments
 (0)