add two minor functions in the pcap interface

2 files changed, 37 insertions, 2 deletions

diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp
index 523be3e..bef9182 100644
--- a/libopie2/opienet/opcap.cpp
+++ b/libopie2/opienet/opcap.cpp
@@ -1034,24 +1034,43 @@ bool OPacketCapturer::open( const QFile& file )
 }
 
 
 bool OPacketCapturer::isOpen() const
 {
     return _open;
 }
 
 
 void OPacketCapturer::readyToReceive()
 {
     qDebug( "OPacketCapturer::readyToReceive(): about to emit 'receivePacket(p)'" );
     OPacket* p = next();
     emit receivedPacket( p );
     // emit is synchronous - packet has been dealt with, now it's safe to delete
     delete p;
 }
 
 
 const QMap<QString,int>& OPacketCapturer::statistics() const
 {
     return _stats;
 }
 
+
+int OPacketCapturer::snapShot() const
+{
+    return pcap_snapshot( _pch );
+}
+
+
+bool OPacketCapturer::swapped() const
+{
+    return pcap_is_swapped( _pch );
+}
+
+
+QString OPacketCapturer::version() const
+{
+    return QString().sprintf( "%s.%s", pcap_major_version( _pch ), pcap_minor_version( _pch ) );
+}
+
+
diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h
index 5a50d9b..ad5b07c 100644
--- a/libopie2/opienet/opcap.h
+++ b/libopie2/opienet/opcap.h
@@ -521,70 +521,86 @@ class OPacketCapturer : public QObject
     OPacketCapturer( QObject* parent = 0, const char* name = 0 );
     /**
      * Destructor.
      */
     ~OPacketCapturer();
     /**
      * Setting the packet capturer to use blocking IO calls can be useful when
      * not using the socket notifier, e.g. without an application object.
      */
     void setBlocking( bool );
     /**
      * @returns true if the packet capturer uses blocking IO calls.
      */
     bool blocking() const;
     /**
      * Closes the packet capturer. This is automatically done in the destructor.
      */
     void close();
     /**
      * @returns the data link type.
      * @see <pcap.h> for possible values.
      */
     int dataLink() const;
     /**
-     * @returns the filedescriptor of the packet capturer. This is only useful, if
+     * @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();
     /**
      * Open the packet capturer to capture packets in live-mode from @a interface.
      * If a @a filename is given, all captured packets are output to a tcpdump-compatible capture file.
      */
     bool open( const QString& interface, const QString& filename = QString::null );
     /**
      * Open the packet capturer to capture packets in offline-mode from @a file.
      */
     bool open( const QFile& file );
     /**
      * @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
+     */
     const QMap<QString,int>& statistics() const;
 
   signals:
     /**
      * This signal is emitted, when a packet has been received.
      */
     void receivedPacket( OPacket* );
 
   protected slots:
     void readyToReceive();
 
   protected:
     QString _name;                                  // devicename
     bool _open;                                     // check this before doing pcap calls
     pcap_t* _pch;                                   // pcap library handle
     pcap_dumper_t* _pcd;                            // pcap dumper handle
     QSocketNotifier* _sn;                           // socket notifier for main loop
     mutable char _errbuf[PCAP_ERRBUF_SIZE];         // holds error strings from libpcap
     QMap<QString, int> _stats;                      // statistics;
 };
 
 #endif // OPCAP_H