Style update: reorder class members

diff --git a/source/inet.h b/source/inet.h
index a65813bbd6af8698ed728fbd3dd2b998c685cc1c..75735a7f36e1cf3e536dadf0b6d4915e26cb1fcd 100644 (file)
--- a/source/inet.h
+++ b/source/inet.h
@@ -30,12 +30,13 @@ public:
        InetAddr(const sockaddr_in &);
        InetAddr(in_addr_t, in_port_t);
 
        InetAddr(const sockaddr_in &);
        InetAddr(in_addr_t, in_port_t);
 

+       virtual InetAddr *copy() const { return new InetAddr(*this); }
+

        Family get_family() const { return INET; }
        in_addr_t get_addr() const { return ntohl(addr); }
        in_port_t get_port() const { return ntohs(port); }
        std::string str() const;
        virtual unsigned fill_sockaddr(sockaddr &) const;
        Family get_family() const { return INET; }
        in_addr_t get_addr() const { return ntohl(addr); }
        in_port_t get_port() const { return ntohs(port); }
        std::string str() const;
        virtual unsigned fill_sockaddr(sockaddr &) const;

-       virtual InetAddr *copy() const { return new InetAddr(*this); }

 };
 
 } // namespace Net
 };
 
 } // namespace Net

diff --git a/source/inet6.h b/source/inet6.h
index 44a5180180b0a024d6ee686f95a28ef1e1b3f1bd..f5a7079af2b55eaee5e0132167c84769d6e72d37 100644 (file)
--- a/source/inet6.h
+++ b/source/inet6.h
@@ -27,13 +27,13 @@ public:
        Inet6Addr(const sockaddr_in6 &);
        Inet6Addr(unsigned char [16], in_port_t);
 
        Inet6Addr(const sockaddr_in6 &);
        Inet6Addr(unsigned char [16], in_port_t);
 

+       virtual Inet6Addr *copy() const { return new Inet6Addr(*this); }
+

        virtual Family get_family() const { return INET6; }
        virtual std::string str() const;
 
        virtual unsigned fill_sockaddr(sockaddr &) const;
        virtual unsigned fill_sockaddr(sockaddr_storage &) const;
        virtual Family get_family() const { return INET6; }
        virtual std::string str() const;
 
        virtual unsigned fill_sockaddr(sockaddr &) const;
        virtual unsigned fill_sockaddr(sockaddr_storage &) const;

-
-       virtual Inet6Addr *copy() const { return new Inet6Addr(*this); }

 };
 
 } // namespace Net
 };
 
 } // namespace Net

diff --git a/source/sockaddr.cpp b/source/sockaddr.cpp
index f95edd3f9558fde0a870ac743f73bee845fdcdd7..08babb12c5f881c84a59471c06b178e4e2c173a1 100644 (file)
--- a/source/sockaddr.cpp
+++ b/source/sockaddr.cpp
@@ -5,11 +5,6 @@
 namespace Msp {
 namespace Net {
 
 namespace Msp {
 namespace Net {
 

-unsigned SockAddr::fill_sockaddr(sockaddr_storage &sa) const
-{
-       return fill_sockaddr(reinterpret_cast<sockaddr &>(sa));
-}
-

 SockAddr *SockAddr::create(const sockaddr_storage &sa)
 {
        switch(sa.ss_family)
 SockAddr *SockAddr::create(const sockaddr_storage &sa)
 {
        switch(sa.ss_family)


@@ -23,5 +18,10 @@ SockAddr *SockAddr::create(const sockaddr_storage &sa)
        }
 }
 
        }
 }
 

+unsigned SockAddr::fill_sockaddr(sockaddr_storage &sa) const
+{
+       return fill_sockaddr(reinterpret_cast<sockaddr &>(sa));
+}
+

 } // namespace Net
 } // namespace Msp
 } // namespace Net
 } // namespace Msp

diff --git a/source/sockaddr.h b/source/sockaddr.h
index 745e6d45afc59adda0889843a257da05dbf16b24..6e4025d298cc46d0fc16719dcebf1cdad334514a 100644 (file)
--- a/source/sockaddr.h
+++ b/source/sockaddr.h
@@ -12,7 +12,16 @@ namespace Net {
 
 class SockAddr
 {
 
 class SockAddr
 {

+protected:
+       SockAddr() { }

 public:
 public:

+       virtual ~SockAddr() { }
+
+       static SockAddr *create(const sockaddr &sa) { return create(reinterpret_cast<const sockaddr_storage &>(sa)); }
+       static SockAddr *create(const sockaddr_storage &);
+
+       virtual SockAddr *copy() const = 0;
+

        virtual Family get_family() const = 0;
        virtual std::string str() const = 0;
 
        virtual Family get_family() const = 0;
        virtual std::string str() const = 0;
 


@@ -23,15 +32,6 @@ public:
        */
        virtual unsigned fill_sockaddr(sockaddr &) const = 0;
        virtual unsigned fill_sockaddr(sockaddr_storage &) const;
        */
        virtual unsigned fill_sockaddr(sockaddr &) const = 0;
        virtual unsigned fill_sockaddr(sockaddr_storage &) const;

-
-       virtual SockAddr *copy() const =0;
-
-       virtual ~SockAddr() { }
-
-       static SockAddr *create(const sockaddr &sa) { return create(reinterpret_cast<const sockaddr_storage &>(sa)); }
-       static SockAddr *create(const sockaddr_storage &);
-protected:
-       SockAddr() { }

 };
 
 } // namespace Net
 };
 
 } // namespace Net

diff --git a/source/streamlistensocket.h b/source/streamlistensocket.h
index 8b96a98441a619ce90366320905bc9911996fca4..a24e731721b2334274667bff674cfe1e4c354245 100644 (file)
--- a/source/streamlistensocket.h
+++ b/source/streamlistensocket.h
@@ -10,13 +10,15 @@ class StreamSocket;
 
 class StreamListenSocket: public Socket
 {
 
 class StreamListenSocket: public Socket
 {

+private:
+       bool listening;
+

 public:
        StreamListenSocket(Family, int = 0);
 public:
        StreamListenSocket(Family, int = 0);

+

        int connect(const SockAddr &);
        void listen(const SockAddr &, unsigned = 4);
        StreamSocket *accept();
        int connect(const SockAddr &);
        void listen(const SockAddr &, unsigned = 4);
        StreamSocket *accept();

-private:
-       bool listening;

 };
 
 } // namespace Net
 };
 
 } // namespace Net

diff --git a/source/streamsocket.h b/source/streamsocket.h
index 66841de0217f6fd5fb20dc6064c745980241ba47..37c5b8e09ae762975fc2c98d1747ddf6a7969bf0 100644 (file)
--- a/source/streamsocket.h
+++ b/source/streamsocket.h
@@ -24,9 +24,9 @@ private:
 public:
        StreamSocket(Family, int = 0);
 
 public:
        StreamSocket(Family, int = 0);
 

+       virtual int connect(const SockAddr &);

        bool is_connecting() const { return connecting; }
        int poll_connect(const Time::TimeDelta &);
        bool is_connecting() const { return connecting; }
        int poll_connect(const Time::TimeDelta &);

-       int connect(const SockAddr &);

 private:
        void on_event(IO::PollEvent);
 };
 private:
        void on_event(IO::PollEvent);
 };