diff options
| -rw-r--r-- | include/socket.h | 15 | ||||
| -rw-r--r-- | src/socket.cpp | 38 |
2 files changed, 53 insertions, 0 deletions
diff --git a/include/socket.h b/include/socket.h index 11c536ed7..a4e9cf43b 100644 --- a/include/socket.h +++ b/include/socket.h @@ -142,6 +142,21 @@ namespace irc * descriptors) */ CoreExport int OpenTCPSocket(const char* addr, int socktype = SOCK_STREAM); + + /** Convert an address-port pair into a binary sockaddr + * @param addr The IP address, IPv4 or IPv6 + * @param port The port, 0 for unspecified + * @param sa The structure to place the result in. Will be zeroed prior to conversion + * @return true if the conversion was successful, false if not. + */ + CoreExport int aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa); + /** Convert a binary sockaddr to an address-port pair + * @param sa The structure to convert + * @param addr the IP address + * @param port the port + * @return true if the conversion was successful, false if unknown address family + */ + CoreExport int satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port); } } diff --git a/src/socket.cpp b/src/socket.cpp index b9efd9f49..3a15c8a56 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -276,4 +276,42 @@ int irc::sockets::insp_aton(const char* a, insp_inaddr* n) return inet_pton(AF_FAMILY, a, n); } +int irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa) +{ + memset(sa, 0, sizeof(sa)); + if (inet_pton(AF_INET, addr, &sa->in4.sin_addr) > 0) + { + sa->in4.sin_family = AF_INET; + sa->in4.sin_port = htons(port); + return true; + } + else if (inet_pton(AF_INET6, addr, &sa->in6.sin6_addr) > 0) + { + sa->in6.sin6_family = AF_INET6; + sa->in6.sin6_port = htons(port); + return true; + } + return false; +} + +int irc::sockets::satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port) { + char addrv[INET6_ADDRSTRLEN+1]; + if (sa->sa.sa_family == AF_INET) + { + if (!inet_ntop(AF_INET, &sa->in4.sin_addr, addrv, sizeof(addrv))) + return false; + addr = addrv; + port = ntohs(sa->in4.sin_port); + return true; + } + else if (sa->sa.sa_family == AF_INET6) + { + if (!inet_ntop(AF_INET6, &sa->in6.sin6_addr, addrv, sizeof(addrv))) + return false; + addr = addrv; + port = ntohs(sa->in6.sin6_port); + return true; + } + return false; +} |