X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=net.h;h=fd89dc5db0695ae6285484e0755ae0d28b286693;hb=HEAD;hp=9b6591de77ae724a9b37faea229f61c1d8c67340;hpb=72801d0fbf90fb4193d1592908b485f183ed85fb;p=paraslash.git

diff --git a/net.h b/net.h
index 9b6591de..33acfc89 100644
--- a/net.h
+++ b/net.h
@@ -3,10 +3,6 @@
 
 /* Userland defines for Linux DCCP support. */
 
-#ifndef IPPROTO_DCCP
-#define IPPROTO_DCCP 33 /**< IANA assigned value. */
-#endif
-
 #ifndef SOL_DCCP
 #define SOL_DCCP 269 /**< Linux socket level. */
 #endif
@@ -29,38 +25,9 @@ char *parse_cidr(const char *cidr,
 		char *addr, ssize_t addrlen, int32_t *netmask);
 char *parse_url(const char *url,
 		char *host, ssize_t hostlen, int32_t *port);
-char *format_url(const char *url, int default_port);
+__malloc 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);
 
@@ -73,10 +40,9 @@ 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);
+	return makesock(l4type, false, host, port, NULL);
 }
 
 void extract_v4_addr(const struct sockaddr_storage *ss, struct in_addr *ia);