Don't close socket on Communicator error

[libs/net.git] / source / inet.h

diff --git a/source/inet.h b/source/inet.h
index 56b9f4d06a91092baf6d2b26d3d849a2e051a2a3..75735a7f36e1cf3e536dadf0b6d4915e26cb1fcd 100644 (file)
--- a/source/inet.h
+++ b/source/inet.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspnet
-Copyright © 2008  Mikkosoft Productions, Mikko Rasa
-Distributed under the LGPL
-*/
-
 #ifndef MSP_NET_INET_H_
 #define MSP_NET_INET_H_
 
@@ -13,37 +6,37 @@ Distributed under the LGPL
 #else
 #include <netinet/in.h>
 #endif
-#include <string>
 #include "sockaddr.h"
 
 namespace Msp {
 namespace Net {
 
-#ifdef WIN32
-typedef u_long in_addr_t;
-typedef u_short in_port_t;
-#endif
-
 /**
 Address class for IPv4 sockets.
 */
 class InetAddr: public SockAddr
 {
 private:
-       in_addr_t   addr;
-       in_port_t   port;
+#ifdef WIN32
+       typedef u_long in_addr_t;
+       typedef u_short in_port_t;
+#endif
+
+       in_addr_t addr;
+       in_port_t port;
 
 public:
        InetAddr();
-       InetAddr(sockaddr_in &);
+       InetAddr(const sockaddr_in &);
        InetAddr(in_addr_t, in_port_t);
 
-       Family      get_family() const { return INET; }
-       in_addr_t   get_addr() const { return ntohl(addr); }
-       in_port_t   get_port() const { return ntohs(port); }
+       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;
-       virtual InetAddr *copy() const { return new InetAddr(*this); }
 };
 
 } // namespace Net