Imported Upstream version 2.6.0
This commit is contained in:
arnaud.quette@free.fr
parent
26fb71b504
commit
459aaf9392
510 changed files with 40508 additions and 18859 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# Makefile.in generated by automake 1.11 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
|
|
@ -38,12 +38,13 @@ subdir = include
|
|||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||
$(srcdir)/config.h.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_create_stdint_h.m4 \
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
|
||||
$(top_srcdir)/m4/ax_create_stdint_h.m4 \
|
||||
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
|
||||
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
|
||||
$(top_srcdir)/m4/lt~obsolete.m4 \
|
||||
$(top_srcdir)/m4/nut_arg_with.m4 \
|
||||
$(top_srcdir)/m4/nut_check_ipv6.m4 \
|
||||
$(top_srcdir)/m4/nut_check_asciidoc.m4 \
|
||||
$(top_srcdir)/m4/nut_check_libgd.m4 \
|
||||
$(top_srcdir)/m4/nut_check_libhal.m4 \
|
||||
$(top_srcdir)/m4/nut_check_libneon.m4 \
|
||||
|
|
@ -53,6 +54,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_create_stdint_h.m4 \
|
|||
$(top_srcdir)/m4/nut_check_libusb.m4 \
|
||||
$(top_srcdir)/m4/nut_check_libwrap.m4 \
|
||||
$(top_srcdir)/m4/nut_check_os.m4 \
|
||||
$(top_srcdir)/m4/nut_config_libhal.m4 \
|
||||
$(top_srcdir)/m4/nut_report_feature.m4 \
|
||||
$(top_srcdir)/m4/nut_type_socklen_t.m4 \
|
||||
$(top_srcdir)/configure.in
|
||||
|
|
@ -65,9 +67,11 @@ CONFIG_CLEAN_VPATH_FILES =
|
|||
SOURCES =
|
||||
DIST_SOURCES =
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
A2X = @A2X@
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AR = @AR@
|
||||
ASCIIDOC = @ASCIIDOC@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
AUTOHEADER = @AUTOHEADER@
|
||||
AUTOMAKE = @AUTOMAKE@
|
||||
|
|
@ -80,8 +84,10 @@ CONFPATH = @CONFPATH@
|
|||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DBLATEX = @DBLATEX@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DOC_BUILD_LIST = @DOC_BUILD_LIST@
|
||||
DRIVER_BUILD_LIST = @DRIVER_BUILD_LIST@
|
||||
DRIVER_INSTALL_TARGET = @DRIVER_INSTALL_TARGET@
|
||||
DRIVER_MAN_LIST = @DRIVER_MAN_LIST@
|
||||
|
|
@ -98,7 +104,6 @@ HAL_CALLOUTS_PATH = @HAL_CALLOUTS_PATH@
|
|||
HAL_DEVICE_MATCH_KEY = @HAL_DEVICE_MATCH_KEY@
|
||||
HAL_FDI_PATH = @HAL_FDI_PATH@
|
||||
HAL_USER = @HAL_USER@
|
||||
HAVE_GLIB_2_14 = @HAVE_GLIB_2_14@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
|
|
@ -109,22 +114,22 @@ LDFLAGS = @LDFLAGS@
|
|||
LIBGD_CFLAGS = @LIBGD_CFLAGS@
|
||||
LIBGD_LDFLAGS = @LIBGD_LDFLAGS@
|
||||
LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
|
||||
LIBHAL_LDFLAGS = @LIBHAL_LDFLAGS@
|
||||
LIBHAL_LIBS = @LIBHAL_LIBS@
|
||||
LIBNEON_CFLAGS = @LIBNEON_CFLAGS@
|
||||
LIBNEON_LDFLAGS = @LIBNEON_LDFLAGS@
|
||||
LIBNEON_LIBS = @LIBNEON_LIBS@
|
||||
LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@
|
||||
LIBNETSNMP_LDFLAGS = @LIBNETSNMP_LDFLAGS@
|
||||
LIBNETSNMP_LIBS = @LIBNETSNMP_LIBS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBPOWERMAN_CFLAGS = @LIBPOWERMAN_CFLAGS@
|
||||
LIBPOWERMAN_LDFLAGS = @LIBPOWERMAN_LDFLAGS@
|
||||
LIBPOWERMAN_LIBS = @LIBPOWERMAN_LIBS@
|
||||
LIBS = @LIBS@
|
||||
LIBSSL_CFLAGS = @LIBSSL_CFLAGS@
|
||||
LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@
|
||||
LIBSSL_LIBS = @LIBSSL_LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
|
||||
LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@
|
||||
LIBUSB_LIBS = @LIBUSB_LIBS@
|
||||
LIBWRAP_CFLAGS = @LIBWRAP_CFLAGS@
|
||||
LIBWRAP_LDFLAGS = @LIBWRAP_LDFLAGS@
|
||||
LIBWRAP_LIBS = @LIBWRAP_LIBS@
|
||||
LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
|
|
|
|||
|
|
@ -104,6 +104,7 @@ void fatalx(int status, const char *fmt, ...)
|
|||
__attribute__ ((__format__ (__printf__, 2, 3))) __attribute__((noreturn));
|
||||
|
||||
extern int nut_debug_level;
|
||||
extern int nut_log_level;
|
||||
|
||||
void *xmalloc(size_t size);
|
||||
void *xcalloc(size_t number, size_t size);
|
||||
|
|
|
|||
|
|
@ -30,10 +30,7 @@
|
|||
MSVC and with C++ compilers. */
|
||||
#undef FLEXIBLE_ARRAY_MEMBER
|
||||
|
||||
/* HAL device match key */
|
||||
#undef HAL_DEVICE_MATCH_KEY
|
||||
|
||||
/* HAL user */
|
||||
/* addons run as user */
|
||||
#undef HAL_USER
|
||||
|
||||
/* Define to 1 if you have the `atexit' function. */
|
||||
|
|
@ -45,6 +42,13 @@
|
|||
/* Define to 1 if C supports variable-length arrays. */
|
||||
#undef HAVE_C_VARARRAYS
|
||||
|
||||
/* Define to 1 if you have the <dbus/dbus-glib.h> header file. */
|
||||
#undef HAVE_DBUS_DBUS_GLIB_H
|
||||
|
||||
/* Define to 1 if you have the declaration of `LOG_UPTO', and to 0 if you
|
||||
don't. */
|
||||
#undef HAVE_DECL_LOG_UPTO
|
||||
|
||||
/* Define to 1 if you have the declaration of `optind', and to 0 if you don't.
|
||||
*/
|
||||
#undef HAVE_DECL_OPTIND
|
||||
|
|
@ -73,29 +77,23 @@
|
|||
/* Define to 1 if you have the `flock' function. */
|
||||
#undef HAVE_FLOCK
|
||||
|
||||
/* Define to 1 if you have the `freeaddrinfo' function. */
|
||||
#undef HAVE_FREEADDRINFO
|
||||
|
||||
/* Define to 1 if you have the <gdfontmb.h> header file. */
|
||||
#undef HAVE_GDFONTMB_H
|
||||
|
||||
/* Define to 1 if you have the <gd.h> header file. */
|
||||
#undef HAVE_GD_H
|
||||
|
||||
/* Define to 1 if you have the `getaddrinfo' function. */
|
||||
#undef HAVE_GETADDRINFO
|
||||
|
||||
/* Define to 1 if you have the <getopt.h> header file. */
|
||||
#undef HAVE_GETOPT_H
|
||||
|
||||
/* Define to 1 if you have the `getpassphrase' function. */
|
||||
#undef HAVE_GETPASSPHRASE
|
||||
|
||||
/* Define to 1 if GLib is version 2.14 or newer */
|
||||
#undef HAVE_GLIB_2_14
|
||||
/* Define to 1 if you have the <glib.h> header file. */
|
||||
#undef HAVE_GLIB_H
|
||||
|
||||
/* Define to 1 if you have the `inet_aton' function. */
|
||||
#undef HAVE_INET_ATON
|
||||
/* Define to 1 if you have the `g_timeout_add_seconds' function. */
|
||||
#undef HAVE_G_TIMEOUT_ADD_SECONDS
|
||||
|
||||
/* Define to 1 if you have the `init_snmp' function. */
|
||||
#undef HAVE_INIT_SNMP
|
||||
|
|
@ -103,9 +101,6 @@
|
|||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
#undef HAVE_INTTYPES_H
|
||||
|
||||
/* Define to enable IPv6 support */
|
||||
#undef HAVE_IPV6
|
||||
|
||||
/* Define if you have Boutell's libgd installed */
|
||||
#undef HAVE_LIBGD
|
||||
|
||||
|
|
@ -160,6 +155,9 @@
|
|||
/* Define to 1 if you have the `seteuid' function. */
|
||||
#undef HAVE_SETEUID
|
||||
|
||||
/* Define to 1 if you have the `setlogmask' function. */
|
||||
#undef HAVE_SETLOGMASK
|
||||
|
||||
/* Define to 1 if you have the `setsid' function. */
|
||||
#undef HAVE_SETSID
|
||||
|
||||
|
|
@ -193,18 +191,6 @@
|
|||
/* Define to 1 if you have the `strptime' function. */
|
||||
#undef HAVE_STRPTIME
|
||||
|
||||
/* Define to 1 if the system has the type `struct addrinfo'. */
|
||||
#undef HAVE_STRUCT_ADDRINFO
|
||||
|
||||
/* Define to 1 if the system has the type `struct in6_addr'. */
|
||||
#undef HAVE_STRUCT_IN6_ADDR
|
||||
|
||||
/* Define to 1 if the system has the type `struct sockaddr_in6'. */
|
||||
#undef HAVE_STRUCT_SOCKADDR_IN6
|
||||
|
||||
/* Define to 1 if the system has the type `struct sockaddr_storage'. */
|
||||
#undef HAVE_STRUCT_SOCKADDR_STORAGE
|
||||
|
||||
/* Define to 1 if you have the <sys/modem.h> header file. */
|
||||
#undef HAVE_SYS_MODEM_H
|
||||
|
||||
|
|
|
|||
|
|
@ -12,15 +12,15 @@
|
|||
#define ST_FLAG_IMMUTABLE 0x0004
|
||||
|
||||
/* list of possible ENUM values */
|
||||
struct enum_t {
|
||||
typedef struct enum_s {
|
||||
char *val;
|
||||
struct enum_t *next;
|
||||
};
|
||||
struct enum_s *next;
|
||||
} enum_t;
|
||||
|
||||
/* list of instant commands */
|
||||
struct cmdlist_t {
|
||||
typedef struct cmdlist_s {
|
||||
char *name;
|
||||
struct cmdlist_t *next;
|
||||
};
|
||||
struct cmdlist_s *next;
|
||||
} cmdlist_t;
|
||||
|
||||
#endif /* EXTSTATE_H_SEEN */
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
/* Autogenerated file. Do not change. */
|
||||
/* This file was generated by "make". */
|
||||
#define NUT_VERSION_MACRO "2.4.3-2365:2366"
|
||||
#define NUT_VERSION_MACRO "2.6.0-2831:2832"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,9 @@
|
|||
#define PARSECONF_H_SEEN 1
|
||||
|
||||
#ifdef __cplusplus
|
||||
/* *INDENT-OFF* */
|
||||
extern "C" {
|
||||
/* *INDENT-ON* */
|
||||
#endif
|
||||
|
||||
#define PCONF_CTX_t_MAGIC 0x00726630
|
||||
|
|
@ -69,7 +71,9 @@ char *pconf_encode(const char *src, char *dest, size_t destsize);
|
|||
int pconf_char(PCONF_CTX_t *ctx, char ch);
|
||||
|
||||
#ifdef __cplusplus
|
||||
/* *INDENT-OFF* */
|
||||
}
|
||||
/* *INDENT-ON* */
|
||||
#endif
|
||||
|
||||
#endif /* PARSECONF_H_SEEN */
|
||||
|
|
|
|||
|
|
@ -17,11 +17,14 @@
|
|||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifndef STATE_H_SEEN
|
||||
#define STATE_H_SEEN
|
||||
|
||||
#include "extstate.h"
|
||||
|
||||
#define ST_SOCK_BUF_LEN 512
|
||||
|
||||
struct st_tree_t {
|
||||
typedef struct st_tree_s {
|
||||
char *var;
|
||||
char *val; /* points to raw or safe */
|
||||
|
||||
|
|
@ -34,24 +37,26 @@ struct st_tree_t {
|
|||
int flags;
|
||||
int aux;
|
||||
|
||||
struct enum_t *enum_list;
|
||||
struct enum_s *enum_list;
|
||||
|
||||
struct st_tree_t *left;
|
||||
struct st_tree_t *right;
|
||||
};
|
||||
struct st_tree_s *left;
|
||||
struct st_tree_s *right;
|
||||
} st_tree_t;
|
||||
|
||||
int state_setinfo(struct st_tree_t **nptr, const char *var, const char *val);
|
||||
int state_addenum(struct st_tree_t *root, const char *var, const char *val);
|
||||
int state_setaux(struct st_tree_t *root, const char *var, const char *auxs);
|
||||
const char *state_getinfo(struct st_tree_t *root, const char *var);
|
||||
int state_getflags(struct st_tree_t *root, const char *var);
|
||||
int state_getaux(struct st_tree_t *root, const char *var);
|
||||
const struct enum_t *state_getenumlist(struct st_tree_t *root, const char *var);
|
||||
void state_setflags(struct st_tree_t *root, const char *var, int numflags, char **flags);
|
||||
int state_addcmd(struct cmdlist_t **list, const char *cmd);
|
||||
void state_infofree(struct st_tree_t *node);
|
||||
void state_cmdfree(struct cmdlist_t *list);
|
||||
int state_delcmd(struct cmdlist_t **list, const char *cmd);
|
||||
int state_delinfo(struct st_tree_t **root, const char *var);
|
||||
int state_delenum(struct st_tree_t *root, const char *var, const char *val);
|
||||
struct st_tree_t *state_tree_find(struct st_tree_t *node, const char *var);
|
||||
int state_setinfo(st_tree_t **nptr, const char *var, const char *val);
|
||||
int state_addenum(st_tree_t *root, const char *var, const char *val);
|
||||
int state_setaux(st_tree_t *root, const char *var, const char *auxs);
|
||||
const char *state_getinfo(st_tree_t *root, const char *var);
|
||||
int state_getflags(st_tree_t *root, const char *var);
|
||||
int state_getaux(st_tree_t *root, const char *var);
|
||||
const enum_t *state_getenumlist(st_tree_t *root, const char *var);
|
||||
void state_setflags(st_tree_t *root, const char *var, int numflags, char **flags);
|
||||
int state_addcmd(cmdlist_t **list, const char *cmd);
|
||||
void state_infofree(st_tree_t *node);
|
||||
void state_cmdfree(cmdlist_t *list);
|
||||
int state_delcmd(cmdlist_t **list, const char *cmd);
|
||||
int state_delinfo(st_tree_t **root, const char *var);
|
||||
int state_delenum(st_tree_t *root, const char *var, const char *val);
|
||||
st_tree_t *state_tree_find(st_tree_t *node, const char *var);
|
||||
|
||||
#endif /* STATE_H_SEEN */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue