From: Jason Ish <ish@unx.ca>
Date: Mon, 12 Sep 2016 16:39:14 +0000 (-0600)
Subject: setup-app-layer-logger.sh: update for logging changes
X-Git-Tag: suricata-3.2beta1~346
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbbc5ab1fcd7cb8b38a3ccb698c92f1439f8cbea;p=thirdparty%2Fsuricata.git

setup-app-layer-logger.sh: update for logging changes
---

diff --git a/scripts/setup-app-layer-logger.sh b/scripts/setup-app-layer-logger.sh
index 13342412ed..51f8e6d105 100755
--- a/scripts/setup-app-layer-logger.sh
+++ b/scripts/setup-app-layer-logger.sh
@@ -69,40 +69,35 @@ w
 EOF
 }
 
-function patch_suricata_c() {
-    filename="src/suricata.c"
+patch_suricata_common_h() {
+    filename="src/suricata-common.h"
     echo "Patching ${filename}."
     ed -s ${filename} > /dev/null <<EOF
-/#include "output-json-template.h"
-t-
-s/template/${protoname_lower}/
-/TmModuleJsonTemplateLogRegister
--
-.,+t-
--
-.,+s/Template/${protoname}/
-w
-EOF
-}
-
-patch_tm_modules_c() {
-    filename="src/tm-modules.c"
-    echo "Patching ${filename}."
-    ed -s ${filename} > /dev/null <<EOF
-/TMM_JSONTEMPLATELOG
+/LOGGER_JSON_TEMPLATE
 t-
 s/TEMPLATE/${protoname_upper}
 w
 EOF
 }
 
-patch_tm_threads_common_h() {
-    filename="src/tm-threads-common.h"
+function patch_output_c() {
+    filename="src/output.c"
     echo "Patching ${filename}."
     ed -s ${filename} > /dev/null <<EOF
-/TMM_JSONTEMPLATELOG
+# Find #include output-json-template.h and duplicate it for new protocol.
+/#include "output-json-template.h"
 t-
-s/TEMPLATE/${protoname_upper}
+s/template/${protoname_lower}/
+# Find JsonTemplateLogRegister() then backup one line to its comment.
+/JsonTemplateLogRegister
+-
+# Copy the current line and the next line up a line.
+.,+t-
+# Go back a line so we're at the first copied line.
+-
+# Now rename to the new protocol name.
+.,+s/Template/${protoname}/
+# Write.
 w
 EOF
 }
@@ -138,9 +133,8 @@ fi
 
 copy_templates
 patch_makefile_am
-patch_suricata_c
-patch_tm_modules_c
-patch_tm_threads_common_h
+patch_suricata_common_h
+patch_output_c
 patch_suricata_yaml_in
 
 cat <<EOF