OSDN Git Service

Merge
author0809216 <0809216@1ed66053-1c2d-0410-8867-f7571e6e31d3>
Thu, 30 Sep 2010 01:19:56 +0000 (01:19 +0000)
committer0809216 <0809216@1ed66053-1c2d-0410-8867-f7571e6e31d3>
Thu, 30 Sep 2010 01:19:56 +0000 (01:19 +0000)
git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel-epoll-cond@10319 1ed66053-1c2d-0410-8867-f7571e6e31d3

46 files changed:
doc/mibs/Makefile [deleted file]
snmpagent/Makefile.am [deleted file]
snmpagent/Makefile.in [deleted file]
snmpagent/MessengerClient.cpp [deleted file]
snmpagent/MessengerClient.h [deleted file]
snmpagent/QueueContainer.h [deleted file]
snmpagent/ULTRAMONKEY-L7-MIB.txt [deleted file]
snmpagent/UML7MIB.txt [deleted file]
snmpagent/UltraMonkeyL7.c [deleted file]
snmpagent/UltraMonkeyL7.h [deleted file]
snmpagent/dispatch_message.cpp [deleted file]
snmpagent/dispatch_message.h [deleted file]
snmpagent/dispatcher.cpp [deleted file]
snmpagent/dispatcher.h [deleted file]
snmpagent/interproccom.cpp [deleted file]
snmpagent/interproccom.h [deleted file]
snmpagent/l7ag_parameter.h [deleted file]
snmpagent/l7ag_socket.cpp [deleted file]
snmpagent/l7ag_socket.h [deleted file]
snmpagent/l7snmpagent.cpp [deleted file]
snmpagent/lockedqueue.h [deleted file]
snmpagent/message.h [deleted file]
snmpagent/mibs.memo [deleted file]
snmpagent/netsnmp_bridge.c [deleted file]
snmpagent/netsnmp_bridge.h [deleted file]
snmpagent/netsnmpbridge.c [deleted file]
snmpagent/netsnmpbridge.h [deleted file]
snmpagent/proc_message.h [deleted file]
snmpagent/proc_mibcollectmessage.cpp [deleted file]
snmpagent/proc_mibcollectmessage.h [deleted file]
snmpagent/proc_settingrequest.cpp [deleted file]
snmpagent/proc_settingrequest.h [deleted file]
snmpagent/proc_trapsendrequest.cpp [deleted file]
snmpagent/proc_trapsendrequest.h [deleted file]
snmpagent/processcheck.cpp [deleted file]
snmpagent/queue_sendtrap.cpp [deleted file]
snmpagent/queue_sendtrap.h [deleted file]
snmpagent/store_mibdata.cpp [deleted file]
snmpagent/store_mibdata.h [deleted file]
snmpagent/subagent.cpp [deleted file]
snmpagent/subagent.h [deleted file]
snmpagent/tag_threadstat.h [deleted file]
snmpagent/tag_trapid.h [deleted file]
snmpagent/trapdata.h [deleted file]
snmpagent/watch_l7vsd.cpp [deleted file]
snmpagent/watch_l7vsd.h [deleted file]

