[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip DHCPD.java, 1.2, 1.3 Echo_tcp.java, 1.38, 1.3

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

Update of /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5217/core/protocolsuite/tcp_ip

Modified Files:
	DHCPD.java Echo_tcp.java ExternalProxyApp.java 
	ProtocolStack.java SNMP.java socketLayer.java 
Log Message:
Serial(FrameRelay) NICS + minor fixes in socket layer/protocol stack...

Index: socketLayer.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/socketLayer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** socketLayer.java	14 Oct 2007 00:22:14 -0000	1.11
--- socketLayer.java	15 Oct 2007 12:04:33 -0000	1.12
***************
*** 166,176 ****
          jnSocket jnsock = (jnSocket)sockTable.get(sock);
          jnsock.app = null;
!         jnsock.open_state = false;
!         if(jnsock.type == jnsock.UDP_socket){
!             mParentStack.UDP().closePort(sock);
!         }
!         else if(jnsock.type == jnsock.TCP_socket){
!             mParentStack.TCP().closePort(sock);
!         }
          jnsock.src_port = 0;
          jnsock.src_IP = "";
--- 166,178 ----
          jnSocket jnsock = (jnSocket)sockTable.get(sock);
          jnsock.app = null;
!         if(jnsock.open_state){
!             if(jnsock.type == jnsock.UDP_socket){
!                 mParentStack.UDP().closePort(sock);
!             }
!             else if(jnsock.type == jnsock.TCP_socket){
!                 mParentStack.TCP().closePort(sock);
!             }
!             jnsock.open_state = false;
!         }        
          jnsock.src_port = 0;
          jnsock.src_IP = "";

Index: ProtocolStack.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/ProtocolStack.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** ProtocolStack.java	14 Oct 2007 22:14:52 -0000	1.60
--- ProtocolStack.java	15 Oct 2007 12:04:33 -0000	1.61
***************
*** 267,287 ****
                              inPacket.setSourceIPAddress(sourceIP);
  //                          test if on local of remote network
!                             if(outInterface[1]==null){
!                                     destMAC = mARPprotocol.getMACAddress(inPacket.getDestIPAddress(),outInterface[0]);
!                             }
!                             else{
  
!                                 //String GatewayAddress = mIPprotocol.getDefaultGateway();
!                                 GatewayAddress = mIPprotocol.getGateway(inPacket.getDestIPAddress());
!                                 String outIface = mIPprotocol.getInterface(inPacket.getDestIPAddress());
[...1390 lines suppressed...]
!             for(int i=0; i<nics.size(); i++)
              {
!                 try{
!                     iface = (String)(nics.get(i));
!                     if(temp.isActiveInterface(iface)){
!                         IP = getIPAddress((String)nics.get(i));
!                         if(IP != null){
!                             return IP;
!                         }
                      }
!                 }catch(InvalidNetworkInterfaceNameException e){
!                     e.printStackTrace();
!                 }
!             }                
!             return "";            
!        }      
         
!       
  }//EOF
  

