Changeset 295 for trunk/include

Timestamp:

Oct 31, 2010, 10:36:04 AM (14 years ago)

Author:

katerina

Message:

Support for IPv6 (ticket #222).

Location:

trunk/include

Files:

• samhain.h (modified) (2 diffs)
• sh_calls.h (modified) (1 diff)
• sh_ipvx.h (added)
• sh_tools.h (modified) (1 diff)

trunk/include/samhain.h

@@ -34 +34 @@
  **************************************************/
 
+/* IPv6 */
+#if defined(HAVE_GETNAMEINFO) && defined(HAVE_GETADDRINFO)
+
+#if defined(SH_COMPILE_STATIC) && defined(__linux__)
+#undef USE_IPVX
+#define SH_SOCKMAX 1
+#else
+
+#if defined(USE_IPV4)
+#undef USE_IPVX
+#else
+#define USE_IPVX 1
+#endif
+
+#define SH_SOCKMAX 8
+#endif
+
+#else
+#undef USE_IPVX
+#define SH_SOCKMAX 1
+#endif
+
+/* end IPv6 */
+
 #define REPLACE_OLD
 
@@ -39 +63 @@
  * IPv6 is 8 groups of 4 hex digits seperated by colons.
  */
-#define SH_IP_BUF        40
+#define SH_IP_BUF        48
 #define SH_MINIBUF       64
 #define SH_BUFSIZE     1024

trunk/include/sh_calls.h

@@ -35 +35 @@
 int sh_aud_set_functions(const char * str_s);
 
+#ifdef SH_IPVX_H
+long int retry_accept(const char * file, int line, 
+                      int fd, struct sh_sockaddr *serv_addr, int * addrlen);
+#endif
 
-long int retry_accept(const char * file, int line, 
-                      int fd, struct sockaddr *serv_addr, int * addrlen);
 long int retry_stat (const char * file, int line, 
                      const char *file_name, struct stat *buf);

trunk/include/sh_tools.h

@@ -28 +28 @@
  */
 char * sh_tools_safe_name(const char * str, int flag);
-int is_numeric (const char * address);
+
 int connect_port (char * address, int port, 
                   char * ecall, int * errnum, char * errmsg, int errsiz);