[Javanetsim-cvs] javaNetSim/guiUI MainScreen.java,1.21,1.22

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

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

Modified Files:
	MainScreen.java 
Log Message:
Hub bug FIX, new save file format, route tables s/l and more...


Index: MainScreen.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/guiUI/MainScreen.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** MainScreen.java	8 Dec 2005 16:45:10 -0000	1.21
--- MainScreen.java	8 Dec 2005 18:07:39 -0000	1.22
***************
*** 827,833 ****
  	    		String strSecondNodeInterface = dlgLink.getSecondSelectedInterface();
  
! 	    		Sim.addEthernetLink(strLinkName,inNode1, strFirstNodeInterface,
! 
! 	    							inNode2, strSecondNodeInterface);
  
  	    		GuiNode tempFirstNode = (GuiNode)GUInodeTable.get(inNode1);
--- 827,831 ----
  	    		String strSecondNodeInterface = dlgLink.getSecondSelectedInterface();
  
! 	    		Sim.addEthernetLink(strLinkName,inNode1, strFirstNodeInterface, inNode2, strSecondNodeInterface);
  
  	    		GuiNode tempFirstNode = (GuiNode)GUInodeTable.get(inNode1);
***************
*** 1699,1703 ****
                                  GuiNode tempNode = (GuiNode)GUInodeTable.get(key);
  
!                                 
  
                                  try{
--- 1697,1701 ----
                                  GuiNode tempNode = (GuiNode)GUInodeTable.get(key);
  
!                                 String lnk;
  
                                  try{
***************
*** 1739,1747 ****
                                          if(tempNode instanceof NetworkLayerDevice){
  
                                              strSave = strSave + "|" + Sim.getIpAddressForInterface(key,nics[i].toString())
! 
                                              + "|" + Sim.getSubnetMask(key,nics[i].toString()) 
  
!                                             + "|" + Sim.getDefaultGateway(key) + "|" + Sim.getMacAddressForInterface(key, nics[i].toString());
  
                                          }else{
--- 1737,1755 ----
                                          if(tempNode instanceof NetworkLayerDevice){
  
+                                             String lP = "100.00";
+                                             
+                                             try{
+                                                 lnk = Sim.getLinkName(key, nics[i].toString());
+                                                 lP = Double.valueOf(Sim.GetLinkProb(lnk)).toString();
+                                             }catch(Exception e){}
+                                             
+                                             
                                              strSave = strSave + "|" + Sim.getIpAddressForInterface(key,nics[i].toString())
!                                             
                                              + "|" + Sim.getSubnetMask(key,nics[i].toString()) 
  
!                                             + "|" + Sim.getDefaultGateway(key) + "|" + Sim.getMacAddressForInterface(key, nics[i].toString())
!                                             
!                                             + "|" + lP;
  
                                          }else{
***************
*** 1756,1759 ****
--- 1764,1786 ----
  
                                      }
+                                     
+ 
+                                     try{
+                                      String routes[] = Sim.getRouteTableEntries(key);
+                                      strSave = strSave + (routes.length-1) + "\n";
+                                      
+                                      Route_entry r;
+                                      
+                                      for(int i=0; i<routes.length-1; i++){
+ 
+                                         r = Sim.getRouteEntry(key, routes[i]);
+ 
+                                         strSave = strSave + routes[i] + "|" + r.gateway  + "|" + r.genMask + "|" + r.Type + "|" + r.iFace + "\n";
+ 
+                                      }
+                                      
+                                     }catch(Exception e){
+                                         strSave = strSave + "0\n";
+                                     }
  
                                  } catch (Exception e) {	//This should never happen 
***************
*** 2019,2023 ****
                                          }
  
!                                         
  
                                          for(j = 1; j<=intCount; j++){
--- 2046,2051 ----
                                          }
  
! 
!                                         String sieve = "100.00";
  
                                          for(j = 1; j<=intCount; j++){
***************
*** 2039,2044 ****
--- 2067,2077 ----
                                                      }
  
+                                                     
+                                                     
                                                      try{
                                                          Sim.setMACAddress(strNodeName,iface[0], iface[5]);
+                                                         
+                                                         sieve = iface[6];
+                                                         
                                                      }catch(Exception e){ }
                                                      
***************
*** 2055,2059 ****
                                                  if(((String)links.get(strLinkName)) == null){
  
!                                                         links.put(strLinkName, strNodeName + "|" + iface[0]);
  
                                                          
--- 2088,2092 ----
                                                  if(((String)links.get(strLinkName)) == null){
  
!                                                         links.put(strLinkName, strNodeName + "|" + iface[0] + "|" + sieve);
  
                                                          
***************
*** 2063,2067 ****
                                                          String ln[] = ((String) links.get(strLinkName)).split("\\|");
  
!                                                         Sim.addEthernetLink(strLinkName, ln[0], ln[1], strNodeName, iface[0]);
  
  							this.createLink(strLinkName, ln[0], strNodeName);
--- 2096,2100 ----
                                                          String ln[] = ((String) links.get(strLinkName)).split("\\|");
  
!                                                         Sim.addEthernetLink(strLinkName, ln[0], ln[1], strNodeName, iface[0], ln[2]);
  
  							this.createLink(strLinkName, ln[0], strNodeName);
***************
*** 2073,2077 ****
                                              }
  
!                                       
  
                                      }
--- 2106,2127 ----
                                              }
  
!                                         /*
!                                         try{
!                                             Route_entry r;
!                                             
!                                             line = input.readLine();
!                                             
!                                                                                                                              
!                                             for(int i=0; i<Integer.valueOf(line).intValue(); i++){
!                                                 String rs = input.readLine();
!                                                 String rts[] = rs.split("\\|");
!                                                                                             
!                                                 r = new Route_entry(rts[0], rts[1], rts[2], rts[4], Integer.valueOf(rts[3]).intValue());
!                                                 System.out.println(rts[4]);
!                                                 Sim.addRoute(strNodeName, r);
!                                             }
!                                         }catch(Exception e){
!                                             
!                                         }*/
  
                                      }