un-advertised hack to set OSID used for sim experiments.

Used to debug NSE problem without changing standard FBSD image,
may come in handy again.

tbsetup/ns2ir/nsenode.tcl

 # -*- tcl -*-
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2002 University of Utah and the Flux Group.
+# Copyright (c) 2000-2002, 2006 University of Utah and the Flux Group.
 # All rights reserved.
 #
 
@@ -69,6 +69,7 @@ NSENode instproc make-simulated {args} {
 NSENode instproc updatedb {DB} {
     $self instvar nseconfig
     $self instvar simcode_present
+    var_import ::GLOBALS::sim_osname
 
     # for all the simulated nodes, we need to find out if
     # they are connected to a real node and if so, find the
@@ -102,7 +103,7 @@ NSENode instproc updatedb {DB} {
     tb-set-hardware $self pcnsenode
 
     # NSE code runs only FreeBSD as of now. 
-    $self set osid "FBSD-STD"    
+    $self set osid $sim_osname
 
     # The Node class's updatedb method updates the DB
     $self next $DB

tbsetup/ns2ir/nstb_compat.tcl

@@ -59,6 +59,7 @@ proc tb-bind-parent {sub phys} {}
 proc tb-fix-current-resources {onoff} {}
 proc tb-set-encapsulate {onoff} {}
 proc tb-set-vlink-emulation {style} {}
+proc tb-set-sim-os {os} {}
 proc tb-set-jail-os {os} {}
 proc tb-set-delay-os {os} {}
 proc tb-set-delay-capacity {cap} {}

tbsetup/ns2ir/parse.tcl.in

@@ -244,9 +244,10 @@ namespace eval GLOBALS {
     # specified vs. unspecified in assign_wrapper
     variable vlink_encapsulate "default"
 
-    # Allow override of jail and delay osids.
+    # Allow override of jail, delay, simnode osids.
     variable jail_osname {}
     variable delay_osname {}
+    variable sim_osname "FBSD-STD"
 
     # Allow override of delay capacity.
     variable delay_capacity {}

tbsetup/ns2ir/traffic.tcl

 # -*- tcl -*-
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2003, 2005 University of Utah and the Flux Group.
+# Copyright (c) 2000-2003, 2005, 2006 University of Utah and the Flux Group.
 # All rights reserved.
 #
 
@@ -339,11 +339,12 @@ Agent/TCP/FullTcp instproc connect {dst} {
     $self instvar application
     $self instvar destination
     $self instvar role
+    var_import ::GLOBALS::sim_osname
 
     $self set proto "tcp"
     $dst set proto "tcp"
-    $node set osid "FBSD-STD"
-    $dst set osid "FBSD-STD"
+    $node set osid $sim_osname
+    $dst set osid $sim_osname
 }
 
 # Agent/Null