Index: tcl/lib/ns-lib.tcl
===================================================================
RCS file: /usr/src/mash/repository/vint/ns-2/tcl/lib/ns-lib.tcl,v
retrieving revision 1.112
retrieving revision 1.115
diff -c -r1.112 -r1.115
*** ns-lib.tcl	1998/07/10 23:21:38	1.112
--- ns-lib.tcl	1998/07/16 18:07:01	1.115
***************
*** 31,37 ****
  # SUCH DAMAGE.
  #
  
! # @(#) $Header: /usr/src/mash/repository/vint/ns-2/tcl/lib/ns-lib.tcl,v 1.112 1998/07/10 23:21:38 haldar Exp $
  
  #
  
--- 31,37 ----
  # SUCH DAMAGE.
  #
  
! # @(#) $Header: /usr/src/mash/repository/vint/ns-2/tcl/lib/ns-lib.tcl,v 1.115 1998/07/16 18:07:01 breslau Exp $
  
  #
  
***************
*** 427,432 ****
--- 427,433 ----
  
  	
  	# construct the queue
+ 	set qtypeOrig $qtype
  	switch -exact $qtype {
  		ErrorModule {
  			if { [llength $args] > 0 } {
***************
*** 436,442 ****
  			}
  		}
  		intserv {
! 			set qtype [lindex $args 1]
  			set q [new Queue/$qtype]
  		}
  		default {
--- 437,443 ----
  			}
  		}
  		intserv {
! 			set qtype [lindex $args 0]
  			set q [new Queue/$qtype]
  		}
  		default {
***************
*** 445,451 ****
  	}
  
  	# Now create the link
! 	switch -exact $qtype {
  		RTM {
                          set c [lindex $args 1]
                          set link_($sid:$did) [new CBQLink       \
--- 446,452 ----
  	}
  
  	# Now create the link
! 	switch -exact $qtypeOrig {
  		RTM {
                          set c [lindex $args 1]
                          set link_($sid:$did) [new CBQLink       \
***************
*** 466,472 ****
                  intserv {
                          #XX need to clean this up
                          set link_($sid:$did) [new IntServLink   \
!                                         $n1 $n2 $bw $delay $q $qtype $args]
                  }
                  default {
                          set link_($sid:$did) [new SimpleLink    \
--- 467,474 ----
                  intserv {
                          #XX need to clean this up
                          set link_($sid:$did) [new IntServLink   \
!                                         $n1 $n2 $bw $delay $q	\
! 						[concat $qtypeOrig $args]]
                  }
                  default {
                          set link_($sid:$did) [new SimpleLink    \
***************
*** 567,573 ****
  	}
  }
  
! Simulator instproc duplex-link { n1 n2 bw delay type } {
  	$self instvar link_
  	set i1 [$n1 id]
  	set i2 [$n2 id]
--- 569,575 ----
  	}
  }
  
! Simulator instproc duplex-link { n1 n2 bw delay type args } {
  	$self instvar link_
  	set i1 [$n1 id]
  	set i2 [$n2 id]
***************
*** 575,589 ****
  		$self remove-nam-linkconfig $i1 $i2
  	}
  
! 	$self simplex-link $n1 $n2 $bw $delay $type
! 	$self simplex-link $n2 $n1 $bw $delay $type
  	
  	# nam only has duplex link, so we do a registration here.
  	$self register-nam-linkconfig $link_($i1:$i2)
  }
  
  Simulator instproc duplex-intserv-link { n1 n2 bw pd sched signal adc args } {
! 	$self  duplex-link $n1 $n2 $bw $pd "intserv $sched $signal $adc $args"
  }
  
  Simulator instproc duplex-link-op { n1 n2 op args } {
--- 577,591 ----
  		$self remove-nam-linkconfig $i1 $i2
  	}
  
! 	eval $self simplex-link $n1 $n2 $bw $delay $type $args
! 	eval $self simplex-link $n2 $n1 $bw $delay $type $args
  	
  	# nam only has duplex link, so we do a registration here.
  	$self register-nam-linkconfig $link_($i1:$i2)
  }
  
  Simulator instproc duplex-intserv-link { n1 n2 bw pd sched signal adc args } {
! 	eval $self duplex-link $n1 $n2 $bw $pd intserv $sched $signal $adc $args
  }
  
  Simulator instproc duplex-link-op { n1 n2 op args } {