[Javanetsim-cvs] javaNetSim/core Node.java, 1.23, 1.24 WirelessAP.java, 1.2, 1.3

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

Update of /cvsroot/javanetsim/javaNetSim/core
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv11437/core

Modified Files:
	Node.java WirelessAP.java 
Log Message:



Index: WirelessAP.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/WirelessAP.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WirelessAP.java	27 Sep 2008 08:38:22 -0000	1.2
--- WirelessAP.java	28 Sep 2008 17:11:47 -0000	1.3
***************
*** 40,44 ****
   **/
  
! public class WirelessAP extends DataLinkLayerDevice {
  	
  	/**
--- 40,44 ----
   **/
  
! public class WirelessAP extends NetworkLayerDevice{ //DataLinkLayerDevice {
  	
  	/**
***************
*** 57,61 ****
          
          public WirelessAP(String inName, boolean inOn) {
!         		super(inName, 1, inOn);	//pass name and protocolstack layer 
                  
                  IntCaches = new Hashtable();   
--- 57,61 ----
          
          public WirelessAP(String inName, boolean inOn) {
!         		super(inName, 3, inOn);	//pass name and protocolstack layer 
                  
                  IntCaches = new Hashtable();   
***************
*** 138,142 ****
  	 */
  	
! 	protected void receivePacket(Packet inPacket,String inInterfaceName) throws LowLinkException{
          if(sz!=1){
                  Ethernet_packet tempPacket = (Ethernet_packet)inPacket;
--- 138,142 ----
  	 */
  	
! 	public void receivePacket(Packet inPacket,String inInterfaceName) throws LowLinkException{
          if(sz!=1){
                  Ethernet_packet tempPacket = (Ethernet_packet)inPacket;

Index: Node.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/Node.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Node.java	27 Sep 2008 10:16:37 -0000	1.23
--- Node.java	28 Sep 2008 17:11:47 -0000	1.24
***************
*** 598,606 ****
  
                  //"Not Applicable"
!                 if(((NetworkInterface)(NetworkInterfacetable.get(inInterfaceName))).getType() == NetworkInterface.Ethernet10T ||
!                 		((NetworkInterface)(NetworkInterfacetable.get(inInterfaceName))).getType() == NetworkInterface.Wireless ||
!                         ((NetworkInterface)(NetworkInterfacetable.get(inInterfaceName))).getType() == NetworkInterface.Ethernet100FX){
!                     EthernetNetworkInterface temp =(EthernetNetworkInterface)NetworkInterfacetable.get(inInterfaceName);	
!                     return temp.getMACAddress();
                  }else{
                      return "Not Applicable";
--- 598,604 ----
  
                  //"Not Applicable"
!                 if(NetworkInterfacetable.get(inInterfaceName) instanceof EthernetNetworkInterface){
!                 	EthernetNetworkInterface temp =(EthernetNetworkInterface)NetworkInterfacetable.get(inInterfaceName);	
!                 	return temp.getMACAddress();                	
                  }else{
                      return "Not Applicable";