[Javanetsim-cvs] javaNetSim/core/protocolsuite/tcp_ip Tcp.java, 1.98, 1.99 Udp.java, 1.39, 1.40 socketLayer.java, 1.10, 1.11

[QweR <qw...@us...>]

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

Modified Files:
	Tcp.java Udp.java socketLayer.java 
Log Message:
Some small bugs fixed

Index: Tcp.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Tcp.java,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** Tcp.java	1 Oct 2007 04:58:12 -0000	1.98
--- Tcp.java	14 Oct 2007 00:22:14 -0000	1.99
***************
*** 396,400 ****
               if (mSL.get_socket(sock_num).src_port==in_Port){
                  printLayerInfo("TCP error: can not double bind to port "+ in_Port +"! Server is already listening to this port");
!                 throw new TransportLayerException("error: can not bind listen to port "+ in_Port +"! Server is already listening to this port");
              }
              else{
--- 396,400 ----
               if (mSL.get_socket(sock_num).src_port==in_Port){
                  printLayerInfo("TCP error: can not double bind to port "+ in_Port +"! Server is already listening to this port");
!                 throw new TransportLayerException("TCP error: can not bind listen to port "+ in_Port +"! Server is already listening to this port");
              }
              else{

Index: socketLayer.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/socketLayer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** socketLayer.java	1 Oct 2007 04:58:13 -0000	1.10
--- socketLayer.java	14 Oct 2007 00:22:14 -0000	1.11
***************
*** 160,165 ****
              mParentStack.TCP().closePort(sock);
          }
!         jnsock.src_port = 0;
!         jnsock.src_IP = "";
      }  
      public void free(int sock) throws TransportLayerException{
--- 160,165 ----
              mParentStack.TCP().closePort(sock);
          }
!         //jnsock.src_port = 0;
!         //jnsock.src_IP = "";
      }  
      public void free(int sock) throws TransportLayerException{

Index: Udp.java
===================================================================
RCS file: /cvsroot/javanetsim/javaNetSim/core/protocolsuite/tcp_ip/Udp.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Udp.java	1 Oct 2007 04:58:12 -0000	1.39
--- Udp.java	14 Oct 2007 00:22:14 -0000	1.40
***************
*** 277,298 ****
         public void bindPort(int sock_num, int in_Port) throws TransportLayerException
         {           
!            int lsPort=PORT_INIT;
!            
!            if ( mSL.get_socket(sock_num).src_port == 0 )
!            {
!                  if (in_Port>=0 && in_Port<=65535)
!                  {                            
!                     //create such a record in hashtable
!                     mSL.get_socket(sock_num).src_port = in_Port;
!                     printLayerInfo("Local port " + in_Port + " binded.");
!                  } else //
!                  {
!                        throw new TransportLayerException("UDP error: can not listen to port "+ in_Port +"! Use port range from 1 to 65535 to listen to.");     
!                  }
!             } else //
!             {
!                if (mSL.get_socket(sock_num).src_port==in_Port) throw new TransportLayerException("error: can not double listen to port "+ in_Port +"! Server is already listening to this port");          
!                throw new TransportLayerException("UDP error: can not listen to port "+ in_Port +"! Already listening to port " + lsPort);          
!             } 
         }
         
--- 277,301 ----
         public void bindPort(int sock_num, int in_Port) throws TransportLayerException
         {           
!             int lsPort=PORT_INIT;
! 
!             if(!mSL.get_socket(sock_num).open_state){
!                 if (in_Port>=0 && in_Port<=65535) { //create such a record in hashtable
!                    mSL.get_socket(sock_num).src_port = in_Port;
!                    printLayerInfo("Local port " + in_Port + " binded.");
!                 } else //
!                 {
!                    throw new TransportLayerException("UDP error: can not listen to port "+ in_Port +"! Use port range from 1 to 65535 to listen to.");
!                 }
!             }
!             else{
!                 if (mSL.get_socket(sock_num).src_port==in_Port){
!                     printLayerInfo("UDP error: can not double bind to port "+ in_Port +"! Server is already listening to this port");
!                     throw new TransportLayerException("UDP error: can not bind listen to port "+ in_Port +"! Server is already listening to this port");
!                 }
!                 else{
!                     printLayerInfo("UDP error: can not bind to port "+ in_Port +"! Already listening to port " + mSL.get_socket(sock_num).src_port);      
!                     throw new TransportLayerException("UDP error: can not bind to port "+ in_Port +"! Already listening to port " + mSL.get_socket(sock_num).src_port);          
!                 }
!             }
         }