Fix retransmission issues (order, tracing, etc.)

[anna.git] / source / diameter.comm / Entity.cpp

diff --git a/source/diameter.comm/Entity.cpp b/source/diameter.comm/Entity.cpp
index fb98dd8..17c1ebf 100644 (file)
--- a/source/diameter.comm/Entity.cpp
+++ b/source/diameter.comm/Entity.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/Server.hpp>
@@ -118,10 +90,11 @@ int Entity::readSocketId(const Message* message, int maxClientSessions) const th
       anna::diameter::helpers::base::functions::decodeSessionId(sid, diameterIdentity, high, low /* context-teid */, optional);
       return (low % maxClientSessions);
     }
-    //case anna::diameter::helpers::dcca::ChargingContext::SMS:
-    //case anna::diameter::helpers::dcca::ChargingContext::MMS:
-    //default:
-    //   return -1; // IEC model and Unknown traffic types
+    case anna::diameter::helpers::dcca::ChargingContext::SMS:
+    case anna::diameter::helpers::dcca::ChargingContext::MMS:
+    case anna::diameter::helpers::dcca::ChargingContext::Unknown:
+    default:
+       return -1; // IEC model and Unknown traffic types
     }
   } catch(anna::RuntimeException &ex) {
     LOGDEBUG(
@@ -165,7 +138,7 @@ bool Entity::send(const Message* message, bool balance) throw(anna::RuntimeExcep
 
   // Balance
   if(balance) {
-    for(register int k = 0; k < getMaxServers(); k++) {   // try round-robin only over one cycle,
+    for(int k = 0; k < getMaxServers(); k++) {   // try round-robin only over one cycle,
       // no matter where you are: don't repeat same server
       if(a_deliveryIterator == end()) a_deliveryIterator = begin();
 
@@ -348,6 +321,18 @@ void Entity::eventPeerShutdown(const ClientSession* clientSession) throw() {
   );
 }
 
+void Entity::eventRequestRetransmission(const ClientSession* clientSession, Message *request) throw() {
+  LOGWARNING(
+    std::string msg(clientSession->asString());
+
+    HopByHop hopByHop = codec::functions::getHopByHop(request->getBody()); // context identification
+    int retries = request->getRetries();
+
+    msg += anna::functions::asString(" | eventRequestRetransmission: request with application HopByHop: %u; remaining %d retries", hopByHop, retries);
+    anna::Logger::warning(msg, ANNA_FILE_LOCATION);
+  );
+}
+
 std::string Entity::asString() const throw() {
   std::string result("diameter::comm::Entity { ");
   std::string realm = a_engine->getRealm();