[Javanetsim-cvs] javaNetSim/guiUI MainScreen.java,1.76,1.77

[Alexander B. <da...@us...>]

Update of /cvsroot/javanetsim/javaNetSim/guiUI
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20961/guiUI

Modified Files:
	MainScreen.java 
Log Message:
Node timers; DHCPC resendings; TCP to bytes packing.

Index: MainScreen.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/MainScreen.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** MainScreen.java	19 Oct 2007 19:38:06 -0000	1.76
--- MainScreen.java	20 Oct 2007 13:27:21 -0000	1.77
***************
*** 2115,2119 ****
                                                      strSave += "|#";
                                                  }else{
!                                                     strSave += "|" + Sim.getMacAddressForInterface(key, nics[i].toString());                                                    
                                                  }
                                                  break;
--- 2115,2119 ----
                                                      strSave += "|#";
                                                  }else{
!                                                     strSave += "|" + ((core.EthernetNetworkInterface)Sim.getNode(key).getNIC(nics[i].toString())).defaultMACAddress;
                                                  }
                                                  break;
***************
*** 2378,2383 ****
                                                              Sim.getNode(strNodeName).addNetworkInterface(iface[0], core.NetworkInterface.Ethernet100FX, true);
                                                              try{                                               
!                                                             //FIXME!!!!!!!
!                                                                 Sim.setMACAddress(strNodeName,iface[0], iface[4]);
                                                              }catch(Exception e){ }
                                                          }else{
--- 2378,2382 ----
                                                              Sim.getNode(strNodeName).addNetworkInterface(iface[0], core.NetworkInterface.Ethernet100FX, true);
                                                              try{                                               
!                                                                 ((core.EthernetNetworkInterface)Sim.getNode(strNodeName).getNIC(iface[0])).defaultMACAddress =  iface[4];
                                                              }catch(Exception e){ }
                                                          }else{
***************
*** 2390,2394 ****
                                                              try{                                               
                                                              //FIXME!!!!!!!
!                                                                 Sim.setMACAddress(strNodeName,iface[0], iface[4]);
                                                              }catch(Exception e){ }
                                                          }else{
--- 2389,2393 ----
                                                              try{                                               
                                                              //FIXME!!!!!!!
!                                                                 ((core.EthernetNetworkInterface)Sim.getNode(strNodeName).getNIC(iface[0])).defaultMACAddress =  iface[4];
                                                              }catch(Exception e){ }
                                                          }else{
***************
*** 2403,2407 ****
                                                              Sim.getNode(strNodeName).addNetworkInterface(iface[0], core.NetworkInterface.Serial, true);
                                                          }
!                                                         ((core.SerialNetworkInterface)Sim.getNode(strNodeName).getNIC(iface[0])).setClockRate(Integer.valueOf(iface[4]));
                                                          break;
                                                          
--- 2402,2406 ----
                                                              Sim.getNode(strNodeName).addNetworkInterface(iface[0], core.NetworkInterface.Serial, true);
                                                          }
!                                                         ((core.SerialNetworkInterface)Sim.getNode(strNodeName).getNIC(iface[0])).setClockRate(Integer.valueOf(iface[4]));   
                                                          break;
                                                          
***************
*** 2764,2768 ****
                                                      
                                                      try{
!                                                         Sim.setMACAddress(strNodeName,iface[0], iface[5]);
                                                          
                                                          sieve = iface[6];
--- 2763,2768 ----
                                                      
                                                      try{
!                                                         ((core.EthernetNetworkInterface)Sim.getNode(strNodeName).getNIC(iface[0])).defaultMACAddress =  iface[5];
!                                                         //Sim.setMACAddress(strNodeName,iface[0], iface[5]);
                                                          
                                                          sieve = iface[6];
***************
*** 3708,3712 ****
  				GUInodeTable.clear();
  
! 				Sim.removeAllObjects();		
  
  				Sim = null;
--- 3708,3712 ----
  				GUInodeTable.clear();
  
! 				Sim.removeAllObjects();	
  
  				Sim = null;