X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FClientSocketHandle.hh;h=92635f956927c221c820ce60de7bc32402d7d64d;hb=5443435c4c2b6e4386c5334b5b8358273f2bae93;hp=2d15dc97f5a65c58f73e947de89f13dbf165a37c;hpb=a1a6c76a214ad1935032826713cabaf9ac57bf07;p=senf.git

diff --git a/Socket/ClientSocketHandle.hh b/Socket/ClientSocketHandle.hh
index 2d15dc9..92635f9 100644
--- a/Socket/ClientSocketHandle.hh
+++ b/Socket/ClientSocketHandle.hh
@@ -24,8 +24,8 @@
     \brief ClientSocketHandle public header
  */
 
-#ifndef HH_ClientSocketHandle_
-#define HH_ClientSocketHandle_ 1
+#ifndef HH_SENF_Socket_ClientSocketHandle_
+#define HH_SENF_Socket_ClientSocketHandle_ 1
 
 // Custom includes
 #include <boost/call_traits.hpp>
@@ -106,7 +106,7 @@ namespace senf {
         /** This class will probably only be usable, if the \c CommunicationPolicy is \c
             ConnectedCommunicationPolicy and the \c AddressingPolicy is not \c
             NoAddressingPolicy. */
-        typedef ServerSocketHandle<SPolicy> ServerSocketHandle;
+        typedef ServerSocketHandle<SPolicy> ServerHandle;
 
         ///////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
@@ -374,18 +374,18 @@ namespace senf {
 
             \throws senf::SystemException
          */
-        void         connect      (AddressParam addr);
+        void         connect      (AddressParam addr) const;
 
         /** \brief Set local address
 
             For addressable protocols (AddressingPolicy is not NoAddressingPolicy), bind() will set
             the local address of the socket.
 
-            \param[in] addr Local socket address to asign
+            \param[in] addr Local socket address to assign
 
             \throws senf::SystemException
          */
-        void         bind         (AddressParam addr);
+        void         bind         (AddressParam addr) const;
 
         /** \brief Query remote address
 
@@ -398,8 +398,8 @@ namespace senf {
 
             \throws senf::SystemException
          */
-        Address      peer         ();
-        void         peer         (Address & addr);
+        Address      peer         () const;
+        void         peer         (Address & addr) const;
                                         ///< Query remote address
                                         /**< \see \ref peer() */
 
@@ -413,8 +413,8 @@ namespace senf {
 
             \throws senf::SystemException
          */
-        Address      local        ();
-        void         local        (Address & addr);
+        Address      local        () const;
+        void         local        (Address & addr) const;
                                         ///< Query local address
                                         /**< \see \ref local() */
 
@@ -427,13 +427,13 @@ namespace senf {
         void state(SocketStateMap & map, unsigned lod=0);
         std::string dumpState(unsigned lod=0);
 
+        unsigned available();
+
     protected:
         ClientSocketHandle(FileHandle other, bool isChecked);
         explicit ClientSocketHandle(std::auto_ptr<SocketBody> body);
 
     private:
-        unsigned available();
-
         friend class senf::ServerSocketHandle<SPolicy>;
     };