Cleanup in iosource/Packet

This commit is contained in:
Tim Wojtulewicz 2020-03-06 16:22:01 -07:00
parent c6f7665953
commit ce17a1f38b
2 changed files with 13 additions and 11 deletions

View file

@ -19,12 +19,14 @@ class RecordVal;
/**
* The Layer 3 type of a packet, as determined by the parsing code in Packet.
* This enum is sized as an int32_t to make the Packet structure align
* correctly.
*/
enum Layer3Proto {
enum Layer3Proto : int32_t {
L3_UNKNOWN = -1, /// Layer 3 type could not be determined.
L3_IPV4 = 1, /// Layer 3 is IPv4.
L3_IPV6 = 2, /// Layer 3 is IPv6.
L3_ARP = 3, /// Layer 3 is ARP.
L3_IPV4 = 1, /// Layer 3 is IPv4.
L3_IPV6 = 2, /// Layer 3 is IPv6.
L3_ARP = 3, /// Layer 3 is ARP.
};
/**
@ -110,7 +112,7 @@ public:
* Returns true if parsing the layer 2 fields failed, including when
* no data was passed into the constructor in the first place.
*/
bool Layer2Valid()
bool Layer2Valid() const
{
return l2_valid;
}
@ -212,14 +214,14 @@ public:
bool l3_checksummed;
private:
// Calculate layer 2 attributes. Sets
// Calculate layer 2 attributes.
void ProcessLayer2();
// Wrapper to generate a packet-level weird.
void Weird(const char* name);
// Renders an MAC address into its ASCII representation.
Val *FmtEUI48(const u_char *mac) const;
Val* FmtEUI48(const u_char *mac) const;
// True if we need to delete associated packet memory upon
// destruction.