Commit: 51c185757e513c6f3a89b6337dd15ccc2c18b8bc - ultramonkey-l7-v3 (git)

UltraMonkey-L7 V3(multi-thread implementation)

Commit MetaInfo

• Revisión: 51c185757e513c6f3a89b6337dd15ccc2c18b8bc (tree)
• Tiempo: 2013-10-25 17:14:40
• Autor: Hiroaki Nakano <nakano.hiroaki@nttc...>
• Commiter: Hiroaki Nakano

Log Message

ipv6でtproxyを使えるようにする。
さらにipv4用tproxyのためのconfigureチェックが
間違っているので修正。

Signed-off-by: Hiroaki Nakano <[e-mail]>

Cambiar Resumen

• modified: configure.in
• modified: l7vsd/include/tcp_socket.h
• modified: l7vsd/include/tcp_socket_option.h

Diferencia incremental

--- a/configure.in
+++ b/configure.in
@@ -29,13 +29,7 @@ AC_CHECK_LIB([netsnmp], main, :,
 	[AC_MSG_ERROR( l7vsd require netsnmp library. )] )
 
 # Checks for header files.
-AC_CHECK_HEADERS([limits.h unistd.h])
-
-# Checks for declarations.
-AC_CHECK_DECLS([IP_TRANSPARENT], [], [], [[
-	#include <sys/socket.h>
-	#include <linux/in.h>
-]])
+AC_CHECK_HEADERS([limits.h unistd.h sys/socket.h linux/in.h linux/in6.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL

--- a/l7vsd/include/tcp_socket.h
+++ b/l7vsd/include/tcp_socket.h
@@ -139,7 +139,7 @@ public:
                 }
         }
 
-#ifdef  IP_TRANSPARENT
+#if defined(IP_TRANSPARENT) || defined(IPV6_TRANSPARENT)
         virtual void    set_transparent(const boost::asio::ip::tcp::endpoint &client_endpoint, boost::system::error_code &error_code) {
                 int ip_socket_level;
                 client_endpoint.address().is_v4()
@@ -147,7 +147,12 @@ public:
                                     : ip_socket_level = SOL_IPV6;
                 // set IP_TRANSPARENT
                 int on = 1;
-                int err = ::setsockopt(my_socket->native(), ip_socket_level, IP_TRANSPARENT, &on, sizeof(on));
+                int err = 0;
+                if (ip_socket_level == SOL_IP) {
+                        err = ::setsockopt(my_socket->native(), ip_socket_level, IP_TRANSPARENT, &on, sizeof(on));
+                } else if (ip_socket_level == SOL_IPV6) {
+                        err = ::setsockopt(my_socket->native(), ip_socket_level, IPV6_TRANSPARENT, &on, sizeof(on));
+                }
                 if (err) {
                         error_code = boost::system::error_code(errno, boost::asio::error::get_system_category());
                         return;
@@ -157,6 +162,7 @@ public:
                 my_socket->bind(client_endpoint, error_code);
         }
 #endif
+
 protected:
         virtual void set_quickack(boost::system::error_code &error_code) {
                 int err = ::setsockopt(my_socket->native(), IPPROTO_TCP, TCP_QUICKACK, &opt_info.quickack_val, sizeof(opt_info.quickack_val));

--- a/l7vsd/include/tcp_socket_option.h
+++ b/l7vsd/include/tcp_socket_option.h
@@ -25,11 +25,21 @@
 #ifndef TCP_SOCKET_OPTION_H
 #define TCP_SOCKET_OPTION_H
 
+#include <sys/socket.h>
 #include "config.h"
-#if HAVE_DECL_IP_TRANSPARENT && !defined(IP_TRANSPARENT)
+
+#if HAVE_IN_H
+#include <linux/in.h>
+#else
 #define IP_TRANSPARENT  19
 #endif
 
+#if HAVE_IN6_H
+#include <linux/in6.h>
+#else
+#define IPV6_TRANSPARENT  75
+#endif
+
 namespace l7vs
 {
 //! tcp_socket_option