Skip to content

Commit 42d15e2

Browse files
rtmengrtmeng
committed
Refactor code to avoid inconsistent override usage
1 parent b1929bf commit 42d15e2

11 files changed

+36
-36
lines changed

‎Packet++/header/DhcpLayer.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ namespace pcpp
793793
/**
794794
* @return The size of @ref dhcp_header + size of options
795795
*/
796-
size_t getHeaderLen() const { return m_DataLen; }
796+
size_t getHeaderLen() const override { return m_DataLen; }
797797

798798
/**
799799
* Calculate the following fields:
@@ -804,11 +804,11 @@ namespace pcpp
804804
* - @ref dhcp_header#hardwareType = 1 (Ethernet)
805805
* - @ref dhcp_header#hardwareAddressLength = 6 (MAC address length)
806806
*/
807-
void computeCalculateFields();
807+
void computeCalculateFields() override;
808808

809-
std::string toString() const;
809+
std::string toString() const override;
810810

811-
OsiModelLayer getOsiModelLayer() const { return OsiModelApplicationLayer; }
811+
OsiModelLayer getOsiModelLayer() const override { return OsiModelApplicationLayer; }
812812

813813
private:
814814

‎Packet++/header/FtpLayer.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ namespace pcpp
4343
/**
4444
* @return Get the size of the layer
4545
*/
46-
size_t getHeaderLen() const { return m_DataLen; }
46+
size_t getHeaderLen() const override { return m_DataLen; }
4747

4848
/// Does nothing for this layer
49-
void computeCalculateFields() {}
49+
void computeCalculateFields() override {}
5050

5151
/**
5252
* @return The OSI layer level of FTP (Application Layer).
5353
*/
54-
OsiModelLayer getOsiModelLayer() const { return OsiModelApplicationLayer; }
54+
OsiModelLayer getOsiModelLayer() const override { return OsiModelApplicationLayer; }
5555

5656
};
5757

‎Packet++/header/IgmpLayer.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -222,11 +222,11 @@ class IgmpLayer : public Layer
222222
/**
223223
* @return Size of IGMP header = 8B
224224
*/
225-
size_t getHeaderLen() const { return sizeof(igmp_header); }
225+
size_t getHeaderLen() const override { return sizeof(igmp_header); }
226226

227-
std::string toString() const;
227+
std::string toString() const override;
228228

229-
OsiModelLayer getOsiModelLayer() const { return OsiModelNetworkLayer; }
229+
OsiModelLayer getOsiModelLayer() const override { return OsiModelNetworkLayer; }
230230
};
231231

232232

‎Packet++/header/NtpLayer.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -655,20 +655,20 @@ namespace pcpp
655655
/**
656656
* @return Get the size of the layer (Including the extension and authentication fields if exists)
657657
*/
658-
size_t getHeaderLen() const { return m_DataLen; }
658+
size_t getHeaderLen() const override { return m_DataLen; }
659659

660660
/// Does nothing for this layer
661-
void computeCalculateFields() {}
661+
void computeCalculateFields() override {}
662662

663663
/**
664664
* @return The OSI layer level of NTP (Application Layer).
665665
*/
666-
OsiModelLayer getOsiModelLayer() const { return OsiModelApplicationLayer; }
666+
OsiModelLayer getOsiModelLayer() const override { return OsiModelApplicationLayer; }
667667

668668
/**
669669
* @return Returns the protocol info as readable string
670670
*/
671-
std::string toString() const;
671+
std::string toString() const override;
672672
};
673673

674674
} // namespace pcpp

‎Packet++/header/PPPoELayer.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -406,9 +406,9 @@ namespace pcpp
406406
/**
407407
* @return The header length which is size of strcut pppoe_header plus the total size of tags
408408
*/
409-
virtual size_t getHeaderLen() const;
409+
size_t getHeaderLen() const override;
410410

411-
virtual std::string toString() const { return "PPP-over-Ethernet Discovery (" + codeToString((PPPoELayer::PPPoECode)getPPPoEHeader()->code) + ")"; }
411+
virtual std::string toString() const override { return "PPP-over-Ethernet Discovery (" + codeToString((PPPoELayer::PPPoECode)getPPPoEHeader()->code) + ")"; }
412412

413413
private:
414414
TLVRecordReader<PPPoETag> m_TagReader;

‎Packet++/header/PacketTrailerLayer.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,16 @@ namespace pcpp
6666
/**
6767
* @return trailer data length in bytes
6868
*/
69-
size_t getHeaderLen() const { return m_DataLen; }
69+
size_t getHeaderLen() const override { return m_DataLen; }
7070

