diff --git a/src/analyzer/protocol/irc/IRC.cc b/src/analyzer/protocol/irc/IRC.cc index bc16397239..ab57130478 100644 --- a/src/analyzer/protocol/irc/IRC.cc +++ b/src/analyzer/protocol/irc/IRC.cc @@ -78,6 +78,20 @@ void IRC_Analyzer::DeliverStream(int length, const u_char* line, bool orig) { return; } + // IRCv3 can pass arbitrary tags at the start of each line. Commonly this is @time, + // which is a timestamp for when the message was sent. They come as a semi-colon + // separated list, and are separated from the rest of the line by a space. + if ( myline.starts_with("@") ) { + std::size_t first_space = myline.find(' '); + // A set of tags doesn't necessarily need to be followed by a command. In this + // case just return. + if ( first_space == string::npos ) + return; + + // We don't do anything with tags right now. Just skip over them. + myline = myline.substr(first_space + 1); + } + // Check for prefix. string prefix = ""; if ( myline[0] == ':' ) { // find end of prefix and extract it diff --git a/testing/btest/Baseline/core.conn-size-threshold/.stdout b/testing/btest/Baseline/core.conn-size-threshold/.stdout index c5ff702739..886aa481d4 100644 --- a/testing/btest/Baseline/core.conn-size-threshold/.stdout +++ b/testing/btest/Baseline/core.conn-size-threshold/.stdout @@ -4,27 +4,39 @@ 0 0 0 secs -Threshold set for [orig_h=192.168.1.77, orig_p=57640/tcp, resp_h=66.198.80.67, resp_p=6667/tcp, proto=6, ctx=[]] +Threshold set for [orig_h=10.0.0.7, orig_p=59069/tcp, resp_h=10.0.0.22, resp_p=6667/tcp, proto=6, ctx=[]] 3000 2000 63 50 -100.0 msecs, 53.0 msecs 50.994873 usecs -triggered duration, [orig_h=192.168.1.77, orig_p=57640/tcp, resp_h=66.198.80.67, resp_p=6667/tcp, proto=6, ctx=[]], 100.0 msecs, F, 105.0 msecs 79.889297 usecs -triggered bytes, [orig_h=192.168.1.77, orig_p=57640/tcp, resp_h=66.198.80.67, resp_p=6667/tcp, proto=6, ctx=[]], 2000, F -triggered bytes, [orig_h=192.168.1.77, orig_p=57640/tcp, resp_h=66.198.80.67, resp_p=6667/tcp, proto=6, ctx=[]], 3000, T -triggered packets, [orig_h=192.168.1.77, orig_p=57640/tcp, resp_h=66.198.80.67, resp_p=6667/tcp, proto=6, ctx=[]], 50, F +100.0 msecs, 2.0 msecs 675.771713 usecs +triggered bytes, [orig_h=10.0.0.7, orig_p=59069/tcp, resp_h=10.0.0.22, resp_p=6667/tcp, proto=6, ctx=[]], 2000, F +triggered duration, [orig_h=10.0.0.7, orig_p=59069/tcp, resp_h=10.0.0.22, resp_p=6667/tcp, proto=6, ctx=[]], 100.0 msecs, F, 1.0 sec 474.0 msecs 342.823029 usecs 0 0 0 0 0 secs -Threshold set for [orig_h=192.168.1.77, orig_p=57655/tcp, resp_h=209.197.168.151, resp_p=1024/tcp, proto=6, ctx=[]] +Threshold set for [orig_h=10.0.0.22, orig_p=43614/tcp, resp_h=10.0.0.7, resp_p=59130/tcp, proto=6, ctx=[]] 3000 2000 63 50 -0 secs, 176.0 msecs 573.038101 usecs -triggered duration, [orig_h=192.168.1.77, orig_p=57655/tcp, resp_h=209.197.168.151, resp_p=1024/tcp, proto=6, ctx=[]], 100.0 msecs, T, 176.0 msecs 573.038101 usecs -triggered bytes, [orig_h=192.168.1.77, orig_p=57655/tcp, resp_h=209.197.168.151, resp_p=1024/tcp, proto=6, ctx=[]], 2000, F -triggered packets, [orig_h=192.168.1.77, orig_p=57640/tcp, resp_h=66.198.80.67, resp_p=6667/tcp, proto=6, ctx=[]], 63, T +100.0 msecs, 730.991364 usecs +triggered bytes, [orig_h=10.0.0.22, orig_p=43614/tcp, resp_h=10.0.0.7, resp_p=59130/tcp, proto=6, ctx=[]], 2000, F +triggered packets, [orig_h=10.0.0.22, orig_p=43614/tcp, resp_h=10.0.0.7, resp_p=59130/tcp, proto=6, ctx=[]], 50, F +triggered bytes, [orig_h=10.0.0.22, orig_p=43614/tcp, resp_h=10.0.0.7, resp_p=59130/tcp, proto=6, ctx=[]], 3000, T +triggered packets, [orig_h=10.0.0.22, orig_p=43614/tcp, resp_h=10.0.0.7, resp_p=59130/tcp, proto=6, ctx=[]], 63, T +triggered duration, [orig_h=10.0.0.22, orig_p=43614/tcp, resp_h=10.0.0.7, resp_p=59130/tcp, proto=6, ctx=[]], 100.0 msecs, T, 133.0 msecs 142.948151 usecs +0 +0 +0 +0 +0 secs +Threshold set for [orig_h=10.0.0.22, orig_p=38016/tcp, resp_h=10.0.0.7, resp_p=59214/tcp, proto=6, ctx=[]] +3000 +2000 +63 +50 +100.0 msecs, 689.983368 usecs +triggered duration, [orig_h=10.0.0.22, orig_p=38016/tcp, resp_h=10.0.0.7, resp_p=59214/tcp, proto=6, ctx=[]], 100.0 msecs, T, 9.0 secs 29.0 msecs 998.064041 usecs diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.irc/out b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.irc/out index ed4d6c57e7..ffd8baef42 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.irc/out +++ b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.irc/out @@ -3,13 +3,13 @@ FILE_NEW file #0, 0, 0 FILE_OVER_NEW_CONNECTION FILE_STATE_REMOVE -file #0, 42208, 0 -[orig_h=192.168.1.77, orig_p=57655/tcp, resp_h=209.197.168.151, resp_p=1024/tcp, proto=6, ctx=[]] +file #0, 1320211, 0 +[orig_h=10.0.0.22, orig_p=43614/tcp, resp_h=10.0.0.7, resp_p=59130/tcp, proto=6, ctx=[]] FILE_BOF_BUFFER -PK\x03\x04\x14\x00\x00\x00\x08\x00\xae +\xd4\xc3\xb2\xa1\x02\x00\x04\x00\x00\x00\x00 MIME_TYPE -application/zip +application/vnd.tcpdump.pcap source: IRC_DATA -MD5: 8c0803242f549c2780cb88b9a9215c65 -SHA1: 8abe0239263fd7326eb803d4465cf494f8bea218 -SHA256: e4f0b0b9d7580e7a22dc1093c8db4df7d0115a4f3b03cc2875cc69705f0d0204 +MD5: 297a5922f7cd25f8d7d1104d585b2ce3 +SHA1: 8a56c159a0c53957377406dd23a886c7d1cf01e0 +SHA256: 566c4819a8130d65d29076930bd46dde5c2595a4a8be4a380857feb5b430ec6e diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.irc/thefile b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.irc/thefile index d4ec9e374b..54980005e2 100644 Binary files a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.irc/thefile and b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.irc/thefile differ diff --git a/testing/btest/Baseline/scripts.base.protocols.conn.new_connection_contents/.stdout b/testing/btest/Baseline/scripts.base.protocols.conn.new_connection_contents/.stdout index a6df0c9df1..2166209feb 100644 --- a/testing/btest/Baseline/scripts.base.protocols.conn.new_connection_contents/.stdout +++ b/testing/btest/Baseline/scripts.base.protocols.conn.new_connection_contents/.stdout @@ -1,3 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -new_connection_contents for [orig_h=192.168.1.77, orig_p=57640/tcp, resp_h=66.198.80.67, resp_p=6667/tcp, proto=6, ctx=[]] -new_connection_contents for [orig_h=192.168.1.77, orig_p=57655/tcp, resp_h=209.197.168.151, resp_p=1024/tcp, proto=6, ctx=[]] +new_connection_contents for [orig_h=10.0.0.7, orig_p=59069/tcp, resp_h=10.0.0.22, resp_p=6667/tcp, proto=6, ctx=[]] +new_connection_contents for [orig_h=10.0.0.22, orig_p=43614/tcp, resp_h=10.0.0.7, resp_p=59130/tcp, proto=6, ctx=[]] +new_connection_contents for [orig_h=10.0.0.22, orig_p=38016/tcp, resp_h=10.0.0.7, resp_p=59214/tcp, proto=6, ctx=[]] diff --git a/testing/btest/Baseline/scripts.base.protocols.conn.threshold/.stdout b/testing/btest/Baseline/scripts.base.protocols.conn.threshold/.stdout index c2382b6155..48a3409d92 100644 --- a/testing/btest/Baseline/scripts.base.protocols.conn.threshold/.stdout +++ b/testing/btest/Baseline/scripts.base.protocols.conn.threshold/.stdout @@ -1,13 +1,17 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -Threshold set for [orig_h=192.168.1.77, orig_p=57640/tcp, resp_h=66.198.80.67, resp_p=6667/tcp, proto=6, ctx=[]] -triggered bytes, [orig_h=192.168.1.77, orig_p=57640/tcp, resp_h=66.198.80.67, resp_p=6667/tcp, proto=6, ctx=[]], 1, T -triggered duration, [orig_h=192.168.1.77, orig_p=57640/tcp, resp_h=66.198.80.67, resp_p=6667/tcp, proto=6, ctx=[]], 200.0 msecs, F -triggered bytes, [orig_h=192.168.1.77, orig_p=57640/tcp, resp_h=66.198.80.67, resp_p=6667/tcp, proto=6, ctx=[]], 2000, F -triggered bytes, [orig_h=192.168.1.77, orig_p=57640/tcp, resp_h=66.198.80.67, resp_p=6667/tcp, proto=6, ctx=[]], 2500, T -triggered bytes, [orig_h=192.168.1.77, orig_p=57640/tcp, resp_h=66.198.80.67, resp_p=6667/tcp, proto=6, ctx=[]], 2700, T -triggered packets, [orig_h=192.168.1.77, orig_p=57640/tcp, resp_h=66.198.80.67, resp_p=6667/tcp, proto=6, ctx=[]], 50, F -Threshold set for [orig_h=192.168.1.77, orig_p=57655/tcp, resp_h=209.197.168.151, resp_p=1024/tcp, proto=6, ctx=[]] -triggered bytes, [orig_h=192.168.1.77, orig_p=57655/tcp, resp_h=209.197.168.151, resp_p=1024/tcp, proto=6, ctx=[]], 1, T -triggered duration, [orig_h=192.168.1.77, orig_p=57655/tcp, resp_h=209.197.168.151, resp_p=1024/tcp, proto=6, ctx=[]], 200.0 msecs, F -triggered bytes, [orig_h=192.168.1.77, orig_p=57655/tcp, resp_h=209.197.168.151, resp_p=1024/tcp, proto=6, ctx=[]], 2000, F -triggered packets, [orig_h=192.168.1.77, orig_p=57640/tcp, resp_h=66.198.80.67, resp_p=6667/tcp, proto=6, ctx=[]], 52, F +Threshold set for [orig_h=10.0.0.7, orig_p=59069/tcp, resp_h=10.0.0.22, resp_p=6667/tcp, proto=6, ctx=[]] +triggered bytes, [orig_h=10.0.0.7, orig_p=59069/tcp, resp_h=10.0.0.22, resp_p=6667/tcp, proto=6, ctx=[]], 1, T +triggered bytes, [orig_h=10.0.0.7, orig_p=59069/tcp, resp_h=10.0.0.22, resp_p=6667/tcp, proto=6, ctx=[]], 2000, F +triggered duration, [orig_h=10.0.0.7, orig_p=59069/tcp, resp_h=10.0.0.22, resp_p=6667/tcp, proto=6, ctx=[]], 200.0 msecs, F +Threshold set for [orig_h=10.0.0.22, orig_p=43614/tcp, resp_h=10.0.0.7, resp_p=59130/tcp, proto=6, ctx=[]] +triggered bytes, [orig_h=10.0.0.22, orig_p=43614/tcp, resp_h=10.0.0.7, resp_p=59130/tcp, proto=6, ctx=[]], 1, T +triggered bytes, [orig_h=10.0.0.22, orig_p=43614/tcp, resp_h=10.0.0.7, resp_p=59130/tcp, proto=6, ctx=[]], 2000, F +triggered packets, [orig_h=10.0.0.22, orig_p=43614/tcp, resp_h=10.0.0.7, resp_p=59130/tcp, proto=6, ctx=[]], 50, F +triggered packets, [orig_h=10.0.0.22, orig_p=43614/tcp, resp_h=10.0.0.7, resp_p=59130/tcp, proto=6, ctx=[]], 52, F +triggered bytes, [orig_h=10.0.0.22, orig_p=43614/tcp, resp_h=10.0.0.7, resp_p=59130/tcp, proto=6, ctx=[]], 2500, T +triggered bytes, [orig_h=10.0.0.22, orig_p=43614/tcp, resp_h=10.0.0.7, resp_p=59130/tcp, proto=6, ctx=[]], 2700, T +Threshold set for [orig_h=10.0.0.22, orig_p=38016/tcp, resp_h=10.0.0.7, resp_p=59214/tcp, proto=6, ctx=[]] +triggered bytes, [orig_h=10.0.0.22, orig_p=38016/tcp, resp_h=10.0.0.7, resp_p=59214/tcp, proto=6, ctx=[]], 1, T +triggered bytes, [orig_h=10.0.0.7, orig_p=59069/tcp, resp_h=10.0.0.22, resp_p=6667/tcp, proto=6, ctx=[]], 2500, T +triggered duration, [orig_h=10.0.0.22, orig_p=38016/tcp, resp_h=10.0.0.7, resp_p=59214/tcp, proto=6, ctx=[]], 200.0 msecs, T +triggered bytes, [orig_h=10.0.0.7, orig_p=59069/tcp, resp_h=10.0.0.22, resp_p=6667/tcp, proto=6, ctx=[]], 2700, T diff --git a/testing/btest/Baseline/scripts.base.protocols.irc.basic/conn.log b/testing/btest/Baseline/scripts.base.protocols.irc.basic/conn.log index 67730e3b29..3d0664e5ed 100644 --- a/testing/btest/Baseline/scripts.base.protocols.irc.basic/conn.log +++ b/testing/btest/Baseline/scripts.base.protocols.irc.basic/conn.log @@ -7,6 +7,7 @@ #open XXXX-XX-XX-XX-XX-XX #fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p proto service duration orig_bytes resp_bytes conn_state local_orig local_resp missed_bytes history orig_pkts orig_ip_bytes resp_pkts resp_ip_bytes tunnel_parents ip_proto #types time string addr port addr port enum string interval count count string bool bool count string count count count count set[string] count -XXXXXXXXXX.XXXXXX ClEkJM2Vm5giqnMf4h 192.168.1.77 57655 209.197.168.151 1024 tcp irc-dcc-data 2.256935 124 42208 SF T F 0 ShAdDaFf 28 1592 43 44452 - 6 -XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 192.168.1.77 57640 66.198.80.67 6667 tcp irc 178.237017 453 25404 S3 T F 0 ShADdTtaf 63 3761 52 28194 - 6 +XXXXXXXXXX.XXXXXX ClEkJM2Vm5giqnMf4h 10.0.0.22 43614 10.0.0.7 59130 tcp irc-dcc-data 0.162309 352 1320211 SF T T 0 ShAadDfF 127 6964 962 1370247 - 6 +XXXXXXXXXX.XXXXXX C4J4Th3PJpwUYZZ6gc 10.0.0.22 38016 10.0.0.7 59214 tcp - 22.539051 22 10 SF T T 0 ShAaDdfF 7 394 8 438 - 6 +XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 10.0.0.7 59069 10.0.0.22 6667 tcp irc 169.871683 638 9679 SF T T 0 ShADadfF 43 2886 37 11611 - 6 #close XXXX-XX-XX-XX-XX-XX diff --git a/testing/btest/Baseline/scripts.base.protocols.irc.basic/irc.log b/testing/btest/Baseline/scripts.base.protocols.irc.basic/irc.log index 6357b02ce3..3215cb36af 100644 --- a/testing/btest/Baseline/scripts.base.protocols.irc.basic/irc.log +++ b/testing/btest/Baseline/scripts.base.protocols.irc.basic/irc.log @@ -7,8 +7,8 @@ #open XXXX-XX-XX-XX-XX-XX #fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p nick user command value addl dcc_file_name dcc_file_size dcc_mime_type fuid #types time string addr port addr port string string string string string string count string string -XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 192.168.1.77 57640 66.198.80.67 6667 - - NICK bloed - - - - - -XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 192.168.1.77 57640 66.198.80.67 6667 bloed - USER sdkfje sdkfje Montreal.QC.CA.Undernet.org dkdkrwq - - - - -XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 192.168.1.77 57640 66.198.80.67 6667 bloed sdkfje JOIN #easymovies (empty) - - - - -XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 192.168.1.77 57640 66.198.80.67 6667 bloed sdkfje DCC #easymovies (empty) ladyvampress-default(2011-07-07)-OS.zip 42208 application/zip F1tb2e2cHYry3wC3Q3 +XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 10.0.0.7 59069 10.0.0.22 6667 - - NICK tim2 - - - - - +XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 10.0.0.7 59069 10.0.0.22 6667 tim2 - USER tim tim 10.0.0.22 TimWojtulewicz - - - - +XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 10.0.0.7 59069 10.0.0.22 6667 tim2 tim JOIN #testing (empty) - - - - +XXXXXXXXXX.XXXXXX CHhAvVGS1DHFjwGM9 10.0.0.7 59069 10.0.0.22 6667 tim2 tim DCC #testing (empty) ssh.trace 1320211 application/vnd.tcpdump.pcap FkshTS1b7DMiTGD6C3 #close XXXX-XX-XX-XX-XX-XX diff --git a/testing/btest/Baseline/scripts.base.protocols.irc.basic/out b/testing/btest/Baseline/scripts.base.protocols.irc.basic/out index 8717fc1956..143efe5d63 100644 --- a/testing/btest/Baseline/scripts.base.protocols.irc.basic/out +++ b/testing/btest/Baseline/scripts.base.protocols.irc.basic/out @@ -1,90 +1,93 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -irc_names_info, #easymovies, { -bloed, -gasman2, -jafafar, -dezmond411, -+gordon1`^, -|EasyMovie|, -+TrEeHoUsE, -+thenagualII, -mikejo1, -bouleemil, -skillZ, -zgdB8_VzO, -GordonCamero, -`Xenu, -fvlkni, -mo5, -tonysaunt, -Verge, -eag, -habzels, -+Max_Renn, -nofire, -Peebo, -macbeth420, -freeeman33, -cguide, -zEmm, -+Luccutis, -scum, -+`AngelnTx, -bga, -+Killazherb, -NeverServe, -ericdraven, -+Xedrethor, -katniss, -friida, -N2Oblivion, -kitts, -+ladyvampress, -wanker, -Picard, -mzazzali, -slickrick2, -+i-am-mojo, -aJerk, -starred, -WhatmeWor, -HagBard +irc_names_info, #testing, { +tim1, +tim2 } -irc_names_info, #easymovies, { -Latika, -TinCan, -Nachos, -dx3d51, -TooFast -} -irc_dcc_send_ack, 1400 -irc_dcc_send_ack, 2800 -irc_dcc_send_ack, 4200 -irc_dcc_send_ack, 5600 -irc_dcc_send_ack, 7000 -irc_dcc_send_ack, 8400 -irc_dcc_send_ack, 9800 -irc_dcc_send_ack, 11200 -irc_dcc_send_ack, 12288 -irc_dcc_send_ack, 13688 -irc_dcc_send_ack, 15088 -irc_dcc_send_ack, 16384 -irc_dcc_send_ack, 17784 -irc_dcc_send_ack, 19184 -irc_dcc_send_ack, 20480 -irc_dcc_send_ack, 21880 -irc_dcc_send_ack, 23280 -irc_dcc_send_ack, 24576 -irc_dcc_send_ack, 25976 -irc_dcc_send_ack, 27376 -irc_dcc_send_ack, 28672 -irc_dcc_send_ack, 30072 -irc_dcc_send_ack, 31472 -irc_dcc_send_ack, 32768 -irc_dcc_send_ack, 34168 -irc_dcc_send_ack, 35568 -irc_dcc_send_ack, 36864 -irc_dcc_send_ack, 38264 -irc_dcc_send_ack, 39664 -irc_dcc_send_ack, 40960 -irc_dcc_send_ack, 42208 +irc_dcc_send_ack, 2048 +irc_dcc_send_ack, 6656 +irc_dcc_send_ack, 9728 +irc_dcc_send_ack, 14336 +irc_dcc_send_ack, 17232 +irc_dcc_send_ack, 27368 +irc_dcc_send_ack, 41848 +irc_dcc_send_ack, 47640 +irc_dcc_send_ack, 67912 +irc_dcc_send_ack, 79496 +irc_dcc_send_ack, 88184 +irc_dcc_send_ack, 96872 +irc_dcc_send_ack, 108456 +irc_dcc_send_ack, 128728 +irc_dcc_send_ack, 143208 +irc_dcc_send_ack, 163480 +irc_dcc_send_ack, 172168 +irc_dcc_send_ack, 183752 +irc_dcc_send_ack, 201216 +irc_dcc_send_ack, 224384 +irc_dcc_send_ack, 244656 +irc_dcc_send_ack, 259136 +irc_dcc_send_ack, 279408 +irc_dcc_send_ack, 299680 +irc_dcc_send_ack, 313856 +irc_dcc_send_ack, 320000 +irc_dcc_send_ack, 322984 +irc_dcc_send_ack, 332200 +irc_dcc_send_ack, 341504 +irc_dcc_send_ack, 353792 +irc_dcc_send_ack, 361472 +irc_dcc_send_ack, 364368 +irc_dcc_send_ack, 384640 +irc_dcc_send_ack, 399120 +irc_dcc_send_ack, 419392 +irc_dcc_send_ack, 429528 +irc_dcc_send_ack, 439664 +irc_dcc_send_ack, 459936 +irc_dcc_send_ack, 474416 +irc_dcc_send_ack, 494688 +irc_dcc_send_ack, 503376 +irc_dcc_send_ack, 516408 +irc_dcc_send_ack, 525096 +irc_dcc_send_ack, 543920 +irc_dcc_send_ack, 562744 +irc_dcc_send_ack, 583016 +irc_dcc_send_ack, 597496 +irc_dcc_send_ack, 603288 +irc_dcc_send_ack, 617768 +irc_dcc_send_ack, 638040 +irc_dcc_send_ack, 661208 +irc_dcc_send_ack, 671344 +irc_dcc_send_ack, 681480 +irc_dcc_send_ack, 687272 +irc_dcc_send_ack, 701752 +irc_dcc_send_ack, 722024 +irc_dcc_send_ack, 736504 +irc_dcc_send_ack, 756776 +irc_dcc_send_ack, 777048 +irc_dcc_send_ack, 809816 +irc_dcc_send_ack, 821936 +irc_dcc_send_ack, 842208 +irc_dcc_send_ack, 862480 +irc_dcc_send_ack, 875512 +irc_dcc_send_ack, 895784 +irc_dcc_send_ack, 916056 +irc_dcc_send_ack, 942120 +irc_dcc_send_ack, 952256 +irc_dcc_send_ack, 956600 +irc_dcc_send_ack, 989368 +irc_dcc_send_ack, 1022136 +irc_dcc_send_ack, 1026104 +irc_dcc_send_ack, 1046376 +irc_dcc_send_ack, 1076784 +irc_dcc_send_ack, 1097056 +irc_dcc_send_ack, 1117328 +irc_dcc_send_ack, 1136152 +irc_dcc_send_ack, 1147736 +irc_dcc_send_ack, 1176696 +irc_dcc_send_ack, 1196968 +irc_dcc_send_ack, 1207104 +irc_dcc_send_ack, 1208552 +irc_dcc_send_ack, 1228824 +irc_dcc_send_ack, 1249096 +irc_dcc_send_ack, 1270816 +irc_dcc_send_ack, 1282400 +irc_dcc_send_ack, 1302672 +irc_dcc_send_ack, 1320211 diff --git a/testing/btest/Baseline/scripts.base.protocols.irc.events/.stdout b/testing/btest/Baseline/scripts.base.protocols.irc.events/.stdout index c709f0af6c..1b1fe5ad5b 100644 --- a/testing/btest/Baseline/scripts.base.protocols.irc.events/.stdout +++ b/testing/btest/Baseline/scripts.base.protocols.irc.events/.stdout @@ -1,18 +1,11 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -thenagualII!~affreujoj@THENAGUAL.users.undernet.org -> #easymovies: \x02TDCC Server Online\x02 Desc:\xc2\xabjet li fong sai yuk 2 vostfr\xc2\xbb Trigger:\xc2\xabtrigger1\xc2\xbb Size:\xc2\xab699MB\xc2\xbb Sends:\xc2\xab0/2\xc2\xbb Queues:\xc2\xab0/10\xc2\xbb Record CPS:\xc2\xab0 cps by n/a\xc2\xbb Downloads:\xc2\xab0\xc2\xbb \x0f\x97I-n-v-i-s-i-o-n\x97 -thenagualII!~affreujoj@THENAGUAL.users.undernet.org -> #easymovies: \x02TDCC Server Online\x02 Desc:\xc2\xabarturo.brachetti.l.homme.aux.mille.songes.avi\xc2\xbb Trigger:\xc2\xabtriggerII\xc2\xbb Size:\xc2\xab698MB\xc2\xbb Sends:\xc2\xab0/2\xc2\xbb Queues:\xc2\xab0/10\xc2\xbb Record CPS:\xc2\xab0 cps by n/a\xc2\xbb Downloads:\xc2\xab0\xc2\xbb \x0f\x97I-n-v-i-s-i-o-n\x97 -thenagualII!~affreujoj@THENAGUAL.users.undernet.org -> #easymovies: \x02TDCC Server Online\x02 Desc:\xc2\xabnational geographic les hackers.avi\xc2\xbb Trigger:\xc2\xab!tdcc-3\xc2\xbb Size:\xc2\xab693MB\xc2\xbb Sends:\xc2\xab0/2\xc2\xbb Queues:\xc2\xab0/10\xc2\xbb Record CPS:\xc2\xab0 cps by n/a\xc2\xbb Downloads:\xc2\xab0\xc2\xbb \x0f\x97I-n-v-i-s-i-o-n\x97 -i-am-mojo!~morgana1@mojojo.users.undernet.org -> #easymovies: \x0308,01 Movies and music updated on the weekends........ \x0304,01Type:\x0308,01 @i-am-mojo \x0304,01For My List Of:\x0308,01 5,307 \x0304,01Files \x0302,01~ \x0304,01Slots:\x0308,01 3/4 \x0302,01~ \x0304,01Queued:\x0308,01 0 \x0302,01~ \x0304,01Speed:\x0308,01 26,007cps \x0302,01~ \x0304,01Next: \x0308,01NOW \x0302,01~ \x0304,01Served:\x0308,01 1,403 \x0302,01~ \x0304,01List: \x0308,01Jul 17th \x0302,01~ \x0304,01Search: \x0308,01ON \x0302,01~ \x0304,01Mode: \x0308,01Normal \x0302,01~ -i-am-mojo!~morgana1@mojojo.users.undernet.org -> #easymovies: SLOTS 4 3 NOW 0 999 64627 5307 341063215095 0 1310935138 105421 OmeNServE v2.51\x01 -ladyvampress!~who_cares@ladyvampress.users.undernet.org -> #easymovies: \x0313,01 \x0313,1Movies and Assorted TV shows \x0315,01Type:\x0313,01 @ladyvampress \x0315,01For My List Of:\x0313,01 3,311 \x0315,01Files \x0314,01- \x0315,01Slots:\x0313,01 0/2 \x0314,01- \x0315,01Queued:\x0313,01 8 \x0314,01- \x0315,01Speed:\x0313,01 79,921cps \x0314,01- \x0315,01Next: \x0313,0192m \x0314,01- \x0315,01Served:\x0313,01 6,990 \x0314,01- \x0315,01List: \x0313,01Jul 7th \x0314,01- \x0315,01Search: \x0313,01ON \x0314,01- \x0315,01Mode: \x0313,01Normal \x0314,01- - -> thenagualII: trigger1 -ladyvampress!~who_cares@ladyvampress.users.undernet.org -> #easymovies: SLOTS 2 0 92m 8 999 79921 3311 2111443703336 0 1310040328 107209 OmeNServE v2.52\x01 -zEmm!ExUser@zem122.users.undernet.org -> #easymovies: \x0308\xab\xab \x0307Server\x0308 \xbb\xbb \x0304Trigger\x0308~[\x0307/ctcp zEmm !!bizzniches!!\x0308]~ \x0304Used\x0308~[\x03070 cps\x0308]~ \x0304Next.Send\x0308~[\x0307Open\x0308]~ \x0304Stole\x0308~[\x0307142.93Gb in 143 files\x0308]~ \x0304Record\x0308~[\x0307174.2Kb/s by Pontius\x0308]~ \x0304Sends\x0308~[\x03070/2\x0308]~ \x0304Queues\x0308~[\x03070/10\x0308]~ \x0304Entered\x0308~[\x0307565 times\x0308]~ \x0304Note\x0308~[\x0307get the new...\x0308]~ \x0308\x02\xab\x02 \x0304\xcb\xd7\xc7\x0308\xfc\x0304\xae\xa7\xee\xf6\xf1 \x0308\x02\xbb\x02 -thenagualII!~affreujoj@THENAGUAL.users.undernet.org -> #easymovies: \x0304,00DVD DIVX ASS APPZ DOCU PHOTOS\x0314,00\x95 \x0301,00Type:\x0304,00 @thenagualII \x0301,00For My List Of:\x0304,00 69,157 \x0301,00Files \x0314,00\x95 \x0301,00Slots:\x0304,00 15/15 \x0314,00\x95 \x0301,00Queued:\x0304,00 0 \x0314,00\x95 \x0301,00Speed:\x0304,00 0cps \x0314,00\x95 \x0301,00Next: \x0304,00NOW \x0314,00\x95 \x0301,00Served:\x0304,00 853 \x0314,00\x95 \x0301,00List: \x0304,00Jul 19th \x0314,00\x95 \x0301,00Search: \x0304,00OFF \x0314,00\x95 \x0301,00Mode: \x0304,00Normal \x0314,00\x95 - -> ladyvampress: list - -> #easymovies: @ladyvampress -gordon1`^!~allu0002@gordon2411.users.undernet.org -> #easymovies: \x0308\x02File Server Online\x02 \x0303Triggers:\xab\x0308\x0308/ctcp gordon1`^ /ctcp gordon1`^ /CTCP gordon1`^ Movies Galore\x0303\xbb Sends:\xab\x03081/30\x0303\xbb Queues:\xab\x03080/30\x0303\xbb Accessed:\xab\x03082556 times\x0303\xbb Online:\xab\x03080/4\x0303\xbb RCPS:\xab\x0308193.8 Kbs by MadDingo\x0303\xbb Served:\xab\x03081.14TB in 1118 files\x0303\xbb Current BW:\xab\x030818.7 Kbs\x0303\xbb AQT:\xab\x0308No Wait\x0303\xbb \x0f\x0303\x97\x0314I\x0303-\x0315n\x0303-\x0315v\x0303-\x0300i\x0303-\x0300s\x0303-\x0315i\x0303-\x0315o\x0303-\x0314n\x0303\x97\x0f -quit: () + -> #testing: hi, i'm chatting for some packets + -> #testing: more packets + -> #testing: more packets! + -> #testing: even more packets! +tim1!tim@10.0.0.22 -> #testing: do we still need more packets? +tim1!tim@10.0.0.22 -> #testing: maybe we do +quit: (leaving) -> #brotest: test quit: (quitting) quit: brotest (Client Quit) diff --git a/testing/btest/Traces/irc-dcc-send.trace b/testing/btest/Traces/irc-dcc-send.trace index 88735b92c3..28090294b1 100644 Binary files a/testing/btest/Traces/irc-dcc-send.trace and b/testing/btest/Traces/irc-dcc-send.trace differ