diff -c ns-2.1b7a.org/Makefile.in ns-2.1b7a/Makefile.in *** ns-2.1b7a.org/Makefile.in Thu Oct 19 05:10:22 2000 --- ns-2.1b7a/Makefile.in Wed Jun 6 10:39:41 2001 *************** *** 54,60 **** LDFLAGS = $(STATIC) LDOUT = -o $(BLANK) ! DEFINE = -DTCP_DELAY_BIND_ALL -DNO_TK @V_DEFINE@ @V_DEFINES@ @DEFS@ INCLUDES = \ -I. @V_INCLUDE_X11@ \ --- 54,60 ---- LDFLAGS = $(STATIC) LDOUT = -o $(BLANK) ! DEFINE = -DTCP_DELAY_BIND_ALL -DNO_TK @V_DEFINE@ @V_DEFINES@ @DEFS@ -DSHOW_SACKBLK INCLUDES = \ -I. @V_INCLUDE_X11@ \ diff -c ns-2.1b7a.org/trace.cc ns-2.1b7a/trace.cc *** ns-2.1b7a.org/trace.cc Fri Sep 1 12:04:08 2000 --- ns-2.1b7a/trace.cc Wed Jun 6 10:40:16 2001 *************** *** 250,257 **** th->uid() /* was p->uid_ */); } else { sprintf(wrk_, ! "%c "TIME_FORMAT" %d %d %s %d %s %d %s.%s %s.%s %d %d %d 0x%x %d %d", ! tt, round(Scheduler::instance().clock()), s, d, --- 250,260 ---- th->uid() /* was p->uid_ */); } else { sprintf(wrk_, ! "%c "TIME_FORMAT" %d %d %s %d %s %d %s.%s %s.%s %d %d %d 0x%x %d %d" ! #ifdef SHOW_SACKBLK ! " %d %d %d %d %d %d" ! #endif ! ,tt, round(Scheduler::instance().clock()), s, d, *************** *** 272,278 **** tcph->ackno(), tcph->flags(), tcph->hlen(), ! tcph->sa_length()); } if (namChan_ != 0) sprintf(nwrk_, --- 275,290 ---- tcph->ackno(), tcph->flags(), tcph->hlen(), ! tcph->sa_length() ! #ifdef SHOW_SACKBLK ! ,tcph->sa_left(0), ! tcph->sa_right(0), ! tcph->sa_left(1), ! tcph->sa_right(1), ! tcph->sa_left(2), ! tcph->sa_right(2) ! #endif ! ); } if (namChan_ != 0) sprintf(nwrk_,