Remove warnings

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

diff --git a/source/diameter.comm/Session.cpp b/source/diameter.comm/Session.cpp
index 051cbce..736635c 100644 (file)
--- a/source/diameter.comm/Session.cpp
+++ b/source/diameter.comm/Session.cpp
@@ -109,7 +109,7 @@ void Session::initializeSequences() throw() {
   //      affect any state that was set when the original request was
   //      processed.  Duplicate answer messages that are to be locally
   //      consumed (see Section 6.2) SHOULD be silently discarded.
-  srand(::time(NULL) + anna::functions::exclusiveHash(anna::functions::asString("%s:%d|%d", getAddress().c_str(), getPort(), a_socketId)));
+  srand(::time(NULL) + anna::functions::hash(anna::functions::asString("%s:%d|%d", getAddress().c_str(), getPort(), a_socketId).c_str()));
   a_nextHopByHop = rand();
   a_nextEndToEnd = ((::time(NULL) & 0xFFF) << 20) + (rand() & 0xFFFFF);
 }
@@ -240,7 +240,6 @@ throw() {
   bool doUnbind = false;
   bool doRetransmission = false;
 
-  // Quitar el OnExpiry: no tiene sentido habiendo keep-alive (DWR)
   if(response->getClassCode() != ClassCode::Bind) {
     if(response->getRequest()->getOnExpiry() == Message::OnExpiry::Abandon) {
       a_onDisconnect = OnDisconnect::IgnorePendings; // Abandon is not graceful
@@ -270,19 +269,18 @@ throw() {
 
   if(doRetransmission) {
     diameter::comm::Message *request = const_cast<Message*>(response->getRequest());
-    eventRequestRetransmission(request);
-
     int retries = request->getRetries();
     if (retries > 0) {
       retries--;
       request->setRetries(retries);
       LOGDEBUG
       (
-        //std::string msg(asString());
-        std::string msg = anna::functions::asString("Retransmission initiated for request with HopByHop: %u; remaining %d retries", response->getHopByHop(), retries);
+        std::string msg(asString());
+        msg += anna::functions::asString(" | Retransmission initiated for request with HopByHop: %u; remaining %d retries", response->getHopByHop(), retries);
         anna::Logger::debug(msg, ANNA_FILE_LOCATION);
       );
       diameter::codec::functions::setPotentiallyReTransmittedMessageBit(*request);
+      eventRequestRetransmission(request);
       send(request);
     }
   }
@@ -441,7 +439,6 @@ throw() {
 
   // Messages
   anna::xml::Node* messages = result->createChild("diameter.comm.Messages");
-  const Response* response;
   const Message* message;
 
   for(const_response_iterator ii = response_begin(), maxii = response_end(); ii != maxii; ii ++) {
@@ -498,4 +495,3 @@ void Session::updateOutgoingActivityTime(void) throw() {
     anna::Logger::debug(msg, ANNA_FILE_LOCATION);
   );
 }
-