From beb19905c2e281fa2bd5ae4c20620cb34027385f Mon Sep 17 00:00:00 2001
From: Eldon Koyle <eldon.koyle@corelight.com>
Date: Mon, 13 Feb 2023 09:34:42 -0700
Subject: [PATCH] Use constexpr instead of #define

---
 src/packet_analysis/protocol/pbb/PBB.cc | 5 +++++
 src/packet_analysis/protocol/pbb/PBB.h  | 6 ------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/packet_analysis/protocol/pbb/PBB.cc b/src/packet_analysis/protocol/pbb/PBB.cc
index 3b8d72ee06..74153333d8 100644
--- a/src/packet_analysis/protocol/pbb/PBB.cc
+++ b/src/packet_analysis/protocol/pbb/PBB.cc
@@ -4,6 +4,11 @@
 
 using namespace zeek::packet_analysis::PBB;
 
+constexpr int PBB_LEN = 18;
+constexpr int PBB_C_DST_OFF = 4;
+constexpr int PBB_C_SRC_OFF = 10;
+constexpr int PBB_ETYPE_OFF = 16;
+
 PBBAnalyzer::PBBAnalyzer() : zeek::packet_analysis::Analyzer("PBB") { }
 
 bool PBBAnalyzer::AnalyzePacket(size_t len, const uint8_t* data, Packet* packet)
diff --git a/src/packet_analysis/protocol/pbb/PBB.h b/src/packet_analysis/protocol/pbb/PBB.h
index d6f8398fce..da7181b580 100644
--- a/src/packet_analysis/protocol/pbb/PBB.h
+++ b/src/packet_analysis/protocol/pbb/PBB.h
@@ -5,12 +5,6 @@
 #include "zeek/packet_analysis/Analyzer.h"
 #include "zeek/packet_analysis/Component.h"
 
-#define PBB_LEN 18u
-#define PBB_C_DST_OFF 4u
-#define PBB_C_SRC_OFF 10u
-#define PBB_ETYPE_OFF 16u
-
-
 namespace zeek::packet_analysis::PBB
 	{