diff --git a/src/utils.cc b/src/utils.cc index 7905717b..022a3355 100644 --- a/src/utils.cc +++ b/src/utils.cc @@ -45,33 +45,6 @@ namespace modsecurity { -std::string phase_name(int x) { - switch (x) { - case modsecurity::Phases::ConnectionPhase: - return "Connection Phase"; - break; - case modsecurity::Phases::UriPhase: - return "URI Phase"; - break; - case modsecurity::Phases::RequestHeadersPhase: - return "Request Headers"; - break; - case modsecurity::Phases::RequestBodyPhase: - return "Request Headers"; - break; - case modsecurity::Phases::ResponseHeadersPhase: - return "Response Headers"; - break; - case modsecurity::Phases::ResponseBodyPhase: - return "Reponse Body"; - break; - case modsecurity::Phases::LoggingPhase: - return "Logging"; - break; - } - return "Phase '" + std::to_string(x) + "' is not known."; -} - int urldecode_nonstrict_inplace(unsigned char *input, uint64_t input_len, int *invalid_count, int *changed) { diff --git a/src/utils.h b/src/utils.h index 163d4469..869010a6 100644 --- a/src/utils.h +++ b/src/utils.h @@ -45,7 +45,6 @@ namespace modsecurity { int win, int *changed); int urldecode_uni_nonstrict_inplace_ex(Transaction *transaction, unsigned char *input, int64_t input_len, int *changed); - std::string phase_name(int x); } // namespace modsecurity diff --git a/src/utils/phase.h b/src/utils/phase.h new file mode 100644 index 00000000..7ea667cc --- /dev/null +++ b/src/utils/phase.h @@ -0,0 +1,59 @@ +/* + * ModSecurity, http://www.modsecurity.org/ + * Copyright (c) 2015 Trustwave Holdings, Inc. (http://www.trustwave.com/) + * + * You may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * If any of the files related to licensing are missing or if you have any + * other questions related to licensing please contact Trustwave Holdings, Inc. + * directly using the email address security@modsecurity.org. + * + */ + +#include +#include +#include +#include + +#ifndef SRC_UTILS_PHASE_H_ +#define SRC_UTILS_PHASE_H_ + +#include "modsecurity/modsecurity.h" + +namespace modsecurity { +namespace utils { + +std::string phase_name(int x) { + switch (x) { + case modsecurity::Phases::ConnectionPhase: + return "Connection Phase"; + break; + case modsecurity::Phases::UriPhase: + return "URI Phase"; + break; + case modsecurity::Phases::RequestHeadersPhase: + return "Request Headers"; + break; + case modsecurity::Phases::RequestBodyPhase: + return "Request Headers"; + break; + case modsecurity::Phases::ResponseHeadersPhase: + return "Response Headers"; + break; + case modsecurity::Phases::ResponseBodyPhase: + return "Reponse Body"; + break; + case modsecurity::Phases::LoggingPhase: + return "Logging"; + break; + } + return "Phase '" + std::to_string(x) + "' is not known."; +} + +} // namespace utils +} // namespace modsecurity + +#endif // SRC_UTILS_PHASE_H_