Update of /cvsroot/javanetsim/javaNetSim/core
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv17313/core
Modified Files:
DeviceConfig.java
Log Message:
ip parameters for serial interfaces are saving
Index: DeviceConfig.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/DeviceConfig.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DeviceConfig.java 17 Nov 2007 21:38:58 -0000 1.9
--- DeviceConfig.java 20 Nov 2007 19:53:03 -0000 1.10
***************
*** 416,420 ****
if(eni!=null && !eni.getMACAddress().equalsIgnoreCase(eni.defaultMACAddress))
conf.add("interface "+intName+" mac-address "+eni.getMACAddress());
! if(eni!=null && device.getIPAddress((String)ins[i])!=null && !device.getIPAddress((String)ins[i]).equals(""))
conf.add("interface "+intName+" ip address "+device.getIPAddress((String)ins[i])+" "+device.getSubnetMask((String)ins[i]));
if(sni!=null && sni.getClockRate()!=sni.DEFAULT_CLOCKRATE)
--- 416,420 ----
if(eni!=null && !eni.getMACAddress().equalsIgnoreCase(eni.defaultMACAddress))
conf.add("interface "+intName+" mac-address "+eni.getMACAddress());
! if((eni!=null || sni!=null) && device.getIPAddress((String)ins[i])!=null && !device.getIPAddress((String)ins[i]).equals(""))
conf.add("interface "+intName+" ip address "+device.getIPAddress((String)ins[i])+" "+device.getSubnetMask((String)ins[i]));
if(sni!=null && sni.getClockRate()!=sni.DEFAULT_CLOCKRATE)
|