X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=net.h;h=e71fe311e60d0ccac59ba626d346b432b3227437;hb=ac9cc8f21ddeb821134e657f509bb83cec8c1da4;hp=8292240f999c5b7928e65e671c574660f089d7f9;hpb=539d39f36549c10656d8b31f3dea32702e9649df;p=paraslash.git diff --git a/net.h b/net.h index 8292240f..e71fe311 100644 --- a/net.h +++ b/net.h @@ -28,35 +28,6 @@ char *parse_url(const char *url, char *format_url(const char *url, int default_port); const char *stringify_port(int port, const char *transport); -/** - * Ensure that string conforms to the IPv4 address format. - * - * \param address The address string to check. - * - * \return 1 if \a address conforms to the IPv4 address format, else 0. - */ -_static_inline_ bool is_valid_ipv4_address(const char *address) -{ - struct in_addr test_it; - - return inet_pton(AF_INET, address, &test_it) != 0; -} - -/** - * Ensure that string conforms to IPv6 address format. - * - * \param address The address string to check. - * - * \return 1 if string has a valid IPv6 address syntax, 0 if not. - * \sa RFC 4291. - */ -_static_inline_ bool is_valid_ipv6_address(const char *address) -{ - struct in6_addr test_it; - - return inet_pton(AF_INET6, address, &test_it) != 0; -} - int lookup_address(unsigned l4type, bool passive, const char *host, int port_number, struct addrinfo **result); @@ -69,8 +40,7 @@ int makesock(unsigned l4type, bool passive, const char *host, int makesock_addrinfo(unsigned l4type, bool passive, struct addrinfo *ai, struct flowopts *fo); -static inline int para_connect_simple(unsigned l4type, - const char *host, uint16_t port) +static inline int para_connect(unsigned l4type, const char *host, uint16_t port) { return makesock(l4type, 0, host, port, NULL); }