Thread: [Javanetsim-cvs] javaNetSim/core CommandProcessor.java, 1.18, 1.19 DeviceConfig.java, 1.15, 1.16 No

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/javanetsim/javaNetSim/core
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21203/core

Modified Files:
	CommandProcessor.java DeviceConfig.java Node.java 
Log Message:
no shutdown corrected

Index: CommandProcessor.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/CommandProcessor.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** CommandProcessor.java	3 Oct 2008 22:29:09 -0000	1.18
--- CommandProcessor.java	5 Oct 2008 16:53:12 -0000	1.19
***************
*** 532,542 ****
  						WiFiPort wi = (WiFiPort)ni;
  						String bssid = params.get(1);
! 						if(EthernetNetworkInterface.isMacAddress(bssid)){
! 							wi.setBSSID(bssid);
! 							if(wi.isActive()) wi.DOWN();
! 							wi.UP();
  						}
  						else{
! 							out += "error: incorrect BSSID\n";
  						}
  					}
--- 532,549 ----
  						WiFiPort wi = (WiFiPort)ni;
  						String bssid = params.get(1);
! 						if(device instanceof WirelessAP || device instanceof Router){
! 							if(EthernetNetworkInterface.isMacAddress(bssid)){
! 								wi.setBSSID(bssid);
! 								if(wi.isActive() && wi.isUP()){
! 									wi.DOWN();
! 									wi.UP();
! 								}
! 							}
! 							else{
! 								out += "error: incorrect BSSID\n";
! 							}
  						}
  						else{
! 							out += "error: command isn't support by this device\n";
  						}
  					}
***************
*** 562,567 ****
  						String bssid = wi.getMACAddress();
  						wi.setBSSID(bssid);
