github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-13 13:26:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replaced usage of usleep (not available in Visual C++) with C++11's std::this_thread::sleep_for & std::chrono::microseconds.

Browse Source 
- disabled build error from warning C4716 because process_request does
  not return a value and Visual C++ doesn't support [[noreturn]]
This commit is contained in:
Eduardo Arias 2024-04-23 12:23:53 -03:00
parent a48856822c
commit 942c8ba606
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
examples/reading_logs_via_rule_message/reading_logs_via_rule_message.h
View File

@ -13,10 +13,11 @@
* *
*/ */
#include <unistd.h>
#include <string> #include <string>
#include <memory> #include <memory>
#include <thread>
#include <chrono>
#include <pthread.h>
#define NUM_THREADS 100 #define NUM_THREADS 100
@ -72,6 +73,11 @@ struct data_ms {
modsecurity::RulesSet *rules; modsecurity::RulesSet *rules;
}; };
#if defined _MSC_VER
#pragma warning(push)
#pragma warning(disable:4716) // avoid error C4716: 'process_request': must return a value, as MSVC C++ compiler doesn't support [[noreturn]]
#pragma warning(disable:4715) // avoid warning c4715: 'process_request' : not all control paths return a value
#endif
[[noreturn]] static void *process_request(void *data) { [[noreturn]] static void *process_request(void *data) {
struct data_ms *a = (struct data_ms *)data; struct data_ms *a = (struct data_ms *)data;
@ -85,7 +91,7 @@ struct data_ms {
modsecTransaction->processConnection(ip, 12345, "127.0.0.1", 80); modsecTransaction->processConnection(ip, 12345, "127.0.0.1", 80);
modsecTransaction->processURI(request_uri, "GET", "1.1"); modsecTransaction->processURI(request_uri, "GET", "1.1");
usleep(10); std::this_thread::sleep_for(std::chrono::microseconds(10));
modsecTransaction->addRequestHeader("Host", modsecTransaction->addRequestHeader("Host",
"net.tutsplus.com"); "net.tutsplus.com");
modsecTransaction->processRequestHeaders(); modsecTransaction->processRequestHeaders();
@ -105,6 +111,9 @@ struct data_ms {
pthread_exit(nullptr); pthread_exit(nullptr);
} }
#if defined _MSC_VER
#pragma warning(pop)
#endif
class ReadingLogsViaRuleMessage { class ReadingLogsViaRuleMessage {
public: public:
@ -151,7 +160,7 @@ class ReadingLogsViaRuleMessage {
reinterpret_cast<void *>(&dms)); reinterpret_cast<void *>(&dms));
} }
usleep(10000); std::this_thread::sleep_for(std::chrono::microseconds(10000));
for (i=0; i < NUM_THREADS; i++) { for (i=0; i < NUM_THREADS; i++) {
pthread_join(threads[i], &status); pthread_join(threads[i], &status);