delivery-boy-cvs Mailing List for DeliveryBoy (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/delivery-boy/client/DeliveryBoyC/classes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30983/DeliveryBoyC/classes

Modified Files:
	clsEasySocket.cs 
Log Message:
* added GarbageCollector code
* added socket events to clsEasySocket
* added AutoAccept property

Index: clsEasySocket.cs
===================================================================
RCS file: /cvsroot/delivery-boy/client/DeliveryBoyC/classes/clsEasySocket.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** clsEasySocket.cs	2 Feb 2005 20:50:19 -0000	1.5
--- clsEasySocket.cs	3 Feb 2005 21:10:00 -0000	1.6
***************
*** 45,48 ****
--- 45,54 ----
  public class clsEasySocket
  {
+     /// Default buffer size in byte
+     private const Int32 DEFAULT_BUFFER_SIZE = 1024;
+     
+     /// Byte buffer
+     private byte[] b_Buffer;
+     
      /// Last occurred exception
      private Exception m_oLastException = null;
***************
*** 53,64 ****
      /// Socket
      private Socket m_oSocket = null;
-     /// Local address
-     private string m_strLocalAddr = "";
      /// Local port
      private Int32 m_i32LocalPort = 0;	    
-     /// Local end point
-     private IPEndPoint m_LocalEndPoint = null;
      /// Remote address
!     private string m_strRemoteAddr = "";
      /// Remote port
      private Int32 m_i32RemotePort = 0;	    
--- 59,66 ----
      /// Socket
      private Socket m_oSocket = null;
      /// Local port
      private Int32 m_i32LocalPort = 0;	    
      /// Remote address
!     private string m_strRemoteAddr = "0.0.0.0";
      /// Remote port
      private Int32 m_i32RemotePort = 0;	    
***************
*** 67,70 ****
--- 69,76 ----
      /// Listen queue
      private Int32 m_i32ListenQueue = -1;	    
+     /// Listen queue
+     private Int32 m_i32BufferSize = 0;	    
+     /// Auto accept?
+     private bool m_boolAutoAccept = true;
  
      /// Use this address type
***************
*** 75,80 ****
      private const ProtocolType c_ProtocolType = ProtocolType.Tcp;
  	    
!     /*! \fn Constructor
!      *  \brief Init all necessary stuff
       * 
       *  \param (none)
--- 81,103 ----
      private const ProtocolType c_ProtocolType = ProtocolType.Tcp;
  	    
!     /// Accept-Event-Handler-Struct
!     public delegate void AcceptHandler(System.Object sender, System.Net.Sockets.Socket socket);
!     /// Accept-Event-Handler
!     public event AcceptHandler OnAccept;
!     /// Connect-Event-Handler-Struct
!     public delegate void ConnectHandler(System.Object sender, System.Net.Sockets.Socket socket);
!     /// Connect-Event-Handler
!     public event ConnectHandler OnConnect;
!     /// Error-Event-Handler-Struct
!     public delegate void ErrorHandler(System.Object sender, System.Exception e);
!     /// Error-Event-Handler
!     public event ErrorHandler OnError;
!     /// Receive-Event-Handler-Struct
!     public delegate void ReceiveHandler(System.Object sender, System.Byte[] buffer, System.Int32 bytes_read);
!     /// Receive-Event-Handler
!     public event ReceiveHandler OnReceive;
!     
!     /*! \fn clsEasySocket
!      *  \brief Inits all necessary stuff
       * 
       *  \param (none)
***************
*** 84,105 ****
      public clsEasySocket()	        
  	{
! 	    try
! 	    {
! 	        // initialize all necessary vars
! 	        m_oASCII = new ASCIIEncoding();
! 	            
! 	        SetLastException(0, null);
  	            
! 	        m_oSocket = new Socket(c_AddressFamily, c_SocketType, c_ProtocolType);
! 	        LocalAddress = "0.0.0.0";
! 	        LocalPort = 0;
! 	        RemoteAddress = "0.0.0.0";
! 	        RemotePort = 0;
! 	        ListenQueue = 1;
! 	    }
! 	    catch (Exception e)
! 	    {
! 	        SetLastException(1, e);
! 	    }
      }
          
--- 107,124 ----
      public clsEasySocket()	        
  	{
!         // initialize all necessary vars
! 	    m_oASCII = new ASCIIEncoding();
  	            
! 	    m_oSocket = new Socket(c_AddressFamily, c_SocketType, c_ProtocolType);
! 	    
! 	    RemoteAddress = "0.0.0.0";
! 	    RemotePort = 0;
! 	    ListenQueue = 1;
! 	    BufferSize = DEFAULT_BUFFER_SIZE;
! 	    AutoAccept = true;
! 	    
! 	    b_Buffer = new byte[BufferSize];
!  
! 	    SetLastException(0, null);
      }
          
***************
*** 135,138 ****
--- 154,158 ----
      }
  
+     
      /*! \property public Int32 ListenQueue
       *  \brief Returns the size of the listen queue or sets it.
***************
*** 155,158 ****
--- 175,198 ----
      }  
      
+     /*! \property public Int32 BufferSize
+      *  \brief Returns the socket buffer size in bytes or sets it.
+      * 
+      *  \param value New size
+      * 
+      *  \return Size of buffer, in byte
+      */
+ 	public Int32 BufferSize
+     {
+         get 
+         {
+             return m_i32BufferSize; 
+         }
+             
+         set
+         {
+             m_i32BufferSize = value;                    
+         }
+     }  
+     
      /*! \property public Int32 RemotePort
       *  \brief Returns the remote port or sets it.
***************
*** 185,216 ****
      }
  
!     /*! \property public string LocalAddress
!      *  \brief Returns the local address or sets it.
       * 
!      *  \param value New local address
       * 
!      *  \return Local address
       */
! 	public string LocalAddress
      {
          get 
          {
!             return m_strRemoteAddr;
!         }
!             
!         set
!         {
!             try
!             {
!                 m_LocalEndPoint = GetEndPoint(value.Trim(), LocalPort);
!                 m_oSocket.Bind(m_LocalEndPoint);
! 
!                 m_strLocalAddr = value.Trim();
!                 SetLastException(0, null);
!             }
!             catch (Exception e)
!             {
!                 SetLastException(1, e);
!             }
          }
      }
--- 225,240 ----
      }
  
!     /*! \property public Socket SocketObject
!      *  \brief Returns the socket object.
       * 
!      *  \param (none)
       * 
!      *  \return Socket object
       */
! 	public Socket SocketObject
      {
          get 
          {
!             return m_oSocket; 
          }
      }
***************
*** 227,247 ****
          get 
          {
!             return m_i32RemotePort; 
          }
              
          set
          {
!             try
!             {
!                 m_LocalEndPoint = GetEndPoint(LocalAddress, value);
!                 m_oSocket.Bind(m_LocalEndPoint);
!                     
!                 m_i32LocalPort = value;                    
!                 SetLastException(0, null);
!             }
!             catch (Exception e)
!             {
!                 SetLastException(1, e);
!             }
          }
      }
--- 251,260 ----
          get 
          {
!             return m_i32LocalPort; 
          }
              
          set
          {
!             m_i32LocalPort = value;   
          }
      }
***************
*** 258,262 ****
          get 
          {
!             return m_oSocket.Connected;
          }
      }
--- 271,275 ----
          get 
          {
!             return SocketObject.Connected;
          }
      }
***************
*** 308,312 ****
              if (!Connected)
              {
!                 m_oSocket.Connect(m_RemoteEndPoint);
  	            
                  return SetLastException(0, null);
--- 321,325 ----
              if (!Connected)
              {
!                 SocketObject.Connect(m_RemoteEndPoint);
  	            
                  return SetLastException(0, null);
***************
*** 321,326 ****
  	}        
  		
!     /*! \fn public UInt32 Disconnect()
!      *  \brief Disconnects.
       * 
       *  \param (none)
--- 334,339 ----
  	}        
  		
!     /*! \fn public UInt32 SocketObject()
!      *  \brief Disconnects or close socket.
       * 
       *  \param (none)
***************
*** 331,335 ****
       *  2 => not connected
       */
!     public UInt32 Disconnect()
      {
          try
--- 344,348 ----
       *  2 => not connected
       */
!     public UInt32 Close()
      {
          try
***************
*** 339,343 ****
              else
              {
!                 m_oSocket.Close();
                  
                  return SetLastException(0, null);
--- 352,356 ----
              else
              {
!                 SocketObject.Close();
                  
                  return SetLastException(0, null);
***************
*** 350,357 ****
  	}        
  
      /*! \fn private IPEndPoint GetEndPoint (string str_Address, Int32 i32_Port)
       *  \brief Creates an end point by an ip address and a port
       * 
!      *  \param str_Address Address
       *  \param i32_Port Port
       * 
--- 363,394 ----
  	}        
  
+     /*! \fn public bool AutoAccept
+      *  \brief Accept each connection request or first run OnAccept-event.
+      * 
+      *  \param value New state:<BR>
+      *         TRUE => Accept each connection request<BR>
+      *         FALSE => First run OnAccept event
+      * 
+      *  \return State:<BR>
+      *          TRUE => Accept each connection request<BR>
+      *          FALSE => First run OnAccept event
+      */
+     public bool AutoAccept
+     {
+         get
+         {
+             return m_boolAutoAccept;
+         }
+         
+         set
+         {
+             m_boolAutoAccept = value;
+         }
+ 	}        
+ 
      /*! \fn private IPEndPoint GetEndPoint (string str_Address, Int32 i32_Port)
       *  \brief Creates an end point by an ip address and a port
       * 
!      *  \param string str_Address
       *  \param i32_Port Port
       * 
***************
*** 362,366 ****
          try
          {
! 		    // create end point
  		    IPAddress oIPAddress = Dns.Resolve(str_Address.Trim()).AddressList[0];
              IPEndPoint oIPEndPoint = new IPEndPoint(oIPAddress, i32_Port);
--- 399,403 ----
          try
          {
!             // create end point
  		    IPAddress oIPAddress = Dns.Resolve(str_Address.Trim()).AddressList[0];
              IPEndPoint oIPEndPoint = new IPEndPoint(oIPAddress, i32_Port);
***************
*** 418,422 ****
  	        if (Connected)
  	        {
! 	            m_oSocket.Send(b_Bytes);
  		           		        
  	            return SetLastException(0, null);
--- 455,459 ----
  	        if (Connected)
  	        {
! 	            SocketObject.Send(b_Bytes);
  		           		        
  	            return SetLastException(0, null);
***************
*** 448,452 ****
              if (!Connected)
              {
!                 m_oSocket.Listen(ListenQueue);
  	            
                  return SetLastException(0, null);
--- 485,491 ----
              if (!Connected)
              {
!                 SocketObject.Bind( new IPEndPoint(IPAddress.Any, LocalPort));
!                 SocketObject.Listen(ListenQueue);
!                 SocketObject.BeginAccept( new AsyncCallback(this.pOnConnectRequest), SocketObject);
  	            
                  return SetLastException(0, null);
***************
*** 460,463 ****
--- 499,578 ----
  	    }
  	}        
+     
+     /*! \fn private void pOnConnectRequest ( IAsyncResult ar )
+      *  \brief Is invoked if a remote socket wants to connect
+      * 
+      *  \param ar Async result
+      * 
+      *  \return (none)
+      */
+     private void pOnConnectRequest ( IAsyncResult ar )
+     {
+         try
+         {
+             if (AutoAccept)
+             {
+                 m_oSocket = SocketObject.EndAccept(ar);
+                 
+                 if (null != OnConnect)
+                     this.OnConnect(this, m_oSocket);
+                 
+                 m_oSocket.BeginReceive(b_Buffer, 0, BufferSize, SocketFlags.None, new AsyncCallback(this.pOnReceive), m_oSocket);
+             }
+             else
+             {
+                 if (null != OnAccept)
+                     this.OnAccept(this, m_oSocket);
+             }        
+         
+         }
+         catch (Exception e)
+         {
+             pOnError(e);
+         }
+         
+         return;
+     }
+     
+     /*! \fn private void pOnReceive ( IAsyncResult ar )
+      *  \brief Is invoked if a remote socket has sended data to this socket
+      * 
+      *  \param ar Async result
+      * 
+      *  \return (none)
+      */
+     private void pOnReceive ( IAsyncResult ar )
+     {
+         try
+         {
+             int iBytesRead = SocketObject.EndReceive(ar);
+ 
+             if (null != OnReceive)
+                 this.OnReceive(this, b_Buffer, iBytesRead);
+         
+             // b_Buffer = new byte[BufferSize];
+             m_oSocket.BeginReceive(b_Buffer, 0, BufferSize, SocketFlags.None, new AsyncCallback(this.pOnReceive), m_oSocket);            
+         }
+         catch (Exception e)
+         {
+             pOnError(e);
+         }
  
+         return;
+     }
+ 
+     /*! \fn private void pOnReceive ( IAsyncResult ar )
+      *  \brief Is invoked if an error occurred
+      * 
+      *  \param ar Async result
+      * 
+      *  \return (none)
+      */
+     private void pOnError ( Exception e )
+     {
+         if (null != OnError)
+             this.OnError(this, e);
+ 
+         return;
+     }
  }

delivery-boy-cvs Mailing List for DeliveryBoy (Page 2)

delivery-boy-cvs — CVS mailing list (new revisions)