X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter.comm%2FLocalServer.cpp;h=32247935056d616bbe4291428b266740ab339f98;hb=78be86969d2f26a9084b0c4af6ce43d5fa4ed3fd;hp=0e2bc2ebd7f0d48425cac338e987c5c80ad4c96c;hpb=028006fc5ee34967fcfffff24a2b1c8b410c26c3;p=anna.git diff --git a/source/diameter.comm/LocalServer.cpp b/source/diameter.comm/LocalServer.cpp index 0e2bc2e..3224793 100644 --- a/source/diameter.comm/LocalServer.cpp +++ b/source/diameter.comm/LocalServer.cpp @@ -50,9 +50,9 @@ void LocalServer::initializeStatisticResources() throw() { std::string accName = "local server '"; accName += anna::functions::socketLiteralAsString(a_key.first, a_key.second); accName += "' on origin-realm '"; - accName += a_engine ? a_engine->getOriginRealm() : "unknown"; // it should be known (createServer) + accName += a_engine ? a_engine->getOriginRealmName() : "unknown"; // it should be known (createServer) accName += "' and origin-host '"; - accName += a_engine ? a_engine->getOriginHost() : "unknown"; // it should be known (createServer) + accName += a_engine ? a_engine->getOriginHostName() : "unknown"; // it should be known (createServer) accName += "'"; a_messageStatistics.initialize(accName); } @@ -81,7 +81,7 @@ LocalServer::serverSession_iterator LocalServer::serverSession_find(const server LocalServer::serverSession_key LocalServer::getServerSessionKey(const anna::comm::ClientSocket &clientSocket) const throw() { - return (anna::functions::exclusiveHash(clientSocket.getRemoteAccessPoint().getINetAddress().serialize())); + return (anna::functions::hash(clientSocket.getRemoteAccessPoint().getINetAddress().serialize().c_str())); } @@ -228,7 +228,8 @@ void LocalServer::newConnection() throw(anna::RuntimeException) { } // Inform local server (availability changes): - bool changes = refreshAvailability(); + refreshAvailability(); + // OAM OamModule &oamModule = OamModule::instantiate(); oamModule.count(OamModule::Counter::CreatedConnectionForServerSession); @@ -273,8 +274,7 @@ ServerSession *LocalServer::createServerSession(const anna::comm::ClientSocket & result->setClientSocket((anna::comm::ClientSocket*)(&clientSocket)); result->a_parent = this; result->a_socketId = key; // de momento... - result->initializeSequences(); // despu�s de asignar el LocalServer y el socketId (*) - // (*) Las secuencias se basan en la semilla: srand(::time(NULL) + anna::functions::exclusiveHash(anna::functions::asString("%s:%d|%d", getAddress().c_str(), getPort(), a_socketId))); + result->initializeSequences(); // despues de asignar el LocalServer y el socketId (sequences are seed-based by mean exclusive hash) result->a_engine = a_engine; a_serverSessions.insert(serverSession_value_type(key, result)); newConnection(); @@ -502,7 +502,7 @@ bool LocalServer::send(const Message* message, int socketId) throw(anna::Runtime // Send: try { - const Response* response = a_lastUsedResource->send(message); + a_lastUsedResource->send(message); return true; // no matter if response is NULL (answers, i.e.) or not. } catch(anna::RuntimeException &ex) { ex.trace(); @@ -520,12 +520,11 @@ bool LocalServer::send(const Message* message, int socketId) throw(anna::Runtime bool LocalServer::broadcast(const Message* message) throw(anna::RuntimeException) { LOGMETHOD(anna::TraceMethod tttm("diameter::comm::LocalServer", "broadcast", ANNA_FILE_LOCATION)); - const Response* response; bool allok = true; for(serverSession_iterator it = serverSession_begin(); it != serverSession_end(); it++) { try { - response = serverSession(it)->send(message); + serverSession(it)->send(message); } catch(anna::RuntimeException &ex) { ex.trace(); allok = false;