retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed TokenDict arrays not ending with token and value set to 0. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@6342 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2019-01-18 09:46:21 +00:00
parent 25f55abcc5
commit 279f2ae6fe
7 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/ClientLogic.cpp
View File

@ -861,7 +861,7 @@ static const TokenDict s_notifPrefix[] = {
{"messages_1:", PrivNotification1},
{"messages_2:", PrivNotification2},
{"messages_3:", PrivNotification3},
{0,0,}
{0,0}
};
enum ChatLogEnum {
ChatLogSaveAll = 1,

1
libs/ysig/sccp.cpp
View File

@ -136,6 +136,7 @@ const TokenDict SCCPManagement::s_broadcastType[] = {
{ "RemoteSCCPInaccessible", SCCPManagement::SccpRemoteInaccessible },
{ "RemoteSCCPAccessible", SCCPManagement::SccpRemoteAccessible },
{ "SignallingPointCongested", SCCPManagement::PCCongested },
{ 0, 0 }
};
static const TokenDict s_sccpNotif[] = {

6
libs/ysig/tcap.cpp
View File

@ -211,7 +211,7 @@ const TokenDict SS7TCAP::s_tcapVersion[] = {
{"UnknownTCAP", SS7TCAP::UnknownTCAP},
{"ITU-T TCAP", SS7TCAP::ITUTCAP},
{"ANSI TCAP", SS7TCAP::ANSITCAP},
{0,-1},
{0,0},
};
const TokenDict SS7TCAP::s_compPrimitives[] = {
@ -251,6 +251,7 @@ const TokenDict SS7TCAP::s_compOperClasses[] = {
{"reportFail", SS7TCAP::FailureOnlyReport},
{"reportSuccess", SS7TCAP::SuccessOnlyReport},
{"reportNone", SS7TCAP::NoReport},
{0,0},
};
@ -1599,6 +1600,7 @@ const TokenDict SS7TCAPComponent::s_compStates[] = {
{"OperationPending", SS7TCAPComponent::OperationPending},
{"OperationSent", SS7TCAPComponent::OperationSent},
{"WaitForReject", SS7TCAPComponent::WaitForReject},
{0,0}
};
SS7TCAPComponent::SS7TCAPComponent(SS7TCAP::TCAPType type, SS7TCAPTransaction* trans, NamedList& params, unsigned int index)
@ -3284,7 +3286,7 @@ const TokenDict SS7TCAPTransactionITU::s_resultPDUValues[] = {
{"provider-no-common-dialogue-portion", SS7TCAPTransactionITU::DiagnosticProviderNoCommonDialog},
{"dialogue-service-user", SS7TCAPTransactionITU::AbortSourceUser},
{"dialogue-service-provider", SS7TCAPTransactionITU::AbortSourceProvider},
{0,-1},
{0,0},
};
SS7TCAPTransactionITU::SS7TCAPTransactionITU(SS7TCAP* tcap, SS7TCAP::TCAPUserTransActions type,

2
modules/qt4/updater.cpp
View File

@ -112,7 +112,7 @@ static const TokenDict s_policies[] = {
{ "check", UpdateLogic::Check },
{ "download", UpdateLogic::Download },
{ "install", UpdateLogic::Install },
{ 0, UpdateLogic::Invalid }
{0,0}
};
UpdateLogic::~UpdateLogic()

2
modules/server/monitoring.cpp
View File

@ -1355,7 +1355,7 @@ static TokenDict s_dbAccountInfo[] = {
{"errorred", DatabaseAccount::ERROR_IDX},
{"querytime", DatabaseAccount::TIME_IDX},
{"hasconn", DatabaseAccount::CONN_IDX},
{0,-1}
{0,0}
};
TokenDict RTPEntry::s_rtpInfo[] = {

44
modules/sig/camel_map.cpp
View File

@ -477,7 +477,7 @@ static const TokenDict s_tagTypes[] = {
{"application", AsnTag::Application},
{"context", AsnTag::Context},
{"private", AsnTag::Private},
{"", -1},
{0,0}
};
struct Parameter {
@ -3168,7 +3168,7 @@ static const Parameter s_SSCSI[] = {
static const TokenDict s_matchType[] = {
{"inhibiting", 0x00},
{"enabling", 0x01},
{0,0xff},
{0,0},
};
static const Parameter s_destinationNumber[] = {
@ -3193,7 +3193,7 @@ static const TokenDict s_callTypeCriteria[] = {
// TS 100 974 v7.15.0 page 307
{"forwarded", 0x00},
{"notForwarded", 0x01},
{0,0xff},
{0,0},
};
static const Parameter s_causeValue[]={
@ -3429,13 +3429,13 @@ static const TokenDict s_networkAccessMode[] = {
{"bothMSCAndSGSN", 0x00},
{"onlyMSC", 0x01},
{"onlySGSN", 0x02},
{0,0xff},
{0,0},
};
static const TokenDict s_lsaOnlyAccessIndicator[] = {
{"accessOutsideLSAsAllowed", 0x00},
{"accessOutsideLSAsRestricted", 0x01},
{0,0xff},
{0,0},
};
static const Parameter s_LSADataSeq[] = {
@ -3475,7 +3475,7 @@ static const TokenDict s_notificationToMSUser[] = {
static const TokenDict s_GMLCRestriction[] = {
{"gmlc-List", 0x00},
{"home-Country", 0x01},
{0,0xff},
{0,0},
};
static const Parameter s_LCSClientExternalIDSeq[] = {
@ -3503,7 +3503,7 @@ static const TokenDict s_LCSClientInternalIDEnum[] = {
{"o-andM-VPLMN", 0x02},
{"anonymousLocation", 0x03},
{"targetMSsubscribedService", 0x04},
{0,0xff},
{0,0},
};
@ -5364,7 +5364,7 @@ static TokenDict s_eventTypeBCSM[] = {
{"tAnswer", 15},
{"tDisconnect", 17},
{"tAbandon", 18},
{"", 0}
{0, 0}
};
static TokenDict s_naCICSelectionType[] = {
@ -5373,7 +5373,7 @@ static TokenDict s_naCICSelectionType[] = {
{"subscribed-and-dialed", 0x02},
{"subscribed-dialing-undeterminded", 0x03},
{"dialed-CIC-not-subscribed", 0x04},
{"", 0}
{0, 0}
};
static const Parameter s_naCarrierInformationSeq[] = {
@ -5426,13 +5426,13 @@ static const TokenDict s_monitorMode[] = {
{"interrupted", 0x00},
{"notifyAndContinue", 0x01},
{"transparent", 0x02},
{"", 0},
{0, 0},
};
static const TokenDict s_legType[] = {
{"leg1", 0x01},
{"leg2", 0x02},
{"", 0},
{0, 0},
};
static const Parameter s_legID[] = {
@ -5516,7 +5516,7 @@ static const Parameter s_eventSpecificInformationBCSM[] = {
static const TokenDict s_messageType[] = {
{"request", 0x00},
{"notification", 0x01},
{"", 0},
{0, 0},
};
static const Parameter s_miscCallInfoSeq[] = {
@ -5585,7 +5585,7 @@ static const Parameter s_assistRequestInstructionsArgs[] = {
static const TokenDict s_bothwayThroughConnectionInd[] = {
{"bothwayPathRequired", 0x00},
{"bothwayPathNotRequired", 0x01},
{"", 0},
{0, 0},
};
static const Parameter s_serviceInteractionIndicatorsTwo[] = {
@ -5622,7 +5622,7 @@ static const Parameter s_connectToResourceArgs[] = {
static const TokenDict s_timerID[] = {
{"tssf", 0x00},
{"", 0x01},
{0,0},
};
static const Parameter s_resetTimerArgs[] = {
@ -5713,7 +5713,7 @@ static const TokenDict s_requestedInformationType[] = {
{"callStopTime", 0x01},
{"callConnectedElapsedTime", 0x02},
{"releaseCause", 0x1e},
{"", 0xff},
{0,0}
};
static const Parameter s_requestedInformationValue[] = {
@ -5861,7 +5861,7 @@ static const TokenDict s_errorTreatment[] = {
{"stdErrorAndInfo", 0x00},
{"help", 0x01},
{"repeatPrompt", 0x02},
{"", 0xff},
{0,0}
};
static const Parameter s_collectedInfoSeq[] = {
@ -6468,7 +6468,7 @@ static const TokenDict s_problemEnum[] = {
{"unknownOperation", 0x00},
{"tooLate", 0x01},
{"operationNotCancellable", 0x02},
{"", 0xff},
{0,0}
};
static const Parameter s_cancelFailedErr[] = {
@ -6480,7 +6480,7 @@ static const Parameter s_cancelFailedErr[] = {
static const TokenDict s_requestedInfoEnum[] = {
{"unknownRequestedInfo", 0x01},
{"requestedInfoNotAvailable", 0x02},
{"", 0xff},
{0,0}
};
static const Parameter s_requestedInfoErr[] = {
@ -6494,7 +6494,7 @@ static const TokenDict s_systemFailureEnum[] = {
{"basicCallProcessingException", 0x02},
{"resourceStatusFailure", 0x03},
{"endUserFailure", 0x04},
{"", 0xff},
{0,0}
};
static const Parameter s_systemFailureCamelErr[] = {
@ -6507,7 +6507,7 @@ static const TokenDict s_taskRefusedEnum[] = {
{"generic", 0x00},
{"unobtainable", 0x01},
{"congestion", 0x02},
{"", 0xff},
{0,0}
};
static const Parameter s_taskRefusedErr[] = {
@ -6830,13 +6830,13 @@ static const TokenDict s_appStates[] = {
{"active", TcapXApplication::Active},
{"shutdown", TcapXApplication::ShutDown},
{"inactive", TcapXApplication::Inactive},
{"", 0},
{0, 0},
};
static const TokenDict s_userTypes[] = {
{"MAP", TcapXUser::MAP},
{"CAMEL", TcapXUser::CAMEL},
{"", 0},
{0, 0},
};
static void replace(String& str, char what, char with)

7
modules/sig/ss7_lnp_ansi.cpp
View File

@ -327,6 +327,7 @@ static const TokenDict s_digitTypes[] = {
{"OriginalCalledNumber", LNPClient::OriginalCalledNumber},
{"RedirectionNumber", LNPClient::RedirectiongNumber},
{"ConnectedNumber", LNPClient::ConnectedNumber},
{0,0}
};
static const TokenDict s_operations[] = {
@ -337,11 +338,13 @@ static const TokenDict s_operations[] = {
{"NetworkManagement:ACG", LNPClient::NetworkManagementACG},
{"Procedural:ReportError", LNPClient::ProceduralError},
{"None", LNPClient::None},
{0,0}
};
static const TokenDict s_nature[] = {
{"national", LNPClient::NatureNational},
{"international", LNPClient::NatureInternational},
{0,0}
};
static const TokenDict s_plans[] = {
@ -353,12 +356,14 @@ static const TokenDict s_plans[] = {
{"maritimemobile", LNPClient::NPMaritimeMobile},
{"landmobile", LNPClient::NPLandMobile},
{"private", LNPClient::NPPrivate},
{0,0}
};
static const TokenDict s_encodings[] = {
{"notused", LNPClient::EncodingNotUsed},
{"bcd", LNPClient::EncodingBCD},
{"ia5", LNPClient::EncodingIA5},
{0,0}
};
// ANSI Originating Line Info
@ -389,6 +394,7 @@ static const TokenDict s_announce[] = {
{"reorder", LNPClient::Reorder},
{"ring", LNPClient::Ringing},
{"", LNPClient::NotUsed},
{ 0, 0 }
};
static const TokenDict s_acgCauses[] = {
@ -417,6 +423,7 @@ static const TokenDict s_gaps[] = {
{"217", 14},
{"300", 15},
{"0", 0},
{0,0}
};
static const String s_remPC = "RemotePC";