// 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);
}
throw() {
LOGMETHOD(anna::TraceMethod traceMethod("anna::diameter::comm::Session", "expireResponse", ANNA_FILE_LOCATION));
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
doUnbind = true;
}
+ else if(response->getRequest()->getOnExpiry() == Message::OnExpiry::Retransmit) {
+ doRetransmission = true;
+ }
} else
doUnbind = true; // (*)
+
try {
response->setMessage(NULL);
eventResponse(*response);
setState(State::Bound);
}
+ if(doRetransmission) {
+ diameter::comm::Message *request = const_cast<Message*>(response->getRequest());
+ int retries = request->getRetries();
+ if (retries > 0) {
+ retries--;
+ request->setRetries(retries);
+ LOGDEBUG
+ (
+ 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);
+ }
+ }
+
response_erase(response);
if(doUnbind) unbind();
cancelActionTimer(); // Action timer
eventPeerShutdown();
///////////////////////////////////////////////////////////////////////
-// Notificar la finalización de las respuestas pendientes de recibir //
+// Notificar la finalizaci�n de las respuestas pendientes de recibir //
///////////////////////////////////////////////////////////////////////
// RFC 3588 - 5.5.4. Failover and Failback Procedures
//
// 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 ++) {
anna::Logger::debug(msg, ANNA_FILE_LOCATION);
);
}
-