Marged dhc code ver 20101018ver

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel-epoll-cond@10385 1ed66053-1c2d-0410-8867-f7571e6e31d3

diff --git a/doc/Makefile.am b/doc/Makefile.am
index eb3e436..9bd2cb5 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,2 +1,2 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = conf sslfiles heartbeat-ra
+SUBDIRS = conf sslfiles heartbeat-ra mibs

diff --git a/doc/mibs/Makefile.am b/doc/mibs/Makefile.am
index e82707a..acb9942 100644 (file)
--- a/doc/mibs/Makefile.am
+++ b/doc/mibs/Makefile.am
@@ -1,6 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
-L7VS_SNMP_MIBSDIR    = /usr/share/snmp/mibs
+UML7_VERSION = @ultramonkeyl7_version@
+L7VS_SNMP_MIBSDIR= /usr/share/doc/$(UML7_VERSION)/mibs
 
 install:
        $(INSTALL) -b -m 644 -D ./ULTRAMONKEY-L7-MIB.txt $(L7VS_SNMP_MIBSDIR)/ULTRAMONKEY-L7-MIB.txt

diff --git a/l7vsd/include/logger_impl.h b/l7vsd/include/logger_impl.h
index 6add5cf..c5d7f21 100644 (file)
--- a/l7vsd/include/logger_impl.h
+++ b/l7vsd/include/logger_impl.h
@@ -43,7 +43,7 @@
 #include "atomic.h"
 #include "wrlock.h"
 
-#if !defined(LOGGER_PROCESS_VSD) && !defined(LOGGER_PROCESS_ADM) && !defined(LOGGER_PROCESS_SNM)
+#if !defined(LOGGER_PROCESS_VSD) && !defined(LOGGER_PROCESS_ADM)
 #define LOGGER_PROCESS_VSD
 #endif
 
@@ -51,8 +51,6 @@
 #define LOGGER_PROCESS_ID "VSD"
 #elif defined(LOGGER_PROCESS_ADM)
 #define LOGGER_PROCESS_ID "ADM"
-#else
-#define LOGGER_PROCESS_ID "SNM"
 #endif
 
 #define LOGGER_PROCESS_PROTOCOL_MODULE_ID "PRM"

diff --git a/l7vsd/src/logger_impl.cpp b/l7vsd/src/logger_impl.cpp
index 5d48a94..0ab72b1 100644 (file)
--- a/l7vsd/src/logger_impl.cpp
+++ b/l7vsd/src/logger_impl.cpp
@@ -69,21 +69,6 @@
 #define LOGGER_ROTATION_TIMING_KEY              "l7vsadm_rotation_timing"
 #define LOGGER_ROTATION_TIMING_VALUE_KEY        "l7vsadm_rotation_timing_value"
 
