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

Support namespaces / modules in bif. Checkpoint.

Browse source 
(now actually commiting all the files)

This change is actually two-fold:
a) bif's now accept module XYZ; statements and module::ID for
   function, const, event, enum, etc. declartation
b) Added C++-namespaces to variables, functions, etc. that are declared
   in bif but accessed from C++
   This required some (lightweight) re-factoring of the C++ codes.
   Note, event's don't have their own C++ namespace yet, since this
   would require a rather huge re-factoring.

Compiles and passes test suite.
New namespace feature not tested yet.
Documentation to follow.
This commit is contained in:
Gregor Maier 2011-02-11 09:37:23 -08:00
parent 86fdd1dcf3
commit f79ea244fa
31 changed files with 332 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/TCP_Rewriter.cc
View file

@ -288,7 +288,7 @@ int TCP_TracePacket::Finish(struct pcap_pkthdr*& hdr,
// tp->th_urp = 0; // clear urgent pointer
// Fix IP addresses before computing the TCP checksum
if ( anonymize_ip_addr )
if ( BifConst::anonymize_ip_addr )
{
ip->ip_src.s_addr = anon_src;
ip->ip_dst.s_addr = anon_dst;
@ -726,7 +726,7 @@ void TCP_RewriterEndpoint::PushPacket()
#endif
if ( ! IsPlaceHolderPacket(next_packet) ||
! omit_rewrite_place_holder )
! BifConst::omit_rewrite_place_holder )
{
if ( next_packet->PredictedAsEmptyPlaceHolder() )
{
@ -798,7 +798,7 @@ TCP_Rewriter::TCP_Rewriter(TCP_Analyzer* arg_analyzer, PacketDumper* arg_dumper,
anon_addr[0] = anon_addr[1] = 0;
if ( anonymize_ip_addr )
if ( BifConst::anonymize_ip_addr )
{
anon_addr[0] = anonymize_ip(to_v4_addr(analyzer->Conn()->OrigAddr()),
ORIG_ADDR);
@ -909,7 +909,7 @@ void TCP_Rewriter::NextPacket(int is_orig, double t,
// Before setting current_packet to p, first clean up empty
// place holders to save memory space.
if ( omit_rewrite_place_holder && holding_packets )
if ( BifConst::omit_rewrite_place_holder && holding_packets )
CleanUpEmptyPlaceHolders();
current_packet = p;
@ -1562,7 +1562,7 @@ TCP_SourcePacketWriter* get_src_pkt_writer(TCP_Analyzer* analyzer)
{
if ( ! pkt_dumper )
return 0; // don't complain if no output file
else if ( ! dump_selected_source_packets )
else if ( ! BifConst::dump_selected_source_packets )
builtin_run_time("flag dump_source_packets is not set");
else
internal_error("source packet writer not initialized");
@ -1571,5 +1571,5 @@ TCP_SourcePacketWriter* get_src_pkt_writer(TCP_Analyzer* analyzer)
return writer;
}
#include "common-rw.bif.func_h"
#include "common-rw.bif.func_def"