Clean the tipc::sockaddr in the default constructor

[software/posixx.git] / src / socket / inet.hpp

diff --git a/src/socket/inet.hpp b/src/socket/inet.hpp
index 05d6ddfe9825f587d78fae323cd393c2f8a03ebd..f86246fc91f6561a7b39e7b35ffe3b24404a7dcc 100644 (file)
--- a/src/socket/inet.hpp
+++ b/src/socket/inet.hpp
@@ -1,7 +1,7 @@
 #ifndef POSIXX_SOCKET_INET_HPP_
 #define POSIXX_SOCKET_INET_HPP_
 
 #ifndef POSIXX_SOCKET_INET_HPP_
 #define POSIXX_SOCKET_INET_HPP_
 

-#include "../basic_socket.hpp" // posixx::socket
+#include "basic_socket.hpp" // posixx::socket

 
 #include <netinet/in.h> // sockaddr_in, htonl, htons, {PF,AF}_INET, INADDR_ANY
 #include <arpa/inet.h> // inet_addr
 
 #include <netinet/in.h> // sockaddr_in, htonl, htons, {PF,AF}_INET, INADDR_ANY
 #include <arpa/inet.h> // inet_addr


@@ -15,27 +15,81 @@ namespace posixx { namespace socket {
 /// Internet Protocol sockets
 namespace inet {
 
 /// Internet Protocol sockets
 namespace inet {
 

+
+/// Address to accept any incoming messages
+const uint32_t any = INADDR_ANY;
+
+/// Address to send to all hosts
+const uint32_t broadcast = INADDR_BROADCAST;
+
+

 /// IP socket address
 struct sockaddr: sockaddr_in
 {
 
        /**
         * Create an IP socket address.
 /// IP socket address
 struct sockaddr: sockaddr_in
 {
 
        /**
         * Create an IP socket address.

+        *
+        * @note The IP address is expected in network byte order but the
+        *       port is expected in host byte order. This is because this
+        *       constructor is expected to be used with predefined IP
+        *       addresses, like any, none, loopback, etc.
+        *
+        * @param addr IP address in network byte order
+        * @param port IP port in host byte order
+        *
+        * @see any, none, etc. constants

         */
         */

-       sockaddr(u_int16_t port = 0, const std::string& ip = "0.0.0.0")
-                       throw ();
+       explicit sockaddr(uint32_t addr = any, uint16_t port = 0) throw ();

 
 

-       /// Length of this IP socket address
-       socklen_t length() const throw ();
+       /**
+        * Create an IP socket address.
+        *
+        * @param addr String representation of the IP address
+        * @param port IP port in host byte order
+        */
+       explicit sockaddr(const std::string& addr, uint16_t port) throw ();

 
 

-       /// Compare two IP socket addresses
-       bool operator == (const sockaddr& other) const throw ();
+       /**
+        * Set the IP address and port.
+        *
+        * @param addr IP address in network byte order
+        * @param port IP port in host byte order
+        *
+        * @see sockaddr(uint32_t, uint16_t)
+        */
+       void set(uint32_t addr, uint16_t port) throw();
+
+       /**
+        * Set the IP address and port.
+        *
+        * @param addr String representation of the IP address
+        * @param port IP port in host byte order
+        *
+        * @see sockaddr(const std::string&, uint16_t)
+        */
+       void set(const std::string& addr, uint16_t port) throw();
+
+       /// Get the IP address as a string
+       std::string addr() const throw ();
+
+       /// Set the IP address (in network byte order)
+       void addr(uint32_t addr) throw ();
+
+       /// Set the IP address from a string
+       void addr(const std::string& addr) throw ();

 
        /// Get the port number
        uint16_t port() const throw ();
 
 
        /// Get the port number
        uint16_t port() const throw ();
 

-       /// Get the IP address
-       std::string addr() const throw ();
+       /// Set the port number (port is expected to be in host byte order)
+       void port(uint16_t port) throw ();
+
+       /// Length of this IP socket address
+       socklen_t length() const throw ();
+
+       /// Compare two IP socket addresses
+       bool operator == (const sockaddr& other) const throw ();

 
 }; // struct sockaddr
 
 
 }; // struct sockaddr
 


@@ -57,37 +111,37 @@ typedef posixx::socket::basic_socket< traits > socket;
 
 
 inline
 
 
 inline

-posixx::socket::inet::sockaddr::sockaddr(u_int16_t port, const std::string& ip)
+posixx::socket::inet::sockaddr::sockaddr(uint32_t addr, uint16_t port)

                throw ()
 {
        memset(this, 0, sizeof(struct sockaddr_in));
        sin_family = AF_INET;
                throw ()
 {
        memset(this, 0, sizeof(struct sockaddr_in));
        sin_family = AF_INET;

-       if (ip == "0.0.0.0") {
-               sin_addr.s_addr = htonl(INADDR_ANY);
-       }
-       else {
-               sin_addr.s_addr = inet_addr(ip.c_str());
-       }
-       sin_port = htons(port);
+       set(addr, port);

 }
 
 inline
 }
 
 inline

-socklen_t posixx::socket::inet::sockaddr::length() const throw ()
+posixx::socket::inet::sockaddr::sockaddr(const std::string& addr, uint16_t port)
+               throw ()

 {
 {

-       return sizeof(sockaddr_in);
+       memset(this, 0, sizeof(struct sockaddr_in));
+       sin_family = AF_INET;
+       set(addr, port);

 }
 
 inline
 }
 
 inline

-bool posixx::socket::inet::sockaddr::operator == (const sockaddr& other) const
+void posixx::socket::inet::sockaddr::set(uint32_t addr, uint16_t port)

                throw ()
 {
                throw ()
 {

-       return !memcmp(this, &other, sizeof(*this));
+       sin_addr.s_addr = addr;
+       this->port(port);

 }
 
 inline
 }
 
 inline

-uint16_t posixx::socket::inet::sockaddr::port() const throw ()
+void posixx::socket::inet::sockaddr::set(const std::string& addr, uint16_t port)
+               throw ()

 {
 {

-       return ntohs(sin_port);
+       this->addr(addr);
+       this->port(port);

 }
 
 inline
 }
 
 inline


@@ -96,4 +150,41 @@ std::string posixx::socket::inet::sockaddr::addr() const throw ()
        return inet_ntoa(sin_addr);
 }
 
        return inet_ntoa(sin_addr);
 }
 

+inline
+void posixx::socket::inet::sockaddr::addr(uint32_t addr) throw ()
+{
+       sin_addr.s_addr = addr;
+}
+
+inline
+void posixx::socket::inet::sockaddr::addr(const std::string& addr) throw ()
+{
+       sin_addr.s_addr = inet_addr(addr.c_str());
+}
+
+inline
+uint16_t posixx::socket::inet::sockaddr::port() const throw ()
+{
+       return ntohs(sin_port);
+}
+
+inline
+void posixx::socket::inet::sockaddr::port(uint16_t port) throw ()
+{
+       sin_port = htons(port);
+}
+
+inline
+socklen_t posixx::socket::inet::sockaddr::length() const throw ()
+{
+       return sizeof(sockaddr_in);
+}
+
+inline
+bool posixx::socket::inet::sockaddr::operator == (const sockaddr& other) const
+               throw ()
+{
+       return !memcmp(this, &other, sizeof(*this));
+}
+

 #endif // POSIXX_SOCKET_INET_HPP_
 #endif // POSIXX_SOCKET_INET_HPP_