oggdec filter improvements.

[paraslash.git] / net.h

diff --git a/net.h b/net.h
index c4412b2fe1040f26f96b023c168b2aa96f50e3c3..8b706178e635fda2ba5ae00568730e36c87fac6a 100644 (file)
--- a/net.h
+++ b/net.h
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
+#include <stdbool.h>
 
 /** \file net.h exported symbols from net.c */
 
@@ -24,11 +25,49 @@
 #endif
 /** \endcond */
 
+
+/**
+ * Functions to parse and validate (parts of) URLs.
+ */
+extern char *parse_cidr(const char *cidr,
+                       char *addr, ssize_t addrlen, int32_t *netmask);
+extern char *parse_url(const char *url,
+                      char *host, ssize_t hostlen, int32_t *port);
+/**
+ * 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;
+}
+
 /**
  * Generic socket creation (passive and active sockets).
  */
 extern int makesock(unsigned l3type, unsigned l4type, int passive,
                    const char *host, unsigned short port_number);
+extern struct in_addr extract_v4_addr(const struct sockaddr_storage *ss);
 
 /**
  * Functions to support listening sockets.
@@ -38,7 +77,6 @@ extern int makesock(unsigned l3type, unsigned l4type, int passive,
 extern int para_listen(unsigned l3type, unsigned l4type, unsigned short port);
 
 /** Pretty-printing of IPv4/6 socket addresses */
-extern char *host_and_port(struct sockaddr *sa, socklen_t len);
 extern char *local_name(int sockfd);
 extern char *remote_name(int sockfd);