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

Merge branch 'topic/jgras/mac-logging' of https://github.com/J-Gras/bro

Browse source 
Thanks! I've tweaked this a bit further, have a look.

BIT-1613 #merged
This commit is contained in:
Robin Sommer 2016-06-06 15:55:25 -07:00
commit d59bb2e9d1
22 changed files with 1828 additions and 452 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Conn.h
View file

@ -3,15 +3,6 @@
#ifndef conn_h
#define conn_h
#include "bro-config.h"
#include <sys/types.h>
#ifdef HAVE_NETINET_ETHER_H
#include <netinet/ether.h>
#endif
#ifdef HAVE_NET_ETHERNET_H
#include <net/ethernet.h>
#endif
#include <sys/types.h>
#include "Dict.h"
@ -305,7 +296,8 @@ protected:
TransportProto proto;
uint32 orig_flow_label, resp_flow_label; // most recent IPv6 flow labels
uint32 vlan, inner_vlan; // VLAN this connection traverses, if available
ether_addr eth_src, eth_dst; // Ethernet MAC addresses, if available
u_char orig_l2_addr[Packet::l2_addr_len]; // Link-layer originator address, if available
u_char resp_l2_addr[Packet::l2_addr_len]; // Link-layer responder address, if available
double start_time, last_time;
double inactivity_timeout;
RecordVal* conn_val;