summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorMatthew Nicholson <mnicholson@digium.com>2011-04-21 18:32:50 +0000
committerMatthew Nicholson <mnicholson@digium.com>2011-04-21 18:32:50 +0000
commit079e794b1cb14b5c9e70966ebaa657e32c144881 (patch)
tree0998d8db216bc1492b06016f865611af9e80400b /configs
parent7f23115ad2faeee58865afbec6bc11a43210fde7 (diff)
Merged revisions 314628 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r314628 | mnicholson | 2011-04-21 13:24:05 -0500 (Thu, 21 Apr 2011) | 27 lines Merged revisions 314620 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r314620 | mnicholson | 2011-04-21 13:22:19 -0500 (Thu, 21 Apr 2011) | 20 lines Merged revisions 314607 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r314607 | mnicholson | 2011-04-21 13:19:21 -0500 (Thu, 21 Apr 2011) | 14 lines Added limits to the number of unauthenticated sessions TCP based protocols are allowed to have open simultaneously. Also added timeouts for unauthenticated sessions where it made sense to do so. Unrelated, the manager interface now properly checks if the user has the "system" privilege before executing shell commands via the Originate action. AST-2011-005 AST-2011-006 (closes issue #18787) Reported by: kobaz (related to issue #18996) Reported by: tzafrir ........ ................ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@314666 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs')
-rw-r--r--configs/http.conf.sample5
-rw-r--r--configs/sip.conf.sample10
-rw-r--r--configs/skinny.conf.sample9
3 files changed, 24 insertions, 0 deletions
diff --git a/configs/http.conf.sample b/configs/http.conf.sample
index f328ea619..8a63148ff 100644
--- a/configs/http.conf.sample
+++ b/configs/http.conf.sample
@@ -34,6 +34,11 @@ bindaddr=127.0.0.1
;
;prefix=asterisk
;
+; sessionlimit specifies the maximum number of httpsessions that will be
+; allowed to exist at any given time. (default: 100)
+;
+;sessionlimit=100
+;
; Whether Asterisk should serve static content from http-static
; Default is no.
;
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 5c8fa4de9..1726299d3 100644
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -202,6 +202,16 @@ tcpbindaddr=0.0.0.0 ; IP address for TCP server to bind to (0.0.0.0
; For details how to construct a certificate for SIP see
; http://tools.ietf.org/html/draft-ietf-sip-domain-certs
+;tcpauthtimeout = 30 ; tcpauthtimeout specifies the maximum number
+ ; of seconds a client has to authenticate. If
+ ; the client does not authenticate beofre this
+ ; timeout expires, the client will be
+ ; disconnected. (default: 30 seconds)
+
+;tcpauthlimit = 100 ; tcpauthlimit specifies the maximum number of
+ ; unauthenticated sessions that will be allowed
+ ; to connect at any given time. (default: 100)
+
srvlookup=yes ; Enable DNS SRV lookups on outbound calls
; Note: Asterisk only uses the first host
; in SRV records
diff --git a/configs/skinny.conf.sample b/configs/skinny.conf.sample
index 2199af19d..d40823ef7 100644
--- a/configs/skinny.conf.sample
+++ b/configs/skinny.conf.sample
@@ -9,6 +9,15 @@ dateformat=M-D-Y ; M,D,Y in any order (6 chars max)
; Use M for month, D for day, Y for year, A for 12-hour time.
keepalive=120
+;authtimeout = 30 ; authtimeout specifies the maximum number of seconds a
+ ; client has to authenticate. If the client does not
+ ; authenticate beofre this timeout expires, the client
+ ; will be disconnected. (default: 30 seconds)
+
+;authlimit = 50 ; authlimit specifies the maximum number of
+ ; unauthenticated sessions that will be allowed to
+ ; connect at any given time. (default: 50)
+
;vmexten=8500 ; Systemwide voicemailmain pilot number
; It must be in the same context as the calling
; device/line