Re: Problem with ns-2.1b4 installation on Win98

[Brett Vickers <bvickers@cs.rutgers.edu>]

I left one thing out of the patch I just posted.  You also need
to patch filter.cc to use "DUPLIC" instead of "DUPLICATE".  The
complete set of patches are below.

Brett


Index: makefile.vc
======================================================================
--- makefile.vc	Wed Sep  2 19:15:29 1998
+++ makefile.vc	Wed Oct 28 12:07:32 1998
@@ -98,7 +98,7 @@
 	scheduler.o object.o \
 	packet.o ip.o route.o connector.o ttl.o \
 	trace.o trace-ip.o \
-	classifier.o classifier-addr.o classifier-hash.o \
+	classifier.o classifier-addr.o classifier-hash.o classifier-virtual.o \
 	classifier-mcast.o classifier-mpath.o replicator.o \
 	classifier-mac.o \
 	app.o telnet.o tcplib-telnet.o \
@@ -122,7 +122,7 @@
 	delay.o ll.o snoop.o \
 	channel.o mac.o mac-csma.o mac-802_11.o mac-multihop.o \
 	dynalink.o rtProtoDV.o net-interface.o \
-	ctrMcast.o prune.o srm.o \
+	ctrMcast.o mcast_ctrl.o srm.o \
 	sessionhelper.o delaymodel.o srm-ssm.o \
 	srm-topo.o \
 	alloc-address.o address.o \
@@ -130,7 +130,7 @@
 	$(LIB_DIR)dmalloc_support.o \
 	webcache/http.o webcache/tcp-simple.o webcache/pagepool.o \
 	webcache/inval-agent.o webcache/tcpapp.o webcache/http-aux.o \
-	lanRouter.o
+	lanRouter.o tfcc.o filter.o
 
 # what was here before is now in emulate/
 OBJ_C =


Index: filter.h
======================================================================
--- filter.h	Tue Oct  6 14:39:34 1998
+++ filter.h	Wed Oct 28 12:07:36 1998
@@ -29,11 +29,11 @@
 public:
 	Filter();
 	inline NsObject* filter_target() { return filter_target_; }
+	enum filter_e { DROP, PASS, FILTER, DUPLIC };
 protected:
-	enum filter_e { DROP, PASS, FILTER, DUPLICATE };
 	virtual filter_e filter(Packet* p);
 
-	int command(int argc, const char*const* argv);
+	int command(int argc, const char* const* argv);
 	void recv(Packet*, Handler* h= 0);
 	NsObject* filter_target_; // target for the matching packets
 };


Index: filter.cc
======================================================================
--- filter.cc	Wed Oct 28 13:58:50 1998
+++ filter.cc	Wed Oct 28 13:58:42 1998
@@ -48,7 +48,7 @@
 		if (h) h->handle(p);
 		drop(p);
 		break;
-	case DUPLICATE :
+	case DUPLIC :
 		if (filter_target_)
 			filter_target_->recv(p->copy(), h);
 		/* fallthrough */