Module: sems Branch: master Commit: 4446d998a9fae7f07ce909b95a8673357b9ac574 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=4446d998a9fae7f07ce909b95a8673357b9ac574
Author: Stefan Sayer <[email protected]> Committer: Stefan Sayer <[email protected]> Date: Sun May 22 23:38:38 2011 +0200 xmlrpc2di: ignore EAGAIN/EWOULDBLOCK result on accept + clearer logic parenthesis --- apps/xmlrpc2di/MultithreadXmlRpcServer.cpp | 4 +++- apps/xmlrpc2di/xmlrpc++/src/XmlRpcDispatch.cpp | 2 +- apps/xmlrpc2di/xmlrpc++/src/XmlRpcServer.cpp | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/xmlrpc2di/MultithreadXmlRpcServer.cpp b/apps/xmlrpc2di/MultithreadXmlRpcServer.cpp index 88c5de7..438c89d 100644 --- a/apps/xmlrpc2di/MultithreadXmlRpcServer.cpp +++ b/apps/xmlrpc2di/MultithreadXmlRpcServer.cpp @@ -97,8 +97,10 @@ void MultithreadXmlRpcServer::acceptConnection() int s = XmlRpcSocket::accept(this->getfd()); if (s < 0) { - ERROR("MultithreadXmlRpcServer::acceptConnection: Could not accept connection (%s).", + if (s != EAGAIN && s != EWOULDBLOCK) { + ERROR("MultithreadXmlRpcServer::acceptConnection: Could not accept connection (%s).", XmlRpcSocket::getErrorMsg().c_str()); + } } else if ( ! XmlRpcSocket::setNonBlocking(s)) diff --git a/apps/xmlrpc2di/xmlrpc++/src/XmlRpcDispatch.cpp b/apps/xmlrpc2di/xmlrpc++/src/XmlRpcDispatch.cpp index 99741fa..13d0916 100644 --- a/apps/xmlrpc2di/xmlrpc++/src/XmlRpcDispatch.cpp +++ b/apps/xmlrpc2di/xmlrpc++/src/XmlRpcDispatch.cpp @@ -228,7 +228,7 @@ XmlRpcDispatch::waitForAndProcessEvents(double timeout) newMask |= src->handleEvent(WritableEvent); ++nset; } - if (fds[i].revents & POLLERR|POLLNVAL|POLLHUP) + if (fds[i].revents & (POLLERR|POLLNVAL|POLLHUP)) { newMask |= src->handleEvent(Exception); ++nset; diff --git a/apps/xmlrpc2di/xmlrpc++/src/XmlRpcServer.cpp b/apps/xmlrpc2di/xmlrpc++/src/XmlRpcServer.cpp index 139b999..3a8e804 100644 --- a/apps/xmlrpc2di/xmlrpc++/src/XmlRpcServer.cpp +++ b/apps/xmlrpc2di/xmlrpc++/src/XmlRpcServer.cpp @@ -175,7 +175,9 @@ XmlRpcServer::acceptConnection() if (s < 0) { //this->close(); - XmlRpcUtil::error("XmlRpcServer::acceptConnection: Could not accept connection (%s).", XmlRpcSocket::getErrorMsg().c_str()); + if (s != EAGAIN && s != EWOULDBLOCK) { + XmlRpcUtil::error("XmlRpcServer::acceptConnection: Could not accept connection (%s).", XmlRpcSocket::getErrorMsg().c_str()); + } } else if ( ! XmlRpcSocket::setNonBlocking(s)) { _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
