From: Jason Ish <ish@unx.ca>
Date: Tue, 29 Nov 2016 13:57:02 +0000 (-0600)
Subject: dnp3: use _ in keyword names instead of "."
X-Git-Tag: suricata-3.2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F2440%2Fhead;p=thirdparty%2Fsuricata.git

dnp3: use _ in keyword names instead of "."

dnp3.ind -> dnp3_ind
dnp3.func -> dnp3_func
dnp3.obj -> dnp3_obj

The variations with a "." are now aliases.
---

diff --git a/src/detect-dnp3.c b/src/detect-dnp3.c
index 5cdad9565f..3baf124f58 100644
--- a/src/detect-dnp3.c
+++ b/src/detect-dnp3.c
@@ -476,8 +476,8 @@ static void DetectDNP3FuncRegister(void)
 {
     SCEnter();
 
-    sigmatch_table[DETECT_AL_DNP3FUNC].name          = "dnp3.func";
-    sigmatch_table[DETECT_AL_DNP3FUNC].alias         = "dnp3_func";
+    sigmatch_table[DETECT_AL_DNP3FUNC].name          = "dnp3_func";
+    sigmatch_table[DETECT_AL_DNP3FUNC].alias         = "dnp3.func";
     sigmatch_table[DETECT_AL_DNP3FUNC].Match         = NULL;
     sigmatch_table[DETECT_AL_DNP3FUNC].AppLayerMatch = NULL;
     sigmatch_table[DETECT_AL_DNP3FUNC].AppLayerTxMatch = DetectDNP3FuncMatch;
@@ -493,8 +493,8 @@ static void DetectDNP3IndRegister(void)
 {
     SCEnter();
 
-    sigmatch_table[DETECT_AL_DNP3IND].name          = "dnp3.ind";
-    sigmatch_table[DETECT_AL_DNP3IND].alias         = "dnp3_ind";
+    sigmatch_table[DETECT_AL_DNP3IND].name          = "dnp3_ind";
+    sigmatch_table[DETECT_AL_DNP3IND].alias         = "dnp3.ind";
     sigmatch_table[DETECT_AL_DNP3IND].Match         = NULL;
     sigmatch_table[DETECT_AL_DNP3IND].AppLayerMatch = NULL;
     sigmatch_table[DETECT_AL_DNP3IND].AppLayerTxMatch = DetectDNP3IndMatch;
@@ -510,8 +510,8 @@ static void DetectDNP3ObjRegister(void)
 {
     SCEnter();
 
-    sigmatch_table[DETECT_AL_DNP3OBJ].name          = "dnp3.obj";
-    sigmatch_table[DETECT_AL_DNP3OBJ].alias         = "dnp3_obj";
+    sigmatch_table[DETECT_AL_DNP3OBJ].name          = "dnp3_obj";
+    sigmatch_table[DETECT_AL_DNP3OBJ].alias         = "dnp3.obj";
     sigmatch_table[DETECT_AL_DNP3OBJ].Match         = NULL;
     sigmatch_table[DETECT_AL_DNP3OBJ].AppLayerMatch = NULL;
     sigmatch_table[DETECT_AL_DNP3OBJ].AppLayerTxMatch = DetectDNP3ObjMatch;