Merge branch 'master' into topic/v6-addr

Conflicts:
	src/bro.bif
This commit is contained in:
Jon Siwek 2012-02-06 11:06:55 -06:00
commit 2e2f8f5d06
56 changed files with 1380 additions and 610 deletions

View file

@ -103,7 +103,7 @@ event irc_dcc_message(c: connection, is_orig: bool,
return;
c$irc$dcc_file_name = argument;
c$irc$dcc_file_size = size;
local p = to_port(dest_port, tcp);
local p = count_to_port(dest_port, tcp);
expect_connection(to_addr("0.0.0.0"), address, p, ANALYZER_FILE, 5 min);
dcc_expected_transfers[address, p] = c$irc;
}