ipsec-286.1.1.tar.gz

[apple/ipsec.git] / ipsec-tools / racoon / sockmisc.h

diff --git a/ipsec-tools/racoon/sockmisc.h b/ipsec-tools/racoon/sockmisc.h
index 828c0b453850b7d2c454ad48ef2bde8fd8ed7539..d4e935d72c44da8999a58f7a934b717b7fbcf76d 100644 (file)
--- a/ipsec-tools/racoon/sockmisc.h
+++ b/ipsec-tools/racoon/sockmisc.h
@@ -34,7 +34,7 @@
 
 struct netaddr {
        union {
-               struct sockaddr sa;
+               struct sockaddr_storage sa;
                struct sockaddr_in sin;
                struct sockaddr_in6 sin6;
        } sa;
@@ -43,45 +43,50 @@ struct netaddr {
 
 extern const int niflags;
 
-extern int cmpsaddrwop __P((const struct sockaddr *, const struct sockaddr *));
-extern int cmpsaddrwild __P((const struct sockaddr *, const struct sockaddr *));
-extern int cmpsaddrstrict __P((const struct sockaddr *, const struct sockaddr *));
+extern int cmpsaddrwop (const struct sockaddr_storage *, const struct sockaddr_storage *);
+extern int cmpsaddrwop_withprefix(const struct sockaddr_storage *, const struct sockaddr_storage *, int);
+extern int cmpsaddrwild (const struct sockaddr_storage *, const struct sockaddr_storage *);
+extern int cmpsaddrstrict (const struct sockaddr_storage *, const struct sockaddr_storage *);
+extern int cmpsaddrstrict_withprefix(const struct sockaddr_storage *, const struct sockaddr_storage *, int);
 
 #ifdef ENABLE_NATT 
 #define CMPSADDR(saddr1, saddr2) cmpsaddrstrict((saddr1), (saddr2))
+#define CMPSADDR2(saddr1, saddr2) cmpsaddrwild((saddr1), (saddr2))
 #else 
 #define CMPSADDR(saddr1, saddr2) cmpsaddrwop((saddr1), (saddr2))
+#define CMPSADDR2(saddr1, saddr2) cmpsaddrwop((saddr1), (saddr2))
 #endif
 
-extern struct sockaddr *getlocaladdr __P((struct sockaddr *));
+extern struct sockaddr_storage *getlocaladdr (struct sockaddr *);
 
-extern int recvfromto __P((int, void *, size_t, int,
-       struct sockaddr *, socklen_t *, struct sockaddr *, unsigned int *));
-extern int sendfromto __P((int, const void *, size_t,
-       struct sockaddr *, struct sockaddr *, int));
+extern int recvfromto (int, void *, size_t, int,
+       struct sockaddr_storage *, socklen_t *, struct sockaddr_storage *, unsigned int *);
+extern int sendfromto (int, const void *, size_t,
+       struct sockaddr_storage *, struct sockaddr_storage *, int);
 
-extern int setsockopt_bypass __P((int, int));
+extern int setsockopt_bypass (int, int);
 
-extern struct sockaddr *newsaddr __P((int));
-extern struct sockaddr *dupsaddr __P((struct sockaddr *));
-extern char *saddr2str __P((const struct sockaddr *));
-extern char *saddrwop2str __P((const struct sockaddr *));
-extern char *saddr2str_fromto __P((const char *format, 
+extern struct sockaddr_storage *newsaddr (int);
+extern struct sockaddr_storage *dupsaddr (struct sockaddr_storage *);
+extern char *saddr2str (const struct sockaddr *);
+extern char *saddr2str_with_prefix __P((const struct sockaddr *, int));
+extern char *saddrwop2str (const struct sockaddr *);
+extern char *saddr2str_fromto (const char *format, 
                                   const struct sockaddr *saddr, 
-                                  const struct sockaddr *daddr));
-extern struct sockaddr *str2saddr __P((char *, char *));
-extern void mask_sockaddr __P((struct sockaddr *, const struct sockaddr *,
-       size_t));
+                                  const struct sockaddr *daddr);
+extern struct sockaddr_storage *str2saddr (char *, char *);
+extern void mask_sockaddr (struct sockaddr_storage *, const struct sockaddr_storage *,
+       size_t);
 
 /* struct netaddr functions */
-extern char *naddrwop2str __P((const struct netaddr *naddr));
-extern char *naddrwop2str_fromto __P((const char *format, const struct netaddr *saddr,
-                                     const struct netaddr *daddr));
-extern int naddr_score(const struct netaddr *naddr, const struct sockaddr *saddr);
+extern char *naddrwop2str (const struct netaddr *naddr);
+extern char *naddrwop2str_fromto (const char *format, const struct netaddr *saddr,
+                                     const struct netaddr *daddr);
+extern int naddr_score(const struct netaddr *naddr, const struct sockaddr_storage *saddr);
 
 /* Some usefull functions for sockaddr port manipulations. */
-extern u_int16_t extract_port __P((const struct sockaddr *addr));
-extern u_int16_t *set_port __P((struct sockaddr *addr, u_int16_t new_port));
-extern u_int16_t *get_port_ptr __P((struct sockaddr *addr));
+extern u_int16_t extract_port (const struct sockaddr_storage *addr);
+extern u_int16_t *set_port (struct sockaddr_storage *addr, u_int16_t new_port);
+extern u_int16_t *get_port_ptr (struct sockaddr_storage *addr);
 
 #endif /* _SOCKMISC_H */