Index: Echo_tcp.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Echo_tcp.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Echo_tcp.java	29 Sep 2007 20:33:35 -0000	1.38
--- Echo_tcp.java	15 Oct 2007 12:04:33 -0000	1.39
***************
*** 72,75 ****
--- 72,80 ----
      public void Close() throws TransportLayerException
      {              
+         if(appType == 0){
+             printLayerInfo("Echo application", "Echo TCP server closed socket."); 
+         }else{
+             printLayerInfo("Echo application", "Echo TCP server closed socket.");
+         }
          mParentStack.SL().close(appSock);
          for(int i=0; i<connections.size(); i++){
***************
*** 80,84 ****
      
      public void Free() throws TransportLayerException{
!         Close();
          mParentStack.SL().free(appSock);
          for(int i=0; i<connections.size(); i++){
--- 85,93 ----
      
      public void Free() throws TransportLayerException{
!         if(appType == 0){
!             printLayerInfo("Echo application", "Echo TCP application freed socket.");
!         }else{
!             printLayerInfo("Echo application", "Echo TCP server freed socket.");
!         }
          mParentStack.SL().free(appSock);
          for(int i=0; i<connections.size(); i++){

Index: ExternalProxyApp.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/ExternalProxyApp.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ExternalProxyApp.java	1 Oct 2007 04:58:12 -0000	1.6
--- ExternalProxyApp.java	15 Oct 2007 12:04:33 -0000	1.7
***************
*** 80,89 ****
          //throw new TransportLayerException("Cannot bind port " + listenPort + ".");       
          recieved = 0;
!         try{
!            if(appType != 0) mParentStack.ListenTCP(this, listenPort);  
!         } catch (TransportLayerException e)
!         {
!             e.printStackTrace();
!         }
      }
      
--- 80,89 ----
          //throw new TransportLayerException("Cannot bind port " + listenPort + ".");       
          recieved = 0;
!         //try{
!            //if(appType != 0) mParentStack.ListenTCP(this, listenPort);  
!         //} catch (TransportLayerException e)
!         //{
!         //    e.printStackTrace();
!         //}
      }
      
***************
*** 102,111 ****
      {              
          //mParentStack.FreeTCPApplication(this);
!         mParentStack.CloseTCP(this);
          recieved = 0;
      }
      
      public void Free() throws TransportLayerException{
!         mParentStack.FreeTCPApplication(this);
          recieved = 0;
      }
--- 102,111 ----
      {              
          //mParentStack.FreeTCPApplication(this);
!         //mParentStack.CloseTCP(this);
          recieved = 0;
      }
      
      public void Free() throws TransportLayerException{
!         //mParentStack.FreeTCPApplication(this);
          recieved = 0;
      }
***************
*** 122,126 ****
      public void Disconnect() throws TransportLayerException, LowLinkException{
          try {
!         mParentStack.FinalizeTCP(this); //will close client connection
          }catch(Exception e){
              ///*TODO*: here to catch
--- 122,126 ----
      public void Disconnect() throws TransportLayerException, LowLinkException{
          try {
!         //mParentStack.FinalizeTCP(this); //will close client connection
          }catch(Exception e){
              ///*TODO*: here to catch
***************
*** 135,139 ****
          Simulation.addLayerInfo(protInfo3);
              
!         mParentStack.CloseTCP(this);
          Close();        
      }  
--- 135,139 ----
          Simulation.addLayerInfo(protInfo3);
              
!         //mParentStack.CloseTCP(this);
          Close();        
      }  
***************
*** 155,159 ****
              
          try{           
!             mParentStack.CloseTCP(this);
              Close();
              EN.NATDisconnect(this);
--- 155,159 ----
              
          try{           
!             //mParentStack.CloseTCP(this);
              Close();
              EN.NATDisconnect(this);
***************
*** 222,226 ****
      {
          
!             mParentStack.SendTCP(this, Data,-1);
          
          //processing the protocol doings.
--- 222,226 ----
      {
          
!            // mParentStack.SendTCP(this, Data,-1);
          
          //processing the protocol doings.

Index: DHCPD.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/DHCPD.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DHCPD.java	14 Oct 2007 17:19:07 -0000	1.2
--- DHCPD.java	15 Oct 2007 12:04:33 -0000	1.3
***************
*** 270,279 ****
                              o.Gateway = l.Gateway;
                              
!                             protInfo = new LayerInfo(getClass().getName());
!                             protInfo.setObjectName(mParentStack.getParentNodeName());
!                             protInfo.setDataType("DHCP Server");
!                             protInfo.setLayer("Application ");
!                             protInfo.setDescription("Sending DHCPOFFER(xid=" + o.xid + ") packet to 255.255.255.255 with op=1 chaddr='" +
                              o.chaddr + "' DHCP Server='" + o.DHCPServer + "' yiaddr='" + o.yiaddr + "'.");
  
                              try{
--- 270,280 ----
                              o.Gateway = l.Gateway;
                              
!                             LayerInfo protInfo1 = new LayerInfo(getClass().getName());                            
!                             protInfo1.setObjectName(mParentStack.getParentNodeName());
!                             protInfo1.setDataType("DHCP Server");
!                             protInfo1.setLayer("Application ");
!                             protInfo1.setDescription("Sending DHCPOFFER(xid=" + o.xid + ") packet to 255.255.255.255 with op=1 chaddr='" +
                              o.chaddr + "' DHCP Server='" + o.DHCPServer + "' yiaddr='" + o.yiaddr + "'.");
+                             Simulation.addLayerInfo(protInfo);
  
                              try{

Index: SNMP.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/SNMP.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** SNMP.java	14 Oct 2007 22:14:52 -0000	1.23
--- SNMP.java	15 Oct 2007 12:04:33 -0000	1.24
***************
*** 161,171 ****
      public void Close() throws TransportLayerException {
          //mParentStack.CloseUDP(this);
-         mParentStack.SL().close(appSock); 
          printInfo("SNMP agent closed socket."); //<--- FIXME!!!
      }
      
      public void Free() throws TransportLayerException{
-         mParentStack.SL().free(appSock); 
          printInfo("SNMP agent freed socket."); //<--- FIXME!!!
      }
      
--- 161,171 ----
      public void Close() throws TransportLayerException {
          //mParentStack.CloseUDP(this);
          printInfo("SNMP agent closed socket."); //<--- FIXME!!!
+         mParentStack.SL().close(appSock);         
      }
      
      public void Free() throws TransportLayerException{
          printInfo("SNMP agent freed socket."); //<--- FIXME!!!
+         mParentStack.SL().free(appSock);         
      }
      
***************
*** 420,424 ****
      */
      public boolean getRequest(String Host, int port, Vector<String> r,String password) throws LowLinkException, TransportLayerException, CommunicationException, InvalidNetworkLayerDeviceException {
-         mParentStack.FreeUDPApplication(this);
          if (Connect(Host, port)) {
              String pack = createSNMPHeader(getNextID(),SNMP_GET);
--- 420,423 ----
***************
*** 447,451 ****
      */
      public boolean getNextRequest(String Host, int port, Vector<String> r,String password) throws LowLinkException, TransportLayerException, CommunicationException, InvalidNetworkLayerDeviceException {
-         mParentStack.FreeUDPApplication(this);
          if (Connect(Host, port)) {
              String pack = createSNMPHeader(getNextID(),SNMP_GETNEXT);
--- 446,449 ----
***************
*** 475,479 ****
      */
      public boolean setRequest(String Host, int port, Vector<String> r,Vector<String> v,String password) throws LowLinkException, TransportLayerException, CommunicationException, InvalidNetworkLayerDeviceException {
-         mParentStack.FreeUDPApplication(this);
          if (Connect(Host, port)) {
              String pack = createSNMPHeader(getNextID(),SNMP_SET);
--- 473,476 ----

[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip DHCPD.java, 1.2, 1.3 Echo_tcp.java, 1.38, 1.3

[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip DHCPD.java, 1.2, 1.3 Echo_tcp.java, 1.38, 1.39 ExternalProxyApp.java, 1.6, 1.7 ProtocolStack.java, 1.60, 1.61 SNMP.java, 1.23, 1.24 socketLayer.java, 1.11, 1.12