Menu
▾
▴
[Ltp-cvs] ltp/testcases/open_hpi_testsuite/snmp Makefile.am, 1.1, 1.2 Makefile.in, 1.5, 1.6 snmp_utils.c, 1.1, 1.2
|
From: Subrata <sub...@us...> - 2008-07-26 03:52:23
|
Update of /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/snmp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26022/ltp/testcases/open_hpi_testsuite/snmp Modified Files: Makefile.am Makefile.in snmp_utils.c Log Message: Update to OpenHPI 2.12.0 (see www.openhpi.org for more info) Index: Makefile.in =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/snmp/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.in 5 May 2008 11:18:19 -0000 1.5 --- Makefile.in 26 Jul 2008 03:51:48 -0000 1.6 *************** *** 1,7 **** ! # Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, --- 1,7 ---- ! # Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ! # 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, *************** *** 68,72 **** $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libopenhpi_snmp_la_LDFLAGS) $(LDFLAGS) -o $@ ! DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles --- 68,72 ---- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libopenhpi_snmp_la_LDFLAGS) $(LDFLAGS) -o $@ ! DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles *************** *** 96,102 **** CFLAGS = @CFLAGS@ CONFPATH = @CONFPATH@ - COV_CFLAGS = @COV_CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ CXXCPP = @CXXCPP@ --- 96,102 ---- CFLAGS = @CFLAGS@ CONFPATH = @CONFPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ + CRYPTO_LIB = @CRYPTO_LIB@ CXX = @CXX@ CXXCPP = @CXXCPP@ *************** *** 121,124 **** --- 121,125 ---- HPI_PKG = @HPI_PKG@ HPI_UTIL_PKG = @HPI_UTIL_PKG@ + ILO2_RIBCL = @ILO2_RIBCL@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ *************** *** 132,136 **** LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ - LIST_RESOURCES_THREADED = @LIST_RESOURCES_THREADED@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ --- 133,136 ---- *************** *** 139,145 **** MARSHALDIR = @MARSHALDIR@ MKDIR_P = @MKDIR_P@ ! NOCFLAGS = @NOCFLAGS@ ! NOCXXFLAGS = @NOCXXFLAGS@ OBJEXT = @OBJEXT@ OPENHPI_INCLUDES = @OPENHPI_INCLUDES@ OPENIPMI_CFLAGS = @OPENIPMI_CFLAGS@ --- 139,145 ---- MARSHALDIR = @MARSHALDIR@ MKDIR_P = @MKDIR_P@ ! OA_SOAP = @OA_SOAP@ OBJEXT = @OBJEXT@ + OH_SSL_INCLUDES = @OH_SSL_INCLUDES@ OPENHPI_INCLUDES = @OPENHPI_INCLUDES@ OPENIPMI_CFLAGS = @OPENIPMI_CFLAGS@ *************** *** 163,166 **** --- 163,167 ---- SNMPLIBS = @SNMPLIBS@ SNMP_BC = @SNMP_BC@ + SSLDIR = @SSLDIR@ SSL_LIB = @SSL_LIB@ STATIC_PLUGIN = @STATIC_PLUGIN@ *************** *** 174,181 **** --- 175,187 ---- VERSION = @VERSION@ WATCHDOG = @WATCHDOG@ + WITH_DOCBOOK2HTML = @WITH_DOCBOOK2HTML@ + WITH_ILO2_RIBCL = @WITH_ILO2_RIBCL@ WITH_IPMI = @WITH_IPMI@ + WITH_OA_SOAP = @WITH_OA_SOAP@ WITH_RTAS = @WITH_RTAS@ WITH_SNMP_BC = @WITH_SNMP_BC@ WITH_SYSFS = @WITH_SYSFS@ + XML2_INCLUDE = @XML2_INCLUDE@ + XML2_LIB = @XML2_LIB@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ *************** *** 236,240 **** MAINTAINERCLEANFILES = Makefile.in INCLUDES = @OPENHPI_INCLUDES@ ! AM_CFLAGS = @CFLAGS@ @SNMPFLAGS@ lib_LTLIBRARIES = libopenhpi_snmp.la EXTRA_DIST = snmp_utils.h --- 242,246 ---- MAINTAINERCLEANFILES = Makefile.in INCLUDES = @OPENHPI_INCLUDES@ ! AM_CFLAGS = @SNMPFLAGS@ lib_LTLIBRARIES = libopenhpi_snmp.la EXTRA_DIST = snmp_utils.h *************** *** 281,286 **** if test -f $$p; then \ f=$(am__strip_dir) \ ! echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ! $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ else :; fi; \ done --- 287,292 ---- if test -f $$p; then \ f=$(am__strip_dir) \ ! echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ! $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ else :; fi; \ done *************** *** 290,295 **** @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ ! echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ! $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ done --- 296,301 ---- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ ! echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ! $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ done *************** *** 345,350 **** 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 --- 351,356 ---- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ ! $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ! END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS *************** *** 358,363 **** 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; \ --- 364,369 ---- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ ! $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ! END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ *************** *** 369,379 **** $(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) \ --- 375,384 ---- $(TAGS_FILES) $(LISP) tags=; \ 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; nonempty = 1; } \ ! END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ Index: Makefile.am =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/snmp/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 25 Jun 2007 15:48:46 -0000 1.1 --- Makefile.am 26 Jul 2008 03:51:48 -0000 1.2 *************** *** 13,17 **** INCLUDES = @OPENHPI_INCLUDES@ ! AM_CFLAGS = @CFLAGS@ @SNMPFLAGS@ lib_LTLIBRARIES = libopenhpi_snmp.la --- 13,17 ---- INCLUDES = @OPENHPI_INCLUDES@ ! AM_CFLAGS = @SNMPFLAGS@ lib_LTLIBRARIES = libopenhpi_snmp.la Index: snmp_utils.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/open_hpi_testsuite/snmp/snmp_utils.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** snmp_utils.c 25 Jun 2007 15:48:46 -0000 1.1 --- snmp_utils.c 26 Jul 2008 03:51:48 -0000 1.2 *************** *** 74,78 **** /* This is one of the exception condition */ returncode = SA_ERR_HPI_NOT_PRESENT; ! trace("Warning: OID=%s gets snmp exception %d \n",objid, vars->type); } else if ( (vars->type == ASN_INTEGER) || --- 74,78 ---- /* This is one of the exception condition */ returncode = SA_ERR_HPI_NOT_PRESENT; ! dbg("Warning: OID=%s gets snmp exception %d \n",objid, vars->type); } else if ( (vars->type == ASN_INTEGER) || *************** *** 93,98 **** } else { ! trace("Error in packet %s\nReason: %s\n", ! objid, snmp_errstring(response->errstat)); returncode = errstat2hpi(response->errstat); } --- 93,98 ---- } else { ! dbg("Error in packet %s\nReason: %s\n", ! objid, snmp_errstring(response->errstat)); returncode = errstat2hpi(response->errstat); } *************** *** 102,106 **** session = snmp_sess_session(sessp); snmp_sess_perror("snmpget", session); ! trace("OID %s, error status: %d\n",objid, status); returncode = snmpstat2hpi(status); } --- 102,106 ---- session = snmp_sess_session(sessp); snmp_sess_perror("snmpget", session); ! dbg("OID %s, error status: %d\n",objid, status); returncode = snmpstat2hpi(status); } *************** *** 158,162 **** default: rtncode = SA_ERR_HPI_INVALID_PARAMS; ! dbg("datatype %c not yet supported by snmp_set()\n", value.type); break; } --- 158,162 ---- default: rtncode = SA_ERR_HPI_INVALID_PARAMS; ! err("datatype %c not yet supported by snmp_set()\n", value.type); break; } *************** *** 251,255 **** /* This is one of the exception condition */ returncode = SA_ERR_HPI_NOT_PRESENT; ! trace("snmp exception %d \n",vars->type); } else if ( (vars->type == ASN_INTEGER) || --- 251,255 ---- /* This is one of the exception condition */ returncode = SA_ERR_HPI_NOT_PRESENT; ! dbg("snmp exception %d \n",vars->type); } else if ( (vars->type == ASN_INTEGER) || *************** *** 282,286 **** fprintf(stderr, "********************************************************\n"); } else { ! dbg("snmp_get2(): No idea.Unknown Type: %X", vars->type); fprint_variable(stderr, vars->name, --- 282,286 ---- fprintf(stderr, "********************************************************\n"); } else { ! err("snmp_get2(): No idea.Unknown Type: %X", vars->type); fprint_variable(stderr, vars->name, *************** *** 290,294 **** #endif } else { ! dbg("Error, Reason: %s", snmp_errstring(response->errstat)); fprintf(stderr, "objid: "); --- 290,294 ---- #endif } else { ! err("Error, Reason: %s", snmp_errstring(response->errstat)); fprintf(stderr, "objid: "); *************** *** 355,359 **** default: rtncode = SA_ERR_HPI_INVALID_PARAMS; ! dbg("datatype %c not yet supported by snmp_set2()", value->type); break; --- 355,359 ---- default: rtncode = SA_ERR_HPI_INVALID_PARAMS; ! err("datatype %c not yet supported by snmp_set2()", value->type); break; *************** *** 394,401 **** /* This is one of the exception condition */ rtncode = SA_ERR_HPI_NOT_PRESENT; ! dbg("snmp exception %d \n",vars->type); } } else { ! dbg("snmp_set2: Error in packet, Reason: %s", snmp_errstring(response->errstat)); rtncode = errstat2hpi(response->errstat); --- 394,401 ---- /* This is one of the exception condition */ rtncode = SA_ERR_HPI_NOT_PRESENT; ! err("snmp exception %d \n",vars->type); } } else { ! err("snmp_set2: Error in packet, Reason: %s", snmp_errstring(response->errstat)); rtncode = errstat2hpi(response->errstat); *************** *** 497,504 **** hpicode = SA_ERR_HPI_READ_ONLY; break; case SNMP_ERR_NOACCESS: case SNMP_ERR_AUTHORIZATIONERROR: case SNMP_ERR_INCONSISTENTNAME: - case SNMP_ERR_NOSUCHNAME: case SNMP_ERR_NOCREATION: hpicode = SA_ERR_HPI_INVALID_PARAMS; --- 497,506 ---- hpicode = SA_ERR_HPI_READ_ONLY; break; + case SNMP_ERR_NOSUCHNAME: + hpicode = SA_ERR_HPI_NOT_PRESENT; + break; case SNMP_ERR_NOACCESS: case SNMP_ERR_AUTHORIZATIONERROR: case SNMP_ERR_INCONSISTENTNAME: case SNMP_ERR_NOCREATION: hpicode = SA_ERR_HPI_INVALID_PARAMS; |