diff --git a/src/LogWriterAscii.cc b/src/LogWriterAscii.cc index 71bd0cf2e0..3ec22b7fa0 100644 --- a/src/LogWriterAscii.cc +++ b/src/LogWriterAscii.cc @@ -60,11 +60,11 @@ bool LogWriterAscii::DoInit(string path, int num_fields, const LogField* const * for ( int i = 0; i < num_fields; i++ ) { - const LogField* field = fields[i]; - if ( fputs(field->name.c_str(), file) == EOF ) + if ( i > 0 && fwrite(separator, separator_len, 1, file) != 1 ) goto write_error; - if ( fwrite(separator, separator_len, 1, file) != 1 ) + const LogField* field = fields[i]; + if ( fputs(field->name.c_str(), file) == EOF ) goto write_error; } diff --git a/testing/btest/Baseline/logging.adapt-filter/ssh-new-default.log b/testing/btest/Baseline/logging.adapt-filter/ssh-new-default.log index e0f76c1dfc..469f2d1991 100644 --- a/testing/btest/Baseline/logging.adapt-filter/ssh-new-default.log +++ b/testing/btest/Baseline/logging.adapt-filter/ssh-new-default.log @@ -1,3 +1,3 @@ -# t id.orig_h id.orig_p id.resp_h id.resp_p status country -1299633982.99326 1.2.3.4 1234 2.3.4.5 80 success unknown -1299633982.99326 1.2.3.4 1234 2.3.4.5 80 failure US +# t id.orig_h id.orig_p id.resp_h id.resp_p status country +1299718503.40319 1.2.3.4 1234 2.3.4.5 80 success unknown +1299718503.40319 1.2.3.4 1234 2.3.4.5 80 failure US diff --git a/testing/btest/Baseline/logging.ascii-empty/output b/testing/btest/Baseline/logging.ascii-empty/output index 1a7ada05ae..d377ca15d7 100644 --- a/testing/btest/Baseline/logging.ascii-empty/output +++ b/testing/btest/Baseline/logging.ascii-empty/output @@ -1,6 +1,6 @@ -PREFIX<>t|id.orig_h|id.orig_p|id.resp_h|id.resp_p|status|country|b| -1299718338.37017|1.2.3.4|1234|2.3.4.5|80|success|unknown|NOT-SET -1299718338.37017|1.2.3.4|1234|2.3.4.5|80|NOT-SET|US|NOT-SET -1299718338.37017|1.2.3.4|1234|2.3.4.5|80|failure|UK|NOT-SET -1299718338.37017|1.2.3.4|1234|2.3.4.5|80|NOT-SET|BR|NOT-SET -1299718338.37017|1.2.3.4|1234|2.3.4.5|80|failure|EMPTY|T +PREFIX<>t|id.orig_h|id.orig_p|id.resp_h|id.resp_p|status|country|b +1299718506.56593|1.2.3.4|1234|2.3.4.5|80|success|unknown|NOT-SET +1299718506.56593|1.2.3.4|1234|2.3.4.5|80|NOT-SET|US|NOT-SET +1299718506.56593|1.2.3.4|1234|2.3.4.5|80|failure|UK|NOT-SET +1299718506.56593|1.2.3.4|1234|2.3.4.5|80|NOT-SET|BR|NOT-SET +1299718506.56593|1.2.3.4|1234|2.3.4.5|80|failure|EMPTY|T diff --git a/testing/btest/Baseline/logging.ascii-escape/ssh.log b/testing/btest/Baseline/logging.ascii-escape/ssh.log index 9892e1aeee..6797e1e302 100644 Binary files a/testing/btest/Baseline/logging.ascii-escape/ssh.log and b/testing/btest/Baseline/logging.ascii-escape/ssh.log differ diff --git a/testing/btest/Baseline/logging.ascii-options/output b/testing/btest/Baseline/logging.ascii-options/output index 9a3e1f8d20..33a922cc2b 100644 --- a/testing/btest/Baseline/logging.ascii-options/output +++ b/testing/btest/Baseline/logging.ascii-options/output @@ -1,5 +1,5 @@ -1299649281.43936|1.2.3.4|1234|2.3.4.5|80|success|unknown -1299649281.43936|1.2.3.4|1234|2.3.4.5|80|failure|US -1299649281.43936|1.2.3.4|1234|2.3.4.5|80|failure|UK -1299649281.43936|1.2.3.4|1234|2.3.4.5|80|success|BR -1299649281.43936|1.2.3.4|1234|2.3.4.5|80|failure|MX +1299718506.38074|1.2.3.4|1234|2.3.4.5|80|success|unknown +1299718506.38074|1.2.3.4|1234|2.3.4.5|80|failure|US +1299718506.38074|1.2.3.4|1234|2.3.4.5|80|failure|UK +1299718506.38074|1.2.3.4|1234|2.3.4.5|80|success|BR +1299718506.38074|1.2.3.4|1234|2.3.4.5|80|failure|MX diff --git a/testing/btest/Baseline/logging.events/output b/testing/btest/Baseline/logging.events/output index 21571f5eee..c3dbf607a6 100644 --- a/testing/btest/Baseline/logging.events/output +++ b/testing/btest/Baseline/logging.events/output @@ -1,2 +1,2 @@ -[t=1298326194.80574, id=[orig_h=1.2.3.4, orig_p=1234/tcp, resp_h=2.3.4.5, resp_p=80/tcp], status=success, country=] -[t=1298326194.80574, id=[orig_h=1.2.3.4, orig_p=1234/tcp, resp_h=2.3.4.5, resp_p=80/tcp], status=failure, country=US] +[t=1299718502.96511, id=[orig_h=1.2.3.4, orig_p=1234/tcp, resp_h=2.3.4.5, resp_p=80/tcp], status=success, country=] +[t=1299718502.96511, id=[orig_h=1.2.3.4, orig_p=1234/tcp, resp_h=2.3.4.5, resp_p=80/tcp], status=failure, country=US] diff --git a/testing/btest/Baseline/logging.path-func/output b/testing/btest/Baseline/logging.path-func/output index 2b44fb2948..25e4ca6696 100644 --- a/testing/btest/Baseline/logging.path-func/output +++ b/testing/btest/Baseline/logging.path-func/output @@ -1,13 +1,13 @@ static-prefix-0.log static-prefix-1.log static-prefix-2.log -# t id.orig_h id.orig_p id.resp_h id.resp_p status country -1299630368.36038 1.2.3.4 1234 2.3.4.5 80 success unknown -1299630368.36038 1.2.3.4 1234 2.3.4.5 80 success BR -1299630368.36038 1.2.3.4 1234 2.3.4.5 80 failure MX3 -# t id.orig_h id.orig_p id.resp_h id.resp_p status country -1299630368.36038 1.2.3.4 1234 2.3.4.5 80 failure US -1299630368.36038 1.2.3.4 1234 2.3.4.5 80 failure MX -# t id.orig_h id.orig_p id.resp_h id.resp_p status country -1299630368.36038 1.2.3.4 1234 2.3.4.5 80 failure UK -1299630368.36038 1.2.3.4 1234 2.3.4.5 80 failure MX2 +# t id.orig_h id.orig_p id.resp_h id.resp_p status country +1299718503.05867 1.2.3.4 1234 2.3.4.5 80 success unknown +1299718503.05867 1.2.3.4 1234 2.3.4.5 80 success BR +1299718503.05867 1.2.3.4 1234 2.3.4.5 80 failure MX3 +# t id.orig_h id.orig_p id.resp_h id.resp_p status country +1299718503.05867 1.2.3.4 1234 2.3.4.5 80 failure US +1299718503.05867 1.2.3.4 1234 2.3.4.5 80 failure MX +# t id.orig_h id.orig_p id.resp_h id.resp_p status country +1299718503.05867 1.2.3.4 1234 2.3.4.5 80 failure UK +1299718503.05867 1.2.3.4 1234 2.3.4.5 80 failure MX2 diff --git a/testing/btest/Baseline/logging.pred/ssh.failure.log b/testing/btest/Baseline/logging.pred/ssh.failure.log index a5dcba878c..c46990dc65 100644 --- a/testing/btest/Baseline/logging.pred/ssh.failure.log +++ b/testing/btest/Baseline/logging.pred/ssh.failure.log @@ -1,2 +1,2 @@ -# t id.orig_h id.orig_p id.resp_h id.resp_p status country -1299630368.46042 1.2.3.4 1234 2.3.4.5 80 failure US +# t id.orig_h id.orig_p id.resp_h id.resp_p status country +1299718503.16177 1.2.3.4 1234 2.3.4.5 80 failure US diff --git a/testing/btest/Baseline/logging.pred/ssh.success.log b/testing/btest/Baseline/logging.pred/ssh.success.log index 1402f6f06d..c6adcd86aa 100644 --- a/testing/btest/Baseline/logging.pred/ssh.success.log +++ b/testing/btest/Baseline/logging.pred/ssh.success.log @@ -1,2 +1,2 @@ -# t id.orig_h id.orig_p id.resp_h id.resp_p status country -1299630368.46042 1.2.3.4 1234 2.3.4.5 80 success - +# t id.orig_h id.orig_p id.resp_h id.resp_p status country +1299718503.16177 1.2.3.4 1234 2.3.4.5 80 success - diff --git a/testing/btest/Baseline/logging.remote/sender.ssh.failure.log b/testing/btest/Baseline/logging.remote/sender.ssh.failure.log index 1a9b7f64b1..815b0366b3 100644 --- a/testing/btest/Baseline/logging.remote/sender.ssh.failure.log +++ b/testing/btest/Baseline/logging.remote/sender.ssh.failure.log @@ -1,4 +1,4 @@ -# t id.orig_h id.orig_p id.resp_h id.resp_p status country -1299630368.80723 1.2.3.4 1234 2.3.4.5 80 failure US -1299630368.80723 1.2.3.4 1234 2.3.4.5 80 failure UK -1299630368.80723 1.2.3.4 1234 2.3.4.5 80 failure MX +# t id.orig_h id.orig_p id.resp_h id.resp_p status country +1299718503.72819 1.2.3.4 1234 2.3.4.5 80 failure US +1299718503.72819 1.2.3.4 1234 2.3.4.5 80 failure UK +1299718503.72819 1.2.3.4 1234 2.3.4.5 80 failure MX diff --git a/testing/btest/Baseline/logging.remote/sender.ssh.log b/testing/btest/Baseline/logging.remote/sender.ssh.log index f780e80992..2f159ad6a7 100644 --- a/testing/btest/Baseline/logging.remote/sender.ssh.log +++ b/testing/btest/Baseline/logging.remote/sender.ssh.log @@ -1,6 +1,6 @@ -# t id.orig_h id.orig_p id.resp_h id.resp_p status country -1299630368.80723 1.2.3.4 1234 2.3.4.5 80 success - -1299630368.80723 1.2.3.4 1234 2.3.4.5 80 failure US -1299630368.80723 1.2.3.4 1234 2.3.4.5 80 failure UK -1299630368.80723 1.2.3.4 1234 2.3.4.5 80 success BR -1299630368.80723 1.2.3.4 1234 2.3.4.5 80 failure MX +# t id.orig_h id.orig_p id.resp_h id.resp_p status country +1299718503.72819 1.2.3.4 1234 2.3.4.5 80 success - +1299718503.72819 1.2.3.4 1234 2.3.4.5 80 failure US +1299718503.72819 1.2.3.4 1234 2.3.4.5 80 failure UK +1299718503.72819 1.2.3.4 1234 2.3.4.5 80 success BR +1299718503.72819 1.2.3.4 1234 2.3.4.5 80 failure MX diff --git a/testing/btest/Baseline/logging.remote/sender.ssh.success.log b/testing/btest/Baseline/logging.remote/sender.ssh.success.log index d662d5af9f..2838cc68b8 100644 --- a/testing/btest/Baseline/logging.remote/sender.ssh.success.log +++ b/testing/btest/Baseline/logging.remote/sender.ssh.success.log @@ -1,3 +1,3 @@ -# t id.orig_h id.orig_p id.resp_h id.resp_p status country -1299630368.80723 1.2.3.4 1234 2.3.4.5 80 success - -1299630368.80723 1.2.3.4 1234 2.3.4.5 80 success BR +# t id.orig_h id.orig_p id.resp_h id.resp_p status country +1299718503.72819 1.2.3.4 1234 2.3.4.5 80 success - +1299718503.72819 1.2.3.4 1234 2.3.4.5 80 success BR diff --git a/testing/btest/Baseline/logging.remove/ssh.failure.log b/testing/btest/Baseline/logging.remove/ssh.failure.log index 5628867595..ddbacda28e 100644 --- a/testing/btest/Baseline/logging.remove/ssh.failure.log +++ b/testing/btest/Baseline/logging.remove/ssh.failure.log @@ -1,3 +1,3 @@ -# t id.orig_h id.orig_p id.resp_h id.resp_p status country -1299630368.57877 1.2.3.4 1234 2.3.4.5 80 failure US -1299630368.57877 1.2.3.4 1234 2.3.4.5 80 failure UK +# t id.orig_h id.orig_p id.resp_h id.resp_p status country +1299718503.28253 1.2.3.4 1234 2.3.4.5 80 failure US +1299718503.28253 1.2.3.4 1234 2.3.4.5 80 failure UK diff --git a/testing/btest/Baseline/logging.remove/ssh.log b/testing/btest/Baseline/logging.remove/ssh.log index 476442eec8..123e8e3a87 100644 --- a/testing/btest/Baseline/logging.remove/ssh.log +++ b/testing/btest/Baseline/logging.remove/ssh.log @@ -1,4 +1,4 @@ -# t id.orig_h id.orig_p id.resp_h id.resp_p status country -1299630368.57877 1.2.3.4 1234 2.3.4.5 80 failure US -1299630368.57877 1.2.3.4 1234 2.3.4.5 80 failure UK -1299630368.57877 1.2.3.4 1234 2.3.4.5 80 failure BR +# t id.orig_h id.orig_p id.resp_h id.resp_p status country +1299718503.28253 1.2.3.4 1234 2.3.4.5 80 failure US +1299718503.28253 1.2.3.4 1234 2.3.4.5 80 failure UK +1299718503.28253 1.2.3.4 1234 2.3.4.5 80 failure BR diff --git a/testing/btest/Baseline/logging.rotate-custom/out b/testing/btest/Baseline/logging.rotate-custom/out index 423b15651d..8206ec5f9a 100644 --- a/testing/btest/Baseline/logging.rotate-custom/out +++ b/testing/btest/Baseline/logging.rotate-custom/out @@ -29,106 +29,106 @@ 1st test-11-03-07_04.00.05.log test.log 11-03-07_04.00.05 11-03-07_04.59.55 1 2nd test2-11-03-07_04.59.55.log test2.log 11-03-07_04.59.55 11-03-07_04.59.55 1 > test-11-03-06_19.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299466805.0 10.0.0.1 20 10.0.0.2 1024 1299470395.0 10.0.0.2 20 10.0.0.3 0 > test-11-03-06_20.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299470405.0 10.0.0.1 20 10.0.0.2 1025 1299473995.0 10.0.0.2 20 10.0.0.3 1 > test-11-03-06_21.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299474005.0 10.0.0.1 20 10.0.0.2 1026 1299477595.0 10.0.0.2 20 10.0.0.3 2 > test-11-03-06_22.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299477605.0 10.0.0.1 20 10.0.0.2 1027 1299481195.0 10.0.0.2 20 10.0.0.3 3 > test-11-03-06_23.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299481205.0 10.0.0.1 20 10.0.0.2 1028 1299484795.0 10.0.0.2 20 10.0.0.3 4 > test-11-03-07_00.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299484805.0 10.0.0.1 20 10.0.0.2 1029 1299488395.0 10.0.0.2 20 10.0.0.3 5 > test-11-03-07_01.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299488405.0 10.0.0.1 20 10.0.0.2 1030 1299491995.0 10.0.0.2 20 10.0.0.3 6 > test-11-03-07_02.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299492005.0 10.0.0.1 20 10.0.0.2 1031 1299495595.0 10.0.0.2 20 10.0.0.3 7 > test-11-03-07_03.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299495605.0 10.0.0.1 20 10.0.0.2 1032 1299499195.0 10.0.0.2 20 10.0.0.3 8 > test-11-03-07_04.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299499205.0 10.0.0.1 20 10.0.0.2 1033 1299502795.0 10.0.0.2 20 10.0.0.3 9 > test.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p > test2-11-03-06_19.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299466805.0 10.0.0.1 20 10.0.0.2 1024 > test2-11-03-06_19.59.55.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299470395.0 10.0.0.2 20 10.0.0.3 0 > test2-11-03-06_20.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299470405.0 10.0.0.1 20 10.0.0.2 1025 > test2-11-03-06_20.59.55.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299473995.0 10.0.0.2 20 10.0.0.3 1 > test2-11-03-06_21.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299474005.0 10.0.0.1 20 10.0.0.2 1026 > test2-11-03-06_21.59.55.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299477595.0 10.0.0.2 20 10.0.0.3 2 > test2-11-03-06_22.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299477605.0 10.0.0.1 20 10.0.0.2 1027 > test2-11-03-06_22.59.55.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299481195.0 10.0.0.2 20 10.0.0.3 3 > test2-11-03-06_23.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299481205.0 10.0.0.1 20 10.0.0.2 1028 > test2-11-03-06_23.59.55.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299484795.0 10.0.0.2 20 10.0.0.3 4 > test2-11-03-07_00.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299484805.0 10.0.0.1 20 10.0.0.2 1029 > test2-11-03-07_00.59.55.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299488395.0 10.0.0.2 20 10.0.0.3 5 > test2-11-03-07_01.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299488405.0 10.0.0.1 20 10.0.0.2 1030 > test2-11-03-07_01.59.55.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299491995.0 10.0.0.2 20 10.0.0.3 6 > test2-11-03-07_02.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299492005.0 10.0.0.1 20 10.0.0.2 1031 > test2-11-03-07_02.59.55.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299495595.0 10.0.0.2 20 10.0.0.3 7 > test2-11-03-07_03.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299495605.0 10.0.0.1 20 10.0.0.2 1032 > test2-11-03-07_03.59.55.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299499195.0 10.0.0.2 20 10.0.0.3 8 > test2-11-03-07_04.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299499205.0 10.0.0.1 20 10.0.0.2 1033 > test2-11-03-07_04.59.55.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299502795.0 10.0.0.2 20 10.0.0.3 9 > test2.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p diff --git a/testing/btest/Baseline/logging.rotate/out b/testing/btest/Baseline/logging.rotate/out index 27bd5179cf..006cd2c851 100644 --- a/testing/btest/Baseline/logging.rotate/out +++ b/testing/btest/Baseline/logging.rotate/out @@ -9,42 +9,42 @@ test-11-03-07_02.00.05.log test.log 11-03-07_02.00.05 11-03-07_03.00.05 0 test-11-03-07_03.00.05.log test.log 11-03-07_03.00.05 11-03-07_04.00.05 0 test-11-03-07_04.00.05.log test.log 11-03-07_04.00.05 11-03-07_04.59.55 1 > test-11-03-06_19.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299466805.0 10.0.0.1 20 10.0.0.2 1024 1299470395.0 10.0.0.2 20 10.0.0.3 0 > test-11-03-06_20.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299470405.0 10.0.0.1 20 10.0.0.2 1025 1299473995.0 10.0.0.2 20 10.0.0.3 1 > test-11-03-06_21.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299474005.0 10.0.0.1 20 10.0.0.2 1026 1299477595.0 10.0.0.2 20 10.0.0.3 2 > test-11-03-06_22.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299477605.0 10.0.0.1 20 10.0.0.2 1027 1299481195.0 10.0.0.2 20 10.0.0.3 3 > test-11-03-06_23.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299481205.0 10.0.0.1 20 10.0.0.2 1028 1299484795.0 10.0.0.2 20 10.0.0.3 4 > test-11-03-07_00.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299484805.0 10.0.0.1 20 10.0.0.2 1029 1299488395.0 10.0.0.2 20 10.0.0.3 5 > test-11-03-07_01.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299488405.0 10.0.0.1 20 10.0.0.2 1030 1299491995.0 10.0.0.2 20 10.0.0.3 6 > test-11-03-07_02.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299492005.0 10.0.0.1 20 10.0.0.2 1031 1299495595.0 10.0.0.2 20 10.0.0.3 7 > test-11-03-07_03.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299495605.0 10.0.0.1 20 10.0.0.2 1032 1299499195.0 10.0.0.2 20 10.0.0.3 8 > test-11-03-07_04.00.05.log -# t id.orig_h id.orig_p id.resp_h id.resp_p +# t id.orig_h id.orig_p id.resp_h id.resp_p 1299499205.0 10.0.0.1 20 10.0.0.2 1033 1299502795.0 10.0.0.2 20 10.0.0.3 9 diff --git a/testing/btest/Baseline/logging.stdout/output b/testing/btest/Baseline/logging.stdout/output index d7dcbd4e48..4c73aed8e4 100644 --- a/testing/btest/Baseline/logging.stdout/output +++ b/testing/btest/Baseline/logging.stdout/output @@ -1,6 +1,6 @@ -# t id.orig_h id.orig_p id.resp_h id.resp_p status country -1299635864.89679 1.2.3.4 1234 2.3.4.5 80 success unknown -1299635864.89679 1.2.3.4 1234 2.3.4.5 80 failure US -1299635864.89679 1.2.3.4 1234 2.3.4.5 80 failure UK -1299635864.89679 1.2.3.4 1234 2.3.4.5 80 success BR -1299635864.89679 1.2.3.4 1234 2.3.4.5 80 failure MX +# t id.orig_h id.orig_p id.resp_h id.resp_p status country +1299718506.28824 1.2.3.4 1234 2.3.4.5 80 success unknown +1299718506.28824 1.2.3.4 1234 2.3.4.5 80 failure US +1299718506.28824 1.2.3.4 1234 2.3.4.5 80 failure UK +1299718506.28824 1.2.3.4 1234 2.3.4.5 80 success BR +1299718506.28824 1.2.3.4 1234 2.3.4.5 80 failure MX diff --git a/testing/btest/Baseline/logging.test-logging/ssh.log b/testing/btest/Baseline/logging.test-logging/ssh.log index d73dc32ec0..82523b7c13 100644 --- a/testing/btest/Baseline/logging.test-logging/ssh.log +++ b/testing/btest/Baseline/logging.test-logging/ssh.log @@ -1,6 +1,6 @@ -# t id.orig_h id.orig_p id.resp_h id.resp_p status country -1299630368.69723 1.2.3.4 1234 2.3.4.5 80 success unknown -1299630368.69723 1.2.3.4 1234 2.3.4.5 80 failure US -1299630368.69723 1.2.3.4 1234 2.3.4.5 80 failure UK -1299630368.69723 1.2.3.4 1234 2.3.4.5 80 success BR -1299630368.69723 1.2.3.4 1234 2.3.4.5 80 failure MX +# t id.orig_h id.orig_p id.resp_h id.resp_p status country +1299718506.1313 1.2.3.4 1234 2.3.4.5 80 success unknown +1299718506.1313 1.2.3.4 1234 2.3.4.5 80 failure US +1299718506.1313 1.2.3.4 1234 2.3.4.5 80 failure UK +1299718506.1313 1.2.3.4 1234 2.3.4.5 80 success BR +1299718506.1313 1.2.3.4 1234 2.3.4.5 80 failure MX