Merged revisions 337775 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r337775 | russell | 2011-09-22 19:45:35 -0500 (Thu, 22 Sep 2011) | 18 lines

  Merged revisions 337774 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r337774 | russell | 2011-09-22 19:44:19 -0500 (Thu, 22 Sep 2011) | 11 lines

    Comment out entries in sample res_pktccops.conf.

    With these options enabled, they can cause Asterisk to freak out by
    SYN flooding a network and eating the CPU.  Obviously it would be good to
    fix the code so that this can't happen, but we can at least change the default
    configuration so it doesn't happen.

    This was reported downstream to the Fedora issue tracker:

        https://bugzilla.redhat.com/show_bug.cgi?id=658431
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337776 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/res_pktccops.conf.sample b/configs/res_pktccops.conf.sample
index 3d61808..769508d 100644 (file)
--- a/configs/res_pktccops.conf.sample
+++ b/configs/res_pktccops.conf.sample
@@ -1,32 +1,32 @@
-; Sample res_pktccops.conf
-
-[general]
-gateinfoperiod => 60 ; default 60s
-gatetimeout = 150 ; default 150
-t1 => 250 ; default 250s
-t7 => 200 ; default 200s
-t8 => 300 ; default 300s
-keepalive => 60 ; default 60s
-
-[teszt]
-host => 192.168.0.24
-pool => 10.0.1.0 10.0.1.255
-pool => 10.0.3.0 10.0.3.255
-pool => 10.0.7.0 10.0.8.255
-pool => 10.0.10.0 10.0.11.255
-
-[general]
-gateinfoperiod => 60 ; default 60s
-gatetimeout = 150 ; default 150
-t1 => 250 ; default 250s
-t7 => 200 ; default 200s
-t8 => 300 ; default 300s
-keepalive => 60 ; default 60s
-
-[test]
-host => 192.168.0.24
-pool => 10.0.1.0 10.0.1.255
-pool => 10.0.3.0 10.0.3.255
-pool => 10.0.7.0 10.0.8.255
-pool => 10.0.10.0 10.0.11.255
-
+;; Sample res_pktccops.conf
+;
+;[general]
+;gateinfoperiod => 60 ; default 60s
+;gatetimeout = 150 ; default 150
+;t1 => 250 ; default 250s
+;t7 => 200 ; default 200s
+;t8 => 300 ; default 300s
+;keepalive => 60 ; default 60s
+;
+;[teszt]
+;host => 192.168.0.24
+;pool => 10.0.1.0 10.0.1.255
+;pool => 10.0.3.0 10.0.3.255
+;pool => 10.0.7.0 10.0.8.255
+;pool => 10.0.10.0 10.0.11.255
+;
+;[general]
+;gateinfoperiod => 60 ; default 60s
+;gatetimeout = 150 ; default 150
+;t1 => 250 ; default 250s
+;t7 => 200 ; default 200s
+;t8 => 300 ; default 300s
+;keepalive => 60 ; default 60s
+;
+;[test]
+;host => 192.168.0.24
+;pool => 10.0.1.0 10.0.1.255
+;pool => 10.0.3.0 10.0.3.255
+;pool => 10.0.7.0 10.0.8.255
+;pool => 10.0.10.0 10.0.11.255
+;