refactor the debug mapper and make it more secure

1 files changed, 2 insertions, 13 deletions

diff --git a/libopie2/opienet/onetutils.cpp b/libopie2/opienet/onetutils.cpp
index ce147c5..e3eb327 100644
--- a/libopie2/opienet/onetutils.cpp
+++ b/libopie2/opienet/onetutils.cpp
@@ -21,45 +21,34 @@
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <opie2/onetutils.h>
 #include <opie2/onetwork.h>
 #include <opie2/omanufacturerdb.h>
 
 #include <net/if.h>
-#include <cassert>
-#include <cstdio>
-using namespace std;
-
-#define IW_PRIV_TYPE_MASK       0x7000
-#define IW_PRIV_TYPE_NONE       0x0000
-#define IW_PRIV_TYPE_BYTE       0x1000
-#define IW_PRIV_TYPE_CHAR       0x2000
-#define IW_PRIV_TYPE_INT        0x4000
-#define IW_PRIV_TYPE_FLOAT      0x5000
-#define IW_PRIV_TYPE_ADDR       0x6000
-#define IW_PRIV_SIZE_FIXED      0x0800
-#define IW_PRIV_SIZE_MASK       0x07FF
+#include <assert.h>
+#include <stdio.h>
 
 /*======================================================================================
  * OMacAddress
  *======================================================================================*/
 
 // static initializer for broadcast and unknown MAC Adresses
 const unsigned char __broadcast[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 const OMacAddress& OMacAddress::broadcast = OMacAddress( __broadcast );
 const unsigned char __unknown[6] = { 0x44, 0x44, 0x44, 0x44, 0x44, 0x44 };
 const OMacAddress& OMacAddress::unknown = OMacAddress( __unknown );
 
 //TODO: Incorporate Ethernet Manufacturer database here! (inline or so)
 
 OMacAddress::OMacAddress()
 {
     memcpy( _bytes, __unknown, 6 );