7171
/**
7272
* Does nothing for this layer
7373
*/
74-
void computeCalculateFields() {}
74+
void computeCalculateFields() override {}
7575

76-
std::string toString() const;
76+
std::string toString() const override;
7777

78-
OsiModelLayer getOsiModelLayer() const { return OsiModelDataLinkLayer; }
78+
OsiModelLayer getOsiModelLayer() const override { return OsiModelDataLinkLayer; }
7979
};
8080

8181
}

‎Packet++/header/RadiusLayer.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ namespace pcpp
316316
/**
317317
* @return The size written in radius_header#length
318318
*/
319-
size_t getHeaderLen() const;
319+
size_t getHeaderLen() const override;
320320

321321
/**
322322
* Does nothing for this layer, RADIUS is always last
@@ -326,11 +326,11 @@ namespace pcpp
326326
/**
327327
* Calculate and store the value of radius_header#length according to the layer size
328328
*/
329-
void computeCalculateFields();
329+
void computeCalculateFields() override;
330330

331-
std::string toString() const;
331+
std::string toString() const override;
332332

333-
OsiModelLayer getOsiModelLayer() const { return OsiModelApplicationLayer; }
333+
OsiModelLayer getOsiModelLayer() const override { return OsiModelApplicationLayer; }
334334
};
335335

336336

‎Packet++/header/SmtpLayer.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ namespace pcpp
4545
/**
4646
* @return Get the size of the layer
4747
*/
48-
size_t getHeaderLen() const { return m_DataLen; }
48+
size_t getHeaderLen() const override { return m_DataLen; }
4949

5050
/// Does nothing for this layer
51-
void computeCalculateFields() {}
51+
void computeCalculateFields() override {}
5252

5353
/**
5454
* @return The OSI layer level of SMTP (Application Layer).
5555
*/
56-
OsiModelLayer getOsiModelLayer() const { return OsiModelApplicationLayer; }
56+
OsiModelLayer getOsiModelLayer() const override { return OsiModelApplicationLayer; }
5757
};
5858

5959
/**

‎Packet++/header/StpLayer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ typedef stp_tcn_bpdu stp_header;
785785
/**
786786
* @return Returns the protocol info as readable string
787787
*/
788-
std::string toString() const { return "Multiple Spanning Tree"; }
788+
std::string toString() const override { return "Multiple Spanning Tree"; }
789789

790790
/**
791791
* A static method that validates the input data

‎Packet++/header/TelnetLayer.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -329,20 +329,20 @@ class TelnetLayer : public Layer
329329
/**
330330
* @return Get the size of the layer
331331
*/
332-
size_t getHeaderLen() const { return m_DataLen; }
332+
size_t getHeaderLen() const override { return m_DataLen; }
333333

334334
/// Does nothing for this layer
335-
void computeCalculateFields() {}
335+
void computeCalculateFields() override {}
336336

337337
/**
338338
* @return The OSI layer level of Telnet (Application Layer).
339339
*/
340-
OsiModelLayer getOsiModelLayer() const { return OsiModelApplicationLayer; }
340+
OsiModelLayer getOsiModelLayer() const override { return OsiModelApplicationLayer; }
341341

342342
/**
343343
* @return Returns the protocol info as readable string
344344
*/
345-
std::string toString() const;
345+
std::string toString() const override;
346346
};
347347

348348
} // namespace pcpp

‎Packet++/header/WakeOnLanLayer.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -152,19 +152,19 @@ namespace pcpp
152152
/**
153153
* @return Get the size of the layer
154154
*/
155-
size_t getHeaderLen() const { return m_DataLen; }
155+
size_t getHeaderLen() const override { return m_DataLen; }
156156

157157
/// Does nothing for this layer
158-
void computeCalculateFields() {}
158+
void computeCalculateFields() override {}
159159

160160
/**
161161
* @return The OSI layer level of Wake on LAN (Data Link Layer)
162162
*/
163-
OsiModelLayer getOsiModelLayer() const { return OsiModelDataLinkLayer; }
163+
OsiModelLayer getOsiModelLayer() const override { return OsiModelDataLinkLayer; }
164164

165165
/**
166166
* @return Returns the protocol info as readable string
167167
*/
168-
std::string toString() const;
168+
std::string toString() const override;
169169
};
170170
} // namespace pcpp

0 commit comments

Comments
 (0)