X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.h;h=f172131ef05d45c8d05f82a91ea9e72cd0160a16;hp=7aaddc0c65264652c1474deb7967603612063c4a;hb=e8d5da94efd6cbb0aa75f57290c76d9992ff8f47;hpb=ae5e9dbcaaad643039e44c85891b3d7b383b23dd

diff --git a/net.h b/net.h
index 7aaddc0c..f172131e 100644
--- a/net.h
+++ b/net.h
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 /** \file net.h exported symbols from net.c */
 
 /**
@@ -93,7 +89,7 @@ _static_inline_ bool is_valid_ipv4_address(const char *address)
  * \param address The address string to check.
  *
  * \return 1 if string has a valid IPv6 address syntax, 0 if not.
- * \sa RFC 4291
+ * \sa RFC 4291.
  */
 _static_inline_ bool is_valid_ipv6_address(const char *address)
 {
@@ -102,12 +98,17 @@ _static_inline_ bool is_valid_ipv6_address(const char *address)
 	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);
+
 /**
  * Generic socket creation (passive and active sockets).
  */
-extern int makesock(unsigned l4type, bool passive,
-		    const char *host, uint16_t port_number,
-		    struct flowopts *fo);
+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);
 
 static inline int para_connect_simple(unsigned l4type,
 				      const char *host, uint16_t port)
@@ -116,6 +117,7 @@ static inline int para_connect_simple(unsigned l4type,
 }
 
 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.
@@ -130,7 +132,6 @@ static inline 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);
 
 /**
@@ -142,8 +143,7 @@ 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 fd, fd_set *rfds, void *addr, socklen_t size, int *new_fd);
-int create_local_socket(const char *name, struct sockaddr_un *unix_addr,
-	mode_t mode);
+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*);