author | mickeyl <mickeyl> | 2004-04-23 14:43:53 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-23 14:43:53 (UTC) |
commit | d8a8c7bf9559dd1ad6a72c9e5582d72a176c97f6 (patch) (side-by-side diff) | |
tree | 1a069ffb791230709e5be8ce230afb6e8d510af9 /libopie2 | |
parent | 8e32516bbda3fda10314f2afe4ee00eb9a49c013 (diff) | |
download | opie-d8a8c7bf9559dd1ad6a72c9e5582d72a176c97f6.zip opie-d8a8c7bf9559dd1ad6a72c9e5582d72a176c97f6.tar.gz opie-d8a8c7bf9559dd1ad6a72c9e5582d72a176c97f6.tar.bz2 |
disambiguate the API (triggered by gcc 3.4 ;)
-rw-r--r-- | libopie2/opienet/opcap.cpp | 4 | ||||
-rw-r--r-- | libopie2/opienet/opcap.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp index 067d6b7..f8ebe6b 100644 --- a/libopie2/opienet/opcap.cpp +++ b/libopie2/opienet/opcap.cpp @@ -1262,52 +1262,50 @@ bool OPacketCapturer::open( const QString& name ) { _sn = new QSocketNotifier( fileno(), QSocketNotifier::Read ); connect( _sn, SIGNAL( activated(int) ), this, SLOT( readyToReceive() ) ); } return true; } bool OPacketCapturer::openDumpFile( const QString& filename ) { pcap_dumper_t* dump = pcap_dump_open( _pch, const_cast<char*>( (const char*) filename ) ); if ( !dump ) { owarn << "OPacketCapturer::open(): can't open dump with '" << filename << "': " << _errbuf << oendl; return false; } odebug << "OPacketCapturer::open(): dump [" << filename << "] opened successfully." << oendl; _pcd = dump; return true; } -bool OPacketCapturer::open( const QFile& file ) +bool OPacketCapturer::openCaptureFile( const QString& name ) { - QString name = file.name(); - if ( _open ) { close(); if ( name == _name ) // ignore opening an already openend device { return true; } else // close the last opened device { close(); } } _name = name; pcap_t* handle = pcap_open_offline( const_cast<char*>( (const char*) name ), &_errbuf[0] ); if ( handle ) { odebug << "OPacketCapturer::open(): libpcap opened successfully." << oendl; _pch = handle; _open = true; // in case we have an application object, create a socket notifier diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h index 2dbe030..9e718d5 100644 --- a/libopie2/opienet/opcap.h +++ b/libopie2/opienet/opcap.h @@ -642,51 +642,51 @@ class OPacketCapturer : public QObject /** * Dump a packet to the output capture file. */ void dump( OPacket* ); /** * @returns the file descriptor of the packet capturer. This is only useful, if * not using the socket notifier, e.g. without an application object. */ int fileno() const; /** * @returns the next @ref OPacket from the packet capturer. * @note If blocking mode is true then this call might block. */ OPacket* next(); /** * @returns the next @ref OPacket from the packet capturer, if * one arrives within @a time milliseconds. */ OPacket* next( int time ); /** * Open the packet capturer to capture packets in live-mode from @a interface. */ bool open( const QString& interface ); /** - * Open the packet capturer to capture packets in offline-mode from @a file. + * Open the packet capturer to capture packets in offline-mode from @a filename. */ - bool open( const QFile& file ); + bool openCaptureFile( const QString& filename ); /** * Open a prerecorded tcpdump compatible capture file for use with @ref dump() */ bool openDumpFile( const QString& filename ); /** * @returns true if the packet capturer is open */ bool isOpen() const; /** * @returns the snapshot length of this packet capturer */ int snapShot() const; /** * @returns true if the input capture file has a different byte-order * than the byte-order of the running system. */ bool swapped() const; /** * @returns the libpcap version string used to write the input capture file. */ QString version() const; /** * @returns the packet statistic database. * @see QMap |