Skip to content
Snippets Groups Projects
Commit c1658a3b authored by tho's avatar tho
Browse files

cleanup UNAdressing

parent af60ed25
No related branches found
No related tags found
No related merge requests found
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
//#include "UNAddressing.ih" //#include "UNAddressing.ih"
// Custom includes // Custom includes
#include <stdio.h>
#include <boost/operators.hpp>
#define prefix_ #define prefix_
///////////////////////////////cc.p//////////////////////////////////////// ///////////////////////////////cc.p////////////////////////////////////////
...@@ -36,18 +35,13 @@ ...@@ -36,18 +35,13 @@
prefix_ senf::UNSocketAddress::UNSocketAddress() prefix_ senf::UNSocketAddress::UNSocketAddress()
{} {}
prefix_ senf::UNSocketAddress::UNSocketAddress(std::string p) prefix_ senf::UNSocketAddress::UNSocketAddress(std::string const & path)
{ {
clear(); clear();
::strncpy(addr_.sun_path, p.c_str(), sizeof(addr_.sun_path)); ::strncpy(addr_.sun_path, path.c_str(), sizeof(addr_.sun_path));
addr_.sun_path[sizeof(addr_.sun_path)-1] = 0; addr_.sun_path[sizeof(addr_.sun_path)-1] = 0;
} }
prefix_ senf::UNSocketAddress fromString(std::string s)
{
return senf::UNSocketAddress::UNSocketAddress(s);
}
prefix_ bool senf::UNSocketAddress::operator==(UNSocketAddress const & other) prefix_ bool senf::UNSocketAddress::operator==(UNSocketAddress const & other)
const const
{ {
...@@ -55,7 +49,7 @@ prefix_ bool senf::UNSocketAddress::operator==(UNSocketAddress const & other) ...@@ -55,7 +49,7 @@ prefix_ bool senf::UNSocketAddress::operator==(UNSocketAddress const & other)
} }
prefix_ std::string senf::UNSocketAddress::path() prefix_ std::string senf::UNSocketAddress::path()
const const
{ {
return std::string(addr_.sun_path); return std::string(addr_.sun_path);
} }
...@@ -77,7 +71,7 @@ prefix_ sockaddr * senf::UNSocketAddress::sockaddr_p() ...@@ -77,7 +71,7 @@ prefix_ sockaddr * senf::UNSocketAddress::sockaddr_p()
return reinterpret_cast <struct sockaddr *> (&addr_); return reinterpret_cast <struct sockaddr *> (&addr_);
} }
prefix_ sockaddr const * senf::UNSocketAddress::sockaddr_p() prefix_ sockaddr const * senf::UNSocketAddress::sockaddr_p()
const const
{ {
return reinterpret_cast <struct sockaddr const *> (&addr_); return reinterpret_cast <struct sockaddr const *> (&addr_);
......
...@@ -31,11 +31,6 @@ ...@@ -31,11 +31,6 @@
#include <string> #include <string>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
#include <boost/cstdint.hpp>
#include <boost/operators.hpp>
#include "../../../Socket/SocketPolicy.hh"
#include "../../../Socket/ClientSocketHandle.hh"
#include "../../../Socket/CommunicationPolicy.hh"
#include "../../../Socket/Protocols/GenericAddressingPolicy.hh" #include "../../../Socket/Protocols/GenericAddressingPolicy.hh"
#include "../../../Utils/safe_bool.hh" #include "../../../Utils/safe_bool.hh"
...@@ -52,18 +47,14 @@ namespace senf { ...@@ -52,18 +47,14 @@ namespace senf {
\implementation This implementation is based on sockaddr_un. \implementation This implementation is based on sockaddr_un.
\ingroup addr_group \ingroup addr_group
\fixme Why both std::string constructor and from_string member ?
*/ */
class UNSocketAddress class UNSocketAddress
: public comparable_safe_bool<UNSocketAddress> : public comparable_safe_bool<UNSocketAddress>
{ {
public: public:
UNSocketAddress(); UNSocketAddress();
explicit UNSocketAddress(std::string p); explicit UNSocketAddress(std::string const & path);
///< Construct an address constant from given path ///< Construct an address constant from given path
static UNSocketAddress from_string(std::string const s);
///< Create UNSocketAddress from string
bool operator==(UNSocketAddress const & other) const; bool operator==(UNSocketAddress const & other) const;
///< Compare UNSocketAddress for equality ///< Compare UNSocketAddress for equality
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment