Skip to content

Commit e3f4199

Browse files
authored
Moved IFileWriterDevice to be next to IFileReaderDvice. (#1948)
1 parent df01da6 commit e3f4199

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

Pcap++/header/PcapFileDevice.h

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,30 @@ namespace pcpp
9292
static IFileReaderDevice* getReader(const std::string& fileName);
9393
};
9494

95+
/// @class IFileWriterDevice
96+
/// An abstract class (cannot be instantiated, has a private c'tor) which is the parent class for file writer
97+
/// devices
98+
class IFileWriterDevice : public IFileDevice
99+
{
100+
protected:
101+
uint32_t m_NumOfPacketsWritten;
102+
uint32_t m_NumOfPacketsNotWritten;
103+
104+
IFileWriterDevice(const std::string& fileName);
105+
106+
public:
107+
/// A destructor for this class
108+
virtual ~IFileWriterDevice()
109+
{}
110+
111+
virtual bool writePacket(RawPacket const& packet) = 0;
112+
113+
virtual bool writePackets(const RawPacketVector& packets) = 0;
114+
115+
using IFileDevice::open;
116+
virtual bool open(bool appendMode) = 0;
117+
};
118+
95119
/// @class PcapFileReaderDevice
96120
/// A class for opening a pcap file in read-only mode. This class enable to open the file and read all packets,
97121
/// packet-by-packet
@@ -312,30 +336,6 @@ namespace pcpp
312336
void close();
313337
};
314338

315-
/// @class IFileWriterDevice
316-
/// An abstract class (cannot be instantiated, has a private c'tor) which is the parent class for file writer
317-
/// devices
318-
class IFileWriterDevice : public IFileDevice
319-
{
320-
protected:
321-
uint32_t m_NumOfPacketsWritten;
322-
uint32_t m_NumOfPacketsNotWritten;
323-
324-
IFileWriterDevice(const std::string& fileName);
325-
326-
public:
327-
/// A destructor for this class
328-
virtual ~IFileWriterDevice()
329-
{}
330-
331-
virtual bool writePacket(RawPacket const& packet) = 0;
332-
333-
virtual bool writePackets(const RawPacketVector& packets) = 0;
334-
335-
using IFileDevice::open;
336-
virtual bool open(bool appendMode) = 0;
337-
};
338-
339339
/// @class PcapFileWriterDevice
340340
/// A class for opening a pcap file for writing or create a new pcap file and write packets to it. This class adds
341341
/// a unique capability that isn't supported in WinPcap and in older libpcap versions which is to open a pcap file

Pcap++/src/PcapFileDevice.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,16 @@ namespace pcpp
147147
return numOfPacketsRead;
148148
}
149149

150+
// ~~~~~~~~~~~~~~~~~~~~~~~~~
151+
// IFileWriterDevice members
152+
// ~~~~~~~~~~~~~~~~~~~~~~~~~
153+
154+
IFileWriterDevice::IFileWriterDevice(const std::string& fileName) : IFileDevice(fileName)
155+
{
156+
m_NumOfPacketsNotWritten = 0;
157+
m_NumOfPacketsWritten = 0;
158+
}
159+
150160
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
151161
// PcapFileReaderDevice members
152162
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -547,16 +557,6 @@ namespace pcpp
547557
return std::string(fileInfo->file_comment, fileInfo->file_comment_size);
548558
}
549559

550-
// ~~~~~~~~~~~~~~~~~~~~~~~~~
551-
// IFileWriterDevice members
552-
// ~~~~~~~~~~~~~~~~~~~~~~~~~
553-
554-
IFileWriterDevice::IFileWriterDevice(const std::string& fileName) : IFileDevice(fileName)
555-
{
556-
m_NumOfPacketsNotWritten = 0;
557-
m_NumOfPacketsWritten = 0;
558-
}
559-
560560
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
561561
// PcapFileWriterDevice members
562562
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~

0 commit comments

Comments
 (0)