! 						if(wi.isActive()) wi.DOWN();
! 						wi.UP();
  					}
  					else{
--- 569,576 ----
  						String bssid = wi.getMACAddress();
  						wi.setBSSID(bssid);
! 						if(wi.isActive() && wi.isUP()){
! 							wi.DOWN();
! 							wi.UP();
! 						}
  					}
  					else{
***************
*** 595,604 ****
  							if(channel==0){
  								wi.setChannel(0);
! 								if(wi.isActive()) wi.DOWN();
  							}
  							else if(channel>=1 && channel<=14){
  								wi.setChannel(channel);
! 								if(wi.isActive()) wi.DOWN();
! 								wi.UP();
  							}
  							else{
--- 604,617 ----
  							if(channel==0){
  								wi.setChannel(0);
! 								if(wi.isUP()){
! 									wi.DOWN();
! 								}
  							}
  							else if(channel>=1 && channel<=14){
  								wi.setChannel(channel);
! 								if(wi.isActive() && wi.isUP()){
! 									wi.DOWN();
! 									wi.UP();
! 								}
  							}
  							else{
***************
*** 630,634 ****
  						WiFiPort wi = (WiFiPort)ni;
  						wi.setChannel(0);
! 						if(wi.isActive()) wi.DOWN();
  					}
  					else{
--- 643,649 ----
  						WiFiPort wi = (WiFiPort)ni;
  						wi.setChannel(0);
! 						if(wi.isUP()){
! 							wi.DOWN();
! 						}
  					}
  					else{
***************
*** 657,661 ****
  					SerialNetworkInterface sni = (SerialNetworkInterface)device.getNetworkInterface(params.get(0));
  					int cr = Integer.parseInt(params.get(1));
! 					if(cr>sni.MIN_CLOCKRATE || cr<=sni.MAX_CLOCKRATE){
  						if(sni!=null){
  							sni.setClockRate(cr);
--- 672,676 ----
  					SerialNetworkInterface sni = (SerialNetworkInterface)device.getNetworkInterface(params.get(0));
  					int cr = Integer.parseInt(params.get(1));
! 					if(cr>SerialNetworkInterface.MIN_CLOCKRATE || cr<=SerialNetworkInterface.MAX_CLOCKRATE){
  						if(sni!=null){
  							sni.setClockRate(cr);
***************
*** 685,689 ****
  					SerialNetworkInterface sni = (SerialNetworkInterface)device.getNetworkInterface(params.get(0));
  					if(sni!=null){
! 						sni.setClockRate(sni.DEFAULT_CLOCKRATE);
  					}
  					else{
--- 700,704 ----
  					SerialNetworkInterface sni = (SerialNetworkInterface)device.getNetworkInterface(params.get(0));
  					if(sni!=null){
! 						sni.setClockRate(SerialNetworkInterface.DEFAULT_CLOCKRATE);
  					}
  					else{
***************
*** 1371,1383 ****
  						String role = params.get(1);
  						if(role.equalsIgnoreCase("client")){
! 							wi.setMode(wi.MODE_STATION);
! 							if(wi.isActive()) wi.DOWN();
! 							wi.UP();
  						}
  						else if(role.equalsIgnoreCase("repeater")){
  							if(false && (device instanceof WirelessAP || device instanceof Router)){
! 								wi.setMode(wi.MODE_REPEATER);
! 								if(wi.isActive()) wi.DOWN();
! 								wi.UP();
  							}
  							else{
--- 1386,1402 ----
  						String role = params.get(1);
  						if(role.equalsIgnoreCase("client")){
! 							wi.setMode(WiFiPort.MODE_STATION);
! 							if(wi.isActive() && wi.isUP()){
! 								wi.DOWN();
! 								wi.UP();
! 							}
  						}
  						else if(role.equalsIgnoreCase("repeater")){
  							if(false && (device instanceof WirelessAP || device instanceof Router)){
! 								wi.setMode(WiFiPort.MODE_REPEATER);
! 								if(wi.isActive() && wi.isUP()){
! 									wi.DOWN();
! 									wi.UP();
! 								}
  							}
  							else{
***************
*** 1387,1393 ****
  						else if(role.equalsIgnoreCase("root") && params.size()==3 && params.get(2).equalsIgnoreCase("access-point")){
  							if(device instanceof WirelessAP || device instanceof Router){
! 								wi.setMode(wi.MODE_AP);
! 								if(wi.isActive()) wi.DOWN();
! 								wi.UP();
  							}
  							else{
--- 1406,1414 ----
  						else if(role.equalsIgnoreCase("root") && params.size()==3 && params.get(2).equalsIgnoreCase("access-point")){
  							if(device instanceof WirelessAP || device instanceof Router){
! 								wi.setMode(WiFiPort.MODE_AP);
! 								if(wi.isActive() && wi.isUP()){
! 									wi.DOWN();
! 									wi.UP();
! 								}
  							}
  							else{

Index: DeviceConfig.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/DeviceConfig.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DeviceConfig.java	3 Oct 2008 22:29:10 -0000	1.15
--- DeviceConfig.java	5 Oct 2008 16:53:12 -0000	1.16
***************
*** 426,433 ****
  					if(ni.getDescription()!=null && !ni.getDescription().equals(""))
  						conf.add("interface "+intName+" description "+ni.getDescription());
- 					if(ni.isUP())
- 						conf.add("no interface "+intName+" shutdown");
- 					else
- 						conf.add("interface "+intName+" shutdown");
  					if(eni!=null && !eni.getMACAddress().equalsIgnoreCase(eni.defaultMACAddress))
  						conf.add("interface "+intName+" mac-address "+eni.getMACAddress());
--- 426,429 ----
***************
*** 469,472 ****
--- 465,473 ----
  					if(!ni.informationReplay)
  						conf.add("no interface "+intName+" ip information-replay");
+ 					
+ 					if(ni.isUP())
+ 						conf.add("no interface "+intName+" shutdown");
+ 					else
+ 						conf.add("interface "+intName+" shutdown");
  	
  					if(device instanceof ApplicationLayerDevice){

Index: Node.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/Node.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Node.java	28 Sep 2008 17:11:47 -0000	1.24
--- Node.java	5 Oct 2008 16:53:12 -0000	1.25
***************
*** 475,480 ****
      
      public void turnOff() {
! 		
!     	
          On = false;
          NodeProtocolStack = null;
--- 475,479 ----
      
      public void turnOff() {
!     	ifacesDOWN();
          On = false;
          NodeProtocolStack = null;

Thread: [Javanetsim-cvs] javaNetSim/core CommandProcessor.java, 1.18, 1.19 DeviceConfig.java, 1.15, 1.16 No

javanetsim-cvs