projects
/
anna.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow to log statistics samples as a event operation
[anna.git]
/
source
/
diameter.comm
/
Engine.cpp
diff --git
a/source/diameter.comm/Engine.cpp
b/source/diameter.comm/Engine.cpp
index
88f78e2
..
d43da75
100644
(file)
--- a/
source/diameter.comm/Engine.cpp
+++ b/
source/diameter.comm/Engine.cpp
@@
-16,7
+16,6
@@
#include <anna/comm/Network.hpp>
#include <anna/comm/Host.hpp>
#include <anna/comm/ClientSocket.hpp>
#include <anna/comm/Network.hpp>
#include <anna/comm/Host.hpp>
#include <anna/comm/ClientSocket.hpp>
-
#include <anna/diameter.comm/Transport.hpp>
#include <anna/diameter.comm/Engine.hpp>
#include <anna/diameter.comm/Entity.hpp>
#include <anna/diameter.comm/Transport.hpp>
#include <anna/diameter.comm/Engine.hpp>
#include <anna/diameter.comm/Entity.hpp>
@@
-63,8
+62,8
@@
comm::Engine::Engine(const char *className, const stack::Dictionary *baseProtoco
a_baseProtocolCodecEngine((std::string("baseProtocolCodecEngine_for_") + std::string(className)).c_str(), baseProtocolDictionary)
{
anna::diameter::sccs::activate();
a_baseProtocolCodecEngine((std::string("baseProtocolCodecEngine_for_") + std::string(className)).c_str(), baseProtocolDictionary)
{
anna::diameter::sccs::activate();
- a_
r
ealm = anna::functions::getDomainname();
- a_
h
ost = anna::functions::getHostname();
+ a_
originR
ealm = anna::functions::getDomainname();
+ a_
originH
ost = anna::functions::getHostname();
// Internal base protocol codec engine:
a_baseProtocolCodecEngine.setValidationMode(anna::diameter::codec::Engine::ValidationMode::Always); // default was: after decoding
// Internal base protocol codec engine:
a_baseProtocolCodecEngine.setValidationMode(anna::diameter::codec::Engine::ValidationMode::Always); // default was: after decoding
@@
-116,8
+115,8
@@
void comm::Engine::setClientCERandDWR(const std::string & cer, const std::string
// * [Acct-Application-Id] 259 Unsigned32
anna::diameter::codec::Message diameterCER(getBaseProtocolCodecEngine());
int applicationId = 0 /*anna::diameter::helpers::APPID__3GPP_Rx*/; // Unsigned32
// * [Acct-Application-Id] 259 Unsigned32
anna::diameter::codec::Message diameterCER(getBaseProtocolCodecEngine());
int applicationId = 0 /*anna::diameter::helpers::APPID__3GPP_Rx*/; // Unsigned32
- std::string OH = getHost();
- std::string OR = getRealm();
+ std::string OH = get
Origin
Host();
+ std::string OR = get
Origin
Realm();
std::string hostIP = anna::functions::getHostnameIP(); // Address
int vendorId = anna::diameter::helpers::VENDORID__tgpp; // Unsigned32
std::string productName = "ANNA Diameter Client"; // UTF8String
std::string hostIP = anna::functions::getHostnameIP(); // Address
int vendorId = anna::diameter::helpers::VENDORID__tgpp; // Unsigned32
std::string productName = "ANNA Diameter Client"; // UTF8String
@@
-769,13
+768,13
@@
int comm::Engine::getOTARequestsForLocalServers() const throw() {
}
}
-void comm::Engine::set
Realm(const std::string & name
) throw() {
- a_
realm = ((name != "") ? name
: anna::functions::getDomainname());
+void comm::Engine::set
OriginRealm(const std::string & originRealm
) throw() {
+ a_
originRealm = ((originRealm != "") ? originRealm
: anna::functions::getDomainname());
}
}
-void comm::Engine::set
Host(const std::string & name
) throw() {
- a_
host = ((name != "") ? name
: anna::functions::getHostname());
+void comm::Engine::set
OriginHost(const std::string & originHost
) throw() {
+ a_
originHost = ((originHost != "") ? originHost
: anna::functions::getHostname());
}
}
@@
-927,8
+926,10
@@
comm::Engine::entity_key comm::Engine::getEntityKey(const socket_v &v) const thr
void comm::Engine::availabilityLostForEntities() throw() {
a_availableForEntities = false;
LOGDEBUG(
void comm::Engine::availabilityLostForEntities() throw() {
a_availableForEntities = false;
LOGDEBUG(
- std::string msg = "diameter::comm::Engine { Realm: ";
- msg += getRealm();
+ std::string msg = "diameter::comm::Engine { Origin-Realm: ";
+ msg += getOriginRealm();
+ msg += " | Origin-Host: ";
+ msg += getOriginHost();
msg += " } has lost its availability for entities";
anna::Logger::debug(msg, ANNA_FILE_LOCATION);
);
msg += " } has lost its availability for entities";
anna::Logger::debug(msg, ANNA_FILE_LOCATION);
);
@@
-944,8
+945,10
@@
void comm::Engine::availabilityLostForEntities() throw() {
void comm::Engine::availabilityRecoveredForEntities() throw() {
a_availableForEntities = true;
LOGDEBUG(
void comm::Engine::availabilityRecoveredForEntities() throw() {
a_availableForEntities = true;
LOGDEBUG(
- std::string msg = "diameter::comm::Engine { Realm: ";
- msg += getRealm();
+ std::string msg = "diameter::comm::Engine { Origin-Realm: ";
+ msg += getOriginRealm();
+ msg += " | Origin-Host: ";
+ msg += getOriginHost();
msg += " } has recovered its availability for entities";
anna::Logger::debug(msg, ANNA_FILE_LOCATION);
);
msg += " } has recovered its availability for entities";
anna::Logger::debug(msg, ANNA_FILE_LOCATION);
);
@@
-961,8
+964,10
@@
void comm::Engine::availabilityRecoveredForEntities() throw() {
void comm::Engine::availabilityLostForLocalServers() throw() {
a_availableForLocalServers = false;
LOGDEBUG(
void comm::Engine::availabilityLostForLocalServers() throw() {
a_availableForLocalServers = false;
LOGDEBUG(
- std::string msg = "diameter::comm::Engine { Realm: ";
- msg += getRealm();
+ std::string msg = "diameter::comm::Engine { Origin-Realm: ";
+ msg += getOriginRealm();
+ msg += " | Origin-Host: ";
+ msg += getOriginHost();
msg += " } has lost its availability for local servers";
anna::Logger::debug(msg, ANNA_FILE_LOCATION);
);
msg += " } has lost its availability for local servers";
anna::Logger::debug(msg, ANNA_FILE_LOCATION);
);
@@
-978,8
+983,10
@@
void comm::Engine::availabilityLostForLocalServers() throw() {
void comm::Engine::availabilityRecoveredForLocalServers() throw() {
a_availableForLocalServers = true;
LOGDEBUG(
void comm::Engine::availabilityRecoveredForLocalServers() throw() {
a_availableForLocalServers = true;
LOGDEBUG(
- std::string msg = "diameter::comm::Engine { Realm: ";
- msg += getRealm();
+ std::string msg = "diameter::comm::Engine { Origin-Realm: ";
+ msg += getOriginRealm();
+ msg += " | Origin-Host: ";
+ msg += getOriginHost();
msg += " } has recovered its availability for local servers";
anna::Logger::debug(msg, ANNA_FILE_LOCATION);
);
msg += " } has recovered its availability for local servers";
anna::Logger::debug(msg, ANNA_FILE_LOCATION);
);
@@
-1076,11
+1083,11
@@
void comm::Engine::readDPA(anna::DataBlock &dpa, const anna::DataBlock & dpr) th
// Origin-Host
avpOH.setId(anna::diameter::helpers::base::AVPID__Origin_Host);
avpOH.setMandatoryBit();
// Origin-Host
avpOH.setId(anna::diameter::helpers::base::AVPID__Origin_Host);
avpOH.setMandatoryBit();
- avpOH.getDiameterIdentity()->fromPrintableString(a_
h
ost.c_str());
+ avpOH.getDiameterIdentity()->fromPrintableString(a_
originH
ost.c_str());
// Origin-Realm
avpOR.setId(anna::diameter::helpers::base::AVPID__Origin_Realm);
avpOR.setMandatoryBit();
// Origin-Realm
avpOR.setId(anna::diameter::helpers::base::AVPID__Origin_Realm);
avpOR.setMandatoryBit();
- avpOR.getDiameterIdentity()->fromPrintableString(a_
r
ealm.c_str());
+ avpOR.getDiameterIdentity()->fromPrintableString(a_
originR
ealm.c_str());
diameterDPA.addAvp(&avpRC);
diameterDPA.addAvp(&avpOH);
diameterDPA.addAvp(&avpOR);
diameterDPA.addAvp(&avpRC);
diameterDPA.addAvp(&avpOH);
diameterDPA.addAvp(&avpOR);
@@
-1137,11
+1144,11
@@
void comm::Engine::readCEA(anna::DataBlock &cea, const anna::DataBlock & cer) th
// Origin-Host
avpOH.setId(anna::diameter::helpers::base::AVPID__Origin_Host);
avpOH.setMandatoryBit();
// Origin-Host
avpOH.setId(anna::diameter::helpers::base::AVPID__Origin_Host);
avpOH.setMandatoryBit();
- avpOH.getDiameterIdentity()->fromPrintableString(a_
h
ost.c_str());
+ avpOH.getDiameterIdentity()->fromPrintableString(a_
originH
ost.c_str());
// Origin-Realm
avpOR.setId(anna::diameter::helpers::base::AVPID__Origin_Realm);
avpOR.setMandatoryBit();
// Origin-Realm
avpOR.setId(anna::diameter::helpers::base::AVPID__Origin_Realm);
avpOR.setMandatoryBit();
- avpOR.getDiameterIdentity()->fromPrintableString(a_
r
ealm.c_str());
+ avpOR.getDiameterIdentity()->fromPrintableString(a_
originR
ealm.c_str());
diameterCEA.addAvp(&avpRC);
diameterCEA.addAvp(&avpOH);
diameterCEA.addAvp(&avpOR);
diameterCEA.addAvp(&avpRC);
diameterCEA.addAvp(&avpOH);
diameterCEA.addAvp(&avpOR);
@@
-1152,7
+1159,7
@@
void comm::Engine::readCEA(anna::DataBlock &cea, const anna::DataBlock & cer) th
int vendorId = anna::diameter::helpers::VENDORID__tgpp; // Unsigned32
diameterCEA.addAvp(anna::diameter::helpers::base::AVPID__Vendor_Id)->getUnsigned32()->setValue(vendorId);
// Product-Name
int vendorId = anna::diameter::helpers::VENDORID__tgpp; // Unsigned32
diameterCEA.addAvp(anna::diameter::helpers::base::AVPID__Vendor_Id)->getUnsigned32()->setValue(vendorId);
// Product-Name
- std::string productName = "
OCS
Diameter Server"; // UTF8String
+ std::string productName = "Diameter Server"; // UTF8String
diameterCEA.addAvp(anna::diameter::helpers::base::AVPID__Product_Name)->getUTF8String()->setValue(productName);
// Encode
cea = diameterCEA.code();
diameterCEA.addAvp(anna::diameter::helpers::base::AVPID__Product_Name)->getUTF8String()->setValue(productName);
// Encode
cea = diameterCEA.code();
@@
-1256,11
+1263,11
@@
void comm::Engine::readDWA(anna::DataBlock &dwa, const anna::DataBlock & dwr) th
// Origin-Host
avpOH.setId(anna::diameter::helpers::base::AVPID__Origin_Host);
avpOH.setMandatoryBit();
// Origin-Host
avpOH.setId(anna::diameter::helpers::base::AVPID__Origin_Host);
avpOH.setMandatoryBit();
- avpOH.getDiameterIdentity()->fromPrintableString(a_
h
ost.c_str());
+ avpOH.getDiameterIdentity()->fromPrintableString(a_
originH
ost.c_str());
// Origin-Realm
avpOR.setId(anna::diameter::helpers::base::AVPID__Origin_Realm);
avpOR.setMandatoryBit();
// Origin-Realm
avpOR.setId(anna::diameter::helpers::base::AVPID__Origin_Realm);
avpOR.setMandatoryBit();
- avpOR.getDiameterIdentity()->fromPrintableString(a_
r
ealm.c_str());
+ avpOR.getDiameterIdentity()->fromPrintableString(a_
originR
ealm.c_str());
diameterDWA.addAvp(&avpRC);
diameterDWA.addAvp(&avpOH);
diameterDWA.addAvp(&avpOR);
diameterDWA.addAvp(&avpRC);
diameterDWA.addAvp(&avpOH);
diameterDWA.addAvp(&avpOR);