Updated the PCAP import/export test code to work with latest code

This commit is contained in:
Srivats P. 2011-03-22 23:01:05 +05:30
parent 497a0be276
commit 3a713899a9

View File

@ -1,6 +1,6 @@
#include "ostprotolib.h"
#include "pcapfileformat.h" #include "pcapfileformat.h"
#include "pdmlfileformat.h"
#include "protocol.pb.h" #include "protocol.pb.h"
#include "protocolmanager.h" #include "protocolmanager.h"
@ -11,6 +11,7 @@ extern ProtocolManager *OstProtocolManager;
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
bool isOk;
QCoreApplication app(argc, argv); QCoreApplication app(argc, argv);
QString error; QString error;
@ -26,19 +27,33 @@ int main(int argc, char* argv[])
QString inFile(argv[1]); QString inFile(argv[1]);
QString outFile(argv[2]); QString outFile(argv[2]);
if (!pcapFileFormat.openStreams(inFile, streams, error)) OstProtocolManager = new ProtocolManager();
OstProtoLib::setExternalApplicationPaths(
"c:/Program Files/Wireshark/Tshark.exe",
"d:/srivatsp/projects/ostinato/pdml/bin/gzip.exe",
"d:/srivatsp/projects/ostinato/pdml/bin/diff.exe",
"d:/srivatsp/projects/ostinato/pdml/bin/gawk.exe");
isOk = pcapFileFormat.openStreams(inFile, streams, error);
if (!error.isEmpty())
{ {
fprintf(stdout, "failed reading streams from %s:%s\n", fprintf(stdout, "failed reading streams from %s:%s\n",
inFile.toAscii().constData(), error.toAscii().constData()); inFile.toAscii().constData(), error.toAscii().constData());
exit(1);
} }
if (!pcapFileFormat.saveStreams(streams, outFile, error)) if (!isOk)
exit(1);
isOk = pcapFileFormat.saveStreams(streams, outFile, error);
if (!error.isEmpty())
{ {
fprintf(stdout, "failed writing streams to %s:%s\n", fprintf(stdout, "failed writing streams to %s:%s\n",
outFile.toAscii().constData(), error.toAscii().constData()); outFile.toAscii().constData(), error.toAscii().constData());
exit(1);
} }
if (!isOk)
exit(1);
return 0; return 0;
} }