Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix clang-tidy cppcoreguidelines-macro-usage findings (macros as constants)

Browse source
This commit is contained in:
Tim Wojtulewicz 2025-05-09 11:57:58 -07:00
parent d6d56d330b
commit ad99a6821e
16 changed files with 96 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Desc.cc
View file

@ -11,8 +11,8 @@
#include "zeek/IPAddr.h"
#include "zeek/Reporter.h"
#define DEFAULT_SIZE 128
#define SLOP 10
constexpr unsigned int DEFAULT_SIZE = 128;
constexpr int SLOP = 10;
namespace zeek {

1
src/Val.cc
View file

@ -6,6 +6,7 @@
#include <netdb.h>
#include <netinet/in.h>
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define RAPIDJSON_HAS_STDSTRING 1
#include <rapidjson/document.h>
#include <rapidjson/error/en.h>

3
src/analyzer/protocol/login/Login.cc
View file

@ -133,10 +133,11 @@ void Login_Analyzer::NewLine(bool orig, char* line) {
}
}
constexpr char VMS_REPEAT_SEQ[] = "\x1b[A";
void Login_Analyzer::AuthenticationDialog(bool orig, char* line) {
if ( orig ) {
if ( is_VMS ) {
#define VMS_REPEAT_SEQ "\x1b[A"
char* repeat_prev_line = strstr(line, VMS_REPEAT_SEQ);
if ( repeat_prev_line ) {
if ( repeat_prev_line[strlen(VMS_REPEAT_SEQ)] ) {

75
src/analyzer/protocol/login/NVT.cc
View file

@ -11,27 +11,22 @@
#define IS_3_BYTE_OPTION(c) ((c) >= 251 && (c) <= 254)
#define TELNET_OPT_SB 250
#define TELNET_OPT_SE 240
static constexpr uint8_t TELNET_OPT_SB = 250;
static constexpr uint8_t TELNET_OPT_SE = 240;
#define TELNET_OPT_IS 0
#define TELNET_OPT_SEND 1
static constexpr uint8_t TELNET_OPT_IS = 0;
static constexpr uint8_t TELNET_OPT_SEND = 1;
#define TELNET_OPT_WILL 251
#define TELNET_OPT_WONT 252
#define TELNET_OPT_DO 253
#define TELNET_OPT_DONT 254
static constexpr uint8_t TELNET_OPT_WILL = 251;
static constexpr uint8_t TELNET_OPT_WONT = 252;
static constexpr uint8_t TELNET_OPT_DO = 253;
static constexpr uint8_t TELNET_OPT_DONT = 254;
#define TELNET_IAC 255
static constexpr uint8_t TELNET_IAC = 255;
namespace zeek::analyzer::login {
TelnetOption::TelnetOption(NVT_Analyzer* arg_endp, unsigned int arg_code) {
endp = arg_endp;
code = arg_code;
flags = 0;
active = 0;
}
TelnetOption::TelnetOption(NVT_Analyzer* arg_endp, unsigned int arg_code) : endp(arg_endp), code(arg_code) {}
void TelnetOption::RecvOption(unsigned int type) {
TelnetOption* peer = endp->FindPeerOption(code);
@ -114,15 +109,17 @@ void TelnetTerminalOption::RecvSubOption(u_char* data, int len) {
endp->SetTerminal(data + 1, len - 1);
}
#define ENCRYPT_SET_ALGORITHM 0
#define ENCRYPT_SUPPORT_ALGORITHM 1
#define ENCRYPT_REPLY 2
#define ENCRYPT_STARTING_TO_ENCRYPT 3
#define ENCRYPT_NO_LONGER_ENCRYPTING 4
#define ENCRYPT_REQUEST_START_TO_ENCRYPT 5
#define ENCRYPT_REQUEST_NO_LONGER_ENCRYPT 6
#define ENCRYPT_ENCRYPT_KEY 7
#define ENCRYPT_DECRYPT_KEY 8
enum EncryptOptions : uint8_t {
ENCRYPT_SET_ALGORITHM = 0,
ENCRYPT_SUPPORT_ALGORITHM = 1,
ENCRYPT_REPLY = 2,
ENCRYPT_STARTING_TO_ENCRYPT = 3,
ENCRYPT_NO_LONGER_ENCRYPTING = 4,
ENCRYPT_REQUEST_START_TO_ENCRYPT = 5,
ENCRYPT_REQUEST_NO_LONGER_ENCRYPT = 6,
ENCRYPT_ENCRYPT_KEY = 7,
ENCRYPT_DECRYPT_KEY = 8,
};
void TelnetEncryptOption::RecvSubOption(u_char* data, int len) {
if ( ! active ) {
@ -157,13 +154,15 @@ void TelnetEncryptOption::RecvSubOption(u_char* data, int len) {
}
}
#define HERE_IS_AUTHENTICATION 0
#define SEND_ME_AUTHENTICATION 1
#define AUTHENTICATION_STATUS 2
#define AUTHENTICATION_NAME 3
enum AuthOptions : uint8_t {
HERE_IS_AUTHENTICATION = 0,
SEND_ME_AUTHENTICATION = 1,
AUTHENTICATION_STATUS = 2,
AUTHENTICATION_NAME = 3,
};
#define AUTH_REJECT 1
#define AUTH_ACCEPT 2
constexpr int AUTH_REJECT = 1;
constexpr int AUTH_ACCEPT = 2;
void TelnetAuthenticateOption::RecvSubOption(u_char* data, int len) {
if ( len <= 0 ) {
@ -212,14 +211,14 @@ void TelnetAuthenticateOption::RecvSubOption(u_char* data, int len) {
}
}
#define ENVIRON_IS 0
#define ENVIRON_SEND 1
#define ENVIRON_INFO 2
constexpr uint8_t ENVIRON_IS = 0;
constexpr uint8_t ENVIRON_SEND = 1;
constexpr uint8_t ENVIRON_INFO = 2;
#define ENVIRON_VAR 0
#define ENVIRON_VAL 1
#define ENVIRON_ESC 2
#define ENVIRON_USERVAR 3
constexpr uint8_t ENVIRON_VAR = 0;
constexpr uint8_t ENVIRON_VAL = 1;
constexpr uint8_t ENVIRON_ESC = 2;
constexpr uint8_t ENVIRON_USERVAR = 3;
void TelnetEnvironmentOption::RecvSubOption(u_char* data, int len) {
if ( len <= 0 ) {
@ -386,7 +385,7 @@ void NVT_Analyzer::SetEncrypting(int mode) {
Event(activating_encryption);
}
#define MAX_DELIVER_UNIT 128
constexpr int MAX_DELIVER_UNIT = 128;
void NVT_Analyzer::DoDeliver(int len, const u_char* data) {
while ( len > 0 ) {

25
src/analyzer/protocol/login/NVT.h
View file

@ -4,12 +4,12 @@
#include "zeek/analyzer/protocol/tcp/ContentLine.h"
#define TELNET_OPTION_BINARY 0
#define TELNET_OPTION_TERMINAL 24
#define TELNET_OPTION_AUTHENTICATE 37
#define TELNET_OPTION_ENCRYPT 38
#define TELNET_OPTION_ENVIRON 39
#define NUM_TELNET_OPTIONS 5
constexpr uint8_t TELNET_OPTION_BINARY = 0;
constexpr uint8_t TELNET_OPTION_TERMINAL = 24;
constexpr uint8_t TELNET_OPTION_AUTHENTICATE = 37;
constexpr uint8_t TELNET_OPTION_ENCRYPT = 38;
constexpr uint8_t TELNET_OPTION_ENVIRON = 39;
constexpr uint8_t NUM_TELNET_OPTIONS = 5;
namespace zeek::analyzer::login {
@ -20,11 +20,8 @@ public:
TelnetOption(NVT_Analyzer* endp, unsigned int code);
virtual ~TelnetOption() {}
// Whether we told the other side WILL/WONT/DO/DONT.
#define OPT_SAID_WILL 0x1
#define OPT_SAID_WONT 0x2
#define OPT_SAID_DO 0x4
#define OPT_SAID_DONT 0x8
// Whether we told the other side WILL/WONT/DO/DONT.
enum SaidOptions : uint8_t { OPT_SAID_WILL = 0x1, OPT_SAID_WONT = 0x2, OPT_SAID_DO = 0x4, OPT_SAID_DONT = 0x8 };
unsigned int Code() const { return code; }
@ -52,10 +49,10 @@ protected:
virtual void InconsistentOption(unsigned int type);
virtual void BadOption();
NVT_Analyzer* endp;
NVT_Analyzer* endp = nullptr;
unsigned int code;
int flags;
int active;
int flags = 0;
bool active = false;
};
namespace detail {

14
src/analyzer/protocol/rpc/Portmap.cc
View file

@ -5,12 +5,14 @@
#include "zeek/analyzer/protocol/rpc/XDR.h"
#include "zeek/analyzer/protocol/rpc/events.bif.h"
#define PMAPPROC_NULL 0
#define PMAPPROC_SET 1
#define PMAPPROC_UNSET 2
#define PMAPPROC_GETPORT 3
#define PMAPPROC_DUMP 4
#define PMAPPROC_CALLIT 5
enum PortmapperProcs : uint8_t {
PMAPPROC_NULL = 0,
PMAPPROC_SET = 1,
PMAPPROC_UNSET = 2,
PMAPPROC_GETPORT = 3,
PMAPPROC_DUMP = 4,
PMAPPROC_CALLIT = 5,
};
namespace zeek::analyzer::rpc {
namespace detail {

2
src/analyzer/protocol/rpc/RPC.cc
View file

@ -19,7 +19,7 @@ const bool DEBUG_rpc_resync = false;
// TODO: Should we add start_time and last_time to the rpc_* events??
// TODO: make this configurable
#define MAX_RPC_LEN 65536
constexpr uint32_t MAX_RPC_LEN = 65536;
namespace zeek::analyzer::rpc {
namespace detail {

2
src/file_analysis/analyzer/x509/OCSP.cc
View file

@ -23,7 +23,7 @@ X509* helper_sk_X509_value(const STACK_OF(X509) * certs, int i) { return sk_X509
namespace zeek::file_analysis::detail {
#define OCSP_STRING_BUF_SIZE 2048
static constexpr size_t OCSP_STRING_BUF_SIZE = 2048;
static bool OCSP_RESPID_bio(OCSP_BASICRESP* basic_resp, BIO* bio) {
#if ( OPENSSL_VERSION_NUMBER < 0x10100000L ) || defined(LIBRESSL_VERSION_NUMBER)

9
src/iosource/Manager.cc
View file

@ -19,8 +19,6 @@
#include "zeek/iosource/PktSrc.h"
#include "zeek/plugin/Manager.h"
#define DEFAULT_PREFIX "pcap"
extern int signal_val;
namespace zeek::iosource {
@ -368,6 +366,10 @@ void Manager::Register(PktSrc* src) {
poll_interval = 1;
}
/**
* Checks if the path comes with a prefix telling us which type of PktSrc to use. If no
* prefix exists, return "pcap" as a default.
*/
static std::pair<std::string, std::string> split_prefix(std::string path) {
// See if the path comes with a prefix telling us which type of
// PktSrc to use. If not, choose default.
@ -378,9 +380,8 @@ static std::pair<std::string, std::string> split_prefix(std::string path) {
prefix = path.substr(0, i);
path = path.substr(i + 2, std::string::npos);
}
else
prefix = DEFAULT_PREFIX;
prefix = "pcap";
return std::make_pair(prefix, path);
}

10
src/net_util.cc
View file

@ -123,11 +123,11 @@ int icmp6_checksum(const struct icmp* icmpp, const IP_Hdr* ip, int len) {
len);
}
#define CLASS_A 0x00000000
#define CLASS_B 0x80000000
#define CLASS_C 0xc0000000
#define CLASS_D 0xe0000000
#define CLASS_E 0xf0000000
constexpr uint32_t CLASS_A = 0x00000000;
constexpr uint32_t CLASS_B = 0x80000000;
constexpr uint32_t CLASS_C = 0xc0000000;
constexpr uint32_t CLASS_D = 0xe0000000;
constexpr uint32_t CLASS_E = 0xf0000000;
#define CHECK_CLASS(addr, class) (((addr) & (class)) == (class))
char addr_to_class(uint32_t addr) {

4
src/packet_analysis/protocol/arp/ARP.cc
View file

@ -25,6 +25,8 @@ ARPAnalyzer::ARPAnalyzer() : zeek::packet_analysis::Analyzer("ARP") {}
// ... and on Solaris we are missing half of the ARPOP codes, so define
// them here as necessary:
// NOLINTBEGIN(cppcoreguidelines-macro-usage)
#ifndef ARPOP_REQUEST
#define ARPOP_REQUEST 1 // ARP request.
#endif
@ -84,6 +86,8 @@ ARPAnalyzer::ARPAnalyzer() : zeek::packet_analysis::Analyzer("ARP") {}
#define ARPHRD_IEEE802 6
#endif
// NOLINTEND(cppcoreguidelines-macro-usage)
bool ARPAnalyzer::AnalyzePacket(size_t len, const uint8_t* data, Packet* packet) {
packet->l3_proto = L3_ARP;

12
src/script_opt/FuncInfo.cc
View file

@ -20,29 +20,29 @@ namespace zeek::detail {
// to the event engine.
// Does not change script-level state (though may change internal state).
#define ATTR_NO_SCRIPT_SIDE_EFFECTS 0x1
constexpr unsigned int ATTR_NO_SCRIPT_SIDE_EFFECTS = 0x1;
// Does not change any Zeek state, internal or external. (May change
// state outside of Zeek, such as file system elements.) Implies
// ATTR_NO_SCRIPT_SIDE_EFFECTS.
#define ATTR_NO_ZEEK_SIDE_EFFECTS 0x2
constexpr unsigned int ATTR_NO_ZEEK_SIDE_EFFECTS = 0x2;
// Calls made with the same arguments yield the same results, if made
// after full Zeek initialization. Implies ATTR_NO_ZEEK_SIDE_EFFECTS.
#define ATTR_IDEMPOTENT 0x4
constexpr unsigned int ATTR_IDEMPOTENT = 0x4;
// Calls with constant arguments can always be folded, even prior to
// full Zeek initialization. Such functions must not have the potential
// to generate errors. Implies ATTR_IDEMPOTENT.
#define ATTR_FOLDABLE 0x8
constexpr unsigned int ATTR_FOLDABLE = 0x8;
// The event engine knows about this script function and may call it
// during its processing.
#define ATTR_SPECIAL_SCRIPT_FUNC 0x10
constexpr unsigned int ATTR_SPECIAL_SCRIPT_FUNC = 0x10;
// ZAM knows about this script function and will replace it with specialized
// instructions.
#define ATTR_ZAM_REPLACEABLE_SCRIPT_FUNC 0x20
constexpr unsigned int ATTR_ZAM_REPLACEABLE_SCRIPT_FUNC = 0x20;
static std::unordered_map<std::string, unsigned int> func_attrs = {
// Script functions.

12
src/script_opt/ScriptOpt.cc
View file

@ -718,8 +718,12 @@ bool has_AST_node_unknown_to_script_opt(const ProfileFunc* prof, bool /* is_ZAM
STMT_ASSERT,
// STMT_EXTERN,
// STMT_STD_FUNCTION,
#define SCRIPT_OPT_NUM_STMTS 24
};
// This should be the total number of entries in the set above, including
// the commented values.
constexpr int SCRIPT_OPT_NUM_STMTS = 24;
// clang-format on
// Fail compilation if NUM_STMT in StmtEnums.h changes.
@ -803,8 +807,12 @@ bool has_AST_node_unknown_to_script_opt(const ProfileFunc* prof, bool /* is_ZAM
// EXPR_ANY_INDEX,
// EXPR_SCRIPT_OPT_BUILTIN,
// EXPR_NOP,
#define SCRIPT_OPT_NUM_EXPRS 70
};
// This should be the total number of entries in the set above, including
// the commented values.
constexpr int SCRIPT_OPT_NUM_EXPRS = 70;
// clang-format on
// Fail compilation if NUM_EXPRS in Expr.h changes.

1
src/supervisor/Supervisor.cc
View file

@ -16,6 +16,7 @@
#include <utility>
#include <variant>
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define RAPIDJSON_HAS_STDSTRING 1
#include <rapidjson/document.h>
#include <rapidjson/stringbuffer.h>

1
src/telemetry/Manager.cc
View file

@ -2,6 +2,7 @@
#include "zeek/telemetry/Manager.h"
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define RAPIDJSON_HAS_STDSTRING 1
// CivetServer is from the civetweb submodule in prometheus-cpp

1
src/threading/formatters/JSON.cc
View file

@ -6,6 +6,7 @@
#define __STDC_LIMIT_MACROS
#endif
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define RAPIDJSON_HAS_STDSTRING 1
#include <rapidjson/internal/ieee754.h>