From: Bhagya Tholpady (bbantwal) <bbantwal@cisco.com>
Date: Wed, 29 Apr 2020 14:04:03 +0000 (+0000)
Subject: Merge pull request #2185 in SNORT/snort3 from ~BBANTWAL/snort3:sort_inspectors to... 
X-Git-Tag: 3.0.1-3~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f19685fd2b8b3443369f1181ca8f0f98c85df49d;p=thirdparty%2Fsnort3.git

Merge pull request #2185 in SNORT/snort3 from ~BBANTWAL/snort3:sort_inspectors to master

Squashed commit of the following:

commit 5ab5610b9202d21193722a4a3957d84e851a3fa5
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Mon Apr 27 18:49:47 2020 -0400

    managers: sort the inspector list in inspection policy using the instance name

    sort the inspector instances in inspection policy by name rather
    than type to obtain an alphabetically sorted verbose inspector
    config output.
---

diff --git a/src/managers/inspector_manager.cc b/src/managers/inspector_manager.cc
index 53d0d6319..45f5c51aa 100644
--- a/src/managers/inspector_manager.cc
+++ b/src/managers/inspector_manager.cc
@@ -112,7 +112,7 @@ struct PHInstance
     ~PHInstance();
 
     static bool comp(PHInstance* a, PHInstance* b)
-    { return ( a->pp_class.api.type < b->pp_class.api.type ); }
+    { return ( a->name < b->name ); }
 
     void set_name(const char* s)
     { name = s; }