X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetutl.h;h=cc3ccabb9df6c81d2dd53a154abedeaba75307ad;hp=932814faf922657e321f98b9803abaec45acc21b;hb=57bc9a1835bcb6a8df7963ee4ab04fde34f28eaf;hpb=7648bc606596851942dd6437ddaa93f53ab20f09

diff --git a/src/netutl.h b/src/netutl.h
index 932814fa..cc3ccabb 100644
--- a/src/netutl.h
+++ b/src/netutl.h
@@ -1,6 +1,10 @@
+#ifndef TINC_NETUTL_H
+#define TINC_NETUTL_H
+
 /*
     netutl.h -- header file for netutl.c
-    Copyright (C) 1998,1999,2000 Ivo Timmermans <zarq@iname.com>
+    Copyright (C) 1998-2005 Ivo Timmermans
+                  2000-2016 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -12,26 +16,28 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: netutl.h,v 1.2.4.1 2000/06/25 15:22:16 guus Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_NETUTL_H__
-#define __TINC_NETUTL_H__
-
 #include "net.h"
 
-extern conn_list_t *lookup_conn(ip_t);
-extern void free_conn_element(conn_list_t *);
-extern void free_conn_list(conn_list_t*);
-extern void prune_conn_list(void);
-extern conn_list_t *new_conn_list(void);
-extern void destroy_conn_list(void);
-extern char *hostlookup(unsigned long);
-extern ip_mask_t *strtoip(char*);
-extern void dump_conn_list(void);
-
-#endif /* __TINC_NETUTL_H__ */
+extern bool hostnames;
+
+extern struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype);
+extern sockaddr_t str2sockaddr(const char *address, const char *port);
+extern void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr);
+extern char *sockaddr2hostname(const sockaddr_t *sa);
+extern int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b);
+extern int sockaddrcmp_noport(const sockaddr_t *a, const sockaddr_t *b);
+extern void sockaddrunmap(sockaddr_t *sa);
+extern void sockaddrfree(sockaddr_t *sa);
+extern void sockaddrcpy(sockaddr_t *dest, const sockaddr_t *src);
+extern void sockaddr_setport(sockaddr_t *sa, const char *port);
+extern int maskcmp(const void *a, const void *b, int masklen);
+extern void maskcpy(void *dest, const void *src, int masklen, int len);
+extern void mask(void *mask, int masklen, int len);
+extern bool maskcheck(const void *mask, int masklen, int len);
+
+#endif