Permalink
Browse files

Merge pull request #7015 from lioncash/pcap

PcapFile: Namespace code under the Common namespace
  • Loading branch information...
JosJuice committed May 30, 2018
2 parents 2f561da + 97c5a84 commit 6cb81ca851dfe5be51d9511ce47627fcddcc2bf9
@@ -8,6 +8,8 @@
#include "Common/File.h"
#include "Common/PcapFile.h"
namespace Common
{
namespace
{
const u32 PCAP_MAGIC = 0xa1b2c3d4;
@@ -61,3 +63,4 @@ void PCAP::AddPacket(const u8* bytes, size_t size)
m_fp->WriteBytes(&rec_hdr, sizeof(rec_hdr));
m_fp->WriteBytes(bytes, size);
}
} // namespace Common
@@ -19,6 +19,8 @@
#include "Common/CommonTypes.h"
#include "Common/File.h"
namespace Common
{
class PCAP final
{
public:
@@ -38,3 +40,4 @@ class PCAP final
std::unique_ptr<File::IOFile> m_fp;
};
} // namespace Common
@@ -40,15 +40,16 @@ struct DMAPacket
#pragma pack(pop)
PCAPDSPCaptureLogger::PCAPDSPCaptureLogger(const std::string& pcap_filename)
: m_pcap(new PCAP(new File::IOFile(pcap_filename, "wb")))
: m_pcap(new Common::PCAP(new File::IOFile(pcap_filename, "wb")))
{
}
PCAPDSPCaptureLogger::PCAPDSPCaptureLogger(PCAP* pcap) : m_pcap(pcap)
PCAPDSPCaptureLogger::PCAPDSPCaptureLogger(Common::PCAP* pcap) : m_pcap(pcap)
{
}
PCAPDSPCaptureLogger::PCAPDSPCaptureLogger(std::unique_ptr<PCAP>&& pcap) : m_pcap(std::move(pcap))
PCAPDSPCaptureLogger::PCAPDSPCaptureLogger(std::unique_ptr<Common::PCAP>&& pcap)
: m_pcap(std::move(pcap))
{
}
@@ -9,7 +9,10 @@
#include "Common/CommonTypes.h"
namespace Common
{
class PCAP;
}
namespace DSP
{
@@ -56,8 +59,8 @@ class PCAPDSPCaptureLogger final : public DSPCaptureLogger
// Automatically creates a writeable file (truncate existing file).
PCAPDSPCaptureLogger(const std::string& pcap_filename);
// Takes ownership of pcap.
PCAPDSPCaptureLogger(PCAP* pcap);
PCAPDSPCaptureLogger(std::unique_ptr<PCAP>&& pcap);
PCAPDSPCaptureLogger(Common::PCAP* pcap);
PCAPDSPCaptureLogger(std::unique_ptr<Common::PCAP>&& pcap);
void LogIFXRead(u16 address, u16 read_value) override { LogIFXAccess(true, address, read_value); }
void LogIFXWrite(u16 address, u16 written_value) override
@@ -69,6 +72,6 @@ class PCAPDSPCaptureLogger final : public DSPCaptureLogger
private:
void LogIFXAccess(bool read, u16 address, u16 value);
std::unique_ptr<PCAP> m_pcap;
std::unique_ptr<Common::PCAP> m_pcap;
};
} // namespace DSP

0 comments on commit 6cb81ca

Please sign in to comment.