X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcomm%2FDevice.cpp;h=0bc5766d6ff21a629cde5b71a9c3dddb5175b4d6;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=c2b4e0994710c2762d53fb329f34f602c4f4ce32;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git diff --git a/source/comm/Device.cpp b/source/comm/Device.cpp index c2b4e09..0bc5766 100644 --- a/source/comm/Device.cpp +++ b/source/comm/Device.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 @@ -46,14 +18,14 @@ using namespace std; using namespace anna; string comm::Device::asString() const -throw() { +{ string result("comm::Device { IP: "); result += asString(a_address); return result += anna::functions::asString(" | Status: %s }", (a_status == Status::Up) ? "Up" : "Down"); } xml::Node* comm::Device::asXML(xml::Node* parent) const -throw(RuntimeException) { +noexcept(false) { xml::Node* result = parent->createChild("comm.Device"); result->createAttribute("IP", asString(a_address)); result->createAttribute("Status", (a_status == Status::Up) ? "Up" : "Down"); @@ -61,13 +33,13 @@ throw(RuntimeException) { } void comm::Device::asAttribute(xml::Node* node) const -throw(RuntimeException) { +noexcept(false) { node->createAttribute("IP", asString(a_address)); node->createAttribute("Status", (a_status == Status::Up) ? "Up" : "Down"); } std::string comm::Device::asString(const in_addr_t& address) -throw() { +{ struct in_addr in; in.s_addr = address; return string(inet_ntoa(in));