Commit: f51f073d8f941830aeb377b25e572a30bf6ebc01 - UltraMonkeyL7_nakano (git)

Commit MetaInfo

• Revision: f51f073d8f941830aeb377b25e572a30bf6ebc01 (tree)
• Time: 2013-12-09 17:59:55
• Author: Hiroaki Nakano <nakano.hiroaki@nttc...>
• Commiter: Hiroaki Nakano

Log Message

#32547: fedora, RHEL7コンパイルエラー対処

TIME_UTCの仕様変更対処、pthreadがリンクされず
リンカエラーとなることへの対処。
ついでに、autotoolsバージョンアップによる
AC_INITとAM_INIT_AUTOMAKEの仕様変更対処。

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

Change Summary

• modified: configure.in
• modified: l7vsd/src/Makefile.am
• modified: l7vsd/src/tcp_session.cpp

Incremental Difference

--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 AC_PREREQ(2.59)
-AC_INIT(l7vsd)
+AC_INIT(l7vsd, 3.1.0, [e-mail])
 PACKAGENAME=l7vsd
 VERSION=3.1.0
 
-AM_INIT_AUTOMAKE($PACKAGENAME, $VERSION, no-define )
+AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADER([config.h])
 
@@ -27,6 +27,8 @@ AC_CHECK_LIB(boost_system-mt, main, :,
 	[AC_MSG_ERROR( l7vsd require boost library. )] )
 AC_CHECK_LIB([netsnmp], main, :,
 	[AC_MSG_ERROR( l7vsd require netsnmp library. )] )
+AC_CHECK_LIB(pthread, main, :,
+	[AC_MSG_ERROR( l7vsd require pthread library. )] )
 
 # Checks for header files.
 AC_CHECK_HEADERS([limits.h unistd.h])

--- a/l7vsd/src/Makefile.am
+++ b/l7vsd/src/Makefile.am
@@ -173,6 +173,7 @@ l7vsd_LDADD = \
 	-lboost_system-mt \
 	-lboost_serialization-mt \
 	-lnetsnmpmibs -lnetsnmpagent -lnetsnmphelpers -lnetsnmp \
+	-lpthread \
 	@external_agent_libs@
 
 l7vsadm_CPPFLAGS = \
@@ -197,6 +198,7 @@ l7vsadm_LDADD = \
 	libl7vsadm_parameter.a \
 	-llog4cxx \
 	-lrt \
+	-lpthread \
 	-lboost_thread-mt \
 	-lboost_system-mt \
 	-lboost_serialization-mt \

--- a/l7vsd/src/tcp_session.cpp
+++ b/l7vsd/src/tcp_session.cpp
@@ -840,7 +840,11 @@ void tcp_session::up_thread_run()
                                 }
                                 if (!server_connected_flag && server_connect_time_out != 0) {
                                         boost::xtime    now_time;
+#if BOOST_VERSION >= 105000
+                                        boost::xtime_get(&now_time, boost::TIME_UTC_);
+#else
                                         boost::xtime_get(&now_time, boost::TIME_UTC);
+#endif
                                         if ((now_time.sec - client_connected_time.sec) > server_connect_time_out) {     // timeout detect.
                                                 boost::system::error_code error_code;
                                                 client_socket.close(error_code);
@@ -1139,7 +1143,11 @@ void tcp_session::up_thread_client_accept(const TCP_PROCESS_TYPE_TAG process_typ
                                                   this,
                                                   boost::asio::placeholders::error));
         } else {
-                boost::xtime_get(&client_connected_time, boost::TIME_UTC);
+#if BOOST_VERSION >= 105000
+                boost::xtime_get(&start_handshake_time, boost::TIME_UTC_);
+#else
+                boost::xtime_get(&start_handshake_time, boost::TIME_UTC);
+#endif
                 upthread_status = UPTHREAD_ACTIVE;
         }
         up_thread_next_call_function = up_thread_function_array[func_tag];