-#elif(LOGGER_PROCESS_SNM)
-#define    LOGGER_LOG_FILENAME_KEY              "snmp_log_filename"
-#define LOGGER_ROTATION_KEY                     "snmp_rotation"
-#define LOGGER_MAX_BACKUP_INDEX_KEY             "snmp_max_backup_index"
-#define LOGGER_MAX_FILE_SIZE_KEY                "snmp_max_filesize"
-#define LOGGER_ROTATION_TIMING_KEY              "snmp_rotation_timing"
-#define LOGGER_ROTATION_TIMING_VALUE_KEY        "snmp_rotation_timing_value"
-
-#define LOGGER_CONN_LOG_FILENAME_KEY            "snmp_conn_log_filename"
-#define LOGGER_CONN_ROTATION_KEY                "snmp_conn_rotation"
-#define LOGGER_CONN_MAX_BACKUP_INDEX_KEY        "snmp_conn_max_backup_index"
-#define LOGGER_CONN_MAX_FILE_SIZE_KEY           "snmp_conn_max_filesize"
-#define LOGGER_CONN_ROTATION_TIMING_KEY         "snmp_conn_rotation_timing"
-#define LOGGER_CONN_ROTATION_TIMING_VALUE_KEY   "snmp_conn_rotation_timing_value"
-
 #endif
 
 /*!
@@ -307,8 +292,6 @@ void l7vs::LoggerImpl::logic_error(const unsigned int logno, const std::string &
         putLogError(l7vs::LOG_CAT_L7VSD_LOGGER, logno, str, file, line);
 #elif defined(LOGGER_PROCESS_ADM)
         putLogError(l7vs::LOG_CAT_L7VSADM_LOGGER, logno, str, file, line);
-#elif defined(LOGGER_PROCESS_SNM)
-        putLogError(l7vs::LOG_CAT_SNMPAGENT_LOGGER, logno, str, file, line);
 #endif
 
         throw std::logic_error(str);
@@ -420,8 +403,6 @@ void l7vs::LoggerImpl::errorConf(unsigned int message_id,
                 log_category = LOG_CAT_L7VSD_LOGGER;
 #elif defined(LOGGER_PROCESS_ADM)
                 log_category = LOG_CAT_L7VSADM_LOGGER;
-#elif defined(LOGGER_PROCESS_SNM)
-                log_category = LOG_CAT_SNMPAGENT_LOGGER;
 #else
                 log_category = LOG_CAT_L7VSD_LOGGER;
 #endif
@@ -1049,8 +1030,6 @@ void l7vs::LoggerImpl::loadConf()
                         }
 #elif defined(LOGGER_PROCESS_ADM)
                         cat_logger->addAppender(normalAppender);
-#elif defined(LOGGER_PROCESS_SNM)
-                        cat_logger->addAppender(normalAppender);
 #else
                         cat_logger->addAppender(normalAppender);
 #endif
@@ -1080,8 +1059,6 @@ void l7vs::LoggerImpl::loadConf()
                         log_category = LOG_CAT_L7VSD_LOGGER;
 #elif defined(LOGGER_PROCESS_ADM)
                         log_category = LOG_CAT_L7VSADM_LOGGER;
-#elif defined(LOGGER_PROCESS_SNM)
-                        log_category = LOG_CAT_SNMPAGENT_LOGGER;
 #else
                         log_category = LOG_CAT_L7VSD_LOGGER;
 #endif

diff --git a/l7vsd/src/logger_logrotate_utility.cpp b/l7vsd/src/logger_logrotate_utility.cpp
index bf000d5..41fd5d6 100644 (file)
--- a/l7vsd/src/logger_logrotate_utility.cpp
+++ b/l7vsd/src/logger_logrotate_utility.cpp
@@ -765,8 +765,6 @@ void logger_logrotate_utility::logrotation_utility_logic_error(const unsigned in
         Logger::putLogError(l7vs::LOG_CAT_L7VSD_LOGGER, logno, str, file, line);
 #elif defined(LOGGER_PROCESS_ADM)
         Logger::putLogError(l7vs::LOG_CAT_L7VSADM_LOGGER, logno, str, file, line);
-#elif defined(LOGGER_PROCESS_SNM)
-        Logger::putLogError(l7vs::LOG_CAT_SNMPAGENT_LOGGER, logno, str, file, line);
 #else
         Logger::putLogError(l7vs::LOG_CAT_L7VSD_LOGGER, logno, str, file, line);
 #endif

diff --git a/l7vsd/src/mibdata.cpp b/l7vsd/src/mibdata.cpp
index b628c3c..83cbaac 100644 (file)
--- a/l7vsd/src/mibdata.cpp
+++ b/l7vsd/src/mibdata.cpp
@@ -81,6 +81,9 @@ namespace l7vs
                 int vs_port = 0;
                 int sorry_port = 0;
                 int sorry_flag = 0;
+                unsigned long long http_requests_tmp = 0;
+                unsigned long long http_get_requests_tmp = 0;
+                unsigned long long http_post_requests_tmp = 0;
 
                 struct counter64 sorry_maxconnection = {
                         0
@@ -218,19 +221,38 @@ namespace l7vs
                                 stats_base& base_stats = protocol_module_ptr->get_stats();
                                 if ( base_stats.get_mode() == stats_base::MODE_HTTP ) {
                                         http_stats &httpstats = static_cast<http_stats&>(base_stats);
-                                        http_requests.low = httpstats.http_requests.get();
-                                        http_get_requests.low = httpstats.http_get_requests.get();
-                                        http_post_requests.low = httpstats.http_post_requests.get();
+                                       http_requests_tmp = httpstats.http_requests.get();
+                                       http_get_requests_tmp = httpstats.http_get_requests.get();
+                                       http_post_requests_tmp = httpstats.http_post_requests.get();
+                                       //convert to counter64 
+                                       http_requests.low = http_requests_tmp & 0xFFFFFFFF;
+                                       http_requests.high = http_requests_tmp >> 32;
+                                       http_get_requests.low = http_get_requests_tmp & 0xFFFFFFFF;
+                                       http_get_requests.high = http_get_requests_tmp >> 32;
+                                       http_post_requests.low = http_post_requests_tmp & 0xFFFFFFFF;
+                                       http_post_requests.high = http_post_requests_tmp >> 32;
                                 }
 
                                 //set sorry max connection
-                                sorry_maxconnection.low = srv.sorry_maxconnection;
+                               sorry_maxconnection.low = srv.sorry_maxconnection & 0xFFFFFFFF;
+                               sorry_maxconnection.high = srv.sorry_maxconnection >> 32;
 
                                 //set throughput information
-                                throughput_upstream.low = srv.throughput_upstream * 8;
-                                throughput_downstream.low = srv.throughput_downstream * 8;
-                                qos_upstream.low = srv.qos_upstream * 8;
-                                qos_downstream.low = srv.qos_downstream * 8;
+                               throughput_upstream.low = (srv.throughput_upstream * 8) & 0xFFFFFFFF;
+                               throughput_upstream.high = (srv.throughput_upstream * 8) >> 32;
+                               throughput_downstream.low = (srv.throughput_downstream * 8) & 0xFFFFFFFF;
+                               throughput_downstream.high = (srv.throughput_downstream * 8) >> 32;
+
+                               //set qos information
+                               if (ULLONG_MAX != srv.qos_upstream) { 
+                                       qos_upstream.low = (srv.qos_upstream * 8) & 0xFFFFFFFF;
+                                       qos_upstream.high = (srv.qos_upstream * 8) >> 32;
+                               }
+
+                               if (ULLONG_MAX != srv.qos_downstream) {
+                                       qos_downstream.low = (srv.qos_downstream * 8) & 0xFFFFFFFF;
+                                       qos_downstream.high = (srv.qos_downstream * 8) >> 32;
+                               }
 
                                 //set session information
                                 pool_session_count = (*it)->get_pool_sessions_count();

diff --git a/l7vsd/src/parameter.cpp b/l7vsd/src/parameter.cpp
index be9baa6..4236c0e 100644 (file)
--- a/l7vsd/src/parameter.cpp
+++ b/l7vsd/src/parameter.cpp
@@ -27,13 +27,11 @@
 #include "logger.h"
 #include "utility.h"
 
-#if !defined(LOGGER_PROCESS_VSD) && !defined(LOGGER_PROCESS_ADM) && !defined(LOGGER_PROCESS_SNM)
+#if !defined(LOGGER_PROCESS_VSD) && !defined(LOGGER_PROCESS_ADM)
 #define LOGGER_PROCESS_VSD
 #endif
 
-#ifdef LOGGER_PROCESS_SNM
-l7vs::LOG_CATEGORY_TAG param_cat = l7vs::LOG_CAT_SNMPAGENT_PARAMETER;
-#elif  LOGGER_PROCESS_ADM
+#ifdef LOGGER_PROCESS_ADM
 l7vs::LOG_CATEGORY_TAG param_cat = l7vs::LOG_CAT_L7VSADM_PARAMETER;
 #else
 l7vs::LOG_CATEGORY_TAG param_cat = l7vs::LOG_CAT_L7VSD_PARAMETER;

diff --git a/l7vsd/src/parameter_impl.cpp b/l7vsd/src/parameter_impl.cpp
index 0259ce2..074d792 100644 (file)
--- a/l7vsd/src/parameter_impl.cpp
+++ b/l7vsd/src/parameter_impl.cpp
@@ -34,13 +34,11 @@
 #include <boost/format.hpp>
 
 
-#if !defined(LOGGER_PROCESS_VSD) && !defined(LOGGER_PROCESS_ADM) && !defined(LOGGER_PROCESS_SNM)
+#if !defined(LOGGER_PROCESS_VSD) && !defined(LOGGER_PROCESS_ADM)
 #define LOGGER_PROCESS_VSD
 #endif
 
-#ifdef  LOGGER_PROCESS_SNM
-l7vs::LOG_CATEGORY_TAG logcat = l7vs::LOG_CAT_SNMPAGENT_PARAMETER;
-#elif   LOGGER_PROCESS_ADM
+#ifdef   LOGGER_PROCESS_ADM
 l7vs::LOG_CATEGORY_TAG logcat = l7vs::LOG_CAT_L7VSADM_PARAMETER;
 #else
 l7vs::LOG_CATEGORY_TAG logcat = l7vs::LOG_CAT_L7VSD_PARAMETER;

diff --git a/l7vsd/src/snmpagent_impl.cpp b/l7vsd/src/snmpagent_impl.cpp
index 32b80c1..1f774f3 100644 (file)
--- a/l7vsd/src/snmpagent_impl.cpp
+++ b/l7vsd/src/snmpagent_impl.cpp
@@ -264,28 +264,6 @@ namespace l7vs
 
                                 netsnmp_ds_set_boolean(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_ROLE, 1);
 
-                                //socket startup
-                                SOCK_STARTUP;
-
-                                //init l7vsAgent
-                                int ret = init_agent("l7vsAgent");
-                                if (ret) {
-                                        std::string msg("init_agent failed.");
-                                        Logger::putLogFatal(LOG_CAT_L7VSD_SNMPAGENT, 3, msg, __FILE__, __LINE__);
-                                        //set error code
-                                        err.setter(true, msg);
-                                        return;
-                                }
-
-                                init_snmp("l7vsAgent");
-
-                                //register snmp get item' handle
-                                init_snmp_handles(err);
-
-                                if (err) {
-                                        return;
-                                }
-
                                 //set initialize flag true
                                 initialized = true;
 
@@ -428,13 +406,35 @@ namespace l7vs
                 }
 
                 try {
+                       //socket startup
+                        SOCK_STARTUP;
+
+                        //init l7vsAgent
+                        int ret = init_agent("l7vsAgent");
+                        if (ret) {
+                                std::string msg("init_agent failed.");
+                                Logger::putLogFatal(LOG_CAT_L7VSD_SNMPAGENT, 3, msg, __FILE__, __LINE__);
+                                //set error code
+                                err.setter(true, msg);
+                                return;
+                        }
+
+                        init_snmp("l7vsAgent");
+
+                        //regist snmp get item' handle
+                        init_snmp_handles(err);
+
+                        if (err) {
+                                return;
+                        }
+
                         //collect mib data first time
                         mibdata::get_instance().collect_mibdata(vsd, err);
 
                         if (err) {
                                 //mib collect failed
                                 std::string msg("collect_mibdata failed,thread start failed.");
-                                Logger::putLogError(LOG_CAT_L7VSD_SNMPAGENT, 3, msg, __FILE__, __LINE__);
+                                Logger::putLogError(LOG_CAT_L7VSD_SNMPAGENT, 4, msg, __FILE__, __LINE__);
                                 //set error code
                                 err.setter(true, msg);
                                 return;
@@ -457,7 +457,7 @@ namespace l7vs
                         std::stringstream msg;
                         msg << "snmp function start failed : " << e.what() << ".";
 
-                        Logger::putLogError(LOG_CAT_L7VSD_SNMPAGENT, 4, msg.str(), __FILE__, __LINE__);
+                        Logger::putLogError(LOG_CAT_L7VSD_SNMPAGENT, 5, msg.str(), __FILE__, __LINE__);
                         //set error code
                         err.setter(true, msg.str());
                 }
@@ -487,13 +487,17 @@ namespace l7vs
                         process_mib_thread.join();
                         trap_thread.join();
 
+                        snmp_shutdown("l7vsAgent");
+                        shutdown_agent();
+                        SOCK_CLEANUP;
+
                         std::string  str =  "snmp function stop.";
                         Logger::putLogInfo(LOG_CAT_L7VSD_SNMPAGENT, 3, str, __FILE__, __LINE__);
 
                 } catch (const boost::thread_interrupted&) {
                         std::stringstream msg;
                         msg << "thread interrupted exception.";
-                        Logger::putLogError(LOG_CAT_L7VSD_SNMPAGENT, 5, msg.str(), __FILE__, __LINE__);
+                        Logger::putLogError(LOG_CAT_L7VSD_SNMPAGENT, 6, msg.str(), __FILE__, __LINE__);
                 }
         }
 
@@ -514,7 +518,7 @@ namespace l7vs
                         if (err) {
                                 std::stringstream msg;
                                 msg << "snmp function start failed.";
-                                Logger::putLogError(LOG_CAT_L7VSD_SNMPAGENT, 6, msg.str(), __FILE__, __LINE__);
+                                Logger::putLogError(LOG_CAT_L7VSD_SNMPAGENT, 7, msg.str(), __FILE__, __LINE__);
                         }
                 }
                 else {
@@ -620,7 +624,7 @@ namespace l7vs
                 if (vsd == NULL) {
                         //mib collect failed
                         std::string msg("vsd pointer is NULL.");
-                        Logger::putLogError(LOG_CAT_L7VSD_SNMPAGENT, 7, msg, __FILE__, __LINE__);
+                        Logger::putLogError(LOG_CAT_L7VSD_SNMPAGENT, 8, msg, __FILE__, __LINE__);
                         return;
                 }
 
@@ -681,7 +685,7 @@ namespace l7vs
                 if (vsd == NULL) {
                         //mib collect failed
                         std::string msg("vsd pointer is NULL.");
-                        Logger::putLogError(LOG_CAT_L7VSD_SNMPAGENT, 8, msg, __FILE__, __LINE__);
+                        Logger::putLogError(LOG_CAT_L7VSD_SNMPAGENT, 9, msg, __FILE__, __LINE__);
                         return;
                 }
 
@@ -912,7 +916,7 @@ namespace l7vs
                 //check vsd pointer
                 if (vsd == NULL) {
                         std::string msg("vsd pointer is NULL.");
-                        Logger::putLogError(LOG_CAT_L7VSD_SNMPAGENT, 9, msg, __FILE__, __LINE__);
+                        Logger::putLogError(LOG_CAT_L7VSD_SNMPAGENT, 10, msg, __FILE__, __LINE__);
                         //set error code
                         err.setter(true, msg);
                         return;
@@ -926,7 +930,7 @@ namespace l7vs
 
                         if (err) {
                                 std::string msg("collect mib data failed.");
-                                Logger::putLogError(LOG_CAT_L7VSD_SNMPAGENT, 10, msg, __FILE__, __LINE__);
+                                Logger::putLogError(LOG_CAT_L7VSD_SNMPAGENT, 11, msg, __FILE__, __LINE__);
                                 //set error code
                                 err.setter(true, msg);
                                 return;
@@ -950,8 +954,7 @@ namespace l7vs
                 if (start_flag == true) {
                         stop();
                 }
-                snmp_shutdown("l7vsAgent");
-                SOCK_CLEANUP;
+                
         }
 
         /*!

diff --git a/l7vsd/src/strict_time_based_rolling_policy.cpp b/l7vsd/src/strict_time_based_rolling_policy.cpp
index 6efe6ac..3e77bcb 100644 (file)
--- a/l7vsd/src/strict_time_based_rolling_policy.cpp
+++ b/l7vsd/src/strict_time_based_rolling_policy.cpp
@@ -251,7 +251,7 @@ time_t StrictTimeBasedRollingPolicy::getNextCheck(time_t now_time)
                         } else {
 #if defined(LOGGER_PROCESS_ADM)
                                 t.tm_year = numYear - 1900;
-#else    //LOGGER_PROCESS_VSD or LOGGER_PROCESS_SNM
+#else    //LOGGER_PROCESS_VSD 
                                 t.tm_year = numYear + 1 - 1900;
 #endif
                         }
@@ -283,7 +283,7 @@ time_t StrictTimeBasedRollingPolicy::getNextCheck(time_t now_time)
 #if defined(LOGGER_PROCESS_ADM)
                                 t.tm_year = numYear - 1900;
                                 t.tm_mon = numMonth - 1;
-#else    //LOGGER_PROCESS_VSD or LOGGER_PROCESS_SNM
+#else    //LOGGER_PROCESS_VSD 
                                 if (12 == numMonth) {
                                         t.tm_year = numYear + 1 - 1900;
                                         t.tm_mon = 0;
@@ -328,7 +328,7 @@ time_t StrictTimeBasedRollingPolicy::getNextCheck(time_t now_time)
                         } else {
 #if defined(LOGGER_PROCESS_ADM)
                                 t.tm_mday = numDate + (numTimingWeek - numNowWeek);
-#else    //LOGGER_PROCESS_VSD or LOGGER_PROCESS_SNM
+#else    //LOGGER_PROCESS_VSD
                                 t.tm_mday = numDate + (7 - (numNowWeek - numTimingWeek));
 #endif
                         }
@@ -359,7 +359,7 @@ time_t StrictTimeBasedRollingPolicy::getNextCheck(time_t now_time)
                         } else {
 #if defined(LOGGER_PROCESS_ADM)
                                 t.tm_mday = numDate;
-#else    //LOGGER_PROCESS_VSD or LOGGER_PROCESS_SNM
+#else    //LOGGER_PROCESS_VSD
                                 t.tm_mday = numDate + 1;
 #endif
                         }
@@ -390,7 +390,7 @@ time_t StrictTimeBasedRollingPolicy::getNextCheck(time_t now_time)
                         } else {
 #if defined(LOGGER_PROCESS_ADM)
                                 t.tm_hour = numHour;
-#else    //LOGGER_PROCESS_VSD or LOGGER_PROCESS_SNM
+#else    //LOGGER_PROCESS_VSD
                                 t.tm_hour = numHour + 1;
 #endif
                         }
@@ -475,7 +475,7 @@ bool StrictTimeBasedRollingPolicy::isTriggeringEvent(
                 // Do not rollover.
                 return false;
         }
-#else    //LOGGER_PROCESS_VSD or LOGGER_PROCESS_SNM
+#else    //LOGGER_PROCESS_VSD
         return now_time > nextCheck;
 #endif
 }