- fix off-by-one bug in OChannelHopper

- fix bug in OPacket which broke everything using it
- expose both wireless extension versions (runtime + compile time) through API

1 files changed, 2 insertions, 2 deletions

diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp
index f8ebe6b..a9dc577 100644
--- a/libopie2/opienet/opcap.cpp
+++ b/libopie2/opienet/opcap.cpp
@@ -55,15 +55,15 @@ namespace Net  {
  *======================================================================================*/
 
 OPacket::OPacket( int datalink, packetheaderstruct header, const unsigned char* data, QObject* parent )
         :QObject( parent, "Generic" ), _hdr( header ), _data( 0 )
 {
 
-    _data = new unsigned char[sizeof data];
+    _data = new unsigned char[ header.len ];
     assert( _data );
-    memcpy( const_cast<unsigned char*>(_data), data, sizeof data );
+    memcpy( const_cast<unsigned char*>(_data), data, header.len );
     // We have to copy the data structure here, because the 'data' pointer handed by libpcap
     // points to an internal region which is reused by lipcap.
     odebug << "OPacket: Length = " << header.len << ", Caplen = " << header.caplen << oendl;
     _end = (unsigned char*) _data + header.len;
 
     switch ( datalink )