diff --git a/doc/mibs/Makefile b/doc/mibs/Makefile
deleted file mode 100644 (file)
index 14c4550..0000000
+++ /dev/null
@@ -1,362 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# doc/mibs/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-pkgdatadir = $(datadir)/l7vsd
-pkgincludedir = $(includedir)/l7vsd
-pkglibdir = $(libdir)/l7vsd
-pkglibexecdir = $(libexecdir)/l7vsd
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-subdir = doc/mibs
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/hibari/marge/l7vsd-3.x-ramiel-epoll-cond/missing --run aclocal-1.11
-AMTAR = ${SHELL} /home/hibari/marge/l7vsd-3.x-ramiel-epoll-cond/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /home/hibari/marge/l7vsd-3.x-ramiel-epoll-cond/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/hibari/marge/l7vsd-3.x-ramiel-epoll-cond/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/hibari/marge/l7vsd-3.x-ramiel-epoll-cond/missing --run automake-1.11
-AWK = gawk
-CC = g++
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DSYMUTIL = 
-DUMPBIN = 
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = /bin/grep -E
-EXEEXT = 
-FGREP = /bin/grep -F
-GREP = /bin/grep
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS = 
-LIBOBJS = 
-LIBS = -ldl 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIPO = 
-LN_S = ln -s
-LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/hibari/marge/l7vsd-3.x-ramiel-epoll-cond/missing --run makeinfo
-MANDIR = 
-MKDIR_P = /bin/mkdir -p
-NM = /usr/bin/nm -B
-NMEDIT = 
-OBJDUMP = objdump
-OBJEXT = o
-OTOOL = 
-OTOOL64 = 
-PACKAGE = l7vsd
-PACKAGE_BUGREPORT = 
-PACKAGE_NAME = 
-PACKAGE_STRING = 
-PACKAGE_TARNAME = 
-PACKAGE_VERSION = 
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SED = /bin/sed
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 3.0.0
-abs_builddir = /home/hibari/marge/l7vsd-3.x-ramiel-epoll-cond/doc/mibs
-abs_srcdir = /home/hibari/marge/l7vsd-3.x-ramiel-epoll-cond/doc/mibs
-abs_top_builddir = /home/hibari/marge/l7vsd-3.x-ramiel-epoll-cond
-abs_top_srcdir = /home/hibari/marge/l7vsd-3.x-ramiel-epoll-cond
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_DUMPBIN = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
-build_alias = 
-build_cpu = x86_64
-build_os = linux-gnu
-build_vendor = unknown
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE}
-dvidir = ${docdir}
-exec_prefix = /usr
-external_agent_libs = -Wl,-E -Wl,-rpath,/usr/lib64/perl5/CORE
-host = x86_64-unknown-linux-gnu
-host_alias = 
-host_cpu = x86_64
-host_os = linux-gnu
-host_vendor = unknown
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/hibari/marge/l7vsd-3.x-ramiel-epoll-cond/install-sh
-l7vs_config = /etc/l7vs/l7vs.cf
-l7vs_max_buffer_size = 4096
-l7vs_moddir = /usr/lib64/l7vs
-l7vsadm_sockdir = /var/run/l7vs
-libdir = /usr/lib64
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-lt_ECHO = echo
-mandir = ${datarootdir}/man
-mkdir_p = /bin/mkdir -p
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias = 
-top_build_prefix = ../../
-top_builddir = ../..
-top_srcdir = ../..
-ultramonkeyl7_version = ultramonkeyl7-3.0.0
-AUTOMAKE_OPTIONS = foreign
-L7VS_SNMP_MIBSDIR = /usr/share/snmp/mibs
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-               && { if test -f $@; then exit 0; else break; fi; }; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/mibs/Makefile'; \
-       $(am__cd) $(top_srcdir) && \
-         $(AUTOMAKE) --foreign doc/mibs/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-       esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       list='$(DISTFILES)'; \
-         dist_files=`for file in $$list; do echo $$file; done | \
-         sed -e "s|^$$srcdirstrip/||;t" \
-             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-       case $$dist_files in \
-         */*) $(MKDIR_P) `echo "$$dist_files" | \
-                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                          sort -u` ;; \
-       esac; \
-       for file in $$dist_files; do \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         if test -d $$d/$$file; then \
-           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-           if test -d "$(distdir)/$$file"; then \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-         else \
-           test -f "$(distdir)/$$file" \
-           || cp -p $$d/$$file "$(distdir)/$$file" \
-           || exit 1; \
-         fi; \
-       done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-         `test -z '$(STRIP)' || \
-           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-       -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-       distclean distclean-generic distclean-libtool distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-data install-data-am install-dvi install-dvi-am \
-       install-exec install-exec-am install-html install-html-am \
-       install-info install-info-am install-man install-pdf \
-       install-pdf-am install-ps install-ps-am install-strip \
-       installcheck installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-generic \
-       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
-
-install:
-       $(INSTALL) -b -m 644 -D ./ULTRAMONKEY-L7-MIB.txt $(L7VS_SNMP_MIBSDIR)/ULTRAMONKEY-L7-MIB.txt
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/snmpagent/Makefile.am b/snmpagent/Makefile.am
deleted file mode 100644 (file)
index d6fc1c8..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-bin_PROGRAMS     = l7snmpagent
-SNMPAGENT_OPTS   = @snmpagent_libs@
-
-l7snmpagent_SOURCES = \
-       ../logger/logger_wrapper.h \
-       ../parameter/parameter_wrapper.h \
-       lockedqueue.h \
-       QueueContainer.h \
-       MessengerClient.h \
-       dispatcher.h \
-       store_mibdata.h \
-       netsnmp_bridge.h \
-       subagent.h \
-       tag_threadstat.h \
-       MessengerClient.cpp \
-       dispatcher.cpp \
-       store_mibdata.cpp \
-       netsnmp_bridge.c \
-       subagent.cpp \
-       l7snmpagent.cpp 
-
-l7snmpagent_CPPFLAGS = \
-       -O2 -Wall -Werror -g -pthread \
-       -I../include -I../logger -I../parameter \
-       -I/usr/include/ucd-snmp -DLOGGER_PROCESS_SNM
-
-l7snmpagent_LDADD = \
-       ../logger/libsnmpagent_logger.a \
-       ../parameter/libsnmpagent_parameter.a \
-       -llog4cxx \
-       -lboost_thread-gcc41-mt \
-       $(SNMPAGENT_OPTS) \
-       -lrt
diff --git a/snmpagent/Makefile.in b/snmpagent/Makefile.in
deleted file mode 100644 (file)
index 9f037bc..0000000
+++ /dev/null
@@ -1,607 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = l7snmpagent$(EXEEXT)
-subdir = snmpagent
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_l7snmpagent_OBJECTS = l7snmpagent-MessengerClient.$(OBJEXT) \
-       l7snmpagent-dispatcher.$(OBJEXT) \
-       l7snmpagent-store_mibdata.$(OBJEXT) \
-       l7snmpagent-netsnmp_bridge.$(OBJEXT) \
-       l7snmpagent-subagent.$(OBJEXT) \
-       l7snmpagent-l7snmpagent.$(OBJEXT)
-l7snmpagent_OBJECTS = $(am_l7snmpagent_OBJECTS)
-am__DEPENDENCIES_1 =
-l7snmpagent_DEPENDENCIES = ../logger/libsnmpagent_logger.a \
-       ../parameter/libsnmpagent_parameter.a $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-       $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-       $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-       $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-       $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(l7snmpagent_SOURCES)
-DIST_SOURCES = $(l7snmpagent_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MANDIR = @MANDIR@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-l7vs_config = @l7vs_config@
-l7vs_max_buffer_size = @l7vs_max_buffer_size@
-l7vs_moddir = @l7vs_moddir@
-l7vsadm_sockdir = @l7vsadm_sockdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-snmpagent_libs = @snmpagent_libs@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-ultramonkeyl7_version = @ultramonkeyl7_version@
-AUTOMAKE_OPTIONS = foreign
-SNMPAGENT_OPTS = @snmpagent_libs@
-l7snmpagent_SOURCES = \
-       ../logger/logger_wrapper.h \
-       ../parameter/parameter_wrapper.h \
-       lockedqueue.h \
-       QueueContainer.h \
-       MessengerClient.h \
-       dispatcher.h \
-       store_mibdata.h \
-       netsnmp_bridge.h \
-       subagent.h \
-       tag_threadstat.h \
-       MessengerClient.cpp \
-       dispatcher.cpp \
-       store_mibdata.cpp \
-       netsnmp_bridge.c \
-       subagent.cpp \
-       l7snmpagent.cpp 
-
-l7snmpagent_CPPFLAGS = \
-       -O2 -Wall -Werror -g -pthread \
-       -I../include -I../logger -I../parameter \
-       -I/usr/include/ucd-snmp -DLOGGER_PROCESS_SNM
-
-l7snmpagent_LDADD = \
-       ../logger/libsnmpagent_logger.a \
-       ../parameter/libsnmpagent_parameter.a \
-       -llog4cxx \
-       -lboost_thread-gcc41-mt \
-       $(SNMPAGENT_OPTS) \
-       -lrt
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-               && exit 0; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  snmpagent/Makefile'; \
-       cd $(top_srcdir) && \
-         $(AUTOMAKE) --foreign  snmpagent/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-       esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-binPROGRAMS: $(bin_PROGRAMS)
-       @$(NORMAL_INSTALL)
-       test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-       @list='$(bin_PROGRAMS)'; for p in $$list; do \
-         p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-         if test -f $$p \
-            || test -f $$p1 \
-         ; then \
-           f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-          echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-          $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-         else :; fi; \
-       done
-
-uninstall-binPROGRAMS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(bin_PROGRAMS)'; for p in $$list; do \
-         f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-         echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-         rm -f "$(DESTDIR)$(bindir)/$$f"; \
-       done
-
-clean-binPROGRAMS:
-       @list='$(bin_PROGRAMS)'; for p in $$list; do \
-         f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-         echo " rm -f $$p $$f"; \
-         rm -f $$p $$f ; \
-       done
-l7snmpagent$(EXEEXT): $(l7snmpagent_OBJECTS) $(l7snmpagent_DEPENDENCIES) 
-       @rm -f l7snmpagent$(EXEEXT)
-       $(CXXLINK) $(l7snmpagent_LDFLAGS) $(l7snmpagent_OBJECTS) $(l7snmpagent_LDADD) $(LIBS)
-
-mostlyclean-compile:
-       -rm -f *.$(OBJEXT)
-
-distclean-compile:
-       -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/l7snmpagent-MessengerClient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/l7snmpagent-dispatcher.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/l7snmpagent-l7snmpagent.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/l7snmpagent-netsnmp_bridge.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/l7snmpagent-store_mibdata.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/l7snmpagent-subagent.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@   if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@   if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@   if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
-
-l7snmpagent-netsnmp_bridge.o: netsnmp_bridge.c
-@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT l7snmpagent-netsnmp_bridge.o -MD -MP -MF "$(DEPDIR)/l7snmpagent-netsnmp_bridge.Tpo" -c -o l7snmpagent-netsnmp_bridge.o `test -f 'netsnmp_bridge.c' || echo '$(srcdir)/'`netsnmp_bridge.c; \
-@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/l7snmpagent-netsnmp_bridge.Tpo" "$(DEPDIR)/l7snmpagent-netsnmp_bridge.Po"; else rm -f "$(DEPDIR)/l7snmpagent-netsnmp_bridge.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='netsnmp_bridge.c' object='l7snmpagent-netsnmp_bridge.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o l7snmpagent-netsnmp_bridge.o `test -f 'netsnmp_bridge.c' || echo '$(srcdir)/'`netsnmp_bridge.c
-
-l7snmpagent-netsnmp_bridge.obj: netsnmp_bridge.c
-@am__fastdepCC_TRUE@   if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT l7snmpagent-netsnmp_bridge.obj -MD -MP -MF "$(DEPDIR)/l7snmpagent-netsnmp_bridge.Tpo" -c -o l7snmpagent-netsnmp_bridge.obj `if test -f 'netsnmp_bridge.c'; then $(CYGPATH_W) 'netsnmp_bridge.c'; else $(CYGPATH_W) '$(srcdir)/netsnmp_bridge.c'; fi`; \
-@am__fastdepCC_TRUE@   then mv -f "$(DEPDIR)/l7snmpagent-netsnmp_bridge.Tpo" "$(DEPDIR)/l7snmpagent-netsnmp_bridge.Po"; else rm -f "$(DEPDIR)/l7snmpagent-netsnmp_bridge.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='netsnmp_bridge.c' object='l7snmpagent-netsnmp_bridge.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o l7snmpagent-netsnmp_bridge.obj `if test -f 'netsnmp_bridge.c'; then $(CYGPATH_W) 'netsnmp_bridge.c'; else $(CYGPATH_W) '$(srcdir)/netsnmp_bridge.c'; fi`
-
-.cpp.o:
-@am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@  if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
-l7snmpagent-MessengerClient.o: MessengerClient.cpp
-@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT l7snmpagent-MessengerClient.o -MD -MP -MF "$(DEPDIR)/l7snmpagent-MessengerClient.Tpo" -c -o l7snmpagent-MessengerClient.o `test -f 'MessengerClient.cpp' || echo '$(srcdir)/'`MessengerClient.cpp; \
-@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/l7snmpagent-MessengerClient.Tpo" "$(DEPDIR)/l7snmpagent-MessengerClient.Po"; else rm -f "$(DEPDIR)/l7snmpagent-MessengerClient.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='MessengerClient.cpp' object='l7snmpagent-MessengerClient.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o l7snmpagent-MessengerClient.o `test -f 'MessengerClient.cpp' || echo '$(srcdir)/'`MessengerClient.cpp
-
-l7snmpagent-MessengerClient.obj: MessengerClient.cpp
-@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT l7snmpagent-MessengerClient.obj -MD -MP -MF "$(DEPDIR)/l7snmpagent-MessengerClient.Tpo" -c -o l7snmpagent-MessengerClient.obj `if test -f 'MessengerClient.cpp'; then $(CYGPATH_W) 'MessengerClient.cpp'; else $(CYGPATH_W) '$(srcdir)/MessengerClient.cpp'; fi`; \
-@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/l7snmpagent-MessengerClient.Tpo" "$(DEPDIR)/l7snmpagent-MessengerClient.Po"; else rm -f "$(DEPDIR)/l7snmpagent-MessengerClient.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='MessengerClient.cpp' object='l7snmpagent-MessengerClient.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o l7snmpagent-MessengerClient.obj `if test -f 'MessengerClient.cpp'; then $(CYGPATH_W) 'MessengerClient.cpp'; else $(CYGPATH_W) '$(srcdir)/MessengerClient.cpp'; fi`
-
-l7snmpagent-dispatcher.o: dispatcher.cpp
-@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT l7snmpagent-dispatcher.o -MD -MP -MF "$(DEPDIR)/l7snmpagent-dispatcher.Tpo" -c -o l7snmpagent-dispatcher.o `test -f 'dispatcher.cpp' || echo '$(srcdir)/'`dispatcher.cpp; \
-@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/l7snmpagent-dispatcher.Tpo" "$(DEPDIR)/l7snmpagent-dispatcher.Po"; else rm -f "$(DEPDIR)/l7snmpagent-dispatcher.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='dispatcher.cpp' object='l7snmpagent-dispatcher.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o l7snmpagent-dispatcher.o `test -f 'dispatcher.cpp' || echo '$(srcdir)/'`dispatcher.cpp
-
-l7snmpagent-dispatcher.obj: dispatcher.cpp
-@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT l7snmpagent-dispatcher.obj -MD -MP -MF "$(DEPDIR)/l7snmpagent-dispatcher.Tpo" -c -o l7snmpagent-dispatcher.obj `if test -f 'dispatcher.cpp'; then $(CYGPATH_W) 'dispatcher.cpp'; else $(CYGPATH_W) '$(srcdir)/dispatcher.cpp'; fi`; \
-@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/l7snmpagent-dispatcher.Tpo" "$(DEPDIR)/l7snmpagent-dispatcher.Po"; else rm -f "$(DEPDIR)/l7snmpagent-dispatcher.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='dispatcher.cpp' object='l7snmpagent-dispatcher.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o l7snmpagent-dispatcher.obj `if test -f 'dispatcher.cpp'; then $(CYGPATH_W) 'dispatcher.cpp'; else $(CYGPATH_W) '$(srcdir)/dispatcher.cpp'; fi`
-
-l7snmpagent-store_mibdata.o: store_mibdata.cpp
-@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT l7snmpagent-store_mibdata.o -MD -MP -MF "$(DEPDIR)/l7snmpagent-store_mibdata.Tpo" -c -o l7snmpagent-store_mibdata.o `test -f 'store_mibdata.cpp' || echo '$(srcdir)/'`store_mibdata.cpp; \
-@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/l7snmpagent-store_mibdata.Tpo" "$(DEPDIR)/l7snmpagent-store_mibdata.Po"; else rm -f "$(DEPDIR)/l7snmpagent-store_mibdata.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='store_mibdata.cpp' object='l7snmpagent-store_mibdata.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o l7snmpagent-store_mibdata.o `test -f 'store_mibdata.cpp' || echo '$(srcdir)/'`store_mibdata.cpp
-
-l7snmpagent-store_mibdata.obj: store_mibdata.cpp
-@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT l7snmpagent-store_mibdata.obj -MD -MP -MF "$(DEPDIR)/l7snmpagent-store_mibdata.Tpo" -c -o l7snmpagent-store_mibdata.obj `if test -f 'store_mibdata.cpp'; then $(CYGPATH_W) 'store_mibdata.cpp'; else $(CYGPATH_W) '$(srcdir)/store_mibdata.cpp'; fi`; \
-@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/l7snmpagent-store_mibdata.Tpo" "$(DEPDIR)/l7snmpagent-store_mibdata.Po"; else rm -f "$(DEPDIR)/l7snmpagent-store_mibdata.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='store_mibdata.cpp' object='l7snmpagent-store_mibdata.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o l7snmpagent-store_mibdata.obj `if test -f 'store_mibdata.cpp'; then $(CYGPATH_W) 'store_mibdata.cpp'; else $(CYGPATH_W) '$(srcdir)/store_mibdata.cpp'; fi`
-
-l7snmpagent-subagent.o: subagent.cpp
-@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT l7snmpagent-subagent.o -MD -MP -MF "$(DEPDIR)/l7snmpagent-subagent.Tpo" -c -o l7snmpagent-subagent.o `test -f 'subagent.cpp' || echo '$(srcdir)/'`subagent.cpp; \
-@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/l7snmpagent-subagent.Tpo" "$(DEPDIR)/l7snmpagent-subagent.Po"; else rm -f "$(DEPDIR)/l7snmpagent-subagent.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='subagent.cpp' object='l7snmpagent-subagent.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o l7snmpagent-subagent.o `test -f 'subagent.cpp' || echo '$(srcdir)/'`subagent.cpp
-
-l7snmpagent-subagent.obj: subagent.cpp
-@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT l7snmpagent-subagent.obj -MD -MP -MF "$(DEPDIR)/l7snmpagent-subagent.Tpo" -c -o l7snmpagent-subagent.obj `if test -f 'subagent.cpp'; then $(CYGPATH_W) 'subagent.cpp'; else $(CYGPATH_W) '$(srcdir)/subagent.cpp'; fi`; \
-@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/l7snmpagent-subagent.Tpo" "$(DEPDIR)/l7snmpagent-subagent.Po"; else rm -f "$(DEPDIR)/l7snmpagent-subagent.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='subagent.cpp' object='l7snmpagent-subagent.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o l7snmpagent-subagent.obj `if test -f 'subagent.cpp'; then $(CYGPATH_W) 'subagent.cpp'; else $(CYGPATH_W) '$(srcdir)/subagent.cpp'; fi`
-
-l7snmpagent-l7snmpagent.o: l7snmpagent.cpp
-@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT l7snmpagent-l7snmpagent.o -MD -MP -MF "$(DEPDIR)/l7snmpagent-l7snmpagent.Tpo" -c -o l7snmpagent-l7snmpagent.o `test -f 'l7snmpagent.cpp' || echo '$(srcdir)/'`l7snmpagent.cpp; \
-@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/l7snmpagent-l7snmpagent.Tpo" "$(DEPDIR)/l7snmpagent-l7snmpagent.Po"; else rm -f "$(DEPDIR)/l7snmpagent-l7snmpagent.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='l7snmpagent.cpp' object='l7snmpagent-l7snmpagent.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o l7snmpagent-l7snmpagent.o `test -f 'l7snmpagent.cpp' || echo '$(srcdir)/'`l7snmpagent.cpp
-
-l7snmpagent-l7snmpagent.obj: l7snmpagent.cpp
-@am__fastdepCXX_TRUE@  if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT l7snmpagent-l7snmpagent.obj -MD -MP -MF "$(DEPDIR)/l7snmpagent-l7snmpagent.Tpo" -c -o l7snmpagent-l7snmpagent.obj `if test -f 'l7snmpagent.cpp'; then $(CYGPATH_W) 'l7snmpagent.cpp'; else $(CYGPATH_W) '$(srcdir)/l7snmpagent.cpp'; fi`; \
-@am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/l7snmpagent-l7snmpagent.Tpo" "$(DEPDIR)/l7snmpagent-l7snmpagent.Po"; else rm -f "$(DEPDIR)/l7snmpagent-l7snmpagent.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='l7snmpagent.cpp' object='l7snmpagent-l7snmpagent.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(l7snmpagent_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o l7snmpagent-l7snmpagent.obj `if test -f 'l7snmpagent.cpp'; then $(CYGPATH_W) 'l7snmpagent.cpp'; else $(CYGPATH_W) '$(srcdir)/l7snmpagent.cpp'; fi`
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-
-distclean-libtool:
-       -rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       tags=; \
-       here=`pwd`; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
-       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-         test -n "$$unique" || unique=$$empty_fix; \
-         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-           $$tags $$unique; \
-       fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       tags=; \
-       here=`pwd`; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
-       test -z "$(CTAGS_ARGS)$$tags$$unique" \
-         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-            $$tags $$unique
-
-GTAGS:
-       here=`$(am__cd) $(top_builddir) && pwd` \
-         && cd $(top_srcdir) \
-         && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-       list='$(DISTFILES)'; for file in $$list; do \
-         case $$file in \
-           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-         esac; \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-           dir="/$$dir"; \
-           $(mkdir_p) "$(distdir)$$dir"; \
-         else \
-           dir=''; \
-         fi; \
-         if test -d $$d/$$file; then \
-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-           fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-         else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
-           || exit 1; \
-         fi; \
-       done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-       for dir in "$(DESTDIR)$(bindir)"; do \
-         test -z "$$dir" || $(mkdir_p) "$$dir"; \
-       done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-         `test -z '$(STRIP)' || \
-           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-       distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-       mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-       clean-generic clean-libtool ctags distclean distclean-compile \
-       distclean-generic distclean-libtool distclean-tags distdir dvi \
-       dvi-am html html-am info info-am install install-am \
-       install-binPROGRAMS install-data install-data-am install-exec \
-       install-exec-am install-info install-info-am install-man \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-       pdf pdf-am ps ps-am tags uninstall uninstall-am \
-       uninstall-binPROGRAMS uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/snmpagent/MessengerClient.cpp b/snmpagent/MessengerClient.cpp
deleted file mode 100644 (file)
index 87ac17d..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-#include <netdb.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <cstring>
-
-#include "MessengerClient.h"
-
-#define READBUFSIZE     (512)
-#define SLEEPNANOTIME   (1000000)
-
-void*
-MessengerClient::run(void *inClass)
-{
-        MessengerClient *msgClPtr = static_cast<MessengerClient *>(inClass);
-        char buffer[READBUFSIZE];
-        struct timespec req;
-
-        while (!msgClPtr->endflg) {     // async read
-                req.tv_sec = 0;
-                req.tv_nsec = SLEEPNANOTIME;
-                int ret = nanosleep(&req, NULL);
-                if (ret == -1) {
-                        break; // nanosleep failed
-                }
-
-                if (msgClPtr->connect()) {
-                        ssize_t recvsize = recv(msgClPtr->socketfd, &buffer, READBUFSIZE, 0);
-                        if (recvsize == -1) {
-                                if (EAGAIN != errno) {
-                                        // TODO error
-                                        msgClPtr->close();
-                                        msgClPtr->ipcstat = DISCONNECT;
-                                        continue;
-                                }
-                        } else if (recvsize == 0) {
-                                continue;
-                        } else {
-                                char *ptr = new char[recvsize];
-                                ::memcpy(ptr , buffer, recvsize);
-                                QueueContainer container;
-                                container.reset(recvsize, ptr);
-                                msgClPtr->messengerQueue->push(container);
-                        }
-                }
-        }
-        msgClPtr->threadid = 0;
-        msgClPtr->endflg = false;
-
-        return NULL;
-}
-
-void
-MessengerClient::setEndpoint(const char *targethost, const char *targetport)
-{
-        host = targethost;
-        port = targetport;
-}
-
-bool
-MessengerClient::connect()
-{
-        struct addrinfo     hints;
-        struct addrinfo    *res = NULL;
-
-        if (!host || !port) {
-                ipcstat = DISCONNECT;
-                return false;
-        }
-        if (ipcstat == CONNECT) return true;
-
-        ::memset(&hints, 0, sizeof(hints));
-        hints.ai_family     = AF_UNSPEC;
-        hints.ai_socktype   = SOCK_STREAM;
-
-        int err = getaddrinfo(host, port, &hints, &res);
-        if (err != 0) {
-                // TODO insert error log
-                //char  buff[255];
-                //::sprintf( buff, "%s", gai_strerror(err) );
-                freeaddrinfo(res);
-                ipcstat = DISCONNECT;
-                return false;
-        }
-
-        for (addrinfo *ai = res; ai; ai = ai->ai_next) {
-                socketfd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-                if (socketfd < 0) {
-                        // TODO error log
-                        freeaddrinfo(res);
-                        ipcstat = DISCONNECT;
-                        return false;
-                }
-                /*
-                        int sockflg = fcntl(socketfd, F_GETFD);
-                        sockflg |= O_NONBLOCK;
-                        int ret = fcntl(socketfd, F_SETFD, sockflg);
-                        if (ret < 0) {
-                            // TODO error log
-                            ::close( socketfd );
-                            socketfd = -1;
-                            continue;
-                        }
-                */
-
-                // TODO must check timeout
-                if (::connect(socketfd, ai->ai_addr, ai->ai_addrlen) < 0) {
-                        // TODO error log
-                        ::close(socketfd);
-                        socketfd = -1;
-                        ipcstat = DISCONNECT;
-                        continue;
-                }
-                break;
-        }
-
-        freeaddrinfo(res);
-
-        if (socketfd < 0) {
-                ipcstat = DISCONNECT;
-                return false;
-        }
-
-        ipcstat = CONNECT;
-        return true;
-}
-
-void
-MessengerClient::close()
-{
-        if (socketfd >= 0)
-                ::close(socketfd);
-        socketfd = -1;
-        ipcstat = DISCONNECT;
-}
-
-int
-MessengerClient::send(size_t insize, const void *data)
-{
-        if (socketfd < 0)
-                return -1;
-        return ::send(socketfd, data, insize, MSG_NOSIGNAL);
-}
-
-void
-MessengerClient::start()
-{
-        pthread_create(&threadid, NULL, run,  this);
-}
-
-void
-MessengerClient::stop()
-{
-        endflg = true;
-}
diff --git a/snmpagent/MessengerClient.h b/snmpagent/MessengerClient.h
deleted file mode 100644 (file)
index 560ecbe..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef MESSENGERCLIENT_H
-#define MESSENGERCLIENT_H
-
-#include <pthread.h>
-#include "lockedqueue.h"
-#include "QueueContainer.h"
-
-enum IPC_STATUS_TAG {
-        UNKNOWN = 0,
-        DISCONNECT,
-        CONNECT
-};
-
-typedef lockedqueue< QueueContainer > MessengerQueue;
-
-class   MessengerClient
-{
-
-protected:
-        const char *host;
-        const char *port;
-        bool    endflg;
-        int     socketfd;
-        pthread_t   threadid;
-        IPC_STATUS_TAG  ipcstat;
-        MessengerQueue *messengerQueue;
-
-        MessengerClient(MessengerClient &) {}
-        MessengerClient &operator=(MessengerClient &) {
-                return *this;
-        }
-        static void    *run(void *);
-
-public:
-        MessengerClient(MessengerQueue *inqueue)
-                : endflg(false),
-                  socketfd(-1),
-                  threadid(0),
-                  ipcstat(UNKNOWN),
-                  messengerQueue(inqueue) {}
-        ~MessengerClient() {};
-
-        void    setEndpoint(const char *, const char *);
-        bool    connect();
-        void    close();
-        int     send(size_t , const void *);
-        void    start();
-        void    stop();
-};
-
-#endif  //MESSENGERCLIENT_H
diff --git a/snmpagent/QueueContainer.h b/snmpagent/QueueContainer.h
deleted file mode 100644 (file)
index 574267b..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef QUEUECONTAINER_H
-#define QUEUECONTAINER_H
-#include <boost/shared_array.hpp>
-
-class   QueueContainer
-{
-
-public:
-        typedef boost::shared_array<char> dataPtr;
-
-protected:
-        size_t  size_;
-        dataPtr data_;
-
-public:
-        QueueContainer() {
-                size_ = 0;
-        }
-        QueueContainer(size_t   insize, char *inptr) {
-                size_ = insize;
-                data_.reset(inptr);
-        }
-        QueueContainer(const QueueContainer &inqueue) {
-                size_ = inqueue.size_;
-                data_ = inqueue.data_;
-        }
-        ~QueueContainer() {}
-
-        QueueContainer *reset(size_t insize, char *inptr) {
-                size_ = insize;
-                data_.reset(inptr);
-                return this;
-        }
-
-        size_t  size() {
-                return size_;
-        }
-        dataPtr data() {
-                return data_;
-        }
-};
-#endif  // QUEUECONTAINER_H
diff --git a/snmpagent/ULTRAMONKEY-L7-MIB.txt b/snmpagent/ULTRAMONKEY-L7-MIB.txt
deleted file mode 100644 (file)
index 1c2a20a..0000000
+++ /dev/null
@@ -1,775 +0,0 @@
-ULTRAMONKEY-L7-MIB DEFINITIONS ::= BEGIN
-IMPORTS
-    MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE, enterprises,
-        FROM SNMPv2-SMI
-    DisplayString
-        FROM SNMPv2-TC
-    InetAddress, InetPortNumber
-        FROM INET-ADDRESS-MIB
-;
-
-ultramonkey-l7 MODULE-IDENTITY
-    LAST-UPDATED "0810040000Z"
-    ORGANIZATION "NTT COMWARE"
-    CONTACT-INFO
-    "UltraMonkey-L7 Community
-     URL: http://sourceforge.jp/projects/ultramonkey-l7/"
-    DESCRIPTION
-    "A MIB module for UltraMonkey-L7"
-    ::= { enterprises 60000 }
-
-um7Traps    OBJECT IDENTIFIER ::= { ultramonkey-l7 0 }
-um7Objects  OBJECT IDENTIFIER ::= { ultramonkey-l7 1 }
-
--- Current Data Group
-
-um7CurrentDataGroup  OBJECT IDENTIFIER ::= { um7Objects 1 }
-
-    um7VirtualServiceTable OBJECT-TYPE
-        SYNTAX      SEQUENCE OF Um7VirtualServiceEntry
-        MAX-ACCESS  not-accessible
-        STATUS      current
-        DESCRIPTION
-        "The table of Virtual Service data."
-        ::= { um7CurrentDataGroup 1 }
-   
-    um7VirtualServiceEntry OBJECT-TYPE
-        SYNTAX     Um7VirtualServiceEntry
-        MAX-ACCESS not-accessible
-        STATUS     current
-        DESCRIPTION
-        "The information about one Virtual Service data."
-        INDEX { um7VSIndex }
-        ::= { um7VirtualServiceTable 1 }
-   
-    Um7VirtualServiceEntry ::= SEQUENCE {
-        um7VSIndex              INTEGER (1..127),
-        um7VSProtocol           INTEGER { tcp(1), udp(2) },
-        um7VSIPAddress          InetAddress,
-        um7VSPortNumber         InetPortNumber,
-        um7VSScheduleModule     DisplayString,
-        um7VSProtocolModule     DisplayString,
-        um7VSProtoModOption     DisplayString,
-        um7VSReschedule         INTEGER { on(1), off(2) },
-        um7VSSorryIpAddress     InetAddress,
-        um7VSSorryPortNumber    InetPortNumber,
-        um7VSSorryThreshold     INTEGER (0..2147483647),
-        um7VSSorryForceFlag     INTEGER { on(1), off(2) },
-        um7VSQoSThresholdUp     INTEGER (0..18446744073709551615),
-        um7VSQoSThresholdDown   INTEGER (0..18446744073709551615),
-        um7VSThroughputUp       INTEGER (0..18446744073709551615),
-        um7VSThroughputDown     INTEGER (0..18446744073709551615)
-    }
-   
-    um7VSIndex OBJECT-TYPE
-        SYNTAX      INTEGER (1..127)
-        MAX-ACCESS  not-accessible
-        STATUS      current
-        DESCRIPTION
-        "The data index of Virtual Service."
-        ::= { um7VirtualServiceEntry 1 }
-
-    um7VSProtocol OBJECT-TYPE
-        SYNTAX      INTEGER {
-                        tcp(1),
-                        udp(2)
-                    }
-        MAX-ACCESS read-only
-        STATUS     current
-        DESCRIPTION
-        "Protocol id of Virtual Service."
-        ::= { um7VirtualServiceEntry 2 }
-
-    um7VSIPAddress  OBJECT-TYPE
-        SYNTAX      InetAddress
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "IP address of Virtual Service."
-        ::= { um7VirtualServiceEntry 3 }
-
-    um7VSPortNumber OBJECT-TYPE
-        SYNTAX      InetPortNumber
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Port number of Virtual Service."
-        ::= { um7VirtualServiceEntry 4 }
-
-    um7VSScheduleModule OBJECT-TYPE
-        SYNTAX      DisplayString
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Schedule module of Virtual Service."
-        ::= { um7VirtualServiceEntry 5 }
-
-    um7VSProtocolModule OBJECT-TYPE
-        SYNTAX      DisplayString
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Protocol module of Virtual Service."
-        ::= { um7VirtualServiceEntry 6 }
-
-    um7VSProtocolModuleOption OBJECT-TYPE
-        SYNTAX      DisplayString
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Protocol module option of Virtual Service."
-        ::= { um7VirtualServiceEntry 7 }
-
-    um7VSReschedule OBJECT-TYPE
-        SYNTAX      INTEGER {
-                        on(1),
-                        off(2)
-                    }
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Protocol module reschedule flag of Virtual Service."
-        ::= { um7VirtualServiceEntry 8 }
-
-    um7VSSorryIpAddress OBJECT-TYPE
-        SYNTAX      InetAddress
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "IP address of sorry server."
-        ::= { um7VirtualServiceEntry 9 }
-
-    um7VSSorryPortNumber OBJECT-TYPE
-        SYNTAX      InetPortNumber
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Port number of sorry server."
-        ::= { um7VirtualServiceEntry 10 }
-
-    um7VSSorryThreshold OBJECT-TYPE
-        SYNTAX      INTEGER (0..2147483647)
-        UNITS        "Connections"
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Connection threshold of sorry server."
-        ::= { um7VirtualServiceEntry 11 }
-
-    um7VSSorryForceFlag OBJECT-TYPE
-        SYNTAX      INTEGER {
-                        on(1),
-                        off(2)
-                    }
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Force flag of sorry server."
-        ::= { um7VirtualServiceEntry 12 }
-
-    um7VSQoSThresholdUp OBJECT-TYPE
-        SYNTAX      INTEGER (0..18446744073709551615)
-        UNITS        "bps"
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "QoS threshold of up stream."
-        ::= { um7VirtualServiceEntry 13 }
-
-    um7VSQoSThresholdDown OBJECT-TYPE
-        SYNTAX      INTEGER (0..18446744073709551615)
-        UNITS        "bps"
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "QoS threshold of down stream."
-        ::= { um7VirtualServiceEntry 14 }
-
-    um7VSThroughputUp OBJECT-TYPE
-        SYNTAX      INTEGER (0..18446744073709551615)
-        UNITS        "bps"
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Current throughput of up stream."
-        ::= { um7VirtualServiceEntry 15 }
-
-    um7VSThroughputDown OBJECT-TYPE
-        SYNTAX      INTEGER (0..18446744073709551615)
-        UNITS        "bps"
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Current throughput of down stream."
-        ::= { um7VirtualServiceEntry 16 }
-
-    um7RealServerTable OBJECT-TYPE
-        SYNTAX      SEQUENCE OF Um7RealServerEntry
-        MAX-ACCESS  not-accessible
-        STATUS      current
-        DESCRIPTION
-        "The table of Real Server data."
-        ::= { um7CurrentDataGroup 2 }
-   
-    um7RealServerEntry OBJECT-TYPE
-        SYNTAX     Um7RealServerEntry
-        MAX-ACCESS not-accessible
-        STATUS     current
-        DESCRIPTION
-        "The information about one Real Server data."
-        INDEX { um7RSIndex }
-        ::= { um7RealServerTable 1 }
-   
-    Um7RealServerEntry ::= SEQUENCE {
-        um7RSIndex                  INTEGER (1..65535)
-        um7RSVirtualServiceIndex    INTEGER (1..127)
-        um7RSIPAddress              InetAddress
-        um7RSPortNumber             InetPortNumber
-        um7RSForwardMode            INTEGER { masq(1) }
-        um7RSWeight                 INTEGER (0..2147483647)
-        um7RSActiveConn             INTEGER (0..2147483647)
-        um7RSInactiveConn           INTEGER (0..2147483647)
-    }
-   
-    um7RSIndex OBJECT-TYPE
-        SYNTAX      INTEGER (1..65535)
-        MAX-ACCESS  not-accessible
-        STATUS      current
-        DESCRIPTION
-        "The data index of Real Server."
-        ::= { um7RealServerEntry 1 }
-
-    um7RSVirtualServiceIndex OBJECT-TYPE
-        SYNTAX      INTEGER(1..127)
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Virtual Service index of Real Server."
-        ::= { um7RealServerEntry 2 }
-
-    um7RSIPAddress OBJECT-TYPE
-        SYNTAX      InetAddress
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "IP address of Real Server."
-        ::= { um7RealServerEntry 3 }
-
-    um7RSPortNumber OBJECT-TYPE
-        SYNTAX      InetPortNumber
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Port number of Real Server."
-        ::= { um7RealServerEntry 4 }
-
-    um7RSForwardMode OBJECT-TYPE
-        SYNTAX      INTEGER { masq(1) }
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Forward mode of Real Server."
-        ::= { um7RealServerEntry 5 }
-
-    um7RSWeight OBJECT-TYPE
-        SYNTAX      INTEGER (0..2147483647)
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Weight of Real Server."
-        ::= { um7RealServerEntry 6 }
-
-    um7RSActiveConn OBJECT-TYPE
-        SYNTAX      INTEGER (0..2147483647)
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Active connections of Real Server."
-        ::= { um7RealServerEntry 7 }
-
-    um7RSInactiveConn OBJECT-TYPE
-        SYNTAX      INTEGER (0..2147483647)
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Inactive connections of Real Server."
-        ::= { um7RealServerEntry 8 }
-
-um7LogLevel             OBJECT IDENTIFIER ::= { um7CurrentDataGroup 3 }
-um7LogLevelL7vsd        OBJECT IDENTIFIER ::= { um7LogLevel 1 }
-um7LogLevelL7vsadm      OBJECT IDENTIFIER ::= { um7LogLevel 2 }
-um7LogLevelSnmpAgent    OBJECT IDENTIFIER ::= { um7LogLevel 3 }
-
-Um7LogLevel ::= INTEGER {
-    unknown(0),
-    debug(1),
-    info(2),
-    warn(3),
-    error(4),
-    fatal(5)
-}
-
-    um7LogVsdNetwork OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd network."
-        ::= { um7LogLevelL7vsd 1 }
-
-    um7LogVsdNetworkBandwidth OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd network bandwidth."
-        ::= { um7LogLevelL7vsd 2 }
-
-    um7LogVsdNetworkNumConnection OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd network num connection."
-        ::= { um7LogLevelL7vsd 3 }
-
-    um7LogVsdNetworkQoS OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd network QoS."
-        ::= { um7LogLevelL7vsd 4 }
-
-    um7LogVsdVirtualService OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd Virtual Service."
-        ::= { um7LogLevelL7vsd 5 }
-
-    um7LogVsdRealServer OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd Real Server."
-        ::= { um7LogLevelL7vsd 6 }
-
-    um7LogVsdRealServerBalancing OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd Real Server balancing."
-        ::= { um7LogLevelL7vsd 7 }
-
-    um7LogVsdSorryServer OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd Sorry Server."
-        ::= { um7LogLevelL7vsd 8 }
-
-    um7LogVsdReplication OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd replication."
-        ::= { um7LogLevelL7vsd 9 }
-
-    um7LogVsdStartStop OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd start stop."
-        ::= { um7LogLevelL7vsd 10 }
-
-    um7LogVsdSystem OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd system."
-        ::= { um7LogLevelL7vsd 11 }
-
-    um7LogVsdSystemMemory OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd system memory."
-        ::= { um7LogLevelL7vsd 12 }
-
-    um7LogVsdSystemSocket OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd system socket."
-        ::= { um7LogLevelL7vsd 13 }
-
-    um7LogVsdSystemSignal OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd system signal."
-        ::= { um7LogLevelL7vsd 14 }
-
-    um7LogVsdEnvironment OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd environment."
-        ::= { um7LogLevelL7vsd 15 }
-
-    um7LogVsdEnvironmentParameter OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd environment parameter."
-        ::= { um7LogLevelL7vsd 16 }
-
-    um7LogVsdLogger OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd logger."
-        ::= { um7LogLevelL7vsd 17 }
-
-    um7LogVsdParameter OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd parameter."
-        ::= { um7LogLevelL7vsd 18 }
-
-    um7LogVsdEvent OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd event."
-        ::= { um7LogLevelL7vsd 19 }
-
-    um7LogVsdSchedule OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd schedule."
-        ::= { um7LogLevelL7vsd 20 }
-
-    um7LogVsdProgram OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd program."
-        ::= { um7LogLevelL7vsd 21 }
-
-    um7LogVsdProtocol OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd protocol."
-        ::= { um7LogLevelL7vsd 22 }
-
-    um7LogVsdModule OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsd module."
-        ::= { um7LogLevelL7vsd 23 }
-
-    um7LogVsadmParse OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsadm parse."
-        ::= { um7LogLevelL7vsadm 1 }
-
-    um7LogVsadmOperate OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsadm operate."
-        ::= { um7LogLevelL7vsadm 2 }
-
-    um7LogVsadmCommunicate OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsadm communicate."
-        ::= { um7LogLevelL7vsadm 3 }
-
-    um7LogVsadmConfigResult OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsadm config result."
-        ::= { um7LogLevelL7vsadm 4 }
-
-    um7LogVsadmCommon OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsadm common."
-        ::= { um7LogLevelL7vsadm 5 }
-
-    um7LogVsadmLogger OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsadm logger."
-        ::= { um7LogLevelL7vsadm 6 }
-
-    um7LogVsadmParameter OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsadm parameter."
-        ::= { um7LogLevelL7vsadm 7 }
-
-    um7LogVsadmProtocol OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsadm protocol."
-        ::= { um7LogLevelL7vsadm 8 }
-
-    um7LogVsadmModule OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7vsadm module."
-        ::= { um7LogLevelL7vsadm 9 }
-
-    um7LogSnmpStartStop OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7snmpagent start stop."
-        ::= { um7LogLevelSnmpAgent 1 }
-
-    um7LogSnmpManagerReceive OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7snmpagent manager-receive."
-        ::= { um7LogLevelSnmpAgent 2 }
-
-    um7LogSnmpManagerSend OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7snmpagent manager-send."
-        ::= { um7LogLevelSnmpAgent 3 }
-
-    um7LogSnmpL7vsdReceive OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7snmpagent l7vsd-receive"
-        ::= { um7LogLevelSnmpAgent 4 }
-
-    um7LogSnmpL7vsdSend OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7snmpagent l7vsd-send"
-        ::= { um7LogLevelSnmpAgent 5 }
-
-    um7LogSnmpLogger OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7snmpagent logger"
-        ::= { um7LogLevelSnmpAgent 6 }
-
-    um7LogSnmpParameter OBJECT-TYPE
-        SYNTAX      Um7LogLevel
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Log Level of l7snmpagent parameter"
-        ::= { um7LogLevelSnmpAgent 7 }
-
-um7Status       OBJECT IDENTIFIER ::= { um7CurrentDataGroup 4 }
-
-    um7StatMessage OBJECT-TYPE
-        SYNTAX      DisplayString
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Status message of l7vsd."
-        ::= { um7Status 1 }
-
-    um7StatReplication OBJECT-TYPE
-        SYNTAX      INTEGER {
-                        out(1),
-                        single(2),
-                        master(3),
-                        slave(4),
-                        masterstop(5),
-                        slavestop(6)
-                    }
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Status of replication."
-        ::= { um7Status 2 }
-
-    um7StatSnmpAgent OBJECT-TYPE
-        SYNTAX      INTEGER {
-                        unknown(0),
-                        disconnect(1),
-                        connect(2)
-                    }
-        MAX-ACCESS  read-only
-        STATUS      current
-        DESCRIPTION
-        "Status of l7snmpagent."
-        ::= { um7Status 3 }
-
--- Traps
-
-    um7StateAlert  NOTIFICATION-TYPE
-        OBJECTS { um7StatSnmpAgent, um7StatReplication }  
-        STATUS  current
-        DESCRIPTION
-        "Trap of process status change."
-        ::= { um7Traps 1 }
-
-    um7VirtualServiceAlert  NOTIFICATION-TYPE
-        OBJECTS { um7VirtualServiceTable, um7RealServerTable }  
-        STATUS  current
-        DESCRIPTION
-        "Trap of Virtual Service change."
-        ::= { um7Traps 2 }
-
-    um7ReplicationAlert  NOTIFICATION-TYPE
-        OBJECTS { um7StatMessage }
-        STATUS  current
-        DESCRIPTION
-        "Trap of replication command execution."
-        ::= { um7Traps 3 }
-
-    um7LogLevelAlert  NOTIFICATION-TYPE
-        OBJECTS { um7LogLevel }  
-        STATUS  current
-        DESCRIPTION
-        "Trap of log level change."
-        ::= { um7Traps 4 }
-
-    um7QoSAlarmOn  NOTIFICATION-TYPE
-        OBJECTS { um7VSQoSThresholdUp, um7VSQoSThresholdDown, um7VSThroughputUp, um7VSThroughputDown }
-        STATUS  current
-        DESCRIPTION
-        "Trap of throughput over QoS threshold."
-        ::= { um7Traps 5 }
-
-    um7QoSAlarmOff  NOTIFICATION-TYPE
-        OBJECTS { um7VSQoSThresholdUp, um7VSQoSThresholdDown, um7VSThroughputUp, um7VSThroughputDown }
-        STATUS  current
-        DESCRIPTION
-        "Trap of throughput under QoS threshold."
-        ::= { um7Traps 6 }
-
-    um7MessageAlert  NOTIFICATION-TYPE
-        OBJECTS { um7StatMessage }
-        STATUS  current
-        DESCRIPTION
-        "Trap of some message."
-        ::= { um7Traps 7 }
-
-
--- conformance information
-
-um7MIBConformance OBJECT IDENTIFIER ::= { ultramonkey-l7 2 }
-um7MIBCompliances OBJECT IDENTIFIER ::= { um7MIBConformance 1 }
-um7MIBGroups      OBJECT IDENTIFIER ::= { um7MIBConformance 2 }
-
-
--- compliance statements
-
-um7MIBCompliance MODULE-COMPLIANCE
-    STATUS  current
-    DESCRIPTION
-    "The compliance statement for UltraMonkey-L7."
-    MODULE  -- this module
-
-    MANDATORY-GROUPS { um7MIBGroup, um7TrapGroup }
-    ::= { um7MIBCompliances 1 }
-
--- units of conformance
-
-um7MIBGroup OBJECT-GROUP
-    OBJECTS   { um7VSIndex, um7VSProtocol, um7VSIPAddress, 
-                um7VSPortNumber, um7VSScheduleModule, um7VSProtocolModule,
-                um7VSProtocolModuleOption, um7VSReschedule, um7VSSorryIpAddress,
-                um7VSSorryThreshold, um7VSSorryForceFlag, um7VSQoSThresholdUp,
-                um7VSQoSThresholdDown, um7VSThroughputUp, um7VSThroughputDown,
-                um7RSIndex, um7RSVirtualServiceIndex, um7RSIPAddress,
-                um7RSPortNumber, um7RSForwardMode, um7RSWeight,
-                um7RSActiveConn, um7RSInactiveConn, um7LogVsdNetwork,
-                um7LogVsdNetworkBandwidth, um7LogVsdNetworkNumConnection,
-                um7LogVsdNetworkQoS, um7LogVsdVirtualService,
-                um7LogVsdRealServer, um7LogVsdRealServerBalancing,
-                um7LogVsdSorryServer, um7LogVsdReplication,
-                um7LogVsdStartStop, um7LogVsdSystem, um7LogVsdSystemMemory,
-                um7LogVsdSystemSocket, um7LogVsdSystemSignal,
-                um7LogVsdEnvironment, um7LogVsdEnvironmentParameter,
-                um7LogVsdLogger, um7LogVsdParameter, um7LogVsdEvent,
-                um7LogVsdSchedule, um7LogVsdProgram, um7LogVsdProtocol,
-                um7LogVsdModule, um7LogVsadmParse, um7LogVsadmOperate,
-                um7LogVsadmCommunicate, um7LogVsadmConfigResult,
-                um7LogVsadmCommon, um7LogVsadmLogger, um7LogVsadmParameter,
-                um7LogVsadmProtocol, um7LogVsadmModule, um7LogSnmpStartStop,
-                um7LogSnmpManagerReceive, um7LogSnmpManagerSend,
-                um7LogSnmpL7vsdReceive, um7LogSnmpL7vsdSend,
-                um7LogSnmpLogger, um7LogSnmpParameter, um7StatSnmpAgent,
-                um7StatReplication }
-    STATUS    current
-    DESCRIPTION
-    "The MIB group of objects providing for management of UltraMonkey-L7."
-    ::= { um7MIBGroups 1 }
-
-um7TrapGroup NOTIFICATION-GROUP
-    NOTIFICATIONS { um7StateAlert, um7VirtualServiceAlert,
-                    um7ReplicationAlert, um7LogLevelAlert,
-                    um7QoSAlarmOn, um7QoSAlarmOff,
-                    um7MessageAlert }
-    STATUS  current
-    DESCRIPTION
-    "The notifications group for UltraMonkey-L7."
-    ::= { um7MIBGroups 2 }
-
-END
-
diff --git a/snmpagent/UML7MIB.txt b/snmpagent/UML7MIB.txt
deleted file mode 100644 (file)
index b0237b4..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-UML7-MIB DEFINITIONS ::= BEGIN
-IMPORTS
-       OBJECT-TYPE, MODULE-IDENTITY, enterprises FROM SNMPv2-SMI
-
-       TEXTUAL-CONVENTION, DisplayString FROM SNMPv2-TC;
-
-UltraMonkeyL7  MODULE-IDENTITY
-       LAST-UPDATED    "200801150000Z"
-       ORGANIZATION    "UltraMonkey-L7"
-       CONTACT-INFO    "email: ultramonkey-l7-users@lists.sourceforge.jp"
-       DESCRIPTION     "Defines the MIBs that would be used for L7VS SNMP and for process monitoring of UltraMonkey-L7."
-       ::= { enterprises 60000 }
-
-l7vsd MODULE-IDENTITY
-        LAST-UPDATED "200801020000Z"
-        ORGANIZATION "L7VS"
-        CONTACT-INFO    "Email: ultramonkey-l7-users@lists.sourceforge.jp"
-        DESCRIPTION     "L7VS MIB"
-        ::= { UltraMonkeyL7 1 }
-
-l7vsTraps       OBJECT IDENTIFIER ::= { l7vsd 0 }
-l7vsInfo        OBJECT IDENTIFIER ::= { l7vsd 1 }
-
-l7vsError       NOTIFICATION-TYPE
-        SYNTAX  DisplayString
-        MAX-ACCESS      read-only
-        STATUS  current
-        DESCRIPTION
-        "L7VS Error Status"
-        ::= { l7vsTraps 1 }
-
-
-NumberVS     OBJECT-TYPE
-        SYNTAX  INTEGER
-        MAX-ACCESS      read-only
-        STATUS  current
-        DESCRIPTION
-       "This value is number of VirtualService."
-        ::= { l7vsInfo 1 }
-
-TableVS                OBJECT-TYPE
-       SYNTAX  SEQUENCE OF ENTRYVS
-       MAX-ACCESS not-accessible
-       STATUS  current
-       ::= { l7vsInfo 2 }
-
-EntryVS                OBJECT-TYPE
-       SYNTAX  ENTRYVS
-       MAX-ACCESS not-accessible
-       STATUS  current
-       INDEX { IndexVS }
-       ::= { TableVS 1 }
-
-ENTRYVS        ::= SEQUENCE {
-       IndexVS INTEGER(0..500)
-       Addr    DisplayString
-       Port    INTEGER(0..70000)
-       ScheduleModuleName      DisplayString
-}
-
-IndexVS                OBJECT-TYPE
-       SYNTAX  INTEGER(0..500)
-       MAX-ACCESS read-only
-       STATUS  current
-       ::= { EntryVS 1 }
-
-Addr           OBJECT-TYPE
-       SYNTAX  DisplayString
-       MAX-ACCESS read-only
-       STATUS  current
-       ::= { EntryVS 2 }
-
-Port           OBJECT-TYPE
-       SYNTAX  INTEGER(0..70000)
-       MAX-ACCESS read-only
-       STATUS  current
-       ::= { EntryVS 3 }
-
-ScheduleModuleName     OBJECT-TYPE
-       SYNTAX  DisplayString
-       MAX-ACCESS read-only
-       STATUS  current
-       ::= { EntryVS 4 }
-
-END
diff --git a/snmpagent/UltraMonkeyL7.c b/snmpagent/UltraMonkeyL7.c
deleted file mode 100644 (file)
index 8eec25c..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Note: this file originally auto-generated by mib2c using
- *        : mib2c.notify.conf,v 5.3 2004/04/15 12:29:19 dts12 Exp $
- */
-
-#include <net-snmp/net-snmp-config.h>
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-#include "UltraMonkeyL7.h"
-
-static oid      snmptrap_oid[] = { 1, 3, 6, 1, 6, 3, 1, 1, 4, 1, 0 };
-
-int
-send_l7vsError_trap(void)
-{
-        netsnmp_variable_list *var_list = NULL;
-        oid             l7vsError_oid[] = { 1, 3, 6, 1, 4, 1, 60000, 1, 0, 1 };
-
-        /*
-         * Set the snmpTrapOid.0 value
-         */
-        snmp_varlist_add_variable(&var_list,
-                                  snmptrap_oid, OID_LENGTH(snmptrap_oid),
-                                  ASN_OBJECT_ID,
-                                  l7vsError_oid, sizeof(l7vsError_oid));
-
-
-        /*
-         * Add any extra (optional) objects here
-         */
-
-        /*
-         * Send the trap to the list of configured destinations
-         *  and clean up
-         */
-        send_v2trap(var_list);
-        snmp_free_varbind(var_list);
-
-        return SNMP_ERR_NOERROR;
-}
diff --git a/snmpagent/UltraMonkeyL7.h b/snmpagent/UltraMonkeyL7.h
deleted file mode 100644 (file)
index ea3e7d5..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Note: this file originally auto-generated by mib2c using
- *        : mib2c.notify.conf,v 5.3 2004/04/15 12:29:19 dts12 Exp $
- */
-#ifndef ULTRAMONKEYL7_H
-#define ULTRAMONKEYL7_H
-
-/*
- * function declarations
- */
-int             send_l7vsError_trap(void);
-
-#endif                          /* ULTRAMONKEYL7_H */
diff --git a/snmpagent/dispatch_message.cpp b/snmpagent/dispatch_message.cpp
deleted file mode 100644 (file)
index 63d114e..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#include "dispatch_message.h"
-
-
-l7ag_dispatch_message::l7ag_dispatch_message()
-{
-
-
-}
-
-
-l7ag_dispatch_message::~l7ag_dispatch_message()
-{
-
-
-}
-
-
-void    l7ag_dispatch_message::add_message(std::string in_msg)
-{
-
-
-}
-
-
-void    l7ag_dispatch_message::do_dispatch()
-{
-
-
-}
-
diff --git a/snmpagent/dispatch_message.h b/snmpagent/dispatch_message.h
deleted file mode 100644 (file)
index ea818f6..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef __L7AG_DISPATCH_MESSAGE_H__
-#define __L7AG_DISPATCH_MESSAGE_H__
-
-#include <string>
-
-#include "proc_mibcollectmessage.h"
-#include "proc_trapsendrequest.h"
-#include "proc_settingrequest.h"
-
-
-class    l7ag_dispatch_message
-{
-protected:
-
-private:
-        std::string    message;
-public:
-        l7ag_dispatch_message();
-        ~l7ag_dispatch_message();
-
-        void    add_message(std::string in_msg);
-        void    do_dispatch();
-};
-
-#endif //__L7AG_DISPATCH_MESSAGE_H__
diff --git a/snmpagent/dispatcher.cpp b/snmpagent/dispatcher.cpp
deleted file mode 100644 (file)
index 264b4e3..0000000
+++ /dev/null
@@ -1,304 +0,0 @@
-//
-//!    @file    dispaatcher.cpp
-//!    @brief    snmpagent - l7vsd message dispatcher
-//
-//    Copyright (C) 2008  NTT COMWARE Corporation.
-//
-//    Distributed under the Boost Software License, Version 1.0. (See accompanying
-//    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-#include <sys/time.h>
-#include "dispatcher.h"
-#include "store_mibdata.h"
-
-#define SLEEPNANOTIME       (1000000)
-#define DISPATCH_LOOP_COUNT (10)
-
-/*!
- *
- */
-l7ag_dispatcher::l7ag_dispatcher()
-{
-        stop_flag   = false;
-        msg_size    = 0;
-        msg         = NULL;
-        message_que = NULL;
-        trap_que    = NULL;
-}
-
-/*!
- *
- */
-l7ag_dispatcher::l7ag_dispatcher(MessageQueue *msgque, TrapQueue *trapque)
-{
-        stop_flag   = false;
-        msg_size    = 0;
-        msg         = NULL;
-        message_que = msgque;
-        trap_que    = trapque;
-}
-
-/*!
- *
- */
-l7ag_dispatcher::~l7ag_dispatcher()
-{
-        if (NULL != msg)free(msg);
-}
-
-/*!
- *
- */
-void*
-l7ag_dispatcher::run(void *args)
-{
-        l7ag_dispatcher *dispatcher = static_cast<l7ag_dispatcher *>(args);
-
-        struct timespec req;
-        req.tv_sec = 0;
-        req.tv_nsec = SLEEPNANOTIME;
-
-        while (!dispatcher->stop_flag) {
-                int ret = nanosleep(&req, NULL);
-                if (ret == -1) {
-                        break; // nanosleep failed
-                }
-                if (!dispatcher->message_que->empty()) {
-                        //まず、取得するための領域確保
-                        if (NULL == dispatcher->msg) {
-                                dispatcher->msg_size = dispatcher->message_que->front().size();
-                                dispatcher->msg      = static_cast<char *>(malloc((sizeof(char) * dispatcher->msg_size)));
-                                memcpy(dispatcher->msg, dispatcher->message_que->front().data().get(), dispatcher->msg_size);
-                        } else {
-                                dispatcher->msg_pos  = dispatcher->msg_size;
-                                dispatcher->msg_size = dispatcher->msg_size + dispatcher->message_que->front().size();
-                                dispatcher->msg      = static_cast<char *>(realloc(dispatcher->msg, (sizeof(char) * dispatcher->msg_size)));
-                                //キューから取得(前に取得しているデータに追加取得)
-                                memcpy(&dispatcher->msg[dispatcher->msg_pos], dispatcher->message_que->front().data().get(), dispatcher->message_que->front().size());
-                        }
-                        //popする
-                        dispatcher->message_que->pop();
-                        //ヘッダのサイズ参照
-                        l7ag_message_header *header;
-                        header = (l7ag_message_header *)dispatcher->msg;
-                        if (header->size <= dispatcher->msg_size) {
-                                //データサイズが十分ならディスパッチ
-                                dispatcher->dispatch_message();
-                                //ディスパッチしたら、あまりデータを前に詰める
-                                //いったんバックアップ
-                                size_t  next_size = dispatcher->msg_size - header->size;
-                                char   *msg_bak   = static_cast<char *>(malloc(sizeof(char) * next_size));
-                                memcpy(msg_bak, &dispatcher->msg[header->size], next_size);
-                                //領域のサイズ変更
-                                dispatcher->msg = static_cast<char *>(realloc(dispatcher->msg, sizeof(char) * next_size));
-                                //リストアする
-                                memcpy(dispatcher->msg, msg_bak, next_size);
-                                dispatcher->msg_size = next_size;
-                                free(msg_bak);
-                        }
-                        //データサイズが足りなければ次回持ち越し
-                } else {
-                        // TODO 複数のキューでたまる速度が遅かった場合消える?
-                        if (NULL != dispatcher->msg) {
-                                free(dispatcher->msg);
-                                dispatcher->msg = NULL;
-                        }
-                }
-        }
-
-        dispatcher->stop_flag = false;
-
-        return NULL;
-}
-
-/*!
- *
- */
-bool
-l7ag_dispatcher::start()
-{
-        bool    retbool = true;
-        if (0 != pthread_create(&dispatch_thread, NULL, run, this)) {
-                retbool = false;
-        }
-        return  retbool;
-}
-
-/*!
- *
- */
-bool
-l7ag_dispatcher::stop()
-{
-        bool    retbool       = true;
-//    void*   thread_return = NULL;
-
-        stop_flag = true;
-        //join
-//    if ( 0 != pthread_join( dispatch_thread, &thread_return ) ) {
-        if (0 != pthread_join(dispatch_thread, NULL)) {
-                //join error
-                retbool = false;
-        }
-        return  retbool;
-}
-
-/*!
- * ディスパッチ入口
- */
-void
-l7ag_dispatcher::dispatch_message()
-{
-        if (dispatch_functions.empty()) {
-                init_dispatcher_function_map();
-        }
-
-        char   *p_message = msg;
-        l7ag_message_header    *msg_header = reinterpret_cast<l7ag_message_header *>(msg);
-        if (msg_header->magic[0] != 0x4d || msg_header->magic[1] != 0x47) return;
-
-        //まず最初のpayload_headerにポインタをずらず
-        p_message = p_message + sizeof(l7ag_message_header);
-
-        for (unsigned long long i = 0; i < msg_header->payload_count; ++i) {
-                //payload_headerとpayloadは1:1
-                //payload_headerのmessage_idでディスパッチ先を決める
-                l7ag_payload_header *payload_header = reinterpret_cast<l7ag_payload_header *>(p_message);
-                if (payload_header->magic[0] != 0x50 || payload_header->magic[1] != 0x59) return;
-                //payloadにポインタをずらす
-                char *payload = p_message + sizeof(l7ag_payload_header);
-
-                std::map< int, boost::function<void(void *)> >::iterator it = dispatch_functions.find(payload_header->message_id);
-                if (dispatch_functions.end() != it) {
-                        it->second(payload);
-                }
-                //次のデータにポインタをずらす
-                p_message = p_message + payload_header->payload_datasize;
-        }
-}
-
-/*!
- * 設定コマンド
- */
-void
-l7ag_dispatcher::process_setting_command(void *p_data)
-{
-        l7ag_settingcommand_message *command = (l7ag_settingcommand_message *)p_data;
-        //コマンド種別をみる
-        if (COMMAND_LOGLEVEL_CHANGE == command->command_id) {
-                //ログレベル変更
-                l7ag_changeloglevel_parameter  *param = reinterpret_cast<l7ag_changeloglevel_parameter *>(&command->data[0]);
-                change_loglevel(param->log_category, param->log_level);
-        } else if (COMMAND_SETTINGFILE_RELOAD == command->command_id) {
-                //設定ファイル再読み込み
-                reload_configure();
-        }
-}
-
-/*!
- * Trap送信リクエスト
- */
-void
-l7ag_dispatcher::process_trap_request(void *p_data)
-{
-        l7ag_traprequest_message *command = (l7ag_traprequest_message *)p_data;
-        trapdata    trap_req;
-        //OIDを取得
-        char *data_oid = static_cast<char *>(calloc((OIDDATASIZE + 1), sizeof(char)));
-        memcpy(data_oid, command->oid, OIDDATASIZE);
-        trap_req.oid   = data_oid;
-        //messageを取得
-        char *data_msg = static_cast<char *>(calloc((TRAPREQUESTMESSAGESIZE + 1), sizeof(char)));
-        memcpy(data_msg, command->message, TRAPREQUESTMESSAGESIZE);
-        trap_req.message = data_msg;
-        trap_que->push(trap_req);
-}
-
-/*!
- * MIBデータ収集結果(VirtualService)
- */
-void
-l7ag_dispatcher::process_mib_collect_response_vs(void *p_data)
-{
-        bool    writeflag = false;
-        l7ag_mibdata_payload_vs *command = (l7ag_mibdata_payload_vs *)p_data;
-        if (command->magic[0] != 0x56 || command->magic[1] != 0x53) return;
-        if (command->vs_count > 0) {
-                int vscount = l7ag_store_mibdata::getInstance().getVSdatacount();
-                for (int i = 0; i < vscount; ++i) {
-                        if (l7ag_store_mibdata::getInstance().getVSmibdata(i)->index == command->index) {
-                                l7ag_store_mibdata::getInstance().updateVSmibdata(i, command);
-                                writeflag = true;
-                        }
-                }
-                if (!writeflag) {
-                        l7ag_store_mibdata::getInstance().addVSmibdata(command);
-                }
-                if (command->index == command->vs_count) {
-                        // delete other index
-                        l7ag_store_mibdata::getInstance().updateVSmibdata(command->vs_count, NULL);
-                }
-        } else {
-                l7ag_store_mibdata::getInstance().clearVSmibdata();
-        }
-}
-
-/*!
- * MIBデータ収集結果(RealServer)
- */
-void
-l7ag_dispatcher::process_mib_collect_response_rs(void *p_data)
-{
-        bool    writeflag = false;
-        l7ag_mibdata_payload_rs *command = (l7ag_mibdata_payload_rs *)p_data;
-        if (command->magic[0] != 0x52 || command->magic[1] != 0x53) return;
-        if (command->rs_count > 0) {
-                int rscount = l7ag_store_mibdata::getInstance().getRSdatacount();
-                for (int i = 0; i < rscount; ++i) {
-                        if (l7ag_store_mibdata::getInstance().getRSmibdata(i)->index == command->index) {
-                                l7ag_store_mibdata::getInstance().updateRSmibdata(i, command);
-                                writeflag = true;
-                        }
-                }
-                if (!writeflag) {
-                        l7ag_store_mibdata::getInstance().addRSmibdata(command);
-                }
-                if (command->index == command->rs_count) {
-                        // delete other index
-                        l7ag_store_mibdata::getInstance().updateRSmibdata(command->rs_count, NULL);
-                }
-        } else {
-                l7ag_store_mibdata::getInstance().clearRSmibdata();
-        }
-}
-
-/*!
- *
- */
-void
-l7ag_dispatcher::change_loglevel(unsigned long long category, unsigned long long loglevel)
-{
-        l7vs::Logger    logger;
-        logger.setLogLevel(static_cast<l7vs::LOG_CATEGORY_TAG>(category), static_cast<l7vs::LOG_LEVEL_TAG>(loglevel));
-}
-
-/*!
- *
- */
-void
-l7ag_dispatcher::reload_configure()
-{
-        l7vs::Parameter        parameter;
-        parameter.read_file(l7vs::PARAM_COMP_SNMPAGENT);
-}
-
-void
-l7ag_dispatcher::init_dispatcher_function_map()
-{
-        dispatch_functions.clear();
-
-        dispatch_functions[MESSAGE_ID_COMMANDREQUEST]        = boost::bind(&l7ag_dispatcher::process_setting_command, this, _1);
-        dispatch_functions[MESSAGE_ID_TRAPREQUEST]           = boost::bind(&l7ag_dispatcher::process_trap_request, this, _1);
-        dispatch_functions[MESSAGE_ID_MIBCOLLECTRESPONSE_VS] = boost::bind(&l7ag_dispatcher::process_mib_collect_response_vs, this, _1);
-        dispatch_functions[MESSAGE_ID_MIBCOLLECTRESPONSE_RS] = boost::bind(&l7ag_dispatcher::process_mib_collect_response_rs, this, _1);
-}
diff --git a/snmpagent/dispatcher.h b/snmpagent/dispatcher.h
deleted file mode 100644 (file)
index 7aa9efe..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-//!    @file    dispatcher.h
-//!    @brief    snmpagent dispatch header
-//
-//    Copyright (C) 2008  NTT COMWARE Corporation.
-//
-//    Distributed under the Boost Software License, Version 1.0. (See accompanying
-//    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef L7AG_DISPATCHER_H
-#define L7AG_DISPATCHER_H
-
-#include <map>
-#include <string>
-#include "lockedqueue.h"
-#include "QueueContainer.h"
-#include "trapdata.h"
-#include "parameter.h"
-#include "logger.h"
-#include "message.h"
-#include <boost/function.hpp>
-#include <boost/bind.hpp>
-
-//! messagequeue typedef
-typedef lockedqueue<QueueContainer> MessageQueue;
-//! lockqueue typedef
-typedef lockedqueue<trapdata>       TrapQueue;
-
-//
-//! @class    l7ag_dispatcher
-//!    @brief    message dispatch class
-class l7ag_dispatcher
-{
-
-private:
-        bool        stop_flag;            //! stopping flag
-        pthread_t   dispatch_thread;    //!    dispatch thread id
-
-        MessageQueue   *message_que;    //! message queue object pointer
-        TrapQueue      *trap_que;        //!    trap queue object pointer
-
-        size_t  msg_size;                //! message size
-        char   *msg;                    //! message pointer
-        size_t  msg_pos;                //! message posision
-
-        std::map< int, boost::function<void (void *)> > dispatch_functions;
-
-        l7ag_dispatcher();
-
-protected:
-        static void *run(void *);
-
-        void dispatch_message();
-        void process_setting_command(void *);
-        void process_trap_request(void *);
-        void process_mib_collect_response_vs(void *);
-        void process_mib_collect_response_rs(void *);
-
-        void change_loglevel(unsigned long long , unsigned long long);
-        void reload_configure();
-        void init_dispatcher_function_map();
-
-public:
-        l7ag_dispatcher(MessageQueue *, TrapQueue *);
-        ~l7ag_dispatcher();
-
-        bool start();
-        bool stop();
-
-        MessageQueue   *get_MessageQueue() {
-                return message_que;
-        }
-        TrapQueue      *get_TrapQueue() {
-                return trap_que;
-        }
-};
-
-#endif //__L7AG_DISPATCHER_H__
-
diff --git a/snmpagent/interproccom.cpp b/snmpagent/interproccom.cpp
deleted file mode 100644 (file)
index e232fc8..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-
-#include "interproccom.h"
-#include "subagent.h"
-
-
-#define SCOPED_LOCK(m)                                                  \
-  pthread_mutex_lock(&m); /* エラー処理は略 */                          \
-  void u_(pthread_mutex_t** m_) { pthread_mutex_unlock(*m_); }          \
-  __attribute__((__cleanup__(u_))) pthread_mutex_t* scoped_lock_ = &m
-
-
-/*!
- *
- */
-l7ag_interproccommunicate::l7ag_interproccommunicate()
-{
-        status    = STOP;
-        stop_flag = false;
-
-        pthread_mutex_init(&mutex_sbuf, NULL);
-        pthread_mutex_init(&mutex_rbuf, NULL);
-}
-
-
-/*!
- *
- */
-l7ag_interproccommunicate::l7ag_interproccommunicate(l7ag_subagent *p_subagent)
-{
-        status    = STOP;
-        stop_flag = false;
-
-        pthread_mutex_init(&mutex_sbuf, NULL);
-        pthread_mutex_init(&mutex_rbuf, NULL);
-
-        set_parent(p_subagent);
-}
-
-
-/*!
- *
- */
-l7ag_interproccommunicate::~l7ag_interproccommunicate()
-{
-
-
-}
-
-
-/*!
- *
- */
-void
-l7ag_interproccommunicate::start_thread()
-{
-
-
-}
-
-
-/*!
- *
- */
-void
-l7ag_interproccommunicate::send_mibdatacollect(std::string oid)
-{
-        //make request message
-
-}
-
-
-/*!
- *
- */
-void
-l7ag_interproccommunicate::set_parent(l7ag_subagent *p_subagent)
-{
-        parent = p_subagent;
-}
-
-
-/*!
- *
- */
-void *
-l7ag_interproccommunicate::do_communicate(void *args)
-{
-        l7ag_interproccommunicate    *proccom = (l7ag_interproccommunicate *)args;
-        //initialize
-
-        while (1) {
-                //recv
-                //send
-                //stop
-                if (proccom->getStopFlag()) {
-                        //
-                }
-        }
-        //finalize
-}
-
-
-/*!
- *
- */
-void
-l7ag_interproccommunicate::setRequestMessage()
-{
-}
-
diff --git a/snmpagent/interproccom.h b/snmpagent/interproccom.h
deleted file mode 100644 (file)
index ec91454..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef __INTERPROCCOM_H__
-#define __INTERPROCCOM_H__
-
-#include <string>
-#include <pthread.h>
-
-#include "l7ag_socket.h"
-#include "tag_threadstat.h"
-#include "dispatch_message.h"
-#include "store_mibdata.h"
-
-class    l7ag_subagent;
-
-class    l7ag_interproccommunicate : public l7ag_socket
-{
-private:
-        l7ag_subagent     *parent;
-        THREAD_STAT_TAG    status;
-        bool        stop_flag;
-
-        pthread_mutex_t    mutex_sbuf;
-        pthread_mutex_t    mutex_rbuf;
-        char     *buffer_send;
-        char     *buffer_recv;
-
-protected:
-        l7ag_interproccommunicate();
-
-        static    void     *do_communicate(void *args);
-
-public:
-        l7ag_interproccommunicate(l7ag_subagent *p_subagent);
-        ~l7ag_interproccommunicate();
-
-        void    set_parent(l7ag_subagent *p_subagent);
-
-        void    start_thread();
-        void    stop_thread() {
-                stop_flag = true;
-        }
-
-        void    send_mibdatacollect(std::string oid);
-        bool    getStopFlag() {
-                return stop_flag;
-        }
-        void    setRequestMessage();
-};
-
-#endif //__INTERPROCCOM_H__
-
diff --git a/snmpagent/l7ag_parameter.h b/snmpagent/l7ag_parameter.h
deleted file mode 100644 (file)
index 366d1e7..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef    __L7AG_PARAMETER_H__
-#define __L7AG_PARAMETER_H__
-
-#include <string>
-#include <map>
-
-#include "logger.h"
-
-struct    l7ag_parameter {
-        std::string    nic;
-        std::string    address;
-        int        portno;
-        int        interval;
-        int        status;    // TODO remove status
-        std::map<l7vs::LOG_CATEGORY_TAG, l7vs::LOG_LEVEL_TAG>    loglevel;
-};
-
-#endif    //__L7AG_PARAMETER_H__
-
diff --git a/snmpagent/l7ag_socket.cpp b/snmpagent/l7ag_socket.cpp
deleted file mode 100644 (file)
index 22dcebc..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "l7ag_socket.h"
-
-
-/*!
- *
- */
-void    l7ag_socket::connect()
-{
-        //socket
-        //connect
-}
-
-/*!
- *
- */
-void    l7ag_socket::disconnect()
-{
-        //close
-}
-
-/*!
- *
- */
-void    l7ag_socket::send()
-{
-        //send
-}
-
-/*!
- *
- */
-void    l7ag_socket::recv()
-{
-        //recv
-}
-
-
diff --git a/snmpagent/l7ag_socket.h b/snmpagent/l7ag_socket.h
deleted file mode 100644 (file)
index af00d63..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __L7AG_SOCKET_H__
-#define __L7AG_SOCKET_H__
-
-class    l7ag_socket
-{
-private:
-        int    sockfd;
-public:
-        l7ag_socket() {};
-        virtual ~l7ag_socket() {};
-
-        void    connect();
-        void    disconnect();
-        void    send();
-        void    recv();
-};
-
-#endif //__L7AG_SOCKET_H__
diff --git a/snmpagent/l7snmpagent.cpp b/snmpagent/l7snmpagent.cpp
deleted file mode 100644 (file)
index fc032ad..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-#include <signal.h>
-#include <sstream>
-#include <string>
-
-#include "logger.h"
-#include "parameter.h"
-#include "subagent.h"
-
-using namespace l7vs;
-
-l7ag_subagent *subagent;
-
-/*!
- * sig handler
- */
-static void
-handler_sig_exit(int sig)
-{
-        subagent->stop();
-}
-
-/*!
- * setup signal handler
- */
-static int
-set_sighandler(int sig, void (*handler)(int))
-{
-        struct sigaction act;
-        int ret;
-
-        ret = sigaction(sig, NULL, &act);
-        if (ret < 0) {
-                return ret;
-        }
-        act.sa_flags &= ~SA_RESETHAND;
-        act.sa_handler = handler;
-        ret = sigaction(sig, &act, NULL);
-        if (ret < 0) {
-                return ret;
-        }
-        return 0;
-}
-
-/*!
- *esetup all signal handlers
- */
-static int
-set_sighandlers()
-{
-        l7vs::Logger    logger;
-        if (LOG_LV_DEBUG == logger.getLogLevel(l7vs::LOG_CAT_SNMPAGENT_START_STOP)) {
-                std::string debugstr("in_function set_sighandler()");
-                logger.putLogDebug(l7vs::LOG_CAT_SNMPAGENT_START_STOP, 0, debugstr, __FILE__, __LINE__);
-        }
-
-        int ret;
-
-#define SET_SIGHANDLER(sig, handler)                                                                    \
-    do {                                                                                                \
-        ret = set_sighandler((sig), (handler));                                                         \
-        if (ret < 0) {                                                                                  \
-            if (LOG_LV_DEBUG == logger.getLogLevel(l7vs::LOG_CAT_SNMPAGENT_SYSTEM_SIGNAL)) {            \
-                std::ostringstream str; \
-                str << "out_function: static int set_sighandlers(void) return_value: " << ret; \
-                logger.putLogDebug(l7vs::LOG_CAT_SNMPAGENT_SYSTEM_SIGNAL, 0, str.str(), __FILE__, __LINE__ );      \
-            }                                                                                           \
-            return ret;                                                                                 \
-        }                                                                                               \
-    } while (0)
-
-        SET_SIGHANDLER(SIGHUP,  handler_sig_exit);
-        SET_SIGHANDLER(SIGINT,  handler_sig_exit);
-        SET_SIGHANDLER(SIGQUIT, handler_sig_exit);
-        SET_SIGHANDLER(SIGTERM, handler_sig_exit);
-        SET_SIGHANDLER(SIGUSR1, SIG_IGN);
-        SET_SIGHANDLER(SIGUSR2, SIG_IGN);
-        SET_SIGHANDLER(SIGALRM, SIG_IGN);
-        SET_SIGHANDLER(SIGCHLD, SIG_IGN);
-
-#undef SET_SIGHANDLER
-
-        if (LOG_LV_DEBUG == logger.getLogLevel(l7vs::LOG_CAT_SNMPAGENT_START_STOP)) {
-                std::string debugstr("out_function set_sighandler()");
-                logger.putLogDebug(l7vs::LOG_CAT_SNMPAGENT_START_STOP, 0, debugstr, __FILE__, __LINE__);
-        }
-        return 0;
-}
-
-/*!
- * l7snmpagent main
- * @param[in]   argc    number of argument
- * @param[in]   argv    array of argument
- */
-int
-main(int argc, char *argv[])
-{
-        l7vs::Logger    logger;
-        logger.putLogInfo(l7vs::LOG_CAT_SNMPAGENT_START_STOP, 0, "start l7snmpagent", __FILE__, __LINE__);
-
-        if (LOG_LV_DEBUG == logger.getLogLevel(l7vs::LOG_CAT_SNMPAGENT_START_STOP)) {
-                std::string debugstr;
-                // TODO set debugstr
-                logger.putLogDebug(l7vs::LOG_CAT_SNMPAGENT_START_STOP, 0, debugstr, __FILE__, __LINE__);
-        }
-
-        set_sighandlers();
-
-        // TODO whats this comment?
-//  parameter_register_function_pointer();
-
-        subagent = new l7ag_subagent();
-
-        // start subagent
-        if (!subagent->start()) {
-                // TODO error log
-        }
-
-        logger.putLogInfo(l7vs::LOG_CAT_SNMPAGENT_START_STOP, 0, "stop l7snmpagent", __FILE__, __LINE__);
-
-        delete subagent;
-        subagent = NULL;
-        return 0;
-}
-
-// TODO remove unit test code!!!
-int
-l7snmp_main(int argc, char *argv[])
-{
-        return main(argc, argv);
-}
diff --git a/snmpagent/lockedqueue.h b/snmpagent/lockedqueue.h
deleted file mode 100644 (file)
index fa81bf8..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-#ifndef __LOCKEDQUEUE_H__
-#define __LOCKEDQUEUE_H__
-
-#include <queue>
-#include <deque>
-#include <pthread.h>
-
-template < typename T, typename _Seq = std::deque<T> >
-class lockedqueue;
-
-template<typename T, typename _Seq>
-class lockedqueue
-{
-        typedef typename _Seq::value_type   value_type;
-        typedef typename _Seq::reference    reference;
-        typedef typename _Seq::size_type    size_type;
-
-private:
-        pthread_mutex_t     mtx;
-        std::queue<T, _Seq>  que;
-
-protected:
-
-public:
-        lockedqueue() {
-                pthread_mutex_init(&mtx, NULL);
-        }
-        ~lockedqueue() {}
-
-        bool
-        empty() const {
-                return que.empty();
-        }
-
-        size_type
-        size() const {
-                return que.size();
-        }
-
-        reference
-        front() {
-                return que.front();
-        }
-
-        void
-        push(const value_type &_data) {
-                pthread_mutex_lock(&mtx);
-                que.push(_data);
-                pthread_mutex_unlock(&mtx);
-        }
-
-        void
-        pop() {
-                pthread_mutex_lock(&mtx);
-                que.pop();
-                pthread_mutex_unlock(&mtx);
-        }
-
-};
-
-#endif//__LOCKEDQUEUE_H__
-
diff --git a/snmpagent/message.h b/snmpagent/message.h
deleted file mode 100644 (file)
index 3e1bd8e..0000000
+++ /dev/null
@@ -1,193 +0,0 @@
-//
-//!    @file    massage.h
-//!    @brief    snmpagent - l7vsd message header
-//
-//    Copyright (C) 2008  NTT COMWARE Corporation.
-//
-//    Distributed under the Boost Software License, Version 1.0. (See accompanying
-//    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef MESSAGE_H
-#define MESSAGE_H
-
-#define PADDINGSIZE             (1)
-
-#define OIDDATASIZE             (128)    // must 64 multiple number for structure byte offset
-#define COMMANDDATASIZE         (256)
-#define TRAPREQUESTMESSAGESIZE  (64)    // must 64 multiple number for structure byte offset
-#define MIBREQUESTDATASIZE      (64)    // must 64 multiple number for structure byte offset
-#define    L7VS_MODNAME_LEN        (256)    // l7vs.h remove this numeric. define this,
-#define    L7VS_PROTOMOD_OPT_LEN    (512)    // l7vs.h remove this numeric, define this,
-
-//message id definitions(l7vsd to subagent)
-#define MESSAGE_ID_COMMANDREQUEST           (0)
-#define MESSAGE_ID_TRAPREQUEST              (1)
-#define MESSAGE_ID_MIBCOLLECTRESPONSE_VS    (2)
-#define MESSAGE_ID_MIBCOLLECTRESPONSE_RS    (3)
-
-//message id definitions(subagent to l7vsd)
-#define MESSAGE_ID_MIBCOLLECTREQUEST        (100)
-
-//setting command definitions
-#define COMMAND_LOGLEVEL_CHANGE             (0x1)
-#define COMMAND_SETTINGFILE_RELOAD          (0x2)
-
-#define MIBDATA_CATEGORY_VS                 (1)
-#define MIBDATA_CATEGORY_RS                 (2)
-
-#define MAGIC_NUMBER_LENGTH                 (2)
-#define MAGIC_MESSAGE_HEADER                "MG" // 0x4D 0x47
-#define MAGIC_PAYLOAD_HEADER                "PY" // 0x50 0x59
-#define MAGIC_SETTING_COMMAND               "ST" // 0x53 0x54
-#define MAGIC_CHANGE_LOGLEVEL               "LL" // 0x4c 0x4c
-#define MAGIC_TRAP_REQUEST                  "TR" // 0x54 0x52
-#define MAGIC_VIRTUAL_SERVICE               "VS" // 0x56 0x53
-#define MAGIC_REAL_SERVER                   "RS" // 0x52 0x53
-#define MAGIC_MIB_REQUEST                   "RQ" // 0x52 0x51
-
-
-struct  l7ag_message_header {
-        char                magic[MAGIC_NUMBER_LENGTH]; //! Magic number
-        unsigned long long  version;                    //! Version
-        unsigned long long  time;                       //! Created time
-        unsigned long long  size;                       //! Message size
-        unsigned long long  payload_count;              //! Payload count
-};
-
-/*!
- *
- */
-struct  l7ag_payload_header {
-        char                magic[MAGIC_NUMBER_LENGTH]; //! Magic number
-        unsigned long long  message_id;
-        unsigned long long  payload_datasize;
-};
-
-/*
- * log level setting
- */
-struct  l7ag_settingcommand_message {
-        char                magic[MAGIC_NUMBER_LENGTH]; //! Magic number
-        unsigned long long  command_id;                 //! 0 when change log level, 1 when reload config
-        unsigned char       data[COMMANDDATASIZE];      //! command parameter (set category when change log level)
-};
-
-/*!
- * command parameter of change log level
- */
-struct  l7ag_changeloglevel_parameter {
-        char                magic[MAGIC_NUMBER_LENGTH]; //! Magic number
-        unsigned long long  log_category;
-        unsigned long long  log_level;
-};
-
-/*!
- * Request message of Trap
- */
-struct  l7ag_traprequest_message {
-        char    magic[MAGIC_NUMBER_LENGTH];         //! Magic number
-        char    oid[OIDDATASIZE];                   //! OID (must "1.3.6.1.4.1.60000.1.0.2")
-        char    message[TRAPREQUESTMESSAGESIZE];    //! Errno
-};
-
-/*!
- * Message for collect MIB data (VirtualService)
- */
-struct  l7ag_mibdata_payload_vs {
-        char                magic[MAGIC_NUMBER_LENGTH];                     //! Magic number
-        int                 index;                                          //! VirtualService index
-        uint8_t             protocol;                                       //! Protocol
-        uint32_t            ipAddress;                                      //! IP
-        uint16_t            portNumber;                                     //! Port
-        char                scheduleModule[L7VS_MODNAME_LEN];               //! schedule module
-        char                protocolModule[L7VS_MODNAME_LEN];               //! protocol module
-        char                protocolModuleOption[L7VS_PROTOMOD_OPT_LEN];    //! protomod option
-        int                 reschedule;                                     //! reschedule flag
-        uint32_t            sorryIpAddress;                                 //! sorry IP
-        uint16_t            sorryPortNumber;                                //! sorry port
-        int                 sorryThreshold;                                 //! sorry threshold
-        int                 sorryForceFlag;                                 //! sorry flag
-        unsigned long long  QoSThresholdUp;                                 //! QoS Threashold value for up stream
-        unsigned long long  QoSThresholdDown;                               //! QoS Threashold value for down stream
-        unsigned long long  throughputUp;                                   //! Throughput for up stream
-        unsigned long long  throughputDown;                                 //! Throughput for down stream
-        int                 vs_count;                                       //! VirtualService count
-
-        bool    operator==(const l7ag_mibdata_payload_vs &in_data) {
-                if (index == in_data.index) {
-                        return true;
-                } else {
-                        return false;
-                }
-        }
-        l7ag_mibdata_payload_vs &operator=(const l7ag_mibdata_payload_vs &in_data) {
-                index               = in_data.index;
-                protocol            = in_data.protocol;
-                ipAddress           = in_data.ipAddress;
-                strncpy(scheduleModule, in_data.scheduleModule, L7VS_MODNAME_LEN);
-                strncpy(protocolModule, in_data.protocolModule, L7VS_MODNAME_LEN);
-                strncpy(protocolModuleOption, in_data.protocolModuleOption, L7VS_PROTOMOD_OPT_LEN);
-                reschedule          = in_data.reschedule;
-                sorryIpAddress      = in_data.sorryIpAddress;
-                sorryPortNumber     = in_data.sorryPortNumber;
-                sorryThreshold      = in_data.sorryThreshold;
-                sorryForceFlag      = in_data.sorryForceFlag;
-                QoSThresholdUp      = in_data.QoSThresholdUp;
-                QoSThresholdDown    = in_data.QoSThresholdDown;
-                throughputUp        = in_data.throughputUp;
-                throughputDown      = in_data.throughputDown;
-                vs_count            = in_data.vs_count;
-
-                return *this;
-        }
-};
-
-
-/*!
- * Message for collect MIB data (RealServer)
- */
-struct  l7ag_mibdata_payload_rs {
-        char                magic[MAGIC_NUMBER_LENGTH]; //! Magic number
-        int                 index;                      //! RealServer index
-        int                 virtualServiceIndex;        //! Relation VirtualService index
-        uint32_t            ipAddress;                  //! IP
-        uint16_t            portNumber;                 //! Port
-        int                 forwardMode;                //! forward mode
-        unsigned long long  weight;                     //! weight
-        unsigned long long  activeConn;                 //! active connection
-        unsigned long long  inactiveConn;               //! inactive connection
-        int                 rs_count;
-
-        bool    operator==(const l7ag_mibdata_payload_rs &in_data) {
-                if (index == in_data.index) {
-                        return true;
-                } else {
-                        return false;
-                }
-        }
-        l7ag_mibdata_payload_rs &operator=(const l7ag_mibdata_payload_rs &in_data) {
-                index               = in_data.index;
-                virtualServiceIndex = in_data.virtualServiceIndex;
-                ipAddress           = in_data.ipAddress;
-                portNumber          = in_data.portNumber;
-                forwardMode         = in_data.forwardMode;
-                weight              = in_data.weight;
-                activeConn          = in_data.activeConn;
-                inactiveConn        = in_data.inactiveConn;
-                rs_count            = in_data.rs_count;
-
-                return *this;
-        }
-};
-
-/*!
- * Request message of collect MIB data
- */
-struct  l7ag_mibrequest_message {
-        char            magic[MAGIC_NUMBER_LENGTH]; //! Magic number
-        unsigned char   oid[OIDDATASIZE];           //! OID. Get all data when set oid to 0
-        unsigned char   data[MIBREQUESTDATASIZE];   //! Expansion
-};
-
-#endif    //MESSAGE_H
diff --git a/snmpagent/mibs.memo b/snmpagent/mibs.memo
deleted file mode 100644 (file)
index 41950a0..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-# UltraMonkey-L7 mib data memo (TSV)
-# (cf. $ env MIBS=ALL snmptranslate -IR -Tp ultramonkey-l7)
-enterprises.ultramonkey-l7(.1.3.6.1.4.1.xxxxx)
-0      um7Traps
-       1       um7StateAlert
-       2       um7VirtualServiceAlert
-       3       um7ReplicationAlert
-       4       um7LogLevelAlert
-       5       um7QoSAlarmOn
-       6       um7QoSAlarmOff
-       7       um7MessageAlert
-1      um7Objects
-       1       um7CurrentDataGroup
-               1       um7VirtualServiceTable  SEQUENCE OF Um7VirtualServiceEntry      not-accessible  -
-                       1       um7VirtualServiceEntry  Um7VirtualServiceEntry INDEX { um7VSIndex }     not-accessible  -
-                               1       um7VSIndex      INTEGER (1..127)        read-only       -
-                               2       um7VSProtocol   INTEGER { tcp(1), udp(2) }      read-only       -
-                               3       um7VSIPAddress  InetAddress     read-only       -
-                               4       um7VSPortNumber InetPortNumber  read-only       -
-                               5       um7VSScheduleModule     OCTET STRING (SIZE (0..15))     read-only       -
-                               6       um7VSProtocolModule     OCTET STRING (SIZE (0..15))     read-only       -
-                               7       um7VSProtocolModuleOption       OCTET STRING (SIZE (0..511))    read-only       -
-                               8       um7VSReschedule INTEGER { on(1), off(2) }       read-only       -
-                               9       um7VSSorryIpAddress     InetAddress     read-only       -
-                               10      um7VSSorryPortNumber    InetPortNumber  read-only       -
-                               11      um7VSSorryThreshold     INTEGER (0..2147483647) read-only       Connections
-                               12      um7VSSorryForceFlag     INTEGER { on(1), off(2) }       read-only       -
-                               13      um7VSQoSThresholdUp     INTEGER (0..18446744073709551615)       read-only       bps
-                               14      um7VSQoSThresholdDown   INTEGER (0..18446744073709551615)       read-only       bps
-                               15      um7VSThroughputUp       INTEGER (0..18446744073709551615)       read-only       bps
-                               16      um7VSThroughputDown     INTEGER (0..18446744073709551615)       read-only       bps
-               2       um7RealServerTable      SEQUENCE OF Um7RealServerEntry  not-accessible  -
-                       1       um7RealServerEntry      Um7RealServerEntry INDEX { Counter32 }  not-accessible  -
-                               1       um7RSIndex      INTEGER (1..65535)      read-only       -
-                               2       um7RSVirtualServiceIndex        INTEGER (1..127)        read-only       -
-                               3       um7RSIPAddress  InetAddress     read-only       -
-                               4       um7RSPortNumber InetPortNumber  read-only       -
-                               5       um7RSForwardMode        INTEGER { masq(1) }     read-only       -
-                               6       um7RSWeight     INTEGER (0..2147483647) read-only       -
-                               7       um7RSActiveConn INTEGER (0..2147483647) read-only       Connections
-                               8       um7RSInactiveConn       INTEGER (0..2147483647) read-only       Connections
-               3       um7LogLevel
-                       1       um7LogLevelL7vsd
-                               1       um7LogVsdNetwork        INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               2       um7LogVsdNetworkBandwidth       INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               3       um7LogVsdNetworkNumConnection   INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               4       um7LogVsdNetworkQoS     INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               5       um7LogVsdVirtualService INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               6       um7LogVsdRealServer     INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               7       um7LogVsdRealServerBalancing    INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               8       um7LogVsdSorryServer    INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               9       um7LogVsdReplication    INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               10      um7LogVsdStartStop      INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               11      um7LogVsdSystem INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               12      um7LogVsdSystemMemory   INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               13      um7LogVsdSystemSocket   INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               14      um7LogVsdSystemSignal   INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               15      um7LogVsdEnvironment    INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               16      um7LogVsdEnvironmentParameter   INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               17      um7LogVsdLogger INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               18      um7LogVsdParameter      INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               19      um7LogVsdEvent  INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               20      um7LogVsdSchedule       INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               21      um7LogVsdProgram        INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               22      um7LogVsdProtocol       INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               23      um7LogVsdModule INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                       2       um7LogLevelL7vsadm
-                               1       um7LogVsadmParse        INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               2       um7LogVsadmOperate      INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               3       um7LogVsadmCommunicate  INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               4       um7LogVsadmConfigResult INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               5       um7LogVsadmCommon       INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               6       um7LogVsadmLogger       INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               7       um7LogVsadmParameter    INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               8       um7LogVsadmProtocol     INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               9       um7LogVsadmModule       INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                       3       um7LogLevelSnmpAgent
-                               1       um7LogSnmpStartStop     INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               2       um7LogSnmpManagerReceive        INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               3       um7LogSnmpManagerSend   INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               4       um7LogSnmpL7vsdReceive  INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               5       um7LogSnmpL7vsdSend     INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               6       um7LogSnmpLogger        INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-                               7       um7LogSnmpParameter     INTEGER { unknown(0), debug(1), info(2), warn(3), error(4), fatal(5) }  read-only       -
-               4       um7Status
-                       1       um7StatMessage  DisplayString   read-only       -
-                       2       um7StatReplication      INTEGER { out(1), single(2), master(3), slave(4), masterstop(5), slavestop(6) } read-only       -
-                       3       um7StatSnmpAgent        INTEGER { unknown(0), disconnect(1), connect(2) }       read-only       -
-2      um7MIBConformance
-       1       um7MIBCompliances
-               1       um7MIBCompliance
-       2       um7MIBGroups
-               1       um7MIBGroup
-               2       um7TrapGroup
-
-# vi:se noet ts=3:
diff --git a/snmpagent/netsnmp_bridge.c b/snmpagent/netsnmp_bridge.c
deleted file mode 100644 (file)
index cab6821..0000000
+++ /dev/null
@@ -1,1964 +0,0 @@
-/*
- * Note: this file originally auto-generated by mib2c using
- *        : mib2c.scalar.conf,v 1.9 2005/01/07 09:37:18 dts12 Exp $
- *        : mib2c.create-dataset.conf,v 5.4 2004/02/02 19:06:53 rstory Exp $
- *        : mib2c.notify.conf,v 5.3 2004/04/15 12:29:19 dts12 Exp $
- */
-
-#include "netsnmp_bridge.h"
-
-static oid      snmptrap_oid[] = { 1, 3, 6, 1, 6, 3, 1, 1, 4, 1, 0 };
-static unsigned int callback_id = 0;
-
-static netsnmp_table_data_set *vs_table_set = NULL;
-static netsnmp_table_data_set *rs_table_set = NULL;
-
-/** Initializes the ultramonkey-l7 module */
-void
-init_netsnmp_bridge(void *clientarg)
-{
-        static oid      um7LogVsdNetwork_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 1 };
-        static oid      um7LogVsdNetworkBandwidth_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 2 };
-        static oid      um7LogVsdNetworkNumConnection_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 3 };
-        static oid      um7LogVsdNetworkQoS_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 4 };
-        static oid      um7LogVsdVirtualService_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 5 };
-        static oid      um7LogVsdRealServer_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 6 };
-        static oid      um7LogVsdRealServerBalancing_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 7 };
-        static oid      um7LogVsdSorryServer_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 8 };
-        static oid      um7LogVsdReplication_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 9 };
-        static oid      um7LogVsdStartStop_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 10 };
-        static oid      um7LogVsdSystem_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 11 };
-        static oid      um7LogVsdSystemMemory_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 12 };
-        static oid      um7LogVsdSystemSocket_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 13 };
-        static oid      um7LogVsdSystemSignal_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 14 };
-        static oid      um7LogVsdEnvironment_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 15 };
-        static oid      um7LogVsdEnvironmentParameter_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 16 };
-        static oid      um7LogVsdLogger_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 17 };
-        static oid      um7LogVsdParameter_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 18 };
-        static oid      um7LogVsdEvent_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 19 };
-        static oid      um7LogVsdSchedule_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 20 };
-        static oid      um7LogVsdProgram_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 21 };
-        static oid      um7LogVsdProtocol_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 22 };
-        static oid      um7LogVsdModule_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 1, 23 };
-        static oid      um7LogVsadmParse_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 2, 1 };
-        static oid      um7LogVsadmOperate_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 2, 2 };
-        static oid      um7LogVsadmCommunicate_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 2, 3 };
-        static oid      um7LogVsadmConfigResult_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 2, 4 };
-        static oid      um7LogVsadmCommon_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 2, 5 };
-        static oid      um7LogVsadmLogger_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 2, 6 };
-        static oid      um7LogVsadmParameter_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 2, 7 };
-        static oid      um7LogVsadmProtocol_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 2, 8 };
-        static oid      um7LogVsadmModule_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 2, 9 };
-        static oid      um7LogSnmpStartStop_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 3, 1 };
-        static oid      um7LogSnmpManagerReceive_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 3, 2 };
-        static oid      um7LogSnmpManagerSend_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 3, 3 };
-        static oid      um7LogSnmpL7vsdReceive_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 3, 4 };
-        static oid      um7LogSnmpL7vsdSend_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 3, 5 };
-        static oid      um7LogSnmpLogger_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 3, 6 };
-        static oid      um7LogSnmpParameter_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, 3, 7 };
-        static oid      um7StatMessage_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 4, 1 };
-        static oid      um7StatReplication_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 4, 2 };
-        static oid      um7StatSnmpAgent_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 4, 3 };
-
-        DEBUGMSGTL(("ultramonkey-l7", "Initializing\n"));
-
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdNetwork", handle_um7LogVsdNetwork,
-        um7LogVsdNetwork_oid,
-        OID_LENGTH(um7LogVsdNetwork_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdNetworkBandwidth",
-        handle_um7LogVsdNetworkBandwidth,
-        um7LogVsdNetworkBandwidth_oid,
-        OID_LENGTH(um7LogVsdNetworkBandwidth_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdNetworkNumConnection",
-        handle_um7LogVsdNetworkNumConnection,
-        um7LogVsdNetworkNumConnection_oid,
-        OID_LENGTH(um7LogVsdNetworkNumConnection_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdNetworkQoS",
-        handle_um7LogVsdNetworkQoS,
-        um7LogVsdNetworkQoS_oid,
-        OID_LENGTH(um7LogVsdNetworkQoS_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdVirtualService",
-        handle_um7LogVsdVirtualService,
-        um7LogVsdVirtualService_oid,
-        OID_LENGTH(um7LogVsdVirtualService_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdRealServer",
-        handle_um7LogVsdRealServer,
-        um7LogVsdRealServer_oid,
-        OID_LENGTH(um7LogVsdRealServer_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdRealServerBalancing",
-        handle_um7LogVsdRealServerBalancing,
-        um7LogVsdRealServerBalancing_oid,
-        OID_LENGTH(um7LogVsdRealServerBalancing_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdSorryServer",
-        handle_um7LogVsdSorryServer,
-        um7LogVsdSorryServer_oid,
-        OID_LENGTH(um7LogVsdSorryServer_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdReplication",
-        handle_um7LogVsdReplication,
-        um7LogVsdReplication_oid,
-        OID_LENGTH(um7LogVsdReplication_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdStartStop",
-        handle_um7LogVsdStartStop,
-        um7LogVsdStartStop_oid,
-        OID_LENGTH(um7LogVsdStartStop_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdSystem", handle_um7LogVsdSystem,
-        um7LogVsdSystem_oid,
-        OID_LENGTH(um7LogVsdSystem_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdSystemMemory",
-        handle_um7LogVsdSystemMemory,
-        um7LogVsdSystemMemory_oid,
-        OID_LENGTH(um7LogVsdSystemMemory_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdSystemSocket",
-        handle_um7LogVsdSystemSocket,
-        um7LogVsdSystemSocket_oid,
-        OID_LENGTH(um7LogVsdSystemSocket_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdSystemSignal",
-        handle_um7LogVsdSystemSignal,
-        um7LogVsdSystemSignal_oid,
-        OID_LENGTH(um7LogVsdSystemSignal_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdEnvironment",
-        handle_um7LogVsdEnvironment,
-        um7LogVsdEnvironment_oid,
-        OID_LENGTH(um7LogVsdEnvironment_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdEnvironmentParameter",
-        handle_um7LogVsdEnvironmentParameter,
-        um7LogVsdEnvironmentParameter_oid,
-        OID_LENGTH(um7LogVsdEnvironmentParameter_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdLogger", handle_um7LogVsdLogger,
-        um7LogVsdLogger_oid,
-        OID_LENGTH(um7LogVsdLogger_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdParameter",
-        handle_um7LogVsdParameter,
-        um7LogVsdParameter_oid,
-        OID_LENGTH(um7LogVsdParameter_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdEvent", handle_um7LogVsdEvent,
-        um7LogVsdEvent_oid,
-        OID_LENGTH(um7LogVsdEvent_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdSchedule", handle_um7LogVsdSchedule,
-        um7LogVsdSchedule_oid,
-        OID_LENGTH(um7LogVsdSchedule_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdProgram", handle_um7LogVsdProgram,
-        um7LogVsdProgram_oid,
-        OID_LENGTH(um7LogVsdProgram_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdProtocol", handle_um7LogVsdProtocol,
-        um7LogVsdProtocol_oid,
-        OID_LENGTH(um7LogVsdProtocol_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsdModule", handle_um7LogVsdModule,
-        um7LogVsdModule_oid,
-        OID_LENGTH(um7LogVsdModule_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsadmParse", handle_um7LogVsadmParse,
-        um7LogVsadmParse_oid,
-        OID_LENGTH(um7LogVsadmParse_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsadmOperate",
-        handle_um7LogVsadmOperate,
-        um7LogVsadmOperate_oid,
-        OID_LENGTH(um7LogVsadmOperate_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsadmCommunicate",
-        handle_um7LogVsadmCommunicate,
-        um7LogVsadmCommunicate_oid,
-        OID_LENGTH(um7LogVsadmCommunicate_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsadmConfigResult",
-        handle_um7LogVsadmConfigResult,
-        um7LogVsadmConfigResult_oid,
-        OID_LENGTH(um7LogVsadmConfigResult_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsadmCommon", handle_um7LogVsadmCommon,
-        um7LogVsadmCommon_oid,
-        OID_LENGTH(um7LogVsadmCommon_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsadmLogger", handle_um7LogVsadmLogger,
-        um7LogVsadmLogger_oid,
-        OID_LENGTH(um7LogVsadmLogger_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsadmParameter",
-        handle_um7LogVsadmParameter,
-        um7LogVsadmParameter_oid,
-        OID_LENGTH(um7LogVsadmParameter_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsadmProtocol",
-        handle_um7LogVsadmProtocol,
-        um7LogVsadmProtocol_oid,
-        OID_LENGTH(um7LogVsadmProtocol_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogVsadmModule", handle_um7LogVsadmModule,
-        um7LogVsadmModule_oid,
-        OID_LENGTH(um7LogVsadmModule_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogSnmpStartStop",
-        handle_um7LogSnmpStartStop,
-        um7LogSnmpStartStop_oid,
-        OID_LENGTH(um7LogSnmpStartStop_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogSnmpManagerReceive",
-        handle_um7LogSnmpManagerReceive,
-        um7LogSnmpManagerReceive_oid,
-        OID_LENGTH(um7LogSnmpManagerReceive_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogSnmpManagerSend",
-        handle_um7LogSnmpManagerSend,
-        um7LogSnmpManagerSend_oid,
-        OID_LENGTH(um7LogSnmpManagerSend_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogSnmpL7vsdReceive",
-        handle_um7LogSnmpL7vsdReceive,
-        um7LogSnmpL7vsdReceive_oid,
-        OID_LENGTH(um7LogSnmpL7vsdReceive_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogSnmpL7vsdSend",
-        handle_um7LogSnmpL7vsdSend,
-        um7LogSnmpL7vsdSend_oid,
-        OID_LENGTH(um7LogSnmpL7vsdSend_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogSnmpLogger", handle_um7LogSnmpLogger,
-        um7LogSnmpLogger_oid,
-        OID_LENGTH(um7LogSnmpLogger_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7LogSnmpParameter",
-        handle_um7LogSnmpParameter,
-        um7LogSnmpParameter_oid,
-        OID_LENGTH(um7LogSnmpParameter_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7StatMessage", handle_um7StatMessage,
-        um7StatMessage_oid,
-        OID_LENGTH(um7StatMessage_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7StatReplication",
-        handle_um7StatReplication,
-        um7StatReplication_oid,
-        OID_LENGTH(um7StatReplication_oid),
-        HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-        ("um7StatSnmpAgent", handle_um7StatSnmpAgent,
-        um7StatSnmpAgent_oid,
-        OID_LENGTH(um7StatSnmpAgent_oid),
-        HANDLER_CAN_RONLY));
-
-        /*
-         * here we initialize all the tables we're planning on supporting
-         */
-        initialize_table_um7VirtualServiceTable();
-        initialize_table_um7RealServerTable();
-
-        // request mib collection every 1 sec.
-        callback_id = snmp_alarm_register(REPEAT_SEC, SA_REPEAT, getL7vsdData, clientarg);
-        if (callback_id == 0) {
-                // TODO error
-        }
-}
-
-int
-handle_um7LogVsdNetwork(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->network,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR, "unknown mode (%d) in handle_um7LogVsdNetwork\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdNetworkBandwidth(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->networkBandwidth,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsdNetworkBandwidth\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdNetworkNumConnection(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->networkNumConnection,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsdNetworkNumConnection\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdNetworkQoS(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->networkQoS,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsdNetworkQoS\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdVirtualService(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->virtualService,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsdVirtualService\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdRealServer(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->realServer,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsdRealServer\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdRealServerBalancing(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->realServerBalancing,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsdRealServerBalancing\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdSorryServer(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->sorryServer,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsdSorryServer\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdReplication(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->replication,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsdReplication\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdStartStop(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->startStop,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsdStartStop\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdSystem(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->system,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR, "unknown mode (%d) in handle_um7LogVsdSystem\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdSystemMemory(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->systemMemory,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsdSystemMemory\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdSystemSocket(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->systemSocket,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsdSystemSocket\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdSystemSignal(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->systemSignal,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsdSystemSignal\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdEnvironment(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->environment,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsdEnvironment\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdEnvironmentParameter(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->environmentParameter,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsdEnvironmentParameter\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdLogger(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->logger,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR, "unknown mode (%d) in handle_um7LogVsdLogger\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdParameter(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->parameter,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsdParameter\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdEvent(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->event,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR, "unknown mode (%d) in handle_um7LogVsdEvent\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdSchedule(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->schedule,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsdSchedule\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdProgram(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->program,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR, "unknown mode (%d) in handle_um7LogVsdProgram\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdProtocol(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->protocol,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsdProtocol\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsdModule(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsd_log_level *log = l7ag_store_mibdata::getInstance().getVsdLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->module,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR, "unknown mode (%d) in handle_um7LogVsdModule\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsadmParse(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsadm_log_level *log = l7ag_store_mibdata::getInstance().getVsadmLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->parse,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR, "unknown mode (%d) in handle_um7LogVsadmParse\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsadmOperate(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsadm_log_level *log = l7ag_store_mibdata::getInstance().getVsadmLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->operate,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsadmOperate\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsadmCommunicate(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsadm_log_level *log = l7ag_store_mibdata::getInstance().getVsadmLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->communicate,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsadmCommunicate\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsadmConfigResult(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsadm_log_level *log = l7ag_store_mibdata::getInstance().getVsadmLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->configResult,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsadmConfigResult\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsadmCommon(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsadm_log_level *log = l7ag_store_mibdata::getInstance().getVsadmLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->common,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsadmCommon\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsadmLogger(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsadm_log_level *log = l7ag_store_mibdata::getInstance().getVsadmLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->logger,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsadmLogger\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsadmParameter(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsadm_log_level *log = l7ag_store_mibdata::getInstance().getVsadmLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->parameter,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsadmParameter\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsadmProtocol(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsadm_log_level *log = l7ag_store_mibdata::getInstance().getVsadmLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->protocol,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsadmProtocol\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogVsadmModule(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7vsadm_log_level *log = l7ag_store_mibdata::getInstance().getVsadmLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->module,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogVsadmModule\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogSnmpStartStop(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7snmpagent_log_level *log = l7ag_store_mibdata::getInstance().getAgentLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->startStop,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogSnmpStartStop\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogSnmpManagerReceive(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7snmpagent_log_level *log = l7ag_store_mibdata::getInstance().getAgentLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->managerReceive,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogSnmpManagerReceive\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogSnmpManagerSend(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7snmpagent_log_level *log = l7ag_store_mibdata::getInstance().getAgentLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->managerSend,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogSnmpManagerSend\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogSnmpL7vsdReceive(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7snmpagent_log_level *log = l7ag_store_mibdata::getInstance().getAgentLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->l7vsdReceive,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogSnmpL7vsdReceive\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogSnmpL7vsdSend(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7snmpagent_log_level *log = l7ag_store_mibdata::getInstance().getAgentLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->l7vsdSend,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogSnmpL7vsdSend\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogSnmpLogger(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7snmpagent_log_level *log = l7ag_store_mibdata::getInstance().getAgentLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->logger,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR, "unknown mode (%d) in handle_um7LogSnmpLogger\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7LogSnmpParameter(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7snmpagent_log_level *log = l7ag_store_mibdata::getInstance().getAgentLogmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &log->parameter,
-                sizeof(l7vs::LOG_LEVEL_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7LogSnmpParameter\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7StatMessage(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7_status *stat = l7ag_store_mibdata::getInstance().getStatmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_OCTET_STR,
-                (u_char *) &stat->message,
-                strnlen(stat->message, DISPLAYSTRING_LEN));
-                break;
-
-        default:
-                snmp_log(LOG_ERR, "unknown mode (%d) in handle_um7StatMessage\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7StatReplication(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-//     struct l7_status* stat = l7ag_store_mibdata::getInstance().getStatmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                /*        snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                                                 (u_char *) &stat->replication,
-                                                  sizeof(REPLICATION_MODE_TAG)  );*/
-                break;
-
-        default:
-                snmp_log(LOG_ERR,
-                "unknown mode (%d) in handle_um7StatReplication\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_um7StatSnmpAgent(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        struct l7_status *stat = l7ag_store_mibdata::getInstance().getStatmibdata();
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                (u_char *) &stat->snmpAgent,
-                sizeof(IPC_STATUS_TAG));
-                break;
-
-        default:
-                snmp_log(LOG_ERR, "unknown mode (%d) in handle_um7StatSnmpAgent\n",
-                reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-/** Initialize the um7VirtualServiceTable table by defining its contents and how it's structured */
-void
-initialize_table_um7VirtualServiceTable()
-{
-        static oid      um7VirtualServiceTable_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 1 };
-        size_t          um7VirtualServiceTable_oid_len =
-        OID_LENGTH(um7VirtualServiceTable_oid);
-
-        /*
-         * create the table structure itself
-         */
-        vs_table_set = netsnmp_create_table_data_set("um7VirtualServiceTable");
-        l7ag_store_mibdata::getInstance().setVsTableSet(vs_table_set);
-
-        /*
-         * comment this out or delete if you don't support creation of new rows
-         */
-//    vs_table_set->allow_creation = 1;
-
-        /***************************************************
-         * Adding indexes
-         */
-        DEBUGMSGTL(("initialize_table_um7VirtualServiceTable",
-        "adding indexes to table um7VirtualServiceTable\n"));
-        netsnmp_table_set_add_indexes(vs_table_set, ASN_INTEGER,       /* index: um7VSIndex */
-        0);
-
-        DEBUGMSGTL(("initialize_table_um7VirtualServiceTable",
-        "adding column types to table um7VirtualServiceTable\n"));
-        netsnmp_table_set_multi_add_default_row(vs_table_set,
-        COLUMN_UM7VSINDEX, ASN_INTEGER,
-        0, NULL, 0,
-        COLUMN_UM7VSPROTOCOL,
-        ASN_INTEGER, 0, NULL, 0,
-        COLUMN_UM7VSIPADDRESS,
-        ASN_OCTET_STR, 0, NULL, 0,
-        COLUMN_UM7VSPORTNUMBER,
-        ASN_UNSIGNED, 0, NULL, 0,
-        COLUMN_UM7VSSCHEDULEMODULE,
-        ASN_OCTET_STR, 0, NULL, 0,
-        COLUMN_UM7VSPROTOCOLMODULE,
-        ASN_OCTET_STR, 0, NULL, 0,
-        COLUMN_UM7VSPROTOCOLMODULEOPTION,
-        ASN_OCTET_STR, 0, NULL, 0,
-        COLUMN_UM7VSRESCHEDULE,
-        ASN_INTEGER, 0, NULL, 0,
-        COLUMN_UM7VSSORRYIPADDRESS,
-        ASN_OCTET_STR, 0, NULL, 0,
-        COLUMN_UM7VSSORRYPORTNUMBER,
-        ASN_UNSIGNED, 0, NULL, 0,
-        COLUMN_UM7VSSORRYTHRESHOLD,
-        ASN_INTEGER, 0, NULL, 0,
-        COLUMN_UM7VSSORRYFORCEFLAG,
-        ASN_INTEGER, 0, NULL, 0,
-        COLUMN_UM7VSQOSTHRESHOLDUP,
-        ASN_INTEGER, 0, NULL, 0,
-        COLUMN_UM7VSQOSTHRESHOLDDOWN,
-        ASN_INTEGER, 0, NULL, 0,
-        COLUMN_UM7VSTHROUGHPUTUP,
-        ASN_INTEGER, 0, NULL, 0,
-        COLUMN_UM7VSTHROUGHPUTDOWN,
-        ASN_INTEGER, 0, NULL, 0, 0);
-
-        /*
-         * registering the table with the master agent
-         */
-        /*
-         * note: if you don't need a subhandler to deal with any aspects
-         * of the request, change um7VirtualServiceTable_handler to "NULL"
-         */
-        netsnmp_register_table_data_set(netsnmp_create_handler_registration
-        ("um7VirtualServiceTable",
-        um7VirtualServiceTable_handler,
-        um7VirtualServiceTable_oid,
-        um7VirtualServiceTable_oid_len,
-        HANDLER_CAN_RWRITE), vs_table_set, NULL);
-}
-
-/** Initialize the um7RealServerTable table by defining its contents and how it's structured */
-void
-initialize_table_um7RealServerTable()
-{
-        static oid      um7RealServerTable_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 2 };
-        size_t          um7RealServerTable_oid_len =
-        OID_LENGTH(um7RealServerTable_oid);
-
-        /*
-         * create the table structure itself
-         */
-        rs_table_set = netsnmp_create_table_data_set("um7RealServerTable");
-        l7ag_store_mibdata::getInstance().setRsTableSet(rs_table_set);
-
-        /*
-         * comment this out or delete if you don't support creation of new rows
-         */
-//    rs_table_set->allow_creation = 1;
-
-        /***************************************************
-         * Adding indexes
-         */
-        DEBUGMSGTL(("initialize_table_um7RealServerTable",
-        "adding indexes to table um7RealServerTable\n"));
-        netsnmp_table_set_add_indexes(rs_table_set, ASN_INTEGER,       /* index: um7RSIndex */
-        0);
-
-        DEBUGMSGTL(("initialize_table_um7RealServerTable",
-        "adding column types to table um7RealServerTable\n"));
-        netsnmp_table_set_multi_add_default_row(rs_table_set,
-        COLUMN_UM7RSINDEX, ASN_INTEGER,
-        0, NULL, 0,
-        COLUMN_UM7RSVIRTUALSERVICEINDEX,
-        ASN_INTEGER, 0, NULL, 0,
-        COLUMN_UM7RSIPADDRESS,
-        ASN_OCTET_STR, 0, NULL, 0,
-        COLUMN_UM7RSPORTNUMBER,
-        ASN_UNSIGNED, 0, NULL, 0,
-        COLUMN_UM7RSFORWARDMODE,
-        ASN_INTEGER, 0, NULL, 0,
-        COLUMN_UM7RSWEIGHT,
-        ASN_INTEGER, 0, NULL, 0,
-        COLUMN_UM7RSACTIVECONN,
-        ASN_INTEGER, 0, NULL, 0,
-        COLUMN_UM7RSINACTIVECONN,
-        ASN_INTEGER, 0, NULL, 0, 0);
-
-        /*
-         * registering the table with the master agent
-         */
-        /*
-         * note: if you don't need a subhandler to deal with any aspects
-         * of the request, change um7RealServerTable_handler to "NULL"
-         */
-        netsnmp_register_table_data_set(netsnmp_create_handler_registration
-        ("um7RealServerTable",
-        um7RealServerTable_handler,
-        um7RealServerTable_oid,
-        um7RealServerTable_oid_len,
-        HANDLER_CAN_RWRITE), rs_table_set, NULL);
-}
-
-/** handles requests for the um7VirtualServiceTable table, if anything else needs to be done */
-int
-um7VirtualServiceTable_handler(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        /*
-         * perform anything here that you need to do.  The requests have
-         * already been processed by the master table_dataset handler, but
-         * this gives you chance to act on the request in some other way
-         * if need be.
-         */
-        return SNMP_ERR_NOERROR;
-}
-
-/** handles requests for the um7RealServerTable table, if anything else needs to be done */
-int
-um7RealServerTable_handler(netsnmp_mib_handler *handler,
-netsnmp_handler_registration *reginfo,
-netsnmp_agent_request_info *reqinfo,
-netsnmp_request_info *requests)
-{
-        /*
-         * perform anything here that you need to do.  The requests have
-         * already been processed by the master table_dataset handler, but
-         * this gives you chance to act on the request in some other way
-         * if need be.
-         */
-        return SNMP_ERR_NOERROR;
-}
-
-int
-send_um7StateAlert_trap()
-{
-        netsnmp_variable_list *var_list = NULL;
-        oid             um7StateAlert_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 0, 1 };
-        /*    oid             um7StatReplication_oid[] =
-                { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 4, 2, 0 };*/
-        oid             um7StatSnmpAgent_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 4, 3, 0 };
-
-        /*
-         * Set the snmpTrapOid.0 value
-         */
-        snmp_varlist_add_variable(&var_list,
-        snmptrap_oid, OID_LENGTH(snmptrap_oid),
-        ASN_OBJECT_ID,
-        (u_char *) um7StateAlert_oid,
-        sizeof(um7StateAlert_oid));
-
-        struct l7_status *stat = l7ag_store_mibdata::getInstance().getStatmibdata();
-        /*    snmp_varlist_add_variable(&var_list,
-                                      um7StatReplication_oid,
-                                      OID_LENGTH(um7StatReplication_oid),
-                                      ASN_INTEGER, (u_char*) &stat->replication,
-                                      sizeof(REPLICATION_MODE_TAG));*/
-        snmp_varlist_add_variable(&var_list,
-        um7StatSnmpAgent_oid,
-        OID_LENGTH(um7StatSnmpAgent_oid),
-        ASN_INTEGER, (u_char *) &stat->snmpAgent,
-        sizeof(IPC_STATUS_TAG));
-
-        /*
-         * Add any extra (optional) objects here
-         */
-
-        /*
-         * Send the trap to the list of configured destinations
-         *  and clean up
-         */
-        send_v2trap(var_list);
-        snmp_free_varbind(var_list);
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-send_um7VirtualServiceAlert_trap()
-{
-        netsnmp_variable_list *var_list = NULL;
-        oid             um7VirtualServiceAlert_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 0, 2 };
-//     oid             um7VirtualServiceTable_oid[] =
-//         { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 1, 0 };
-//     oid             um7RealServerTable_oid[] =
-//         { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 2, 0 };
-
-        /*
-         * Set the snmpTrapOid.0 value
-         */
-        snmp_varlist_add_variable(&var_list,
-        snmptrap_oid, OID_LENGTH(snmptrap_oid),
-        ASN_OBJECT_ID,
-        (u_char *) um7VirtualServiceAlert_oid,
-        sizeof(um7VirtualServiceAlert_oid));
-
-        /*
-         * Add any objects from the trap definition
-         */
-        /*
-            snmp_varlist_add_variable(&var_list,
-                                      um7VirtualServiceTable_oid,
-                                      OID_LENGTH(um7VirtualServiceTable_oid),,
-                                      // Set an appropriate value for um7VirtualServiceTable
-                                      NULL, 0);
-            snmp_varlist_add_variable(&var_list,
-                                      um7RealServerTable_oid,
-                                      OID_LENGTH(um7RealServerTable_oid),,
-                                      // Set an appropriate value for um7RealServerTable
-                                      NULL, 0);
-        */
-
-        /*
-         * Add any extra (optional) objects here
-         */
-
-        /*
-         * Send the trap to the list of configured destinations
-         *  and clean up
-         */
-        send_v2trap(var_list);
-        snmp_free_varbind(var_list);
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-send_um7ReplicationAlert_trap()
-{
-        netsnmp_variable_list *var_list = NULL;
-        oid             um7ReplicationAlert_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 0, 3 };
-        oid             um7StatMessage_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 4, 1, 0 };
-
-        /*
-         * Set the snmpTrapOid.0 value
-         */
-        snmp_varlist_add_variable(&var_list,
-        snmptrap_oid, OID_LENGTH(snmptrap_oid),
-        ASN_OBJECT_ID,
-        (u_char *) um7ReplicationAlert_oid,
-        sizeof(um7ReplicationAlert_oid));
-
-        struct l7_status *stat = l7ag_store_mibdata::getInstance().getStatmibdata();
-        snmp_varlist_add_variable(&var_list,
-        um7StatMessage_oid,
-        OID_LENGTH(um7StatMessage_oid),
-        ASN_OCTET_STR,
-        (u_char *) &stat->message,
-        strnlen(stat->message, DISPLAYSTRING_LEN));
-
-        /*
-         * Add any extra (optional) objects here
-         */
-
-        /*
-         * Send the trap to the list of configured destinations
-         *  and clean up
-         */
-        send_v2trap(var_list);
-        snmp_free_varbind(var_list);
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-send_um7LogLevelAlert_trap()
-{
-        netsnmp_variable_list *var_list = NULL;
-        oid             um7LogLevelAlert_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 0, 4 };
-//     oid             um7LogLevel_oid[] =
-//         { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3, /* insert index here */  };
-
-        /*
-         * Set the snmpTrapOid.0 value
-         */
-        snmp_varlist_add_variable(&var_list,
-        snmptrap_oid, OID_LENGTH(snmptrap_oid),
-        ASN_OBJECT_ID,
-        (u_char *) um7LogLevelAlert_oid,
-        sizeof(um7LogLevelAlert_oid));
-
-        /*
-         * Add any objects from the trap definition
-         */
-        /*
-            snmp_varlist_add_variable(&var_list,
-                                      um7LogLevel_oid,
-                                      OID_LENGTH(um7LogLevel_oid),,
-                                      // Set an appropriate value for um7LogLevel
-                                      NULL, 0);
-        */
-
-        /*
-         * Add any extra (optional) objects here
-         */
-
-        /*
-         * Send the trap to the list of configured destinations
-         *  and clean up
-         */
-        send_v2trap(var_list);
-        snmp_free_varbind(var_list);
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-send_um7QoSAlarmOn_trap(size_t index)
-{
-        netsnmp_variable_list *var_list = NULL;
-        oid             um7QoSAlarmOn_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 0, 5 };
-        oid             um7VSQoSThresholdUp_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 1, 1, 13, index };
-        oid             um7VSQoSThresholdDown_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 1, 1, 14, index };
-        oid             um7VSThroughputUp_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 1, 1, 15, index };
-        oid             um7VSThroughputDown_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 1, 1, 16, index };
-
-        /*
-         * Set the snmpTrapOid.0 value
-         */
-        snmp_varlist_add_variable(&var_list,
-        snmptrap_oid, OID_LENGTH(snmptrap_oid),
-        ASN_OBJECT_ID,
-        (u_char *) um7QoSAlarmOn_oid,
-        sizeof(um7QoSAlarmOn_oid));
-
-        vsdata *vs = l7ag_store_mibdata::getInstance().getVSmibdata(index);
-        if (vs) {
-                snmp_varlist_add_variable(&var_list,
-                um7VSQoSThresholdUp_oid,
-                OID_LENGTH(um7VSQoSThresholdUp_oid),
-                ASN_INTEGER,
-                (u_char *) &vs->QoSThresholdUp,
-                sizeof(unsigned long long));
-                snmp_varlist_add_variable(&var_list,
-                um7VSQoSThresholdDown_oid,
-                OID_LENGTH(um7VSQoSThresholdDown_oid),
-                ASN_INTEGER,
-                (u_char *) &vs->QoSThresholdDown,
-                sizeof(unsigned long long));
-                snmp_varlist_add_variable(&var_list,
-                um7VSThroughputUp_oid,
-                OID_LENGTH(um7VSThroughputUp_oid),
-                ASN_INTEGER,
-                (u_char *) &vs->throughputUp,
-                sizeof(unsigned long long));
-                snmp_varlist_add_variable(&var_list,
-                um7VSThroughputDown_oid,
-                OID_LENGTH(um7VSThroughputDown_oid),
-                ASN_INTEGER,
-                (u_char *) &vs->throughputDown,
-                sizeof(unsigned long long));
-        }
-
-        /*
-         * Add any extra (optional) objects here
-         */
-
-        /*
-         * Send the trap to the list of configured destinations
-         *  and clean up
-         */
-        send_v2trap(var_list);
-        snmp_free_varbind(var_list);
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-send_um7QoSAlarmOff_trap(size_t index)
-{
-        netsnmp_variable_list *var_list = NULL;
-        oid             um7QoSAlarmOff_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 0, 6 };
-        oid             um7VSQoSThresholdUp_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 1, 1, 13, index };
-        oid             um7VSQoSThresholdDown_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 1, 1, 14, index };
-        oid             um7VSThroughputUp_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 1, 1, 15, index };
-        oid             um7VSThroughputDown_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 1, 1, 16, index };
-
-        /*
-         * Set the snmpTrapOid.0 value
-         */
-        snmp_varlist_add_variable(&var_list,
-        snmptrap_oid, OID_LENGTH(snmptrap_oid),
-        ASN_OBJECT_ID,
-        (u_char *) um7QoSAlarmOff_oid,
-        sizeof(um7QoSAlarmOff_oid));
-
-        vsdata *vs = l7ag_store_mibdata::getInstance().getVSmibdata(index);
-        if (vs) {
-                snmp_varlist_add_variable(&var_list,
-                um7VSQoSThresholdUp_oid,
-                OID_LENGTH(um7VSQoSThresholdUp_oid),
-                ASN_INTEGER,
-                (u_char *) &vs->QoSThresholdUp,
-                sizeof(unsigned long long));
-                snmp_varlist_add_variable(&var_list,
-                um7VSQoSThresholdDown_oid,
-                OID_LENGTH(um7VSQoSThresholdDown_oid),
-                ASN_INTEGER,
-                (u_char *) &vs->QoSThresholdDown,
-                sizeof(unsigned long long));
-                snmp_varlist_add_variable(&var_list,
-                um7VSThroughputUp_oid,
-                OID_LENGTH(um7VSThroughputUp_oid),
-                ASN_INTEGER,
-                (u_char *) &vs->throughputUp,
-                sizeof(unsigned long long));
-                snmp_varlist_add_variable(&var_list,
-                um7VSThroughputDown_oid,
-                OID_LENGTH(um7VSThroughputDown_oid),
-                ASN_INTEGER,
-                (u_char *) &vs->throughputDown,
-                sizeof(unsigned long long));
-        }
-
-        /*
-         * Add any extra (optional) objects here
-         */
-
-        /*
-         * Send the trap to the list of configured destinations
-         *  and clean up
-         */
-        send_v2trap(var_list);
-        snmp_free_varbind(var_list);
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-send_um7MessageAlert_trap()
-{
-        netsnmp_variable_list *var_list = NULL;
-        oid             um7MessageAlert_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 0, 7 };
-        oid             um7StatMessage_oid[] =
-        { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 4, 1, 0 };
-
-        /*
-         * Set the snmpTrapOid.0 value
-         */
-        snmp_varlist_add_variable(&var_list,
-        snmptrap_oid, OID_LENGTH(snmptrap_oid),
-        ASN_OBJECT_ID,
-        (u_char *) um7MessageAlert_oid,
-        sizeof(um7MessageAlert_oid));
-
-        struct l7_status *stat = l7ag_store_mibdata::getInstance().getStatmibdata();
-        snmp_varlist_add_variable(&var_list,
-        um7StatMessage_oid,
-        OID_LENGTH(um7StatMessage_oid),
-        ASN_OCTET_STR,
-        (u_char *) &stat->message,
-        strnlen(stat->message, DISPLAYSTRING_LEN));
-
-        /*
-         * Add any extra (optional) objects here
-         */
-
-        /*
-         * Send the trap to the list of configured destinations
-         *  and clean up
-         */
-        send_v2trap(var_list);
-        snmp_free_varbind(var_list);
-
-        return SNMP_ERR_NOERROR;
-}
-
-// get all mib data from l7vsd
-// called every REPEAT_SEC sec.
-void
-getL7vsdData(unsigned int clientreg, void *clientarg)
-{
-        if (!clientarg) return;
-        MessengerClient *message = (MessengerClient *) clientarg;
-
-        long long buf_size = sizeof(struct l7ag_message_header)
-        + sizeof(struct l7ag_payload_header)
-        + sizeof(struct l7ag_mibrequest_message);
-        char *sendbuf = (char *) calloc(1, buf_size);
-
-        struct l7ag_message_header *msg_head = (struct l7ag_message_header *) sendbuf;
-        msg_head->magic[0]      = 0x4d; // M
-        msg_head->magic[1]      = 0x47; // G
-        msg_head->version       = 1;
-        msg_head->size          = buf_size;
-        msg_head->payload_count = 1;
-// TODO set time    msg_head->time          = 1;
-
-        struct l7ag_payload_header *payload  = (struct l7ag_payload_header *)(msg_head + 1);
-        payload->magic[0]         = 0x50; // P
-        payload->magic[1]         = 0x59; // Y
-        payload->message_id       = MESSAGE_ID_MIBCOLLECTREQUEST;
-        payload->payload_datasize = sizeof(struct l7ag_payload_header)
-        + sizeof(struct l7ag_mibrequest_message);
-
-        struct l7ag_mibrequest_message *request = (struct l7ag_mibrequest_message *)(payload + 1);
-        memset(request, 0, sizeof(struct l7ag_mibrequest_message));
-        request->magic[0] = 0x52; // R
-        request->magic[1] = 0x51; // Q
-
-        if (message->connect()) {
-                int ret = message->send(buf_size, sendbuf);
-                if (ret != buf_size) {
-                        // TODO error
-                        message->close();
-                }
-        }
-}
-
diff --git a/snmpagent/netsnmp_bridge.h b/snmpagent/netsnmp_bridge.h
deleted file mode 100644 (file)
index 20ea356..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Note: this file originally auto-generated by mib2c using
- *        : mib2c.scalar.conf,v 1.9 2005/01/07 09:37:18 dts12 Exp $
- *        : mib2c.create-dataset.conf,v 5.4 2004/02/02 19:06:53 rstory Exp $
- *        : mib2c.notify.conf,v 5.3 2004/04/15 12:29:19 dts12 Exp $
- */
-#ifndef NETSNMP_BRIDGE_H
-#define NETSNMP_BRIDGE_H
-
-#include <net-snmp/net-snmp-config.h>
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-#include <string.h>
-
-#include "MessengerClient.h"
-#include "store_mibdata.h"
-#include "message.h"
-#include "../logger/logger_enum.h"
-
-#define REPEAT_SEC  3
-
-/*
- * column number definitions for table um7VirtualServiceTable
- */
-#define COLUMN_UM7VSINDEX                   1
-#define COLUMN_UM7VSPROTOCOL                2
-#define COLUMN_UM7VSIPADDRESS               3
-#define COLUMN_UM7VSPORTNUMBER              4
-#define COLUMN_UM7VSSCHEDULEMODULE          5
-#define COLUMN_UM7VSPROTOCOLMODULE          6
-#define COLUMN_UM7VSPROTOCOLMODULEOPTION    7
-#define COLUMN_UM7VSRESCHEDULE              8
-#define COLUMN_UM7VSSORRYIPADDRESS          9
-#define COLUMN_UM7VSSORRYPORTNUMBER         10
-#define COLUMN_UM7VSSORRYTHRESHOLD          11
-#define COLUMN_UM7VSSORRYFORCEFLAG          12
-#define COLUMN_UM7VSQOSTHRESHOLDUP          13
-#define COLUMN_UM7VSQOSTHRESHOLDDOWN        14
-#define COLUMN_UM7VSTHROUGHPUTUP            15
-#define COLUMN_UM7VSTHROUGHPUTDOWN          16
-
-/*
- * column number definitions for table um7RealServerTable
- */
-#define COLUMN_UM7RSINDEX                   1
-#define COLUMN_UM7RSVIRTUALSERVICEINDEX     2
-#define COLUMN_UM7RSIPADDRESS               3
-#define COLUMN_UM7RSPORTNUMBER              4
-#define COLUMN_UM7RSFORWARDMODE             5
-#define COLUMN_UM7RSWEIGHT                  6
-#define COLUMN_UM7RSACTIVECONN              7
-#define COLUMN_UM7RSINACTIVECONN            8
-
-/*
- * function declarations
- */
-void    init_netsnmp_bridge(void *);
-void    initialize_table_um7VirtualServiceTable();
-void    initialize_table_um7RealServerTable();
-void    getL7vsdData(unsigned int, void *);
-int     send_um7StateAlert_trap();
-int     send_um7VirtualServiceAlert_trap();
-int     send_um7ReplicationAlert_trap();
-int     send_um7LogLevelAlert_trap();
-int     send_um7QoSAlarmOn_trap();
-int     send_um7QoSAlarmOff_trap();
-int     send_um7MessageAlert_trap();
-Netsnmp_Node_Handler handle_um7LogVsdNetwork;
-Netsnmp_Node_Handler handle_um7LogVsdNetworkBandwidth;
-Netsnmp_Node_Handler handle_um7LogVsdNetworkNumConnection;
-Netsnmp_Node_Handler handle_um7LogVsdNetworkQoS;
-Netsnmp_Node_Handler handle_um7LogVsdVirtualService;
-Netsnmp_Node_Handler handle_um7LogVsdRealServer;
-Netsnmp_Node_Handler handle_um7LogVsdRealServerBalancing;
-Netsnmp_Node_Handler handle_um7LogVsdSorryServer;
-Netsnmp_Node_Handler handle_um7LogVsdReplication;
-Netsnmp_Node_Handler handle_um7LogVsdStartStop;
-Netsnmp_Node_Handler handle_um7LogVsdSystem;
-Netsnmp_Node_Handler handle_um7LogVsdSystemMemory;
-Netsnmp_Node_Handler handle_um7LogVsdSystemSocket;
-Netsnmp_Node_Handler handle_um7LogVsdSystemSignal;
-Netsnmp_Node_Handler handle_um7LogVsdEnvironment;
-Netsnmp_Node_Handler handle_um7LogVsdEnvironmentParameter;
-Netsnmp_Node_Handler handle_um7LogVsdLogger;
-Netsnmp_Node_Handler handle_um7LogVsdParameter;
-Netsnmp_Node_Handler handle_um7LogVsdEvent;
-Netsnmp_Node_Handler handle_um7LogVsdSchedule;
-Netsnmp_Node_Handler handle_um7LogVsdProgram;
-Netsnmp_Node_Handler handle_um7LogVsdProtocol;
-Netsnmp_Node_Handler handle_um7LogVsdModule;
-Netsnmp_Node_Handler handle_um7LogVsadmParse;
-Netsnmp_Node_Handler handle_um7LogVsadmOperate;
-Netsnmp_Node_Handler handle_um7LogVsadmCommunicate;
-Netsnmp_Node_Handler handle_um7LogVsadmConfigResult;
-Netsnmp_Node_Handler handle_um7LogVsadmCommon;
-Netsnmp_Node_Handler handle_um7LogVsadmLogger;
-Netsnmp_Node_Handler handle_um7LogVsadmParameter;
-Netsnmp_Node_Handler handle_um7LogVsadmProtocol;
-Netsnmp_Node_Handler handle_um7LogVsadmModule;
-Netsnmp_Node_Handler handle_um7LogSnmpStartStop;
-Netsnmp_Node_Handler handle_um7LogSnmpManagerReceive;
-Netsnmp_Node_Handler handle_um7LogSnmpManagerSend;
-Netsnmp_Node_Handler handle_um7LogSnmpL7vsdReceive;
-Netsnmp_Node_Handler handle_um7LogSnmpL7vsdSend;
-Netsnmp_Node_Handler handle_um7LogSnmpLogger;
-Netsnmp_Node_Handler handle_um7LogSnmpParameter;
-Netsnmp_Node_Handler handle_um7StatMessage;
-Netsnmp_Node_Handler handle_um7StatSnmpAgent;
-Netsnmp_Node_Handler handle_um7StatReplication;
-Netsnmp_Node_Handler um7VirtualServiceTable_handler;
-Netsnmp_Node_Handler um7RealServerTable_handler;
-
-#endif                          /* NETSNMP_BRIDGE_H */
diff --git a/snmpagent/netsnmpbridge.c b/snmpagent/netsnmpbridge.c
deleted file mode 100644 (file)
index d48608a..0000000
+++ /dev/null
@@ -1,469 +0,0 @@
-/*
- * Note: this file originally auto-generated by mib2c using
- *  : mib2c.iterate.conf 15999 2007-03-25 22:32:02Z dts12 $
- */
-
-#include <string>
-#include <sstream>
-
-#include "netsnmpbridge.h"
-#include "store_mibdata.h"
-
-#define REPEAT_TIME (1)
-
-std::vector<vsdata>::iterator   vs_iterator;
-std::vector<rsdata>::iterator   rs_iterator;
-
-//trap functions
-static oid      snmptrap_oid[] = { 1, 3, 6, 1, 6, 3, 1, 1, 4, 1, 0 };
-
-//trap value
-std::string trap_message;
-
-//collect mib callback id
-static unsigned int reg_id = 0;
-
-void
-set_l7vsError_trap_value(const std::string &in_str)
-{
-        trap_message = in_str;
-}
-
-int
-send_l7vsError_trap(void)
-{
-        netsnmp_variable_list *var_list = NULL;
-        oid l7vsError_oid[] = { 1, 3, 6, 1, 4, 1, 60000, 1, 0, 1 };
-        /*
-         * Set the snmpTrapOid.0 value
-         */
-        snmp_varlist_add_variable(&var_list,
-                                  snmptrap_oid, OID_LENGTH(snmptrap_oid),
-                                  ASN_OBJECT_ID,
-                                  (u_char *)l7vsError_oid, sizeof(l7vsError_oid));
-        /*
-         * Add any extra (optional) objects here
-         */
-        snmp_varlist_add_variable(&var_list,
-                                  snmptrap_oid, OID_LENGTH(snmptrap_oid),
-                                  ASN_OCTET_STR,
-                                  (u_char *)trap_message.c_str(), trap_message.length());
-        /*
-         * Send the trap to the list of configured destinations
-         *  and clean up
-         */
-        send_v2trap(var_list);
-        snmp_free_varbind(var_list);
-        return SNMP_ERR_NOERROR;
-}
-
-
-/** Initializes the UltraMonkeyL7 module */
-void
-init_UltraMonkeyL7(MessengerClient *message)
-{
-        static oid VSCount_oid[] = { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 1 };
-        static oid RSCount_oid[] = { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 3 };
-
-//    DEBUGMSGTL(("UltraMonkeyL7", "Initializing\n"));
-
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-                                ("VSCount", handle_VSCount, VSCount_oid,
-                                 OID_LENGTH(VSCount_oid), HANDLER_CAN_RONLY));
-        netsnmp_register_scalar(netsnmp_create_handler_registration
-                                ("RSCount", handle_RSCount, RSCount_oid,
-                                 OID_LENGTH(RSCount_oid), HANDLER_CAN_RONLY));
-
-        /*
-         * here we initialize all the tables we're planning on supporting
-         */
-        initialize_table_VSTable();
-        initialize_table_RSTable();
-
-        reg_id = snmp_alarm_register(REPEAT_TIME, SA_REPEAT, collect_mib, message);
-        if (reg_id == 0) {
-                // TODO error
-        }
-}
-
-// scaler values
-int
-handle_VSCount(netsnmp_mib_handler *handler,
-               netsnmp_handler_registration *reginfo,
-               netsnmp_agent_request_info *reqinfo,
-               netsnmp_request_info *requests)
-{
-        snmp_log(LOG_INFO, "handle_vscount\n"); // TODO remove
-        switch (reqinfo->mode) {
-        case MODE_GET: {
-                std::size_t vs_count = l7ag_store_mibdata::getInstance().getVSdatacount();
-                snmp_log(LOG_INFO, "vs_count %d\n", vs_count); // TODO remove
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                                         (u_char *) &vs_count,
-                                         sizeof(std::size_t));
-                break;
-        }
-        default:
-                /*
-                 * we should never get here, so this is a really bad error
-                 */
-                snmp_log(LOG_ERR, "unknown mode (%d) in handle_VSCount\n",
-                         reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-int
-handle_RSCount(netsnmp_mib_handler *handler,
-               netsnmp_handler_registration *reginfo,
-               netsnmp_agent_request_info *reqinfo,
-               netsnmp_request_info *requests)
-{
-        snmp_log(LOG_INFO, "handle_rscount\n");
-        switch (reqinfo->mode) {
-        case MODE_GET: {
-                std::size_t rs_count = l7ag_store_mibdata::getInstance().getRSdatacount();
-                snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER,
-                                         (u_char *) &rs_count,
-                                         sizeof(std::size_t));
-                snmp_log(LOG_INFO, "rs_count %d\n", rs_count);
-                break;
-        }
-        default:
-                /*
-                 * we should never get here, so this is a really bad error
-                 */
-                snmp_log(LOG_ERR, "unknown mode (%d) in handle_RSCount\n",
-                         reqinfo->mode);
-                return SNMP_ERR_GENERR;
-        }
-
-        return SNMP_ERR_NOERROR;
-}
-
-// TODO what is this comment???
-// Determine the first/last column names
-
-/**
- * Initialize the VSTable table by defining its contents and how it's structured
- */
-void
-initialize_table_VSTable(void)
-{
-        static oid VSTable_oid[] = { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 2 };
-        size_t     VSTable_oid_len = OID_LENGTH(VSTable_oid);
-        netsnmp_handler_registration *reg;
-        netsnmp_iterator_info *iinfo;
-        netsnmp_table_registration_info *table_info;
-
-        reg = netsnmp_create_handler_registration("VSTable", VSTable_handler,
-                        VSTable_oid, VSTable_oid_len,
-                        HANDLER_CAN_RONLY);
-
-        table_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_registration_info);
-        netsnmp_table_helper_add_indexes(table_info, ASN_INTEGER,   /* index: IndexVS */
-                                         0);
-        table_info->min_column = COLUMN_INDEXVS;
-        table_info->max_column = COLUMN_RSCOUNTVS;
-
-        iinfo = SNMP_MALLOC_TYPEDEF(netsnmp_iterator_info);
-        iinfo->get_first_data_point = VSTable_get_first_data_point;
-        iinfo->get_next_data_point  = VSTable_get_next_data_point;
-        iinfo->table_reginfo        = table_info;
-
-        netsnmp_register_table_iterator(reg, iinfo);
-
-        /*
-         * Initialise the contents of the table here
-         */
-}
-
-/*
- * Example iterator hook routines - using 'get_next' to do most of the work
- */
-netsnmp_variable_list*
-VSTable_get_first_data_point(void **my_loop_context,
-                             void **my_data_context,
-                             netsnmp_variable_list *put_index_data,
-                             netsnmp_iterator_info *mydata)
-{
-        *my_loop_context = l7ag_store_mibdata::getInstance().getVS_first_data_point();      //store_mibdataのデータの先頭を取得
-        vs_iterator      = l7ag_store_mibdata::getInstance().getVS_first_data_iterator();
-        return VSTable_get_next_data_point(my_loop_context, my_data_context,
-                                           put_index_data, mydata);
-}
-
-netsnmp_variable_list*
-VSTable_get_next_data_point(void **my_loop_context,
-                            void **my_data_context,
-                            netsnmp_variable_list *put_index_data,
-                            netsnmp_iterator_info *mydata)
-{
-        struct vsdata *entry = (struct vsdata *) * my_loop_context;
-        netsnmp_variable_list *idx = put_index_data;
-
-        if (entry) {
-                snmp_set_var_typed_integer(idx, ASN_INTEGER, entry->index);
-                idx = idx->next_variable;
-                *my_data_context = (void *) l7ag_store_mibdata::getInstance().getVS_data_point(vs_iterator);    //ここはstore_mibdataからvectorのiteratorからデータのポインタを取得
-                vs_iterator++;
-                *my_loop_context = (void *) l7ag_store_mibdata::getInstance().getVS_data_point(vs_iterator);    //vectorのiteratorから次のデータのポインタを取得
-                return put_index_data;
-        } else {
-                return NULL;
-        }
-}
-
-
-/** handles requests for the VSTable table */
-int
-VSTable_handler(netsnmp_mib_handler *handler,
-                netsnmp_handler_registration *reginfo,
-                netsnmp_agent_request_info *reqinfo,
-                netsnmp_request_info *requests)
-{
-
-        netsnmp_request_info *request;
-        netsnmp_table_request_info *table_info;
-        struct vsdata *table_entry;
-
-        switch (reqinfo->mode) {
-                /*
-                 * Read-support (also covers GetNext requests)
-                 */
-        case MODE_GET:
-                for (request = requests; request; request = request->next) {
-                        table_entry = (struct vsdata *)
-                                      netsnmp_extract_iterator_context(request);
-                        table_info = netsnmp_extract_table_info(request);
-
-                        switch (table_info->colnum) {
-                        case COLUMN_INDEXVS:
-                                if (!table_entry) {
-                                        netsnmp_set_request_error(reqinfo, request,
-                                                                  SNMP_NOSUCHINSTANCE);
-                                        continue;
-                                }
-                                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
-                                                           table_entry->index);
-                                break;
-                        case COLUMN_QOSTHREASHOLDUP:
-                                if (!table_entry) {
-                                        netsnmp_set_request_error(reqinfo, request,
-                                                                  SNMP_NOSUCHINSTANCE);
-                                        continue;
-                                }
-                                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
-                                                           table_entry->QoSThreasholdUp);
-                                break;
-                        case COLUMN_QOSTHREASHOLDDOWN:
-                                if (!table_entry) {
-                                        netsnmp_set_request_error(reqinfo, request,
-                                                                  SNMP_NOSUCHINSTANCE);
-                                        continue;
-                                }
-                                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
-                                                           table_entry->QoSThreasholdDown);
-                                break;
-                                /*
-                                            case COLUMN_RSCOUNTVS:
-                                                if (!table_entry) {
-                                                    netsnmp_set_request_error(reqinfo, request,
-                                                                              SNMP_NOSUCHINSTANCE);
-                                                    continue;
-                                                }
-                                                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
-                                                                           table_entry->RSCountatVS);
-                                                break;
-                                */
-                        default:
-                                netsnmp_set_request_error(reqinfo, request,
-                                                          SNMP_NOSUCHOBJECT);
-                                break;
-                        }
-                }
-                break;
-
-        }
-        return SNMP_ERR_NOERROR;
-}
-
-// Determine the first/last column names
-
-/** Initialize the RSTable table by defining its contents and how it's structured */
-void
-initialize_table_RSTable(void)
-{
-        static oid      RSTable_oid[] = { 1, 3, 6, 1, 4, 1, 60000, 1, 1, 4 };
-        size_t          RSTable_oid_len = OID_LENGTH(RSTable_oid);
-        netsnmp_handler_registration *reg;
-        netsnmp_iterator_info *iinfo;
-        netsnmp_table_registration_info *table_info;
-
-        reg = netsnmp_create_handler_registration("RSTable", RSTable_handler,
-                        RSTable_oid, RSTable_oid_len,
-                        HANDLER_CAN_RONLY);
-
-        table_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_registration_info);
-        netsnmp_table_helper_add_indexes(table_info, ASN_INTEGER,   /* index: IndexRS */
-                                         0);
-        table_info->min_column = COLUMN_INDEXRS;
-        table_info->max_column = COLUMN_INACTIVECONN;
-
-        iinfo = SNMP_MALLOC_TYPEDEF(netsnmp_iterator_info);
-        iinfo->get_first_data_point = RSTable_get_first_data_point;
-        iinfo->get_next_data_point = RSTable_get_next_data_point;
-        iinfo->table_reginfo = table_info;
-
-        netsnmp_register_table_iterator(reg, iinfo);
-
-        /*
-         * Initialise the contents of the table here
-         */
-}
-
-/*
- * Example iterator hook routines - using 'get_next' to do most of the work
- */
-netsnmp_variable_list *
-RSTable_get_first_data_point(void **my_loop_context,
-                             void **my_data_context,
-                             netsnmp_variable_list *put_index_data,
-                             netsnmp_iterator_info *mydata)
-{
-        *my_loop_context = l7ag_store_mibdata::getInstance().getRS_first_data_point();
-        rs_iterator      = l7ag_store_mibdata::getInstance().getRS_first_data_iterator();
-        return RSTable_get_next_data_point(my_loop_context, my_data_context,
-                                           put_index_data, mydata);
-}
-
-netsnmp_variable_list *
-RSTable_get_next_data_point(void **my_loop_context,
-                            void **my_data_context,
-                            netsnmp_variable_list *put_index_data,
-                            netsnmp_iterator_info *mydata)
-{
-        struct rsdata *entry = (struct rsdata *) * my_loop_context;
-        netsnmp_variable_list *idx = put_index_data;
-
-        if (entry) {
-                snmp_set_var_typed_integer(idx, ASN_INTEGER, entry->index);
-                idx = idx->next_variable;
-                *my_data_context = (void *) l7ag_store_mibdata::getInstance().getRS_data_point(rs_iterator);
-                *my_loop_context = (void *) l7ag_store_mibdata::getInstance().getRS_data_point(rs_iterator);
-                return put_index_data;
-        } else {
-                return NULL;
-        }
-}
-
-
-/** handles requests for the RSTable table */
-int
-RSTable_handler(netsnmp_mib_handler *handler,
-                netsnmp_handler_registration *reginfo,
-                netsnmp_agent_request_info *reqinfo,
-                netsnmp_request_info *requests)
-{
-
-        netsnmp_request_info *request;
-        netsnmp_table_request_info *table_info;
-        struct rsdata *table_entry;
-
-        switch (reqinfo->mode) {
-                /*
-                 * Read-support (also covers GetNext requests)
-                 */
-        case MODE_GET:
-                for (request = requests; request; request = request->next) {
-                        table_entry = (struct rsdata *)
-                                      netsnmp_extract_iterator_context(request);
-                        table_info = netsnmp_extract_table_info(request);
-
-                        switch (table_info->colnum) {
-                        case COLUMN_INDEXRS:
-                                if (!table_entry) {
-                                        netsnmp_set_request_error(reqinfo, request,
-                                                                  SNMP_NOSUCHINSTANCE);
-                                        continue;
-                                }
-                                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
-                                                           table_entry->index);
-                                break;
-                        case COLUMN_VSINDEX:
-                                if (!table_entry) {
-                                        netsnmp_set_request_error(reqinfo, request,
-                                                                  SNMP_NOSUCHINSTANCE);
-                                        continue;
-                                }
-                                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
-                                                           table_entry->virtualServiceIndex);
-                                break;
-                        case COLUMN_WEIGHT:
-                                if (!table_entry) {
-                                        netsnmp_set_request_error(reqinfo, request,
-                                                                  SNMP_NOSUCHINSTANCE);
-                                        continue;
-                                }
-                                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
-                                                           table_entry->weight);
-                                break;
-                        case COLUMN_ACTIVECONN:
-                                if (!table_entry) {
-                                        netsnmp_set_request_error(reqinfo, request,
-                                                                  SNMP_NOSUCHINSTANCE);
-                                        continue;
-                                }
-                                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
-                                                           table_entry->activeConn);
-                                break;
-                        case COLUMN_INACTIVECONN:
-                                if (!table_entry) {
-                                        netsnmp_set_request_error(reqinfo, request,
-                                                                  SNMP_NOSUCHINSTANCE);
-                                        continue;
-                                }
-                                snmp_set_var_typed_integer(request->requestvb, ASN_INTEGER,
-                                                           table_entry->inactiveConn);
-                                break;
-                        default:
-                                netsnmp_set_request_error(reqinfo, request,
-                                                          SNMP_NOSUCHOBJECT);
-                                break;
-                        }
-                }
-                break;
-
-        }
-        return SNMP_ERR_NOERROR;
-}
-
-void
-collect_mib(unsigned int clientreg, void *clientarg)
-{
-        snmp_log(LOG_INFO, "called\n"); // TODO remove
-        MessengerClient *message = (MessengerClient *) clientarg;
-        snmp_log(LOG_INFO, "%d\n", message->socketfd); // TODO remove
-        unsigned long long int  buf_size = sizeof(struct l7ag_message_header)
-                                           + sizeof(struct l7ag_payload_header)
-                                           + sizeof(struct l7ag_mibrequest_message);
-        char *sendbuf = (char *) calloc(1, buf_size);
-        struct l7ag_message_header *msg_head = (struct l7ag_message_header *) sendbuf;
-        memcpy(msg_head->magic, "MSG", 4); // TODO remove
-        msg_head->version       = 1;
-        msg_head->size          = buf_size;
-        msg_head->payload_count = 1;
-// TODO set time    msg_head->time          = 1;
-        struct l7ag_payload_header *payload  = (struct l7ag_payload_header *)(msg_head + 1);
-        memcpy(payload->magic, "PAY", 4); // TODO remove
-        payload->message_id = MESSAGE_ID_MIBCOLLECTREQUEST;
-        payload->payload_datasize = sizeof(struct l7ag_payload_header) + sizeof(struct l7ag_mibrequest_message);
-        struct l7ag_mibrequest_message *request = (struct l7ag_mibrequest_message *)(payload + 1);
-        memset(request, 0, sizeof(struct l7ag_mibrequest_message));
-        memcpy(request->magic, "REQ", 4); // TODO remove
-
-        int ret = message->send(buf_size, sendbuf);
-        snmp_log(LOG_INFO, "ret %d\n", ret); // TODO remove
-}
diff --git a/snmpagent/netsnmpbridge.h b/snmpagent/netsnmpbridge.h
deleted file mode 100644 (file)
index 9c3d68c..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Note: this file originally auto-generated by mib2c using
- *  : mib2c.iterate.conf 15999 2007-03-25 22:32:02Z dts12 $
- */
-#ifndef NETSNMPBRIDGE_H
-#define NETSNMPBRIDGE_H
-
-#include <net-snmp/net-snmp-config.h>
-#include <net-snmp/net-snmp-includes.h>
-#include <net-snmp/agent/net-snmp-agent-includes.h>
-
-#include "MessengerClient.h"
-
-/*
- * function declarations
- */
-void init_UltraMonkeyL7(MessengerClient *);
-Netsnmp_Node_Handler    handle_VSCount;
-Netsnmp_Node_Handler    handle_RSCount;
-
-void initialize_table_VSTable(void);
-Netsnmp_Node_Handler        VSTable_handler;
-Netsnmp_First_Data_Point    VSTable_get_first_data_point;
-Netsnmp_Next_Data_Point     VSTable_get_next_data_point;
-
-void initialize_table_RSTable(void);
-Netsnmp_Node_Handler        RSTable_handler;
-Netsnmp_First_Data_Point    RSTable_get_first_data_point;
-Netsnmp_Next_Data_Point     RSTable_get_next_data_point;
-
-// trap functions
-void    set_l7vsError_trap_value(const std::string &);
-int     send_l7vsError_trap(void);
-
-void    collect_mib(unsigned int, void *);
-
-/*
- * column number definitions for table VSTable
- */
-#define COLUMN_INDEXVS              1
-#define COLUMN_QOSTHREASHOLDUP      2
-#define COLUMN_QOSTHREASHOLDDOWN    3
-#define COLUMN_RSCOUNTVS            4
-
-/*
- * column number definitions for table RSTable
- */
-#define COLUMN_INDEXRS              1
-#define COLUMN_VSINDEX              2
-#define COLUMN_WEIGHT               3
-#define COLUMN_ACTIVECONN           4
-#define COLUMN_INACTIVECONN         5
-
-#endif                          /* NETSNMPBRIDGE_H */
diff --git a/snmpagent/proc_message.h b/snmpagent/proc_message.h
deleted file mode 100644 (file)
index fb7a24f..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __PROC_MESSAGE_H__
-#define __PROC_MESSAGE_H__
-
-
-class    proc_message
-{
-private:
-
-public:
-        proc_message() {};
-        virtual    ~proc_message() {};
-
-        virtual    void    do_process() = 0;
-};
-
-
-#endif //__PROC_MESSAGE_H__
diff --git a/snmpagent/proc_mibcollectmessage.cpp b/snmpagent/proc_mibcollectmessage.cpp
deleted file mode 100644 (file)
index b268fa0..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#include "proc_mibcollectmessage.h"
-
-
-proc_mibcollectmessage::proc_mibcollectmessage()
-{
-
-
-}
-
-
-proc_mibcollectmessage::~proc_mibcollectmessage()
-{
-
-
-}
-
-
-void    proc_mibcollectmessage::do_process()
-{
-
-
-}
-
diff --git a/snmpagent/proc_mibcollectmessage.h b/snmpagent/proc_mibcollectmessage.h
deleted file mode 100644 (file)
index dc9dfae..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __PROC_MIBCOLLECTMESSAGE_H__
-#define __PROC_MIBCOLLECTMESSAGE_H__
-
-#include "proc_message.h"
-
-class    proc_mibcollectmessage : public    proc_message
-{
-private:
-
-public:
-        proc_mibcollectmessage();
-        ~proc_mibcollectmessage();
-
-        void    do_process();
-};
-
-#endif //__PROC_MIBCOLLECTMESSAGE_H__
diff --git a/snmpagent/proc_settingrequest.cpp b/snmpagent/proc_settingrequest.cpp
deleted file mode 100644 (file)
index 9631d62..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#include "proc_settingrequest.h"
-
-
-proc_settingrequest::proc_settingrequest()
-{
-
-
-}
-
-
-proc_settingrequest::~proc_settingrequest()
-{
-
-
-}
-
-
-void    proc_settingrequest::do_process()
-{
-
-
-}
-
diff --git a/snmpagent/proc_settingrequest.h b/snmpagent/proc_settingrequest.h
deleted file mode 100644 (file)
index b4e993c..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __PROC_SETTINGREQUEST_H__
-#define __PROC_SETTINGREQUEST_H__
-
-#include "proc_message.h"
-
-class    proc_settingrequest : public    proc_message
-{
-private:
-
-public:
-        proc_settingrequest();
-        ~proc_settingrequest();
-
-        void    do_process();
-};
-
-#endif //__PROC_SETTINGREQUEST_H__
-
diff --git a/snmpagent/proc_trapsendrequest.cpp b/snmpagent/proc_trapsendrequest.cpp
deleted file mode 100644 (file)
index 341f84f..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#include "proc_trapsendrequest.h"
-
-
-proc_trapsendrequest::proc_trapsendrequest()
-{
-
-
-}
-
-
-proc_trapsendrequest::~proc_trapsendrequest()
-{
-
-
-}
-
-
-void    proc_trapsendrequest::do_process()
-{
-
-
-}
-
diff --git a/snmpagent/proc_trapsendrequest.h b/snmpagent/proc_trapsendrequest.h
deleted file mode 100644 (file)
index ea0e09c..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __PROC_TRAPSENDREQUEST_H__
-#define __PROC_TRAPSENDREQUEST_H__
-
-#include "proc_message.h"
-
-class    proc_trapsendrequest : public    proc_message
-{
-private:
-
-public:
-        proc_trapsendrequest();
-        ~proc_trapsendrequest();
-
-        void    do_process();
-};
-
-#endif //__PROC_TRAPSENDREQUEST_H__
diff --git a/snmpagent/processcheck.cpp b/snmpagent/processcheck.cpp
deleted file mode 100644 (file)
index 6988fbf..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <iostream>
-#include <string>
-#include <fstream>
-#include <sys/types.h>
-#include <dirent.h>
-
-#define BASEPATH "/proc/"
-
-bool    findProcess(std::string &processname)
-{
-        bool retflg = false;
-
-        DIR *dp = opendir(BASEPATH);
-        if (!dp) {
-                return false; //don't open /proc
-        }
-
-        struct dirent *dent = readdir(dp);
-        while (dent) {
-                if (dent->d_type == DT_DIR) {
-                        std::string dirname = dent->d_name;
-                        if (0x2F < dent->d_name[0] && 0x3A > dent->d_name[0]) {
-                                std::string filename = BASEPATH;
-                                filename += dent->d_name;
-                                filename += "/status";
-                                std::string strbuff;
-                                std::ifstream ifs(filename.c_str());
-                                std::getline(ifs, strbuff);
-                                if (strbuff.find(processname) != std::string::npos) {
-                                        retflg = true;
-                                        break;
-                                }
-                        }
-                }
-                dent = readdir(dp);
-        }
-        closedir(dp);
-        return retflg;
-}
diff --git a/snmpagent/queue_sendtrap.cpp b/snmpagent/queue_sendtrap.cpp
deleted file mode 100644 (file)
index ee8c6a1..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-
-#include "queue_sendtrap.h"
-
-
-l7ag_queuesendtrap::l7ag_queuesendtrap()
-{
-
-
-
-}
-
-
-l7ag_queuesendtrap::~l7ag_queuesendtrap()
-{
-
-
-}
-
-
-void    l7ag_queuesendtrap::get_queuedata()
-{
-
-
-}
-
-
-void    l7ag_queuesendtrap::make_queuedata(std::string oid, std::string trapmessage)
-{
-
-
-}
-
-
-void    l7ag_queuesendtrap::set_queuedata()
-{
-
-
-}
-
diff --git a/snmpagent/queue_sendtrap.h b/snmpagent/queue_sendtrap.h
deleted file mode 100644 (file)
index 3074388..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __QUEUE_SENDTRAP_H__
-#define __QUEUE_SENDTRAP_H__
-
-#include <string>
-
-class    l7ag_queuesendtrap
-{
-private:
-        void    set_queuedata();
-
-public:
-        l7ag_queuesendtrap();
-        ~l7ag_queuesendtrap();
-
-        void    get_queuedata();
-        void    make_queuedata(std::string oid, std::string trapmessage);
-};
-
-#endif //__QUEUE_SENDTRAP_H__
diff --git a/snmpagent/store_mibdata.cpp b/snmpagent/store_mibdata.cpp
deleted file mode 100644 (file)
index 2825e6b..0000000
+++ /dev/null
@@ -1,553 +0,0 @@
-//
-//!    @file    store_mibdata.cpp
-//!    @brief    net-snmp mibdata stored source
-//
-//    Copyright (C) 2008  NTT COMWARE Corporation.
-//
-//    Distributed under the Boost Software License, Version 1.0. (See accompanying
-//    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#include "store_mibdata.h"
-
-vsdata    *l7ag_store_mibdata::getVS_first_data_point()
-{
-        return &vsdatalist.front();
-}
-
-std::vector<vsdata>::iterator    l7ag_store_mibdata::getVS_first_data_iterator()
-{
-        return vsdatalist.begin();
-}
-
-vsdata    *l7ag_store_mibdata::getVS_data_point(std::vector<vsdata>::iterator in_it)
-{
-        if (vsdatalist.end() == in_it) {
-                return NULL;
-        }
-        for (unsigned int i = 0; i < vsdatalist.size(); i++) {
-                if (vsdatalist[i].index == in_it->index) {
-                        return &vsdatalist[i];
-                }
-        }
-        return NULL;
-}
-
-std::size_t    l7ag_store_mibdata::getVSdatacount()
-{
-        return vsdatalist.size();
-}
-
-vsdata    *l7ag_store_mibdata::getVSmibdata(std::size_t n)
-{
-        if (vsdatalist.size() <= n) {
-                return NULL;
-        }
-        return &vsdatalist[n];
-}
-
-vsdata    *l7ag_store_mibdata::updateVSmibdata(std::size_t n, l7ag_mibdata_payload_vs *in_data)
-{
-        oid   index[1];
-        netsnmp_table_row *row;
-
-        if (vsdatalist.size() <= n) {
-                return NULL;
-        }
-        if (in_data == NULL) {
-                for (size_t i = vsdatalist.size(); i > n; i--) {
-                        index[0] = i;
-                        row = netsnmp_table_data_get_from_oid(vs_table_set->table, index, 1);
-                        netsnmp_table_dataset_remove_and_delete_row(vs_table_set, row);
-                        vsdatalist.pop_back();
-                }
-                return NULL;
-        }
-
-        vsdatalist[n].index = in_data->index;
-        switch (in_data->protocol) {
-        case IPPROTO_TCP:
-                vsdatalist[n].protocol = 1;
-                break;
-        case IPPROTO_UDP:
-                vsdatalist[n].protocol = 2;
-                break;
-        default:
-                vsdatalist[n].protocol = 0;
-                break;
-        }
-        struct in_addr vip_in = { in_data->ipAddress };
-        char *vip = inet_ntoa(vip_in);
-        strncpy(vsdatalist[n].ipAddress, vip, L7VS_IPADDR_LEN);
-        vsdatalist[n].portNumber    = ntohs(in_data->portNumber);
-        strncpy(vsdatalist[n].scheduleModule, in_data->scheduleModule, L7VS_MODNAME_LEN);
-        strncpy(vsdatalist[n].protocolModule, in_data->protocolModule, L7VS_MODNAME_LEN);
-        strncpy(vsdatalist[n].protocolModuleOption, in_data->protocolModuleOption, L7VS_PROTOMOD_OPT_LEN);
-        switch (in_data->reschedule) {
-        case 0:
-                vsdatalist[n].reschedule = 2;
-                break;
-        case 1:
-                vsdatalist[n].reschedule = 1;
-                break;
-        default:
-                vsdatalist[n].reschedule = 0;
-                break;
-        }
-        struct in_addr sorry_in = { in_data->sorryIpAddress };
-        char *sorry = inet_ntoa(sorry_in);
-        strncpy(vsdatalist[n].sorryIpAddress, sorry, L7VS_IPADDR_LEN);
-        vsdatalist[n].sorryPortNumber   = ntohs(in_data->sorryPortNumber);
-        vsdatalist[n].sorryThreshold    = in_data->sorryThreshold;
-        switch (in_data->sorryForceFlag) {
-        case 0:
-                vsdatalist[n].sorryForceFlag = 2;
-                break;
-        case 1:
-                vsdatalist[n].sorryForceFlag = 1;
-                break;
-        default:
-                vsdatalist[n].sorryForceFlag = 0;
-                break;
-        }
-        vsdatalist[n].QoSThresholdUp    = in_data->QoSThresholdUp   * 8;
-        vsdatalist[n].QoSThresholdDown  = in_data->QoSThresholdDown * 8;
-        vsdatalist[n].throughputUp      = in_data->throughputUp     * 8;
-        vsdatalist[n].throughputDown    = in_data->throughputDown   * 8;
-
-        if (vs_table_set == NULL) {
-                return false;
-        }
-        index[0] = vsdatalist[n].index;
-        row = netsnmp_table_data_get_from_oid(vs_table_set->table, index, 1);
-        if (row == NULL) {
-//        row = netsnmp_table_data_set_create_row_from_defaults(vs_table_set->default_row);
-                row = netsnmp_create_table_data_row();
-                if (row == NULL) return false;
-                netsnmp_table_row_add_index(row, ASN_INTEGER, (char *)&vsdatalist[n].index, sizeof(unsigned short));
-                netsnmp_table_dataset_add_row(vs_table_set, row);
-        }
-
-        netsnmp_set_row_column(row, COLUMN_UM7VSINDEX, ASN_INTEGER, (char *) &vsdatalist[n].index, sizeof(unsigned short));
-        netsnmp_set_row_column(row, COLUMN_UM7VSPROTOCOL, ASN_INTEGER, (char *) &vsdatalist[n].protocol, sizeof(unsigned char));
-        netsnmp_set_row_column(row, COLUMN_UM7VSIPADDRESS, ASN_OCTET_STR, vsdatalist[n].ipAddress, strnlen(vsdatalist[n].ipAddress, L7VS_IPADDR_LEN));
-        netsnmp_set_row_column(row, COLUMN_UM7VSPORTNUMBER, ASN_UNSIGNED, (char *) &vsdatalist[n].portNumber, sizeof(unsigned short));
-        netsnmp_set_row_column(row, COLUMN_UM7VSSCHEDULEMODULE, ASN_OCTET_STR, (char *) &vsdatalist[n].scheduleModule, L7VS_MODNAME_LEN);
-        netsnmp_set_row_column(row, COLUMN_UM7VSPROTOCOLMODULE, ASN_OCTET_STR, (char *) &vsdatalist[n].protocolModule, L7VS_MODNAME_LEN);
-        netsnmp_set_row_column(row, COLUMN_UM7VSPROTOCOLMODULEOPTION, ASN_OCTET_STR, (char *) &vsdatalist[n].protocolModuleOption, L7VS_PROTOMOD_OPT_LEN);
-        netsnmp_set_row_column(row, COLUMN_UM7VSRESCHEDULE, ASN_INTEGER, (char *) &vsdatalist[n].reschedule, sizeof(unsigned char));
-        netsnmp_set_row_column(row, COLUMN_UM7VSSORRYIPADDRESS, ASN_OCTET_STR, vsdatalist[n].sorryIpAddress, strnlen(vsdatalist[n].sorryIpAddress, L7VS_IPADDR_LEN));
-        netsnmp_set_row_column(row, COLUMN_UM7VSSORRYPORTNUMBER, ASN_UNSIGNED, (char *) &vsdatalist[n].sorryPortNumber, sizeof(unsigned short));
-        netsnmp_set_row_column(row, COLUMN_UM7VSSORRYTHRESHOLD, ASN_INTEGER, (char *) &vsdatalist[n].sorryThreshold, sizeof(unsigned int));
-        netsnmp_set_row_column(row, COLUMN_UM7VSSORRYFORCEFLAG, ASN_INTEGER, (char *) &vsdatalist[n].sorryForceFlag, sizeof(unsigned char));
-        netsnmp_set_row_column(row, COLUMN_UM7VSQOSTHRESHOLDUP, ASN_INTEGER, (char *) &vsdatalist[n].QoSThresholdUp, sizeof(unsigned long long));
-        netsnmp_set_row_column(row, COLUMN_UM7VSQOSTHRESHOLDDOWN, ASN_INTEGER, (char *) &vsdatalist[n].QoSThresholdDown, sizeof(unsigned long long));
-        netsnmp_set_row_column(row, COLUMN_UM7VSTHROUGHPUTUP, ASN_INTEGER, (char *) &vsdatalist[n].throughputUp, sizeof(unsigned long long));
-        netsnmp_set_row_column(row, COLUMN_UM7VSTHROUGHPUTDOWN, ASN_INTEGER, (char *) &vsdatalist[n].throughputDown, sizeof(unsigned long long));
-
-        return &vsdatalist[n];
-}
-
-bool    l7ag_store_mibdata::addVSmibdata(l7ag_mibdata_payload_vs *in_data)
-{
-        oid   index[1];
-        netsnmp_table_row *row;
-        vsdata    data;
-
-        if (NULL == in_data) {
-                return false;
-        }
-
-        data.index = in_data->index;
-        switch (in_data->protocol) {
-        case IPPROTO_TCP:
-                data.protocol = 1;
-                break;
-        case IPPROTO_UDP:
-                data.protocol = 2;
-                break;
-        default:
-                data.protocol = 0;
-                break;
-        }
-        struct in_addr vip_in = { in_data->ipAddress };
-        char *vip = inet_ntoa(vip_in);
-        strncpy(data.ipAddress, vip, L7VS_IPADDR_LEN);
-        data.portNumber = ntohs(in_data->portNumber);
-        strncpy(data.scheduleModule, in_data->scheduleModule, L7VS_MODNAME_LEN);
-        strncpy(data.protocolModule, in_data->protocolModule, L7VS_MODNAME_LEN);
-        strncpy(data.protocolModuleOption, in_data->protocolModuleOption, L7VS_PROTOMOD_OPT_LEN);
-        switch (in_data->reschedule) {
-        case 0:
-                data.reschedule = 2;
-                break;
-        case 1:
-                data.reschedule = 1;
-                break;
-        default:
-                data.reschedule = 0;
-                break;
-        }
-        struct in_addr sorry_in = { in_data->sorryIpAddress };
-        char *sorry = inet_ntoa(sorry_in);
-        strncpy(data.sorryIpAddress, sorry, L7VS_IPADDR_LEN);
-        data.sorryPortNumber    = ntohs(in_data->sorryPortNumber);
-        data.sorryThreshold     = in_data->sorryThreshold;
-        switch (in_data->sorryForceFlag) {
-        case 0:
-                data.sorryForceFlag = 2;
-                break;
-        case 1:
-                data.sorryForceFlag = 1;
-                break;
-        default:
-                data.sorryForceFlag = 0;
-                break;
-        }
-        data.QoSThresholdUp     = in_data->QoSThresholdUp   * 8;
-        data.QoSThresholdDown   = in_data->QoSThresholdDown * 8;
-        data.throughputUp       = in_data->throughputUp     * 8;
-        data.throughputDown     = in_data->throughputDown   * 8;
-        vsdatalist.push_back(data);
-
-        if (vs_table_set == NULL) {
-                return false;
-        }
-        index[0] = data.index;
-        row = netsnmp_table_data_get_from_oid(vs_table_set->table, index, 1);
-        if (row == NULL) {
-//        row = netsnmp_table_data_set_create_row_from_defaults(vs_table_set->default_row);
-                row = netsnmp_create_table_data_row();
-                if (row == NULL) return false;
-                netsnmp_table_row_add_index(row, ASN_INTEGER, (char *)&data.index, sizeof(unsigned short));
-                netsnmp_table_dataset_add_row(vs_table_set, row);
-        }
-
-        netsnmp_set_row_column(row, COLUMN_UM7VSINDEX, ASN_INTEGER, (char *) &data.index, sizeof(unsigned short));
-        netsnmp_set_row_column(row, COLUMN_UM7VSPROTOCOL, ASN_INTEGER, (char *) &data.protocol, sizeof(unsigned char));
-        netsnmp_set_row_column(row, COLUMN_UM7VSIPADDRESS, ASN_OCTET_STR, data.ipAddress, strnlen(data.ipAddress, L7VS_IPADDR_LEN));
-        netsnmp_set_row_column(row, COLUMN_UM7VSPORTNUMBER, ASN_UNSIGNED, (char *) &data.portNumber, sizeof(unsigned short));
-        netsnmp_set_row_column(row, COLUMN_UM7VSSCHEDULEMODULE, ASN_OCTET_STR, (char *) &data.scheduleModule, L7VS_MODNAME_LEN);
-        netsnmp_set_row_column(row, COLUMN_UM7VSPROTOCOLMODULE, ASN_OCTET_STR, (char *) &data.protocolModule, L7VS_MODNAME_LEN);
-        netsnmp_set_row_column(row, COLUMN_UM7VSPROTOCOLMODULEOPTION, ASN_OCTET_STR, (char *) &data.protocolModuleOption, L7VS_PROTOMOD_OPT_LEN);
-        netsnmp_set_row_column(row, COLUMN_UM7VSRESCHEDULE, ASN_INTEGER, (char *) &data.reschedule, sizeof(unsigned char));
-        netsnmp_set_row_column(row, COLUMN_UM7VSSORRYIPADDRESS, ASN_OCTET_STR, data.sorryIpAddress, strnlen(data.sorryIpAddress, L7VS_IPADDR_LEN));
-        netsnmp_set_row_column(row, COLUMN_UM7VSSORRYPORTNUMBER, ASN_UNSIGNED, (char *) &data.sorryPortNumber, sizeof(unsigned short));
-        netsnmp_set_row_column(row, COLUMN_UM7VSSORRYTHRESHOLD, ASN_INTEGER, (char *) &data.sorryThreshold, sizeof(unsigned int));
-        netsnmp_set_row_column(row, COLUMN_UM7VSSORRYFORCEFLAG, ASN_INTEGER, (char *) &data.sorryForceFlag, sizeof(unsigned char));
-        netsnmp_set_row_column(row, COLUMN_UM7VSQOSTHRESHOLDUP, ASN_INTEGER, (char *) &data.QoSThresholdUp, sizeof(unsigned long long));
-        netsnmp_set_row_column(row, COLUMN_UM7VSQOSTHRESHOLDDOWN, ASN_INTEGER, (char *) &data.QoSThresholdDown, sizeof(unsigned long long));
-        netsnmp_set_row_column(row, COLUMN_UM7VSTHROUGHPUTUP, ASN_INTEGER, (char *) &data.throughputUp, sizeof(unsigned long long));
-        netsnmp_set_row_column(row, COLUMN_UM7VSTHROUGHPUTDOWN, ASN_INTEGER, (char *) &data.throughputDown, sizeof(unsigned long long));
-
-        return true;
-}
-
-void    l7ag_store_mibdata::clearVSmibdata()
-{
-        oid   index[1];
-        netsnmp_table_row *row;
-        for (size_t i = 1; i <= vsdatalist.size(); i++) {
-                index[0] = i;
-                row = netsnmp_table_data_get_from_oid(vs_table_set->table, index, 1);
-                netsnmp_table_dataset_remove_and_delete_row(vs_table_set, row);
-        }
-        vsdatalist.clear();
-}
-
-rsdata    *l7ag_store_mibdata::getRS_first_data_point()
-{
-        return &rsdatalist.front();
-}
-
-rsdata    *l7ag_store_mibdata::getRS_data_point(std::vector<rsdata>::iterator in_it)
-{
-        if (rsdatalist.end() == in_it) {
-                return NULL;
-        }
-        for (size_t i = 0; i < rsdatalist.size(); i++) {
-                if (rsdatalist[i].index == in_it->index) {
-                        return &rsdatalist[i];
-                }
-        }
-
-        return NULL;
-}
-
-std::vector<rsdata>::iterator    l7ag_store_mibdata::getRS_first_data_iterator()
-{
-        return rsdatalist.begin();
-}
-
-std::size_t    l7ag_store_mibdata::getRSdatacount()
-{
-        return rsdatalist.size();
-}
-
-rsdata    *l7ag_store_mibdata::getRSmibdata(std::size_t n)
-{
-        if (rsdatalist.size() <= n) {
-                return NULL;
-        }
-        return &rsdatalist[n];
-}
-
-rsdata    *l7ag_store_mibdata::updateRSmibdata(std::size_t n, l7ag_mibdata_payload_rs *in_data)
-{
-        oid   index[1];
-        netsnmp_table_row *row;
-
-        if (rsdatalist.size() <= n) {
-                return NULL;
-        }
-        if (in_data == NULL) {
-                for (size_t i = rsdatalist.size(); i > n; i--) {
-                        index[0] = i;
-                        row = netsnmp_table_data_get_from_oid(rs_table_set->table, index, 1);
-                        netsnmp_table_dataset_remove_and_delete_row(rs_table_set, row);
-                        rsdatalist.pop_back();
-                }
-                return NULL;
-        }
-
-        rsdatalist[n].index                  = in_data->index;
-        rsdatalist[n].virtualServiceIndex    = in_data->virtualServiceIndex;
-        struct in_addr in = { in_data->ipAddress };
-        char *ip = inet_ntoa(in);
-        strncpy(rsdatalist[n].ipAddress, ip, L7VS_IPADDR_LEN);
-        rsdatalist[n].portNumber             = ntohs(in_data->portNumber);
-        rsdatalist[n].forwardMode            = in_data->forwardMode;
-        rsdatalist[n].weight                 = in_data->weight;
-        rsdatalist[n].activeConn             = in_data->activeConn;
-        rsdatalist[n].inactiveConn           = in_data->inactiveConn;
-
-        if (rs_table_set == NULL) {
-                return false;
-        }
-        index[0] = rsdatalist[n].index;
-        row = netsnmp_table_data_get_from_oid(rs_table_set->table, index, 1);
-        if (row == NULL) {
-//        row = netsnmp_table_data_set_create_row_from_defaults(rs_table_set->default_row);
-                row = netsnmp_create_table_data_row();
-                if (row == NULL) return false;
-                netsnmp_table_row_add_index(row, ASN_INTEGER, (char *)&rsdatalist[n].index, sizeof(unsigned short));
-                netsnmp_table_dataset_add_row(rs_table_set, row);
-        }
-
-        netsnmp_set_row_column(row, COLUMN_UM7RSINDEX, ASN_INTEGER, (char *) &rsdatalist[n].index, sizeof(unsigned short));
-        netsnmp_set_row_column(row, COLUMN_UM7RSVIRTUALSERVICEINDEX, ASN_INTEGER, (char *) &rsdatalist[n].virtualServiceIndex, sizeof(unsigned short));
-        netsnmp_set_row_column(row, COLUMN_UM7RSIPADDRESS, ASN_OCTET_STR, rsdatalist[n].ipAddress, strnlen(rsdatalist[n].ipAddress, L7VS_IPADDR_LEN));
-        netsnmp_set_row_column(row, COLUMN_UM7RSPORTNUMBER, ASN_UNSIGNED, (char *) &rsdatalist[n].portNumber, sizeof(unsigned short));
-        netsnmp_set_row_column(row, COLUMN_UM7RSFORWARDMODE, ASN_INTEGER, (char *) &rsdatalist[n].forwardMode, sizeof(unsigned short));
-        netsnmp_set_row_column(row, COLUMN_UM7RSWEIGHT, ASN_INTEGER, (char *) &rsdatalist[n].weight, sizeof(unsigned int));
-        netsnmp_set_row_column(row, COLUMN_UM7RSACTIVECONN, ASN_INTEGER, (char *) &rsdatalist[n].activeConn, sizeof(unsigned int));
-        netsnmp_set_row_column(row, COLUMN_UM7RSINACTIVECONN, ASN_INTEGER, (char *) &rsdatalist[n].inactiveConn, sizeof(unsigned int));
-
-        return &rsdatalist[n];
-}
-
-bool    l7ag_store_mibdata::addRSmibdata(l7ag_mibdata_payload_rs *in_data)
-{
-        oid   index[1];
-        netsnmp_table_row *row;
-        rsdata data;
-
-        if (NULL == in_data) {
-                return false;
-        }
-
-        data.index                  = in_data->index;
-        data.virtualServiceIndex    = in_data->virtualServiceIndex;
-        struct in_addr in = { in_data->ipAddress };
-        char *ip = inet_ntoa(in);
-        strncpy(data.ipAddress, ip, L7VS_IPADDR_LEN);
-        data.portNumber             = ntohs(in_data->portNumber);
-        data.forwardMode            = in_data->forwardMode;
-        data.weight                 = in_data->weight;
-        data.activeConn             = in_data->activeConn;
-        data.inactiveConn           = in_data->inactiveConn;
-
-        rsdatalist.push_back(data);
-
-        if (rs_table_set == NULL) {
-                return false;
-        }
-        index[0] = data.index;
-        row = netsnmp_table_data_get_from_oid(rs_table_set->table, index, 1);
-        if (row == NULL) {
-//        row = netsnmp_table_data_set_create_row_from_defaults(rs_table_set->default_row);
-                row = netsnmp_create_table_data_row();
-                if (row == NULL) return false;
-                netsnmp_table_row_add_index(row, ASN_INTEGER, (char *)&data.index, sizeof(unsigned short));
-                netsnmp_table_dataset_add_row(rs_table_set, row);
-        }
-
-        netsnmp_set_row_column(row, COLUMN_UM7RSINDEX, ASN_INTEGER, (char *) &data.index, sizeof(unsigned short));
-        netsnmp_set_row_column(row, COLUMN_UM7RSVIRTUALSERVICEINDEX, ASN_INTEGER, (char *) &data.virtualServiceIndex, sizeof(unsigned short));
-        netsnmp_set_row_column(row, COLUMN_UM7RSIPADDRESS, ASN_OCTET_STR, data.ipAddress, strnlen(data.ipAddress, L7VS_IPADDR_LEN));
-        netsnmp_set_row_column(row, COLUMN_UM7RSPORTNUMBER, ASN_UNSIGNED, (char *) &data.portNumber, sizeof(unsigned short));
-        netsnmp_set_row_column(row, COLUMN_UM7RSFORWARDMODE, ASN_INTEGER, (char *) &data.forwardMode, sizeof(unsigned short));
-        netsnmp_set_row_column(row, COLUMN_UM7RSWEIGHT, ASN_INTEGER, (char *) &data.weight, sizeof(unsigned int));
-        netsnmp_set_row_column(row, COLUMN_UM7RSACTIVECONN, ASN_INTEGER, (char *) &data.activeConn, sizeof(unsigned int));
-        netsnmp_set_row_column(row, COLUMN_UM7RSINACTIVECONN, ASN_INTEGER, (char *) &data.inactiveConn, sizeof(unsigned int));
-
-        return true;
-}
-
-void    l7ag_store_mibdata::clearRSmibdata()
-{
-        oid   index[1];
-        netsnmp_table_row *row;
-        for (size_t i = 1; i <= rsdatalist.size(); i++) {
-                index[0] = i;
-                row = netsnmp_table_data_get_from_oid(rs_table_set->table, index, 1);
-                netsnmp_table_dataset_remove_and_delete_row(rs_table_set, row);
-        }
-        rsdatalist.clear();
-}
-
-l7vsd_log_level    *l7ag_store_mibdata::getVsdLogmibdata()
-{
-        return &vsd_log;
-}
-
-l7vsadm_log_level    *l7ag_store_mibdata::getVsadmLogmibdata()
-{
-        return &adm_log;
-}
-
-l7snmpagent_log_level    *l7ag_store_mibdata::getAgentLogmibdata()
-{
-        return &snmp_log;
-}
-
-l7_status    *l7ag_store_mibdata::getStatmibdata()
-{
-        return &status;
-}
-
-void    l7ag_store_mibdata::clearVsdLogmibdata()
-{
-        vsd_log.network                 = l7vs::LOG_LV_NONE;
-        vsd_log.networkBandwidth        = l7vs::LOG_LV_NONE;
-        vsd_log.networkNumConnection    = l7vs::LOG_LV_NONE;
-        vsd_log.networkQoS              = l7vs::LOG_LV_NONE;
-        vsd_log.virtualService          = l7vs::LOG_LV_NONE;
-        vsd_log.realServer              = l7vs::LOG_LV_NONE;
-        vsd_log.realServerBalancing     = l7vs::LOG_LV_NONE;
-        vsd_log.sorryServer             = l7vs::LOG_LV_NONE;
-        vsd_log.replication             = l7vs::LOG_LV_NONE;
-        vsd_log.startStop               = l7vs::LOG_LV_NONE;
-        vsd_log.system                  = l7vs::LOG_LV_NONE;
-        vsd_log.systemMemory            = l7vs::LOG_LV_NONE;
-        vsd_log.systemSocket            = l7vs::LOG_LV_NONE;
-        vsd_log.systemSignal            = l7vs::LOG_LV_NONE;
-        vsd_log.environment             = l7vs::LOG_LV_NONE;
-        vsd_log.environmentParameter    = l7vs::LOG_LV_NONE;
-        vsd_log.logger                  = l7vs::LOG_LV_NONE;
-        vsd_log.parameter               = l7vs::LOG_LV_NONE;
-        vsd_log.event                   = l7vs::LOG_LV_NONE;
-        vsd_log.schedule                = l7vs::LOG_LV_NONE;
-        vsd_log.program                 = l7vs::LOG_LV_NONE;
-        vsd_log.protocol                = l7vs::LOG_LV_NONE;
-        vsd_log.module                  = l7vs::LOG_LV_NONE;
-}
-
-void    l7ag_store_mibdata::clearVsadmLogmibdata()
-{
-        adm_log.parse           = l7vs::LOG_LV_NONE;
-        adm_log.operate         = l7vs::LOG_LV_NONE;
-        adm_log.communicate     = l7vs::LOG_LV_NONE;
-        adm_log.configResult    = l7vs::LOG_LV_NONE;
-        adm_log.common          = l7vs::LOG_LV_NONE;
-        adm_log.logger          = l7vs::LOG_LV_NONE;
-        adm_log.parameter       = l7vs::LOG_LV_NONE;
-        adm_log.protocol        = l7vs::LOG_LV_NONE;
-        adm_log.module          = l7vs::LOG_LV_NONE;
-}
-
-void    l7ag_store_mibdata::clearAgentLogmibdata()
-{
-        snmp_log.startStop      = l7vs::LOG_LV_NONE;
-        snmp_log.managerReceive = l7vs::LOG_LV_NONE;
-        snmp_log.managerSend    = l7vs::LOG_LV_NONE;
-        snmp_log.l7vsdReceive   = l7vs::LOG_LV_NONE;
-        snmp_log.l7vsdSend      = l7vs::LOG_LV_NONE;
-        snmp_log.logger         = l7vs::LOG_LV_NONE;
-        snmp_log.parameter      = l7vs::LOG_LV_NONE;
-}
-
-void    l7ag_store_mibdata::clearStatmibdata()
-{
-        memset(&status.message, 0, DISPLAYSTRING_LEN);
-        status.snmpAgent    = UNKNOWN;
-//    status.replication  = l7vs::replication::REPLICATION_OUT;
-}
-
-void    l7ag_store_mibdata::setVsdLogmibdata(l7vsd_log_level log)
-{
-        vsd_log.network                 = log.network;
-        vsd_log.networkBandwidth        = log.networkBandwidth;
-        vsd_log.networkNumConnection    = log.networkNumConnection;
-        vsd_log.networkQoS              = log.networkQoS;
-        vsd_log.virtualService          = log.virtualService;
-        vsd_log.realServer              = log.realServer;
-        vsd_log.realServerBalancing     = log.realServerBalancing;
-        vsd_log.sorryServer             = log.sorryServer;
-        vsd_log.replication             = log.replication;
-        vsd_log.startStop               = log.startStop;
-        vsd_log.system                  = log.system;
-        vsd_log.systemMemory            = log.systemMemory;
-        vsd_log.systemSocket            = log.systemSocket;
-        vsd_log.systemSignal            = log.systemSignal;
-        vsd_log.environment             = log.environment;
-        vsd_log.environmentParameter    = log.environmentParameter;
-        vsd_log.logger                  = log.logger;
-        vsd_log.parameter               = log.parameter;
-        vsd_log.event                   = log.event;
-        vsd_log.schedule                = log.schedule;
-        vsd_log.program                 = log.program;
-        vsd_log.protocol                = log.protocol;
-        vsd_log.module                  = log.module;
-}
-
-void    l7ag_store_mibdata::setVsadmLogmibdata(l7vsadm_log_level log)
-{
-        adm_log.parse           = log.parse;
-        adm_log.operate         = log.operate;
-        adm_log.communicate     = log.communicate;
-        adm_log.configResult    = log.configResult;
-        adm_log.common          = log.common;
-        adm_log.logger          = log.logger;
-        adm_log.parameter       = log.parameter;
-        adm_log.protocol        = log.protocol;
-        adm_log.module          = log.module;
-}
-
-void    l7ag_store_mibdata::setAgentLogmibdata(l7snmpagent_log_level log)
-{
-        snmp_log.startStop      = log.startStop;
-        snmp_log.managerReceive = log.managerReceive;
-        snmp_log.managerSend    = log.managerSend;
-        snmp_log.l7vsdReceive   = log.l7vsdReceive;
-        snmp_log.l7vsdSend      = log.l7vsdSend;
-        snmp_log.logger         = log.logger;
-        snmp_log.parameter      = log.parameter;
-}
-
-void    l7ag_store_mibdata::setStatmibdata(l7_status stat)
-{
-        memcpy(&status.message, &stat.message, strnlen(stat.message, DISPLAYSTRING_LEN));
-        status.snmpAgent    = stat.snmpAgent;
-//     status.replication  = stat.replication;
-}
-
-void    l7ag_store_mibdata::setVsTableSet(netsnmp_table_data_set *table_set)
-{
-        vs_table_set = table_set;
-}
-
-void    l7ag_store_mibdata::setRsTableSet(netsnmp_table_data_set *table_set)
-{
-        rs_table_set = table_set;
-}
diff --git a/snmpagent/store_mibdata.h b/snmpagent/store_mibdata.h
deleted file mode 100644 (file)
index 58cea86..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-//
-//!    @file    store_mibdata.h
-//!    @brief    net-snmp mibdata stored header
-//
-//    Copyright (C) 2008  NTT COMWARE Corporation.
-//
-//    Distributed under the Boost Software License, Version 1.0. (See accompanying
-//    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-#ifndef STORE_MIBDATA_H
-#define STORE_MIBDATA_H
-
-#include <string>
-#include <map>
-#include <vector>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include "message.h"
-#include "netsnmp_bridge.h"
-#include "logger_enum.h"
-#include "MessengerClient.h"
-
-#define DISPLAYSTRING_LEN           (256)     // RFC2579
-#define    L7VS_IPADDR_LEN                (128)
-
-struct vsdata {
-        unsigned short      index;
-        unsigned char       protocol;
-        char                ipAddress[L7VS_IPADDR_LEN];
-        unsigned short      portNumber;
-        char                scheduleModule[L7VS_MODNAME_LEN];
-        char                protocolModule[L7VS_MODNAME_LEN];
-        char                protocolModuleOption[L7VS_PROTOMOD_OPT_LEN];
-        unsigned char       reschedule;
-        char                sorryIpAddress[L7VS_IPADDR_LEN];
-        unsigned short      sorryPortNumber;
-        unsigned int        sorryThreshold;
-        unsigned char       sorryForceFlag;
-        unsigned long long  QoSThresholdUp;
-        unsigned long long  QoSThresholdDown;
-        unsigned long long  throughputUp;
-        unsigned long long  throughputDown;
-};
-
-struct rsdata {
-        unsigned short  index;
-        unsigned short  virtualServiceIndex;
-        char            ipAddress[L7VS_IPADDR_LEN];
-        unsigned short  portNumber;
-        unsigned short  forwardMode;
-        unsigned int    weight;
-        unsigned int    activeConn;
-        unsigned int    inactiveConn;
-};
-
-struct l7vsd_log_level {
-        l7vs::LOG_LEVEL_TAG   network;
-        l7vs::LOG_LEVEL_TAG   networkBandwidth;
-        l7vs::LOG_LEVEL_TAG   networkNumConnection;
-        l7vs::LOG_LEVEL_TAG   networkQoS;
-        l7vs::LOG_LEVEL_TAG   virtualService;
-        l7vs::LOG_LEVEL_TAG   realServer;
-        l7vs::LOG_LEVEL_TAG   realServerBalancing;
-        l7vs::LOG_LEVEL_TAG   sorryServer;
-        l7vs::LOG_LEVEL_TAG   replication;
-        l7vs::LOG_LEVEL_TAG   startStop;
-        l7vs::LOG_LEVEL_TAG   system;
-        l7vs::LOG_LEVEL_TAG   systemMemory;
-        l7vs::LOG_LEVEL_TAG   systemSocket;
-        l7vs::LOG_LEVEL_TAG   systemSignal;
-        l7vs::LOG_LEVEL_TAG   environment;
-        l7vs::LOG_LEVEL_TAG   environmentParameter;
-        l7vs::LOG_LEVEL_TAG   logger;
-        l7vs::LOG_LEVEL_TAG   parameter;
-        l7vs::LOG_LEVEL_TAG   event;
-        l7vs::LOG_LEVEL_TAG   schedule;
-        l7vs::LOG_LEVEL_TAG   program;
-        l7vs::LOG_LEVEL_TAG   protocol;
-        l7vs::LOG_LEVEL_TAG   module;
-};
-
-struct l7vsadm_log_level {
-        l7vs::LOG_LEVEL_TAG   parse;
-        l7vs::LOG_LEVEL_TAG   operate;
-        l7vs::LOG_LEVEL_TAG   communicate;
-        l7vs::LOG_LEVEL_TAG   configResult;
-        l7vs::LOG_LEVEL_TAG   common;
-        l7vs::LOG_LEVEL_TAG   logger;
-        l7vs::LOG_LEVEL_TAG   parameter;
-        l7vs::LOG_LEVEL_TAG   protocol;
-        l7vs::LOG_LEVEL_TAG   module;
-};
-
-struct l7snmpagent_log_level {
-        l7vs::LOG_LEVEL_TAG   startStop;
-        l7vs::LOG_LEVEL_TAG   managerReceive;
-        l7vs::LOG_LEVEL_TAG   managerSend;
-        l7vs::LOG_LEVEL_TAG   l7vsdReceive;
-        l7vs::LOG_LEVEL_TAG   l7vsdSend;
-        l7vs::LOG_LEVEL_TAG   logger;
-        l7vs::LOG_LEVEL_TAG   parameter;
-};
-
-struct l7_status {
-        char                    message[DISPLAYSTRING_LEN];
-        IPC_STATUS_TAG          snmpAgent;
-//    REPLICATION_MODE_TAG    replication;
-};
-
-class l7ag_store_mibdata
-{
-protected:
-        std::vector<vsdata>     vsdatalist;
-        std::vector<rsdata>     rsdatalist;
-        l7vsd_log_level         vsd_log;
-        l7vsadm_log_level       adm_log;
-        l7snmpagent_log_level   snmp_log;
-        l7_status               status;
-        netsnmp_table_data_set *vs_table_set;
-        netsnmp_table_data_set *rs_table_set;
-private:
-        l7ag_store_mibdata() {};
-        l7ag_store_mibdata(const l7ag_store_mibdata &) {};
-        l7ag_store_mibdata &operator=(const l7ag_store_mibdata &in_data) {
-                vsdatalist = in_data.vsdatalist;
-                rsdatalist = in_data.rsdatalist;
-                return *this;
-        };
-public:
-        static l7ag_store_mibdata &getInstance() {
-                static l7ag_store_mibdata instance;
-                return instance;
-        }
-
-        vsdata *getVS_first_data_point();
-        rsdata *getRS_first_data_point();
-        vsdata *getVS_data_point(std::vector<vsdata>::iterator);
-        rsdata *getRS_data_point(std::vector<rsdata>::iterator);
-        std::vector<vsdata>::iterator   getVS_first_data_iterator();
-        std::vector<rsdata>::iterator   getRS_first_data_iterator();
-
-        vsdata                 *getVSmibdata(std::size_t);
-        rsdata                 *getRSmibdata(std::size_t);
-        l7vsd_log_level        *getVsdLogmibdata();
-        l7vsadm_log_level      *getVsadmLogmibdata();
-        l7snmpagent_log_level  *getAgentLogmibdata();
-        l7_status              *getStatmibdata();
-
-        std::size_t getVSdatacount();
-        std::size_t getRSdatacount();
-
-        bool        addVSmibdata(struct l7ag_mibdata_payload_vs *);
-        bool        addRSmibdata(struct l7ag_mibdata_payload_rs *);
-        vsdata     *updateVSmibdata(std::size_t, l7ag_mibdata_payload_vs *);
-        rsdata     *updateRSmibdata(std::size_t, l7ag_mibdata_payload_rs *);
-
-        void    clearVSmibdata();
-        void    clearRSmibdata();
-        void    clearVsdLogmibdata();
-        void    clearVsadmLogmibdata();
-        void    clearAgentLogmibdata();
-        void    clearStatmibdata();
-        void    setVsdLogmibdata(l7vsd_log_level);
-        void    setVsadmLogmibdata(l7vsadm_log_level);
-        void    setAgentLogmibdata(l7snmpagent_log_level);
-        void    setStatmibdata(l7_status);
-        void    setVsTableSet(netsnmp_table_data_set *);
-        void    setRsTableSet(netsnmp_table_data_set *);
-};
-
-#endif //__STORE_MIBDATA_H__
diff --git a/snmpagent/subagent.cpp b/snmpagent/subagent.cpp
deleted file mode 100644 (file)
index 66fb832..0000000
+++ /dev/null
@@ -1,244 +0,0 @@
-#include <sstream>
-#include <sys/time.h>
-
-#include "error_code.h"
-#include "parameter.h"
-#include "subagent.h"
-#include "netsnmp_bridge.h"
-
-#define NIC_DEFAULT         "eth0"
-#define ADDR_DEFAULT        "127.0.0.1"
-#define PORT_DEFAULT        (60162)
-#define INTERVAL_DEFAULT    (1000)
-#define SLEEPNANOTIME       (1000000)
-
-
-/*!
- * l7ag_subagent class constructor
- */
-l7ag_subagent::l7ag_subagent()
-{
-        stop_flag   = false;
-        stat        = STOP;
-
-        dispatcher  = new l7ag_dispatcher(&msg_queue, &trap_queue);
-        messenger   = new MessengerClient(&msg_queue);
-
-        loglevelmap_init();
-}
-
-/*!
- * l7ag_subagent class destructor
- */
-l7ag_subagent::~l7ag_subagent()
-{
-        delete  messenger;
-        delete  dispatcher;
-}
-
-/*!
- * main loop
- */
-bool
-l7ag_subagent::start()
-{
-        struct timespec req;
-        req.tv_sec = 0;
-        req.tv_nsec = SLEEPNANOTIME;
-
-        // initialize
-        reload_config();
-
-        // convert int to string
-        std::stringstream   ss;
-        std::string         port;
-        ss << snmpparam.portno;
-        ss >> port;
-
-        messenger->setEndpoint(snmpparam.address.c_str(), port.c_str());
-
-        // start IPC thread
-        messenger->start();
-
-        // start dispatcher thread
-        dispatcher->start();
-
-        netsnmp_ds_set_boolean(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_ROLE, 1);
-        init_agent("l7snmpagent");
-        init_netsnmp_bridge(messenger);
-        init_snmp("l7snmpagent");
-
-        //loop
-        while (1) {
-                agent_check_and_process(0); // non-blocking
-                if (stop_flag) {
-                        //他スレッドの終了指示
-                        messenger->stop();
-                        dispatcher->stop();
-                        break;
-                }
-                //Trapキューチェック
-                //Trapキューにデータがある場合
-                if (!dispatcher->get_TrapQueue()->empty()) {
-                        //Trap値設定
-                        struct l7_status *stat = l7ag_store_mibdata::getInstance().getStatmibdata();
-                        strncpy(stat->message, dispatcher->get_TrapQueue()->front().message.c_str(), DISPLAYSTRING_LEN);
-                        l7ag_store_mibdata::getInstance().setStatmibdata(*stat);
-                        //Trap送信
-                        send_um7MessageAlert_trap();
-                        dispatcher->get_TrapQueue()->pop();
-                }
-
-                int ret = nanosleep(&req, NULL);
-                if (ret == -1) {
-                        break; // nanosleep failed
-                }
-        }
-        //finalize
-
-        //completed
-        return true;
-}
-
-/*!
- * stop main loop
- */
-void
-l7ag_subagent::stop()
-{
-        stop_flag = true;
-}
-
-void
-l7ag_subagent::reload_config()
-{
-        l7vs::Parameter        param;
-        l7vs::error_code    err;
-        //パラメータの読み込み
-        //NIC
-        snmpparam.nic = param.get_string(l7vs::PARAM_COMP_SNMPAGENT, "nic", err);
-        if (err) {
-                snmpparam.nic = NIC_DEFAULT;
-        }
-        //EndPoint
-        snmpparam.address = param.get_string(l7vs::PARAM_COMP_SNMPAGENT, "ip_addr", err);
-        if (err) {
-                snmpparam.address = ADDR_DEFAULT;
-        }
-        snmpparam.portno = param.get_int(l7vs::PARAM_COMP_SNMPAGENT, "port", err);
-        if (err) {
-                snmpparam.portno = PORT_DEFAULT;
-        }
-        //RequestInterval
-        snmpparam.interval = param.get_int(l7vs::PARAM_COMP_SNMPAGENT, "interval", err);
-        if (err) {
-                snmpparam.interval = INTERVAL_DEFAULT;
-        }
-        //status
-        snmpparam.status = param.get_int(l7vs::PARAM_COMP_SNMPAGENT, "status", err);
-        if (err) {
-                snmpparam.status = 0;
-        }
-
-        //loglevel設定
-        load_loglevel();
-}
-
-void
-l7ag_subagent::load_loglevel()
-{
-        l7vs::Parameter        param;
-        l7vs::error_code    err;
-        std::string            tmpstr;
-        //log level 取得
-        snmpparam.loglevel.clear();
-
-        tmpstr = param.get_string(l7vs::PARAM_COMP_LOGGER, "snmpagent_start_stop", err);
-        if (!err) {
-                snmpparam.loglevel.insert(
-                        std::pair<l7vs::LOG_CATEGORY_TAG, l7vs::LOG_LEVEL_TAG>(l7vs::LOG_CAT_SNMPAGENT_START_STOP,
-                                        levelstring_map[tmpstr]));
-        } else {
-                snmpparam.loglevel.insert(
-                        std::pair<l7vs::LOG_CATEGORY_TAG, l7vs::LOG_LEVEL_TAG>(l7vs::LOG_CAT_SNMPAGENT_START_STOP,
-                                        l7vs::LOG_LV_INFO));
-        }
-
-        tmpstr = param.get_string(l7vs::PARAM_COMP_LOGGER, "snmpagent_manager_receive", err);
-        if (!err) {
-                snmpparam.loglevel.insert(
-                        std::pair<l7vs::LOG_CATEGORY_TAG, l7vs::LOG_LEVEL_TAG>(l7vs::LOG_CAT_SNMPAGENT_MANAGER_RECEIVE,
-                                        levelstring_map[tmpstr]));
-        } else {
-                snmpparam.loglevel.insert(
-                        std::pair<l7vs::LOG_CATEGORY_TAG, l7vs::LOG_LEVEL_TAG>(l7vs::LOG_CAT_SNMPAGENT_MANAGER_RECEIVE,
-                                        l7vs::LOG_LV_INFO));
-        }
-
-        tmpstr = param.get_string(l7vs::PARAM_COMP_LOGGER, "snmpagent_manager_send", err);
-        if (!err) {
-                snmpparam.loglevel.insert(
-                        std::pair<l7vs::LOG_CATEGORY_TAG, l7vs::LOG_LEVEL_TAG>(l7vs::LOG_CAT_SNMPAGENT_MANAGER_SEND,
-                                        levelstring_map[tmpstr]));
-        } else {
-                snmpparam.loglevel.insert(
-                        std::pair<l7vs::LOG_CATEGORY_TAG, l7vs::LOG_LEVEL_TAG>(l7vs::LOG_CAT_SNMPAGENT_MANAGER_SEND,
-                                        l7vs::LOG_LV_INFO));
-        }
-
-        tmpstr = param.get_string(l7vs::PARAM_COMP_LOGGER, "snmpagent_l7vsd_receive", err);
-        if (!err) {
-                snmpparam.loglevel.insert(
-                        std::pair<l7vs::LOG_CATEGORY_TAG, l7vs::LOG_LEVEL_TAG>(l7vs::LOG_CAT_SNMPAGENT_L7VSD_RECEIVE,
-                                        levelstring_map[tmpstr]));
-        } else {
-                snmpparam.loglevel.insert(
-                        std::pair<l7vs::LOG_CATEGORY_TAG, l7vs::LOG_LEVEL_TAG>(l7vs::LOG_CAT_SNMPAGENT_L7VSD_RECEIVE,
-                                        l7vs::LOG_LV_INFO));
-        }
-
-        tmpstr = param.get_string(l7vs::PARAM_COMP_LOGGER, "snmpagent_l7vsd_send", err);
-        if (!err) {
-                snmpparam.loglevel.insert(
-                        std::pair<l7vs::LOG_CATEGORY_TAG, l7vs::LOG_LEVEL_TAG>(l7vs::LOG_CAT_SNMPAGENT_L7VSD_SEND,
-                                        levelstring_map[tmpstr]));
-        } else {
-                snmpparam.loglevel.insert(
-                        std::pair<l7vs::LOG_CATEGORY_TAG, l7vs::LOG_LEVEL_TAG>(l7vs::LOG_CAT_SNMPAGENT_L7VSD_SEND,
-                                        l7vs::LOG_LV_INFO));
-        }
-
-        tmpstr = param.get_string(l7vs::PARAM_COMP_LOGGER, "snmpagent_logger", err);
-        if (!err) {
-                snmpparam.loglevel.insert(
-                        std::pair<l7vs::LOG_CATEGORY_TAG, l7vs::LOG_LEVEL_TAG>(l7vs::LOG_CAT_SNMPAGENT_LOGGER,
-                                        levelstring_map[tmpstr]));
-        } else {
-                snmpparam.loglevel.insert(
-                        std::pair<l7vs::LOG_CATEGORY_TAG, l7vs::LOG_LEVEL_TAG>(l7vs::LOG_CAT_SNMPAGENT_LOGGER,
-                                        l7vs::LOG_LV_INFO));
-        }
-
-        tmpstr = param.get_string(l7vs::PARAM_COMP_LOGGER, "snmpagent_parameter", err);
-        if (!err) {
-                snmpparam.loglevel.insert(
-                        std::pair<l7vs::LOG_CATEGORY_TAG, l7vs::LOG_LEVEL_TAG>(l7vs::LOG_CAT_SNMPAGENT_PARAMETER,
-                                        levelstring_map[tmpstr]));
-        } else {
-                snmpparam.loglevel.insert(
-                        std::pair<l7vs::LOG_CATEGORY_TAG, l7vs::LOG_LEVEL_TAG>(l7vs::LOG_CAT_SNMPAGENT_PARAMETER,
-                                        l7vs::LOG_LV_INFO));
-        }
-}
-
-void
-l7ag_subagent::loglevelmap_init()
-{
-        //loglevelのテーブル作成
-        levelstring_map.clear();
-        levelstring_map.insert(std::pair<std::string, l7vs::LOG_LEVEL_TAG>("debug", l7vs::LOG_LV_DEBUG));
-        levelstring_map.insert(std::pair<std::string, l7vs::LOG_LEVEL_TAG>("info", l7vs::LOG_LV_INFO));
-        levelstring_map.insert(std::pair<std::string, l7vs::LOG_LEVEL_TAG>("warn", l7vs::LOG_LV_WARN));
-        levelstring_map.insert(std::pair<std::string, l7vs::LOG_LEVEL_TAG>("error", l7vs::LOG_LV_ERROR));
-        levelstring_map.insert(std::pair<std::string, l7vs::LOG_LEVEL_TAG>("fatal", l7vs::LOG_LV_FATAL));
-}
diff --git a/snmpagent/subagent.h b/snmpagent/subagent.h
deleted file mode 100644 (file)
index 3059fa1..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef __SUBAGENT_H__
-#define __SUBAGENT_H__
-
-#include "l7ag_parameter.h"
-#include "lockedqueue.h"
-#include "QueueContainer.h"
-#include "tag_threadstat.h"         // TODO no need? set only STOP. no read.
-#include "store_mibdata.h"
-#include "MessengerClient.h"
-#include "trapdata.h"
-#include "dispatcher.h"
-
-class l7ag_subagent
-{
-private:
-        l7ag_parameter snmpparam;
-        std::map<std::string, l7vs::LOG_LEVEL_TAG> levelstring_map;
-
-        bool            stop_flag;
-        THREAD_STAT_TAG stat;           // TODO no need? set only STOP. no read.
-
-        MessageQueue    msg_queue;
-        TrapQueue       trap_queue;
-
-        MessengerClient    *messenger;  // IPC class
-        l7ag_dispatcher    *dispatcher; // Dispatch class
-
-        void    reload_config();
-        void    load_loglevel();
-        void    loglevelmap_init();
-
-public:
-        l7ag_subagent();
-        ~l7ag_subagent();
-
-        bool    start();
-        void    stop();
-
-        l7ag_parameter *get_parameter() {
-                return &snmpparam;
-        }
-};
-
-#endif //__SUBAGENT_H__
diff --git a/snmpagent/tag_threadstat.h b/snmpagent/tag_threadstat.h
deleted file mode 100644 (file)
index 21ddd9a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __THREADSTAT_TAG_H__
-#define __THREADSTAT_TAG_H__
-
-enum    THREAD_STAT_TAG {
-        STOP,
-        INITIALIZING,
-        RUNNING,
-        FINALIZING,
-};
-
-#endif //__THREADSTAT_TAG_H__
diff --git a/snmpagent/tag_trapid.h b/snmpagent/tag_trapid.h
deleted file mode 100644 (file)
index f28bde2..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __TRAPID_TAG_H__
-#define __TRAPID_TAG_H__
-
-enum    TRAPID_TAG { id_error };
-
-#endif //__TRAPID_TAG_H__
diff --git a/snmpagent/trapdata.h b/snmpagent/trapdata.h
deleted file mode 100644 (file)
index 977a94a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __TRAPDATA_H__
-#define __TRAPDATA_H__
-
-#include <string>
-
-struct  trapdata {
-        std::string oid;
-        std::string message;
-};
-
-#endif//__TRAPDATA_H__
diff --git a/snmpagent/watch_l7vsd.cpp b/snmpagent/watch_l7vsd.cpp
deleted file mode 100644 (file)
index b238a51..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-
-#include "watch_l7vsd.h"
-
-/*!
- *
- */
-l7ag_watch_l7vsd::l7ag_watch_l7vsd()
-{
-
-
-}
-
-/*!
- *
- */
-l7ag_watch_l7vsd::l7ag_watch_l7vsd(l7ag_queuesendtrap *p_queueclass)
-{
-        set_TrapQueueClass(p_queueclass);
-}
-
-/*!
- *
- */
-l7ag_watch_l7vsd::~l7ag_watch_l7vsd()
-{
-
-
-}
-
-/*!
- *
- */
-void    l7ag_watch_l7vsd::start_thread()
-{
-
-
-}
-
-/*!
- *
- */
-void    l7ag_watch_l7vsd::stop_thread()
-{
-
-
-}
-
-/*!
- *
- */
-THREAD_STAT_TAG    l7ag_watch_l7vsd::get_threadstatus()
-{
-
-
-}
-
-/*!
- *
- */
-void     *l7ag_watch_l7vsd::watch(void *args)
-{
-
-
-}
-
diff --git a/snmpagent/watch_l7vsd.h b/snmpagent/watch_l7vsd.h
deleted file mode 100644 (file)
index 40ac46a..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef __WATCH_L7VSD_H__
-#define __WATCH_L7VSD_H__
-
-#include <string>
-#include "tag_threadstat.h"
-
-class    l7ag_queuesendtrap;
-class    l7ag_watch_l7vsd
-{
-private:
-        l7ag_queuesendtrap *queueclass;
-
-protected:
-        l7ag_watch_l7vsd();
-
-        static void *watch(void *args);
-
-public:
-        l7ag_watch_l7vsd(l7ag_queuesendtrap *p_queueclass);
-        ~l7ag_watch_l7vsd();
-
-        void    set_TrapQueueClass(l7ag_queuesendtrap *p_queueclass) {
-                queueclass = p_queueclass;
-        }
-
-        void    start_thread();
-        void    stop_thread();
-        THREAD_STAT_TAG    get_threadstatus();
-};
-
-#endif //__WATCH_L7VSD_H__