X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcomm%2Fhandler%2FServerSocket.cpp;h=6fa829d8dd8b914d16f09c38ef8454d98da1ca61;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=72a732f972f086c44d74cfdb9db01d348332fa0a;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git diff --git a/source/comm/handler/ServerSocket.cpp b/source/comm/handler/ServerSocket.cpp index 72a732f..6fa829d 100644 --- a/source/comm/handler/ServerSocket.cpp +++ b/source/comm/handler/ServerSocket.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not Nothingness Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// https://bitbucket.org/testillano/anna -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: eduardo.ramos.testillano@gmail.com -// cisco.tierra@gmail.com +// ANNA - Anna is Not Nothingness Anymore // +// // +// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo // +// // +// See project site at http://redmine.teslayout.com/projects/anna-suite // +// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE // #include @@ -54,7 +26,7 @@ using namespace std; using namespace anna; void comm::handler::ServerSocket::initialize() -throw(RuntimeException) { +noexcept(false) { LOGMETHOD(TraceMethod traceMethod("comm::handler::ServerSocket", "initialize", ANNA_FILE_LOCATION)); if(a_serverSocket == NULL) { @@ -97,7 +69,7 @@ throw(RuntimeException) { // para eso bloqueamos el comm::Communicator. */ void comm::handler::ServerSocket::apply() -throw(RuntimeException) { +noexcept(false) { LOGMETHOD(TraceMethod traceMethod("handler::ServerSocket", "apply", ANNA_FILE_LOCATION)); Guard guard(a_communicator, "Communicator from handler::ServerSocket"); comm::LocalConnection* localConnection = a_serverSocket->accept(); @@ -136,7 +108,7 @@ throw(RuntimeException) { // que tengan establecidos contra este ServerSocket. //-------------------------------------------------------------------------- void comm::handler::ServerSocket::breakAddress(const in_addr_t& address) -throw() { +{ LOGMETHOD(TraceMethod traceMethod("comm::handler::ServerSocket", "breakAddress", ANNA_FILE_LOCATION)); const comm::AccessPoint& accessPoint = a_serverSocket->getLocalAccessPoint(); const comm::Device* device = accessPoint.getINetAddress().getDevice(false); @@ -179,7 +151,7 @@ throw() { * MainHandler cuando se use el Communicator::Clone. */ void comm::handler::ServerSocket::finalize() -throw() { +{ LOGMETHOD(TraceMethod traceMethod("comm::handler::ServerSocket", "finalize", ANNA_FILE_LOCATION)); if(a_serverSocket == NULL) @@ -193,7 +165,7 @@ throw() { } string comm::handler::ServerSocket::asString() const -throw() { +{ string result("comm::handler::ServerSocket { "); result += comm::Handler::asString(); result += " | "; @@ -202,7 +174,7 @@ throw() { } xml::Node* comm::handler::ServerSocket::asXML(xml::Node* parent) const -throw() { +{ xml::Node* result = parent->createChild("comm.handler.ServerSocket"); comm::Handler::asAttribute(result);