Révision f3607cde
Ajouté par Ermal il y a environ 10 ans
| pfPorts/suricata/files/patch-alert-pf.diff | ||
|---|---|---|
| 48 | 48 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alert-unified2-alert.Po@am__quote@ |
| 49 | 49 |
diff -rNu ./src/alert-pf.c ./src.new/alert-pf.c |
| 50 | 50 |
--- ./src/alert-pf.c 1969-12-31 19:00:00.000000000 -0500 |
| 51 |
+++ ./src.new/alert-pf.c 2014-04-26 12:24:25.000000000 -0400
|
|
| 52 |
@@ -0,0 +1,800 @@
|
|
| 53 |
+/* Copyright (C) 2007-2010 Open Information Security Foundation
|
|
| 51 |
+++ ./src.new/alert-pf.c 2014-04-30 20:20:08.000000000 -0400
|
|
| 52 |
@@ -0,0 +1,835 @@
|
|
| 53 |
+/* Copyright (C) 2007-2014 Open Information Security Foundation
|
|
| 54 | 54 |
+ * |
| 55 | 55 |
+ * You can copy, redistribute or modify this Program under the terms of |
| 56 | 56 |
+ * the GNU General Public License version 2 as published by the Free |
| ... | ... | |
| 65 | 65 |
+ * version 2 along with this program; if not, write to the Free Software |
| 66 | 66 |
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA |
| 67 | 67 |
+ * 02110-1301, USA. |
| 68 |
+ * |
|
| 69 |
+ * Portions of this module are based on previous works of the following: |
|
| 70 |
+ * |
|
| 71 |
+ * Copyright (c) 2012 Ermal Lu?i |
|
| 72 |
+ * Copyright (c) 2006 Antonio Benojar <zz.stalker@gmail.com> |
|
| 73 |
+ * Copyright (c) 2005 Antonio Benojar <zz.stalker@gmail.com> |
|
| 74 |
+ * |
|
| 75 |
+ * Copyright (c) 2003, 2004 Armin Wolfermann: |
|
| 76 |
+ * |
|
| 77 |
+ * The AlertPfBlock() function is based |
|
| 78 |
+ * on Armin's Wolfermann pftabled-1.03 functions. |
|
| 79 |
+ * |
|
| 80 |
+ * All rights reserved. |
|
| 81 |
+ * |
|
| 82 |
+ * Redistribution and use in source and binary forms, with or without |
|
| 83 |
+ * modification, are permitted provided that the following conditions |
|
| 84 |
+ * are met: |
|
| 85 |
+ * |
|
| 86 |
+ * 1. Redistributions of source code must retain the above copyright |
|
| 87 |
+ * notice, this list of conditions and the following disclaimer. |
|
| 88 |
+ * |
|
| 89 |
+ * 2. Redistributions in binary form must reproduce the above copyright |
|
| 90 |
+ * notice, this list of conditions and the following disclaimer in the |
|
| 91 |
+ * documentation and/or other materials provided with the distribution. |
|
| 92 |
+ * |
|
| 93 |
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR |
|
| 94 |
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
|
| 95 |
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
|
| 96 |
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
|
| 97 |
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
|
| 98 |
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
|
| 99 |
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
|
| 100 |
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
|
| 101 |
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
|
| 102 |
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
|
| 68 | 103 |
+ */ |
| 69 | 104 |
+ |
| 70 | 105 |
+/** |
| ... | ... | |
| 907 | 942 |
+ |
| 908 | 943 |
diff -rNu ./src/suricata.c ./src.new/suricata.c |
| 909 | 944 |
--- ./src/suricata.c 2013-09-24 06:28:37.000000000 -0400 |
| 910 |
+++ ./src.new/suricata.c 2014-04-18 19:44:27.000000000 -0400
|
|
| 945 |
+++ ./src.new/suricata.c 2014-04-30 19:20:58.000000000 -0400
|
|
| 911 | 946 |
@@ -100,6 +100,7 @@ |
| 912 | 947 |
#include "alert-prelude.h" |
| 913 | 948 |
#include "alert-syslog.h" |
| ... | ... | |
| 927 | 962 |
|
| 928 | 963 |
/* stream engine */ |
| 929 | 964 |
TmModuleStreamTcpRegister(); |
| 965 |
@@ -1887,6 +1892,7 @@ |
|
| 966 |
if (engine_analysis) {
|
|
| 967 |
exit(EXIT_SUCCESS); |
|
| 968 |
} |
|
| 969 |
+ SCThresholdConfInitContext(de_ctx,NULL); |
|
| 970 |
} |
|
| 971 |
|
|
| 972 |
/* registering singal handlers we use. We register usr2 here, so that one |
|
| 973 |
@@ -1898,7 +1904,6 @@ |
|
| 974 |
SCCudaPBSetUpQueuesAndBuffers(); |
|
| 975 |
#endif /* __SC_CUDA_SUPPORT__ */ |
|
| 976 |
|
|
| 977 |
- SCThresholdConfInitContext(de_ctx,NULL); |
|
| 978 |
SCAsn1LoadConfig(); |
|
| 979 |
|
|
| 980 |
CoredumpLoadConfig(); |
|
| 981 |
@@ -2019,6 +2024,7 @@ |
|
| 982 |
if (de_ctx->failure_fatal) |
|
| 983 |
exit(EXIT_FAILURE); |
|
| 984 |
} |
|
| 985 |
+ SCThresholdConfInitContext(de_ctx,NULL); |
|
| 986 |
TmThreadActivateDummySlot(); |
|
| 987 |
SCLogInfo("Signature(s) loaded, Detect thread(s) activated.");
|
|
| 988 |
} |
|
| 930 | 989 |
diff -rNu ./src/tm-modules.c ./src.new/tm-modules.c |
| 931 | 990 |
--- ./src/tm-modules.c 2013-09-24 06:28:37.000000000 -0400 |
| 932 | 991 |
+++ ./src.new/tm-modules.c 2014-04-18 16:45:17.000000000 -0400 |
| ... | ... | |
| 953 | 1012 |
TMM_SIZE, |
| 954 | 1013 |
} TmmId; |
| 955 | 1014 |
|
| 956 |
|
|
Formats disponibles : Unified diff
Update suricata pf-alert patch. Submitted-by: Bill Meeks