projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'dechamps/windevice' into 1.1
[tinc]
/
src
/
netutl.h
diff --git
a/src/netutl.h
b/src/netutl.h
index
c94a703
..
471cae7
100644
(file)
--- a/
src/netutl.h
+++ b/
src/netutl.h
@@
-1,7
+1,7
@@
/*
netutl.h -- header file for netutl.c
Copyright (C) 1998-2005 Ivo Timmermans
/*
netutl.h -- header file for netutl.c
Copyright (C) 1998-2005 Ivo Timmermans
- 2000-20
09
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-20
13
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
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
@@
-13,9
+13,9
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
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.
+ 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__
*/
#ifndef __TINC_NETUTL_H__
@@
-25,18
+25,14
@@
extern bool hostnames;
extern bool hostnames;
-extern struct addrinfo *str2addrinfo(const char *, const char *, int);
+extern struct addrinfo *str2addrinfo(const char *, const char *, int)
__attribute__ ((__malloc__))
;
extern sockaddr_t str2sockaddr(const char *, const char *);
extern void sockaddr2str(const sockaddr_t *, char **, char **);
extern sockaddr_t str2sockaddr(const char *, const char *);
extern void sockaddr2str(const sockaddr_t *, char **, char **);
-extern char *sockaddr2hostname(const sockaddr_t *);
+extern char *sockaddr2hostname(const sockaddr_t *)
__attribute__ ((__malloc__))
;
extern int sockaddrcmp(const sockaddr_t *, const sockaddr_t *);
extern int sockaddrcmp_noport(const sockaddr_t *, const sockaddr_t *);
extern void sockaddrunmap(sockaddr_t *);
extern void sockaddrfree(sockaddr_t *);
extern void sockaddrcpy(sockaddr_t *, const sockaddr_t *);
extern int sockaddrcmp(const sockaddr_t *, const sockaddr_t *);
extern int sockaddrcmp_noport(const sockaddr_t *, const sockaddr_t *);
extern void sockaddrunmap(sockaddr_t *);
extern void sockaddrfree(sockaddr_t *);
extern void sockaddrcpy(sockaddr_t *, const sockaddr_t *);
-extern int maskcmp(const void *, const void *, int);
-extern void maskcpy(void *, const void *, int, int);
-extern void mask(void *, int, int);
-extern bool maskcheck(const void *, int, int);
-#endif
/* __TINC_NETUTL_H__ */
+#endif /* __TINC_NETUTL_H__ */