ipsec-332.tar.gz

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

diff --git a/ipsec-tools/racoon/misc.h b/ipsec-tools/racoon/misc.h
index 8f90cc9c6d60201f7c31353f38dda3c5d0ae468d..c56aea3e2efa5df80fb037b53a8f8135fbecb976 100644 (file)
--- a/ipsec-tools/racoon/misc.h
+++ b/ipsec-tools/racoon/misc.h
@@ -1,4 +1,6 @@
-/* $Id: misc.h,v 1.6.10.1 2005/11/06 17:18:26 monas Exp $ */
+/*     $NetBSD: misc.h,v 1.4 2006/09/09 16:22:09 manu Exp $    */
+
+/* Id: misc.h,v 1.9 2006/04/06 14:00:06 manubsd Exp */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -40,22 +42,29 @@
 #define LOCATION        debug_location(__FILE__, __LINE__, NULL)
 #endif
 
-extern int hexdump __P((void *, size_t));
-extern char *bit2str __P((int, int));
-extern void *get_newbuf __P((void *, size_t));
-extern const char *debug_location __P((const char *, int, const char *));
-extern int getfsize __P((char *));
+extern int hexdump (void *, size_t);
+extern char *bit2str (int, int);
+extern void *get_newbuf (void *, size_t);
+extern const char *debug_location (const char *, int, const char *);
+extern int getfsize (char *);
 struct timeval;
-extern double timedelta __P((struct timeval *, struct timeval *));
+extern double timedelta (struct timeval *, struct timeval *);
+char *strdup (const char *);
+extern char* binsanitize (char*, size_t);
 
-#ifndef HAVE_STRLCPY
-#define strlcpy(d,s,l) (strncpy(d,s,l), (d)[(l)-1] = '\0')
-#endif
+#define RACOON_TAILQ_FOREACH_REVERSE(var, head, headname ,field)       \
+  TAILQ_FOREACH_REVERSE(var, head, field, headname)
 
-#ifndef HAVE_STRLCAT
-#define strlcat(d,s,l) strncat(d,s,(l)-strlen(d)-1)
-#endif
+#define STRDUP_FATAL(x) if (x == NULL) {                       \
+       plog(ASL_LEVEL_ERR, "strdup failed\n"); \
+       exit(1);                                                \
+}
 
 #include "libpfkey.h"
 
+#define remainingsize(string_buffer_sizeof, filled_str) (string_buffer_sizeof - strlen(filled_str) - 1)
+#define remainingsize_opt(string_buffer_sizeof, filled_strlen) (string_buffer_sizeof - filled_strlen - 1)
+#define remainingsizeof(string_buffer) (sizeof(string_buffer) - strlen(string_buffer) - 1)
+#define remainingsizeof_opt(string_buffer, filled_strlen) (sizeof(string_buffer) - filled_strlen - 1)
+
 #endif /* _MISC_H */