* This is potentially a very slow operation, so is disabled by
* default.
*/
- SocketAddress(const char* host, uint16_t port,
- bool allowNameLookup = false) {
+ SocketAddress(const char* host, uint16_t port, bool allowNameLookup = false) {
// Initialize the address family first,
// since setFromHostPort() and setFromIpPort() will check it.
}
}
- SocketAddress(const std::string& host, uint16_t port,
- bool allowNameLookup = false) {
+ SocketAddress(
+ const std::string& host,
+ uint16_t port,
+ bool allowNameLookup = false) {
// Initialize the address family first,
// since setFromHostPort() and setFromIpPort() will check it.
setFromPath(StringPiece{path, length});
}
+ /**
+ * Construct a SocketAddress from a local unix socket path.
+ *
+ * Raises std::invalid_argument on error.
+ *
+ * @param path The Unix domain socket path.
+ */
+ static SocketAddress makeFromPath(StringPiece path) {
+ SocketAddress addr;
+ addr.setFromPath(path);
+ return addr;
+ }
+
/**
* Initialize this SocketAddress from a socket's peer address.
*
* enough for the full address type required by
* address->sa_family.
*/
- void setFromSockaddr(const struct sockaddr* address,
- socklen_t addrlen);
+ void setFromSockaddr(const struct sockaddr* address, socklen_t addrlen);
/**
* Initialize this SocketAddress from a struct sockaddr_in.
* the valid bytes of sun_path, not including any NUL
* terminator.
*/
- void setFromSockaddr(const struct sockaddr_un* address,
- socklen_t addrlen);
-
+ void setFromSockaddr(const struct sockaddr_un* address, socklen_t addrlen);
/**
* Fill in a given sockaddr_storage with the ip or unix address.
sa_family_t getFamily() const {
DCHECK(external_ || AF_UNIX != storage_.addr.family());
- return external_ ? AF_UNIX : storage_.addr.family();
+ return external_ ? sa_family_t(AF_UNIX) : storage_.addr.family();
}
bool empty() const {
* Return true if this is an IPv4-mapped IPv6 address.
*/
bool isIPv4Mapped() const {
- return (getFamily() == AF_INET6 &&
- storage_.addr.isIPv4Mapped());
+ return (getFamily() == AF_INET6 && storage_.addr.isIPv4Mapped());
}
/**
* the heap.
*/
struct ExternalUnixAddr {
- struct sockaddr_un *addr;
+ struct sockaddr_un* addr;
socklen_t len;
- /* For debugging only, will be removed */
- uint64_t magic;
- static constexpr uint64_t kMagic = 0x1234faceb00c;
-
socklen_t pathLength() const {
- return len - offsetof(struct sockaddr_un, sun_path);
+ return socklen_t(len - offsetof(struct sockaddr_un, sun_path));
}
void init() {
- addr = new sockaddr_un;
- magic = kMagic;
+ addr = new struct sockaddr_un;
addr->sun_family = AF_UNIX;
len = 0;
}
- void init(const ExternalUnixAddr &other) {
- addr = new sockaddr_un;
- magic = kMagic;
+ void init(const ExternalUnixAddr& other) {
+ addr = new struct sockaddr_un;
len = other.len;
- memcpy(addr, other.addr, len);
- // Fill the rest with 0s, just for safety
- memset(reinterpret_cast<char*>(addr) + len, 0,
- sizeof(struct sockaddr_un) - len);
+ memcpy(addr, other.addr, size_t(len));
}
- void copy(const ExternalUnixAddr &other) {
- CHECK(magic == kMagic);
+ void copy(const ExternalUnixAddr& other) {
len = other.len;
- memcpy(addr, other.addr, len);
+ memcpy(addr, other.addr, size_t(len));
}
void free() {
- CHECK(magic == kMagic);
delete addr;
- magic = 0;
}
};
void setFromLocalAddr(const struct addrinfo* results);
void setFromSocket(int socket, int (*fn)(int, struct sockaddr*, socklen_t*));
std::string getIpString(int flags) const;
- void getIpString(char *buf, size_t buflen, int flags) const;
+ void getIpString(char* buf, size_t buflen, int flags) const;
void updateUnixAddressLength(socklen_t addrlen);
size_t hash_value(const SocketAddress& address);
std::ostream& operator<<(std::ostream& os, const SocketAddress& addr);
-
-}
+} // namespace folly
namespace std {
// Provide an implementation for std::hash<SocketAddress>
-template<>
+template <>
struct hash<folly::SocketAddress> {
- size_t operator()(
- const folly::SocketAddress& addr) const {
+ size_t operator()(const folly::SocketAddress& addr) const {
return addr.hash();
}
};
-
-}
+} // namespace std