# HG changeset patch # User Thomas Klausner # Date 1575393539 -3600 # Node ID 1409e693fa0f685067d6fb46dc485fc554410a01 # Parent eff5bb332b5a3f88d3893fff10eebde8cfcbc150 Document IncomingQueueLimit, OutgoingQueueLimit, and LocalQueueLimit diff -r eff5bb332b5a -r 1409e693fa0f doc/freediameter.conf.sample --- a/doc/freediameter.conf.sample Mon Nov 25 02:12:23 2019 +0800 +++ b/doc/freediameter.conf.sample Tue Dec 03 18:18:59 2019 +0100 @@ -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; @@ -126,14 +126,14 @@ # 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 = ""; # 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 @@ -144,13 +144,13 @@ # 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. @@ -178,8 +178,8 @@ # 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; @@ -196,6 +196,21 @@ # 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. ############################################################## @@ -205,7 +220,7 @@ # 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: @@ -244,9 +259,9 @@ # 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. # @@ -277,3 +292,4 @@ # Possible values: Always, Never # Default: Always #RouteRecordInAnswers = Never; +