X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcomm%2FNetwork.cpp;h=0a08f5be536ecc48cf38d0b296166641d50df3df;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=583926e3fca6c6c26660fa1f38ad9fd7987f8eb5;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/source/comm/Network.cpp b/source/comm/Network.cpp
index 583926e..0a08f5b 100644
--- a/source/comm/Network.cpp
+++ b/source/comm/Network.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not 'N' 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 <netdb.h>
@@ -51,7 +23,7 @@ using namespace std;
 using namespace anna;
 
 comm::Device* comm::Network::find(const in_addr_t& address)
-throw() {
+{
   Device* result = NULL;
 
   if(a_cacheDevice != NULL && *a_cacheDevice == address)
@@ -69,7 +41,7 @@ throw() {
 }
 
 comm::Host* comm::Network::find_host(const char* name)
-throw() {
+{
   Host* result = NULL;
 
   if(a_cacheHost != NULL && anna_strcmp(a_cacheHost->getName().c_str(), name) == 0)
@@ -87,7 +59,7 @@ throw() {
 }
 
 comm::Host* comm::Network::resolve(const char* hostname)
-throw(RuntimeException) {
+noexcept(false) {
   comm::Host* result = find_host(hostname);
   struct hostent *host;
 
@@ -123,7 +95,7 @@ throw(RuntimeException) {
 
 
 comm::Server* comm::Network::createServer(const char* ip, const int remotePort, const bool autoRecovery, comm::TransportFactory* transportFactory, const Port::_v mode, const DoConnect::_v doConnect)
-throw(RuntimeException) {
+noexcept(false) {
   comm::Server* result(NULL);
   comm::Host* host = find_host(ip);
   Guard guard(host, "comm::Host from comm::Network::createServer");
@@ -144,14 +116,14 @@ throw(RuntimeException) {
 }
 
 comm::Server* comm::Network::createServer(const char* ip, const int remotePort, const bool autoRecovery, comm::ReceiverFactory& rrff, comm::TransportFactory* transportFactory, const Port::_v mode, const DoConnect::_v doConnect)
-throw(RuntimeException) {
+noexcept(false) {
   Server* result = createServer(ip, remotePort, autoRecovery, transportFactory, mode, doConnect);
   result->setReceiverFactory(rrff);
   return result;
 }
 
 //comm::Server* comm::Network::findServer (const char* ip, const int remotePort)
-//   throw (RuntimeException)
+//   noexcept(false)
 //{
 //   comm::Host* _host (NULL);
 //
@@ -167,7 +139,7 @@ throw(RuntimeException) {
 
 
 comm::Server* comm::Network::resolveServer(const char* hostname, const int remotePort, const bool autoRecovery, comm::TransportFactory* transportFactory, const Port::_v mode, const DoConnect::_v doConnect)
-throw(RuntimeException) {
+noexcept(false) {
   comm::Server* result(NULL);
   comm::Host* host = resolve(hostname);
   Guard guard(host, "comm::Host from comm::Network::resolveServer");
@@ -186,26 +158,26 @@ throw(RuntimeException) {
 }
 
 comm::Server* comm::Network::resolveServer(const char* hostname, const int remotePort, const bool autoRecovery, comm::ReceiverFactory& rrff, comm::TransportFactory* transportFactory, const Port::_v mode, const DoConnect::_v doConnect)
-throw(RuntimeException) {
+noexcept(false) {
   Server* result = resolveServer(hostname, remotePort, autoRecovery, transportFactory, mode, doConnect);
   result->setReceiverFactory(rrff);
   return result;
 }
 
 comm::INetAddress comm::Network::getINetAddress(const char* ip, const int port)
-throw(RuntimeException) {
+noexcept(false) {
   const Device* device = find(Device::asAddress(ip));
   return INetAddress(device, port);
 }
 
 comm::INetAddress comm::Network::getINetAddress(const std::string& ip, const int port)
-throw(RuntimeException) {
+noexcept(false) {
   const Device* device = find(Device::asAddress(ip));
   return INetAddress(device, port);
 }
 
 xml::Node* comm::Network::asXML(xml::Node* parent) const
-throw() {
+{
   xml::Node* result = parent->createChild("comm.Network");
   xml::Node* node = result->createChild("comm.Devices");