+	sctp/sctp-timestamp.o sctp/sctp-hbAfterRto.o \+	sctp/sctp-multipleFastRtx.o sctp/sctp-mfrHbAfterRto.o \+	sctp/sctp-mfrTimestamp.o \+	sctp/sctpDebug.o \+	tools/integrator.o tools/queue-monitor.o \+	tools/flowmon.o tools/loss-monitor.o \+	queue/queue.o queue/drop-tail.o \+	adc/simple-intserv-sched.o queue/red.o \+	queue/semantic-packetqueue.o queue/semantic-red.o \+	tcp/ack-recons.o \+	queue/sfq.o queue/fq.o queue/drr.o queue/srr.o queue/cbq.o \+	queue/jobs.o queue/marker.o queue/demarker.o \+	link/hackloss.o queue/errmodel.o queue/fec.o\+	link/delay.o tcp/snoop.o \+	gaf/gaf.o \+	link/dynalink.o routing/rtProtoDV.o common/net-interface.o \+	mcast/ctrMcast.o mcast/mcast_ctrl.o mcast/srm.o \+	common/sessionhelper.o queue/delaymodel.o \+	mcast/srm-ssm.o mcast/srm-topo.o \+	routing/alloc-address.o routing/address.o \+	$(LIB_DIR)int.Vec.o $(LIB_DIR)int.RVec.o \+	$(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 \+	webcache/mcache.o webcache/webtraf.o \+	webcache/webserver.o \+	webcache/logweb.o \+	empweb/empweb.o \+	empweb/empftp.o \+	realaudio/realaudio.o \+	mac/lanRouter.o classifier/filter.o \+	common/pkt-counter.o \+	common/Decapsulator.o common/Encapsulator.o \+	common/encap.o \+	mac/channel.o mac/mac.o mac/ll.o mac/mac-802_11.o \+	mac/mac-802_3.o mac/mac-tdma.o mac/smac.o \+	mobile/mip.o mobile/mip-reg.o mobile/gridkeeper.o \+	mobile/propagation.o mobile/tworayground.o \+	mobile/antenna.o mobile/omni-antenna.o \+	mobile/shadowing.o mobile/shadowing-vis.o mobile/dumb-agent.o \+	common/bi-connector.o common/node.o \+	common/mobilenode.o \+	mac/arp.o mobile/god.o mobile/dem.o \+	mobile/topography.o mobile/modulation.o \+	queue/priqueue.o queue/dsr-priqueue.o \+	mac/phy.o mac/wired-phy.o mac/wireless-phy.o \+	mac/mac-timers.o trace/cmu-trace.o mac/varp.o \+	mac/mac-simple.o \+	satellite/sat-hdlc.o \+	dsdv/dsdv.o dsdv/rtable.o queue/rtqueue.o \+	routing/rttable.o \+	imep/imep.o imep/dest_queue.o imep/imep_api.o \+	imep/imep_rt.o imep/rxmit_queue.o imep/imep_timers.o \+	imep/imep_util.o imep/imep_io.o \+	tora/tora.o tora/tora_api.o tora/tora_dest.o \+	tora/tora_io.o tora/tora_logs.o tora/tora_neighbor.o \+	dsr/dsragent.o dsr/hdr_sr.o dsr/mobicache.o dsr/path.o \+	dsr/requesttable.o dsr/routecache.o dsr/add_sr.o \+	dsr/dsr_proto.o dsr/flowstruct.o dsr/linkcache.o \+	dsr/simplecache.o dsr/sr_forwarder.o \+	aodv/aodv_logs.o aodv/aodv.o \+	aodv/aodv_rtable.o aodv/aodv_rqueue.o \+	common/ns-process.o \+	satellite/satgeometry.o satellite/sathandoff.o \+	satellite/satlink.o satellite/satnode.o \+	satellite/satposition.o satellite/satroute.o \+	satellite/sattrace.o \+	rap/raplist.o rap/rap.o rap/media-app.o rap/utilities.o \+	common/fsm.o tcp/tcp-abs.o \+	diffusion/diffusion.o diffusion/diff_rate.o diffusion/diff_prob.o \+	diffusion/diff_sink.o diffusion/flooding.o diffusion/omni_mcast.o \+	diffusion/hash_table.o diffusion/routing_table.o diffusion/iflist.o \+	tcp/tfrc.o tcp/tfrc-sink.o mobile/energy-model.o apps/ping.o tcp/tcp-rfc793edu.o \+	queue/rio.o queue/semantic-rio.o tcp/tcp-sack-rh.o tcp/scoreboard-rh.o \+	plm/loss-monitor-plm.o plm/cbr-traffic-PP.o \+	linkstate/hdr-ls.o \+	mpls/classifier-addr-mpls.o mpls/ldp.o mpls/mpls-module.o \+	routing/rtmodule.o classifier/classifier-hier.o \+	routing/addr-params.o \+         nix/hdr_nv.o nix/classifier-nix.o \+         nix/nixnode.o \+         routealgo/rnode.o \+         routealgo/bfs.o \+         routealgo/rbitmap.o \+         routealgo/rlookup.o \+         routealgo/routealgo.o \+         nix/nixvec.o \+	nix/nixroute.o \+	diffserv/dsred.o diffserv/dsredq.o \+	diffserv/dsEdge.o diffserv/dsCore.o \+	diffserv/dsPolicy.o diffserv/ew.o diffserv/dewp.o \+	queue/red-pd.o queue/pi.o queue/vq.o queue/rem.o \+	queue/gk.o \+	pushback/rate-limit.o pushback/rate-limit-strategy.o \+	pushback/ident-tree.o pushback/agg-spec.o \+	pushback/logging-data-struct.o \+	pushback/rate-estimator.o \+	pushback/pushback-queue.o pushback/pushback.o \+	common/parentnode.o trace/basetrace.o \+	common/simulator.o asim/asim.o \+	common/scheduler-map.o common/splay-scheduler.o \+	linkstate/ls.o linkstate/rtProtoLS.o \+	pgm/classifier-pgm.o pgm/pgm-agent.o pgm/pgm-sender.o \+	pgm/pgm-receiver.o mcast/rcvbuf.o \+	mcast/classifier-lms.o mcast/lms-agent.o mcast/lms-receiver.o \+	mcast/lms-sender.o \+	queue/delayer.o \+	xcp/xcpq.o xcp/xcp.o xcp/xcp-end-sys.o \+	wpan/p802_15_4csmaca.o wpan/p802_15_4fail.o \+	wpan/p802_15_4hlist.o wpan/p802_15_4mac.o \+	wpan/p802_15_4nam.o wpan/p802_15_4phy.o \+	wpan/p802_15_4sscs.o wpan/p802_15_4timer.o \+	wpan/p802_15_4trace.o wpan/p802_15_4transac.o \+	@V_STLOBJ@+++# don't allow comments to follow continuation lines++#  mac-csma.o mac-multihop.o\+#	sensor-nets/landmark.o mac-simple-wireless.o \+#	sensor-nets/tags.o sensor-nets/sensor-query.o \+#	sensor-nets/flood-agent.o \++# what was here before is now in emulate/+OBJ_C =++OBJ_COMPAT = $(OBJ_GETOPT) common/win32.o+#XXX compat/win32x.o compat/tkConsole.o++OBJ_EMULATE_CC = \+	emulate/net-ip.o \+	emulate/net.o \+	emulate/tap.o \+	emulate/ether.o \+	emulate/internet.o \+	emulate/ping_responder.o \+	emulate/arp.o \+	emulate/icmp.o \+	emulate/net-pcap.o \+	emulate/nat.o  \+	emulate/iptap.o \+	emulate/tcptap.o++OBJ_EMULATE_C = \+	emulate/inet.o++OBJ_GEN = $(GEN_DIR)version.o $(GEN_DIR)ns_tcl.o $(GEN_DIR)ptypes.o++SRC =	$(OBJ_C:.o=.c) $(OBJ_CC:.o=.cc) \+	$(OBJ_EMULATE_C:.o=.c) $(OBJ_EMULATE_CC:.o=.cc) \+	common/tclAppInit.cc common/tkAppInit.cc ++OBJ =	$(OBJ_C) $(OBJ_CC) $(OBJ_GEN) $(OBJ_COMPAT)++CLEANFILES = ns nse nsx ns.dyn $(OBJ) $(OBJ_EMULATE_CC) \+	$(OBJ_EMULATE_C) common/tclAppInit.o \+	$(GEN_DIR)* $(NS).core core core.$(NS) core.$(NSX) core.$(NSE) \+	common/ptypes2tcl common/ptypes2tcl.o ++SUBDIRS=\+	indep-utils/cmu-scen-gen/setdest \+	indep-utils/webtrace-conv/dec \+	indep-utils/webtrace-conv/epa \+	indep-utils/webtrace-conv/nlanr \+	indep-utils/webtrace-conv/ucb++BUILD_NSE = @build_nse@++all: $(NS) $(BUILD_NSE) all-recursive++# AODV-UU: Added phony targets for AODV-UU+.PHONY: aodv-uu-clean dsruu-clean++$(AODV_UU_DIR)/$(AODV_UU_LIB):+	cd $(AODV_UU_DIR) && $(MAKE) $(AODV_UU_LIB) NS_DEFS='$(DEFINE)' OPTS='$(CCOPT)' NS_INC='$(subst -I.,-I$(shell pwd),$(INCLUDES))'++aodv-uu-clean:+	cd $(AODV_UU_DIR) && $(MAKE) clean++$(DSRUU_DIR)/$(DSRUU_LIB): $(DSRUU_DIR)/*.c $(DSRUU_DIR)/*.h  $(DSRUU_DIR)/Makefile+	$(MAKE) -C $(DSRUU_DIR) $(DSRUU_LIB) NS_DEFS='$(DEFINE) -DNS2' OPTS='$(CCOPT)' NS_INC='$(subst -I.,-I$(shell pwd),$(INCLUDES))'++dsruu-clean:+	$(MAKE) -C $(DSRUU_DIR) clean++all-recursive:+	for i in $(SUBDIRS); do ( cd $$i; $(MAKE) all; ) done++# AODV-UU: Added "aodv-uu" as first dependency+$(NS):  $(AODV_UU_DIR)/$(AODV_UU_LIB) $(DSRUU_DIR)/$(DSRUU_LIB) $(OBJ) common/tclAppInit.o Makefile+	$(LINK) $(LDFLAGS) $(LDOUT)$@ \+		common/tclAppInit.o $(OBJ) $(LIB) $(DSRUU_DIR)/*-ns.o++Makefile: Makefile.in+	@echo "Makefile.in is newer than Makefile."+	@echo "You need to re-run configure."+	false++$(NSE): $(OBJ) common/tclAppInit.o $(OBJ_EMULATE_CC) $(OBJ_EMULATE_C)+	$(LINK) $(LDFLAGS) $(LDOUT)$@ \+		common/tclAppInit.o $(OBJ) \+		$(OBJ_EMULATE_CC) $(OBJ_EMULATE_C)  $(LIB) ++ns.dyn: $(OBJ) common/tclAppInit.o+	$(LINK) $(LDFLAGS) -o $@ \+		common/tclAppInit.o $(OBJ) $(LIB)++PURIFY	= purify -cache-dir=/tmp+ns-pure: $(OBJ) common/tclAppInit.o+	$(PURIFY) $(LINK) $(LDFLAGS) -o $@ \+		common/tclAppInit.o $(OBJ) $(LIB)++NS_TCL_LIB = \+	tcl/lib/ns-compat.tcl \+	tcl/lib/ns-default.tcl \+	tcl/lib/ns-errmodel.tcl \+	tcl/lib/ns-lib.tcl \+	tcl/lib/ns-link.tcl \+	tcl/lib/ns-mobilenode.tcl \+	tcl/lib/ns-sat.tcl \+	tcl/lib/ns-cmutrace.tcl \+	tcl/lib/ns-node.tcl \+	tcl/lib/ns-rtmodule.tcl \+	tcl/lib/ns-hiernode.tcl \+	tcl/lib/ns-packet.tcl \+	tcl/lib/ns-queue.tcl \+	tcl/lib/ns-source.tcl \+	tcl/lib/ns-nam.tcl \+	tcl/lib/ns-trace.tcl \+	tcl/lib/ns-agent.tcl \+	tcl/lib/ns-random.tcl \+	tcl/lib/ns-namsupp.tcl \+	tcl/lib/ns-address.tcl \+	tcl/lib/ns-intserv.tcl \+	tcl/lib/ns-autoconf.tcl \+	tcl/rtp/session-rtp.tcl \+	tcl/lib/ns-mip.tcl \+	tcl/rtglib/dynamics.tcl \+	tcl/rtglib/route-proto.tcl \+	tcl/rtglib/algo-route-proto.tcl \+	tcl/rtglib/ns-rtProtoLS.tcl \+        tcl/interface/ns-iface.tcl \+	tcl/mcast/BST.tcl \+        tcl/mcast/ns-mcast.tcl \+        tcl/mcast/McastProto.tcl \+        tcl/mcast/DM.tcl \+	tcl/mcast/srm.tcl \+	tcl/mcast/srm-adaptive.tcl \+	tcl/mcast/srm-ssm.tcl \+	tcl/mcast/timer.tcl \+	tcl/mcast/McastMonitor.tcl \+	tcl/mobility/dsdv.tcl \+	tcl/mobility/dsr.tcl \+        tcl/ctr-mcast/CtrMcast.tcl \+        tcl/ctr-mcast/CtrMcastComp.tcl \+        tcl/ctr-mcast/CtrRPComp.tcl \+	tcl/rlm/rlm.tcl \+	tcl/rlm/rlm-ns.tcl \+	tcl/session/session.tcl \+	tcl/lib/ns-route.tcl \+	tcl/emulate/ns-emulate.tcl \+	tcl/lan/vlan.tcl \+	tcl/lan/abslan.tcl \+	tcl/lan/ns-ll.tcl \+	tcl/lan/ns-mac.tcl \+	tcl/webcache/http-agent.tcl \+	tcl/webcache/http-server.tcl \+	tcl/webcache/http-cache.tcl \+	tcl/webcache/http-mcache.tcl \+	tcl/webcache/webtraf.tcl \+	tcl/webcache/empweb.tcl \+	tcl/webcache/empftp.tcl \+	tcl/plm/plm.tcl \+	tcl/plm/plm-ns.tcl \+	tcl/plm/plm-topo.tcl \+	tcl/mpls/ns-mpls-classifier.tcl \+	tcl/mpls/ns-mpls-ldpagent.tcl \+	tcl/mpls/ns-mpls-node.tcl \+	tcl/mpls/ns-mpls-simulator.tcl \+	tcl/lib/ns-pushback.tcl \+	tcl/lib/ns-srcrt.tcl \+	tcl/mcast/ns-lms.tcl \+	tcl/lib/ns-qsnode.tcl \+	@V_NS_TCL_LIB_STL@++$(GEN_DIR)ns_tcl.cc: $(NS_TCL_LIB)+	$(TCLSH) bin/tcl-expand.tcl tcl/lib/ns-lib.tcl @V_NS_TCL_LIB_STL@ | $(TCL2C) et_ns_lib > $@++$(GEN_DIR)version.c: VERSION+	$(RM) $@+	$(TCLSH) bin/string2c.tcl version_string < VERSION > $@++$(GEN_DIR)ptypes.cc: common/ptypes2tcl common/packet.h+	./common/ptypes2tcl > $@++common/ptypes2tcl: common/ptypes2tcl.o+	$(LINK) $(LDFLAGS) $(LDOUT)$@ common/ptypes2tcl.o++common/ptypes2tcl.o: common/ptypes2tcl.cc common/packet.h++dirs:+	for d in $(DESTDIR)$(MANDEST)/man1; do \+		if [ ! -d $$d ]; then \+			mkdir -p $$d ;\+		fi;\+	done+++install: dirs force install-ns install-man++install-ns: force+	$(INSTALL) -m 755 ns $(DESTDIR)$(BINDEST)++install-man: force+	$(INSTALL) -m 644 ns.1 $(DESTDIR)$(MANDEST)/man1++install-recursive: force+	for i in $(SUBDIRS); do ( cd $$i; $(MAKE) install; ) done++clean: aodv-uu-clean dsruu-clean+	$(RM) $(CLEANFILES)++AUTOCONF_GEN = tcl/lib/ns-autoconf.tcl+distclean: distclean-recursive+	$(RM) $(CLEANFILES) Makefile config.cache config.log config.status \+	    autoconf.h gnuc.h os-proto.h $(AUTOCONF_GEN); \+	$(MV) .configure .configure- ;\+	echo "Moved .configure to .configure-"++distclean-recursive:+	for i in $(SUBDIRS); do ( cd $$i; $(MAKE) clean; $(RM) Makefile; ) done++tags:	force+	ctags -wtd *.cc *.h webcache/*.cc webcache/*.h dsdv/*.cc dsdv/*.h \+	dsr/*.cc dsr/*.h webcache/*.cc webcache/*.h lib/*.cc lib/*.h \+	../Tcl/*.cc ../Tcl/*.h ++TAGS:	force+	etags *.cc *.h webcache/*.cc webcache/*.h dsdv/*.cc dsdv/*.h \+	dsr/*.cc dsr/*.h webcache/*.cc webcache/*.h lib/*.cc lib/*.h \+	../Tcl/*.cc ../Tcl/*.h++tcl/lib/TAGS:	force+	( \+		cd tcl/lib; \+		$(TCLSH) ../../bin/tcl-expand.tcl ns-lib.tcl | grep '^### tcl-expand.tcl: begin' | awk '{print $$5}' >.tcl_files; \+		etags --lang=none -r '/^[ \t]*proc[ \t]+\([^ \t]+\)/\1/' `cat .tcl_files`; \+		etags --append --lang=none -r '/^\([A-Z][^ \t]+\)[ \t]+\(instproc\|proc\)[ \t]+\([^ \t]+\)[ \t]+/\1::\3/' `cat .tcl_files`; \+	)++depend: $(SRC)+	$(MKDEP) -- $(CFLAGS) -- -Y $(SRC) >& /dev/null++srctar:+	@cwd=`pwd` ; dir=`basename $$cwd` ; \+	    name=ns-`cat VERSION | tr A-Z a-z` ; \+	    tar=ns-src-`cat VERSION`.tar.gz ; \+	    list="" ; \+	    for i in `cat FILES` ; do list="$$list $$name/$$i" ; done; \+	    echo \+	    "(rm -f $$tar; cd .. ; ln -s $$dir $$name)" ; \+	     (rm -f $$tar; cd .. ; ln -s $$dir $$name) ; \+	    echo \+	    "(cd .. ; tar cfh $$tar [lots of files])" ; \+	     (cd .. ; tar cfh - $$list) | gzip -c > $$tar ; \+	    echo \+	    "rm ../$$name; chmod 444 $$tar" ;  \+	     rm ../$$name; chmod 444 $$tar++force:++test:	force+	./validate++# Create makefile.vc for Win32 development by replacing:+# "# !include ..." 	-> 	"!include ..."+makefile.vc:	Makefile.in+	$(PERL) bin/gen-vcmake.pl < Makefile.in > makefile.vc+#	$(PERL) -pe 's/^# (\!include)/\!include/o' < Makefile.in > makefile.vcdiff -uprN ns-2.29.orig/queue/priqueue.cc ns-2.29/queue/priqueue.cc--- ns-2.29.orig/queue/priqueue.cc	2005-10-20 06:45:23.000000000 +0200+++ ns-2.29/queue/priqueue.cc	2006-03-10 13:59:45.000000000 +0100@@ -92,7 +92,11 @@ PriQueue::recv(Packet *p, Handler *h)                 case PT_AODV:                         recvHighPriority(p, h);                         break;-+#ifdef AODV_UU+                case PT_AODVUU:+                        recvHighPriority(p, h);+                        break;+#endif /* AODV_UU */                 default:                         Queue::recv(p, h);                 }diff -uprN ns-2.29.orig/smolsr/copy-protocol-plugin-api.h ns-2.29/smolsr/copy-protocol-plugin-api.h--- ns-2.29.orig/smolsr/copy-protocol-plugin-api.h	1970-01-01 01:00:00.000000000 +0100+++ ns-2.29/smolsr/copy-protocol-plugin-api.h	2004-10-04 17:54:49.000000000 +0200@@ -0,0 +1,175 @@+//---------------------------------------------------------------------------+//                          Protocol-Plugin API+//             Cedric Adjih, projet Hipercom, INRIA Rocquencourt