Merge remote-tracking branch 'origin/master' into topic/seth/smb

This commit is contained in:
Seth Hall 2016-05-20 14:28:39 -04:00
commit e2fb7591f4
296 changed files with 5297 additions and 2700 deletions

View file

@ -19,6 +19,8 @@ extern RecordType* icmp_context;
extern RecordType* signature_state;
extern RecordType* SYN_packet;
extern RecordType* pcap_packet;
extern RecordType* raw_pkt_hdr_type;
extern RecordType* l2_hdr_type;
extern EnumType* transport_proto;
extern TableType* string_set;
extern TableType* string_array;
@ -194,9 +196,6 @@ extern Val* pkt_profile_file;
extern int load_sample_freq;
extern double gap_report_freq;
extern RecordType* gap_info;
extern int packet_filter_default;
extern int sig_max_group_size;