 + return(targoffset);
 +}
 +
-+int IPTapAgent::uncompress(unsigned long* pTarget, unsigned long* pSource, int Count)
++inline int Packet::uncompress(unsigned long* pTarget, unsigned long* pSource, int Count)
 +{ // Reverse above compression
 +  // Target buffer MUST BE ZERO on entry!
 +int offset = 0;

     int	       	lo_, hi_;	// range of lost packets
     double     	ts_;		// timestamp for RTT estimation
--- dist-ns-allinone-2.26/ns-2.26/Makefile.in	Thu Feb 27 17:51:25 2003
+++ ns-allinone-2.26/ns-2.26/Makefile.in	Sun Dec 14 20:38:54 2003
@@ -79,6 +79,15 @@
 
 CFLAGS	= $(CCOPT) $(DEFINE)
 
+#### with event system
+INCLUDES += -I../.. -I../../../lib -I../../../../lib/libtb `elvin-config --cflags vin4c`
+#CFLAGS += -DUSEEVENTS -DADD_ETHER_OVERHEAD -DGETTIME_TSC
+CFLAGS += -DUSEEVENTS -DADD_ETHER_OVERHEAD -DGETTIME_TSC
+LIB += -L../../../lib -L../../../../lib/libtb -levent -ltb -lcrypto
+LIB += `elvin-config --libs vin4c`
+STATIC += -static

 };
 
 #endif
--- dist-ns-allinone-2.26/ns-2.26/classifier/classifier-port.cc	Wed Feb 26 15:07:33 2003
+++ ns-allinone-2.26/ns-2.26/classifier/classifier-port.cc	Fri Jan 16 17:27:47 2004
@@ -26,9 +26,17 @@
 #endif
 
 #include "classifier-port.h"
+#include "packet.h"
+
+#ifdef PACKET_DECAPSULATE
+extern bool PacketDecapsulateIfNeeded(Packet *p);
+#endif
 
 int PortClassifier::classify(Packet *p) 
 {
+#ifdef PACKET_DECAPSULATE
+	::PacketDecapsulateIfNeeded(p);
+#endif
 	// Port classifier returns the destination port.  No shifting
 	// or masking is required since in the 32-bit addressing,
 	// ports are stored in a seperate variable.
--- dist-ns-allinone-2.26/ns-2.26/common/ip.h	Wed Feb 26 15:07:39 2003
+++ ns-allinone-2.26/ns-2.26/common/ip.h	Fri Nov 28 16:55:25 2003
@@ -76,11 +76,11 @@
