X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter.comm%2FServer.cpp;h=a751d48f700aaad0af377b8a5b7171747186159d;hb=129af2a9a7c287843be5bd443c5b1ad9b08438a8;hp=20ddc17f0b63564ef6d3201ebe4c12f222d0d938;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/source/diameter.comm/Server.cpp b/source/diameter.comm/Server.cpp
index 20ddc17..a751d48 100644
--- a/source/diameter.comm/Server.cpp
+++ b/source/diameter.comm/Server.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 <anna/diameter.comm/ClientSession.hpp>
@@ -140,7 +112,7 @@ bool Server::send(const Message* message, int socketId) throw(anna::RuntimeExcep
   bool fixedSocket = (socketId != -1);
   int clientSessions = getNumberOfClientSessions();
 
-  for(register int k = 0; k < clientSessions; k++) {    // try round-robin only over one cycle,
+  for(int k = 0; k < clientSessions; k++) {    // try round-robin only over one cycle,
     // no matter where you are: don't repeat same socket
     if(fixedSocket)
       a_lastUsedResource = a_engine->findClientSession(a_socket.first /*ip*/, a_socket.second /*port*/, socketId); // exception if not found
@@ -343,25 +315,36 @@ anna::xml::Node* Server::asXML(anna::xml::Node* parent) const throw() {
 
 
 void Server::eventPeerShutdown(const ClientSession *clientSession) throw() {
-  // Inform father server:
+  // Inform father entity:
   a_parent->eventPeerShutdown(clientSession);
 }
 
+void Server::eventRequestRetransmission(const ClientSession* clientSession, Message *request) throw() {
+  // Inform father entity:
+  a_parent->eventRequestRetransmission(clientSession, request);
+}
+
 void Server::eventResponse(const Response& response) throw(anna::RuntimeException) {
-  // Inform father server:
+  // Inform father entity:
   a_parent->eventResponse(response);
 }
 
 void Server::eventRequest(ClientSession *clientSession, const anna::DataBlock & request) throw(anna::RuntimeException) {
-  // Inform father server:
+  // Inform father entity:
   a_parent->eventRequest(clientSession, request);
 }
 
 void Server::eventUnknownResponse(ClientSession *clientSession, const anna::DataBlock & response) throw(anna::RuntimeException) {
-  // Inform father server:
+  // Inform father entity:
   a_parent->eventUnknownResponse(clientSession, response);
 }
 
+void Server::eventDPA(ClientSession *clientSession, const anna::DataBlock & response) throw(anna::RuntimeException) {
+  // Inform father entity:
+  a_parent->eventDPA(clientSession, response);
+}
+
+
 void Server::availabilityLost() throw() {
   a_available = false;
   std::string socket = anna::functions::socketLiteralAsString(a_socket.first, a_socket.second);