Socket/Protocols/INet: Updated INet4SocketAddress to use INet4Address

[senf.git] / Socket / Protocols / INet / INetAddressing.cci

diff --git a/Socket/Protocols/INet/INetAddressing.cci b/Socket/Protocols/INet/INetAddressing.cci
index 45802bc..f0e039d 100644 (file)
--- a/Socket/Protocols/INet/INetAddressing.cci
+++ b/Socket/Protocols/INet/INetAddressing.cci
@@ -33,61 +33,66 @@
 ///////////////////////////////////////////////////////////////////////////
 // senf::INet4Address
 
-prefix_ senf::INet4Address::INet4Address()
+prefix_ senf::INet4SocketAddress::INet4SocketAddress()
 {
     clear();
 }
 
-prefix_ senf::INet4Address::INet4Address(char const * address)
+prefix_ bool senf::INet4SocketAddress::operator==(INet4SocketAddress const & other)
+    const
 {
-    assignString(address);
+    return addr_.sin_port == other.addr_.sin_port &&
+        addr_.sin_addr.s_addr == other.addr_.sin_addr.s_addr;
 }
 
-prefix_ senf::INet4Address::INet4Address(std::string address)
+prefix_ senf::INet4Address senf::INet4SocketAddress::address()
+    const
 {
-    assignString(address);
+    return INet4Address::from_inaddr(addr_.sin_addr.s_addr);
 }
 
-prefix_ bool senf::INet4Address::operator==(INet4Address const & other)
+prefix_ unsigned senf::INet4SocketAddress::port()
     const
 {
-    return addr_.sin_port == other.addr_.sin_port &&
-        addr_.sin_addr.s_addr == other.addr_.sin_addr.s_addr;
+    return ntohs(addr_.sin_port);
 }
 
-prefix_ std::string senf::INet4Address::host()
+prefix_ bool senf::INet4SocketAddress::boolean_test()
     const
 {
-    char buffer[128];
-    return std::string(::inet_ntop(AF_INET,&addr_.sin_addr,buffer,128));
+    return port() || address();
 }
 
-prefix_ unsigned senf::INet4Address::port()
-    const
+prefix_ void senf::INet4SocketAddress::address(INet4Address const & addr)
 {
-    return ntohs(addr_.sin_port);
+    addr_.sin_addr.s_addr = addr.inaddr();
+}
+
+prefix_ void senf::INet4SocketAddress::port(unsigned p)
+{
+    addr_.sin_port = htons(p);
 }
 
-prefix_ struct sockaddr * senf::INet4Address::sockaddr_p()
+prefix_ struct sockaddr * senf::INet4SocketAddress::sockaddr_p()
 {
     return reinterpret_cast<struct sockaddr *>(&addr_);
 }
 
-prefix_ struct sockaddr const * senf::INet4Address::sockaddr_p()
+prefix_ struct sockaddr const * senf::INet4SocketAddress::sockaddr_p()
     const
 {
     return reinterpret_cast<struct sockaddr const *>(&addr_);
 }
 
-prefix_ unsigned senf::INet4Address::sockaddr_len()
+prefix_ unsigned senf::INet4SocketAddress::sockaddr_len()
     const
 {
     return sizeof(addr_);
 }
 
-prefix_ std::ostream & senf::operator<<(std::ostream & os, INet4Address const & addr)
+prefix_ std::ostream & senf::operator<<(std::ostream & os, INet4SocketAddress const & addr)
 {
-    os << addr.str();
+    os << addr.address() << ":" << addr.port();
     return os;
 }