Fix a bug that resulted in recursion in the type system.

- There is a bit of other minor reorganization cleanup here too.
This commit is contained in:
Seth Hall 2016-03-07 13:50:12 -05:00
parent b58ee68c11
commit c8818da09a

View file

@ -169,11 +169,16 @@ export {
recent_files : set[string] &default=string_set() &read_expire=3min; recent_files : set[string] &default=string_set() &read_expire=3min;
}; };
## Optionally write out the SMB commands log. This is
## primarily useful for debugging so is disabled by default.
const write_cmd_log = F &redef;
## Everything below here is used internally in the SMB scripts.
redef record connection += { redef record connection += {
smb_state : State &optional; smb_state : State &optional;
}; };
## Internal use only ## Internal use only
## Some commands shouldn't be logged by the smb1_message event ## Some commands shouldn't be logged by the smb1_message event
const deferred_logging_cmds: set[string] = { const deferred_logging_cmds: set[string] = {
@ -183,10 +188,6 @@ export {
"TREE_CONNECT_ANDX", "TREE_CONNECT_ANDX",
}; };
## Optionally write out the SMB commands log. This is
## primarily useful for debugging so is disabled by default.
const write_cmd_log = F &redef;
## This is an internally used function. ## This is an internally used function.
const set_current_file: function(smb_state: State, file_id: count) &redef; const set_current_file: function(smb_state: State, file_id: count) &redef;
@ -198,9 +199,6 @@ redef record FileInfo += {
## ID referencing this file. ## ID referencing this file.
fid : count &optional; fid : count &optional;
## Maintain a reference to the file record.
f : fa_file &optional;
## UUID referencing this file if DCE/RPC ## UUID referencing this file if DCE/RPC
uuid : string &optional; uuid : string &optional;
}; };