New upstream version 1.5.0upstream

1 files changed, 57 insertions, 14 deletions

diff --git a/doc/freediameter.conf.sample b/doc/freediameter.conf.sample
index 4b2ba9e..e6a6146 100644
--- a/doc/freediameter.conf.sample
+++ b/doc/freediameter.conf.sample
@@ -5,12 +5,12 @@
 
 # It is possible to use "include" keyword to import additional files
 # e.g.: include "/etc/freeDiameter.d/*.conf"
-# This is exactly equivalent as copy & paste the content of the included file(s) 
+# This is exactly equivalent as copy & paste the content of the included file(s)
 # where the "include" keyword is found.
 
 
 ##############################################################
-##  Peer identity and realm 
+##  Peer identity and realm
 
 # The Diameter Identity of this daemon.
 # This must be a valid FQDN that resolves to the local host.
@@ -34,10 +34,10 @@
 # Default: 5868. Use 0 to disable.
 #SecPort = 5868;
 
-# Use RFC3588 method for TLS protection, where TLS is negociated after CER/CEA exchange is completed 
-# on the unsecure connection. The alternative is RFC6733 mechanism, where TLS protects also the 
+# Use RFC3588 method for TLS protection, where TLS is negociated after CER/CEA exchange is completed
+# on the unsecure connection. The alternative is RFC6733 mechanism, where TLS protects also the
 # CER/CEA exchange on a dedicated secure port.
-# This parameter only affects outgoing connections. 
+# This parameter only affects outgoing connections.
 # The setting can be also defined per-peer (see Peers configuration section).
 # Default: use RFC6733 method with separate port for TLS.
 #TLS_old_method;
@@ -88,6 +88,19 @@
 # Default: 5 unidentified clients in paralel.
 #ThreadsPerServer = 5;
 
+# If this host is used as relay or proxy, it can be useful to limit
+# connections from "outside" until enough processing nodes are available.
+# This parameter defines a regex pattern for recognizing such nodes;
+# Default: NO DEFAULT
+#ProcessingPeersPattern = "worker[0-9]*.example.com";
+
+# This next parameter defines how many of these processing peers
+# must be connected before CERs from other hosts are accepted.
+# If this is set, ProcessingPeersPattern must also be defined.
+# If unset or less than 1, ProcessingPeersPattern and this variable do nothing.
+# Default: 0
+#ProcessingPeersMinimum = 0;
+
 ##############################################################
 ##  TLS Configuration
 
@@ -113,14 +126,14 @@ TLS_Cred = "/etc/ssl/certs/freeDiameter.pem", "/etc/ssl/private/freeDiameter.key
 
 # Certificate Revocation List file
 # The information about revoked certificates.
-# The file contains a list of trusted CRLs in PEM format. They should have been verified before. 
+# The file contains a list of trusted CRLs in PEM format. They should have been verified before.
 # (This parameter is passed to gnutls_certificate_set_x509_crl_file function)
 # Note: openssl CRL format might have interoperability issue with GNUTLS format.
 # Default : GNUTLS default behavior
 #TLS_CRL = "<file.PEM>";
 
 # GNU TLS Priority string
-# This string allows to configure the behavior of GNUTLS key exchanges 
+# This string allows to configure the behavior of GNUTLS key exchanges
 # algorithms. See gnutls_priority_init function documentation for information.
 # You should also refer to the Diameter required TLS support here:
 #   http://tools.ietf.org/html/rfc6733#section-13.1
@@ -131,13 +144,13 @@ TLS_Cred = "/etc/ssl/certs/freeDiameter.pem", "/etc/ssl/private/freeDiameter.key
 # Diffie-Hellman parameters size
 # Set the number of bits for generated DH parameters
 # Valid value should be 768, 1024, 2048, 3072 or 4096.
-# (This parameter is passed to gnutls_dh_params_generate2 function, 
+# (This parameter is passed to gnutls_dh_params_generate2 function,
 # it usually should match RSA key size)
 # Default : 1024
 #TLS_DH_Bits = 1024;
 
 # Alternatively, you can specify a file to load the PKCS#3 encoded
-# DH parameters directly from. This accelerates the daemon start 
+# DH parameters directly from. This accelerates the daemon start
 # but is slightly less secure. If this file is provided, the
 # TLS_DH_Bits parameters has no effect.
 # Default : no default.
@@ -165,8 +178,8 @@ TLS_Cred = "/etc/ssl/certs/freeDiameter.pem", "/etc/ssl/private/freeDiameter.key
 
 # Disable the relaying of Diameter messages?
 # For messages not handled locally, the default behavior is to forward the
-# message to another peer if any is available, according to the routing 
-# algorithms. In addition the "0xffffff" application is advertised in CER/CEA 
+# message to another peer if any is available, according to the routing
+# algorithms. In addition the "0xffffff" application is advertised in CER/CEA
 # exchanges.
 # Default: Relaying is enabled.
 #NoRelay;
@@ -175,6 +188,29 @@ TLS_Cred = "/etc/ssl/certs/freeDiameter.pem", "/etc/ssl/private/freeDiameter.key
 # Default: 4
 #AppServThreads = 4;
 
+# Number of server threads that can handle incoming message routing at the same time.
+# Default: 1
+#RoutingInThreads = 1;
+
+# Number of server threads that can handle outgoing message routing at the same time.
+# Default: 1
+#RoutingOutThreads= 1;
+
+# Maximum size of the incoming queue (messages queued after accepting
+# them from the network) before blocking
+# Default: 20
+#IncomingQueueLimit = 20;
+
+# Maximum size of the outgoing queue (messages queued for sending to
+# the network) before blocking
+# Default: 30
+#OutgoingQueueLimit = 30;
+
+# Maximum size of the local queue (messages queued for local handling)
+# before blocking
+# Default: 25
+#LocalQueueLimit = 25;
+
 # Other applications are configured by loaded extensions.
 
 ##############################################################
@@ -184,7 +220,7 @@ TLS_Cred = "/etc/ssl/certs/freeDiameter.pem", "/etc/ssl/private/freeDiameter.key
 # Diameter Base Protocol. The specific application behaviors,
 # as well as advanced functions, are provided
 # by loadable extensions (plug-ins).
-#  These extensions may in addition receive the name of a 
+#  These extensions may in addition receive the name of a
 # configuration file, the format of which is extension-specific.
 #
 # Format:
@@ -223,9 +259,9 @@ TLS_Cred = "/etc/ssl/certs/freeDiameter.pem", "/etc/ssl/private/freeDiameter.key
 
 #  The local server listens for incoming connections. By default,
 # all unknown connecting peers are rejected. Extensions can override this behavior (e.g., acl_wl).
-# 
+#
 #  In addition to incoming connections, the local peer can
-# be configured to establish and maintain connections to some 
+# be configured to establish and maintain connections to some
 # Diameter nodes and allow connections from these nodes.
 #  This is achieved with the ConnectPeer directive described below.
 #
@@ -250,3 +286,10 @@ TLS_Cred = "/etc/ssl/certs/freeDiameter.pem", "/etc/ssl/private/freeDiameter.key
 
 
 ##############################################################
+## General settings
+
+# If Route-Record AVPs should be added in Answers.
+# Possible values: Always, Never
+# Default: Always
+#RouteRecordInAnswers = Never;
+