summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/PropertiesI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/PropertiesI.cpp')
-rw-r--r--cpp/src/Ice/PropertiesI.cpp359
1 files changed, 187 insertions, 172 deletions
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index 3467f46c33d..f89dccea13b 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -100,183 +100,198 @@ Ice::PropertiesI::getPropertiesForPrefix(const string& prefix)
// Examples: "Ice.Foo.*" allows all properties with that prefix, such as "Ice.Foo.Bar".
// "Ice.Foo*" allows properties such as "Ice.Foo.Bar" and "Ice.FooBar".
//
-static const string iceProps[] = {
- "ChangeUser",
- "Config",
- "ConnectionIdleTime",
- "Daemon",
- "DaemonNoChdir",
- "DaemonNoClose",
- "Default.Host",
- "Default.Locator",
- "Default.Protocol",
- "Default.Router",
- "Logger.Timestamp",
- "MonitorConnections",
- "Nohup",
- "NullHandleAbort",
- "Override.Compress",
- "Override.Timeout",
- "Plugin.*",
- "PrintAdapterReady",
- "PrintProcessId",
- "ProgramName",
- "RetryIntervals",
- "ServerIdleTime",
- "ThreadPool.Client.Size",
- "ThreadPool.Client.SizeMax",
- "ThreadPool.Client.SizeWarn",
- "ThreadPool.Server.Size",
- "Trace.Network",
- "Trace.Protocol",
- "Trace.Retry",
- "UseSyslog",
- "Warn.AMICallback",
- "Warn.Connections",
- "Warn.Dispatch",
- "Warn.Leaks"
- };
-
-static const string iceBoxProps[] = {
- "DBEnvName.*",
- "PrintServicesReady",
- "Service.*",
- "ServiceManager.AdapterId",
- "ServiceManager.Endpoints",
- "ServiceManager.Identity",
- "UseSharedCommunicator.*"
- };
-
-static const string icePackProps[] = {
- "Node.AdapterId",
- "Node.CollocateRegistry",
- "Node.Data",
- "Node.Endpoints",
- "Node.Name",
- "Node.PrintServersReady",
- "Node.PropertiesOverride",
- "Node.ThreadPool.Size",
- "Node.Trace.Activator",
- "Node.Trace.Adapter",
- "Node.Trace.Server",
- "Node.WaitTime",
- "Registry.Admin.AdapterId",
- "Registry.Admin.Endpoints",
- "Registry.Client.Endpoints",
- "Registry.Data",
- "Registry.DynamicRegistration",
- "Registry.Internal.AdapterId",
- "Registry.Internal.Endpoints",
- "Registry.Server.Endpoints",
- "Registry.Trace.AdapterRegistry",
- "Registry.Trace.NodeRegistry",
- "Registry.Trace.ObjectRegistry",
- "Registry.Trace.ServerRegistry"
- };
-
-static const string icePatchProps[] = {
- "BusyTimeout",
- "RemoveOrphaned",
- "Thorough",
- "Trace.Files",
- "UpdatePeriod"
- };
-
-static const string iceSSLProps[] = {
- "Client.CertificateVerifier",
- "Client.CertPath*",
- "Client.Config",
- "Client.Handshake.Retries",
- "Client.Overrides.CACertificate",
- "Client.Overrides.DSA.Certificate",
- "Client.Overrides.DSA.PrivateKey",
- "Client.Overrides.RSA.Certificate",
- "Client.Overrides.RSA.PrivateKey",
- "Client.Passphrase.Retries",
- "Server.CertificateVerifier",
- "Server.CertPath*",
- "Server.Config",
- "Server.Overrides.CACertificate",
- "Server.Overrides.DSA.Certificate",
- "Server.Overrides.DSA.PrivateKey",
- "Server.Overrides.RSA.Certificate",
- "Server.Overrides.RSA.PrivateKey",
- "Server.Passphrase.Retries",
- "Trace.Security"
- };
-
-static const string iceStormProps[] = {
- "Flush.Timeout",
- "Publish.Endpoints",
- "TopicManager.Endpoints",
- "TopicManager.Proxy",
- "Trace.Flush",
- "Trace.Subscriber",
- "Trace.Topic",
- "Trace.TopicManager"
- };
-
-static const string glacierProps[] = {
- "Router.AcceptCert",
- "Router.AllowCategories",
- "Router.Client.BatchSleepTime",
- "Router.Client.Endpoints",
- "Router.Client.ForwardContext",
- "Router.Endpoints",
- "Router.Identity",
- "Router.PrintProxyOnFd",
- "Router.Server.BatchSleepTime",
- "Router.Server.Endpoints",
- "Router.Server.ForwardContext",
- "Router.SessionManager",
- "Router.Trace.Client",
- "Router.Trace.RoutingTable",
- "Router.Trace.Server",
- "Router.UserId",
- "Starter.AddUserToAllowCategories",
- "Starter.Certificate.BitStrength",
- "Starter.Certificate.CommonName",
- "Starter.Certificate.Country",
- "Starter.Certificate.IssuedAdjust",
- "Starter.Certificate.Locality",
- "Starter.Certificate.Organization",
- "Starter.Certificate.OrganizationalUnit",
- "Starter.Certificate.SecondsValid",
- "Starter.Certificate.StateProvince",
- "Starter.CryptPasswords",
- "Starter.Endpoints",
- "Starter.PasswordVerifier",
- "Starter.PropertiesOverride",
- "Starter.RouterPath",
- "Starter.StartupTimeout",
- "Starter.Trace"
- };
-
-static const string freezeProps[] = {
- "Trace.DB",
- "Trace.Evictor"
- };
-
-struct PropertyValues {
+static const string iceProps[] =
+{
+ "ChangeUser",
+ "Config",
+ "ConnectionIdleTime",
+ "Daemon",
+ "DaemonNoChdir",
+ "DaemonNoClose",
+ "Default.Host",
+ "Default.Locator",
+ "Default.Protocol",
+ "Default.Router",
+ "Logger.Timestamp",
+ "MonitorConnections",
+ "Nohup",
+ "NullHandleAbort",
+ "Override.Compress",
+ "Override.Timeout",
+ "Plugin.*",
+ "PrintAdapterReady",
+ "PrintProcessId",
+ "ProgramName",
+ "RetryIntervals",
+ "ServerIdleTime",
+ "ThreadPool.Client.Size",
+ "ThreadPool.Client.SizeMax",
+ "ThreadPool.Client.SizeWarn",
+ "ThreadPool.Server.Size",
+ "Trace.Network",
+ "Trace.Protocol",
+ "Trace.Retry",
+ "UseSyslog",
+ "Warn.AMICallback",
+ "Warn.Connections",
+ "Warn.Dispatch",
+ "Warn.Leaks"
+};
+
+static const string iceBoxProps[] =
+{
+ "DBEnvName.*",
+ "PrintServicesReady",
+ "Service.*",
+ "ServiceManager.AdapterId",
+ "ServiceManager.Endpoints",
+ "ServiceManager.Identity",
+ "UseSharedCommunicator.*"
+};
+
+static const string icePackProps[] =
+{
+ "Node.AdapterId",
+ "Node.CollocateRegistry",
+ "Node.Data",
+ "Node.Endpoints",
+ "Node.Name",
+ "Node.PrintServersReady",
+ "Node.PropertiesOverride",
+ "Node.ThreadPool.Size",
+ "Node.Trace.Activator",
+ "Node.Trace.Adapter",
+ "Node.Trace.Server",
+ "Node.WaitTime",
+ "Registry.Admin.AdapterId",
+ "Registry.Admin.Endpoints",
+ "Registry.Client.Endpoints",
+ "Registry.Data",
+ "Registry.DynamicRegistration",
+ "Registry.Internal.AdapterId",
+ "Registry.Internal.Endpoints",
+ "Registry.Server.Endpoints",
+ "Registry.Trace.AdapterRegistry",
+ "Registry.Trace.NodeRegistry",
+ "Registry.Trace.ObjectRegistry",
+ "Registry.Trace.ServerRegistry"
+};
+
+static const string icePatchProps[] =
+{
+ "Endpoints",
+ "BusyTimeout",
+ "RemoveOrphaned",
+ "Thorough",
+ "Trace.Files",
+ "UpdatePeriod"
+};
+
+static const string iceSSLProps[] =
+{
+ "Client.CertificateVerifier",
+ "Client.CertPath*",
+ "Client.Config",
+ "Client.Handshake.Retries",
+ "Client.Overrides.CACertificate",
+ "Client.Overrides.DSA.Certificate",
+ "Client.Overrides.DSA.PrivateKey",
+ "Client.Overrides.RSA.Certificate",
+ "Client.Overrides.RSA.PrivateKey",
+ "Client.Passphrase.Retries",
+ "Server.CertificateVerifier",
+ "Server.CertPath*",
+ "Server.Config",
+ "Server.Overrides.CACertificate",
+ "Server.Overrides.DSA.Certificate",
+ "Server.Overrides.DSA.PrivateKey",
+ "Server.Overrides.RSA.Certificate",
+ "Server.Overrides.RSA.PrivateKey",
+ "Server.Passphrase.Retries",
+ "Trace.Security"
+};
+
+static const string iceStormProps[] =
+{
+ "Flush.Timeout",
+ "Publish.Endpoints",
+ "TopicManager.Endpoints",
+ "TopicManager.Proxy",
+ "Trace.Flush",
+ "Trace.Subscriber",
+ "Trace.Topic",
+ "Trace.TopicManager"
+};
+
+static const string glacierProps[] =
+{
+ "Router.AcceptCert",
+ "Router.AllowCategories",
+ "Router.Client.BatchSleepTime",
+ "Router.Client.Endpoints",
+ "Router.Client.ForwardContext",
+ "Router.Endpoints",
+ "Router.Identity",
+ "Router.PrintProxyOnFd",
+ "Router.Server.BatchSleepTime",
+ "Router.Server.Endpoints",
+ "Router.Server.ForwardContext",
+ "Router.SessionManager",
+ "Router.Trace.Client",
+ "Router.Trace.RoutingTable",
+ "Router.Trace.Server",
+ "Router.UserId",
+ "Starter.AddUserToAllowCategories",
+ "Starter.Certificate.BitStrength",
+ "Starter.Certificate.CommonName",
+ "Starter.Certificate.Country",
+ "Starter.Certificate.IssuedAdjust",
+ "Starter.Certificate.Locality",
+ "Starter.Certificate.Organization",
+ "Starter.Certificate.OrganizationalUnit",
+ "Starter.Certificate.SecondsValid",
+ "Starter.Certificate.StateProvince",
+ "Starter.CryptPasswords",
+ "Starter.Endpoints",
+ "Starter.PasswordVerifier",
+ "Starter.PropertiesOverride",
+ "Starter.RouterPath",
+ "Starter.StartupTimeout",
+ "Starter.Trace"
+};
+
+static const string freezeProps[] =
+{
+ "Trace.DB",
+ "Trace.Evictor"
+};
+
+struct PropertyValues
+{
string prefix;
const string* props;
size_t propsSize;
- PropertyValues(string pf, const string* p, size_t s) : prefix(pf), props(p), propsSize(s) {}
+
+ PropertyValues(string pf, const string* p, size_t s) :
+ prefix(pf), props(p), propsSize(s)
+ {
+ }
};
//
// Array of valid properties for each application.
//
-static const PropertyValues validProps[] = {
- PropertyValues("Freeze", freezeProps, sizeof(freezeProps) / sizeof(freezeProps[0])),
- PropertyValues("Glacier", glacierProps, sizeof(glacierProps) / sizeof(glacierProps[0])),
- PropertyValues("IceBox", iceBoxProps, sizeof(iceBoxProps) / sizeof(iceBoxProps[0])),
- PropertyValues("Ice", iceProps, sizeof(iceProps) / sizeof(iceProps[0])),
- PropertyValues("IcePack", icePackProps, sizeof(icePackProps) / sizeof(icePackProps[0])),
- PropertyValues("IcePatch", icePatchProps, sizeof(icePatchProps) / sizeof(icePatchProps[0])),
- PropertyValues("IceSSL", iceSSLProps, sizeof(iceSSLProps) / sizeof(iceSSLProps[0])),
- PropertyValues("IceStorm", iceStormProps, sizeof(iceStormProps) / sizeof(iceStormProps[0]))
- };
+static const PropertyValues validProps[] =
+{
+ PropertyValues("Freeze", freezeProps, sizeof(freezeProps) / sizeof(freezeProps[0])),
+ PropertyValues("Glacier", glacierProps, sizeof(glacierProps) / sizeof(glacierProps[0])),
+ PropertyValues("IceBox", iceBoxProps, sizeof(iceBoxProps) / sizeof(iceBoxProps[0])),
+ PropertyValues("Ice", iceProps, sizeof(iceProps) / sizeof(iceProps[0])),
+ PropertyValues("IcePack", icePackProps, sizeof(icePackProps) / sizeof(icePackProps[0])),
+ PropertyValues("IcePatch", icePatchProps, sizeof(icePatchProps) / sizeof(icePatchProps[0])),
+ PropertyValues("IceSSL", iceSSLProps, sizeof(iceSSLProps) / sizeof(iceSSLProps[0])),
+ PropertyValues("IceStorm", iceStormProps, sizeof(iceStormProps) / sizeof(iceStormProps[0]))
+};
static const size_t validPropsSize = sizeof(validProps) / sizeof(validProps[0]);
@@ -284,9 +299,9 @@ void
Ice::PropertiesI::setProperty(const string& key, const string& value)
{
//
- // Check if the property is legal. (We write to cerr instead of using
- // a logger because no logger may be established at the time the property
- // is parsed.)
+ // Check if the property is legal. (We write to cerr instead of
+ // using a logger because no logger may be established at the time
+ // the property is parsed.)
//
string::size_type dotPos = key.find('.');
if(dotPos != string::npos)