Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-07 00:58:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Small packet dumper API change.

Browse source
This commit is contained in:
Robin Sommer 2014-08-22 16:49:14 -07:00
parent caa55ad352
commit 0186061aa8
7 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
TODO.iosources
View file

@ -1,4 +1,3 @@
- PktDumper: Move Dump() to public and remove Record()
- Wrap BPF_Program into namespace and clean up - Wrap BPF_Program into namespace and clean up
- Add an interface for derived pkt source to run a BPF filter. - Add an interface for derived pkt source to run a BPF filter.
- Tests, in particular the packet dumping needs testing. - Tests, in particular the packet dumping needs testing.

2
src/Net.cc
View file

@ -127,7 +127,7 @@ RETSIGTYPE watchdog(int /* signo */)
iosource::PktDumper::Packet p; iosource::PktDumper::Packet p;
p.hdr = current_hdr; p.hdr = current_hdr;
p.data = current_pkt; p.data = current_pkt;
pkt_dumper->Record(&p); pkt_dumper->Dump(&p);
} }
} }

2
src/Serializer.cc
View file

@ -1221,7 +1221,7 @@ Packet* Packet::Unserialize(UnserialInfo* info)
iosource::PktDumper::Packet dp; iosource::PktDumper::Packet dp;
dp.hdr = p->hdr; dp.hdr = p->hdr;
dp.data = p->pkt; dp.data = p->pkt;
dump->Record(&dp); dump->Dump(&dp);
} }
} }
#endif #endif

4
src/Sessions.cc
View file

@ -1394,7 +1394,7 @@ void NetSessions::DumpPacket(const struct pcap_pkthdr* hdr,
iosource::PktDumper::Packet p; iosource::PktDumper::Packet p;
p.hdr = hdr; p.hdr = hdr;
p.data = pkt; p.data = pkt;
pkt_dumper->Record(&p); pkt_dumper->Dump(&p);
} }
else else
@ -1407,7 +1407,7 @@ void NetSessions::DumpPacket(const struct pcap_pkthdr* hdr,
iosource::PktDumper::Packet p; iosource::PktDumper::Packet p;
p.hdr = &h; p.hdr = &h;
p.data = pkt; p.data = pkt;
pkt_dumper->Record(&p); pkt_dumper->Dump(&p);
} }
} }

4
src/bro.bif
View file

@ -3235,7 +3235,7 @@ function dump_current_packet%(file_name: string%) : bool
iosource::PktDumper::Packet p; iosource::PktDumper::Packet p;
p.hdr = hdr; p.hdr = hdr;
p.data = pkt; p.data = pkt;
addl_pkt_dumper->Record(&p); addl_pkt_dumper->Dump(&p);
} }
return new Val(! addl_pkt_dumper->IsError(), TYPE_BOOL); return new Val(! addl_pkt_dumper->IsError(), TYPE_BOOL);
@ -3300,7 +3300,7 @@ function dump_packet%(pkt: pcap_packet, file_name: string%) : bool
iosource::PktDumper::Packet p; iosource::PktDumper::Packet p;
p.hdr = &hdr; p.hdr = &hdr;
p.data = (*pkt_vl)[4]->AsString()->Bytes(); p.data = (*pkt_vl)[4]->AsString()->Bytes();
addl_pkt_dumper->Record(&p); addl_pkt_dumper->Dump(&p);
} }
return new Val(addl_pkt_dumper->IsError(), TYPE_BOOL); return new Val(addl_pkt_dumper->IsError(), TYPE_BOOL);

5
src/iosource/PktDumper.cc
View file

@ -50,11 +50,6 @@ int PktDumper::HdrSize() const
return is_open ? props.hdr_size : -1; return is_open ? props.hdr_size : -1;
} }
bool PktDumper::Record(const Packet* pkt)
{
return Dump(pkt);
}
void PktDumper::Opened(const Properties& arg_props) void PktDumper::Opened(const Properties& arg_props)
{ {
is_open = true; is_open = true;

6
src/iosource/PktDumper.h
View file

@ -25,8 +25,10 @@ public:
int HdrSize() const; int HdrSize() const;
bool Record(const Packet* pkt); bool Record(const Packet* pkt);
// PktSrc interface for derived classes to implement.
virtual void Close() = 0; virtual void Close() = 0;
virtual void Open() = 0; virtual void Open() = 0;
virtual bool Dump(const Packet* pkt) = 0;
protected: protected:
// Methods to use by derived classed. // Methods to use by derived classed.
@ -41,10 +43,6 @@ protected:
void Closed(); void Closed();
void Error(const std::string& msg); void Error(const std::string& msg);
// PktSrc interface for derived classes to implement.
virtual bool Dump(const Packet* pkt) = 0;
private: private:
bool is_open; bool is_open;
Properties props; Properties props;