http: aliases for htp server personalities

In preparation of libhtp rust

diff --git a/src/app-layer-htp-libhtp.h b/src/app-layer-htp-libhtp.h
index 1c611865170f13a3f733e75619320e32885c2502..82bead7e2c0553f52bfbf3c63f38ab2ddb85057e 100644 (file)
--- a/src/app-layer-htp-libhtp.h
+++ b/src/app-layer-htp-libhtp.h
@@ -52,6 +52,17 @@
 #define HTP_STATUS_OK    HTP_OK
 #define HTP_STATUS_ERROR HTP_ERROR
 
+#define HTP_SERVER_PERSONALITY_APACHE_2 HTP_SERVER_APACHE_2
+#define HTP_SERVER_PERSONALITY_MINIMAL  HTP_SERVER_MINIMAL
+#define HTP_SERVER_PERSONALITY_GENERIC  HTP_SERVER_GENERIC
+#define HTP_SERVER_PERSONALITY_IDS      HTP_SERVER_IDS
+#define HTP_SERVER_PERSONALITY_IIS_4_0  HTP_SERVER_IIS_4_0
+#define HTP_SERVER_PERSONALITY_IIS_5_0  HTP_SERVER_IIS_5_0
+#define HTP_SERVER_PERSONALITY_IIS_5_1  HTP_SERVER_IIS_5_1
+#define HTP_SERVER_PERSONALITY_IIS_6_0  HTP_SERVER_IIS_6_0
+#define HTP_SERVER_PERSONALITY_IIS_7_0  HTP_SERVER_IIS_7_0
+#define HTP_SERVER_PERSONALITY_IIS_7_5  HTP_SERVER_IIS_7_5
+
 bstr *SCHTPGenerateNormalizedUri(htp_tx_t *tx, htp_uri_t *uri, bool uri_include_all);
 
 #endif /* SURICATA_APP_LAYER_HTP_LIBHTP__H */

diff --git a/src/app-layer-htp.c b/src/app-layer-htp.c
index febf4d85e6b02b774c418128abd7a27746d78cdb..c1a69ffe36f007e9062f226664e6fbc00b41a3f3 100644 (file)
--- a/src/app-layer-htp.c
+++ b/src/app-layer-htp.c
@@ -242,8 +242,9 @@ static inline uint64_t HtpGetActiveResponseTxID(HtpState *s)
  */
 static const char *HTPLookupPersonalityString(int p)
 {
-#define CASE_HTP_PERSONALITY_STRING(p) \
-    case HTP_SERVER_ ## p: return #p
+#define CASE_HTP_PERSONALITY_STRING(p)                                                             \
+    case HTP_SERVER_PERSONALITY_##p:                                                               \
+        return #p
 
     switch (p) {
         CASE_HTP_PERSONALITY_STRING(MINIMAL);
@@ -271,8 +272,9 @@ static const char *HTPLookupPersonalityString(int p)
  */
 static int HTPLookupPersonality(const char *str)
 {
-#define IF_HTP_PERSONALITY_NUM(p) \
-    if (strcasecmp(#p, str) == 0) return HTP_SERVER_ ## p
+#define IF_HTP_PERSONALITY_NUM(p)                                                                  \
+    if (strcasecmp(#p, str) == 0)                                                                  \
+    return HTP_SERVER_PERSONALITY_##p
 
     IF_HTP_PERSONALITY_NUM(MINIMAL);
     IF_HTP_PERSONALITY_NUM(GENERIC);
@@ -296,7 +298,7 @@ static int HTPLookupPersonality(const char *str)
                      "longer supported by libhtp, failing back to "
                      "Apache2 personality.",
                 str);
-        return HTP_SERVER_APACHE_2;
+        return HTP_SERVER_PERSONALITY_APACHE_2;
     }
 
     return -1;