]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
list keywords: restore 2.0 similar output
authorEric Leblond <eric@regit.org>
Fri, 16 Jan 2015 09:12:55 +0000 (10:12 +0100)
committerVictor Julien <victor@inliniac.net>
Fri, 17 Apr 2015 12:53:13 +0000 (14:53 +0200)
Unset was previously displayed if the application layer was not
set. Code before this patch was displaying '(null)' which is not
user friendly.

src/detect.c

index ad0af28c8ac8b2e8db28b758cb2b057f5e8d3f7b..648c69ef7e01ae20c80ebe19518f73f97423fead 100644 (file)
@@ -4902,8 +4902,8 @@ static inline void SigMultilinePrint(int i, char *prefix)
 void SigTableList(const char *keyword)
 {
     size_t size = sizeof(sigmatch_table) / sizeof(SigTableElmt);
-
     size_t i;
+    char *proto_name;
 
     if (keyword == NULL) {
         printf("=====Supported keywords=====\n");
@@ -4928,8 +4928,8 @@ void SigTableList(const char *keyword)
                     printf("%s", sigmatch_table[i].desc);
                 }
                 /* Build feature */
-                printf(";%s;",
-                       AppLayerGetProtoName(sigmatch_table[i].alproto));
+                proto_name = AppLayerGetProtoName(sigmatch_table[i].alproto);
+                printf(";%s;", proto_name ? proto_name : "Unset");
                 PrintFeatureList(sigmatch_table[i].flags, ':');
                 printf(";");
                 if (sigmatch_table[i].url) {