make etherdump work again
dev/etherdump.cc:
now that init is automatically called by the framework, don't
init twice.
--HG--
extra : convert_revision : 16dcdef67aa193ed71ff546e7b255d60f39bf13d
This commit is contained in:
@@ -43,11 +43,8 @@ using std::string;
|
||||
EtherDump::EtherDump(const string &name, const string &file)
|
||||
: SimObject(name)
|
||||
{
|
||||
if (!file.empty()) {
|
||||
if (!file.empty())
|
||||
stream.open(file.c_str());
|
||||
if (stream.is_open())
|
||||
init();
|
||||
}
|
||||
}
|
||||
|
||||
#define DLT_EN10MB 1 // Ethernet (10Mb)
|
||||
@@ -74,6 +71,9 @@ struct pcap_pkthdr {
|
||||
void
|
||||
EtherDump::init()
|
||||
{
|
||||
if (!stream.is_open())
|
||||
return;
|
||||
|
||||
curtime = time(NULL);
|
||||
s_freq = ticksPerSecond;
|
||||
us_freq = ticksPerSecond / ULL(1000000);
|
||||
|
||||
Reference in New Issue
Block a user