hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix listener search functions

Browse Source 
The functions that searched for listeners compared both sockets and
addresses in the same function. This made its use error prone and caused
false positives in some cases.
This commit is contained in:
Markus Mäkelä 2019-05-06 15:50:07 +03:00
parent 956b7ee919
commit 95fd61b8dc
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
4 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/maxscale/listener.hh
View File

@ -350,17 +350,23 @@ SListener listener_find(const std::string& name);
std::vector<SListener> listener_find_by_service(const SERVICE* service);
/**
* Find listener by configuration
* Find listener by socket
*
* @param socket Optional path to a socket file
* @param address Address where the listener listens
* @param port The port on which the listener listens
* @param socket Path to a socket file
*
* @return The matching listener if one was found
*/
SListener listener_find_by_config(const std::string& socket,
const std::string& address,
unsigned short port);
SListener listener_find_by_socket(const std::string& socket);
/**
* Find listener by address and port
*
* @param address Network address
* @param port Network port
*
* @return The matching listener if one was found
*/
SListener listener_find_by_address(const std::string& address, unsigned short port);
int listener_set_ssl_version(SSL_LISTENER* ssl_listener, const char* version);
void listener_set_certificates(SSL_LISTENER* ssl_listener, const std::string& cert,

23
server/core/config.cc
View File

@ -4172,17 +4172,22 @@ int create_new_listener(CONFIG_CONTEXT* obj)
address = "";
}
if (auto l = listener_find_by_config(socket, address, port))
if (socket_defined)
{
if (auto l = listener_find_by_socket(socket))
{
MXS_ERROR("Creation of listener '%s' for service '%s' failed, because "
"listener '%s' already listens on socket %s.",
obj->name(), service->name(), l->name(), socket.c_str());
return 1;
}
}
else if (auto l = listener_find_by_address(address, port))
{
string socket_type = socket_defined ? "socket" : "port";
string socket_definition = socket_defined ? socket : obj->m_parameters.get_string(CN_PORT);
MXS_ERROR("Creation of listener '%s' for service '%s' failed, because "
"listener '%s' already listens on the %s %s.",
obj->name(),
service->name(),
l->name(),
socket_type.c_str(),
socket_definition.c_str());
"listener '%s' already listens on port %s.",
obj->name(), service->name(), l->name(),
obj->m_parameters.get_string(CN_PORT).c_str());
return 1;
}

2
server/core/config_runtime.cc
View File

@ -1172,7 +1172,7 @@ bool runtime_create_listener(Service* service,
{
config_runtime_error("Listener '%s' already exists", name);
}
else if (SListener l = listener_find_by_config("", addr, u_port))
else if (SListener l = listener_find_by_address(addr, u_port))
{
config_runtime_error("Listener '%s' already listens on [%s]:%u", l->name(), addr, u_port);
}

24
server/core/listener.cc
View File

@ -338,9 +338,24 @@ static bool is_all_iface(const std::string& a, const std::string& b)
return addresses.count(a) || addresses.count(b);
}
SListener listener_find_by_config(const std::string& socket,
const std::string& address,
unsigned short port)
SListener listener_find_by_socket(const std::string& socket)
{
SListener rval;
std::lock_guard<std::mutex> guard(listener_lock);
for (const auto& listener : all_listeners)
{
if (listener->address() == socket)
{
rval = listener;
break;
}
}
return rval;
}
SListener listener_find_by_address(const std::string& address, unsigned short port)
{
SListener rval;
std::lock_guard<std::mutex> guard(listener_lock);
@ -348,8 +363,7 @@ SListener listener_find_by_config(const std::string& socket,
for (const auto& listener : all_listeners)
{
if (port == listener->port()
&& (listener->address() == address || listener->address() == socket
|| is_all_iface(listener->address(), address)))
&& (listener->address() == address || is_all_iface(listener->address(), address)))
{
rval = listener;
break;