X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=net.h;h=2256f376497b89d3382e2bf80ce09725ef64ab02;hb=refs%2Fheads%2Fnext;hp=15412586583ae9398090f98a8bfee83b59a09d59;hpb=a694ab16b6ff43b545ccd530360b7224433a5b76;p=paraslash.git

diff --git a/net.h b/net.h
index 15412586..33acfc89 100644
--- a/net.h
+++ b/net.h
@@ -1,96 +1,82 @@
-/*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
-#include <stdbool.h>
-
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 /** \file net.h exported symbols from net.c */
 
-/**
- * the buffer size of the sun_path component of struct sockaddr_un
- *
- * While glibc doesn't define \p UNIX_PATH_MAX, it
- * documents it has being limited to 108 bytes.
- */
-#ifndef UNIX_PATH_MAX
-#define UNIX_PATH_MAX 108
-#endif
+/* Userland defines for Linux DCCP support. */
 
-/** \cond Userland defines for Linux DCCP support. */
-#ifndef IPPROTO_DCCP
-#define IPPROTO_DCCP	33	/**< IANA assigned value */
-#define SOCK_DCCP	6	/**< Linux socket type	 */
-#define SOL_DCCP        269	/**< Linux socket level	 */
+#ifndef SOL_DCCP
+#define SOL_DCCP 269 /**< Linux socket level. */
 #endif
-/** \endcond */
 
+/** The maximum length of the host component in an URL. */
+#define MAX_HOSTLEN 256
+
+/* Opaque, only known to net.c. */
+struct flowopts;
+
+struct flowopts *flowopt_new(void);
+void flowopt_add(struct flowopts *fo, int level, int opt,
+		const char *name, const void *val, int len);
+void flowopt_cleanup(struct flowopts *fo);
 
 /**
  * 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;
+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);
+__malloc char *format_url(const char *url, int default_port);
+const char *stringify_port(int port, const char *transport);
 
-	return inet_pton(AF_INET, address, &test_it) != 0;
-}
+int lookup_address(unsigned l4type, bool passive, const char *host,
+		int port_number, struct addrinfo **result);
 
 /**
- * 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
+ * Generic socket creation (passive and active sockets).
  */
-_static_inline_ bool is_valid_ipv6_address(const char *address)
-{
-	struct in6_addr test_it;
+int makesock(unsigned l4type, bool passive, const char *host,
+		uint16_t port_number, struct flowopts *fo);
+
+int makesock_addrinfo(unsigned l4type, bool passive, struct addrinfo *ai,
+		struct flowopts *fo);
 
-	return inet_pton(AF_INET6, address, &test_it) != 0;
+static inline int para_connect(unsigned l4type, const char *host, uint16_t port)
+{
+	return makesock(l4type, false, host, port, NULL);
 }
 
-/**
- * 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);
+void extract_v4_addr(const struct sockaddr_storage *ss, struct in_addr *ia);
+bool sockaddr_equal(const struct sockaddr *sa1, const struct sockaddr *sa2);
 
 /**
  * Functions to support listening sockets.
  */
 /** How many pending connections queue of a listening server will hold. */
 #define BACKLOG	10
-extern int para_listen(unsigned l3type, unsigned l4type, unsigned short port);
+
+int para_listen(unsigned l4type, const char *addr, uint16_t port);
+int para_listen_simple(unsigned l4type, uint16_t port);
 
 /** Pretty-printing of IPv4/6 socket addresses */
-extern char *local_name(int sockfd);
-extern char *remote_name(int sockfd);
+char *remote_name(int sockfd);
 
-int send_bin_buffer(int, const char *, size_t);
-int send_buffer(int, const char *);
-__printf_2_3 int send_va_buffer(int fd, const char *fmt, ...);
+/**
+ * Determining maximum payload (packet) size
+ */
+int generic_max_transport_msg_size(int sockfd);
 
 int recv_bin_buffer(int fd, char *buf, size_t size);
 int recv_buffer(int fd, char *buf, size_t size);
 
-int para_accept(int, void *addr, socklen_t size);
-int create_local_socket(const char *name, struct sockaddr_un *unix_addr,
-	mode_t mode);
-int create_remote_socket(const char *name);
+int para_accept(int fd, void *addr, socklen_t size, int *new_fd);
+int create_local_socket(const char *name);
+int connect_local_socket(const char *name);
 int recv_cred_buffer(int, char *, size_t);
 ssize_t send_cred_buffer(int, char*);
-int recv_pattern(int fd, const char *pattern, size_t bufsize);
+
+/**
+ * Functions and definitions to support \p IPPROTO_DCCP
+ */
+/** Hardcoded maximum number of separate CCID modules compiled into a host. */
+#define DCCP_MAX_HOST_CCIDS	20
+int dccp_available_ccids(uint8_t **ccid_array);