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

Fix PIA packet replay to deliver copy of IP header

Browse source 
This prevented one from writing a packet-wise analyzer that needs access
to IP headers and can be attached to a connection via signature match.

None of the analyzers currently shipping are affected.  And maybe it's
unlikely there will be many that ever would be, but it's awkward for the
API to omit IP headers in this special case (i.e. packets buffer for use
with DPD signature matching).

Addresses BIT-1298
This commit is contained in:
Jon Siwek 2014-12-10 15:12:38 -06:00
parent 69724c5e1f
commit c211a2c91a
4 changed files with 113 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

71
src/IP.cc
View file

@ -4,6 +4,8 @@
#include "Type.h"
#include "Val.h"
#include "Var.h"
#include <algorithm>
#include <utility>
static RecordType* ip4_hdr_type = 0;
static RecordType* ip6_hdr_type = 0;
@ -636,3 +638,72 @@ VectorVal* IPv6_Hdr_Chain::BuildVal() const
return rval;
}
IP_Hdr::IP_Hdr(const IP_Hdr& other)
{
del = true;
if ( other.ip4 )
{
char* new_hdr = new char[other.HdrLen()];
memcpy(new_hdr, other.ip4, other.HdrLen());
ip4 = (const struct ip*)new_hdr;
ip6 = 0;
ip6_hdrs = 0;
}
else
{
ip4 = 0;
char* new_hdr = new char[other.HdrLen()];
memcpy(new_hdr, other.ip6, other.HdrLen());
ip6 = (const struct ip6_hdr*)new_hdr;
ip6_hdrs = other.ip6_hdrs->Copy(ip6);
}
}
IP_Hdr& IP_Hdr::operator=(IP_Hdr other)
{
swap(*this, other);
return *this;
}
IPv6_Hdr_Chain* IPv6_Hdr_Chain::Copy(const ip6_hdr* new_hdr) const
{
IPv6_Hdr_Chain* rval = new IPv6_Hdr_Chain;
rval->length = length;
#ifdef ENABLE_MOBILE_IPV6
if ( homeAddr )
rval->homeAddr = new IPAddr(*homeAddr);
#endif
if ( finalDst )
rval->finalDst = new IPAddr(*finalDst);
if ( chain.empty() )
{
reporter->InternalWarning("empty IPv6 header chain");
delete rval;
return 0;
}
const u_char* new_data = (const u_char*)new_hdr;
const u_char* old_data = chain[0]->Data();
for ( size_t i = 0; i < chain.size(); ++i )
{
int off = chain[i]->Data() - old_data;
rval->chain.push_back(new IPv6_Hdr(chain[i]->Type(), new_data + off));
}
return rval;
}
void swap(IP_Hdr& a, IP_Hdr& b)
{
using std::swap;
swap(a.ip4, b.ip4);
swap(a.ip6, b.ip6);
swap(a.del, b.del);
swap(a.ip6_hdrs, b.ip6_hdrs);
}