-#define MAC_ADDR_S "%02x:%02x:%02x:%02x:%02x:%02x"
-#define MAC_ADDR_V(x) ((unsigned char*)&(x))[0],((unsigned char*)&(x))[1], \
- ((unsigned char*)&(x))[2],((unsigned char*)&(x))[3], \
- ((unsigned char*)&(x))[4],((unsigned char*)&(x))[5]
-
-#define IP_ADDR_S "%d.%d.%d.%d"
-
-#ifdef WORDS_BIGENDIAN
-# define IP_ADDR_V(x) ((unsigned char*)&(x))[0],((unsigned char*)&(x))[1], \
- ((unsigned char*)&(x))[2],((unsigned char*)&(x))[3]
-#else
-# define IP_ADDR_V(x) ((unsigned char*)&(x))[3],((unsigned char*)&(x))[2], \
- ((unsigned char*)&(x))[1],((unsigned char*)&(x))[0]
-#endif
-
-#define MAXBUFSIZE 4096 /* Probably way too much, but it must fit every possible request. */
-
-/* tap types */
-#define TAP_TYPE_ETHERTAP 0
-#define TAP_TYPE_TUNTAP 1
+#define MAXBUFSIZE 2048 /* Probably way too much, but it must fit every possible request. */
+#define MAXSOCKETS 128 /* Overkill... */