--- nam-1.0a3/main.cc	Wed Nov  5 22:08:04 1997
+++ src/nam-1/main.cc	Wed Nov 19 21:02:56 1997
@@ -396,7 +396,7 @@
 	FILE *fp = fopen(".nam.tcl", "r");
 	if (fp != NULL) {
 		fclose(fp);
-		tcl.EvalFile(configFile);
+		tcl.EvalFile(".nam.tcl");
 	}
 
 	// User-supplied configuration files
--- nam-1.0a3/anetmodel.cc	Wed Nov  5 22:08:04 1997
+++ src/nam-1/anetmodel.cc	Wed Nov 19 20:59:33 1997
@@ -131,7 +131,9 @@
 	placeEverything();
 
 	for (NetView *p = views_; p != 0; p = p->next_)
-		p->redrawModel();
+		if ((p->width() > 0) && (p->height() > 0))
+			// XXX assume this means tk is being initialized
+			p->redrawModel();
 }
 
 // do several passes of embedding
--- nam-1.0a3/trace.cc	Mon Nov 10 12:11:25 1997
+++ src/nam-1/trace.cc	Wed Nov 19 17:10:20 1997
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static char rcsid[] =
-"@(#) $Header: /usr/src/mash/repository/vint/nam-1/trace.cc,v 1.11 1997/11/10 20:11:21 haoboy Exp $ (LBL)";
+"@(#) $Header: /usr/src/mash/repository/vint/nam-1/trace.cc,v 1.12 1997/11/20 01:10:33 haoboy Exp $ (LBL)";
 #endif
 
 #include <stdlib.h>
@@ -122,6 +122,7 @@
 	 * trace event.
 	 */
 	mintime_ = nextTime();
+	now_ = mintime_;
 
 	State::instance()->setTimes(mintime_, maxtime_);
 }
--- nam-1.0a3/nam.1	Mon Nov 10 12:11:15 1997
+++ src/nam-1/nam.1	Sat Nov 15 12:27:06 1997
@@ -1,5 +1,5 @@
 .\"
-.\" @(#) $Header: /usr/src/mash/repository/vint/nam-1/nam.1,v 1.4 1997/11/10 20:11:16 haoboy Exp $ (LBL)
+.\" @(#) $Header: /usr/src/mash/repository/vint/nam-1/nam.1,v 1.5 1997/11/15 20:27:14 haoboy Exp $ (LBL)
 .\"
 .\" Copyright (c) 1991,1993 Regents of the University of California.
 .\" All rights reserved.
@@ -414,6 +414,8 @@
 -c <conv> is the conversation id.
 .br
 -i <id> is the packet id in the conversation.
+.br
+-a <attr> is the packet attribute, which is currently used as color id.
 
 Additional flags may be added for some protocols. This list may be extended as 
 required:
@@ -427,7 +429,7 @@
 
 .IP "Link/Queue State"
 
-l -t <time> -s <src> -d <dst> -S <state> [-c <color>]
+l -t <time> -s <src> -d <dst> -S <state> [-c <color>] [-r <bw> -D <delay>]
 .br
 q -t <time> -s <src> -d <dst> -a <attr>
 
@@ -435,6 +437,9 @@
 DOWN marks link failure and recovery, COLOR marks link color change. If 
 COLOR is given, a following -c <color> is expected which gives the new color
 value.
+In link event, [-r <bw> -D<delay>] gives link bandwidth and delay, 
+respectively. It is only used when nam creates the link, i.e., loading the 
+trace file.
 .br
 <attr> specifies the queue position, i.e., the angle between the link along 
 which queued packets are displayed and the horizontal line.
--- nam-1.0a3/nam.tcl	Tue Nov  4 11:50:37 1997
+++ src/nam-1/nam.tcl	Wed Nov 19 20:51:23 1997
@@ -30,7 +30,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# @(#) $Header: /usr/src/mash/repository/vint/nam-1/nam.tcl,v 1.22 1997/11/04 19:50:11 haoboy Exp $ (LBL)
+# @(#) $Header: /usr/src/mash/repository/vint/nam-1/nam.tcl,v 1.24 1997/11/20 02:19:38 haoboy Exp $ (LBL)
 #
 set tk_strictMotif 0
 
@@ -954,6 +954,7 @@
 set montab(l) graph
 set montab(n) ""
 set montab(p) monitor
+set montab(d) monitor
 set montab(r) monitor
 set montab(a) monitor
 
@@ -1575,16 +1576,21 @@
     $netModel color $ix $name
 }
 
+proc do_relayout { Iter Kca Kcr } {
+	global netModel
+	$netModel instvar INCR_ITERATIONS_ KCa_ KCr_
+	set KCa_ $Kca
+	set KCr_ $Kcr
+	set INCR_ITERATIONS_ $Iter
+	$netModel relayout
+}
+
 #
 # do more iterations to layout network model 
 #
 proc nam_relayout {} {
-	global netModel ITERATIONS KCa KCr now netView
-	$netModel instvar INCR_ITERATIONS_ KCa_ KCr_
-	set KCa_ $KCa
-	set KCr_ $KCr
-	set INCR_ITERATIONS_ $ITERATIONS
-	$netModel relayout
+	global netModel ITERATIONS KCa KCr now
+	do_relayout $ITERATIONS $KCa $KCr
 	settime $now
 	update idletasks
 }
@@ -1627,7 +1633,6 @@
 
 	frame .view
 
-
 #	nam_config $netModel
         nam_layout $netModel $tracefile
 	$netModel layout
@@ -1756,6 +1761,14 @@
 
         window_bind .
         view_bind $netView
+
+	# User-defined initialization hook
+	nam_init_hook
+}
+
+# XXX
+# User-defined initialization hook. Perhaps we need an OO approach here?
+proc nam_init_hook {} {
 }
 
 set viewctr 0
@@ -1923,7 +1936,6 @@
 	bind $w.f.f.a <Double-ButtonPress-1> " jump_to_annotation $w.f.f.a"
 }
 
-# obsolete and should be removed
 proc build.tl { w } {
 	set f [smallfont]
 	frame $w.bar -relief ridge -borderwidth 2
@@ -1981,7 +1993,7 @@
 set www_cancels(/a) "a"
 set www_cancels(/pre) "pre"
 set www_sets(h1) {{bold 1} {size 18}}
-set www_sets(h2) {{bold 1} {size 16}}
+set www_sets(h2) {{bold 1} {size 14}} ;# may not exists on some systems
 set www_sets(h3) {{bold 1} {size 14}}
 set www_sets(h4) {{bold 1} {size 12}}
 set www_sets(h5) {{bold 1} {size 10}}
@@ -2387,4 +2399,27 @@
 	    -command {destroy .help}
     pack .help.f.ctl.b -side left
     parse_html .help.f.f.w .help.f.ctl.e $help_text($which)
+}
+
+#
+# The following functions are actually the functions used in the 'v' events 
+# in the nam traces
+# The 'v' events are generated by dynamic links (rtmodel). Whenever you have 
+# a nam trace which has dynamic link traces, you'll need to define the 
+# following functions.
+#
+proc link-up {now src dst} {
+	sim_annotation $now link($src:$dst) up
+}
+
+proc link-down {now src dst} {
+	sim_annotation $now link($src:$dst) down
+}
+
+proc node-up {now src} {
+	sim_annotation $now $node $src up
+}
+
+proc node-down {now src} {
+	sim_annotation $now $node $src down
 }