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

MXS-2196: Make client DCB creation private to Listener

Browse Source 
The functions that the Listener uses are now private functions. Also moved
the function documentation into the headers.
This commit is contained in:
Markus Mäkelä
2018-12-02 02:46:03 +02:00
parent cca3d15b90
commit 3df38bc887
2 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/core/listener.cc
View File

@ -852,24 +852,19 @@ static int accept_one_connection(int fd, struct sockaddr* client_conn)
return client_fd;
}
/**
* @brief Accept a new client connection
*
* @param listener Listener that has a new connection request
*
* @return DCB - The new client DCB for the new connection, or NULL if failed
*/
DCB* accept_one_dcb(const SListener& listener)
}
DCB* Listener::accept_one_dcb()
{
DCB* client_dcb = NULL;
int c_sock;
struct sockaddr_storage client_conn;
if ((c_sock = accept_one_connection(listener->fd(), (struct sockaddr*)&client_conn)) >= 0)
if ((c_sock = accept_one_connection(fd(), (struct sockaddr*)&client_conn)) >= 0)
{
configure_network_socket(c_sock, client_conn.ss_family);
client_dcb = dcb_alloc(DCB_ROLE_CLIENT_HANDLER, listener, listener->service());
client_dcb = dcb_alloc(DCB_ROLE_CLIENT_HANDLER, m_self, m_service);
if (client_dcb == NULL)
{
@ -938,12 +933,11 @@ DCB* accept_one_dcb(const SListener& listener)
if (client_dcb)
{
mxb::atomic::add(&client_dcb->service->client_count, 1);
mxb::atomic::add(&m_service->client_count, 1);
}
return client_dcb;
}
}
bool Listener::listen_shared(std::string config_bind)
{
@ -1015,7 +1009,7 @@ uint32_t Listener::poll_handler(MXB_POLL_DATA* data, MXB_WORKER* worker, uint32_
Listener* listener = static_cast<Listener*>(data);
DCB* client_dcb;
while ((client_dcb = accept_one_dcb(listener->m_self)))
while ((client_dcb = listener->accept_one_dcb()))
{
listener->m_proto_func.accept(client_dcb);
}