F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't allocate buffers

Browse Source
This commit is contained in:
Craig Dowell
2010-02-04 07:15:08 -08:00
parent e8b0f35b03
commit 41862ebc92
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/pcap-file-object.cc
View File

@@ -92,21 +92,23 @@ PcapFileObject::Init (uint32_t dataLinkType, uint32_t snapLen, int32_t tzCorrect
bool
PcapFileObject::Write (Time t, Ptr<const Packet> p)
{
uint8_t buffer[PcapFile::SNAPLEN_DEFAULT];
uint64_t current = t.GetMicroSeconds ();
uint64_t s = current / 1000000;
uint64_t us = current % 1000000;
uint32_t bufferSize = p->GetSize ();
uint8_t *buffer = new uint8_t[bufferSize];
p->CopyData (buffer, bufferSize);
bool rc = m_file.Write (s, us, buffer, bufferSize);
delete [] buffer;
return rc;
}
bool
PcapFileObject::Write (Time t, Header &header, Ptr<const Packet> p)
{
uint8_t buffer[PcapFile::SNAPLEN_DEFAULT];
uint64_t current = t.GetMicroSeconds ();
uint64_t s = current / 1000000;
uint64_t us = current % 1000000;
@@ -119,13 +121,10 @@ PcapFileObject::Write (Time t, Header &header, Ptr<const Packet> p)
headerBuffer.AddAtStart (headerSize);
header.Serialize (headerBuffer.Begin ());
uint8_t *buffer = new uint8_t[bufferSize];
headerBuffer.Begin ().Read (buffer, headerSize);
p->CopyData (&buffer[headerSize], packetSize);
bool rc = m_file.Write (s, us, buffer, bufferSize);
delete [] buffer;
return rc;
}