# # ChangeLog for tools/tracemerge # # Generated by Trac 1.0.10 # 08/18/22 19:57:36 Sun, 24 Dec 2006 04:16:27 GMT Perry Lorier [e2d49d5] * tools/tracedump/tracedump.cc (modified) * tools/tracemerge/tracemerge.c (modified) * tools/tracertstats/output.c (modified) Cleanup more warnings Wed, 13 Dec 2006 03:57:50 GMT Shane Alcock [c690742] * tools/tracemerge/Makefile.am (modified) The manpage should now get distributed for tracemerge Tue, 14 Nov 2006 00:56:01 GMT Perry Lorier [a7282fb] * tools/traceanon/ipenc.c (modified) * tools/traceanon/ipenc.h (modified) * tools/traceanon/panon.h (modified) * tools/traceanon/rijndael.c (modified) * tools/traceanon/traceanon.c (modified) * tools/tracemerge/tracemerge.c (modified) * tools/tracereport/dir_report.c (modified) * tools/tracereport/flow_report.c (modified) * tools/tracereport/port_report.c (modified) * tools/tracereport/tos_report.c (modified) * tools/tracereport/tracereport.c (modified) * tools/tracereport/ttl_report.c (modified) * tools/tracertstats/tracertstats.c (modified) * tools/tracesplit/tracesplit.c (modified) * tools/tracesplit/tracesplit_dir.c (modified) * tools/tracestats/tracestats.c (modified) Fix lots of little warnings Tue, 07 Nov 2006 03:40:26 GMT Perry Lorier [67825b2] * tools/traceanon/traceanon.1 (modified) * tools/tracedump/tracedump.1 (modified) * tools/tracemerge/tracemerge.1 (modified) * tools/tracereport/tracereport.1 (modified) * tools/tracertstats/tracertstats.1 (modified) * tools/tracesplit/traceconvert.1 (modified) * tools/tracesplit/tracefilter.1 (modified) * tools/tracesplit/tracesplit.1 (modified) * tools/tracesplit/tracesplit_dir.1 (modified) * tools/tracestats/tracestats.1 (modified) * tools/tracestats/tracesummary.1 (modified) Update all the man pages to make sure they refer to each other (and ... Tue, 07 Nov 2006 03:03:17 GMT Perry Lorier [1369834] * README (modified) * configure.in (modified) * tools/tracemerge/Makefile.am (modified) * tools/tracereport/Makefile.am (modified) * tools/tracereport/tracereport.1 (added) * tools/tracertstats/Makefile.am (modified) * tools/tracertstats/tracertstats.1 (added) * tools/tracesplit/Makefile.am (modified) * tools/tracesplit/traceconvert.1 (modified) * tools/tracesplit/tracesplit.1 (modified) * tools/tracesplit/tracesplit_dir.1 (added) Add man pages (And install them!) for all the various tools Thu, 02 Nov 2006 22:35:50 GMT Perry Lorier [a31b4c7] * tools/tracemerge/tracemerge.c (modified) use optind not a hard coded 2! Thu, 29 Jun 2006 08:58:23 GMT Daniel Lawson [66caf4b] * tools/traceanon/traceanon.c (modified) * tools/tracedump/tracedump.cc (modified) * tools/tracemerge/tracemerge.c (modified) * tools/tracereport/tracereport.c (modified) * tools/tracertstats/tracertstats.c (modified) * tools/tracesplit/tracesplit.c (modified) * tools/tracestats/tracestats.c (modified) Updated the various tools to have improved usage() functions, and to ... Tue, 13 Jun 2006 23:01:38 GMT Shane Alcock [162d976] * lib/format_duck.c (modified) * tools/tracemerge/tracemerge.c (modified) tracemerge now uses trace_perror_output when an output trace errors ... Mon, 05 Jun 2006 07:48:57 GMT Matt Brown [0e91d5e] * tools/tracemerge/tracemerge.c (modified) * Consume an argument after initialising the output trace otherwise ... Mon, 05 Jun 2006 07:27:55 GMT Matt Brown [6f9aaee] * tools/tracemerge/tracemerge.c (modified) Improve error checking and actually display an error message when ... Thu, 20 Apr 2006 22:28:36 GMT Perry Lorier [39e141f] * lib/libtrace.h (modified) * lib/libtrace_int.h (modified) * lib/libtraceio-stdio.c (modified) * lib/protocols.c (modified) * lib/trace.c (modified) * tools/tracemerge/tracemerge.c (modified) Merge windows portability fixes Thu, 13 Apr 2006 14:17:15 GMT Perry Lorier [6b0560b] * tools/tracemerge/tracemerge.c (modified) Fix missing declared variable Thu, 30 Mar 2006 23:15:04 GMT Perry Lorier [7e16db7] * tools/tracemerge/tracemerge.1 (modified) Update documentation Thu, 30 Mar 2006 23:10:43 GMT Perry Lorier [c2f71ad] * tools/tracemerge/tracemerge.c (modified) Merged sam's fixes Added unique-packets Fri, 03 Mar 2006 04:26:47 GMT Perry Lorier [7dda48a] * tools/tracemerge/test-tracemerge.sh (modified) Make the testcase clean up after itself Fri, 03 Mar 2006 04:26:25 GMT Perry Lorier [18544c8] * tools/tracemerge/test-tracemerge.sh (added) * tools/tracemerge/tracemerge.1 (added) * tools/tracemerge/tracemerge.c (modified) Port to the newer libtrace, add manpage and test case Thu, 15 Dec 2005 01:16:33 GMT Shane Alcock [d56089a] * examples/capture/capture.c (modified) * examples/count/tracestats.c (modified) * examples/erfsplit/erfsplit.c (modified) * examples/event/rate-tracetime.c (modified) * examples/event/rate.c (modified) * examples/munge/munge.c (modified) * examples/pcap2erf/pcap2erf.c (modified) * examples/protocol/protocol.c (modified) * examples/rate/rate-dir.c (modified) * examples/rate/rate.c (modified) * examples/rxtest/rxtest.c (modified) * examples/sample/sample.c (modified) * examples/tracedump/tracedump.c (modified) * examples/tracemark/tracemark.c (modified) * tools/traceanon/traceanon.c (modified) * tools/tracedump/tracedump.cc (modified) * tools/tracemerge/tracemerge.c (modified) * tools/tracereport/tracereport.c (modified) * tools/tracertstats/tracertstats.c (modified) * tools/tracesplit/tracesplit.c (modified) * tools/tracestats/tracestats.c (modified) Updated examples and tools to use new function names Sun, 27 Nov 2005 21:15:22 GMT Daniel Lawson [3840760] * examples/capture/capture.c (modified) * examples/count/tracestats.c (modified) * examples/erfsplit/erfsplit.c (modified) * examples/event/rate-tracetime.c (modified) * examples/event/rate.c (modified) * examples/munge/munge.c (modified) * examples/pcap2erf/pcap2erf.c (modified) * examples/protocol/protocol.c (modified) * examples/rate/rate-dir.c (modified) * examples/rate/rate.c (modified) * examples/rxtest/rxtest.c (modified) * examples/sample/sample.c (modified) * examples/tracedump/tracedump.c (modified) * examples/tracemark/tracemark.c (modified) * lib/format_wag.c (modified) * libpacketdump/libpacketdump.cc (modified) * tools/traceanon/traceanon.c (modified) * tools/tracedump/tracedump.cc (modified) * tools/tracemerge/tracemerge.c (modified) * tools/tracereport/tracereport.c (modified) * tools/tracertstats/tracertstats.c (modified) * tools/tracesplit/tracesplit.c (modified) * tools/tracestats/tracestats.c (modified) updated the examples/ and tools/ directories to correctly use ... Wed, 02 Nov 2005 00:09:23 GMT Daniel Lawson [aef91e2] * tools/traceanon/Makefile.am (modified) * tools/traceanon/traceanon.c (modified) * tools/tracedump/Makefile.am (modified) * tools/tracemerge/Makefile.am (modified) * tools/tracereport/Makefile.am (modified) * tools/tracertstats/Makefile.am (modified) * tools/tracesplit/Makefile.am (modified) updated the various Makefile.am to use include Makefile.tools Tue, 01 Nov 2005 21:13:54 GMT Daniel Lawson [1e7434a] * tools/tracemerge/Makefile.am (added) * tools/tracereport/Makefile.am (added) * tools/tracertstats/Makefile.am (added) * tools/tracesplit/Makefile.am (added) adding remainder of Makefile.am for tools Tue, 01 Nov 2005 21:08:56 GMT Daniel Lawson [a3505a8] * ChangeLog (modified) * Makefile.am (modified) * README (modified) * configure.in (modified) * lib/Makefile.am (modified) * libpacketdump/Makefile.am (modified) * tools/Makefile.am (added) * tools/traceanon/Makefile (deleted) * tools/traceanon/Makefile.am (added) * tools/tracedump/Makefile (deleted) * tools/tracedump/Makefile.am (added) * tools/tracemerge/Makefile (deleted) * tools/tracereport/Makefile (deleted) * tools/tracesplit/Makefile (deleted) removing old original Makefiles adding Makefile.am in appropriate ... Thu, 13 Oct 2005 03:26:37 GMT Perry Lorier [b297e50] * tools/tracemerge/tracemerge.c (modified) Add -d to merge directions, without just does a normal merge Wed, 12 Oct 2005 03:52:16 GMT Perry Lorier [801a5cc] * tools/tracemerge/Makefile (added) * tools/tracemerge/tracemerge.c (added) Merges two traces together