by applying a "patch" file typically created by the diff program.
endef
+CONFIGURE_ARGS+= --disable-xattr
+
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
--- /dev/null
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=alsa-lib
+PKG_VERSION:=1.0.27.2
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \
+ http://alsa.cybermirror.org/lib/
+PKG_MD5SUM:=69129a7c37697f81ac092335e9fa452b
+
+PKG_LICENSE:=LGPLv2.1 GPLv2
+PKG_LICENSE_FILE:=COPYING aserver/COPYING
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_USE_MIPS16:=0
+PKG_CHECK_FORMAT_SECURITY:=0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/alsa-lib
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=ALSA (Advanced Linux Sound Architecture) library
+ URL:=http://www.alsa-project.org/
+ MAINTAINER:=Peter Wagner <tripolar@gmx.at>
+ DEPENDS:=@AUDIO_SUPPORT +kmod-sound-core +libpthread +librt
+endef
+
+define Package/alsa-lib/description
+ This is the library package for alsa, needed by some userspace programs.
+ You must have enabled the ALSA support in the kernel.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+define Build/Configure
+ $(call Build/Configure/Default, \
+ --disable-python \
+ --disable-debug \
+ --without-debug \
+ $(SOFT_FLOAT_CONFIG_OPTION) \
+ --with-versioned=no \
+ )
+endef
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/include/
+ $(CP) \
+ $(PKG_INSTALL_DIR)/usr/include/alsa \
+ $(1)/usr/include/
+
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+ $(CP) \
+ $(PKG_INSTALL_DIR)/usr/lib/libasound.{la,so*} \
+ $(1)/usr/lib/
+ $(INSTALL_DATA) \
+ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/alsa.pc \
+ $(1)/usr/lib/pkgconfig/
+
+ $(INSTALL_DIR) $(1)/usr/share/aclocal
+ $(INSTALL_DATA) \
+ $(PKG_INSTALL_DIR)/usr/share/aclocal/alsa.m4 \
+ $(1)/usr/share/aclocal/
+endef
+
+define Package/alsa-lib/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) \
+ $(PKG_INSTALL_DIR)/usr/lib/libasound.so.* \
+ $(1)/usr/lib/
+
+ $(INSTALL_DIR) $(1)/usr/share/alsa/{cards,pcm}
+ $(INSTALL_DATA) \
+ $(PKG_INSTALL_DIR)/usr/share/alsa/alsa.conf \
+ $(1)/usr/share/alsa/
+ $(INSTALL_DATA) \
+ $(PKG_INSTALL_DIR)/usr/share/alsa/pcm/* \
+ $(1)/usr/share/alsa/pcm/
+ $(CP) \
+ $(PKG_INSTALL_DIR)/usr/share/alsa/cards/* \
+ $(1)/usr/share/alsa/cards/
+endef
+
+$(eval $(call BuildPackage,alsa-lib))
--- /dev/null
+diff --git a/src/Makefile.in b/src/Makefile.in
+index e21fc0d..c8f3ea0 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -419,7 +419,7 @@ clean-libLTLIBRARIES:
+ rm -f $${locs}; \
+ }
+ libasound.la: $(libasound_la_OBJECTS) $(libasound_la_DEPENDENCIES) $(EXTRA_libasound_la_DEPENDENCIES)
+- $(AM_V_CCLD)$(libasound_la_LINK) -rpath $(libdir) $(libasound_la_OBJECTS) $(libasound_la_LIBADD) $(LIBS)
++ $(AM_V_CCLD)$(libasound_la_LINK) -rpath $(DESTDIR)$(libdir) $(libasound_la_OBJECTS) $(libasound_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+diff --git a/src/pcm/scopes/Makefile.in b/src/pcm/scopes/Makefile.in
+index 469dbb5..391f3d4 100644
+--- a/src/pcm/scopes/Makefile.in
++++ b/src/pcm/scopes/Makefile.in
+@@ -348,7 +348,7 @@ clean-pkglibLTLIBRARIES:
+ rm -f $${locs}; \
+ }
+ scope-level.la: $(scope_level_la_OBJECTS) $(scope_level_la_DEPENDENCIES) $(EXTRA_scope_level_la_DEPENDENCIES)
+- $(AM_V_CCLD)$(scope_level_la_LINK) -rpath $(pkglibdir) $(scope_level_la_OBJECTS) $(scope_level_la_LIBADD) $(LIBS)
++ $(AM_V_CCLD)$(scope_level_la_LINK) -rpath $(DESTDIR)$(pkglibdir) $(scope_level_la_OBJECTS) $(scope_level_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
--- /dev/null
+diff --git a/configure.in b/configure.in
+index 00fff2b..af39300 100644
+--- a/configure.in
++++ b/configure.in
+@@ -24,22 +24,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+ AC_PREFIX_DEFAULT(/usr)
+
+-dnl Checks for programs.
+-
+-dnl try to gues cross-compiler if not set
+-if test "x$host" != "x$build" -a -z "`echo $CC | grep -e '-gcc'`";
+-then
+- AC_MSG_CHECKING(for cross-compiler)
+-
+- which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc
+- which ${host_cpu}-${host_os}-gcc >/dev/null 2>&1 \
+- && CC=${host_cpu}-${host_os}-gcc
+- which ${host_cpu}-${host_vendor}-${host_os}-gcc >/dev/null 2>&1 \
+- && CC=${host_cpu}-${host_vendor}-${host_os}-gcc
+-
+- AC_MSG_RESULT($CC)
+-fi
+-
+ CFLAGS="$CFLAGS -D_GNU_SOURCE"
+
+
--- /dev/null
+#
+# Copyright (C) 2007-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=glib2
+PKG_VERSION:=2.41.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
+PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION)
+PKG_SOURCE_URL:=@GNOME/glib/2.41
+PKG_MD5SUM:=bae557c87323e8df7ac30fb484b5cba9
+
+PKG_BUILD_DEPENDS:=glib2/host libpthread zlib libintl libffi
+HOST_BUILD_DEPENDS:=libintl/host libiconv/host libffi/host
+PKG_INSTALL:=1
+PKG_USE_MIPS16:=0
+
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/glib-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/glib2
+ SECTION:=libs
+ CATEGORY:=Libraries
+ DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS) +zlib +libpthread +libffi
+ TITLE:=glib 2.0
+ MAINTAINER:=Peter Wagner <tripolar@gmx.at>
+ URL:=http://www.gtk.org/
+endef
+
+define Package/glib2/description
+ The GLib library of C routines
+endef
+
+define Build/Configure
+ $(call Build/Configure/Default, \
+ --enable-shared \
+ --enable-static \
+ --enable-debug=no \
+ --disable-selinux \
+ --disable-fam \
+ $(if $(ICONV_FULL),--with-libiconv=gnu) \
+ , \
+ glib_cv_stack_grows=no \
+ glib_cv_uscore=no \
+ ac_cv_path_GLIB_GENMARSHAL=$(STAGING_DIR_HOST)/bin/glib-genmarshal \
+ ac_cv_func_mmap_fixed_mapped=yes \
+ ac_cv_func_posix_getpwuid_r=yes \
+ ac_cv_func_posix_getgrgid_r=yes \
+ );
+endef
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) \
+ $(PKG_INSTALL_DIR)/usr/include/glib-2.0 \
+ $(1)/usr/include/
+ $(CP) \
+ $(PKG_INSTALL_DIR)/usr/lib/glib-2.0/include/*.h \
+ $(1)/usr/include/glib-2.0/
+ $(CP) \
+ $(PKG_INSTALL_DIR)/usr/include/gio-unix-2.0 \
+ $(1)/usr/include/
+
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) \
+ $(PKG_INSTALL_DIR)/usr/lib/glib-2.0 \
+ $(1)/usr/lib/
+
+ $(CP) \
+ $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+ $(1)/usr/lib/
+
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+ $(INSTALL_DATA) \
+ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
+ $(1)/usr/lib/pkgconfig
+
+ $(INSTALL_DIR) $(2)/share/aclocal/
+ $(INSTALL_DATA) \
+ $(PKG_INSTALL_DIR)/usr/share/aclocal/*.m4 \
+ $(2)/share/aclocal/
+endef
+
+define Package/glib2/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) \
+ $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+ $(1)/usr/lib/
+endef
+
+$(eval $(call HostBuild))
+$(eval $(call BuildPackage,glib2))
--- /dev/null
+#
+# Copyright (C) 2009-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libffi
+PKG_VERSION:=3.0.13
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=ftp://sourceware.org/pub/libffi/
+PKG_MD5SUM:=45f3b6dbc9ee7c7dfbbbc5feba571529
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_USE_MIPS16:=0
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+
+define Package/libffi
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=Foreign Function Interface (FFI) library
+ URL:=http://sourceware.org/libffi/
+ MAINTAINER:=Peter Wagner <tripolar@gmx.at>
+endef
+
+define Package/libffi/description
+The libffi library provides a portable, high level programming interface to
+various calling conventions. This allows a programmer to call any function
+specified by a call interface description at run-time.
+
+FFI stands for Foreign Function Interface. A foreign function interface is the
+popular name for the interface that allows code written in one language to call
+code written in another language. The libffi library really only provides the
+lowest, machine dependent layer of a fully featured foreign function interface.
+A layer must exist above libffi that handles type conversions for values passed
+between the two languages.
+endef
+
+CONFIGURE_PATH = build
+CONFIGURE_CMD = ../configure
+MAKE_PATH = build
+
+define Build/Configure
+ mkdir -p $(PKG_BUILD_DIR)/build
+ $(Build/Configure/Default)
+endef
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+ $(CP) \
+ $(PKG_INSTALL_DIR)/usr/lib/libffi.{so*,a,la} \
+ $(1)/usr/lib/
+ $(CP) \
+ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+ $(1)/usr/lib/pkgconfig/
+
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) \
+ $(PKG_INSTALL_DIR)/usr/lib/libffi-$(PKG_VERSION)/include/*.h \
+ $(1)/usr/include/
+endef
+
+define Package/libffi/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) \
+ $(PKG_INSTALL_DIR)/usr/lib/libffi.so.* \
+ $(1)/usr/lib/
+endef
+
+$(eval $(call HostBuild))
+$(eval $(call BuildPackage,libffi))
--- /dev/null
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libgd
+PKG_VERSION:=2.1.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=https://bitbucket.org/libgd/gd-libgd/downloads
+PKG_MD5SUM:=03588159bf4faab9079849c8d709acc6
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=MIT
+
+PKG_FIXUP:=autoreconf
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libgd
+ SECTION:=libs
+ CATEGORY:=Libraries
+ DEPENDS:=+libjpeg +libpng
+ TITLE:=The GD graphics library
+ URL:=http://www.libgd.org/
+endef
+
+define Package/libgd/description
+ GD is an open source code library for the dynamic creation of images by
+ programmers. GD creates PNG, JPEG and GIF images, among other formats.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+ --enable-shared \
+ --enable-static \
+ --disable-rpath \
+ --without-x \
+ --without-fontconfig \
+ --without-freetype \
+ --with-jpeg=$(STAGING_DIR)/usr \
+ --with-png=$(STAGING_DIR)/usr \
+ --without-xpm \
+ --without-iconv
+
+CONFIGURE_VARS += \
+ LIBPNG12_CONFIG="$(STAGING_DIR)/host/bin/libpng12-config" \
+ ac_cv_header_iconv_h=no
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/gdlib-config $(1)/usr/bin/
+ $(SED) \
+ 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
+ $(1)/usr/bin/gdlib-config
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/entities.h $(1)/usr/include/
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/gd{,_io,cache,fontg,fontl,fontmb,fonts,fontt,fx}.h \
+ $(1)/usr/include/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgd.{a,la,so*} $(1)/usr/lib/
+ $(INSTALL_DIR) $(2)/bin
+ $(LN) ../../usr/bin/gdlib-config $(2)/bin/
+endef
+
+define Package/libgd/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgd.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libgd))
--- /dev/null
+--- a/config/gdlib-config.in
++++ b/config/gdlib-config.in
+@@ -71,7 +71,7 @@ while test $# -gt 0; do
+ echo @LDFLAGS@
+ ;;
+ --libs)
+- echo -lgd @LIBS@ @LIBICONV@
++ echo -lgd @LIBS@
+ ;;
+ --cflags|--includes)
+ echo -I@includedir@
+@@ -84,7 +84,7 @@ while test $# -gt 0; do
+ echo "includedir: $includedir"
+ echo "cflags: -I@includedir@"
+ echo "ldflags: @LDFLAGS@"
+- echo "libs: @LIBS@ @LIBICONV@"
++ echo "libs: @LIBS@"
+ echo "libdir: $libdir"
+ echo "features: @FEATURES@"
+ ;;
--- /dev/null
+--- a/src/gd_bmp.c
++++ b/src/gd_bmp.c
+@@ -21,6 +21,7 @@
+ #include <math.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <features.h>
+ #include "gd.h"
+ #include "gdhelpers.h"
+ #include "bmp.h"
+@@ -42,6 +43,13 @@ static int bmp_read_rle(gdImagePtr im, g
+
+ #define BMP_DEBUG(s)
+
++#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LONG_DOUBLE_MATH__)
++long double ceill(long double x)
++{
++ return (long double)ceil((double)x);
++}
++#endif
++
+ static int gdBMPPutWord(gdIOCtx *out, int w)
+ {
+ /* Byte order is little-endian */
--- /dev/null
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=jpeg
+PKG_VERSION:=6b
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)src.v$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/libjpeg
+PKG_MD5SUM:=dbd5f3b47ed13132f04c685d608a7547
+
+PKG_LICENSE:=IJG
+PKG_LICENSE_FILES:=README
+
+PKG_BUILD_PARALLEL:=1
+PKG_BUILD_DEPENDS:=libltdl
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/jpeg/Default
+ TITLE:=The Independent JPEG Group's JPEG
+ URL:=http://www.ijg.org/
+endef
+
+define Package/libjpeg
+ $(call Package/jpeg/Default)
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE+= runtime library
+endef
+
+define Package/jpeg-tools
+ $(call Package/jpeg/Default)
+ SECTION:=utils
+ CATEGORY:=Utilities
+ DEPENDS:=+libjpeg
+ TITLE+= manipulation tools
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+ --enable-shared \
+ --enable-static \
+
+HOST_CONFIGURE_ARGS += \
+ --enable-shared \
+ --enable-static \
+
+define Build/Prepare
+ $(call Build/Prepare/Default)
+ (cd $(PKG_BUILD_DIR); \
+ rm -f ltconfig ltmain.sh libtool; \
+ ln -s `which true` ltconfig; \
+ ln -s $(STAGING_DIR)/host/bin/libtool libtool; \
+ )
+endef
+
+define Build/Compile
+ $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/{include,lib,bin,man/man1}
+ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+ LIBTOOL="./libtool --tag=CC" \
+ prefix="$(PKG_INSTALL_DIR)/usr" \
+ exec_prefix="$(PKG_INSTALL_DIR)/usr" \
+ all
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ prefix="$(PKG_INSTALL_DIR)/usr" \
+ exec_prefix="$(PKG_INSTALL_DIR)/usr" \
+ install install-headers install-lib
+endef
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/jpeglib.h $(1)/usr/include/
+ $(CP) $(PKG_BUILD_DIR)/jpegint.h $(1)/usr/include/
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/j{config,error,morecfg}.h $(1)/usr/include/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.{a,so*} $(1)/usr/lib/
+endef
+
+define Package/libjpeg/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.so.* $(1)/usr/lib/
+endef
+
+define Package/jpeg-tools/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/*jpeg* $(1)/usr/bin/
+endef
+
+$(eval $(call HostBuild))
+$(eval $(call BuildPackage,libjpeg))
+$(eval $(call BuildPackage,jpeg-tools))
--- /dev/null
+--- a/makefile.cfg
++++ b/makefile.cfg
+@@ -168,7 +168,7 @@ libjpeg.a: @A2K_DEPS@ $(LIBOBJECTS)
+
+ # with libtool:
+ libjpeg.la: @A2K_DEPS@ $(LIBOBJECTS)
+- $(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \
++ $(LIBTOOL) --mode=link "$(CC)" -o libjpeg.la $(LIBOBJECTS) \
+ -rpath $(libdir) -version-info $(JPEG_LIB_VERSION)
+
+ # sample programs:
--- /dev/null
+#! /bin/sh -e
+
+# DP: Lossless-crop patch from <http://sylvana.net/jpegcrop/croppatch.tar.gz>
+# DP: by <guido@jpegclub.org>.
+
+case "$1" in
+ -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+ -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+esac
+exit 0
+@DPATCH@
+diff -urNad /home/bill/debian/libjpeg/libjpeg6b-6b/jerror.h libjpeg6b-6b/jerror.h
+--- /home/bill/debian/libjpeg/libjpeg6b-6b/jerror.h 2003-09-22 18:15:48.000000000 +0200
++++ libjpeg6b-6b/jerror.h 2003-09-22 18:16:12.000000000 +0200
+@@ -45,6 +45,7 @@
+ JMESSAGE(JERR_BAD_ALLOC_CHUNK, "MAX_ALLOC_CHUNK is wrong, please fix")
+ JMESSAGE(JERR_BAD_BUFFER_MODE, "Bogus buffer control mode")
+ JMESSAGE(JERR_BAD_COMPONENT_ID, "Invalid component ID %d in SOS")
++JMESSAGE(JERR_BAD_CROP_SPEC, "Invalid crop request")
+ JMESSAGE(JERR_BAD_DCT_COEF, "DCT coefficient out of range")
+ JMESSAGE(JERR_BAD_DCTSIZE, "IDCT output block size %d not supported")
+ JMESSAGE(JERR_BAD_HUFF_TABLE, "Bogus Huffman table definition")
+diff -urNad /home/bill/debian/libjpeg/libjpeg6b-6b/jpegtran.c libjpeg6b-6b/jpegtran.c
+--- /home/bill/debian/libjpeg/libjpeg6b-6b/jpegtran.c 2003-09-22 18:15:48.000000000 +0200
++++ libjpeg6b-6b/jpegtran.c 2003-09-22 18:16:22.000000000 +0200
+@@ -1,7 +1,7 @@
+ /*
+ * jpegtran.c
+ *
+- * Copyright (C) 1995-1997, Thomas G. Lane.
++ * Copyright (C) 1995-2001, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+@@ -64,8 +64,10 @@
+ #endif
+ #if TRANSFORMS_SUPPORTED
+ fprintf(stderr, "Switches for modifying the image:\n");
++ fprintf(stderr, " -crop WxH+X+Y Crop to a rectangular subarea\n");
+ fprintf(stderr, " -grayscale Reduce to grayscale (omit color data)\n");
+ fprintf(stderr, " -flip [horizontal|vertical] Mirror image (left-right or top-bottom)\n");
++ fprintf(stderr, " -perfect Fail if there is non-transformable edge blocks\n");
+ fprintf(stderr, " -rotate [90|180|270] Rotate image (degrees clockwise)\n");
+ fprintf(stderr, " -transpose Transpose image\n");
+ fprintf(stderr, " -transverse Transverse transpose image\n");
+@@ -133,7 +135,9 @@
+ copyoption = JCOPYOPT_DEFAULT;
+ transformoption.transform = JXFORM_NONE;
+ transformoption.trim = FALSE;
++ transformoption.perfect = FALSE;
+ transformoption.force_grayscale = FALSE;
++ transformoption.crop = FALSE;
+ cinfo->err->trace_level = 0;
+
+ /* Scan command line options, adjust parameters */
+@@ -160,7 +164,7 @@
+ exit(EXIT_FAILURE);
+ #endif
+
+- } else if (keymatch(arg, "copy", 1)) {
++ } else if (keymatch(arg, "copy", 2)) {
+ /* Select which extra markers to copy. */
+ if (++argn >= argc) /* advance to next argument */
+ usage();
+@@ -173,6 +177,20 @@
+ } else
+ usage();
+
++ } else if (keymatch(arg, "crop", 2)) {
++ /* Perform lossless cropping. */
++#if TRANSFORMS_SUPPORTED
++ if (++argn >= argc) /* advance to next argument */
++ usage();
++ if (! jtransform_parse_crop_spec(&transformoption, argv[argn])) {
++ fprintf(stderr, "%s: bogus -crop argument '%s'\n",
++ progname, argv[argn]);
++ exit(EXIT_FAILURE);
++ }
++#else
++ select_transform(JXFORM_NONE); /* force an error */
++#endif
++
+ } else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) {
+ /* Enable debug printouts. */
+ /* On first -d, print version identification */
+@@ -233,7 +251,12 @@
+ usage();
+ outfilename = argv[argn]; /* save it away for later use */
+
+- } else if (keymatch(arg, "progressive", 1)) {
++ } else if (keymatch(arg, "perfect", 2)) {
++ /* Fail if there is any partial edge MCUs that the transform can't
++ * handle. */
++ transformoption.perfect = TRUE;
++
++ } else if (keymatch(arg, "progressive", 2)) {
+ /* Select simple progressive mode. */
+ #ifdef C_PROGRESSIVE_SUPPORTED
+ simple_progressive = TRUE;
+@@ -342,8 +365,10 @@
+ jvirt_barray_ptr * src_coef_arrays;
+ jvirt_barray_ptr * dst_coef_arrays;
+ int file_index;
+- FILE * input_file;
+- FILE * output_file;
++ /* We assume all-in-memory processing and can therefore use only a
++ * single file pointer for sequential input and output operation.
++ */
++ FILE * fp;
+
+ /* On Mac, fetch a command line. */
+ #ifdef USE_CCOMMAND
+@@ -406,24 +431,13 @@
+
+ /* Open the input file. */
+ if (file_index < argc) {
+- if ((input_file = fopen(argv[file_index], READ_BINARY)) == NULL) {
+- fprintf(stderr, "%s: can't open %s\n", progname, argv[file_index]);
++ if ((fp = fopen(argv[file_index], READ_BINARY)) == NULL) {
++ fprintf(stderr, "%s: can't open %s for reading\n", progname, argv[file_index]);
+ exit(EXIT_FAILURE);
+ }
+ } else {
+ /* default input file is stdin */
+- input_file = read_stdin();
+- }
+-
+- /* Open the output file. */
+- if (outfilename != NULL) {
+- if ((output_file = fopen(outfilename, WRITE_BINARY)) == NULL) {
+- fprintf(stderr, "%s: can't open %s\n", progname, outfilename);
+- exit(EXIT_FAILURE);
+- }
+- } else {
+- /* default output file is stdout */
+- output_file = write_stdout();
++ fp = read_stdin();
+ }
+
+ #ifdef PROGRESS_REPORT
+@@ -431,7 +445,7 @@
+ #endif
+
+ /* Specify data source for decompression */
+- jpeg_stdio_src(&srcinfo, input_file);
++ jpeg_stdio_src(&srcinfo, fp);
+
+ /* Enable saving of extra markers that we want to copy */
+ jcopy_markers_setup(&srcinfo, copyoption);
+@@ -443,6 +457,15 @@
+ * jpeg_read_coefficients so that memory allocation will be done right.
+ */
+ #if TRANSFORMS_SUPPORTED
++ /* Fails right away if -perfect is given and transformation is not perfect.
++ */
++ if (transformoption.perfect &&
++ !jtransform_perfect_transform(srcinfo.image_width, srcinfo.image_height,
++ srcinfo.max_h_samp_factor * DCTSIZE, srcinfo.max_v_samp_factor * DCTSIZE,
++ transformoption.transform)) {
++ fprintf(stderr, "%s: transformation is not perfect\n", progname);
++ exit(EXIT_FAILURE);
++ }
+ jtransform_request_workspace(&srcinfo, &transformoption);
+ #endif
+
+@@ -463,11 +486,32 @@
+ dst_coef_arrays = src_coef_arrays;
+ #endif
+
++ /* Close input file, if we opened it.
++ * Note: we assume that jpeg_read_coefficients consumed all input
++ * until JPEG_REACHED_EOI, and that jpeg_finish_decompress will
++ * only consume more while (! cinfo->inputctl->eoi_reached).
++ * We cannot call jpeg_finish_decompress here since we still need the
++ * virtual arrays allocated from the source object for processing.
++ */
++ if (fp != stdin)
++ fclose(fp);
++
++ /* Open the output file. */
++ if (outfilename != NULL) {
++ if ((fp = fopen(outfilename, WRITE_BINARY)) == NULL) {
++ fprintf(stderr, "%s: can't open %s for writing\n", progname, outfilename);
++ exit(EXIT_FAILURE);
++ }
++ } else {
++ /* default output file is stdout */
++ fp = write_stdout();
++ }
++
+ /* Adjust default compression parameters by re-parsing the options */
+ file_index = parse_switches(&dstinfo, argc, argv, 0, TRUE);
+
+ /* Specify data destination for compression */
+- jpeg_stdio_dest(&dstinfo, output_file);
++ jpeg_stdio_dest(&dstinfo, fp);
+
+ /* Start compressor (note no image data is actually written here) */
+ jpeg_write_coefficients(&dstinfo, dst_coef_arrays);
+@@ -488,11 +532,9 @@
+ (void) jpeg_finish_decompress(&srcinfo);
+ jpeg_destroy_decompress(&srcinfo);
+
+- /* Close files, if we opened them */
+- if (input_file != stdin)
+- fclose(input_file);
+- if (output_file != stdout)
+- fclose(output_file);
++ /* Close output file, if we opened it */
++ if (fp != stdout)
++ fclose(fp);
+
+ #ifdef PROGRESS_REPORT
+ end_progress_monitor((j_common_ptr) &dstinfo);
+diff -urNad /home/bill/debian/libjpeg/libjpeg6b-6b/transupp.c libjpeg6b-6b/transupp.c
+--- /home/bill/debian/libjpeg/libjpeg6b-6b/transupp.c 2003-09-22 18:15:49.000000000 +0200
++++ libjpeg6b-6b/transupp.c 2003-09-22 18:16:28.000000000 +0200
+@@ -1,7 +1,7 @@
+ /*
+ * transupp.c
+ *
+- * Copyright (C) 1997, Thomas G. Lane.
++ * Copyright (C) 1997-2001, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+@@ -20,6 +20,7 @@
+ #include "jinclude.h"
+ #include "jpeglib.h"
+ #include "transupp.h" /* My own external interface */
++#include <ctype.h> /* to declare isdigit() */
+
+
+ #if TRANSFORMS_SUPPORTED
+@@ -28,7 +29,8 @@
+ * Lossless image transformation routines. These routines work on DCT
+ * coefficient arrays and thus do not require any lossy decompression
+ * or recompression of the image.
+- * Thanks to Guido Vollbeding for the initial design and code of this feature.
++ * Thanks to Guido Vollbeding for the initial design and code of this feature,
++ * and to Ben Jackson for introducing the cropping feature.
+ *
+ * Horizontal flipping is done in-place, using a single top-to-bottom
+ * pass through the virtual source array. It will thus be much the
+@@ -42,6 +44,13 @@
+ * arrays for most of the transforms. That could result in much thrashing
+ * if the image is larger than main memory.
+ *
++ * If cropping or trimming is involved, the destination arrays may be smaller
++ * than the source arrays. Note it is not possible to do horizontal flip
++ * in-place when a nonzero Y crop offset is specified, since we'd have to move
++ * data from one block row to another but the virtual array manager doesn't
++ * guarantee we can touch more than one row at a time. So in that case,
++ * we have to use a separate destination array.
++ *
+ * Some notes about the operating environment of the individual transform
+ * routines:
+ * 1. Both the source and destination virtual arrays are allocated from the
+@@ -54,20 +63,65 @@
+ * and we may as well take that as the effective iMCU size.
+ * 4. When "trim" is in effect, the destination's dimensions will be the
+ * trimmed values but the source's will be untrimmed.
+- * 5. All the routines assume that the source and destination buffers are
++ * 5. When "crop" is in effect, the destination's dimensions will be the
++ * cropped values but the source's will be uncropped. Each transform
++ * routine is responsible for picking up source data starting at the
++ * correct X and Y offset for the crop region. (The X and Y offsets
++ * passed to the transform routines are measured in iMCU blocks of the
++ * destination.)
++ * 6. All the routines assume that the source and destination buffers are
+ * padded out to a full iMCU boundary. This is true, although for the
+ * source buffer it is an undocumented property of jdcoefct.c.
+- * Notes 2,3,4 boil down to this: generally we should use the destination's
+- * dimensions and ignore the source's.
+ */
+
+
+ LOCAL(void)
+-do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
+- jvirt_barray_ptr *src_coef_arrays)
+-/* Horizontal flip; done in-place, so no separate dest array is required */
++do_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
++ JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
++ jvirt_barray_ptr *src_coef_arrays,
++ jvirt_barray_ptr *dst_coef_arrays)
++/* Crop. This is only used when no rotate/flip is requested with the crop. */
+ {
+- JDIMENSION MCU_cols, comp_width, blk_x, blk_y;
++ JDIMENSION dst_blk_y, x_crop_blocks, y_crop_blocks;
++ int ci, offset_y;
++ JBLOCKARRAY src_buffer, dst_buffer;
++ jpeg_component_info *compptr;
++
++ /* We simply have to copy the right amount of data (the destination's
++ * image size) starting at the given X and Y offsets in the source.
++ */
++ for (ci = 0; ci < dstinfo->num_components; ci++) {
++ compptr = dstinfo->comp_info + ci;
++ x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
++ y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
++ for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
++ dst_blk_y += compptr->v_samp_factor) {
++ dst_buffer = (*srcinfo->mem->access_virt_barray)
++ ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
++ (JDIMENSION) compptr->v_samp_factor, TRUE);
++ src_buffer = (*srcinfo->mem->access_virt_barray)
++ ((j_common_ptr) srcinfo, src_coef_arrays[ci],
++ dst_blk_y + y_crop_blocks,
++ (JDIMENSION) compptr->v_samp_factor, FALSE);
++ for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
++ jcopy_block_row(src_buffer[offset_y] + x_crop_blocks,
++ dst_buffer[offset_y],
++ compptr->width_in_blocks);
++ }
++ }
++ }
++}
++
++
++LOCAL(void)
++do_flip_h_no_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
++ JDIMENSION x_crop_offset,
++ jvirt_barray_ptr *src_coef_arrays)
++/* Horizontal flip; done in-place, so no separate dest array is required.
++ * NB: this only works when y_crop_offset is zero.
++ */
++{
++ JDIMENSION MCU_cols, comp_width, blk_x, blk_y, x_crop_blocks;
+ int ci, k, offset_y;
+ JBLOCKARRAY buffer;
+ JCOEFPTR ptr1, ptr2;
+@@ -79,17 +133,19 @@
+ * mirroring by changing the signs of odd-numbered columns.
+ * Partial iMCUs at the right edge are left untouched.
+ */
+- MCU_cols = dstinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE);
++ MCU_cols = srcinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE);
+
+ for (ci = 0; ci < dstinfo->num_components; ci++) {
+ compptr = dstinfo->comp_info + ci;
+ comp_width = MCU_cols * compptr->h_samp_factor;
++ x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
+ for (blk_y = 0; blk_y < compptr->height_in_blocks;
+ blk_y += compptr->v_samp_factor) {
+ buffer = (*srcinfo->mem->access_virt_barray)
+ ((j_common_ptr) srcinfo, src_coef_arrays[ci], blk_y,
+ (JDIMENSION) compptr->v_samp_factor, TRUE);
+ for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
++ /* Do the mirroring */
+ for (blk_x = 0; blk_x * 2 < comp_width; blk_x++) {
+ ptr1 = buffer[offset_y][blk_x];
+ ptr2 = buffer[offset_y][comp_width - blk_x - 1];
+@@ -105,6 +161,79 @@
+ *ptr2++ = -temp1;
+ }
+ }
++ if (x_crop_blocks > 0) {
++ /* Now left-justify the portion of the data to be kept.
++ * We can't use a single jcopy_block_row() call because that routine
++ * depends on memcpy(), whose behavior is unspecified for overlapping
++ * source and destination areas. Sigh.
++ */
++ for (blk_x = 0; blk_x < compptr->width_in_blocks; blk_x++) {
++ jcopy_block_row(buffer[offset_y] + blk_x + x_crop_blocks,
++ buffer[offset_y] + blk_x,
++ (JDIMENSION) 1);
++ }
++ }
++ }
++ }
++ }
++}
++
++
++LOCAL(void)
++do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
++ JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
++ jvirt_barray_ptr *src_coef_arrays,
++ jvirt_barray_ptr *dst_coef_arrays)
++/* Horizontal flip in general cropping case */
++{
++ JDIMENSION MCU_cols, comp_width, dst_blk_x, dst_blk_y;
++ JDIMENSION x_crop_blocks, y_crop_blocks;
++ int ci, k, offset_y;
++ JBLOCKARRAY src_buffer, dst_buffer;
++ JBLOCKROW src_row_ptr, dst_row_ptr;
++ JCOEFPTR src_ptr, dst_ptr;
++ jpeg_component_info *compptr;
++
++ /* Here we must output into a separate array because we can't touch
++ * different rows of a single virtual array simultaneously. Otherwise,
++ * this is essentially the same as the routine above.
++ */
++ MCU_cols = srcinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE);
++
++ for (ci = 0; ci < dstinfo->num_components; ci++) {
++ compptr = dstinfo->comp_info + ci;
++ comp_width = MCU_cols * compptr->h_samp_factor;
++ x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
++ y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
++ for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
++ dst_blk_y += compptr->v_samp_factor) {
++ dst_buffer = (*srcinfo->mem->access_virt_barray)
++ ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
++ (JDIMENSION) compptr->v_samp_factor, TRUE);
++ src_buffer = (*srcinfo->mem->access_virt_barray)
++ ((j_common_ptr) srcinfo, src_coef_arrays[ci],
++ dst_blk_y + y_crop_blocks,
++ (JDIMENSION) compptr->v_samp_factor, FALSE);
++ for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
++ dst_row_ptr = dst_buffer[offset_y];
++ src_row_ptr = src_buffer[offset_y];
++ for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) {
++ if (x_crop_blocks + dst_blk_x < comp_width) {
++ /* Do the mirrorable blocks */
++ dst_ptr = dst_row_ptr[dst_blk_x];
++ src_ptr = src_row_ptr[comp_width - x_crop_blocks - dst_blk_x - 1];
++ /* this unrolled loop doesn't need to know which row it's on... */
++ for (k = 0; k < DCTSIZE2; k += 2) {
++ *dst_ptr++ = *src_ptr++; /* copy even column */
++ *dst_ptr++ = - *src_ptr++; /* copy odd column with sign change */
++ }
++ } else {
++ /* Copy last partial block(s) verbatim */
++ jcopy_block_row(src_row_ptr + dst_blk_x + x_crop_blocks,
++ dst_row_ptr + dst_blk_x,
++ (JDIMENSION) 1);
++ }
++ }
+ }
+ }
+ }
+@@ -113,11 +242,13 @@
+
+ LOCAL(void)
+ do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
++ JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
+ jvirt_barray_ptr *src_coef_arrays,
+ jvirt_barray_ptr *dst_coef_arrays)
+ /* Vertical flip */
+ {
+ JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y;
++ JDIMENSION x_crop_blocks, y_crop_blocks;
+ int ci, i, j, offset_y;
+ JBLOCKARRAY src_buffer, dst_buffer;
+ JBLOCKROW src_row_ptr, dst_row_ptr;
+@@ -131,33 +262,38 @@
+ * of odd-numbered rows.
+ * Partial iMCUs at the bottom edge are copied verbatim.
+ */
+- MCU_rows = dstinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE);
++ MCU_rows = srcinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE);
+
+ for (ci = 0; ci < dstinfo->num_components; ci++) {
+ compptr = dstinfo->comp_info + ci;
+ comp_height = MCU_rows * compptr->v_samp_factor;
++ x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
++ y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
+ for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
+ dst_blk_y += compptr->v_samp_factor) {
+ dst_buffer = (*srcinfo->mem->access_virt_barray)
+ ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
+ (JDIMENSION) compptr->v_samp_factor, TRUE);
+- if (dst_blk_y < comp_height) {
++ if (y_crop_blocks + dst_blk_y < comp_height) {
+ /* Row is within the mirrorable area. */
+ src_buffer = (*srcinfo->mem->access_virt_barray)
+ ((j_common_ptr) srcinfo, src_coef_arrays[ci],
+- comp_height - dst_blk_y - (JDIMENSION) compptr->v_samp_factor,
++ comp_height - y_crop_blocks - dst_blk_y -
++ (JDIMENSION) compptr->v_samp_factor,
+ (JDIMENSION) compptr->v_samp_factor, FALSE);
+ } else {
+ /* Bottom-edge blocks will be copied verbatim. */
+ src_buffer = (*srcinfo->mem->access_virt_barray)
+- ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_y,
++ ((j_common_ptr) srcinfo, src_coef_arrays[ci],
++ dst_blk_y + y_crop_blocks,
+ (JDIMENSION) compptr->v_samp_factor, FALSE);
+ }
+ for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
+- if (dst_blk_y < comp_height) {
++ if (y_crop_blocks + dst_blk_y < comp_height) {
+ /* Row is within the mirrorable area. */
+ dst_row_ptr = dst_buffer[offset_y];
+ src_row_ptr = src_buffer[compptr->v_samp_factor - offset_y - 1];
++ src_row_ptr += x_crop_blocks;
+ for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
+ dst_blk_x++) {
+ dst_ptr = dst_row_ptr[dst_blk_x];
+@@ -173,7 +309,8 @@
+ }
+ } else {
+ /* Just copy row verbatim. */
+- jcopy_block_row(src_buffer[offset_y], dst_buffer[offset_y],
++ jcopy_block_row(src_buffer[offset_y] + x_crop_blocks,
++ dst_buffer[offset_y],
+ compptr->width_in_blocks);
+ }
+ }
+@@ -184,11 +321,12 @@
+
+ LOCAL(void)
+ do_transpose (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
++ JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
+ jvirt_barray_ptr *src_coef_arrays,
+ jvirt_barray_ptr *dst_coef_arrays)
+ /* Transpose source into destination */
+ {
+- JDIMENSION dst_blk_x, dst_blk_y;
++ JDIMENSION dst_blk_x, dst_blk_y, x_crop_blocks, y_crop_blocks;
+ int ci, i, j, offset_x, offset_y;
+ JBLOCKARRAY src_buffer, dst_buffer;
+ JCOEFPTR src_ptr, dst_ptr;
+@@ -201,6 +339,8 @@
+ */
+ for (ci = 0; ci < dstinfo->num_components; ci++) {
+ compptr = dstinfo->comp_info + ci;
++ x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
++ y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
+ for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
+ dst_blk_y += compptr->v_samp_factor) {
+ dst_buffer = (*srcinfo->mem->access_virt_barray)
+@@ -210,11 +350,12 @@
+ for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
+ dst_blk_x += compptr->h_samp_factor) {
+ src_buffer = (*srcinfo->mem->access_virt_barray)
+- ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x,
++ ((j_common_ptr) srcinfo, src_coef_arrays[ci],
++ dst_blk_x + x_crop_blocks,
+ (JDIMENSION) compptr->h_samp_factor, FALSE);
+ for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
+- src_ptr = src_buffer[offset_x][dst_blk_y + offset_y];
+ dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
++ src_ptr = src_buffer[offset_x][dst_blk_y + offset_y + y_crop_blocks];
+ for (i = 0; i < DCTSIZE; i++)
+ for (j = 0; j < DCTSIZE; j++)
+ dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+@@ -228,6 +369,7 @@
+
+ LOCAL(void)
+ do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
++ JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
+ jvirt_barray_ptr *src_coef_arrays,
+ jvirt_barray_ptr *dst_coef_arrays)
+ /* 90 degree rotation is equivalent to
+@@ -237,6 +379,7 @@
+ */
+ {
+ JDIMENSION MCU_cols, comp_width, dst_blk_x, dst_blk_y;
++ JDIMENSION x_crop_blocks, y_crop_blocks;
+ int ci, i, j, offset_x, offset_y;
+ JBLOCKARRAY src_buffer, dst_buffer;
+ JCOEFPTR src_ptr, dst_ptr;
+@@ -246,11 +389,13 @@
+ * at the (output) right edge properly. They just get transposed and
+ * not mirrored.
+ */
+- MCU_cols = dstinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE);
++ MCU_cols = srcinfo->image_height / (dstinfo->max_h_samp_factor * DCTSIZE);
+
+ for (ci = 0; ci < dstinfo->num_components; ci++) {
+ compptr = dstinfo->comp_info + ci;
+ comp_width = MCU_cols * compptr->h_samp_factor;
++ x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
++ y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
+ for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
+ dst_blk_y += compptr->v_samp_factor) {
+ dst_buffer = (*srcinfo->mem->access_virt_barray)
+@@ -259,15 +404,26 @@
+ for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
+ for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
+ dst_blk_x += compptr->h_samp_factor) {
+- src_buffer = (*srcinfo->mem->access_virt_barray)
+- ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x,
+- (JDIMENSION) compptr->h_samp_factor, FALSE);
++ if (x_crop_blocks + dst_blk_x < comp_width) {
++ /* Block is within the mirrorable area. */
++ src_buffer = (*srcinfo->mem->access_virt_barray)
++ ((j_common_ptr) srcinfo, src_coef_arrays[ci],
++ comp_width - x_crop_blocks - dst_blk_x -
++ (JDIMENSION) compptr->h_samp_factor,
++ (JDIMENSION) compptr->h_samp_factor, FALSE);
++ } else {
++ /* Edge blocks are transposed but not mirrored. */
++ src_buffer = (*srcinfo->mem->access_virt_barray)
++ ((j_common_ptr) srcinfo, src_coef_arrays[ci],
++ dst_blk_x + x_crop_blocks,
++ (JDIMENSION) compptr->h_samp_factor, FALSE);
++ }
+ for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
+- src_ptr = src_buffer[offset_x][dst_blk_y + offset_y];
+- if (dst_blk_x < comp_width) {
++ dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
++ if (x_crop_blocks + dst_blk_x < comp_width) {
+ /* Block is within the mirrorable area. */
+- dst_ptr = dst_buffer[offset_y]
+- [comp_width - dst_blk_x - offset_x - 1];
++ src_ptr = src_buffer[compptr->h_samp_factor - offset_x - 1]
++ [dst_blk_y + offset_y + y_crop_blocks];
+ for (i = 0; i < DCTSIZE; i++) {
+ for (j = 0; j < DCTSIZE; j++)
+ dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+@@ -277,7 +433,8 @@
+ }
+ } else {
+ /* Edge blocks are transposed but not mirrored. */
+- dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
++ src_ptr = src_buffer[offset_x]
++ [dst_blk_y + offset_y + y_crop_blocks];
+ for (i = 0; i < DCTSIZE; i++)
+ for (j = 0; j < DCTSIZE; j++)
+ dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+@@ -292,6 +449,7 @@
+
+ LOCAL(void)
+ do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
++ JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
+ jvirt_barray_ptr *src_coef_arrays,
+ jvirt_barray_ptr *dst_coef_arrays)
+ /* 270 degree rotation is equivalent to
+@@ -301,6 +459,7 @@
+ */
+ {
+ JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y;
++ JDIMENSION x_crop_blocks, y_crop_blocks;
+ int ci, i, j, offset_x, offset_y;
+ JBLOCKARRAY src_buffer, dst_buffer;
+ JCOEFPTR src_ptr, dst_ptr;
+@@ -310,11 +469,13 @@
+ * at the (output) bottom edge properly. They just get transposed and
+ * not mirrored.
+ */
+- MCU_rows = dstinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE);
++ MCU_rows = srcinfo->image_width / (dstinfo->max_v_samp_factor * DCTSIZE);
+
+ for (ci = 0; ci < dstinfo->num_components; ci++) {
+ compptr = dstinfo->comp_info + ci;
+ comp_height = MCU_rows * compptr->v_samp_factor;
++ x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
++ y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
+ for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
+ dst_blk_y += compptr->v_samp_factor) {
+ dst_buffer = (*srcinfo->mem->access_virt_barray)
+@@ -324,14 +485,15 @@
+ for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
+ dst_blk_x += compptr->h_samp_factor) {
+ src_buffer = (*srcinfo->mem->access_virt_barray)
+- ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x,
++ ((j_common_ptr) srcinfo, src_coef_arrays[ci],
++ dst_blk_x + x_crop_blocks,
+ (JDIMENSION) compptr->h_samp_factor, FALSE);
+ for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
+ dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
+- if (dst_blk_y < comp_height) {
++ if (y_crop_blocks + dst_blk_y < comp_height) {
+ /* Block is within the mirrorable area. */
+ src_ptr = src_buffer[offset_x]
+- [comp_height - dst_blk_y - offset_y - 1];
++ [comp_height - y_crop_blocks - dst_blk_y - offset_y - 1];
+ for (i = 0; i < DCTSIZE; i++) {
+ for (j = 0; j < DCTSIZE; j++) {
+ dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+@@ -341,7 +503,8 @@
+ }
+ } else {
+ /* Edge blocks are transposed but not mirrored. */
+- src_ptr = src_buffer[offset_x][dst_blk_y + offset_y];
++ src_ptr = src_buffer[offset_x]
++ [dst_blk_y + offset_y + y_crop_blocks];
+ for (i = 0; i < DCTSIZE; i++)
+ for (j = 0; j < DCTSIZE; j++)
+ dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+@@ -356,6 +519,7 @@
+
+ LOCAL(void)
+ do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
++ JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
+ jvirt_barray_ptr *src_coef_arrays,
+ jvirt_barray_ptr *dst_coef_arrays)
+ /* 180 degree rotation is equivalent to
+@@ -365,89 +529,93 @@
+ */
+ {
+ JDIMENSION MCU_cols, MCU_rows, comp_width, comp_height, dst_blk_x, dst_blk_y;
++ JDIMENSION x_crop_blocks, y_crop_blocks;
+ int ci, i, j, offset_y;
+ JBLOCKARRAY src_buffer, dst_buffer;
+ JBLOCKROW src_row_ptr, dst_row_ptr;
+ JCOEFPTR src_ptr, dst_ptr;
+ jpeg_component_info *compptr;
+
+- MCU_cols = dstinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE);
+- MCU_rows = dstinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE);
++ MCU_cols = srcinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE);
++ MCU_rows = srcinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE);
+
+ for (ci = 0; ci < dstinfo->num_components; ci++) {
+ compptr = dstinfo->comp_info + ci;
+ comp_width = MCU_cols * compptr->h_samp_factor;
+ comp_height = MCU_rows * compptr->v_samp_factor;
++ x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
++ y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
+ for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
+ dst_blk_y += compptr->v_samp_factor) {
+ dst_buffer = (*srcinfo->mem->access_virt_barray)
+ ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y,
+ (JDIMENSION) compptr->v_samp_factor, TRUE);
+- if (dst_blk_y < comp_height) {
++ if (y_crop_blocks + dst_blk_y < comp_height) {
+ /* Row is within the vertically mirrorable area. */
+ src_buffer = (*srcinfo->mem->access_virt_barray)
+ ((j_common_ptr) srcinfo, src_coef_arrays[ci],
+- comp_height - dst_blk_y - (JDIMENSION) compptr->v_samp_factor,
++ comp_height - y_crop_blocks - dst_blk_y -
++ (JDIMENSION) compptr->v_samp_factor,
+ (JDIMENSION) compptr->v_samp_factor, FALSE);
+ } else {
+ /* Bottom-edge rows are only mirrored horizontally. */
+ src_buffer = (*srcinfo->mem->access_virt_barray)
+- ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_y,
++ ((j_common_ptr) srcinfo, src_coef_arrays[ci],
++ dst_blk_y + y_crop_blocks,
+ (JDIMENSION) compptr->v_samp_factor, FALSE);
+ }
+ for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
+- if (dst_blk_y < comp_height) {
++ dst_row_ptr = dst_buffer[offset_y];
++ if (y_crop_blocks + dst_blk_y < comp_height) {
+ /* Row is within the mirrorable area. */
+- dst_row_ptr = dst_buffer[offset_y];
+ src_row_ptr = src_buffer[compptr->v_samp_factor - offset_y - 1];
+- /* Process the blocks that can be mirrored both ways. */
+- for (dst_blk_x = 0; dst_blk_x < comp_width; dst_blk_x++) {
++ for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) {
+ dst_ptr = dst_row_ptr[dst_blk_x];
+- src_ptr = src_row_ptr[comp_width - dst_blk_x - 1];
+- for (i = 0; i < DCTSIZE; i += 2) {
+- /* For even row, negate every odd column. */
+- for (j = 0; j < DCTSIZE; j += 2) {
+- *dst_ptr++ = *src_ptr++;
+- *dst_ptr++ = - *src_ptr++;
++ if (x_crop_blocks + dst_blk_x < comp_width) {
++ /* Process the blocks that can be mirrored both ways. */
++ src_ptr = src_row_ptr[comp_width - x_crop_blocks - dst_blk_x - 1];
++ for (i = 0; i < DCTSIZE; i += 2) {
++ /* For even row, negate every odd column. */
++ for (j = 0; j < DCTSIZE; j += 2) {
++ *dst_ptr++ = *src_ptr++;
++ *dst_ptr++ = - *src_ptr++;
++ }
++ /* For odd row, negate every even column. */
++ for (j = 0; j < DCTSIZE; j += 2) {
++ *dst_ptr++ = - *src_ptr++;
++ *dst_ptr++ = *src_ptr++;
++ }
+ }
+- /* For odd row, negate every even column. */
+- for (j = 0; j < DCTSIZE; j += 2) {
+- *dst_ptr++ = - *src_ptr++;
+- *dst_ptr++ = *src_ptr++;
++ } else {
++ /* Any remaining right-edge blocks are only mirrored vertically. */
++ src_ptr = src_row_ptr[x_crop_blocks + dst_blk_x];
++ for (i = 0; i < DCTSIZE; i += 2) {
++ for (j = 0; j < DCTSIZE; j++)
++ *dst_ptr++ = *src_ptr++;
++ for (j = 0; j < DCTSIZE; j++)
++ *dst_ptr++ = - *src_ptr++;
+ }
+ }
+ }
+- /* Any remaining right-edge blocks are only mirrored vertically. */
+- for (; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) {
+- dst_ptr = dst_row_ptr[dst_blk_x];
+- src_ptr = src_row_ptr[dst_blk_x];
+- for (i = 0; i < DCTSIZE; i += 2) {
+- for (j = 0; j < DCTSIZE; j++)
+- *dst_ptr++ = *src_ptr++;
+- for (j = 0; j < DCTSIZE; j++)
+- *dst_ptr++ = - *src_ptr++;
+- }
+- }
+ } else {
+ /* Remaining rows are just mirrored horizontally. */
+- dst_row_ptr = dst_buffer[offset_y];
+ src_row_ptr = src_buffer[offset_y];
+- /* Process the blocks that can be mirrored. */
+- for (dst_blk_x = 0; dst_blk_x < comp_width; dst_blk_x++) {
+- dst_ptr = dst_row_ptr[dst_blk_x];
+- src_ptr = src_row_ptr[comp_width - dst_blk_x - 1];
+- for (i = 0; i < DCTSIZE2; i += 2) {
+- *dst_ptr++ = *src_ptr++;
+- *dst_ptr++ = - *src_ptr++;
++ for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) {
++ if (x_crop_blocks + dst_blk_x < comp_width) {
++ /* Process the blocks that can be mirrored. */
++ dst_ptr = dst_row_ptr[dst_blk_x];
++ src_ptr = src_row_ptr[comp_width - x_crop_blocks - dst_blk_x - 1];
++ for (i = 0; i < DCTSIZE2; i += 2) {
++ *dst_ptr++ = *src_ptr++;
++ *dst_ptr++ = - *src_ptr++;
++ }
++ } else {
++ /* Any remaining right-edge blocks are only copied. */
++ jcopy_block_row(src_row_ptr + dst_blk_x + x_crop_blocks,
++ dst_row_ptr + dst_blk_x,
++ (JDIMENSION) 1);
+ }
+ }
+- /* Any remaining right-edge blocks are only copied. */
+- for (; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) {
+- dst_ptr = dst_row_ptr[dst_blk_x];
+- src_ptr = src_row_ptr[dst_blk_x];
+- for (i = 0; i < DCTSIZE2; i++)
+- *dst_ptr++ = *src_ptr++;
+- }
+ }
+ }
+ }
+@@ -457,6 +625,7 @@
+
+ LOCAL(void)
+ do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
++ JDIMENSION x_crop_offset, JDIMENSION y_crop_offset,
+ jvirt_barray_ptr *src_coef_arrays,
+ jvirt_barray_ptr *dst_coef_arrays)
+ /* Transverse transpose is equivalent to
+@@ -470,18 +639,21 @@
+ */
+ {
+ JDIMENSION MCU_cols, MCU_rows, comp_width, comp_height, dst_blk_x, dst_blk_y;
++ JDIMENSION x_crop_blocks, y_crop_blocks;
+ int ci, i, j, offset_x, offset_y;
+ JBLOCKARRAY src_buffer, dst_buffer;
+ JCOEFPTR src_ptr, dst_ptr;
+ jpeg_component_info *compptr;
+
+- MCU_cols = dstinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE);
+- MCU_rows = dstinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE);
++ MCU_cols = srcinfo->image_height / (dstinfo->max_h_samp_factor * DCTSIZE);
++ MCU_rows = srcinfo->image_width / (dstinfo->max_v_samp_factor * DCTSIZE);
+
+ for (ci = 0; ci < dstinfo->num_components; ci++) {
+ compptr = dstinfo->comp_info + ci;
+ comp_width = MCU_cols * compptr->h_samp_factor;
+ comp_height = MCU_rows * compptr->v_samp_factor;
++ x_crop_blocks = x_crop_offset * compptr->h_samp_factor;
++ y_crop_blocks = y_crop_offset * compptr->v_samp_factor;
+ for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks;
+ dst_blk_y += compptr->v_samp_factor) {
+ dst_buffer = (*srcinfo->mem->access_virt_barray)
+@@ -490,17 +662,26 @@
+ for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) {
+ for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks;
+ dst_blk_x += compptr->h_samp_factor) {
+- src_buffer = (*srcinfo->mem->access_virt_barray)
+- ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x,
+- (JDIMENSION) compptr->h_samp_factor, FALSE);
++ if (x_crop_blocks + dst_blk_x < comp_width) {
++ /* Block is within the mirrorable area. */
++ src_buffer = (*srcinfo->mem->access_virt_barray)
++ ((j_common_ptr) srcinfo, src_coef_arrays[ci],
++ comp_width - x_crop_blocks - dst_blk_x -
++ (JDIMENSION) compptr->h_samp_factor,
++ (JDIMENSION) compptr->h_samp_factor, FALSE);
++ } else {
++ src_buffer = (*srcinfo->mem->access_virt_barray)
++ ((j_common_ptr) srcinfo, src_coef_arrays[ci],
++ dst_blk_x + x_crop_blocks,
++ (JDIMENSION) compptr->h_samp_factor, FALSE);
++ }
+ for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) {
+- if (dst_blk_y < comp_height) {
+- src_ptr = src_buffer[offset_x]
+- [comp_height - dst_blk_y - offset_y - 1];
+- if (dst_blk_x < comp_width) {
++ dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
++ if (y_crop_blocks + dst_blk_y < comp_height) {
++ if (x_crop_blocks + dst_blk_x < comp_width) {
+ /* Block is within the mirrorable area. */
+- dst_ptr = dst_buffer[offset_y]
+- [comp_width - dst_blk_x - offset_x - 1];
++ src_ptr = src_buffer[compptr->h_samp_factor - offset_x - 1]
++ [comp_height - y_crop_blocks - dst_blk_y - offset_y - 1];
+ for (i = 0; i < DCTSIZE; i++) {
+ for (j = 0; j < DCTSIZE; j++) {
+ dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+@@ -516,7 +697,8 @@
+ }
+ } else {
+ /* Right-edge blocks are mirrored in y only */
+- dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
++ src_ptr = src_buffer[offset_x]
++ [comp_height - y_crop_blocks - dst_blk_y - offset_y - 1];
+ for (i = 0; i < DCTSIZE; i++) {
+ for (j = 0; j < DCTSIZE; j++) {
+ dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+@@ -526,11 +708,10 @@
+ }
+ }
+ } else {
+- src_ptr = src_buffer[offset_x][dst_blk_y + offset_y];
+- if (dst_blk_x < comp_width) {
++ if (x_crop_blocks + dst_blk_x < comp_width) {
+ /* Bottom-edge blocks are mirrored in x only */
+- dst_ptr = dst_buffer[offset_y]
+- [comp_width - dst_blk_x - offset_x - 1];
++ src_ptr = src_buffer[compptr->h_samp_factor - offset_x - 1]
++ [dst_blk_y + offset_y + y_crop_blocks];
+ for (i = 0; i < DCTSIZE; i++) {
+ for (j = 0; j < DCTSIZE; j++)
+ dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+@@ -540,7 +721,8 @@
+ }
+ } else {
+ /* At lower right corner, just transpose, no mirroring */
+- dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x];
++ src_ptr = src_buffer[offset_x]
++ [dst_blk_y + offset_y + y_crop_blocks];
+ for (i = 0; i < DCTSIZE; i++)
+ for (j = 0; j < DCTSIZE; j++)
+ dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j];
+@@ -554,8 +736,116 @@
+ }
+
+
++/* Parse an unsigned integer: subroutine for jtransform_parse_crop_spec.
++ * Returns TRUE if valid integer found, FALSE if not.
++ * *strptr is advanced over the digit string, and *result is set to its value.
++ */
++
++LOCAL(boolean)
++jt_read_integer (const char ** strptr, JDIMENSION * result)
++{
++ const char * ptr = *strptr;
++ JDIMENSION val = 0;
++
++ for (; isdigit(*ptr); ptr++) {
++ val = val * 10 + (JDIMENSION) (*ptr - '0');
++ }
++ *result = val;
++ if (ptr == *strptr)
++ return FALSE; /* oops, no digits */
++ *strptr = ptr;
++ return TRUE;
++}
++
++
++/* Parse a crop specification (written in X11 geometry style).
++ * The routine returns TRUE if the spec string is valid, FALSE if not.
++ *
++ * The crop spec string should have the format
++ * <width>x<height>{+-}<xoffset>{+-}<yoffset>
++ * where width, height, xoffset, and yoffset are unsigned integers.
++ * Each of the elements can be omitted to indicate a default value.
++ * (A weakness of this style is that it is not possible to omit xoffset
++ * while specifying yoffset, since they look alike.)
++ *
++ * This code is loosely based on XParseGeometry from the X11 distribution.
++ */
++
++GLOBAL(boolean)
++jtransform_parse_crop_spec (jpeg_transform_info *info, const char *spec)
++{
++ info->crop = FALSE;
++ info->crop_width_set = JCROP_UNSET;
++ info->crop_height_set = JCROP_UNSET;
++ info->crop_xoffset_set = JCROP_UNSET;
++ info->crop_yoffset_set = JCROP_UNSET;
++
++ if (isdigit(*spec)) {
++ /* fetch width */
++ if (! jt_read_integer(&spec, &info->crop_width))
++ return FALSE;
++ info->crop_width_set = JCROP_POS;
++ }
++ if (*spec == 'x' || *spec == 'X') {
++ /* fetch height */
++ spec++;
++ if (! jt_read_integer(&spec, &info->crop_height))
++ return FALSE;
++ info->crop_height_set = JCROP_POS;
++ }
++ if (*spec == '+' || *spec == '-') {
++ /* fetch xoffset */
++ info->crop_xoffset_set = (*spec == '-') ? JCROP_NEG : JCROP_POS;
++ spec++;
++ if (! jt_read_integer(&spec, &info->crop_xoffset))
++ return FALSE;
++ }
++ if (*spec == '+' || *spec == '-') {
++ /* fetch yoffset */
++ info->crop_yoffset_set = (*spec == '-') ? JCROP_NEG : JCROP_POS;
++ spec++;
++ if (! jt_read_integer(&spec, &info->crop_yoffset))
++ return FALSE;
++ }
++ /* We had better have gotten to the end of the string. */
++ if (*spec != '\0')
++ return FALSE;
++ info->crop = TRUE;
++ return TRUE;
++}
++
++
++/* Trim off any partial iMCUs on the indicated destination edge */
++
++LOCAL(void)
++trim_right_edge (jpeg_transform_info *info, JDIMENSION full_width)
++{
++ JDIMENSION MCU_cols;
++
++ MCU_cols = info->output_width / (info->max_h_samp_factor * DCTSIZE);
++ if (MCU_cols > 0 && info->x_crop_offset + MCU_cols ==
++ full_width / (info->max_h_samp_factor * DCTSIZE))
++ info->output_width = MCU_cols * (info->max_h_samp_factor * DCTSIZE);
++}
++
++LOCAL(void)
++trim_bottom_edge (jpeg_transform_info *info, JDIMENSION full_height)
++{
++ JDIMENSION MCU_rows;
++
++ MCU_rows = info->output_height / (info->max_v_samp_factor * DCTSIZE);
++ if (MCU_rows > 0 && info->y_crop_offset + MCU_rows ==
++ full_height / (info->max_v_samp_factor * DCTSIZE))
++ info->output_height = MCU_rows * (info->max_v_samp_factor * DCTSIZE);
++}
++
++
+ /* Request any required workspace.
+ *
++ * This routine figures out the size that the output image will be
++ * (which implies that all the transform parameters must be set before
++ * it is called).
++ *
+ * We allocate the workspace virtual arrays from the source decompression
+ * object, so that all the arrays (both the original data and the workspace)
+ * will be taken into account while making memory management decisions.
+@@ -569,9 +859,13 @@
+ jpeg_transform_info *info)
+ {
+ jvirt_barray_ptr *coef_arrays = NULL;
++ boolean need_workspace, transpose_it;
+ jpeg_component_info *compptr;
+- int ci;
++ JDIMENSION xoffset, yoffset, width_in_iMCUs, height_in_iMCUs;
++ JDIMENSION width_in_blocks, height_in_blocks;
++ int ci, h_samp_factor, v_samp_factor;
+
++ /* Determine number of components in output image */
+ if (info->force_grayscale &&
+ srcinfo->jpeg_color_space == JCS_YCbCr &&
+ srcinfo->num_components == 3) {
+@@ -581,55 +875,181 @@
+ /* Process all the components */
+ info->num_components = srcinfo->num_components;
+ }
++ /* If there is only one output component, force the iMCU size to be 1;
++ * else use the source iMCU size. (This allows us to do the right thing
++ * when reducing color to grayscale, and also provides a handy way of
++ * cleaning up "funny" grayscale images whose sampling factors are not 1x1.)
++ */
+
+ switch (info->transform) {
++ case JXFORM_TRANSPOSE:
++ case JXFORM_TRANSVERSE:
++ case JXFORM_ROT_90:
++ case JXFORM_ROT_270:
++ info->output_width = srcinfo->image_height;
++ info->output_height = srcinfo->image_width;
++ if (info->num_components == 1) {
++ info->max_h_samp_factor = 1;
++ info->max_v_samp_factor = 1;
++ } else {
++ info->max_h_samp_factor = srcinfo->max_v_samp_factor;
++ info->max_v_samp_factor = srcinfo->max_h_samp_factor;
++ }
++ break;
++ default:
++ info->output_width = srcinfo->image_width;
++ info->output_height = srcinfo->image_height;
++ if (info->num_components == 1) {
++ info->max_h_samp_factor = 1;
++ info->max_v_samp_factor = 1;
++ } else {
++ info->max_h_samp_factor = srcinfo->max_h_samp_factor;
++ info->max_v_samp_factor = srcinfo->max_v_samp_factor;
++ }
++ break;
++ }
++
++ /* If cropping has been requested, compute the crop area's position and
++ * dimensions, ensuring that its upper left corner falls at an iMCU boundary.
++ */
++ if (info->crop) {
++ /* Insert default values for unset crop parameters */
++ if (info->crop_xoffset_set == JCROP_UNSET)
++ info->crop_xoffset = 0; /* default to +0 */
++ if (info->crop_yoffset_set == JCROP_UNSET)
++ info->crop_yoffset = 0; /* default to +0 */
++ if (info->crop_xoffset >= info->output_width ||
++ info->crop_yoffset >= info->output_height)
++ ERREXIT(srcinfo, JERR_BAD_CROP_SPEC);
++ if (info->crop_width_set == JCROP_UNSET)
++ info->crop_width = info->output_width - info->crop_xoffset;
++ if (info->crop_height_set == JCROP_UNSET)
++ info->crop_height = info->output_height - info->crop_yoffset;
++ /* Ensure parameters are valid */
++ if (info->crop_width <= 0 || info->crop_width > info->output_width ||
++ info->crop_height <= 0 || info->crop_height > info->output_height ||
++ info->crop_xoffset > info->output_width - info->crop_width ||
++ info->crop_yoffset > info->output_height - info->crop_height)
++ ERREXIT(srcinfo, JERR_BAD_CROP_SPEC);
++ /* Convert negative crop offsets into regular offsets */
++ if (info->crop_xoffset_set == JCROP_NEG)
++ xoffset = info->output_width - info->crop_width - info->crop_xoffset;
++ else
++ xoffset = info->crop_xoffset;
++ if (info->crop_yoffset_set == JCROP_NEG)
++ yoffset = info->output_height - info->crop_height - info->crop_yoffset;
++ else
++ yoffset = info->crop_yoffset;
++ /* Now adjust so that upper left corner falls at an iMCU boundary */
++ info->output_width =
++ info->crop_width + (xoffset % (info->max_h_samp_factor * DCTSIZE));
++ info->output_height =
++ info->crop_height + (yoffset % (info->max_v_samp_factor * DCTSIZE));
++ /* Save x/y offsets measured in iMCUs */
++ info->x_crop_offset = xoffset / (info->max_h_samp_factor * DCTSIZE);
++ info->y_crop_offset = yoffset / (info->max_v_samp_factor * DCTSIZE);
++ } else {
++ info->x_crop_offset = 0;
++ info->y_crop_offset = 0;
++ }
++
++ /* Figure out whether we need workspace arrays,
++ * and if so whether they are transposed relative to the source.
++ */
++ need_workspace = FALSE;
++ transpose_it = FALSE;
++ switch (info->transform) {
+ case JXFORM_NONE:
++ if (info->x_crop_offset != 0 || info->y_crop_offset != 0)
++ need_workspace = TRUE;
++ /* No workspace needed if neither cropping nor transforming */
++ break;
+ case JXFORM_FLIP_H:
+- /* Don't need a workspace array */
++ if (info->trim)
++ trim_right_edge(info, srcinfo->image_width);
++ if (info->y_crop_offset != 0)
++ need_workspace = TRUE;
++ /* do_flip_h_no_crop doesn't need a workspace array */
+ break;
+ case JXFORM_FLIP_V:
+- case JXFORM_ROT_180:
+- /* Need workspace arrays having same dimensions as source image.
+- * Note that we allocate arrays padded out to the next iMCU boundary,
+- * so that transform routines need not worry about missing edge blocks.
+- */
+- coef_arrays = (jvirt_barray_ptr *)
+- (*srcinfo->mem->alloc_small) ((j_common_ptr) srcinfo, JPOOL_IMAGE,
+- SIZEOF(jvirt_barray_ptr) * info->num_components);
+- for (ci = 0; ci < info->num_components; ci++) {
+- compptr = srcinfo->comp_info + ci;
+- coef_arrays[ci] = (*srcinfo->mem->request_virt_barray)
+- ((j_common_ptr) srcinfo, JPOOL_IMAGE, FALSE,
+- (JDIMENSION) jround_up((long) compptr->width_in_blocks,
+- (long) compptr->h_samp_factor),
+- (JDIMENSION) jround_up((long) compptr->height_in_blocks,
+- (long) compptr->v_samp_factor),
+- (JDIMENSION) compptr->v_samp_factor);
+- }
++ if (info->trim)
++ trim_bottom_edge(info, srcinfo->image_height);
++ /* Need workspace arrays having same dimensions as source image. */
++ need_workspace = TRUE;
+ break;
+ case JXFORM_TRANSPOSE:
++ /* transpose does NOT have to trim anything */
++ /* Need workspace arrays having transposed dimensions. */
++ need_workspace = TRUE;
++ transpose_it = TRUE;
++ break;
+ case JXFORM_TRANSVERSE:
++ if (info->trim) {
++ trim_right_edge(info, srcinfo->image_height);
++ trim_bottom_edge(info, srcinfo->image_width);
++ }
++ /* Need workspace arrays having transposed dimensions. */
++ need_workspace = TRUE;
++ transpose_it = TRUE;
++ break;
+ case JXFORM_ROT_90:
++ if (info->trim)
++ trim_right_edge(info, srcinfo->image_height);
++ /* Need workspace arrays having transposed dimensions. */
++ need_workspace = TRUE;
++ transpose_it = TRUE;
++ break;
++ case JXFORM_ROT_180:
++ if (info->trim) {
++ trim_right_edge(info, srcinfo->image_width);
++ trim_bottom_edge(info, srcinfo->image_height);
++ }
++ /* Need workspace arrays having same dimensions as source image. */
++ need_workspace = TRUE;
++ break;
+ case JXFORM_ROT_270:
+- /* Need workspace arrays having transposed dimensions.
+- * Note that we allocate arrays padded out to the next iMCU boundary,
+- * so that transform routines need not worry about missing edge blocks.
+- */
++ if (info->trim)
++ trim_bottom_edge(info, srcinfo->image_width);
++ /* Need workspace arrays having transposed dimensions. */
++ need_workspace = TRUE;
++ transpose_it = TRUE;
++ break;
++ }
++
++ /* Allocate workspace if needed.
++ * Note that we allocate arrays padded out to the next iMCU boundary,
++ * so that transform routines need not worry about missing edge blocks.
++ */
++ if (need_workspace) {
+ coef_arrays = (jvirt_barray_ptr *)
+ (*srcinfo->mem->alloc_small) ((j_common_ptr) srcinfo, JPOOL_IMAGE,
+- SIZEOF(jvirt_barray_ptr) * info->num_components);
++ SIZEOF(jvirt_barray_ptr) * info->num_components);
++ width_in_iMCUs = (JDIMENSION)
++ jdiv_round_up((long) info->output_width,
++ (long) (info->max_h_samp_factor * DCTSIZE));
++ height_in_iMCUs = (JDIMENSION)
++ jdiv_round_up((long) info->output_height,
++ (long) (info->max_v_samp_factor * DCTSIZE));
+ for (ci = 0; ci < info->num_components; ci++) {
+ compptr = srcinfo->comp_info + ci;
++ if (info->num_components == 1) {
++ /* we're going to force samp factors to 1x1 in this case */
++ h_samp_factor = v_samp_factor = 1;
++ } else if (transpose_it) {
++ h_samp_factor = compptr->v_samp_factor;
++ v_samp_factor = compptr->h_samp_factor;
++ } else {
++ h_samp_factor = compptr->h_samp_factor;
++ v_samp_factor = compptr->v_samp_factor;
++ }
++ width_in_blocks = width_in_iMCUs * h_samp_factor;
++ height_in_blocks = height_in_iMCUs * v_samp_factor;
+ coef_arrays[ci] = (*srcinfo->mem->request_virt_barray)
+ ((j_common_ptr) srcinfo, JPOOL_IMAGE, FALSE,
+- (JDIMENSION) jround_up((long) compptr->height_in_blocks,
+- (long) compptr->v_samp_factor),
+- (JDIMENSION) jround_up((long) compptr->width_in_blocks,
+- (long) compptr->h_samp_factor),
+- (JDIMENSION) compptr->h_samp_factor);
++ width_in_blocks, height_in_blocks, (JDIMENSION) v_samp_factor);
+ }
+- break;
+ }
++
+ info->workspace_coef_arrays = coef_arrays;
+ }
+
+@@ -642,14 +1062,8 @@
+ int tblno, i, j, ci, itemp;
+ jpeg_component_info *compptr;
+ JQUANT_TBL *qtblptr;
+- JDIMENSION dtemp;
+ UINT16 qtemp;
+
+- /* Transpose basic image dimensions */
+- dtemp = dstinfo->image_width;
+- dstinfo->image_width = dstinfo->image_height;
+- dstinfo->image_height = dtemp;
+-
+ /* Transpose sampling factors */
+ for (ci = 0; ci < dstinfo->num_components; ci++) {
+ compptr = dstinfo->comp_info + ci;
+@@ -674,46 +1088,159 @@
+ }
+
+
+-/* Trim off any partial iMCUs on the indicated destination edge */
++/* Adjust Exif image parameters.
++ *
++ * We try to adjust the Tags ExifImageWidth and ExifImageHeight if possible.
++ */
+
+ LOCAL(void)
+-trim_right_edge (j_compress_ptr dstinfo)
++adjust_exif_parameters (JOCTET FAR * data, unsigned int length,
++ JDIMENSION new_width, JDIMENSION new_height)
+ {
+- int ci, max_h_samp_factor;
+- JDIMENSION MCU_cols;
++ boolean is_motorola; /* Flag for byte order */
++ unsigned int number_of_tags, tagnum;
++ unsigned int firstoffset, offset;
++ JDIMENSION new_value;
+
+- /* We have to compute max_h_samp_factor ourselves,
+- * because it hasn't been set yet in the destination
+- * (and we don't want to use the source's value).
+- */
+- max_h_samp_factor = 1;
+- for (ci = 0; ci < dstinfo->num_components; ci++) {
+- int h_samp_factor = dstinfo->comp_info[ci].h_samp_factor;
+- max_h_samp_factor = MAX(max_h_samp_factor, h_samp_factor);
++ if (length < 12) return; /* Length of an IFD entry */
++
++ /* Discover byte order */
++ if (GETJOCTET(data[0]) == 0x49 && GETJOCTET(data[1]) == 0x49)
++ is_motorola = FALSE;
++ else if (GETJOCTET(data[0]) == 0x4D && GETJOCTET(data[1]) == 0x4D)
++ is_motorola = TRUE;
++ else
++ return;
++
++ /* Check Tag Mark */
++ if (is_motorola) {
++ if (GETJOCTET(data[2]) != 0) return;
++ if (GETJOCTET(data[3]) != 0x2A) return;
++ } else {
++ if (GETJOCTET(data[3]) != 0) return;
++ if (GETJOCTET(data[2]) != 0x2A) return;
+ }
+- MCU_cols = dstinfo->image_width / (max_h_samp_factor * DCTSIZE);
+- if (MCU_cols > 0) /* can't trim to 0 pixels */
+- dstinfo->image_width = MCU_cols * (max_h_samp_factor * DCTSIZE);
+-}
+
+-LOCAL(void)
+-trim_bottom_edge (j_compress_ptr dstinfo)
+-{
+- int ci, max_v_samp_factor;
+- JDIMENSION MCU_rows;
++ /* Get first IFD offset (offset to IFD0) */
++ if (is_motorola) {
++ if (GETJOCTET(data[4]) != 0) return;
++ if (GETJOCTET(data[5]) != 0) return;
++ firstoffset = GETJOCTET(data[6]);
++ firstoffset <<= 8;
++ firstoffset += GETJOCTET(data[7]);
++ } else {
++ if (GETJOCTET(data[7]) != 0) return;
++ if (GETJOCTET(data[6]) != 0) return;
++ firstoffset = GETJOCTET(data[5]);
++ firstoffset <<= 8;
++ firstoffset += GETJOCTET(data[4]);
++ }
++ if (firstoffset > length - 2) return; /* check end of data segment */
+
+- /* We have to compute max_v_samp_factor ourselves,
+- * because it hasn't been set yet in the destination
+- * (and we don't want to use the source's value).
+- */
+- max_v_samp_factor = 1;
+- for (ci = 0; ci < dstinfo->num_components; ci++) {
+- int v_samp_factor = dstinfo->comp_info[ci].v_samp_factor;
+- max_v_samp_factor = MAX(max_v_samp_factor, v_samp_factor);
++ /* Get the number of directory entries contained in this IFD */
++ if (is_motorola) {
++ number_of_tags = GETJOCTET(data[firstoffset]);
++ number_of_tags <<= 8;
++ number_of_tags += GETJOCTET(data[firstoffset+1]);
++ } else {
++ number_of_tags = GETJOCTET(data[firstoffset+1]);
++ number_of_tags <<= 8;
++ number_of_tags += GETJOCTET(data[firstoffset]);
+ }
+- MCU_rows = dstinfo->image_height / (max_v_samp_factor * DCTSIZE);
+- if (MCU_rows > 0) /* can't trim to 0 pixels */
+- dstinfo->image_height = MCU_rows * (max_v_samp_factor * DCTSIZE);
++ if (number_of_tags == 0) return;
++ firstoffset += 2;
++
++ /* Search for ExifSubIFD offset Tag in IFD0 */
++ for (;;) {
++ if (firstoffset > length - 12) return; /* check end of data segment */
++ /* Get Tag number */
++ if (is_motorola) {
++ tagnum = GETJOCTET(data[firstoffset]);
++ tagnum <<= 8;
++ tagnum += GETJOCTET(data[firstoffset+1]);
++ } else {
++ tagnum = GETJOCTET(data[firstoffset+1]);
++ tagnum <<= 8;
++ tagnum += GETJOCTET(data[firstoffset]);
++ }
++ if (tagnum == 0x8769) break; /* found ExifSubIFD offset Tag */
++ if (--number_of_tags == 0) return;
++ firstoffset += 12;
++ }
++
++ /* Get the ExifSubIFD offset */
++ if (is_motorola) {
++ if (GETJOCTET(data[firstoffset+8]) != 0) return;
++ if (GETJOCTET(data[firstoffset+9]) != 0) return;
++ offset = GETJOCTET(data[firstoffset+10]);
++ offset <<= 8;
++ offset += GETJOCTET(data[firstoffset+11]);
++ } else {
++ if (GETJOCTET(data[firstoffset+11]) != 0) return;
++ if (GETJOCTET(data[firstoffset+10]) != 0) return;
++ offset = GETJOCTET(data[firstoffset+9]);
++ offset <<= 8;
++ offset += GETJOCTET(data[firstoffset+8]);
++ }
++ if (offset > length - 2) return; /* check end of data segment */
++
++ /* Get the number of directory entries contained in this SubIFD */
++ if (is_motorola) {
++ number_of_tags = GETJOCTET(data[offset]);
++ number_of_tags <<= 8;
++ number_of_tags += GETJOCTET(data[offset+1]);
++ } else {
++ number_of_tags = GETJOCTET(data[offset+1]);
++ number_of_tags <<= 8;
++ number_of_tags += GETJOCTET(data[offset]);
++ }
++ if (number_of_tags < 2) return;
++ offset += 2;
++
++ /* Search for ExifImageWidth and ExifImageHeight Tags in this SubIFD */
++ do {
++ if (offset > length - 12) return; /* check end of data segment */
++ /* Get Tag number */
++ if (is_motorola) {
++ tagnum = GETJOCTET(data[offset]);
++ tagnum <<= 8;
++ tagnum += GETJOCTET(data[offset+1]);
++ } else {
++ tagnum = GETJOCTET(data[offset+1]);
++ tagnum <<= 8;
++ tagnum += GETJOCTET(data[offset]);
++ }
++ if (tagnum == 0xA002 || tagnum == 0xA003) {
++ if (tagnum == 0xA002)
++ new_value = new_width; /* ExifImageWidth Tag */
++ else
++ new_value = new_height; /* ExifImageHeight Tag */
++ if (is_motorola) {
++ data[offset+2] = 0; /* Format = unsigned long (4 octets) */
++ data[offset+3] = 4;
++ data[offset+4] = 0; /* Number Of Components = 1 */
++ data[offset+5] = 0;
++ data[offset+6] = 0;
++ data[offset+7] = 1;
++ data[offset+8] = 0;
++ data[offset+9] = 0;
++ data[offset+10] = (JOCTET)((new_value >> 8) & 0xFF);
++ data[offset+11] = (JOCTET)(new_value & 0xFF);
++ } else {
++ data[offset+2] = 4; /* Format = unsigned long (4 octets) */
++ data[offset+3] = 0;
++ data[offset+4] = 1; /* Number Of Components = 1 */
++ data[offset+5] = 0;
++ data[offset+6] = 0;
++ data[offset+7] = 0;
++ data[offset+8] = (JOCTET)(new_value & 0xFF);
++ data[offset+9] = (JOCTET)((new_value >> 8) & 0xFF);
++ data[offset+10] = 0;
++ data[offset+11] = 0;
++ }
++ }
++ offset += 12;
++ } while (--number_of_tags);
+ }
+
+
+@@ -736,18 +1263,22 @@
+ {
+ /* If force-to-grayscale is requested, adjust destination parameters */
+ if (info->force_grayscale) {
+- /* We use jpeg_set_colorspace to make sure subsidiary settings get fixed
+- * properly. Among other things, the target h_samp_factor & v_samp_factor
+- * will get set to 1, which typically won't match the source.
+- * In fact we do this even if the source is already grayscale; that
+- * provides an easy way of coercing a grayscale JPEG with funny sampling
+- * factors to the customary 1,1. (Some decoders fail on other factors.)
++ /* First, ensure we have YCbCr or grayscale data, and that the source's
++ * Y channel is full resolution. (No reasonable person would make Y
++ * be less than full resolution, so actually coping with that case
++ * isn't worth extra code space. But we check it to avoid crashing.)
+ */
+- if ((dstinfo->jpeg_color_space == JCS_YCbCr &&
+- dstinfo->num_components == 3) ||
+- (dstinfo->jpeg_color_space == JCS_GRAYSCALE &&
+- dstinfo->num_components == 1)) {
+- /* We have to preserve the source's quantization table number. */
++ if (((dstinfo->jpeg_color_space == JCS_YCbCr &&
++ dstinfo->num_components == 3) ||
++ (dstinfo->jpeg_color_space == JCS_GRAYSCALE &&
++ dstinfo->num_components == 1)) &&
++ srcinfo->comp_info[0].h_samp_factor == srcinfo->max_h_samp_factor &&
++ srcinfo->comp_info[0].v_samp_factor == srcinfo->max_v_samp_factor) {
++ /* We use jpeg_set_colorspace to make sure subsidiary settings get fixed
++ * properly. Among other things, it sets the target h_samp_factor &
++ * v_samp_factor to 1, which typically won't match the source.
++ * We have to preserve the source's quantization table number, however.
++ */
+ int sv_quant_tbl_no = dstinfo->comp_info[0].quant_tbl_no;
+ jpeg_set_colorspace(dstinfo, JCS_GRAYSCALE);
+ dstinfo->comp_info[0].quant_tbl_no = sv_quant_tbl_no;
+@@ -755,50 +1286,52 @@
+ /* Sorry, can't do it */
+ ERREXIT(dstinfo, JERR_CONVERSION_NOTIMPL);
+ }
++ } else if (info->num_components == 1) {
++ /* For a single-component source, we force the destination sampling factors
++ * to 1x1, with or without force_grayscale. This is useful because some
++ * decoders choke on grayscale images with other sampling factors.
++ */
++ dstinfo->comp_info[0].h_samp_factor = 1;
++ dstinfo->comp_info[0].v_samp_factor = 1;
+ }
+
+- /* Correct the destination's image dimensions etc if necessary */
++ /* Correct the destination's image dimensions as necessary
++ * for crop and rotate/flip operations.
++ */
++ dstinfo->image_width = info->output_width;
++ dstinfo->image_height = info->output_height;
++
++ /* Transpose destination image parameters */
+ switch (info->transform) {
+- case JXFORM_NONE:
+- /* Nothing to do */
+- break;
+- case JXFORM_FLIP_H:
+- if (info->trim)
+- trim_right_edge(dstinfo);
+- break;
+- case JXFORM_FLIP_V:
+- if (info->trim)
+- trim_bottom_edge(dstinfo);
+- break;
+ case JXFORM_TRANSPOSE:
+- transpose_critical_parameters(dstinfo);
+- /* transpose does NOT have to trim anything */
+- break;
+ case JXFORM_TRANSVERSE:
+- transpose_critical_parameters(dstinfo);
+- if (info->trim) {
+- trim_right_edge(dstinfo);
+- trim_bottom_edge(dstinfo);
+- }
+- break;
+ case JXFORM_ROT_90:
+- transpose_critical_parameters(dstinfo);
+- if (info->trim)
+- trim_right_edge(dstinfo);
+- break;
+- case JXFORM_ROT_180:
+- if (info->trim) {
+- trim_right_edge(dstinfo);
+- trim_bottom_edge(dstinfo);
+- }
+- break;
+ case JXFORM_ROT_270:
+ transpose_critical_parameters(dstinfo);
+- if (info->trim)
+- trim_bottom_edge(dstinfo);
+ break;
+ }
+
++ /* Adjust Exif properties */
++ if (srcinfo->marker_list != NULL &&
++ srcinfo->marker_list->marker == JPEG_APP0+1 &&
++ srcinfo->marker_list->data_length >= 6 &&
++ GETJOCTET(srcinfo->marker_list->data[0]) == 0x45 &&
++ GETJOCTET(srcinfo->marker_list->data[1]) == 0x78 &&
++ GETJOCTET(srcinfo->marker_list->data[2]) == 0x69 &&
++ GETJOCTET(srcinfo->marker_list->data[3]) == 0x66 &&
++ GETJOCTET(srcinfo->marker_list->data[4]) == 0 &&
++ GETJOCTET(srcinfo->marker_list->data[5]) == 0) {
++ /* Suppress output of JFIF marker */
++ dstinfo->write_JFIF_header = FALSE;
++ /* Adjust Exif image parameters */
++ if (dstinfo->image_width != srcinfo->image_width ||
++ dstinfo->image_height != srcinfo->image_height)
++ /* Align data segment to start of TIFF structure for parsing */
++ adjust_exif_parameters(srcinfo->marker_list->data + 6,
++ srcinfo->marker_list->data_length - 6,
++ dstinfo->image_width, dstinfo->image_height);
++ }
++
+ /* Return the appropriate output data set */
+ if (info->workspace_coef_arrays != NULL)
+ return info->workspace_coef_arrays;
+@@ -816,38 +1349,106 @@
+ */
+
+ GLOBAL(void)
+-jtransform_execute_transformation (j_decompress_ptr srcinfo,
+- j_compress_ptr dstinfo,
+- jvirt_barray_ptr *src_coef_arrays,
+- jpeg_transform_info *info)
++jtransform_execute_transform (j_decompress_ptr srcinfo,
++ j_compress_ptr dstinfo,
++ jvirt_barray_ptr *src_coef_arrays,
++ jpeg_transform_info *info)
+ {
+ jvirt_barray_ptr *dst_coef_arrays = info->workspace_coef_arrays;
+
++ /* Note: conditions tested here should match those in switch statement
++ * in jtransform_request_workspace()
++ */
+ switch (info->transform) {
+ case JXFORM_NONE:
++ if (info->x_crop_offset != 0 || info->y_crop_offset != 0)
++ do_crop(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
++ src_coef_arrays, dst_coef_arrays);
+ break;
+ case JXFORM_FLIP_H:
+- do_flip_h(srcinfo, dstinfo, src_coef_arrays);
++ if (info->y_crop_offset != 0)
++ do_flip_h(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
++ src_coef_arrays, dst_coef_arrays);
++ else
++ do_flip_h_no_crop(srcinfo, dstinfo, info->x_crop_offset,
++ src_coef_arrays);
+ break;
+ case JXFORM_FLIP_V:
+- do_flip_v(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays);
++ do_flip_v(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
++ src_coef_arrays, dst_coef_arrays);
+ break;
+ case JXFORM_TRANSPOSE:
+- do_transpose(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays);
++ do_transpose(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
++ src_coef_arrays, dst_coef_arrays);
+ break;
+ case JXFORM_TRANSVERSE:
+- do_transverse(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays);
++ do_transverse(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
++ src_coef_arrays, dst_coef_arrays);
+ break;
+ case JXFORM_ROT_90:
+- do_rot_90(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays);
++ do_rot_90(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
++ src_coef_arrays, dst_coef_arrays);
+ break;
+ case JXFORM_ROT_180:
+- do_rot_180(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays);
++ do_rot_180(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
++ src_coef_arrays, dst_coef_arrays);
+ break;
+ case JXFORM_ROT_270:
+- do_rot_270(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays);
++ do_rot_270(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset,
++ src_coef_arrays, dst_coef_arrays);
++ break;
++ }
++}
++
++/* jtransform_perfect_transform
++ *
++ * Determine whether lossless transformation is perfectly
++ * possible for a specified image and transformation.
++ *
++ * Inputs:
++ * image_width, image_height: source image dimensions.
++ * MCU_width, MCU_height: pixel dimensions of MCU.
++ * transform: transformation identifier.
++ * Parameter sources from initialized jpeg_struct
++ * (after reading source header):
++ * image_width = cinfo.image_width
++ * image_height = cinfo.image_height
++ * MCU_width = cinfo.max_h_samp_factor * DCTSIZE
++ * MCU_height = cinfo.max_v_samp_factor * DCTSIZE
++ * Result:
++ * TRUE = perfect transformation possible
++ * FALSE = perfect transformation not possible
++ * (may use custom action then)
++ */
++
++GLOBAL(boolean)
++jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height,
++ int MCU_width, int MCU_height,
++ JXFORM_CODE transform)
++{
++ boolean result = TRUE; /* initialize TRUE */
++
++ switch (transform) {
++ case JXFORM_FLIP_H:
++ case JXFORM_ROT_270:
++ if (image_width % (JDIMENSION) MCU_width)
++ result = FALSE;
++ break;
++ case JXFORM_FLIP_V:
++ case JXFORM_ROT_90:
++ if (image_height % (JDIMENSION) MCU_height)
++ result = FALSE;
++ break;
++ case JXFORM_TRANSVERSE:
++ case JXFORM_ROT_180:
++ if (image_width % (JDIMENSION) MCU_width)
++ result = FALSE;
++ if (image_height % (JDIMENSION) MCU_height)
++ result = FALSE;
+ break;
+ }
++
++ return result;
+ }
+
+ #endif /* TRANSFORMS_SUPPORTED */
+diff -urNad /home/bill/debian/libjpeg/libjpeg6b-6b/transupp.h libjpeg6b-6b/transupp.h
+--- /home/bill/debian/libjpeg/libjpeg6b-6b/transupp.h 2003-09-22 18:15:49.000000000 +0200
++++ libjpeg6b-6b/transupp.h 2003-09-22 18:16:16.000000000 +0200
+@@ -1,7 +1,7 @@
+ /*
+ * transupp.h
+ *
+- * Copyright (C) 1997, Thomas G. Lane.
++ * Copyright (C) 1997-2001, Thomas G. Lane.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+@@ -22,32 +22,6 @@
+ #define TRANSFORMS_SUPPORTED 1 /* 0 disables transform code */
+ #endif
+
+-/* Short forms of external names for systems with brain-damaged linkers. */
+-
+-#ifdef NEED_SHORT_EXTERNAL_NAMES
+-#define jtransform_request_workspace jTrRequest
+-#define jtransform_adjust_parameters jTrAdjust
+-#define jtransform_execute_transformation jTrExec
+-#define jcopy_markers_setup jCMrkSetup
+-#define jcopy_markers_execute jCMrkExec
+-#endif /* NEED_SHORT_EXTERNAL_NAMES */
+-
+-
+-/*
+- * Codes for supported types of image transformations.
+- */
+-
+-typedef enum {
+- JXFORM_NONE, /* no transformation */
+- JXFORM_FLIP_H, /* horizontal flip */
+- JXFORM_FLIP_V, /* vertical flip */
+- JXFORM_TRANSPOSE, /* transpose across UL-to-LR axis */
+- JXFORM_TRANSVERSE, /* transpose across UR-to-LL axis */
+- JXFORM_ROT_90, /* 90-degree clockwise rotation */
+- JXFORM_ROT_180, /* 180-degree rotation */
+- JXFORM_ROT_270 /* 270-degree clockwise (or 90 ccw) */
+-} JXFORM_CODE;
+-
+ /*
+ * Although rotating and flipping data expressed as DCT coefficients is not
+ * hard, there is an asymmetry in the JPEG format specification for images
+@@ -75,6 +49,19 @@
+ * (For example, -rot 270 -trim trims only the bottom edge, but -rot 90 -trim
+ * followed by -rot 180 -trim trims both edges.)
+ *
++ * We also offer a lossless-crop option, which discards data outside a given
++ * image region but losslessly preserves what is inside. Like the rotate and
++ * flip transforms, lossless crop is restricted by the JPEG format: the upper
++ * left corner of the selected region must fall on an iMCU boundary. If this
++ * does not hold for the given crop parameters, we silently move the upper left
++ * corner up and/or left to make it so, simultaneously increasing the region
++ * dimensions to keep the lower right crop corner unchanged. (Thus, the
++ * output image covers at least the requested region, but may cover more.)
++ *
++ * If both crop and a rotate/flip transform are requested, the crop is applied
++ * last --- that is, the crop region is specified in terms of the destination
++ * image.
++ *
+ * We also offer a "force to grayscale" option, which simply discards the
+ * chrominance channels of a YCbCr image. This is lossless in the sense that
+ * the luminance channel is preserved exactly. It's not the same kind of
+@@ -83,20 +70,89 @@
+ * be aware of the option to know how many components to work on.
+ */
+
++
++/* Short forms of external names for systems with brain-damaged linkers. */
++
++#ifdef NEED_SHORT_EXTERNAL_NAMES
++#define jtransform_parse_crop_spec jTrParCrop
++#define jtransform_request_workspace jTrRequest
++#define jtransform_adjust_parameters jTrAdjust
++#define jtransform_execute_transform jTrExec
++#define jtransform_perfect_transform jTrPerfect
++#define jcopy_markers_setup jCMrkSetup
++#define jcopy_markers_execute jCMrkExec
++#endif /* NEED_SHORT_EXTERNAL_NAMES */
++
++
++/*
++ * Codes for supported types of image transformations.
++ */
++
++typedef enum {
++ JXFORM_NONE, /* no transformation */
++ JXFORM_FLIP_H, /* horizontal flip */
++ JXFORM_FLIP_V, /* vertical flip */
++ JXFORM_TRANSPOSE, /* transpose across UL-to-LR axis */
++ JXFORM_TRANSVERSE, /* transpose across UR-to-LL axis */
++ JXFORM_ROT_90, /* 90-degree clockwise rotation */
++ JXFORM_ROT_180, /* 180-degree rotation */
++ JXFORM_ROT_270 /* 270-degree clockwise (or 90 ccw) */
++} JXFORM_CODE;
++
++/*
++ * Codes for crop parameters, which can individually be unspecified,
++ * positive, or negative. (Negative width or height makes no sense, though.)
++ */
++
++typedef enum {
++ JCROP_UNSET,
++ JCROP_POS,
++ JCROP_NEG
++} JCROP_CODE;
++
++/*
++ * Transform parameters struct.
++ * NB: application must not change any elements of this struct after
++ * calling jtransform_request_workspace.
++ */
++
+ typedef struct {
+ /* Options: set by caller */
+ JXFORM_CODE transform; /* image transform operator */
++ boolean perfect; /* if TRUE, fail if partial MCUs are requested */
+ boolean trim; /* if TRUE, trim partial MCUs as needed */
+ boolean force_grayscale; /* if TRUE, convert color image to grayscale */
++ boolean crop; /* if TRUE, crop source image */
++
++ /* Crop parameters: application need not set these unless crop is TRUE.
++ * These can be filled in by jtransform_parse_crop_spec().
++ */
++ JDIMENSION crop_width; /* Width of selected region */
++ JCROP_CODE crop_width_set;
++ JDIMENSION crop_height; /* Height of selected region */
++ JCROP_CODE crop_height_set;
++ JDIMENSION crop_xoffset; /* X offset of selected region */
++ JCROP_CODE crop_xoffset_set; /* (negative measures from right edge) */
++ JDIMENSION crop_yoffset; /* Y offset of selected region */
++ JCROP_CODE crop_yoffset_set; /* (negative measures from bottom edge) */
+
+ /* Internal workspace: caller should not touch these */
+ int num_components; /* # of components in workspace */
+ jvirt_barray_ptr * workspace_coef_arrays; /* workspace for transformations */
++ JDIMENSION output_width; /* cropped destination dimensions */
++ JDIMENSION output_height;
++ JDIMENSION x_crop_offset; /* destination crop offsets measured in iMCUs */
++ JDIMENSION y_crop_offset;
++ int max_h_samp_factor; /* destination iMCU size */
++ int max_v_samp_factor;
+ } jpeg_transform_info;
+
+
+ #if TRANSFORMS_SUPPORTED
+
++/* Parse a crop specification (written in X11 geometry style) */
++EXTERN(boolean) jtransform_parse_crop_spec
++ JPP((jpeg_transform_info *info, const char *spec));
+ /* Request any required workspace */
+ EXTERN(void) jtransform_request_workspace
+ JPP((j_decompress_ptr srcinfo, jpeg_transform_info *info));
+@@ -106,10 +162,24 @@
+ jvirt_barray_ptr *src_coef_arrays,
+ jpeg_transform_info *info));
+ /* Execute the actual transformation, if any */
+-EXTERN(void) jtransform_execute_transformation
++EXTERN(void) jtransform_execute_transform
+ JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
+ jvirt_barray_ptr *src_coef_arrays,
+ jpeg_transform_info *info));
++/* Determine whether lossless transformation is perfectly
++ * possible for a specified image and transformation.
++ */
++EXTERN(boolean) jtransform_perfect_transform
++ JPP((JDIMENSION image_width, JDIMENSION image_height,
++ int MCU_width, int MCU_height,
++ JXFORM_CODE transform));
++
++/* jtransform_execute_transform used to be called
++ * jtransform_execute_transformation, but some compilers complain about
++ * routine names that long. This macro is here to avoid breaking any
++ * old source code that uses the original name...
++ */
++#define jtransform_execute_transformation jtransform_execute_transform
+
+ #endif /* TRANSFORMS_SUPPORTED */
+
--- /dev/null
+--- a/jdmarker.c
++++ b/jdmarker.c
+@@ -342,6 +342,12 @@ get_sos (j_decompress_ptr cinfo)
+
+ TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc,
+ compptr->dc_tbl_no, compptr->ac_tbl_no);
++
++ /* This CSi (cc) should differ from the previous CSi */
++ for (ci = 0; ci < i; ci++) {
++ if (cinfo->cur_comp_info[ci] == compptr)
++ ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);
++ }
+ }
+
+ /* Collect the additional scan parameters Ss, Se, Ah/Al. */
--- /dev/null
+#
+# Copyright (C) 2009-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=liboping
+PKG_VERSION:=1.6.2
+PKG_RELEASE:=1
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=GPL-2.0
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://verplant.org/liboping/files
+PKG_MD5SUM:=64a6f31310093d2517cfe7f05aa011e0
+
+PKG_FIXUP:=autoreconf
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/liboping/Default
+ URL:=http://verplant.org/liboping/
+endef
+
+define Package/liboping
+$(call Package/liboping/Default)
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=C library to generate ICMP echo requests.
+endef
+
+define Package/oping
+$(call Package/liboping/Default)
+ SECTION:=net
+ CATEGORY:=Network
+ TITLE:=Send ICMP echo request to network hosts
+ DEPENDS+= +liboping
+endef
+
+define Package/noping
+$(call Package/liboping/Default)
+ SECTION:=net
+ CATEGORY:=Network
+ TITLE:=Ncurses application to send ICMP echo request to network hosts
+ DEPENDS+= +liboping +libncurses
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+ --without-perl-bindings \
+ --enable-shared \
+ --enable-static
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/oping.h $(1)/usr/include/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/liboping.{a,so*} $(1)/usr/lib/
+endef
+
+define Package/liboping/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/liboping.so.* $(1)/usr/lib/
+endef
+
+define Package/oping/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/oping $(1)/usr/bin/
+endef
+
+define Package/noping/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/noping $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,liboping))
+$(eval $(call BuildPackage,oping))
+$(eval $(call BuildPackage,noping))
--- /dev/null
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign no-dependenci
+ SUBDIRS = mans
+
+ if COMPILER_IS_GCC
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ endif
+
+ include_HEADERS = oping.h
--- /dev/null
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libpng
+PKG_VERSION:=1.2.51
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@SF/libpng
+PKG_MD5SUM:=4efba67fa5aa2b785c6fcec2cc3e90c9
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+
+PKG_LICENSE:=Libpng GPL-2.0+ BSD-3-Clause
+PKC_LICENSE_FILES:=LICENSE contrib/gregbook/COPYING contrib/gregbook/LICENSE
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libpng
+ SECTION:=libs
+ CATEGORY:=Libraries
+ DEPENDS:=+zlib
+ TITLE:=A PNG format files handling library
+ URL:=http://www.libpng.org/pub/png/libpng.html
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+ --enable-shared \
+ --enable-static \
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(1)/usr/bin/
+ $(SED) \
+ 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
+ $(1)/usr/bin/libpng{,12}-config
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/png{,conf}.h $(1)/usr/include/
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/libpng12 $(1)/usr/include/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.{a,la,so*} $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(1)/usr/lib/pkgconfig/
+ $(INSTALL_DIR) $(2)/bin
+ for f in libpng{,12}-config; do \
+ $(LN) ../../usr/bin/$$$$f $(2)/bin/ ; \
+ done
+endef
+
+define Package/libpng/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call HostBuild))
+$(eval $(call BuildPackage,libpng))
--- /dev/null
+--- a/scripts/libpng-config-body.in
++++ b/scripts/libpng-config-body.in
+@@ -83,6 +83,7 @@ while test $# -gt 0; do
+
+ --static)
+ R_opts=""
++ libs=${all_libs}
+ ;;
+
+ *)
--- /dev/null
+#
+# Copyright (C) 2007-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libsndfile
+PKG_VERSION:=1.0.25
+PKG_RELEASE:=2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.mega-nerd.com/libsndfile/files/
+PKG_MD5SUM:=e2b7bb637e01022c7d20f95f9c3990a2
+
+PKG_LICENSE:=LGPLv2.1
+PKG_LICENSE_FILES:=COPYING
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libsndfile
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=Library for reading/writing audio files
+ URL:=http://www.mega-nerd.com/libsndfile/
+ MAINTAINER:=Peter Wagner <tripolar@gmx.at>
+ DEPENDS:=@!avr32
+endef
+
+define Package/libsndfile/description
+ libsndfile is a library of C routines for reading and writing files
+ containing sampled audio data.
+endef
+
+CONFIGURE_ARGS+= \
+ --disable-alsa \
+ --disable-external-libs \
+ --disable-sqlite
+
+CONFIGURE_VARS += \
+ ac_cv_sys_file_offset_bits=64 \
+ ac_cv_sys_large_files=yes \
+ ac_cv_sys_largefile_CFLAGS=-D_LARGFILE_SOURCE \
+ ac_cv_sys_largefile_LDFLAGS= \
+ ac_cv_sys_largefile_LIBS= \
+ ac_cv_sys_largefile_source=yes
+
+TARGET_CFLAGS += $(FPIC)
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)
+ $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+endef
+
+define Package/libsndfile/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsndfile.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libsndfile))
--- /dev/null
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+
++ACLOCAL_AMFLAGS = -I M4
++
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
+
+ if BUILD_OCTAVE_MOD
TITLE:=Rakshasa's BitTorrent library
URL:=http://libtorrent.rakshasa.no/
DEPENDS:=+libopenssl +libsigcxx
+ MAINTAINER:=Peter Wagner <tripolar@gmx.at>
endef
define Package/libtorrent/description
--- /dev/null
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=pcre
+PKG_VERSION:=8.35
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@SF/pcre
+PKG_MD5SUM:=6aacb23986adccd9b3bc626c00979958
+PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>
+
+PKG_LICENSE:=BSD-3c
+PKG_LICENSE_FILES:=LICENCE
+
+PKG_FIXUP:=autoreconf
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libpcre/default
+ SECTION:=libs
+ CATEGORY:=Libraries
+ URL:=http://www.pcre.org/
+endef
+
+define Package/libpcre
+ $(call Package/libpcre/default)
+ TITLE:=A Perl Compatible Regular Expression library
+endef
+
+define Package/libpcrecpp
+ $(call Package/libpcre/default)
+ TITLE:=C++ wrapper for Perl Compatible Regular Expression library
+ DEPENDS:=+libpcre +libstdcpp
+endef
+
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+ --enable-utf8 \
+ --enable-unicode-properties \
+
+ifneq ($(CONFIG_PACKAGE_libpcrecpp),)
+ CONFIGURE_ARGS+= --enable-cpp
+else
+ CONFIGURE_ARGS+= --disable-cpp
+endif
+
+MAKE_FLAGS += \
+ CFLAGS="$(TARGET_CFLAGS)"
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pcre-config $(1)/usr/bin/
+
+ $(INSTALL_DIR) $(2)/bin
+ $(LN) $(STAGING_DIR)/usr/bin/pcre-config $(2)/bin
+
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/pcre*.h $(1)/usr/include/
+
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre*.{a,so*} $(1)/usr/lib//
+
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpcre*.pc $(1)/usr/lib/pkgconfig/
+
+endef
+
+define Package/libpcre/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.so.* $(1)/usr/lib/
+endef
+
+define Package/libpcrecpp/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcrecpp.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libpcre))
+$(eval $(call BuildPackage,libpcrecpp))
--- /dev/null
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=postgresql
+PKG_VERSION:=9.0.17
+PKG_RELEASE:=1
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=PostgreSQL
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=\
+ http://ftp9.us.postgresql.org/pub/mirrors/postgresql/source/v$(PKG_VERSION) \
+ http://ftp.be.postgresql.org/postgresql/source/v$(PKG_VERSION) \
+ ftp://ftp-archives.postgresql.org/pub/source/v$(PKG_VERSION)
+PKG_MD5SUM:=46bf3ef3761c091fb0d2e25012c1709e
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+PKG_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libpq
+ SECTION:=libs
+ CATEGORY:=Libraries
+ DEPENDS:=+zlib +libreadline +libpthread +libncurses +shadow-su
+ TITLE:=PostgreSQL client library
+ URL:=http://www.postgresql.org/
+ SUBMENU:=database
+endef
+
+define Package/libpq/description
+PostgreSQL client library.
+endef
+
+define Package/pgsql-cli
+ SECTION:=utils
+ CATEGORY:=Utilities
+ DEPENDS:=+libpq
+ TITLE:=Command Line Interface (CLI) to PostgreSQL databases
+ URL:=http://www.postgresql.org/
+ SUBMENU:=database
+endef
+
+define Package/pgsql-cli/description
+Command Line Interface (CLI) to PostgreSQL databases.
+endef
+
+define Package/pgsql-server
+ SECTION:=utils
+ CATEGORY:=Utilities
+ DEPENDS:=+libpq
+ TITLE:=PostgreSQL databases Server
+ URL:=http://www.postgresql.org/
+ SUBMENU:=database
+endef
+
+define Package/pgsql-server/description
+PostgreSQL databases Server.
+endef
+
+# Need a native ecpg ,pg_config, and zic for build
+define Build/Configure
+ (cd $(PKG_BUILD_DIR); rm -f config.cache; \
+ ./configure \
+ --prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --datadir=/usr/share \
+ --includedir=/usr/include \
+ --infodir=/usr/share/info \
+ --libdir=/usr/lib \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --mandir=/usr/share/man \
+ --sbindir=/usr/sbin \
+ --sysconfdir=/etc \
+ $(DISABLE_NLS) \
+ --enable-shared \
+ --enable-static \
+ --disable-integer-datetimes \
+ --disable-rpath \
+ --without-java \
+ --without-krb4 \
+ --without-krb5 \
+ --without-openssl \
+ --without-pam \
+ --without-perl \
+ --without-python \
+ --without-readline \
+ --without-rendezvous \
+ --without-tcl \
+ --without-tk \
+ --with-zlib="yes" \
+ --enable-depend \
+ --with-system-timezone=/tmp \
+ );
+ $(MAKE) -C $(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc CC="$(HOSTCC)" CFLAGS+="-I../../libpq"
+ mv $(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc/ecpg \
+ $(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc/ecpg.host
+ $(MAKE) -C $(PKG_BUILD_DIR)/src/timezone CC="$(HOSTCC)"
+ mv $(PKG_BUILD_DIR)/src/timezone/zic $(PKG_BUILD_DIR)/host-zic
+ $(INSTALL_DIR) $(STAGING_DIR)/host/bin/
+ $(CP) $(PKG_BUILD_DIR)/host-zic $(STAGING_DIR)/host/bin/zic
+ $(MAKE) -C $(PKG_BUILD_DIR)/src/bin/pg_config CC="$(HOSTCC)"
+ mv $(PKG_BUILD_DIR)/src/bin/pg_config/pg_config \
+ $(PKG_BUILD_DIR)/src/bin/pg_config/pg_config.host
+ $(MAKE) -C $(PKG_BUILD_DIR) distclean
+
+ (cd $(PKG_BUILD_DIR); rm -f config.cache; \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ CPPFLAGS="$$$$CPPFLAGS $(TARGET_CPPFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+ ./configure \
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --program-prefix="" \
+ --program-suffix="" \
+ --prefix=/usr \
+ --exec-prefix=/usr \
+ --bindir=/usr/bin \
+ --datadir=/usr/share \
+ --includedir=/usr/include \
+ --infodir=/usr/share/info \
+ --libdir=/usr/lib \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --mandir=/usr/share/man \
+ --sbindir=/usr/sbin \
+ --sysconfdir=/etc \
+ $(DISABLE_NLS) \
+ $(DISABLE_LARGEFILE) \
+ --enable-shared \
+ --enable-static \
+ --disable-integer-datetimes \
+ --disable-rpath \
+ --without-java \
+ --without-krb4 \
+ --without-krb5 \
+ --without-openssl \
+ --without-pam \
+ --without-perl \
+ --without-python \
+ --without-rendezvous \
+ --without-tcl \
+ --without-tk \
+ --with-zlib="yes" \
+ --enable-depend \
+ $(if $(CONFIG_TARGET_avr32),--disable-spinlocks) \
+ );
+ $(SED) 's@ECPG = ../../preproc/ecpg@ECPG = ../../preproc/ecpg.host@' $(PKG_BUILD_DIR)/src/interfaces/ecpg/test/Makefile.regress
+endef
+
+TARGET_CFLAGS += $(FPIC) -lpthread
+
+# because PROFILE means something else in the project Makefile
+unexport PROFILE
+
+define Build/Compile
+ +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ all
+ +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ install
+endef
+
+define Package/libpq/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpq.so.* $(1)/usr/lib/
+endef
+
+define Package/pgsql-cli/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/psql $(1)/usr/bin/
+endef
+
+define Package/pgsql-server/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_DIR) $(1)/usr/share/postgresql
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_DIR) $(1)/etc/config
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
+ ln -sf postgres $(1)/usr/bin/postmaster
+
+ $(INSTALL_BIN) ./files/postgresql.init $(1)/etc/init.d/postgresql
+
+ $(CP) -r $(PKG_INSTALL_DIR)/usr/share/postgresql/* \
+ $(1)/usr/share/postgresql
+
+ $(INSTALL_DATA) ./files/postgresql.config $(1)/etc/config/postgresql
+
+ $(CP) -r \
+ $(PKG_INSTALL_DIR)/usr/lib/postgresql \
+ $(1)/usr/lib
+endef
+
+define Package/pgsql-server/conffiles
+/etc/config/postgresql
+endef
+
+define Package/pgsql-server/postinst
+#!/bin/sh
+grep -q '^postgres:' /etc/passwd && exit 0
+group=$$(grep '^postgres:' /etc/group | cut -f3 -d:)
+if [ -z "$${group}" ] ; then
+ group=1000
+ tst=$$(cat /etc/group | grep ":$${group}:")
+ while [ -n "$${tst}" ] ; do
+ group=$$(($${group}+1))
+ tst=$$(cat /etc/group | grep ":$${group}:")
+ done
+ echo "postgres:x:$${group}:" >>/etc/group
+fi
+
+user=$$(cat /etc/passwd | grep "^postgres:")
+if [ -z "$${user}" ] ; then
+ num="$${group}"
+ tst=$$(cat /etc/passwd | grep ":.*:$${num}:")
+ while [ -n "$${tst}" ] ; do
+ num=$$(($${num}+1))
+ tst=$$(cat /etc/passwd | grep ":.*:$${num}:")
+ done
+ echo "postgres:*:$${num}:$${group}:PostgreSQL administrator:/tmp:/bin/ash" >>/etc/passwd
+fi
+endef
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/bin/pg_config/pg_config.host $(1)/usr/bin/pg_config
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/libpq $(1)/usr/include/
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/libpq-fe.h $(1)/usr/include/
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/pg_config.h $(1)/usr/include/
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/pg_config_manual.h $(1)/usr/include/
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/postgres_ext.h $(1)/usr/include/
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/postgresql $(1)/usr/include/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpq.{a,so*} $(1)/usr/lib/
+ $(CP) $(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc/ecpg.host $(1)/usr/bin/ecpg
+ $(CP) $(PKG_BUILD_DIR)/host-zic $(1)/usr/bin/zic
+endef
+
+$(eval $(call BuildPackage,libpq))
+$(eval $(call BuildPackage,pgsql-cli))
+$(eval $(call BuildPackage,pgsql-server))
--- /dev/null
+config postgresql config
+ option PGUSER postgres
+ option PGDATA /var/postgresql/data
+ option PGLOG /var/postgresql/data/postgresql.log
+ option PG_CTL /usr/bin/pg_ctl
--- /dev/null
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006 OpenWrt.org
+START=50
+
+EXTRA_COMMANDS="status reload"
+
+config_load "postgresql"
+config_get pgdata config PGDATA
+config_get pguser config PGUSER
+config_get pgctl config PG_CTL
+config_get pglog config PGLOG
+
+start() {
+ if [ ! -e /usr/bin/su ]; then
+ echo "The su command is requred to run postgres"
+ exit 1
+ fi
+
+ if [ ! -d ${pgdata} ]; then
+ echo "Create the data directory (${pgdata}) and try again"
+ exit 1
+ fi
+
+ echo "starting postgres..."
+ # make sure localhost (without a dot) is in /etc/hosts
+ grep -q 'localhost$' /etc/hosts || echo '127.0.0.1 localhost' >> /etc/hosts
+
+ # for whatever reason, /dev/null gets wrong perms
+ chmod a+w /dev/null
+
+ if [ -f ${pgdata}/postmaster.pid ]; then
+ rm ${pgdata}/postmaster.pid
+ fi
+
+ config_get pgopts config PGOPTS
+ if [ -n "${pgopts}" ]; then
+ pgopts="-o ${pgopts}"
+ fi
+ /usr/bin/su ${pguser} -c "/usr/bin/postmaster -D '${pgdata}' &" >> ${pglog} 2>&1
+
+ while :
+ do
+ cnt=$((${cnt} + 1))
+ if [ -f "${pgdata}/postmaster.pid" ]; then
+ ret=0
+ break
+ fi
+
+ if [ ${cnt} -eq 30 ]; then
+ echo "Postgres failed to start. See ${pglog} for details"
+ ret=1
+ break
+ fi
+ sleep 1
+ done
+
+ echo "ok"
+ return ${ret}
+}
+
+stop() {
+ echo "stopping postgres..."
+ /usr/bin/su ${pguser} -c "${pgctl} stop -D '${pgdata}' -s -m fast"
+ ret=$?
+ if [ -f ${pgdata}/postmaster.pid ]; then
+ rm ${pgdata}/postmaster.pid
+ fi
+ echo "ok"
+ return ${ret}
+}
+
+restart() {
+ echo "restarting postgres..."
+ /usr/bin/su ${pguser} -c "${pgctl} stop -D '${pgdata}' -s -m fast -w"
+ if [ -f ${pgdata}/postmaster.pid ]; then
+ rm ${pgdata}/postmaster.pid
+ fi
+ /usr/bin/su ${pguser} -c "/usr/bin/postmaster -D '${pgdata}' &" >> ${pglog} 2>&1
+ echo "ok"
+ return $?
+}
+
+reload() {
+ echo "reloading postgres..."
+ /usr/bin/su ${pguser} -c "${pgctl} reload -D '${pgdata}' -s"
+ echo "ok"
+}
+
+status() {
+ echo "status postgres..."
+ /usr/bin/su ${pguser} -c "${pgctl} status -D '${pgdata}'"
+ echo "ok"
+}
--- /dev/null
+--- a/src/port/Makefile
++++ b/src/port/Makefile
+@@ -53,6 +53,7 @@ uninstall:
+
+ libpgport.a: $(OBJS)
+ $(AR) $(AROPT) $@ $^
++ $(RANLIB) libpgport.a
+
+ # thread.o needs PTHREAD_CFLAGS (but thread_srv.o does not)
+ thread.o: thread.c
--- /dev/null
+--- a/src/bin/psql/print.h
++++ b/src/bin/psql/print.h
+@@ -171,10 +171,6 @@ extern void printQuery(const PGresult *r
+ extern void setDecimalLocale(void);
+ extern const printTextFormat *get_line_style(const printTableOpt *opt);
+
+-#ifndef __CYGWIN__
+-#define DEFAULT_PAGER "more"
+-#else
+ #define DEFAULT_PAGER "less"
+-#endif
+
+ #endif /* PRINT_H */
PKG_MD5SUM:=a72001a9067a4c2c4e0e836d0f92ece4
PKG_BUILD_DEPENDS:=protobuf/host
+PKG_USE_MIPS16:=0
PKG_INSTALL:=1
--- /dev/null
+--- a/src/google/protobuf/stubs/platform_macros.h
++++ b/src/google/protobuf/stubs/platform_macros.h
+@@ -49,7 +49,7 @@
+ #elif defined(__ARMEL__)
+ #define GOOGLE_PROTOBUF_ARCH_ARM 1
+ #define GOOGLE_PROTOBUF_ARCH_32_BIT 1
+-#elif defined(__MIPSEL__)
++#elif defined(__MIPSEL__) || defined(__MIPSEB__)
+ #define GOOGLE_PROTOBUF_ARCH_MIPS 1
+ #define GOOGLE_PROTOBUF_ARCH_32_BIT 1
+ #elif defined(__pnacl__)
--- /dev/null
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=speex
+PKG_VERSION:=1.2rc1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/speex/
+PKG_MD5SUM:=c4438b22c08e5811ff10e2b06ee9b9ae
+
+PKG_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libspeex
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=Open source speech compression codec library
+ URL:=http://www.speex.org/
+ MAINTAINER:=Peter Wagner <tripolar@gmx.at>
+endef
+
+define Package/libspeexdsp
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=Open source speech compression codec library output to DSP
+ URL:=http://www.speex.org/
+ MAINTAINER:=Peter Wagner <tripolar@gmx.at>
+endef
+
+define Package/libspeex/description
+ Open source patent-free speech compression codec library.
+ Speex is an Open Source/Free Software patent-free audio compression
+ format designed for speech. The Speex Project aims to lower the
+ barrier of entry for voice applications by providing a free
+ alternative to expensive proprietary speech codecs. Moreover, Speex
+ is well-adapted to Internet applications and provides useful features
+ that are not present in most other codecs.
+
+ This package contains the shared codec library, needed by other programs.
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+define Package/libspeexdsp/description
+ Open source patent-free speech compression codec library.
+ Speex is an Open Source/Free Software patent-free audio compression
+ format designed for speech. The Speex Project aims to lower the
+ barrier of entry for voice applications by providing a free
+ alternative to expensive proprietary speech codecs. Moreover, Speex
+ is well-adapted to Internet applications and provides useful features
+ that are not present in most other codecs.
+
+ This package contains the shared dsp library, needed by other programs.
+endef
+
+define Build/Configure
+ $(call Build/Configure/Default, \
+ --enable-shared \
+ --enable-static \
+ --enable-fixed-point \
+ --disable-oggtest \
+ --disable-float-api \
+ --disable-vbr \
+ --with-ogg=$(STAGING_DIR)/usr \
+ )
+endef
+
+define Build/Compile
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ bin_PROGRAMS="" \
+ all install
+endef
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/speex $(1)/usr/include/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeexdsp.{a,so*} $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc $(1)/usr/lib/pkgconfig/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speexdsp.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libspeex/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.so.* $(1)/usr/lib/
+endef
+
+define Package/libspeexdsp/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeexdsp.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libspeex))
+$(eval $(call BuildPackage,libspeexdsp))
--- /dev/null
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=tcp_wrappers
+PKG_VERSION:=7.6
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=ftp://ftp.porcupine.org/pub/security
+PKG_MD5SUM:=e6fa25f71226d090f34de3f6b122fb5a
+
+PKG_LICENSE:=BSD
+PKG_LICENE_FILES:=DISCLAIMER
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libwrap
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=Security wrapper library for TCP services
+ URL:=ftp://ftp.porcupine.org/pub/security/index.html
+ MAINTAINER:=Peter Wagner <tripolar@gmx.at>
+endef
+
+TARGET_CFLAGS += $(FPIC)
+
+define Build/Compile
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ $(TARGET_CONFIGURE_OPTS) \
+ OPT_CFLAGS="$(TARGET_CFLAGS)" \
+ LIBS=-lnsl \
+ NETGROUP= \
+ VSYSLOG= \
+ BUGS= \
+ EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 \
+ -Dss_family=__ss_family -Dss_len=__ss_len" \
+ FACILITY=LOG_DAEMON \
+ SEVERITY=LOG_INFO \
+ REAL_DAEMON_DIR=/usr/sbin \
+ STYLE="-DPROCESS_OPTIONS" \
+ tidy all
+endef
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) $(PKG_BUILD_DIR)/tcpd.h $(1)/usr/include/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_BUILD_DIR)/libwrap.a $(1)/usr/lib/
+ $(CP) $(PKG_BUILD_DIR)/shared/libwrap.so* $(1)/usr/lib/
+endef
+
+define Package/libwrap/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_BUILD_DIR)/shared/libwrap.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libwrap))
--- /dev/null
+--- a/hosts_access.c
++++ b/hosts_access.c
+@@ -240,6 +240,26 @@ struct request_info *request;
+ }
+ }
+
++/* hostfile_match - look up host patterns from file */
++
++static int hostfile_match(path, host)
++char *path;
++struct hosts_info *host;
++{
++ char tok[BUFSIZ];
++ int match = NO;
++ FILE *fp;
++
++ if ((fp = fopen(path, "r")) != 0) {
++ while (fscanf(fp, "%s", tok) == 1 && !(match = host_match(tok, host)))
++ /* void */ ;
++ fclose(fp);
++ } else if (errno != ENOENT) {
++ tcpd_warn("open %s: %m", path);
++ }
++ return (match);
++}
++
+ /* host_match - match host name and/or address against pattern */
+
+ static int host_match(tok, host)
+@@ -267,6 +287,8 @@ struct host_info *host;
+ tcpd_warn("netgroup support is disabled"); /* not tcpd_jump() */
+ return (NO);
+ #endif
++ } else if (tok[0] == '/') { /* /file hack */
++ return (hostfile_match(tok, host));
+ } else if (STR_EQ(tok, "KNOWN")) { /* check address and name */
+ char *name = eval_hostname(host);
+ return (STR_NE(eval_hostaddr(host), unknown) && HOSTNAME_KNOWN(name));
+--- a/tcpd.h
++++ b/tcpd.h
+@@ -4,6 +4,25 @@
+ * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
+ */
+
++#ifndef _TCPWRAPPERS_TCPD_H
++#define _TCPWRAPPERS_TCPD_H
++
++/* someone else may have defined this */
++#undef __P
++
++/* use prototypes if we have an ANSI C compiler or are using C++ */
++#if defined(__STDC__) || defined(__cplusplus)
++#define __P(args) args
++#else
++#define __P(args) ()
++#endif
++
++/* Need definitions of struct sockaddr_in and FILE. */
++#include <netinet/in.h>
++#include <stdio.h>
++
++__BEGIN_DECLS
++
+ /* Structure to describe one communications endpoint. */
+
+ #define STRING_LENGTH 128 /* hosts, users, processes */
+@@ -25,10 +44,10 @@ struct request_info {
+ char pid[10]; /* access via eval_pid(request) */
+ struct host_info client[1]; /* client endpoint info */
+ struct host_info server[1]; /* server endpoint info */
+- void (*sink) (); /* datagram sink function or 0 */
+- void (*hostname) (); /* address to printable hostname */
+- void (*hostaddr) (); /* address to printable address */
+- void (*cleanup) (); /* cleanup function or 0 */
++ void (*sink) __P((int)); /* datagram sink function or 0 */
++ void (*hostname) __P((struct host_info *)); /* address to printable hostname */
++ void (*hostaddr) __P((struct host_info *)); /* address to printable address */
++ void (*cleanup) __P((struct request_info *)); /* cleanup function or 0 */
+ struct netconfig *config; /* netdir handle */
+ };
+
+@@ -61,25 +80,30 @@ extern char paranoid[];
+ /* Global functions. */
+
+ #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
+-extern void fromhost(); /* get/validate client host info */
++extern void fromhost __P((struct request_info *)); /* get/validate client host info */
+ #else
+ #define fromhost sock_host /* no TLI support needed */
+ #endif
+
+-extern int hosts_access(); /* access control */
+-extern void shell_cmd(); /* execute shell command */
+-extern char *percent_x(); /* do %<char> expansion */
+-extern void rfc931(); /* client name from RFC 931 daemon */
+-extern void clean_exit(); /* clean up and exit */
+-extern void refuse(); /* clean up and exit */
+-extern char *xgets(); /* fgets() on steroids */
+-extern char *split_at(); /* strchr() and split */
+-extern unsigned long dot_quad_addr(); /* restricted inet_addr() */
++extern void shell_cmd __P((char *)); /* execute shell command */
++extern char *percent_x __P((char *, int, char *, struct request_info *)); /* do %<char> expansion */
++extern void rfc931 __P((struct sockaddr_in *, struct sockaddr_in *, char *)); /* client name from RFC 931 daemon */
++extern void clean_exit __P((struct request_info *)); /* clean up and exit */
++extern void refuse __P((struct request_info *)); /* clean up and exit */
++extern char *xgets __P((char *, int, FILE *)); /* fgets() on steroids */
++extern char *split_at __P((char *, int)); /* strchr() and split */
++extern unsigned long dot_quad_addr __P((char *)); /* restricted inet_addr() */
+
+ /* Global variables. */
+
++#ifdef HAVE_WEAKSYMS
++extern int allow_severity __attribute__ ((weak)); /* for connection logging */
++extern int deny_severity __attribute__ ((weak)); /* for connection logging */
++#else
+ extern int allow_severity; /* for connection logging */
+ extern int deny_severity; /* for connection logging */
++#endif
++
+ extern char *hosts_allow_table; /* for verification mode redirection */
+ extern char *hosts_deny_table; /* for verification mode redirection */
+ extern int hosts_access_verbose; /* for verbose matching mode */
+@@ -92,9 +116,14 @@ extern int resident; /* > 0 if residen
+ */
+
+ #ifdef __STDC__
++extern int hosts_access(struct request_info *request);
++extern int hosts_ctl(char *daemon, char *client_name, char *client_addr,
++ char *client_user);
+ extern struct request_info *request_init(struct request_info *,...);
+ extern struct request_info *request_set(struct request_info *,...);
+ #else
++extern int hosts_access();
++extern int hosts_ctl();
+ extern struct request_info *request_init(); /* initialize request */
+ extern struct request_info *request_set(); /* update request structure */
+ #endif
+@@ -117,27 +146,31 @@ extern struct request_info *request_set(
+ * host_info structures serve as caches for the lookup results.
+ */
+
+-extern char *eval_user(); /* client user */
+-extern char *eval_hostname(); /* printable hostname */
+-extern char *eval_hostaddr(); /* printable host address */
+-extern char *eval_hostinfo(); /* host name or address */
+-extern char *eval_client(); /* whatever is available */
+-extern char *eval_server(); /* whatever is available */
++extern char *eval_user __P((struct request_info *)); /* client user */
++extern char *eval_hostname __P((struct host_info *)); /* printable hostname */
++extern char *eval_hostaddr __P((struct host_info *)); /* printable host address */
++extern char *eval_hostinfo __P((struct host_info *)); /* host name or address */
++extern char *eval_client __P((struct request_info *)); /* whatever is available */
++extern char *eval_server __P((struct request_info *)); /* whatever is available */
+ #define eval_daemon(r) ((r)->daemon) /* daemon process name */
+ #define eval_pid(r) ((r)->pid) /* process id */
+
+ /* Socket-specific methods, including DNS hostname lookups. */
+
+-extern void sock_host(); /* look up endpoint addresses */
+-extern void sock_hostname(); /* translate address to hostname */
+-extern void sock_hostaddr(); /* address to printable address */
++/* look up endpoint addresses */
++extern void sock_host __P((struct request_info *));
++/* translate address to hostname */
++extern void sock_hostname __P((struct host_info *));
++/* address to printable address */
++extern void sock_hostaddr __P((struct host_info *));
++
+ #define sock_methods(r) \
+ { (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }
+
+ /* The System V Transport-Level Interface (TLI) interface. */
+
+ #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
+-extern void tli_host(); /* look up endpoint addresses etc. */
++extern void tli_host __P((struct request_info *)); /* look up endpoint addresses etc. */
+ #endif
+
+ /*
+@@ -178,7 +211,7 @@ extern struct tcpd_context tcpd_context;
+ * behavior.
+ */
+
+-extern void process_options(); /* execute options */
++extern void process_options __P((char *, struct request_info *)); /* execute options */
+ extern int dry_run; /* verification flag */
+
+ /* Bug workarounds. */
+@@ -217,3 +250,7 @@ extern char *fix_strtok();
+ #define strtok my_strtok
+ extern char *my_strtok();
+ #endif
++
++__END_DECLS
++
++#endif /* tcpd.h */
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,10 @@
++GLIBC=$(shell grep -s -c __GLIBC__ /usr/include/features.h)
++
+ # @(#) Makefile 1.23 97/03/21 19:27:20
+
++# unset the HOSTNAME environment variable
++HOSTNAME =
++
+ what:
+ @echo
+ @echo "Usage: edit the REAL_DAEMON_DIR definition in the Makefile then:"
+@@ -19,7 +24,7 @@ what:
+ @echo " generic (most bsd-ish systems with sys5 compatibility)"
+ @echo " 386bsd aix alpha apollo bsdos convex-ultranet dell-gcc dgux dgux543"
+ @echo " dynix epix esix freebsd hpux irix4 irix5 irix6 isc iunix"
+- @echo " linux machten mips(untested) ncrsvr4 netbsd next osf power_unix_211"
++ @echo " linux gnu machten mips(untested) ncrsvr4 netbsd next osf power_unix_211"
+ @echo " ptx-2.x ptx-generic pyramid sco sco-nis sco-od2 sco-os5 sinix sunos4"
+ @echo " sunos40 sunos5 sysv4 tandem ultrix unicos7 unicos8 unixware1 unixware2"
+ @echo " uts215 uxp"
+@@ -43,8 +48,8 @@ what:
+ # Ultrix 4.x SunOS 4.x ConvexOS 10.x Dynix/ptx
+ #REAL_DAEMON_DIR=/usr/etc
+ #
+-# SysV.4 Solaris 2.x OSF AIX
+-#REAL_DAEMON_DIR=/usr/sbin
++# SysV.4 Solaris 2.x OSF AIX Linux
++REAL_DAEMON_DIR=/usr/sbin
+ #
+ # BSD 4.4
+ #REAL_DAEMON_DIR=/usr/libexec
+@@ -141,10 +146,21 @@ freebsd:
+ LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \
+ EXTRA_CFLAGS=-DSYS_ERRLIST_DEFINED VSYSLOG= all
+
++ifneq ($(GLIBC),0)
++MYLIB=-lnsl
++endif
++
+ linux:
+ @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
+- LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \
+- NETGROUP= TLI= EXTRA_CFLAGS="-DBROKEN_SO_LINGER" all
++ LIBS=$(MYLIB) RANLIB=ranlib ARFLAGS=rv AUX_OBJ=weak_symbols.o \
++ NETGROUP=-DNETGROUP TLI= VSYSLOG= BUGS= all \
++ EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DHAVE_WEAKSYMS -D_REENTRANT"
++
++gnu:
++ @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
++ LIBS=$(MYLIB) RANLIB=ranlib ARFLAGS=rv AUX_OBJ=weak_symbols.o \
++ NETGROUP=-DNETGROUP TLI= VSYSLOG= BUGS= all \
++ EXTRA_CFLAGS="-DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT"
+
+ # This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x.
+ hpux hpux8 hpux9 hpux10:
+@@ -391,7 +407,7 @@ AR = ar
+ # the ones provided with this source distribution. The environ.c module
+ # implements setenv(), getenv(), and putenv().
+
+-AUX_OBJ= setenv.o
++#AUX_OBJ= setenv.o
+ #AUX_OBJ= environ.o
+ #AUX_OBJ= environ.o strcasecmp.o
+
+@@ -454,7 +470,8 @@ AUX_OBJ= setenv.o
+ # host name aliases. Compile with -DSOLARIS_24_GETHOSTBYNAME_BUG to work
+ # around this. The workaround does no harm on other Solaris versions.
+
+-BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DLIBC_CALLS_STRTOK
++BUGS =
++#BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DLIBC_CALLS_STRTOK
+ #BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DINET_ADDR_BUG
+ #BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DSOLARIS_24_GETHOSTBYNAME_BUG
+
+@@ -464,7 +481,7 @@ BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS
+ # If your system supports NIS or YP-style netgroups, enable the following
+ # macro definition. Netgroups are used only for host access control.
+ #
+-#NETGROUP= -DNETGROUP
++NETGROUP= -DNETGROUP
+
+ ###############################################################
+ # System dependencies: whether or not your system has vsyslog()
+@@ -491,7 +508,7 @@ VSYSLOG = -Dvsyslog=myvsyslog
+ # Uncomment the next definition to turn on the language extensions
+ # (examples: allow, deny, banners, twist and spawn).
+ #
+-#STYLE = -DPROCESS_OPTIONS # Enable language extensions.
++STYLE = -DPROCESS_OPTIONS # Enable language extensions.
+
+ ################################################################
+ # Optional: Changing the default disposition of logfile records
+@@ -514,7 +531,7 @@ VSYSLOG = -Dvsyslog=myvsyslog
+ #
+ # The LOG_XXX names below are taken from the /usr/include/syslog.h file.
+
+-FACILITY= LOG_MAIL # LOG_MAIL is what most sendmail daemons use
++FACILITY= LOG_DAEMON # LOG_MAIL is what most sendmail daemons use
+
+ # The syslog priority at which successful connections are logged.
+
+@@ -610,7 +627,7 @@ TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\
+ # Paranoid mode implies hostname lookup. In order to disable hostname
+ # lookups altogether, see the next section.
+
+-PARANOID= -DPARANOID
++#PARANOID= -DPARANOID
+
+ ########################################
+ # Optional: turning off hostname lookups
+@@ -623,7 +640,7 @@ PARANOID= -DPARANOID
+ # In order to perform selective hostname lookups, disable paranoid
+ # mode (see previous section) and comment out the following definition.
+
+-HOSTNAME= -DALWAYS_HOSTNAME
++#HOSTNAME= -DALWAYS_HOSTNAME
+
+ #############################################
+ # Optional: Turning on host ADDRESS checking
+@@ -649,28 +666,46 @@ HOSTNAME= -DALWAYS_HOSTNAME
+ # source-routed traffic in the kernel. Examples: 4.4BSD derivatives,
+ # Solaris 2.x, and Linux. See your system documentation for details.
+ #
+-# KILL_OPT= -DKILL_IP_OPTIONS
++KILL_OPT= -DKILL_IP_OPTIONS
+
+ ## End configuration options
+ ############################
+
+ # Protection against weird shells or weird make programs.
+
++CC = gcc
+ SHELL = /bin/sh
+-.c.o:; $(CC) $(CFLAGS) -c $*.c
++.c.o:; $(CC) $(CFLAGS) -o $*.o -c $*.c
++
++SOMAJOR = 0
++SOMINOR = 7.6
++
++LIB = libwrap.a
++SHLIB = shared/libwrap.so.$(SOMAJOR).$(SOMINOR)
++SHLIBSOMAJ= shared/libwrap.so.$(SOMAJOR)
++SHLIBSO = shared/libwrap.so
++SHLIBFLAGS = -Lshared -lwrap
+
+-CFLAGS = -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
++shared/%.o: %.c
++ $(CC) $(CFLAGS) $(SHCFLAGS) -c $< -o $@
++
++CFLAGS = -O2 -g -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
+ $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
+ -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
+ -DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
+ $(UCHAR) $(TABLES) $(STRINGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \
+ $(VSYSLOG) $(HOSTNAME)
+
++SHLINKFLAGS = -shared -Xlinker -soname -Xlinker libwrap.so.$(SOMAJOR) -lc $(LIBS)
++SHCFLAGS = -fPIC -shared -D_REENTRANT
++
+ LIB_OBJ= hosts_access.o options.o shell_cmd.o rfc931.o eval.o \
+ hosts_ctl.o refuse.o percent_x.o clean_exit.o $(AUX_OBJ) \
+ $(FROM_OBJ) fix_options.o socket.o tli.o workarounds.o \
+ update.o misc.o diag.o percent_m.o myvsyslog.o
+
++SHLIB_OBJ= $(addprefix shared/, $(LIB_OBJ));
++
+ FROM_OBJ= fromhost.o
+
+ KIT = README miscd.c tcpd.c fromhost.c hosts_access.c shell_cmd.c \
+@@ -684,46 +719,78 @@ KIT = README miscd.c tcpd.c fromhost.c h
+ refuse.c tcpdchk.8 setenv.c inetcf.c inetcf.h scaffold.c \
+ scaffold.h tcpdmatch.8 README.NIS
+
+-LIB = libwrap.a
+-
+-all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk
++all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk $(LIB)
+
+ # Invalidate all object files when the compiler options (CFLAGS) have changed.
+
+ config-check:
+ @set +e; test -n "$(REAL_DAEMON_DIR)" || { make; exit 1; }
+- @set +e; echo $(CFLAGS) >/tmp/cflags.$$$$ ; \
+- if cmp cflags /tmp/cflags.$$$$ ; \
+- then rm /tmp/cflags.$$$$ ; \
+- else mv /tmp/cflags.$$$$ cflags ; \
++ @set +e; echo $(CFLAGS) >cflags.new ; \
++ if cmp cflags cflags.new ; \
++ then rm cflags.new ; \
++ else mv cflags.new cflags ; \
+ fi >/dev/null 2>/dev/null
++ @if [ ! -d shared ]; then mkdir shared; fi
+
+ $(LIB): $(LIB_OBJ)
+ rm -f $(LIB)
+ $(AR) $(ARFLAGS) $(LIB) $(LIB_OBJ)
+ -$(RANLIB) $(LIB)
+
+-tcpd: tcpd.o $(LIB)
+- $(CC) $(CFLAGS) -o $@ tcpd.o $(LIB) $(LIBS)
++$(SHLIB): $(SHLIB_OBJ)
++ rm -f $(SHLIB)
++ $(CC) -o $(SHLIB) $(SHLINKFLAGS) $(SHLIB_OBJ)
++ ln -s $(notdir $(SHLIB)) $(SHLIBSOMAJ)
++ ln -s $(notdir $(SHLIBSOMAJ)) $(SHLIBSO)
++
++tcpd: tcpd.o $(SHLIB)
++ $(CC) $(CFLAGS) -o $@ tcpd.o $(SHLIBFLAGS)
+
+-miscd: miscd.o $(LIB)
+- $(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS)
++miscd: miscd.o $(SHLIB)
++ $(CC) $(CFLAGS) -o $@ miscd.o $(SHLIBFLAGS)
+
+-safe_finger: safe_finger.o $(LIB)
+- $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS)
++safe_finger: safe_finger.o $(SHLIB)
++ $(CC) $(CFLAGS) -o $@ safe_finger.o $(SHLIBFLAGS)
+
+ TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o
+
+-tcpdmatch: $(TCPDMATCH_OBJ) $(LIB)
+- $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LIB) $(LIBS)
++tcpdmatch: $(TCPDMATCH_OBJ) $(SHLIB)
++ $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(SHLIBFLAGS)
+
+-try-from: try-from.o fakelog.o $(LIB)
+- $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(LIB) $(LIBS)
++try-from: try-from.o fakelog.o $(SHLIB)
++ $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(SHLIBFLAGS)
+
+ TCPDCHK_OBJ = tcpdchk.o fakelog.o inetcf.o scaffold.o
+
+-tcpdchk: $(TCPDCHK_OBJ) $(LIB)
+- $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LIB) $(LIBS)
++tcpdchk: $(TCPDCHK_OBJ) $(SHLIB)
++ $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(SHLIBFLAGS)
++
++install: install-lib install-bin install-dev
++
++install-lib:
++ install -o root -g root -m 0644 $(SHLIB) ${DESTDIR}/lib/
++ ln -s $(notdir $(SHLIB)) ${DESTDIR}/lib/$(notdir $(SHLIBSOMAJ))
++
++install-bin:
++ install -o root -g root -m 0755 tcpd ${DESTDIR}/usr/sbin/
++ install -o root -g root -m 0755 tcpdchk ${DESTDIR}/usr/sbin/
++ install -o root -g root -m 0755 tcpdmatch ${DESTDIR}/usr/sbin/
++ install -o root -g root -m 0755 try-from ${DESTDIR}/usr/sbin/
++ install -o root -g root -m 0755 safe_finger ${DESTDIR}/usr/sbin/
++ install -o root -g root -m 0644 tcpd.8 ${DESTDIR}/usr/share/man/man8/
++ install -o root -g root -m 0644 tcpdchk.8 ${DESTDIR}/usr/share/man/man8/
++ install -o root -g root -m 0644 tcpdmatch.8 ${DESTDIR}/usr/share/man/man8/
++ install -o root -g root -m 0644 hosts_access.5 ${DESTDIR}/usr/share/man/man5/
++ install -o root -g root -m 0644 hosts_options.5 ${DESTDIR}/usr/share/man/man5/
++
++install-dev:
++ ln -s /lib/$(notdir $(SHLIBSOMAJ)) ${DESTDIR}/usr/lib/$(notdir $(SHLIBSO))
++ install -o root -g root -m 0644 hosts_access.3 ${DESTDIR}/usr/share/man/man3/
++ install -o root -g root -m 0644 tcpd.h ${DESTDIR}/usr/include/
++ install -o root -g root -m 0644 $(LIB) ${DESTDIR}/usr/lib/
++ ln -s hosts_access.3 ${DESTDIR}/usr/share/man/man3/hosts_ctl.3
++ ln -s hosts_access.3 ${DESTDIR}/usr/share/man/man3/request_init.3
++ ln -s hosts_access.3 ${DESTDIR}/usr/share/man/man3/request_set.3
+
+ shar: $(KIT)
+ @shar $(KIT)
+@@ -739,7 +806,8 @@ archive:
+
+ clean:
+ rm -f tcpd miscd safe_finger tcpdmatch tcpdchk try-from *.[oa] core \
+- cflags
++ cflags libwrap*.so*
++ rm -rf shared
+
+ tidy: clean
+ chmod -R a+r .
+@@ -885,5 +953,6 @@ update.o: cflags
+ update.o: mystdarg.h
+ update.o: tcpd.h
+ vfprintf.o: cflags
++weak_symbols.o: tcpd.h
+ workarounds.o: cflags
+ workarounds.o: tcpd.h
+--- a/hosts_access.5
++++ b/hosts_access.5
+@@ -8,9 +8,9 @@ name, host name/address) patterns. Exam
+ impatient reader is encouraged to skip to the EXAMPLES section for a
+ quick introduction.
+ .PP
+-An extended version of the access control language is described in the
+-\fIhosts_options\fR(5) document. The extensions are turned on at
+-program build time by building with -DPROCESS_OPTIONS.
++The extended version of the access control language is described in the
++\fIhosts_options\fR(5) document. \fBNote that this language supersedes
++the meaning of \fIshell_command\fB as documented below.\fR
+ .PP
+ In the following text, \fIdaemon\fR is the the process name of a
+ network daemon process, and \fIclient\fR is the name and/or address of
+@@ -40,7 +40,7 @@ A newline character is ignored when it i
+ character. This permits you to break up long lines so that they are
+ easier to edit.
+ .IP \(bu
+-Blank lines or lines that begin with a `#\' character are ignored.
++Blank lines or lines that begin with a `#' character are ignored.
+ This permits you to insert comments and whitespace so that the tables
+ are easier to read.
+ .IP \(bu
+@@ -69,26 +69,33 @@ checks are case insensitive.
+ .SH PATTERNS
+ The access control language implements the following patterns:
+ .IP \(bu
+-A string that begins with a `.\' character. A host name is matched if
++A string that begins with a `.' character. A host name is matched if
+ the last components of its name match the specified pattern. For
+-example, the pattern `.tue.nl\' matches the host name
+-`wzv.win.tue.nl\'.
++example, the pattern `.tue.nl' matches the host name
++`wzv.win.tue.nl'.
+ .IP \(bu
+-A string that ends with a `.\' character. A host address is matched if
++A string that ends with a `.' character. A host address is matched if
+ its first numeric fields match the given string. For example, the
+-pattern `131.155.\' matches the address of (almost) every host on the
++pattern `131.155.' matches the address of (almost) every host on the
+ Eind\%hoven University network (131.155.x.x).
+ .IP \(bu
+-A string that begins with an `@\' character is treated as an NIS
++A string that begins with an `@' character is treated as an NIS
+ (formerly YP) netgroup name. A host name is matched if it is a host
+ member of the specified netgroup. Netgroup matches are not supported
+ for daemon process names or for client user names.
+ .IP \(bu
+-An expression of the form `n.n.n.n/m.m.m.m\' is interpreted as a
+-`net/mask\' pair. A host address is matched if `net\' is equal to the
+-bitwise AND of the address and the `mask\'. For example, the net/mask
+-pattern `131.155.72.0/255.255.254.0\' matches every address in the
+-range `131.155.72.0\' through `131.155.73.255\'.
++An expression of the form `n.n.n.n/m.m.m.m' is interpreted as a
++`net/mask' pair. A host address is matched if `net' is equal to the
++bitwise AND of the address and the `mask'. For example, the net/mask
++pattern `131.155.72.0/255.255.254.0' matches every address in the
++range `131.155.72.0' through `131.155.73.255'.
++.IP \(bu
++A string that begins with a `/' character is treated as a file
++name. A host name or address is matched if it matches any host name
++or address pattern listed in the named file. The file format is
++zero or more lines with zero or more host name or address patterns
++separated by whitespace. A file name pattern can be used anywhere
++a host name or address pattern can be used.
+ .SH WILDCARDS
+ The access control language supports explicit wildcards:
+ .IP ALL
+@@ -115,19 +122,19 @@ without -DPARANOID when you want more co
+ .ne 6
+ .SH OPERATORS
+ .IP EXCEPT
+-Intended use is of the form: `list_1 EXCEPT list_2\'; this construct
++Intended use is of the form: `list_1 EXCEPT list_2'; this construct
+ matches anything that matches \fIlist_1\fR unless it matches
+ \fIlist_2\fR. The EXCEPT operator can be used in daemon_lists and in
+ client_lists. The EXCEPT operator can be nested: if the control
+-language would permit the use of parentheses, `a EXCEPT b EXCEPT c\'
+-would parse as `(a EXCEPT (b EXCEPT c))\'.
++language would permit the use of parentheses, `a EXCEPT b EXCEPT c'
++would parse as `(a EXCEPT (b EXCEPT c))'.
+ .br
+ .ne 6
+ .SH SHELL COMMANDS
+ If the first-matched access control rule contains a shell command, that
+ command is subjected to %<letter> substitutions (see next section).
+ The result is executed by a \fI/bin/sh\fR child process with standard
+-input, output and error connected to \fI/dev/null\fR. Specify an `&\'
++input, output and error connected to \fI/dev/null\fR. Specify an `&'
+ at the end of the command if you do not want to wait until it has
+ completed.
+ .PP
+@@ -159,7 +166,7 @@ depending on how much information is ava
+ .IP %u
+ The client user name (or "unknown").
+ .IP %%
+-Expands to a single `%\' character.
++Expands to a single `%' character.
+ .PP
+ Characters in % expansions that may confuse the shell are replaced by
+ underscores.
+@@ -243,9 +250,9 @@ A positive IDENT lookup result (the clie
+ less trustworthy. It is possible for an intruder to spoof both the
+ client connection and the IDENT lookup, although doing so is much
+ harder than spoofing just a client connection. It may also be that
+-the client\'s IDENT server is lying.
++the client's IDENT server is lying.
+ .PP
+-Note: IDENT lookups don\'t work with UDP services.
++Note: IDENT lookups don't work with UDP services.
+ .SH EXAMPLES
+ The language is flexible enough that different types of access control
+ policy can be expressed with a minimum of fuss. Although the language
+@@ -285,7 +292,7 @@ ALL: LOCAL @some_netgroup
+ .br
+ ALL: .foobar.edu EXCEPT terminalserver.foobar.edu
+ .PP
+-The first rule permits access from hosts in the local domain (no `.\'
++The first rule permits access from hosts in the local domain (no `.'
+ in the host name) and from members of the \fIsome_netgroup\fP
+ netgroup. The second rule permits access from all hosts in the
+ \fIfoobar.edu\fP domain (notice the leading dot), with the exception of
+@@ -322,8 +329,8 @@ in.tftpd: LOCAL, .my.domain
+ /etc/hosts.deny:
+ .in +3
+ .nf
+-in.tftpd: ALL: (/some/where/safe_finger -l @%h | \\
+- /usr/ucb/mail -s %d-%h root) &
++in.tftpd: ALL: (/usr/sbin/safe_finger -l @%h | \\
++ /usr/bin/mail -s %d-%h root) &
+ .fi
+ .PP
+ The safe_finger command comes with the tcpd wrapper and should be
+@@ -349,7 +356,7 @@ control rule; when the length of an acce
+ capacity of an internal buffer; when an access control rule is not
+ terminated by a newline character; when the result of %<letter>
+ expansion would overflow an internal buffer; when a system call fails
+-that shouldn\'t. All problems are reported via the syslog daemon.
++that shouldn't. All problems are reported via the syslog daemon.
+ .SH FILES
+ .na
+ .nf
+--- a/rfc931.c
++++ b/rfc931.c
+@@ -33,7 +33,7 @@ static char sccsid[] = "@(#) rfc931.c 1.
+
+ int rfc931_timeout = RFC931_TIMEOUT;/* Global so it can be changed */
+
+-static jmp_buf timebuf;
++static sigjmp_buf timebuf;
+
+ /* fsocket - open stdio stream on top of socket */
+
+@@ -62,7 +62,7 @@ int protocol;
+ static void timeout(sig)
+ int sig;
+ {
+- longjmp(timebuf, sig);
++ siglongjmp(timebuf, sig);
+ }
+
+ /* rfc931 - return remote user name, given socket structures */
+@@ -99,7 +99,7 @@ char *dest;
+ * Set up a timer so we won't get stuck while waiting for the server.
+ */
+
+- if (setjmp(timebuf) == 0) {
++ if (sigsetjmp(timebuf,1) == 0) {
+ signal(SIGALRM, timeout);
+ alarm(rfc931_timeout);
+
+--- a/tcpd.8
++++ b/tcpd.8
+@@ -94,7 +94,7 @@ configuration files.
+ .PP
+ The example assumes that the network daemons live in /usr/etc. On some
+ systems, network daemons live in /usr/sbin or in /usr/libexec, or have
+-no `in.\' prefix to their name.
++no `in.' prefix to their name.
+ .SH EXAMPLE 2
+ This example applies when \fItcpd\fR expects that the network daemons
+ are left in their original place.
+@@ -110,26 +110,26 @@ finger stream tcp nowait nobody /us
+ becomes:
+ .sp
+ .ti +5
+-finger stream tcp nowait nobody /some/where/tcpd in.fingerd
++finger stream tcp nowait nobody /usr/sbin/tcpd in.fingerd
+ .sp
+ .fi
+ .PP
+ The example assumes that the network daemons live in /usr/etc. On some
+ systems, network daemons live in /usr/sbin or in /usr/libexec, the
+-daemons have no `in.\' prefix to their name, or there is no userid
++daemons have no `in.' prefix to their name, or there is no userid
+ field in the inetd configuration file.
+ .PP
+ Similar changes will be needed for the other services that are to be
+-covered by \fItcpd\fR. Send a `kill -HUP\' to the \fIinetd\fR(8)
++covered by \fItcpd\fR. Send a `kill -HUP' to the \fIinetd\fR(8)
+ process to make the changes effective. AIX users may also have to
+-execute the `inetimp\' command.
++execute the `inetimp' command.
+ .SH EXAMPLE 3
+ In the case of daemons that do not live in a common directory ("secret"
+ or otherwise), edit the \fIinetd\fR configuration file so that it
+ specifies an absolute path name for the process name field. For example:
+ .nf
+ .sp
+- ntalk dgram udp wait root /some/where/tcpd /usr/local/lib/ntalkd
++ ntalk dgram udp wait root /usr/sbin/tcpd /usr/sbin/in.ntalkd
+ .sp
+ .fi
+ .PP
+--- a/hosts_access.3
++++ b/hosts_access.3
+@@ -3,7 +3,7 @@
+ hosts_access, hosts_ctl, request_init, request_set \- access control library
+ .SH SYNOPSIS
+ .nf
+-#include "tcpd.h"
++#include <tcpd.h>
+
+ extern int allow_severity;
+ extern int deny_severity;
+--- a/options.c
++++ b/options.c
+@@ -473,6 +473,9 @@ static struct syslog_names log_fac[] = {
+ #ifdef LOG_CRON
+ "cron", LOG_CRON,
+ #endif
++#ifdef LOG_FTP
++ "ftp", LOG_FTP,
++#endif
+ #ifdef LOG_LOCAL0
+ "local0", LOG_LOCAL0,
+ #endif
+--- a/fix_options.c
++++ b/fix_options.c
+@@ -35,7 +35,12 @@ struct request_info *request;
+ #ifdef IP_OPTIONS
+ unsigned char optbuf[BUFFER_SIZE / 3], *cp;
+ char lbuf[BUFFER_SIZE], *lp;
++#if !defined(__GLIBC__)
+ int optsize = sizeof(optbuf), ipproto;
++#else /* __GLIBC__ */
++ size_t optsize = sizeof(optbuf);
++ int ipproto;
++#endif /* __GLIBC__ */
+ struct protoent *ip;
+ int fd = request->fd;
+ unsigned int opt;
+--- a/workarounds.c
++++ b/workarounds.c
+@@ -163,7 +163,11 @@ int *fromlen;
+ int fix_getpeername(sock, sa, len)
+ int sock;
+ struct sockaddr *sa;
++#if !defined(__GLIBC__)
+ int *len;
++#else /* __GLIBC__ */
++size_t *len;
++#endif /* __GLIBC__ */
+ {
+ int ret;
+ struct sockaddr_in *sin = (struct sockaddr_in *) sa;
+--- a/socket.c
++++ b/socket.c
+@@ -76,7 +76,11 @@ struct request_info *request;
+ {
+ static struct sockaddr_in client;
+ static struct sockaddr_in server;
++#if !defined (__GLIBC__)
+ int len;
++#else /* __GLIBC__ */
++ size_t len;
++#endif /* __GLIBC__ */
+ char buf[BUFSIZ];
+ int fd = request->fd;
+
+@@ -224,7 +228,11 @@ int fd;
+ {
+ char buf[BUFSIZ];
+ struct sockaddr_in sin;
++#if !defined(__GLIBC__)
+ int size = sizeof(sin);
++#else /* __GLIBC__ */
++ size_t size = sizeof(sin);
++#endif /* __GLIBC__ */
+
+ /*
+ * Eat up the not-yet received datagram. Some systems insist on a
+--- a/safe_finger.c
++++ b/safe_finger.c
+@@ -26,21 +26,24 @@ static char sccsid[] = "@(#) safe_finger
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <pwd.h>
++#include <syslog.h>
+
+ extern void exit();
+
+ /* Local stuff */
+
+-char path[] = "PATH=/bin:/usr/bin:/usr/ucb:/usr/bsd:/etc:/usr/etc:/usr/sbin";
++char path[] = "PATH=/bin:/usr/bin:/sbin:/usr/sbin";
+
+ #define TIME_LIMIT 60 /* Do not keep listinging forever */
+ #define INPUT_LENGTH 100000 /* Do not keep listinging forever */
+ #define LINE_LENGTH 128 /* Editors can choke on long lines */
+ #define FINGER_PROGRAM "finger" /* Most, if not all, UNIX systems */
+ #define UNPRIV_NAME "nobody" /* Preferred privilege level */
+-#define UNPRIV_UGID 32767 /* Default uid and gid */
++#define UNPRIV_UGID 65534 /* Default uid and gid */
+
+ int finger_pid;
++int allow_severity = SEVERITY;
++int deny_severity = LOG_WARNING;
+
+ void cleanup(sig)
+ int sig;
+--- a/hosts_options.5
++++ b/hosts_options.5
+@@ -58,12 +58,12 @@ Notice the leading dot on the domain nam
+ Execute, in a child process, the specified shell command, after
+ performing the %<letter> expansions described in the hosts_access(5)
+ manual page. The command is executed with stdin, stdout and stderr
+-connected to the null device, so that it won\'t mess up the
++connected to the null device, so that it won't mess up the
+ conversation with the client host. Example:
+ .sp
+ .nf
+ .ti +3
+-spawn (/some/where/safe_finger -l @%h | /usr/ucb/mail root) &
++spawn (/usr/sbin/safe_finger -l @%h | /usr/bin/mail root) &
+ .fi
+ .sp
+ executes, in a background child process, the shell command "safe_finger
+--- a/tcpdchk.c
++++ b/tcpdchk.c
+@@ -350,6 +350,8 @@ char *pat;
+ {
+ if (pat[0] == '@') {
+ tcpd_warn("%s: daemon name begins with \"@\"", pat);
++ } else if (pat[0] == '/') {
++ tcpd_warn("%s: daemon name begins with \"/\"", pat);
+ } else if (pat[0] == '.') {
+ tcpd_warn("%s: daemon name begins with dot", pat);
+ } else if (pat[strlen(pat) - 1] == '.') {
+@@ -382,6 +384,8 @@ char *pat;
+ {
+ if (pat[0] == '@') { /* @netgroup */
+ tcpd_warn("%s: user name begins with \"@\"", pat);
++ } else if (pat[0] == '/') {
++ tcpd_warn("%s: user name begins with \"/\"", pat);
+ } else if (pat[0] == '.') {
+ tcpd_warn("%s: user name begins with dot", pat);
+ } else if (pat[strlen(pat) - 1] == '.') {
+@@ -402,8 +406,13 @@ char *pat;
+ static int check_host(pat)
+ char *pat;
+ {
++ char buf[BUFSIZ];
+ char *mask;
+ int addr_count = 1;
++ FILE *fp;
++ struct tcpd_context saved_context;
++ char *cp;
++ char *wsp = " \t\r\n";
+
+ if (pat[0] == '@') { /* @netgroup */
+ #ifdef NO_NETGRENT
+@@ -422,6 +431,21 @@ char *pat;
+ tcpd_warn("netgroup support disabled");
+ #endif
+ #endif
++ } else if (pat[0] == '/') { /* /path/name */
++ if ((fp = fopen(pat, "r")) != 0) {
++ saved_context = tcpd_context;
++ tcpd_context.file = pat;
++ tcpd_context.line = 0;
++ while (fgets(buf, sizeof(buf), fp)) {
++ tcpd_context.line++;
++ for (cp = strtok(buf, wsp); cp; cp = strtok((char *) 0, wsp))
++ check_host(cp);
++ }
++ tcpd_context = saved_context;
++ fclose(fp);
++ } else if (errno != ENOENT) {
++ tcpd_warn("open %s: %m", pat);
++ }
+ } else if (mask = split_at(pat, '/')) { /* network/netmask */
+ if (dot_quad_addr(pat) == INADDR_NONE
+ || dot_quad_addr(mask) == INADDR_NONE)
+--- a/percent_m.c
++++ b/percent_m.c
+@@ -13,7 +13,7 @@ static char sccsid[] = "@(#) percent_m.c
+ #include <string.h>
+
+ extern int errno;
+-#ifndef SYS_ERRLIST_DEFINED
++#if !defined(SYS_ERRLIST_DEFINED) && !defined(HAVE_STRERROR)
+ extern char *sys_errlist[];
+ extern int sys_nerr;
+ #endif
+@@ -29,11 +29,15 @@ char *ibuf;
+
+ while (*bp = *cp)
+ if (*cp == '%' && cp[1] == 'm') {
++#ifdef HAVE_STRERROR
++ strcpy(bp, strerror(errno));
++#else
+ if (errno < sys_nerr && errno > 0) {
+ strcpy(bp, sys_errlist[errno]);
+ } else {
+ sprintf(bp, "Unknown error %d", errno);
+ }
++#endif
+ bp += strlen(bp);
+ cp += 2;
+ } else {
+--- a/scaffold.c
++++ b/scaffold.c
+@@ -180,10 +180,12 @@ struct request_info *request;
+
+ /* ARGSUSED */
+
+-void rfc931(request)
+-struct request_info *request;
++void rfc931(rmt_sin, our_sin, dest)
++struct sockaddr_in *rmt_sin;
++struct sockaddr_in *our_sin;
++char *dest;
+ {
+- strcpy(request->user, unknown);
++ strcpy(dest, unknown);
+ }
+
+ /* check_path - examine accessibility */
+--- /dev/null
++++ b/weak_symbols.c
+@@ -0,0 +1,11 @@
++ /*
++ * @(#) weak_symbols.h 1.5 99/12/29 23:50
++ *
++ * Author: Anthony Towns <ajt@debian.org>
++ */
++
++#ifdef HAVE_WEAKSYMS
++#include <syslog.h>
++int deny_severity = LOG_WARNING;
++int allow_severity = SEVERITY;
++#endif
--- /dev/null
+--- a/Makefile
++++ b/Makefile
+@@ -689,7 +689,8 @@ SHLIBFLAGS = -Lshared -lwrap
+ shared/%.o: %.c
+ $(CC) $(CFLAGS) $(SHCFLAGS) -c $< -o $@
+
+-CFLAGS = -O2 -g -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
++OPT_CFLAGS = -O2 -g
++CFLAGS = $(OPT_CFLAGS) -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
+ $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
+ -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
+ -DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
--- /dev/null
+--- a/scaffold.c
++++ b/scaffold.c
+@@ -20,13 +20,12 @@ static char sccs_id[] = "@(#) scaffold.c
+ #include <syslog.h>
+ #include <setjmp.h>
+ #include <string.h>
++#include <stdlib.h>
+
+ #ifndef INADDR_NONE
+ #define INADDR_NONE (-1) /* XXX should be 0xffffffff */
+ #endif
+
+-extern char *malloc();
+-
+ /* Application-specific. */
+
+ #include "tcpd.h"
--- /dev/null
+--- a/hosts_access.5
++++ b/hosts_access.5
+@@ -90,6 +90,9 @@ bitwise AND of the address and the `mask
+ pattern `131.155.72.0/255.255.254.0' matches every address in the
+ range `131.155.72.0' through `131.155.73.255'.
+ .IP \(bu
++An expression of the form `n.n.n.n/m\' is interpreted as a
++`net/prefixlen\' pair, as below, for IPv4 addresses.
++.IP \(bu
+ A string that begins with a `/' character is treated as a file
+ name. A host name or address is matched if it matches any host name
+ or address pattern listed in the named file. The file format is
+--- a/tcpd.h
++++ b/tcpd.h
+@@ -93,6 +93,7 @@ extern void refuse __P((struct request_i
+ extern char *xgets __P((char *, int, FILE *)); /* fgets() on steroids */
+ extern char *split_at __P((char *, int)); /* strchr() and split */
+ extern unsigned long dot_quad_addr __P((char *)); /* restricted inet_addr() */
++extern unsigned long prefix_to_netmask __P((char *)); /* 0-32 prefix length */
+
+ /* Global variables. */
+
+--- a/misc.c
++++ b/misc.c
+@@ -14,6 +14,8 @@ static char sccsic[] = "@(#) misc.c 1.2
+ #include <arpa/inet.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <ctype.h>
++#include <stdlib.h>
+
+ #include "tcpd.h"
+
+@@ -85,3 +87,22 @@ char *str;
+ }
+ return (runs == 4 ? inet_addr(str) : INADDR_NONE);
+ }
++
++/* prefix_to_netmask - convert prefix (0-32) to netmask */
++
++unsigned long prefix_to_netmask(str)
++char *str;
++{
++ unsigned long prefix;
++ char *endptr;
++
++ if (!isdigit(str[0]))
++ return INADDR_NONE;
++
++ prefix = strtoul(str, &endptr, 10);
++ if ((endptr == str) || (*endptr != '\0') || (prefix > 32))
++ return INADDR_NONE;
++
++ return htonl(~0UL << (32 - prefix));
++}
++
+--- a/hosts_access.c
++++ b/hosts_access.c
+@@ -345,7 +345,12 @@ char *string;
+ if ((addr = dot_quad_addr(string)) == INADDR_NONE)
+ return (NO);
+ if ((net = dot_quad_addr(net_tok)) == INADDR_NONE
+- || (mask = dot_quad_addr(mask_tok)) == INADDR_NONE) {
++ || ((mask = dot_quad_addr(mask_tok)) == INADDR_NONE
++ && strcmp(mask_tok, "255.255.255.255")
++ && (mask = prefix_to_netmask(mask_tok)) == INADDR_NONE
++ && strcmp(mask_tok, "32"))) {
++ /* 255.255.255.255 == INADDR_NONE, separate check needed. TJ. */
++ /* 32 == INADDR_NONE, separate check needed. philipp */
+ tcpd_warn("bad net/mask expression: %s/%s", net_tok, mask_tok);
+ return (NO); /* not tcpd_jump() */
+ }
include $(TOPDIR)/rules.mk
PKG_NAME:=cshark
-PKG_VERSION:=2014-06-24
+PKG_VERSION:=2014-07-02
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/cloudshark/cshark.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=7eb7c109d654dfa06c8fcf6776959dbafdeb33f1
+PKG_SOURCE_VERSION:=ec638311b0b8ef74baf0be06dcf03a641e3308a2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_BUILD_PARALLEL:=1
PKG_MD5SUM:=628e8b2a28d47f262e4c26c989402a59
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
+PKG_CHECK_FORMAT_SECURITY:=0
include $(INCLUDE_DIR)/package.mk
CATEGORY:=Network
TITLE:=WoL client for magic packets via ethernet frames
URL:=http://ftp.debian.org/debian/pool/main/e/etherwake
+ MAINTAINER:=Peter Wagner <tripolar@gmx.at>
endef
define Package/etherwake/description
depends on PACKAGE_fastd
default n
+config FASTD_WITH_VERIFY
+ bool "Include support for on-verify handlers"
+ depends on PACKAGE_fastd
+ default n
+
endmenu
include $(TOPDIR)/rules.mk
PKG_NAME:=fastd
-PKG_VERSION:=12
+PKG_VERSION:=14
PKG_RELEASE:=1
PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/73
-PKG_MD5SUM:=1dadc61f4d712a10844afcb9b9f49a41
+PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/75
+PKG_MD5SUM:=34f6bdebd0410a1fba7c8fd06fff7a05
PKG_CONFIG_DEPENDS:=\
CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \
CONFIG_FASTD_WITH_CMDLINE_USER \
CONFIG_FASTD_WITH_CMDLINE_LOGGING \
CONFIG_FASTD_WITH_CMDLINE_OPERATION \
- CONFIG_FASTD_WITH_CMDLINE_COMMANDS
+ CONFIG_FASTD_WITH_CMDLINE_COMMANDS \
+ CONFIG_FASTD_WITH_VERIFY
PKG_BUILD_DEPENDS:=nacl libuecc
-DWITH_CMDLINE_LOGGING:BOOL=FALSE \
-DWITH_CMDLINE_OPERATION:BOOL=FALSE \
-DWITH_CMDLINE_COMMANDS:BOOL=FALSE \
- -DWITH_CAPABILITIES:BOOL=FALSE
+ -DWITH_VERIFY:BOOL=FALSE \
+ -DWITH_CAPABILITIES:BOOL=FALSE \
+ -DENABLE_SYSTEMD:BOOL=FALSE \
+ -DENABLE_LIBSODIUM:BOOL=FALSE \
+ -DENABLE_LTO:BOOL=TRUE
ifeq ($(CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST),y)
CMAKE_OPTIONS += -DWITH_CMDLINE_COMMANDS:BOOL=TRUE
endif
+ifeq ($(CONFIG_FASTD_WITH_VERIFY),y)
+CMAKE_OPTIONS += -DWITH_VERIFY:BOOL=TRUE
+endif
+
define Package/fastd/description
Fast and secure tunneling daemon, which is optimized on small code size and few dependencies
START=95
+SERVICE_USE_PID=1
+
EXTRA_COMMANDS="up down show_key generate_key"
LIST_SEP="
start() {
config_load 'fastd'
config_foreach start_instance 'fastd'
+ return 0
}
stop() {
config_load 'fastd'
config_foreach stop_instance 'fastd'
+ return 0
}
reload() {
config_load 'fastd'
config_foreach reload_instance 'fastd'
+ return 0
}
up() {
DEPENDS:=+libopenssl +libpthread
TITLE:=The fast version control system
URL:=http://git-scm.com
+ MAINTAINER:=Peter Wagner <tripolar@gmx.at>
endef
define Package/git/description
PKG_NAME:=haproxy
PKG_VERSION:=1.5.1
-PKG_RELEASE:=06
+PKG_RELEASE:=09
PKG_SOURCE:=haproxy-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://haproxy.1wt.eu/download/1.5/src/
PKG_MD5SUM:=49640cf3ddd793a05fbd3394481a1ed4
--- /dev/null
+From e726fd6571f684d0e92b8d97de8ca7a68d30f708 Mon Sep 17 00:00:00 2001
+From: Willy Tarreau <w@1wt.eu>
+Date: Thu, 26 Jun 2014 08:20:38 +0200
+Subject: [PATCH 7/9] BUILD: remove TODO from the spec file and add README
+
+This used to cause a build failure since 1.5.0, as reported by
+Timothy Shelton. The proxy protocol doc was also added.
+(cherry picked from commit ca3094d0b1531ce62fc1970aa7396a01330bb5c1)
+---
+ examples/haproxy.spec | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/examples/haproxy.spec b/examples/haproxy.spec
+index 4ee3aa5..2fdb1a7 100644
+--- a/examples/haproxy.spec
++++ b/examples/haproxy.spec
+@@ -67,7 +67,7 @@ fi
+
+ %files
+ %defattr(-,root,root)
+-%doc CHANGELOG TODO examples/*.cfg doc/haproxy-en.txt doc/haproxy-fr.txt doc/architecture.txt doc/configuration.txt
++%doc CHANGELOG README examples/*.cfg doc/haproxy-en.txt doc/haproxy-fr.txt doc/architecture.txt doc/configuration.txt doc/proxy-protocol.txt
+ %doc %{_mandir}/man1/%{name}.1*
+
+ %attr(0755,root,root) %{_sbindir}/%{name}
+--
+1.8.5.5
+
--- /dev/null
+From b4cbc1e2227754ff384da1437e7d3448f91571b2 Mon Sep 17 00:00:00 2001
+From: Willy Tarreau <w@1wt.eu>
+Date: Fri, 27 Jun 2014 18:08:49 +0200
+Subject: [PATCH 8/9] MINOR: log: make MAX_SYSLOG_LEN overridable at build time
+
+This value was set in log.h without any #ifndef around, so when one
+wanted to change it, a patch was needed. Let's move it to defaults.h
+with the usual #ifndef so that it's easier to change it.
+(cherry picked from commit 4e957907aa117c07214ab84ba2a58f2fc1666931)
+---
+ include/common/defaults.h | 4 ++++
+ include/types/log.h | 1 -
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/include/common/defaults.h b/include/common/defaults.h
+index c53db08..0075509 100644
+--- a/include/common/defaults.h
++++ b/include/common/defaults.h
+@@ -48,6 +48,10 @@
+ #define CAPTURE_LEN 64
+ #endif
+
++#ifndef MAX_SYSLOG_LEN
++#define MAX_SYSLOG_LEN 1024
++#endif
++
+ // maximum line size when parsing config
+ #ifndef LINESIZE
+ #define LINESIZE 2048
+diff --git a/include/types/log.h b/include/types/log.h
+index 8ee8d7c..b3288bd 100644
+--- a/include/types/log.h
++++ b/include/types/log.h
+@@ -28,7 +28,6 @@
+ #include <common/config.h>
+ #include <common/mini-clist.h>
+
+-#define MAX_SYSLOG_LEN 1024
+ #define NB_LOG_FACILITIES 24
+ #define NB_LOG_LEVELS 8
+ #define SYSLOG_PORT 514
+--
+1.8.5.5
+
--- /dev/null
+From dc2695cc531bd7fc98f09df5f6e1e57290ab1a14 Mon Sep 17 00:00:00 2001
+From: Willy Tarreau <w@1wt.eu>
+Date: Fri, 27 Jun 2014 18:10:07 +0200
+Subject: [PATCH 9/9] MEDIUM: log: support a user-configurable max log line
+ length
+
+With all the goodies supported by logformat, people find that the limit
+of 1024 chars for log lines is too short. Some servers do not support
+larger lines and can simply drop them, so changing the default value is
+not always the best choice.
+
+This patch takes a different approach. Log line length is specified per
+log server on the "log" line, with a value between 80 and 65535. That
+way it's possibly to satisfy all needs, even with some fat local servers
+and small remote ones.
+(cherry picked from commit 18324f574f349d510622ff45635de899437a3a11)
+---
+ doc/configuration.txt | 28 ++++++++++++++++--
+ include/proto/log.h | 1 +
+ include/types/global.h | 1 +
+ include/types/log.h | 1 +
+ src/cfgparse.c | 80 ++++++++++++++++++++++++++++++++++++++++----------
+ src/log.c | 36 ++++++++++++++++-------
+ 6 files changed, 118 insertions(+), 29 deletions(-)
+
+diff --git a/doc/configuration.txt b/doc/configuration.txt
+index 080d8fc..e53bb21 100644
+--- a/doc/configuration.txt
++++ b/doc/configuration.txt
+@@ -559,7 +559,7 @@ group <group name>
+ Similar to "gid" but uses the GID of group name <group name> from /etc/group.
+ See also "gid" and "user".
+
+-log <address> <facility> [max level [min level]]
++log <address> [len <length>] <facility> [max level [min level]]
+ Adds a global syslog server. Up to two global servers can be defined. They
+ will receive logs for startups and exits, as well as all logs from proxies
+ configured with "log global".
+@@ -584,6 +584,18 @@ log <address> <facility> [max level [min level]]
+ optionally enclosing them with braces ('{}'), similarly to what is done
+ in Bourne shell.
+
++ <length> is an optional maximum line length. Log lines larger than this value
++ will be truncated before being sent. The reason is that syslog
++ servers act differently on log line length. All servers support the
++ default value of 1024, but some servers simply drop larger lines
++ while others do log them. If a server supports long lines, it may
++ make sense to set this value here in order to avoid truncating long
++ lines. Similarly, if a server drops long lines, it is preferable to
++ truncate them before sending them. Accepted values are 80 to 65535
++ inclusive. The default value of 1024 is generally fine for all
++ standard usages. Some specific cases of long captures or
++ JSON-formated logs may require larger values.
++
+ <facility> must be one of the 24 standard syslog facilities :
+
+ kern user mail daemon auth syslog lpr news
+@@ -3349,7 +3361,7 @@ ignore-persist { if | unless } <condition>
+
+
+ log global
+-log <address> <facility> [<level> [<minlevel>]]
++log <address> [len <length>] <facility> [<level> [<minlevel>]]
+ no log
+ Enable per-instance logging of events and traffic.
+ May be used in sections : defaults | frontend | listen | backend
+@@ -3389,6 +3401,18 @@ no log
+ sign ('$') and optionally enclosing them with braces ('{}'),
+ similarly to what is done in Bourne shell.
+
++ <length> is an optional maximum line length. Log lines larger than this
++ value will be truncated before being sent. The reason is that
++ syslog servers act differently on log line length. All servers
++ support the default value of 1024, but some servers simply drop
++ larger lines while others do log them. If a server supports long
++ lines, it may make sense to set this value here in order to avoid
++ truncating long lines. Similarly, if a server drops long lines,
++ it is preferable to truncate them before sending them. Accepted
++ values are 80 to 65535 inclusive. The default value of 1024 is
++ generally fine for all standard usages. Some specific cases of
++ long captures or JSON-formated logs may require larger values.
++
+ <facility> must be one of the 24 standard syslog facilities :
+
+ kern user mail daemon auth syslog lpr news
+diff --git a/include/proto/log.h b/include/proto/log.h
+index e3c1a75..54c51d1 100644
+--- a/include/proto/log.h
++++ b/include/proto/log.h
+@@ -39,6 +39,7 @@ extern char *log_format;
+ extern char default_tcp_log_format[];
+ extern char default_http_log_format[];
+ extern char clf_http_log_format[];
++extern char *logline;
+
+
+ int build_logline(struct session *s, char *dst, size_t maxsize, struct list *list_format);
+diff --git a/include/types/global.h b/include/types/global.h
+index 23e3f3d..77df1dd 100644
+--- a/include/types/global.h
++++ b/include/types/global.h
+@@ -110,6 +110,7 @@ struct global {
+ int last_checks;
+ int spread_checks;
+ int max_spread_checks;
++ int max_syslog_len;
+ char *chroot;
+ char *pidfile;
+ char *node, *desc; /* node name & description */
+diff --git a/include/types/log.h b/include/types/log.h
+index b3288bd..c7e47ea 100644
+--- a/include/types/log.h
++++ b/include/types/log.h
+@@ -152,6 +152,7 @@ struct logsrv {
+ int facility;
+ int level;
+ int minlvl;
++ int maxlen;
+ };
+
+ #endif /* _TYPES_LOG_H */
+diff --git a/src/cfgparse.c b/src/cfgparse.c
+index 762978a..e6e65b4 100644
+--- a/src/cfgparse.c
++++ b/src/cfgparse.c
+@@ -1254,6 +1254,8 @@ int cfg_parse_global(const char *file, int linenum, char **args, int kwm)
+ struct sockaddr_storage *sk;
+ int port1, port2;
+ struct logsrv *logsrv;
++ int arg = 0;
++ int len = 0;
+
+ if (*(args[1]) == 0 || *(args[2]) == 0) {
+ Alert("parsing [%s:%d] : '%s' expects <address> and <facility> as arguments.\n", file, linenum, args[0]);
+@@ -1263,28 +1265,50 @@ int cfg_parse_global(const char *file, int linenum, char **args, int kwm)
+
+ logsrv = calloc(1, sizeof(struct logsrv));
+
+- logsrv->facility = get_log_facility(args[2]);
++ /* just after the address, a length may be specified */
++ if (strcmp(args[arg+2], "len") == 0) {
++ len = atoi(args[arg+3]);
++ if (len < 80 || len > 65535) {
++ Alert("parsing [%s:%d] : invalid log length '%s', must be between 80 and 65535.\n",
++ file, linenum, args[arg+3]);
++ err_code |= ERR_ALERT | ERR_FATAL;
++ goto out;
++ }
++ logsrv->maxlen = len;
++
++ /* skip these two args */
++ arg += 2;
++ }
++ else
++ logsrv->maxlen = MAX_SYSLOG_LEN;
++
++ if (logsrv->maxlen > global.max_syslog_len) {
++ global.max_syslog_len = logsrv->maxlen;
++ logline = realloc(logline, global.max_syslog_len + 1);
++ }
++
++ logsrv->facility = get_log_facility(args[arg+2]);
+ if (logsrv->facility < 0) {
+- Alert("parsing [%s:%d] : unknown log facility '%s'\n", file, linenum, args[2]);
++ Alert("parsing [%s:%d] : unknown log facility '%s'\n", file, linenum, args[arg+2]);
+ err_code |= ERR_ALERT | ERR_FATAL;
+ logsrv->facility = 0;
+ }
+
+ logsrv->level = 7; /* max syslog level = debug */
+- if (*(args[3])) {
+- logsrv->level = get_log_level(args[3]);
++ if (*(args[arg+3])) {
++ logsrv->level = get_log_level(args[arg+3]);
+ if (logsrv->level < 0) {
+- Alert("parsing [%s:%d] : unknown optional log level '%s'\n", file, linenum, args[3]);
++ Alert("parsing [%s:%d] : unknown optional log level '%s'\n", file, linenum, args[arg+3]);
+ err_code |= ERR_ALERT | ERR_FATAL;
+ logsrv->level = 0;
+ }
+ }
+
+ logsrv->minlvl = 0; /* limit syslog level to this level (emerg) */
+- if (*(args[4])) {
+- logsrv->minlvl = get_log_level(args[4]);
++ if (*(args[arg+4])) {
++ logsrv->minlvl = get_log_level(args[arg+4]);
+ if (logsrv->minlvl < 0) {
+- Alert("parsing [%s:%d] : unknown optional minimum log level '%s'\n", file, linenum, args[4]);
++ Alert("parsing [%s:%d] : unknown optional minimum log level '%s'\n", file, linenum, args[arg+4]);
+ err_code |= ERR_ALERT | ERR_FATAL;
+ logsrv->minlvl = 0;
+ }
+@@ -4791,22 +4815,46 @@ stats_error_parsing:
+ else if (*(args[1]) && *(args[2])) {
+ struct sockaddr_storage *sk;
+ int port1, port2;
++ int arg = 0;
++ int len = 0;
+
+ logsrv = calloc(1, sizeof(struct logsrv));
+
+- logsrv->facility = get_log_facility(args[2]);
++ /* just after the address, a length may be specified */
++ if (strcmp(args[arg+2], "len") == 0) {
++ len = atoi(args[arg+3]);
++ if (len < 80 || len > 65535) {
++ Alert("parsing [%s:%d] : invalid log length '%s', must be between 80 and 65535.\n",
++ file, linenum, args[arg+3]);
++ err_code |= ERR_ALERT | ERR_FATAL;
++ goto out;
++ }
++ logsrv->maxlen = len;
++
++ /* skip these two args */
++ arg += 2;
++ }
++ else
++ logsrv->maxlen = MAX_SYSLOG_LEN;
++
++ if (logsrv->maxlen > global.max_syslog_len) {
++ global.max_syslog_len = logsrv->maxlen;
++ logline = realloc(logline, global.max_syslog_len + 1);
++ }
++
++ logsrv->facility = get_log_facility(args[arg+2]);
+ if (logsrv->facility < 0) {
+- Alert("parsing [%s:%d] : unknown log facility '%s'\n", file, linenum, args[2]);
++ Alert("parsing [%s:%d] : unknown log facility '%s'\n", file, linenum, args[arg+2]);
+ err_code |= ERR_ALERT | ERR_FATAL;
+ goto out;
+
+ }
+
+ logsrv->level = 7; /* max syslog level = debug */
+- if (*(args[3])) {
+- logsrv->level = get_log_level(args[3]);
++ if (*(args[arg+3])) {
++ logsrv->level = get_log_level(args[arg+3]);
+ if (logsrv->level < 0) {
+- Alert("parsing [%s:%d] : unknown optional log level '%s'\n", file, linenum, args[3]);
++ Alert("parsing [%s:%d] : unknown optional log level '%s'\n", file, linenum, args[arg+3]);
+ err_code |= ERR_ALERT | ERR_FATAL;
+ goto out;
+
+@@ -4814,10 +4862,10 @@ stats_error_parsing:
+ }
+
+ logsrv->minlvl = 0; /* limit syslog level to this level (emerg) */
+- if (*(args[4])) {
+- logsrv->minlvl = get_log_level(args[4]);
++ if (*(args[arg+4])) {
++ logsrv->minlvl = get_log_level(args[arg+4]);
+ if (logsrv->minlvl < 0) {
+- Alert("parsing [%s:%d] : unknown optional minimum log level '%s'\n", file, linenum, args[4]);
++ Alert("parsing [%s:%d] : unknown optional minimum log level '%s'\n", file, linenum, args[arg+4]);
+ err_code |= ERR_ALERT | ERR_FATAL;
+ goto out;
+
+diff --git a/src/log.c b/src/log.c
+index 114ab7b..3e3acb4 100644
+--- a/src/log.c
++++ b/src/log.c
+@@ -146,7 +146,7 @@ char *log_format = NULL;
+ /* This is a global syslog line, common to all outgoing messages. It begins
+ * with the syslog tag and the date that are updated by update_log_hdr().
+ */
+-static char logline[MAX_SYSLOG_LEN];
++char *logline = NULL;
+
+ struct logformat_var_args {
+ char *name;
+@@ -736,7 +736,7 @@ static char *update_log_hdr()
+ tvsec = date.tv_sec;
+ get_localtime(tvsec, &tm);
+
+- hdr_len = snprintf(logline, MAX_SYSLOG_LEN,
++ hdr_len = snprintf(logline, global.max_syslog_len,
+ "<<<<>%s %2d %02d:%02d:%02d %s%s[%d]: ",
+ monthname[tm.tm_mon],
+ tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec,
+@@ -746,8 +746,8 @@ static char *update_log_hdr()
+ * either -1 or the number of bytes that would be needed to store
+ * the total message. In both cases, we must adjust it.
+ */
+- if (hdr_len < 0 || hdr_len > MAX_SYSLOG_LEN)
+- hdr_len = MAX_SYSLOG_LEN;
++ if (hdr_len < 0 || hdr_len > global.max_syslog_len)
++ hdr_len = global.max_syslog_len;
+
+ dataptr = logline + hdr_len;
+ }
+@@ -772,9 +772,9 @@ void send_log(struct proxy *p, int level, const char *format, ...)
+ data_len = dataptr - logline;
+
+ va_start(argp, format);
+- data_len += vsnprintf(dataptr, logline + sizeof(logline) - dataptr, format, argp);
+- if (data_len < 0 || data_len > MAX_SYSLOG_LEN)
+- data_len = MAX_SYSLOG_LEN;
++ data_len += vsnprintf(dataptr, logline + global.max_syslog_len - dataptr, format, argp);
++ if (data_len < 0 || data_len > global.max_syslog_len)
++ data_len = global.max_syslog_len;
+ va_end(argp);
+
+ __send_log(p, level, logline, data_len);
+@@ -811,8 +811,6 @@ void __send_log(struct proxy *p, int level, char *message, size_t size)
+ if (!logsrvs)
+ return;
+
+- message[size - 1] = '\n';
+-
+ /* Send log messages to syslog server. */
+ nblogger = 0;
+ list_for_each_entry(tmp, logsrvs, list) {
+@@ -820,6 +818,8 @@ void __send_log(struct proxy *p, int level, char *message, size_t size)
+ int *plogfd = logsrv->addr.ss_family == AF_UNIX ?
+ &logfdunix : &logfdinet;
+ int sent;
++ int max;
++ char backup;
+
+ nblogger++;
+
+@@ -858,9 +858,23 @@ void __send_log(struct proxy *p, int level, char *message, size_t size)
+ } while (fac_level && log_ptr > dataptr);
+ *log_ptr = '<';
+
+- sent = sendto(*plogfd, log_ptr, size - (log_ptr - dataptr),
++ max = size - (log_ptr - dataptr);
++ if (max > logsrv->maxlen)
++ max = logsrv->maxlen;
++
++ /* insert a \n at the end of the message, but save what was
++ * there first because we could have different max lengths
++ * for different log targets.
++ */
++ backup = log_ptr[max - 1];
++ log_ptr[max - 1] = '\n';
++
++ sent = sendto(*plogfd, log_ptr, max,
+ MSG_DONTWAIT | MSG_NOSIGNAL,
+ (struct sockaddr *)&logsrv->addr, get_addr_len(&logsrv->addr));
++
++ log_ptr[max - 1] = backup;
++
+ if (sent < 0) {
+ Alert("sendto logger #%d failed: %s (errno=%d)\n",
+ nblogger, strerror(errno), errno);
+@@ -1604,7 +1618,7 @@ void sess_log(struct session *s)
+
+ tmplog = update_log_hdr();
+ size = tmplog - logline;
+- size += build_logline(s, tmplog, sizeof(logline) - size, &s->fe->logformat);
++ size += build_logline(s, tmplog, global.max_syslog_len - size, &s->fe->logformat);
+ if (size > 0) {
+ __send_log(s->fe, level, logline, size + 1);
+ s->logs.logwait = 0;
+--
+1.8.5.5
+
--- /dev/null
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=net-snmp
+PKG_VERSION:=5.4.4
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/net-snmp
+PKG_MD5SUM:=95aa054f3c99a1ce242807d7eaf98619
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=MIT BSD-3-Clause-Clear
+
+PKG_FIXUP = patch-libtool
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/net-snmp/Default
+ SECTION:=net
+ CATEGORY:=Network
+ URL:=http://www.net-snmp.org/
+endef
+
+define Package/net-snmp/Default/description
+ Simple Network Management Protocol (SNMP) is a widely used protocol for
+ monitoring the health and welfare of network equipment (eg. routers),
+ computer equipment and even devices like UPSs. Net-SNMP is a suite of
+ applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both
+ IPv4 and IPv6.
+endef
+
+
+define Package/libnetsnmp
+$(call Package/net-snmp/Default)
+ SECTION:=libs
+ CATEGORY:=Libraries
+ DEPENDS:=+libelf1
+ TITLE:=Open source SNMP implementation (libraries)
+endef
+
+define Package/libnetsnmp/description
+$(call Package/net-snmp/Default/description)
+ .
+ This package contains shared libraries, needed by other programs.
+endef
+
+
+define Package/snmp-utils
+$(call Package/net-snmp/Default)
+ DEPENDS:=+libnetsnmp
+ TITLE:=Open source SNMP implementation (utilities)
+endef
+
+define Package/snmp-utils/description
+$(call Package/net-snmp/Default/description)
+ .
+ This package contains SNMP client utilities.
+endef
+
+
+define Package/snmpd
+$(call Package/net-snmp/Default)
+ DEPENDS:=+libnetsnmp
+ TITLE:=Open source SNMP implementation (daemon)
+endef
+
+define Package/snmpd/description
+$(call Package/net-snmp/Default/description)
+ .
+ This package contains the SNMP agent, dynamically linked.
+endef
+
+
+define Package/snmpd-static
+$(call Package/net-snmp/Default)
+ TITLE:=Open source SNMP implementation (daemon)
+ DEPENDS:=+libelf1
+endef
+
+define Package/snmpd-static/description
+$(call Package/net-snmp/Default/description)
+ .
+ This package contains the SNMP agent, statically linked.
+endef
+
+
+SNMP_MIB_MODULES_INCLUDED = \
+ host/hr_device \
+ host/hr_disk \
+ host/hr_filesys \
+ host/hr_network \
+ host/hr_partition \
+ host/hr_proc \
+ host/hr_storage \
+ host/hr_system \
+ ieee802dot11 \
+ if-mib/ifXTable \
+ mibII/at \
+ mibII/icmp \
+ mibII/ifTable \
+ mibII/ip \
+ mibII/snmp_mib \
+ mibII/sysORTable \
+ mibII/system_mib \
+ mibII/tcp \
+ mibII/udp \
+ mibII/vacm_context \
+ mibII/vacm_vars \
+ snmpv3/snmpEngine \
+ snmpv3/snmpMPDStats \
+ snmpv3/usmConf \
+ snmpv3/usmStats \
+ snmpv3/usmUser \
+ tunnel \
+ ucd-snmp/disk \
+ ucd-snmp/dlmod \
+ ucd-snmp/extensible \
+ ucd-snmp/loadave \
+ ucd-snmp/memory \
+ ucd-snmp/pass \
+ ucd-snmp/proc \
+ ucd-snmp/vmstat \
+ util_funcs \
+ utilities/execute \
+
+SNMP_MIB_MODULES_EXCLUDED = \
+ agent_mibs \
+ agentx \
+ disman/event \
+ disman/schedule \
+ hardware \
+ host \
+ if-mib \
+ mibII \
+ notification \
+ notification-log-mib \
+ snmpv3mibs \
+ target \
+ tcp-mib \
+ ucd_snmp \
+ udp-mib \
+ utilities \
+
+SNMP_TRANSPORTS_INCLUDED = Callback UDP
+
+SNMP_TRANSPORTS_EXCLUDED = TCP TCPIPv6 Unix
+
+TARGET_CFLAGS += $(FPIC)
+
+CONFIGURE_ARGS += \
+ --enable-mfd-rewrites \
+ --enable-shared \
+ --enable-static \
+ --with-endianness=$(if $(CONFIG_BIG_ENDIAN),big,little) \
+ --with-logfile=/var/log/snmpd.log \
+ --with-persistent-directory=/usr/lib/snmp/ \
+ --with-default-snmp-version=1 \
+ --with-sys-contact=root@localhost \
+ --with-sys-location=Unknown \
+ --enable-applications \
+ --disable-debugging \
+ --disable-manuals \
+ --disable-mibs \
+ --disable-scripts \
+ --with-out-mib-modules="$(SNMP_MIB_MODULES_EXCLUDED)" \
+ --with-mib-modules="$(SNMP_MIB_MODULES_INCLUDED)" \
+ --with-out-transports="$(SNMP_TRANSPORTS_EXCLUDED)" \
+ --with-transports="$(SNMP_TRANSPORTS_INCLUDED)" \
+ --without-openssl \
+ --without-libwrap \
+ --without-rpm \
+ --without-zlib \
+ $(call autoconf_bool,CONFIG_IPV6,ipv6) \
+
+ifeq ($(CONFIG_IPV6),y)
+SNMP_TRANSPORTS_INCLUDED+= UDPIPv6
+endif
+
+TARGET_LDFLAGS += -L$(TOOLCHAIN_DIR)/usr/lib
+
+ifdef CONFIG_PACKAGE_snmpd-static
+ define Build/Compile/static
+ $(MAKE) -C $(PKG_BUILD_DIR)/agent \
+ LDFLAGS="$(TARGET_LDFLAGS) -lm -static" \
+ EXEEXT="-static" \
+ snmpd-static
+ endef
+endif
+
+define Build/Compile
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
+ LDFLAGS="$(TARGET_LDFLAGS) -lm -lc" \
+ all install
+ $(Build/Compile/static)
+endef
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(2)/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(2)/bin/
+ $(SED) 's,=/usr,=$(STAGING_DIR)/usr,g' $(2)/bin/net-snmp-config
+
+ $(INSTALL_DIR) $(1)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/net-snmp $(1)/usr/include/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*} $(1)/usr/lib/
+endef
+
+define Package/libnetsnmp/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.so.* $(1)/usr/lib/
+endef
+
+define Package/snmpd/conffiles
+/etc/default/snmpd
+/etc/config/snmpd
+endef
+
+define Package/snmpd/install
+ $(INSTALL_DIR) $(1)/etc/config
+ $(INSTALL_DATA) ./files/snmpd.conf $(1)/etc/config/snmpd
+ $(INSTALL_DIR) $(1)/etc/snmp
+ ln -sf /var/run/snmpd.conf $(1)/etc/snmp/
+ $(INSTALL_DIR) $(1)/etc/default
+ $(INSTALL_DATA) ./files/snmpd.default $(1)/etc/default/snmpd
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_BIN) ./files/snmpd.init $(1)/etc/init.d/snmpd
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/snmpd $(1)/usr/sbin/snmpd
+endef
+
+define Package/snmpd-static/conffiles
+/etc/default/snmpd
+/etc/config/snmpd
+endef
+
+define Package/snmpd-static/install
+ $(INSTALL_DIR) $(1)/etc/config
+ $(INSTALL_DATA) ./files/snmpd.conf $(1)/etc/config/snmpd
+ $(INSTALL_DIR) $(1)/etc/snmp
+ ln -sf /var/run/snmpd.conf $(1)/etc/snmp/
+ $(INSTALL_DIR) $(1)/etc/default
+ $(INSTALL_DATA) ./files/snmpd.default $(1)/etc/default/snmpd
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_BIN) ./files/snmpd.init $(1)/etc/init.d/snmpd
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/agent/snmpd-static $(1)/usr/sbin/snmpd
+endef
+
+define Package/snmp-utils/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/snmp{get,set,status,test,trap,walk} $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,libnetsnmp))
+$(eval $(call BuildPackage,snmp-utils))
+$(eval $(call BuildPackage,snmpd))
+$(eval $(call BuildPackage,snmpd-static))
--- /dev/null
+config agent
+ option agentaddress UDP:161
+
+config com2sec public
+ option secname ro
+ option source default
+ option community public
+
+config com2sec private
+ option secname rw
+ option source localhost
+ option community private
+
+config group public_v1
+ option group public
+ option version v1
+ option secname ro
+
+config group public_v2c
+ option group public
+ option version v2c
+ option secname ro
+
+config group public_usm
+ option group public
+ option version usm
+ option secname ro
+
+config group private_v1
+ option group private
+ option version v1
+ option secname rw
+
+config group private_v2c
+ option group private
+ option version v2c
+ option secname rw
+
+config group private_usm
+ option group private
+ option version usm
+ option secname rw
+
+config view all
+ option viewname all
+ option type included
+ option oid .1
+
+config access public_access
+ option group public
+ option context none
+ option version any
+ option level noauth
+ option prefix exact
+ option read all
+ option write none
+ option notify none
+
+config access private_access
+ option group private
+ option context none
+ option version any
+ option level noauth
+ option prefix exact
+ option read all
+ option write all
+ option notify all
+
+config system
+ option sysLocation 'office'
+ option sysContact 'bofh@example.com'
+ option sysName 'HeartOfGold'
+# option sysServices 72
+# option sysDescr 'adult playground'
+# option sysObjectID '1.2.3.4'
+
+config exec
+ option name filedescriptors
+ option prog /bin/cat
+ option args /proc/sys/fs/file-nr
+# option miboid 1.2.3.4
+
--- /dev/null
+OPTIONS="-Lf /dev/null -p /var/run/snmpd.pid"
--- /dev/null
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2008 OpenWrt.org
+START=50
+
+DEFAULT=/etc/default/snmpd
+LIB_D=/var/lib/snmp
+LOG_D=/var/log
+RUN_D=/var/run
+PID_F=$RUN_D/snmpd.pid
+RUN_C=$RUN_D/snmpd.conf
+
+snmpd_agent_add() {
+ local cfg="$1"
+
+ config_get agentaddress "$cfg" agentaddress
+ [ -n "$agentaddress" ] || return 0
+ echo "agentaddress $agentaddress" >> $RUN_C
+}
+snmpd_system_add() {
+ local cfg="$1"
+ config_get syslocation "$cfg" sysLocation
+ [ -n "$syslocation" ] && echo "sysLocation $syslocation" >> $RUN_C
+ config_get syscontact "$cfg" sysContact
+ [ -n "$syscontact" ] && echo "sysContact $syscontact" >> $RUN_C
+ config_get sysname "$cfg" sysName
+ [ -n "$sysname" ] && echo "sysName $sysname" >> $RUN_C
+ config_get sysservice "$cfg" sysService
+ [ -n "$sysservice" ] && echo "sysService $sysservice" >> $RUN_C
+ config_get sysdescr "$cfg" sysDescr
+ [ -n "$sysdescr" ] && echo "sysDescr $sysdescr" >> $RUN_C
+ config_get sysobjectid "$cfg" sysObjectID
+ [ -n "$sysobjectid" ] && echo "sysObjectID $sysobjectid" >> $RUN_C
+}
+snmpd_com2sec_add() {
+ local cfg="$1"
+ config_get secname "$cfg" secname
+ [ -n "$secname" ] || return 0
+ config_get source "$cfg" source
+ [ -n "$source" ] || return 0
+ config_get community "$cfg" community
+ [ -n "$community" ] || return 0
+ echo "com2sec $secname $source $community" >> $RUN_C
+}
+snmpd_com2sec6_add() {
+ local cfg="$1"
+ config_get secname "$cfg" secname
+ [ -n "$secname" ] || return 0
+ config_get source "$cfg" source
+ [ -n "$source" ] || return 0
+ config_get community "$cfg" community
+ [ -n "$community" ] || return 0
+ echo "com2sec6 $secname $source $community" >> $RUN_C
+}
+snmpd_group_add() {
+ local cfg="$1"
+ config_get group "$cfg" group
+ [ -n "$group" ] || return 0
+ config_get version "$cfg" version
+ [ -n "$version" ] || return 0
+ config_get secname "$cfg" secname
+ [ -n "$secname" ] || return 0
+ echo "group $group $version $secname" >> $RUN_C
+}
+snmpd_view_add() {
+ local cfg="$1"
+ config_get viewname "$cfg" viewname
+ [ -n "$viewname" ] || return 0
+ config_get type "$cfg" type
+ [ -n "$type" ] || return 0
+ config_get oid "$cfg" oid
+ [ -n "$oid" ] || return 0
+ # optional mask
+ config_get mask "$cfg" mask
+ echo "view $viewname $type $oid $mask" >> $RUN_C
+}
+snmpd_access_add() {
+ local cfg="$1"
+ config_get group "$cfg" group
+ [ -n "$group" ] || return 0
+ config_get context "$cfg" context
+ [ -n $context ] || return 0
+ [ "$context" == "none" ] && context='""'
+ config_get version "$cfg" version
+ [ -n "$version" ] || return 0
+ config_get level "$cfg" level
+ [ -n "$level" ] || return 0
+ config_get prefix "$cfg" prefix
+ [ -n "$prefix" ] || return 0
+ config_get read "$cfg" read
+ [ -n "$read" ] || return 0
+ config_get write "$cfg" write
+ [ -n "$write" ] || return 0
+ config_get notify "$cfg" notify
+ [ -n "$notify" ] || return 0
+ echo "access $group $context $version $level $prefix $read $write $notify" >> $RUN_C
+}
+snmpd_pass_add() {
+ local cfg="$1"
+ local pass='pass'
+
+ config_get miboid "$cfg" miboid
+ [ -n "$miboid" ] || return 0
+ config_get prog "$cfg" prog
+ [ -n "$prog" ] || return 0
+ config_get_bool persist "$cfg" persist 0
+ [ $persist -ne 0 ] && pass='pass_persist'
+ config_get priority "$cfg" priority
+ priority=${priority:+-p $priority}
+ echo "$pass $priority $miboid $prog" >> $RUN_C
+}
+snmpd_exec_add() {
+ local cfg="$1"
+
+ config_get name "$cfg" name
+ [ -n "$name" ] || return 0
+ config_get prog "$cfg" prog
+ [ -n "$prog" ] || return 0
+ config_get args "$cfg" args
+ config_get miboid "$cfg" miboid
+ echo "exec $miboid $name $prog $args" >> $RUN_C
+}
+start() {
+ [ -d $LIB_D ] || mkdir -p $LIB_D
+ [ -d $LOG_D ] || mkdir -p $LOG_D
+ [ -d $RUN_D ] || mkdir -p $RUN_D
+ [ -f $RUN_C ] && rm -f $RUN_C
+
+ config_load snmpd
+
+ config_foreach snmpd_agent_add agent
+ config_foreach snmpd_system_add system
+ config_foreach snmpd_com2sec_add com2sec
+ config_foreach snmpd_com2sec6_add com2sec6
+ config_foreach snmpd_group_add group
+ config_foreach snmpd_view_add view
+ config_foreach snmpd_access_add access
+ config_foreach snmpd_pass_add pass
+ config_foreach snmpd_exec_add exec
+
+ [ -f $DEFAULT ] && . $DEFAULT
+ $DEBUG /usr/sbin/snmpd $OPTIONS
+}
+stop() {
+ [ -f $PID_F ] && kill $(cat $PID_F)
+ [ -f $RUN_C ] && rm -f $RUN_C
+}
--- /dev/null
+--- a/agent/mibgroup/mibII/interfaces.c
++++ b/agent/mibgroup/mibII/interfaces.c
+@@ -1561,6 +1561,10 @@ Interface_Scan_Init(void)
+ struct ifnet *nnew;
+ char *stats, *ifstart = line;
+
++ /* Ignore interfaces with no statistics. */
++ if (strstr(line, "No statistics available."))
++ continue;
++
+ if (line[strlen(line) - 1] == '\n')
+ line[strlen(line) - 1] = '\0';
+
+@@ -1594,7 +1598,7 @@ Interface_Scan_Init(void)
+ &coll) != 5)) {
+ if ((scan_line_to_use == scan_line_2_2)
+ && !strstr(line, "No statistics available"))
+- snmp_log(LOG_ERR,
++ snmp_log(LOG_DEBUG,
+ "/proc/net/dev data format error, line ==|%s|",
+ line);
+ continue;
--- /dev/null
+--- a/local/Makefile.in
++++ b/local/Makefile.in
+@@ -100,7 +100,7 @@ tkmib.made: $(srcdir)/tkmib
+
+ mib2c.made: $(srcdir)/mib2c
+ if test "x$(PERL)" != "x" ; then \
+- $(PERL) -p -e 's%^#!.*/perl.*%#!$(PERL)%;s#/usr/local/share/snmp#$(snmplibdir)#;' ${srcdir}/mib2c > mib2c.made; \
++ $(PERL) -p -e 's%^#!.*/perl.*%#!$(PERL)%;s#/usr/local/share/snmp#$(snmplibdir)#;s#/usr/local/etc/snmp#$(SNMPCONFPATH)#;' ${srcdir}/mib2c > mib2c.made; \
+ else \
+ touch mib2c.made; \
+ fi
+--- a/mibs/Makefile.in
++++ b/mibs/Makefile.in
+@@ -48,11 +48,15 @@ NETSNMPMIBS = NET-SNMP-TC.txt NET-SNMP-M
+ UCDMIBS = UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \
+ UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt
+
++EXTRAMIBS = BGP4-MIB.txt BRIDGE-MIB.txt GNOME-SMI.txt OSPF-MIB.txt \
++ OSPF-TRAP-MIB.txt RIPv2-MIB.txt SOURCE-ROUTING-MIB.txt \
++ LM-SENSORS-MIB.txt
++
+ DEFAULTMIBS = @default_mibs_install@
+
+ MIBS = $(V1MIBS) $(V2MIBS) $(V3MIBS) $(RFCMIBS) \
+ $(AGENTMIBS) $(IANAMIBS) \
+- $(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS)
++ $(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS) $(EXTRAMIBS)
+
+ all: standardall
+
+--- a/Makefile.top
++++ b/Makefile.top
+@@ -26,6 +26,7 @@ man8dir = $(mandir)/man8
+ snmplibdir = $(datadir)/snmp
+ mibdir = $(snmplibdir)/mibs
+ persistentdir = @PERSISTENT_DIRECTORY@
++sysconfdir = @sysconfdir@
+ DESTDIR = @INSTALL_PREFIX@
+ INSTALL_PREFIX = $(DESTDIR)
+
--- /dev/null
+--- a/local/mib2c
++++ b/local/mib2c
+@@ -60,8 +60,9 @@ $currentlevel = -1;
+ if($ENV{MIB2C_DIR}) {
+ push @def_search_dirs, split(/:/, $ENV{MIB2C_DIR});
+ }
+-push @def_search_dirs, "/usr/local/share/snmp/";
+-push @def_search_dirs, "/usr/local/share/snmp/mib2c-data";
++push @def_search_dirs, "/etc/snmp/";
++push @def_search_dirs, "/usr/share/snmp/";
++push @def_search_dirs, "/usr/share/snmp/mib2c-data";
+ push @def_search_dirs, "./mib2c-conf.d";
+
+ sub usage {
--- /dev/null
+--- /dev/null
++++ b/mibs/BGP4-MIB.txt
+@@ -0,0 +1,929 @@
++ BGP4-MIB DEFINITIONS ::= BEGIN
++
++ IMPORTS
++ MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE,
++ IpAddress, Integer32, Counter32, Gauge32, mib-2
++ FROM SNMPv2-SMI
++ MODULE-COMPLIANCE, OBJECT-GROUP, NOTIFICATION-GROUP
++ FROM SNMPv2-CONF;
++
++ bgp MODULE-IDENTITY
++ LAST-UPDATED "9902100000Z"
++ ORGANIZATION "IETF IDR Working Group"
++ CONTACT-INFO "E-mail: idr@merit.net
++
++ Susan Hares (Editor)
++ Merit Network
++ 4251 Plymouth Road
++ Suite C
++ Ann Arbor, MI 48105-2785
++ Tel: +1 734 936 2095
++ Fax: +1 734 647 3185
++ E-mail: skh@merit.edu
++
++ Jeff Johnson (Editor)
++ RedBack Networks, Inc.
++ 1389 Moffett Park Drive
++ Sunnyvale, CA 94089-1134
++ Tel: +1 408 548 3516
++ Fax: +1 408 548 3599
++ E-mail: jeff@redback.com"
++ DESCRIPTION
++ "The MIB module for BGP-4."
++ REVISION "9902100000Z"
++ DESCRIPTION
++ "Corrected duplicate OBJECT IDENTIFIER
++ assignment in the conformance information."
++ REVISION "9601080000Z"
++ DESCRIPTION
++ "1) Fixed the definitions of the traps to
++ make them equivalent to their initial
++ definition in RFC 1269.
++ 2) Added compliance and conformance info."
++ ::= { mib-2 15 }
++
++ bgpVersion OBJECT-TYPE
++ SYNTAX OCTET STRING (SIZE (1..255))
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "Vector of supported BGP protocol version
++ numbers. Each peer negotiates the version
++ from this vector. Versions are identified
++ via the string of bits contained within this
++ object. The first octet contains bits 0 to
++ 7, the second octet contains bits 8 to 15,
++ and so on, with the most significant bit
++ referring to the lowest bit number in the
++ octet (e.g., the MSB of the first octet
++ refers to bit 0). If a bit, i, is present
++ and set, then the version (i+1) of the BGP
++ is supported."
++ ::= { bgp 1 }
++
++ bgpLocalAs OBJECT-TYPE
++ SYNTAX INTEGER (0..65535)
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The local autonomous system number."
++ ::= { bgp 2 }
++
++
++
++ -- BGP Peer table. This table contains, one entry per BGP
++ -- peer, information about the BGP peer.
++
++ bgpPeerTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF BgpPeerEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "BGP peer table. This table contains,
++ one entry per BGP peer, information about the
++ connections with BGP peers."
++ ::= { bgp 3 }
++
++ bgpPeerEntry OBJECT-TYPE
++ SYNTAX BgpPeerEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "Entry containing information about the
++ connection with a BGP peer."
++ INDEX { bgpPeerRemoteAddr }
++ ::= { bgpPeerTable 1 }
++
++ BgpPeerEntry ::= SEQUENCE {
++ bgpPeerIdentifier
++ IpAddress,
++ bgpPeerState
++ INTEGER,
++ bgpPeerAdminStatus
++ INTEGER,
++ bgpPeerNegotiatedVersion
++ Integer32,
++ bgpPeerLocalAddr
++ IpAddress,
++ bgpPeerLocalPort
++ INTEGER,
++ bgpPeerRemoteAddr
++ IpAddress,
++ bgpPeerRemotePort
++ INTEGER,
++ bgpPeerRemoteAs
++ INTEGER,
++ bgpPeerInUpdates
++ Counter32,
++ bgpPeerOutUpdates
++ Counter32,
++ bgpPeerInTotalMessages
++ Counter32,
++ bgpPeerOutTotalMessages
++ Counter32,
++ bgpPeerLastError
++ OCTET STRING,
++ bgpPeerFsmEstablishedTransitions
++ Counter32,
++ bgpPeerFsmEstablishedTime
++ Gauge32,
++ bgpPeerConnectRetryInterval
++ INTEGER,
++ bgpPeerHoldTime
++ INTEGER,
++ bgpPeerKeepAlive
++ INTEGER,
++ bgpPeerHoldTimeConfigured
++ INTEGER,
++ bgpPeerKeepAliveConfigured
++ INTEGER,
++ bgpPeerMinASOriginationInterval
++ INTEGER,
++ bgpPeerMinRouteAdvertisementInterval
++ INTEGER,
++ bgpPeerInUpdateElapsedTime
++ Gauge32
++ }
++
++ bgpPeerIdentifier OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The BGP Identifier of this entry's BGP peer."
++ ::= { bgpPeerEntry 1 }
++
++ bgpPeerState OBJECT-TYPE
++ SYNTAX INTEGER {
++ idle(1),
++ connect(2),
++ active(3),
++ opensent(4),
++ openconfirm(5),
++ established(6)
++ }
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The BGP peer connection state."
++ ::= { bgpPeerEntry 2 }
++
++ bgpPeerAdminStatus OBJECT-TYPE
++ SYNTAX INTEGER {
++ stop(1),
++ start(2)
++ }
++ MAX-ACCESS read-write
++ STATUS current
++ DESCRIPTION
++ "The desired state of the BGP connection. A
++ transition from 'stop' to 'start' will cause
++ the BGP Start Event to be generated. A
++ transition from 'start' to 'stop' will cause
++ the BGP Stop Event to be generated. This
++ parameter can be used to restart BGP peer
++ connections. Care should be used in providing
++ write access to this object without adequate
++ authentication."
++ ::= { bgpPeerEntry 3 }
++
++ bgpPeerNegotiatedVersion OBJECT-TYPE
++ SYNTAX Integer32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The negotiated version of BGP running between
++ the two peers."
++ ::= { bgpPeerEntry 4 }
++
++ bgpPeerLocalAddr OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The local IP address of this entry's BGP
++ connection."
++ ::= { bgpPeerEntry 5 }
++
++ bgpPeerLocalPort OBJECT-TYPE
++ SYNTAX INTEGER (0..65535)
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The local port for the TCP connection between
++ the BGP peers."
++ ::= { bgpPeerEntry 6 }
++
++ bgpPeerRemoteAddr OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The remote IP address of this entry's BGP
++ peer."
++ ::= { bgpPeerEntry 7 }
++
++ bgpPeerRemotePort OBJECT-TYPE
++ SYNTAX INTEGER (0..65535)
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The remote port for the TCP connection between
++ the BGP peers. Note that the objects
++ bgpPeerLocalAddr, bgpPeerLocalPort,
++ bgpPeerRemoteAddr and bgpPeerRemotePort
++ provide the appropriate reference to the
++ standard MIB TCP connection table."
++ ::= { bgpPeerEntry 8 }
++
++ bgpPeerRemoteAs OBJECT-TYPE
++ SYNTAX INTEGER (0..65535)
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The remote autonomous system number."
++ ::= { bgpPeerEntry 9 }
++
++ bgpPeerInUpdates OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The number of BGP UPDATE messages received on
++ this connection. This object should be
++ initialized to zero (0) when the connection is
++ established."
++ ::= { bgpPeerEntry 10 }
++
++ bgpPeerOutUpdates OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The number of BGP UPDATE messages transmitted
++ on this connection. This object should be
++ initialized to zero (0) when the connection is
++ established."
++ ::= { bgpPeerEntry 11 }
++
++ bgpPeerInTotalMessages OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The total number of messages received from the
++ remote peer on this connection. This object
++ should be initialized to zero when the
++ connection is established."
++ ::= { bgpPeerEntry 12 }
++
++ bgpPeerOutTotalMessages OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The total number of messages transmitted to
++ the remote peer on this connection. This object
++ should be initialized to zero when the
++ connection is established."
++ ::= { bgpPeerEntry 13 }
++
++ bgpPeerLastError OBJECT-TYPE
++ SYNTAX OCTET STRING (SIZE (2))
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The last error code and subcode seen by this
++ peer on this connection. If no error has
++ occurred, this field is zero. Otherwise, the
++ first byte of this two byte OCTET STRING
++ contains the error code, and the second byte
++ contains the subcode."
++ ::= { bgpPeerEntry 14 }
++
++ bgpPeerFsmEstablishedTransitions OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The total number of times the BGP FSM
++ transitioned into the established state."
++ ::= { bgpPeerEntry 15 }
++
++ bgpPeerFsmEstablishedTime OBJECT-TYPE
++ SYNTAX Gauge32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "This timer indicates how long (in seconds) this
++ peer has been in the Established state or how long
++ since this peer was last in the Established state.
++ It is set to zero when a new peer is configured or
++ the router is booted."
++ ::= { bgpPeerEntry 16 }
++
++ bgpPeerConnectRetryInterval OBJECT-TYPE
++ SYNTAX INTEGER (1..65535)
++ MAX-ACCESS read-write
++ STATUS current
++ DESCRIPTION
++ "Time interval in seconds for the ConnectRetry
++ timer. The suggested value for this timer is
++ 120 seconds."
++ ::= { bgpPeerEntry 17 }
++
++ bgpPeerHoldTime OBJECT-TYPE
++ SYNTAX INTEGER ( 0 | 3..65535 )
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "Time interval in seconds for the Hold Timer
++ established with the peer. The value of this
++ object is calculated by this BGP speaker by
++ using the smaller of the value in
++ bgpPeerHoldTimeConfigured and the Hold Time
++ received in the OPEN message. This value
++ must be at lease three seconds if it is not
++ zero (0) in which case the Hold Timer has
++ not been established with the peer, or, the
++ value of bgpPeerHoldTimeConfigured is zero (0)."
++ ::= { bgpPeerEntry 18 }
++
++ bgpPeerKeepAlive OBJECT-TYPE
++ SYNTAX INTEGER ( 0 | 1..21845 )
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "Time interval in seconds for the KeepAlive
++ timer established with the peer. The value of
++ this object is calculated by this BGP speaker
++ such that, when compared with bgpPeerHoldTime,
++ it has the same proportion as what
++ bgpPeerKeepAliveConfigured has when compared
++ with bgpPeerHoldTimeConfigured. If the value
++ of this object is zero (0), it indicates that
++ the KeepAlive timer has not been established
++ with the peer, or, the value of
++ bgpPeerKeepAliveConfigured is zero (0)."
++ ::= { bgpPeerEntry 19 }
++
++ bgpPeerHoldTimeConfigured OBJECT-TYPE
++ SYNTAX INTEGER ( 0 | 3..65535 )
++ MAX-ACCESS read-write
++ STATUS current
++ DESCRIPTION
++ "Time interval in seconds for the Hold Time
++ configured for this BGP speaker with this peer.
++ This value is placed in an OPEN message sent to
++ this peer by this BGP speaker, and is compared
++ with the Hold Time field in an OPEN message
++ received from the peer when determining the Hold
++ Time (bgpPeerHoldTime) with the peer. This value
++ must not be less than three seconds if it is not
++ zero (0) in which case the Hold Time is NOT to be
++ established with the peer. The suggested value for
++ this timer is 90 seconds."
++ ::= { bgpPeerEntry 20 }
++
++ bgpPeerKeepAliveConfigured OBJECT-TYPE
++ SYNTAX INTEGER ( 0 | 1..21845 )
++ MAX-ACCESS read-write
++ STATUS current
++ DESCRIPTION
++ "Time interval in seconds for the KeepAlive timer
++ configured for this BGP speaker with this peer.
++ The value of this object will only determine the
++ KEEPALIVE messages' frequency relative to the value
++ specified in bgpPeerHoldTimeConfigured; the actual
++ time interval for the KEEPALIVE messages is
++ indicated by bgpPeerKeepAlive. A reasonable
++ maximum value for this timer would be configured to
++ be one third of that of bgpPeerHoldTimeConfigured.
++ If the value of this object is zero (0), no
++ periodical KEEPALIVE messages are sent to the peer
++ after the BGP connection has been established. The
++ suggested value for this timer is 30 seconds."
++ ::= { bgpPeerEntry 21 }
++
++ bgpPeerMinASOriginationInterval OBJECT-TYPE
++ SYNTAX INTEGER (1..65535)
++ MAX-ACCESS read-write
++ STATUS current
++ DESCRIPTION
++ "Time interval in seconds for the
++ MinASOriginationInterval timer.
++ The suggested value for this timer is 15 seconds."
++ ::= { bgpPeerEntry 22 }
++
++ bgpPeerMinRouteAdvertisementInterval OBJECT-TYPE
++ SYNTAX INTEGER (1..65535)
++ MAX-ACCESS read-write
++ STATUS current
++ DESCRIPTION
++ "Time interval in seconds for the
++ MinRouteAdvertisementInterval timer.
++ The suggested value for this timer is 30 seconds."
++ ::= { bgpPeerEntry 23 }
++
++ bgpPeerInUpdateElapsedTime OBJECT-TYPE
++ SYNTAX Gauge32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "Elapsed time in seconds since the last BGP
++ UPDATE message was received from the peer.
++ Each time bgpPeerInUpdates is incremented,
++ the value of this object is set to zero (0)."
++ ::= { bgpPeerEntry 24 }
++
++
++
++ bgpIdentifier OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The BGP Identifier of local system."
++ ::= { bgp 4 }
++
++
++
++ -- Received Path Attribute Table. This table contains,
++ -- one entry per path to a network, path attributes
++ -- received from all peers running BGP version 3 or less.
++ -- This table is obsolete, having been replaced in
++ -- functionality with the bgp4PathAttrTable.
++
++ bgpRcvdPathAttrTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF BgpPathAttrEntry
++ MAX-ACCESS not-accessible
++ STATUS obsolete
++ DESCRIPTION
++ "The BGP Received Path Attribute Table contains
++ information about paths to destination networks
++ received from all peers running BGP version 3 or
++ less."
++ ::= { bgp 5 }
++
++ bgpPathAttrEntry OBJECT-TYPE
++ SYNTAX BgpPathAttrEntry
++ MAX-ACCESS not-accessible
++ STATUS obsolete
++ DESCRIPTION
++ "Information about a path to a network."
++ INDEX { bgpPathAttrDestNetwork,
++ bgpPathAttrPeer }
++ ::= { bgpRcvdPathAttrTable 1 }
++
++ BgpPathAttrEntry ::= SEQUENCE {
++ bgpPathAttrPeer
++ IpAddress,
++ bgpPathAttrDestNetwork
++ IpAddress,
++ bgpPathAttrOrigin
++ INTEGER,
++ bgpPathAttrASPath
++ OCTET STRING,
++ bgpPathAttrNextHop
++ IpAddress,
++ bgpPathAttrInterASMetric
++ Integer32
++ }
++
++ bgpPathAttrPeer OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS obsolete
++ DESCRIPTION
++ "The IP address of the peer where the path
++ information was learned."
++ ::= { bgpPathAttrEntry 1 }
++
++ bgpPathAttrDestNetwork OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS obsolete
++ DESCRIPTION
++ "The address of the destination network."
++ ::= { bgpPathAttrEntry 2 }
++
++ bgpPathAttrOrigin OBJECT-TYPE
++ SYNTAX INTEGER {
++ igp(1),-- networks are interior
++ egp(2),-- networks learned via EGP
++ incomplete(3) -- undetermined
++ }
++ MAX-ACCESS read-only
++ STATUS obsolete
++ DESCRIPTION
++ "The ultimate origin of the path information."
++ ::= { bgpPathAttrEntry 3 }
++
++ bgpPathAttrASPath OBJECT-TYPE
++ SYNTAX OCTET STRING (SIZE (2..255))
++ MAX-ACCESS read-only
++ STATUS obsolete
++ DESCRIPTION
++ "The set of ASs that must be traversed to reach
++ the network. This object is probably best
++ represented as SEQUENCE OF INTEGER. For SMI
++ compatibility, though, it is represented as
++ OCTET STRING. Each AS is represented as a pair
++ of octets according to the following algorithm:
++
++ first-byte-of-pair = ASNumber / 256;
++ second-byte-of-pair = ASNumber & 255;"
++ ::= { bgpPathAttrEntry 4 }
++
++ bgpPathAttrNextHop OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS obsolete
++ DESCRIPTION
++ "The address of the border router that should
++ be used for the destination network."
++ ::= { bgpPathAttrEntry 5 }
++
++ bgpPathAttrInterASMetric OBJECT-TYPE
++ SYNTAX Integer32
++ MAX-ACCESS read-only
++ STATUS obsolete
++ DESCRIPTION
++ "The optional inter-AS metric. If this
++ attribute has not been provided for this route,
++ the value for this object is 0."
++ ::= { bgpPathAttrEntry 6 }
++
++
++
++ -- BGP-4 Received Path Attribute Table. This table contains,
++ -- one entry per path to a network, path attributes
++ -- received from all peers running BGP-4.
++
++ bgp4PathAttrTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF Bgp4PathAttrEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "The BGP-4 Received Path Attribute Table contains
++ information about paths to destination networks
++ received from all BGP4 peers."
++ ::= { bgp 6 }
++
++ bgp4PathAttrEntry OBJECT-TYPE
++ SYNTAX Bgp4PathAttrEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "Information about a path to a network."
++ INDEX { bgp4PathAttrIpAddrPrefix,
++ bgp4PathAttrIpAddrPrefixLen,
++ bgp4PathAttrPeer }
++ ::= { bgp4PathAttrTable 1 }
++
++ Bgp4PathAttrEntry ::= SEQUENCE {
++ bgp4PathAttrPeer
++ IpAddress,
++ bgp4PathAttrIpAddrPrefixLen
++ INTEGER,
++ bgp4PathAttrIpAddrPrefix
++ IpAddress,
++ bgp4PathAttrOrigin
++ INTEGER,
++ bgp4PathAttrASPathSegment
++ OCTET STRING,
++ bgp4PathAttrNextHop
++ IpAddress,
++ bgp4PathAttrMultiExitDisc
++ INTEGER,
++ bgp4PathAttrLocalPref
++ INTEGER,
++ bgp4PathAttrAtomicAggregate
++ INTEGER,
++ bgp4PathAttrAggregatorAS
++ INTEGER,
++ bgp4PathAttrAggregatorAddr
++ IpAddress,
++ bgp4PathAttrCalcLocalPref
++ INTEGER,
++ bgp4PathAttrBest
++ INTEGER,
++ bgp4PathAttrUnknown
++ OCTET STRING
++ }
++
++ bgp4PathAttrPeer OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The IP address of the peer where the path
++ information was learned."
++ ::= { bgp4PathAttrEntry 1 }
++ bgp4PathAttrIpAddrPrefixLen OBJECT-TYPE
++ SYNTAX INTEGER (0..32)
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "Length in bits of the IP address prefix in the
++ Network Layer Reachability Information field."
++ ::= { bgp4PathAttrEntry 2 }
++
++ bgp4PathAttrIpAddrPrefix OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "An IP address prefix in the Network Layer
++ Reachability Information field. This object
++ is an IP address containing the prefix with
++ length specified by bgp4PathAttrIpAddrPrefixLen.
++ Any bits beyond the length specified by
++ bgp4PathAttrIpAddrPrefixLen are zeroed."
++ ::= { bgp4PathAttrEntry 3 }
++
++ bgp4PathAttrOrigin OBJECT-TYPE
++ SYNTAX INTEGER {
++ igp(1),-- networks are interior
++ egp(2),-- networks learned via EGP
++ incomplete(3) -- undetermined
++ }
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The ultimate origin of the path information."
++ ::= { bgp4PathAttrEntry 4 }
++
++ bgp4PathAttrASPathSegment OBJECT-TYPE
++ SYNTAX OCTET STRING (SIZE (2..255))
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The sequence of AS path segments. Each AS
++ path segment is represented by a triple
++ <type, length, value>.
++
++ The type is a 1-octet field which has two
++ possible values:
++ 1 AS_SET: unordered set of ASs a
++ route in the UPDATE message
++ has traversed
++ 2 AS_SEQUENCE: ordered set of ASs
++ a route in the UPDATE message
++ has traversed.
++
++ The length is a 1-octet field containing the
++ number of ASs in the value field.
++
++ The value field contains one or more AS
++ numbers, each AS is represented in the octet
++ string as a pair of octets according to the
++ following algorithm:
++
++ first-byte-of-pair = ASNumber / 256;
++ second-byte-of-pair = ASNumber & 255;"
++ ::= { bgp4PathAttrEntry 5 }
++
++ bgp4PathAttrNextHop OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The address of the border router that should
++ be used for the destination network."
++ ::= { bgp4PathAttrEntry 6 }
++
++ bgp4PathAttrMultiExitDisc OBJECT-TYPE
++ SYNTAX INTEGER (-1..2147483647)
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "This metric is used to discriminate between
++ multiple exit points to an adjacent autonomous
++ system. A value of -1 indicates the absence of
++ this attribute."
++ ::= { bgp4PathAttrEntry 7 }
++
++ bgp4PathAttrLocalPref OBJECT-TYPE
++ SYNTAX INTEGER (-1..2147483647)
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The originating BGP4 speaker's degree of
++ preference for an advertised route. A value of
++ -1 indicates the absence of this attribute."
++ ::= { bgp4PathAttrEntry 8 }
++
++ bgp4PathAttrAtomicAggregate OBJECT-TYPE
++ SYNTAX INTEGER {
++ lessSpecificRrouteNotSelected(1),
++ lessSpecificRouteSelected(2)
++ }
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "Whether or not a system has selected
++ a less specific route without selecting a
++ more specific route."
++ ::= { bgp4PathAttrEntry 9 }
++
++ bgp4PathAttrAggregatorAS OBJECT-TYPE
++ SYNTAX INTEGER (0..65535)
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The AS number of the last BGP4 speaker that
++ performed route aggregation. A value of zero (0)
++ indicates the absence of this attribute."
++ ::= { bgp4PathAttrEntry 10 }
++
++ bgp4PathAttrAggregatorAddr OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The IP address of the last BGP4 speaker that
++ performed route aggregation. A value of
++ 0.0.0.0 indicates the absence of this attribute."
++ ::= { bgp4PathAttrEntry 11 }
++
++ bgp4PathAttrCalcLocalPref OBJECT-TYPE
++ SYNTAX INTEGER (-1..2147483647)
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The degree of preference calculated by the
++ receiving BGP4 speaker for an advertised route.
++ A value of -1 indicates the absence of this
++ attribute."
++ ::= { bgp4PathAttrEntry 12 }
++
++ bgp4PathAttrBest OBJECT-TYPE
++ SYNTAX INTEGER {
++ false(1),-- not chosen as best route
++ true(2) -- chosen as best route
++ }
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "An indication of whether or not this route
++ was chosen as the best BGP4 route."
++ ::= { bgp4PathAttrEntry 13 }
++
++ bgp4PathAttrUnknown OBJECT-TYPE
++ SYNTAX OCTET STRING (SIZE(0..255))
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "One or more path attributes not understood
++ by this BGP4 speaker. Size zero (0) indicates
++ the absence of such attribute(s). Octets
++ beyond the maximum size, if any, are not
++ recorded by this object."
++ ::= { bgp4PathAttrEntry 14 }
++
++
++ -- Traps.
++
++ -- note that in RFC 1657, bgpTraps was incorrectly
++ -- assigned a value of { bgp 7 }, and each of the
++ -- traps had the bgpPeerRemoteAddr object inappropriately
++ -- removed from their OBJECTS clause. The following
++ -- definitions restore the semantics of the traps as
++ -- they were initially defined in RFC 1269.
++
++ -- { bgp 7 } is unused
++
++ bgpTraps OBJECT IDENTIFIER ::= { bgp 0 }
++
++ bgpEstablished NOTIFICATION-TYPE
++ OBJECTS { bgpPeerRemoteAddr,
++ bgpPeerLastError,
++ bgpPeerState }
++ STATUS current
++ DESCRIPTION
++ "The BGP Established event is generated when
++ the BGP FSM enters the ESTABLISHED state."
++ ::= { bgpTraps 1 }
++
++ bgpBackwardTransition NOTIFICATION-TYPE
++ OBJECTS { bgpPeerRemoteAddr,
++ bgpPeerLastError,
++ bgpPeerState }
++ STATUS current
++ DESCRIPTION
++ "The BGPBackwardTransition Event is generated
++ when the BGP FSM moves from a higher numbered
++ state to a lower numbered state."
++ ::= { bgpTraps 2 }
++
++ -- conformance information
++
++ bgpMIBConformance OBJECT IDENTIFIER ::= { bgp 8 }
++ bgpMIBCompliances OBJECT IDENTIFIER ::= { bgpMIBConformance 1 }
++ bgpMIBGroups OBJECT IDENTIFIER ::= { bgpMIBConformance 2 }
++
++ -- compliance statements
++
++ bgpMIBCompliance MODULE-COMPLIANCE
++ STATUS current
++ DESCRIPTION
++ "The compliance statement for entities which
++ implement the BGP4 mib."
++ MODULE -- this module
++ MANDATORY-GROUPS { bgp4MIBGlobalsGroup,
++ bgp4MIBPeerGroup,
++ bgp4MIBPathAttrGroup,
++ bgp4MIBNotificationGroup }
++ ::= { bgpMIBCompliances 1 }
++
++ -- units of conformance
++
++ bgp4MIBGlobalsGroup OBJECT-GROUP
++ OBJECTS { bgpVersion,
++ bgpLocalAs,
++ bgpIdentifier }
++ STATUS current
++ DESCRIPTION
++ "A collection of objects providing information
++ on global BGP state."
++ ::= { bgpMIBGroups 1 }
++
++ bgp4MIBPeerGroup OBJECT-GROUP
++ OBJECTS { bgpPeerIdentifier,
++ bgpPeerState,
++ bgpPeerAdminStatus,
++ bgpPeerNegotiatedVersion,
++ bgpPeerLocalAddr,
++ bgpPeerLocalPort,
++ bgpPeerRemoteAddr,
++ bgpPeerRemotePort,
++ bgpPeerRemoteAs,
++ bgpPeerInUpdates,
++ bgpPeerOutUpdates,
++ bgpPeerInTotalMessages,
++ bgpPeerOutTotalMessages,
++ bgpPeerLastError,
++ bgpPeerFsmEstablishedTransitions,
++ bgpPeerFsmEstablishedTime,
++ bgpPeerConnectRetryInterval,
++ bgpPeerHoldTime,
++ bgpPeerKeepAlive,
++ bgpPeerHoldTimeConfigured,
++ bgpPeerKeepAliveConfigured,
++ bgpPeerMinASOriginationInterval,
++ bgpPeerMinRouteAdvertisementInterval,
++ bgpPeerInUpdateElapsedTime }
++ STATUS current
++ DESCRIPTION
++ "A collection of objects for managing
++ BGP peers."
++ ::= { bgpMIBGroups 2 }
++
++ bgp4MIBRcvdPathAttrGroup OBJECT-GROUP
++ OBJECTS { bgpPathAttrPeer,
++ bgpPathAttrDestNetwork,
++ bgpPathAttrOrigin,
++ bgpPathAttrASPath,
++ bgpPathAttrNextHop,
++ bgpPathAttrInterASMetric }
++ STATUS obsolete
++ DESCRIPTION
++ "A collection of objects for managing BGP
++ path entries.
++
++ This conformance group is obsolete,
++ replaced by bgp4MIBPathAttrGroup."
++ ::= { bgpMIBGroups 3 }
++
++ bgp4MIBPathAttrGroup OBJECT-GROUP
++ OBJECTS { bgp4PathAttrPeer,
++ bgp4PathAttrIpAddrPrefixLen,
++ bgp4PathAttrIpAddrPrefix,
++ bgp4PathAttrOrigin,
++ bgp4PathAttrASPathSegment,
++ bgp4PathAttrNextHop,
++ bgp4PathAttrMultiExitDisc,
++ bgp4PathAttrLocalPref,
++ bgp4PathAttrAtomicAggregate,
++ bgp4PathAttrAggregatorAS,
++ bgp4PathAttrAggregatorAddr,
++ bgp4PathAttrCalcLocalPref,
++ bgp4PathAttrBest,
++ bgp4PathAttrUnknown }
++ STATUS current
++ DESCRIPTION
++ "A collection of objects for managing
++ BGP path entries."
++ ::= { bgpMIBGroups 4 }
++
++ bgp4MIBNotificationGroup NOTIFICATION-GROUP
++ NOTIFICATIONS { bgpEstablished,
++ bgpBackwardTransition }
++ STATUS current
++ DESCRIPTION
++ "A collection of notifications for signaling
++ changes in BGP peer relationships."
++ ::= { bgpMIBGroups 5 }
++
++ END
+--- /dev/null
++++ b/mibs/BRIDGE-MIB.txt
+@@ -0,0 +1,1075 @@
++BRIDGE-MIB DEFINITIONS ::= BEGIN
++
++IMPORTS
++ Counter, TimeTicks
++ FROM RFC1155-SMI
++ mib-2
++ FROM RFC1213-MIB
++ OBJECT-TYPE
++ FROM RFC-1212
++ TRAP-TYPE
++ FROM RFC-1215;
++
++-- All representations of MAC addresses in this MIB Module
++-- use, as a textual convention (i.e. this convention does
++-- not affect their encoding), the data type:
++MacAddress ::= OCTET STRING (SIZE (6)) -- a 6 octet address
++ -- in the
++ -- "canonical"
++ -- order
++-- defined by IEEE 802.1a, i.e., as if it were transmitted
++-- least significant bit first, even though 802.5 (in
++-- contrast to other n802.x protocols) requires MAC
++-- addresses to be transmitted most significant bit first.
++--
++-- 16-bit addresses, if needed, are represented by setting
++-- their upper 4 octets to all 0's, i.e., AAFF would be
++-- represented as 00000000AAFF.
++
++-- Similarly, all representations of Bridge-Id in this MIB
++-- Module use, as a textual convention (i.e. this
++-- convention does not affect their encoding), the data
++-- type:
++BridgeId ::= OCTET STRING (SIZE (8)) -- the
++ -- Bridge-Identifier
++ -- as used in the
++ -- Spanning Tree
++-- Protocol to uniquely identify a bridge. Its first two
++-- octets (in network byte order) contain a priority
++-- value and its last 6 octets contain the MAC address
++-- used to refer to a bridge in a unique fashion
++-- (typically, the numerically smallest MAC address
++-- of all ports on the bridge).
++
++-- Several objects in this MIB module represent values of
++-- timers used by the Spanning Tree Protocol. In this
++-- MIB, these timers have values in units of hundreths of
++-- a second (i.e. 1/100 secs).
++-- These timers, when stored in a Spanning Tree Protocol's
++-- BPDU, are in units of 1/256 seconds. Note, however,
++-- that 802.1D-1990 specifies a settable granularity of
++-- no more than 1 second for these timers. To avoid
++-- ambiguity, a data type is defined here as a textual
++-- convention and all representation of these timers
++-- in this MIB module are defined using this data type. An
++-- algorithm is also defined for converting between the
++-- different units, to ensure a timer's value is not
++-- distorted by multiple conversions.
++-- The data type is:
++
++Timeout ::= INTEGER -- a STP timer in units of 1/100 seconds
++
++-- To convert a Timeout value into a value in units of
++-- 1/256 seconds, the following algorithm should be used:
++--
++-- b = floor( (n * 256) / 100)
++--
++-- where:
++-- floor = quotient [ignore remainder]
++-- n is the value in 1/100 second units
++-- b is the value in 1/256 second units
++--
++-- To convert the value from 1/256 second units back to
++-- 1/100 seconds, the following algorithm should be used:
++--
++-- n = ceiling( (b * 100) / 256)
++--
++-- where:
++-- ceiling = quotient [if remainder is 0], or
++-- quotient + 1 [if remainder is non-zero]
++-- n is the value in 1/100 second units
++-- b is the value in 1/256 second units
++--
++-- Note: it is important that the arithmetic operations are
++-- done in the order specified (i.e., multiply first, divide
++-- second).
++
++ dot1dBridge OBJECT IDENTIFIER ::= { mib-2 17 }
++
++-- groups in the Bridge MIB
++
++dot1dBase OBJECT IDENTIFIER ::= { dot1dBridge 1 }
++
++dot1dStp OBJECT IDENTIFIER ::= { dot1dBridge 2 }
++
++dot1dSr OBJECT IDENTIFIER ::= { dot1dBridge 3 }
++-- separately documented
++
++dot1dTp OBJECT IDENTIFIER ::= { dot1dBridge 4 }
++
++dot1dStatic OBJECT IDENTIFIER ::= { dot1dBridge 5 }
++
++-- the dot1dBase group
++
++-- Implementation of the dot1dBase group is mandatory for all
++-- bridges.
++
++dot1dBaseBridgeAddress OBJECT-TYPE
++ SYNTAX MacAddress
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The MAC address used by this bridge when it must
++ be referred to in a unique fashion. It is
++ recommended that this be the numerically smallest
++ MAC address of all ports that belong to this
++ bridge. However it is only required to be unique.
++ When concatenated with dot1dStpPriority a unique
++ BridgeIdentifier is formed which is used in the
++ Spanning Tree Protocol."
++ REFERENCE
++ "IEEE 802.1D-1990: Sections 6.4.1.1.3 and 3.12.5"
++ ::= { dot1dBase 1 }
++
++dot1dBaseNumPorts OBJECT-TYPE
++ SYNTAX INTEGER
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The number of ports controlled by this bridging
++ entity."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 6.4.1.1.3"
++ ::= { dot1dBase 2 }
++
++dot1dBaseType OBJECT-TYPE
++ SYNTAX INTEGER {
++ unknown(1),
++ transparent-only(2),
++ sourceroute-only(3),
++ srt(4)
++ }
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "Indicates what type of bridging this bridge can
++ perform. If a bridge is actually performing a
++ certain type of bridging this will be indicated by
++ entries in the port table for the given type."
++ ::= { dot1dBase 3 }
++
++-- The Generic Bridge Port Table
++
++dot1dBasePortTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF Dot1dBasePortEntry
++ ACCESS not-accessible
++ STATUS mandatory
++ DESCRIPTION
++ "A table that contains generic information about
++ every port that is associated with this bridge.
++ Transparent, source-route, and srt ports are
++ included."
++ ::= { dot1dBase 4 }
++
++dot1dBasePortEntry OBJECT-TYPE
++ SYNTAX Dot1dBasePortEntry
++ ACCESS not-accessible
++ STATUS mandatory
++ DESCRIPTION
++ "A list of information for each port of the
++ bridge."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 6.4.2, 6.6.1"
++ INDEX { dot1dBasePort }
++ ::= { dot1dBasePortTable 1 }
++
++Dot1dBasePortEntry ::=
++ SEQUENCE {
++ dot1dBasePort
++ INTEGER,
++ dot1dBasePortIfIndex
++ INTEGER,
++ dot1dBasePortCircuit
++
++ OBJECT IDENTIFIER,
++ dot1dBasePortDelayExceededDiscards
++ Counter,
++ dot1dBasePortMtuExceededDiscards
++ Counter
++ }
++
++dot1dBasePort OBJECT-TYPE
++ SYNTAX INTEGER (1..65535)
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The port number of the port for which this entry
++ contains bridge management information."
++ ::= { dot1dBasePortEntry 1 }
++
++dot1dBasePortIfIndex OBJECT-TYPE
++ SYNTAX INTEGER
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The value of the instance of the ifIndex object,
++ defined in MIB-II, for the interface corresponding
++ to this port."
++ ::= { dot1dBasePortEntry 2 }
++
++dot1dBasePortCircuit OBJECT-TYPE
++ SYNTAX OBJECT IDENTIFIER
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "For a port which (potentially) has the same value
++ of dot1dBasePortIfIndex as another port on the
++ same bridge, this object contains the name of an
++ object instance unique to this port. For example,
++ in the case where multiple ports correspond one-
++ to-one with multiple X.25 virtual circuits, this
++ value might identify an (e.g., the first) object
++ instance associated with the X.25 virtual circuit
++ corresponding to this port.
++
++ For a port which has a unique value of
++ dot1dBasePortIfIndex, this object can have the
++ value { 0 0 }."
++ ::= { dot1dBasePortEntry 3 }
++
++dot1dBasePortDelayExceededDiscards OBJECT-TYPE
++ SYNTAX Counter
++
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The number of frames discarded by this port due
++ to excessive transit delay through the bridge. It
++ is incremented by both transparent and source
++ route bridges."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 6.6.1.1.3"
++ ::= { dot1dBasePortEntry 4 }
++
++dot1dBasePortMtuExceededDiscards OBJECT-TYPE
++ SYNTAX Counter
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The number of frames discarded by this port due
++ to an excessive size. It is incremented by both
++ transparent and source route bridges."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 6.6.1.1.3"
++ ::= { dot1dBasePortEntry 5 }
++
++-- the dot1dStp group
++
++-- Implementation of the dot1dStp group is optional. It is
++-- implemented by those bridges that support the Spanning Tree
++-- Protocol.
++
++dot1dStpProtocolSpecification OBJECT-TYPE
++ SYNTAX INTEGER {
++ unknown(1),
++ decLb100(2),
++ ieee8021d(3)
++ }
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "An indication of what version of the Spanning
++ Tree Protocol is being run. The value
++ 'decLb100(2)' indicates the DEC LANbridge 100
++ Spanning Tree protocol. IEEE 802.1d
++ implementations will return 'ieee8021d(3)'. If
++ future versions of the IEEE Spanning Tree Protocol
++ are released that are incompatible with the
++ current version a new value will be defined."
++
++ ::= { dot1dStp 1 }
++
++dot1dStpPriority OBJECT-TYPE
++ SYNTAX INTEGER (0..65535)
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "The value of the write-able portion of the Bridge
++ ID, i.e., the first two octets of the (8 octet
++ long) Bridge ID. The other (last) 6 octets of the
++ Bridge ID are given by the value of
++ dot1dBaseBridgeAddress."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.3.7"
++ ::= { dot1dStp 2 }
++
++dot1dStpTimeSinceTopologyChange OBJECT-TYPE
++ SYNTAX TimeTicks
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The time (in hundredths of a second) since the
++ last time a topology change was detected by the
++ bridge entity."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 6.8.1.1.3"
++ ::= { dot1dStp 3 }
++
++dot1dStpTopChanges OBJECT-TYPE
++ SYNTAX Counter
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The total number of topology changes detected by
++ this bridge since the management entity was last
++ reset or initialized."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 6.8.1.1.3"
++ ::= { dot1dStp 4 }
++
++dot1dStpDesignatedRoot OBJECT-TYPE
++ SYNTAX BridgeId
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The bridge identifier of the root of the spanning
++ tree as determined by the Spanning Tree Protocol
++ as executed by this node. This value is used as
++
++ the Root Identifier parameter in all Configuration
++ Bridge PDUs originated by this node."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.3.1"
++ ::= { dot1dStp 5 }
++
++dot1dStpRootCost OBJECT-TYPE
++ SYNTAX INTEGER
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The cost of the path to the root as seen from
++ this bridge."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.3.2"
++ ::= { dot1dStp 6 }
++
++dot1dStpRootPort OBJECT-TYPE
++ SYNTAX INTEGER
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The port number of the port which offers the
++ lowest cost path from this bridge to the root
++ bridge."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.3.3"
++ ::= { dot1dStp 7 }
++
++dot1dStpMaxAge OBJECT-TYPE
++ SYNTAX Timeout
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The maximum age of Spanning Tree Protocol
++ information learned from the network on any port
++ before it is discarded, in units of hundredths of
++ a second. This is the actual value that this
++ bridge is currently using."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.3.4"
++ ::= { dot1dStp 8 }
++
++dot1dStpHelloTime OBJECT-TYPE
++ SYNTAX Timeout
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++
++ "The amount of time between the transmission of
++ Configuration bridge PDUs by this node on any port
++ when it is the root of the spanning tree or trying
++ to become so, in units of hundredths of a second.
++ This is the actual value that this bridge is
++ currently using."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.3.5"
++ ::= { dot1dStp 9 }
++
++dot1dStpHoldTime OBJECT-TYPE
++ SYNTAX INTEGER
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "This time value determines the interval length
++ during which no more than two Configuration bridge
++ PDUs shall be transmitted by this node, in units
++ of hundredths of a second."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.3.14"
++ ::= { dot1dStp 10 }
++
++dot1dStpForwardDelay OBJECT-TYPE
++ SYNTAX Timeout
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "This time value, measured in units of hundredths
++ of a second, controls how fast a port changes its
++ spanning state when moving towards the Forwarding
++ state. The value determines how long the port
++ stays in each of the Listening and Learning
++ states, which precede the Forwarding state. This
++ value is also used, when a topology change has
++ been detected and is underway, to age all dynamic
++ entries in the Forwarding Database. [Note that
++ this value is the one that this bridge is
++ currently using, in contrast to
++ dot1dStpBridgeForwardDelay which is the value that
++ this bridge and all others would start using
++ if/when this bridge were to become the root.]"
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.3.6"
++ ::= { dot1dStp 11 }
++
++dot1dStpBridgeMaxAge OBJECT-TYPE
++ SYNTAX Timeout (600..4000)
++
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "The value that all bridges use for MaxAge when
++ this bridge is acting as the root. Note that
++ 802.1D-1990 specifies that the range for this
++ parameter is related to the value of
++ dot1dStpBridgeHelloTime. The granularity of this
++ timer is specified by 802.1D-1990 to be 1 second.
++ An agent may return a badValue error if a set is
++ attempted to a value which is not a whole number
++ of seconds."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.3.8"
++ ::= { dot1dStp 12 }
++
++dot1dStpBridgeHelloTime OBJECT-TYPE
++ SYNTAX Timeout (100..1000)
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "The value that all bridges use for HelloTime when
++ this bridge is acting as the root. The
++ granularity of this timer is specified by 802.1D-
++ 1990 to be 1 second. An agent may return a
++ badValue error if a set is attempted to a value
++ which is not a whole number of seconds."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.3.9"
++ ::= { dot1dStp 13 }
++
++dot1dStpBridgeForwardDelay OBJECT-TYPE
++ SYNTAX Timeout (400..3000)
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "The value that all bridges use for ForwardDelay
++ when this bridge is acting as the root. Note that
++ 802.1D-1990 specifies that the range for this
++ parameter is related to the value of
++ dot1dStpBridgeMaxAge. The granularity of this
++ timer is specified by 802.1D-1990 to be 1 second.
++ An agent may return a badValue error if a set is
++ attempted to a value which is not a whole number
++ of seconds."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.3.10"
++ ::= { dot1dStp 14 }
++
++-- The Spanning Tree Port Table
++
++dot1dStpPortTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF Dot1dStpPortEntry
++ ACCESS not-accessible
++ STATUS mandatory
++ DESCRIPTION
++ "A table that contains port-specific information
++ for the Spanning Tree Protocol."
++ ::= { dot1dStp 15 }
++
++dot1dStpPortEntry OBJECT-TYPE
++ SYNTAX Dot1dStpPortEntry
++ ACCESS not-accessible
++ STATUS mandatory
++ DESCRIPTION
++ "A list of information maintained by every port
++ about the Spanning Tree Protocol state for that
++ port."
++ INDEX { dot1dStpPort }
++ ::= { dot1dStpPortTable 1 }
++
++Dot1dStpPortEntry ::=
++ SEQUENCE {
++ dot1dStpPort
++ INTEGER,
++ dot1dStpPortPriority
++ INTEGER,
++ dot1dStpPortState
++ INTEGER,
++ dot1dStpPortEnable
++ INTEGER,
++ dot1dStpPortPathCost
++ INTEGER,
++ dot1dStpPortDesignatedRoot
++ BridgeId,
++ dot1dStpPortDesignatedCost
++ INTEGER,
++ dot1dStpPortDesignatedBridge
++ BridgeId,
++ dot1dStpPortDesignatedPort
++ OCTET STRING,
++ dot1dStpPortForwardTransitions
++ Counter
++ }
++
++dot1dStpPort OBJECT-TYPE
++ SYNTAX INTEGER (1..65535)
++
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The port number of the port for which this entry
++ contains Spanning Tree Protocol management
++ information."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 6.8.2.1.2"
++ ::= { dot1dStpPortEntry 1 }
++
++dot1dStpPortPriority OBJECT-TYPE
++ SYNTAX INTEGER (0..255)
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "The value of the priority field which is
++ contained in the first (in network byte order)
++ octet of the (2 octet long) Port ID. The other
++ octet of the Port ID is given by the value of
++ dot1dStpPort."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.5.1"
++ ::= { dot1dStpPortEntry 2 }
++
++dot1dStpPortState OBJECT-TYPE
++ SYNTAX INTEGER {
++ disabled(1),
++ blocking(2),
++ listening(3),
++ learning(4),
++ forwarding(5),
++ broken(6)
++ }
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The port's current state as defined by
++ application of the Spanning Tree Protocol. This
++ state controls what action a port takes on
++ reception of a frame. If the bridge has detected
++ a port that is malfunctioning it will place that
++ port into the broken(6) state. For ports which
++ are disabled (see dot1dStpPortEnable), this object
++ will have a value of disabled(1)."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.5.2"
++ ::= { dot1dStpPortEntry 3 }
++
++dot1dStpPortEnable OBJECT-TYPE
++ SYNTAX INTEGER {
++ enabled(1),
++ disabled(2)
++ }
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "The enabled/disabled status of the port."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.5.2"
++ ::= { dot1dStpPortEntry 4 }
++
++dot1dStpPortPathCost OBJECT-TYPE
++ SYNTAX INTEGER (1..65535)
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "The contribution of this port to the path cost of
++ paths towards the spanning tree root which include
++ this port. 802.1D-1990 recommends that the
++ default value of this parameter be in inverse
++ proportion to the speed of the attached LAN."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.5.3"
++ ::= { dot1dStpPortEntry 5 }
++
++dot1dStpPortDesignatedRoot OBJECT-TYPE
++ SYNTAX BridgeId
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The unique Bridge Identifier of the Bridge
++ recorded as the Root in the Configuration BPDUs
++ transmitted by the Designated Bridge for the
++ segment to which the port is attached."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.5.4"
++ ::= { dot1dStpPortEntry 6 }
++
++dot1dStpPortDesignatedCost OBJECT-TYPE
++ SYNTAX INTEGER
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The path cost of the Designated Port of the
++ segment connected to this port. This value is
++ compared to the Root Path Cost field in received
++
++ bridge PDUs."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.5.5"
++ ::= { dot1dStpPortEntry 7 }
++
++dot1dStpPortDesignatedBridge OBJECT-TYPE
++ SYNTAX BridgeId
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The Bridge Identifier of the bridge which this
++ port considers to be the Designated Bridge for
++ this port's segment."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.5.6"
++ ::= { dot1dStpPortEntry 8 }
++
++dot1dStpPortDesignatedPort OBJECT-TYPE
++ SYNTAX OCTET STRING (SIZE (2))
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The Port Identifier of the port on the Designated
++ Bridge for this port's segment."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 4.5.5.7"
++ ::= { dot1dStpPortEntry 9 }
++
++dot1dStpPortForwardTransitions OBJECT-TYPE
++ SYNTAX Counter
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The number of times this port has transitioned
++ from the Learning state to the Forwarding state."
++ ::= { dot1dStpPortEntry 10 }
++
++-- the dot1dTp group
++
++-- Implementation of the dot1dTp group is optional. It is
++-- implemented by those bridges that support the transparent
++-- bridging mode. A transparent or SRT bridge will implement
++-- this group.
++
++dot1dTpLearnedEntryDiscards OBJECT-TYPE
++ SYNTAX Counter
++
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The total number of Forwarding Database entries,
++ which have been or would have been learnt, but
++ have been discarded due to a lack of space to
++ store them in the Forwarding Database. If this
++ counter is increasing, it indicates that the
++ Forwarding Database is regularly becoming full (a
++ condition which has unpleasant performance effects
++ on the subnetwork). If this counter has a
++ significant value but is not presently increasing,
++ it indicates that the problem has been occurring
++ but is not persistent."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 6.7.1.1.3"
++ ::= { dot1dTp 1 }
++
++dot1dTpAgingTime OBJECT-TYPE
++ SYNTAX INTEGER (10..1000000)
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "The timeout period in seconds for aging out
++ dynamically learned forwarding information.
++ 802.1D-1990 recommends a default of 300 seconds."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 6.7.1.1.3"
++ ::= { dot1dTp 2 }
++
++-- The Forwarding Database for Transparent Bridges
++
++dot1dTpFdbTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF Dot1dTpFdbEntry
++ ACCESS not-accessible
++ STATUS mandatory
++ DESCRIPTION
++ "A table that contains information about unicast
++ entries for which the bridge has forwarding and/or
++ filtering information. This information is used
++ by the transparent bridging function in
++ determining how to propagate a received frame."
++ ::= { dot1dTp 3 }
++
++dot1dTpFdbEntry OBJECT-TYPE
++ SYNTAX Dot1dTpFdbEntry
++ ACCESS not-accessible
++ STATUS mandatory
++ DESCRIPTION
++ "Information about a specific unicast MAC address
++ for which the bridge has some forwarding and/or
++ filtering information."
++ INDEX { dot1dTpFdbAddress }
++ ::= { dot1dTpFdbTable 1 }
++
++Dot1dTpFdbEntry ::=
++ SEQUENCE {
++ dot1dTpFdbAddress
++ MacAddress,
++ dot1dTpFdbPort
++ INTEGER,
++ dot1dTpFdbStatus
++ INTEGER
++ }
++
++dot1dTpFdbAddress OBJECT-TYPE
++ SYNTAX MacAddress
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "A unicast MAC address for which the bridge has
++ forwarding and/or filtering information."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 3.9.1, 3.9.2"
++ ::= { dot1dTpFdbEntry 1 }
++
++dot1dTpFdbPort OBJECT-TYPE
++ SYNTAX INTEGER
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "Either the value '0', or the port number of the
++ port on which a frame having a source address
++ equal to the value of the corresponding instance
++ of dot1dTpFdbAddress has been seen. A value of
++ '0' indicates that the port number has not been
++ learned but that the bridge does have some
++ forwarding/filtering information about this
++ address (e.g. in the dot1dStaticTable).
++ Implementors are encouraged to assign the port
++ value to this object whenever it is learned even
++ for addresses for which the corresponding value of
++ dot1dTpFdbStatus is not learned(3)."
++ ::= { dot1dTpFdbEntry 2 }
++
++dot1dTpFdbStatus OBJECT-TYPE
++ SYNTAX INTEGER {
++ other(1),
++ invalid(2),
++ learned(3),
++ self(4),
++ mgmt(5)
++ }
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The status of this entry. The meanings of the
++ values are:
++ other(1) : none of the following. This would
++ include the case where some other
++ MIB object (not the corresponding
++ instance of dot1dTpFdbPort, nor an
++ entry in the dot1dStaticTable) is
++ being used to determine if and how
++ frames addressed to the value of
++ the corresponding instance of
++ dot1dTpFdbAddress are being
++ forwarded.
++ invalid(2) : this entry is not longer valid
++ (e.g., it was learned but has since
++ aged-out), but has not yet been
++ flushed from the table.
++ learned(3) : the value of the corresponding
++ instance of dot1dTpFdbPort was
++ learned, and is being used.
++ self(4) : the value of the corresponding
++ instance of dot1dTpFdbAddress
++ represents one of the bridge's
++ addresses. The corresponding
++ instance of dot1dTpFdbPort
++ indicates which of the bridge's
++ ports has this address.
++ mgmt(5) : the value of the corresponding
++ instance of dot1dTpFdbAddress is
++ also the value of an existing
++ instance of dot1dStaticAddress."
++ ::= { dot1dTpFdbEntry 3 }
++
++-- Port Table for Transparent Bridges
++
++dot1dTpPortTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF Dot1dTpPortEntry
++ ACCESS not-accessible
++ STATUS mandatory
++ DESCRIPTION
++ "A table that contains information about every
++ port that is associated with this transparent
++ bridge."
++ ::= { dot1dTp 4 }
++
++dot1dTpPortEntry OBJECT-TYPE
++ SYNTAX Dot1dTpPortEntry
++ ACCESS not-accessible
++ STATUS mandatory
++ DESCRIPTION
++ "A list of information for each port of a
++ transparent bridge."
++ INDEX { dot1dTpPort }
++ ::= { dot1dTpPortTable 1 }
++
++Dot1dTpPortEntry ::=
++ SEQUENCE {
++ dot1dTpPort
++ INTEGER,
++ dot1dTpPortMaxInfo
++ INTEGER,
++ dot1dTpPortInFrames
++ Counter,
++ dot1dTpPortOutFrames
++ Counter,
++ dot1dTpPortInDiscards
++ Counter
++ }
++
++dot1dTpPort OBJECT-TYPE
++ SYNTAX INTEGER (1..65535)
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The port number of the port for which this entry
++ contains Transparent bridging management
++ information."
++ ::= { dot1dTpPortEntry 1 }
++
++-- It would be nice if we could use ifMtu as the size of the
++-- largest INFO field, but we can't because ifMtu is defined
++-- to be the size that the (inter-)network layer can use which
++-- can differ from the MAC layer (especially if several layers
++-- of encapsulation are used).
++
++dot1dTpPortMaxInfo OBJECT-TYPE
++ SYNTAX INTEGER
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The maximum size of the INFO (non-MAC) field that
++ this port will receive or transmit."
++ ::= { dot1dTpPortEntry 2 }
++
++dot1dTpPortInFrames OBJECT-TYPE
++ SYNTAX Counter
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The number of frames that have been received by
++ this port from its segment. Note that a frame
++ received on the interface corresponding to this
++ port is only counted by this object if and only if
++ it is for a protocol being processed by the local
++ bridging function, including bridge management
++ frames."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 6.6.1.1.3"
++ ::= { dot1dTpPortEntry 3 }
++
++dot1dTpPortOutFrames OBJECT-TYPE
++ SYNTAX Counter
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The number of frames that have been transmitted
++ by this port to its segment. Note that a frame
++ transmitted on the interface corresponding to this
++ port is only counted by this object if and only if
++ it is for a protocol being processed by the local
++ bridging function, including bridge management
++ frames."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 6.6.1.1.3"
++ ::= { dot1dTpPortEntry 4 }
++
++dot1dTpPortInDiscards OBJECT-TYPE
++ SYNTAX Counter
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "Count of valid frames received which were
++ discarded (i.e., filtered) by the Forwarding
++ Process."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 6.6.1.1.3"
++ ::= { dot1dTpPortEntry 5 }
++-- The Static (Destination-Address Filtering) Database
++
++-- Implementation of this group is optional.
++
++dot1dStaticTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF Dot1dStaticEntry
++ ACCESS not-accessible
++ STATUS mandatory
++ DESCRIPTION
++ "A table containing filtering information
++ configured into the bridge by (local or network)
++ management specifying the set of ports to which
++ frames received from specific ports and containing
++ specific destination addresses are allowed to be
++ forwarded. The value of zero in this table as the
++ port number from which frames with a specific
++ destination address are received, is used to
++ specify all ports for which there is no specific
++ entry in this table for that particular
++ destination address. Entries are valid for
++ unicast and for group/broadcast addresses."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 6.7.2"
++ ::= { dot1dStatic 1 }
++
++dot1dStaticEntry OBJECT-TYPE
++ SYNTAX Dot1dStaticEntry
++ ACCESS not-accessible
++ STATUS mandatory
++ DESCRIPTION
++ "Filtering information configured into the bridge
++ by (local or network) management specifying the
++ set of ports to which frames received from a
++ specific port and containing a specific
++ destination address are allowed to be forwarded."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 6.7.2"
++ INDEX { dot1dStaticAddress, dot1dStaticReceivePort }
++ ::= { dot1dStaticTable 1 }
++
++Dot1dStaticEntry ::=
++ SEQUENCE {
++ dot1dStaticAddress
++ MacAddress,
++ dot1dStaticReceivePort
++ INTEGER,
++ dot1dStaticAllowedToGoTo
++ OCTET STRING,
++ dot1dStaticStatus
++ INTEGER
++ }
++
++dot1dStaticAddress OBJECT-TYPE
++ SYNTAX MacAddress
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "The destination MAC address in a frame to which
++ this entry's filtering information applies. This
++ object can take the value of a unicast address, a
++ group address or the broadcast address."
++ REFERENCE
++ "IEEE 802.1D-1990: Section 3.9.1, 3.9.2"
++ ::= { dot1dStaticEntry 1 }
++
++dot1dStaticReceivePort OBJECT-TYPE
++ SYNTAX INTEGER
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "Either the value '0', or the port number of the
++ port from which a frame must be received in order
++ for this entry's filtering information to apply.
++ A value of zero indicates that this entry applies
++ on all ports of the bridge for which there is no
++ other applicable entry."
++ ::= { dot1dStaticEntry 2 }
++
++dot1dStaticAllowedToGoTo OBJECT-TYPE
++ SYNTAX OCTET STRING
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "The set of ports to which frames received from a
++ specific port and destined for a specific MAC
++
++ address, are allowed to be forwarded. Each octet
++ within the value of this object specifies a set of
++ eight ports, with the first octet specifying ports
++ 1 through 8, the second octet specifying ports 9
++ through 16, etc. Within each octet, the most
++ significant bit represents the lowest numbered
++ port, and the least significant bit represents the
++ highest numbered port. Thus, each port of the
++ bridge is represented by a single bit within the
++ value of this object. If that bit has a value of
++ '1' then that port is included in the set of
++ ports; the port is not included if its bit has a
++ value of '0'. (Note that the setting of the bit
++ corresponding to the port from which a frame is
++ received is irrelevant.) The default value of
++ this object is a string of ones of appropriate
++ length."
++ ::= { dot1dStaticEntry 3 }
++
++dot1dStaticStatus OBJECT-TYPE
++ SYNTAX INTEGER {
++ other(1),
++ invalid(2),
++ permanent(3),
++ deleteOnReset(4),
++ deleteOnTimeout(5)
++ }
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "This object indicates the status of this entry.
++ The default value is permanent(3).
++ other(1) - this entry is currently in use but
++ the conditions under which it will
++ remain so are different from each of the
++ following values.
++ invalid(2) - writing this value to the object
++ removes the corresponding entry.
++ permanent(3) - this entry is currently in use
++ and will remain so after the next reset
++ of the bridge.
++ deleteOnReset(4) - this entry is currently in
++ use and will remain so until the next
++ reset of the bridge.
++ deleteOnTimeout(5) - this entry is currently
++ in use and will remain so until it is
++ aged out."
++
++ ::= { dot1dStaticEntry 4 }
++
++-- Traps for use by Bridges
++
++-- Traps for the Spanning Tree Protocol
++
++newRoot TRAP-TYPE
++ ENTERPRISE dot1dBridge
++ DESCRIPTION
++ "The newRoot trap indicates that the sending agent
++ has become the new root of the Spanning Tree; the
++ trap is sent by a bridge soon after its election
++ as the new root, e.g., upon expiration of the
++ Topology Change Timer immediately subsequent to
++ its election. Implementation of this trap is
++ optional."
++ ::= 1
++
++topologyChange TRAP-TYPE
++ ENTERPRISE dot1dBridge
++ DESCRIPTION
++ "A topologyChange trap is sent by a bridge when
++ any of its configured ports transitions from the
++ Learning state to the Forwarding state, or from
++ the Forwarding state to the Blocking state. The
++ trap is not sent if a newRoot trap is sent for the
++ same transition. Implementation of this trap is
++ optional."
++ ::= 2
++
++END
+--- /dev/null
++++ b/mibs/GNOME-SMI.txt
+@@ -0,0 +1,88 @@
++GNOME-SMI DEFINITIONS ::= BEGIN
++
++IMPORTS
++ MODULE-IDENTITY,
++ OBJECT-IDENTITY,
++ enterprises
++ FROM SNMPv2-SMI;
++
++gnome MODULE-IDENTITY
++ LAST-UPDATED "200709070000Z"
++ ORGANIZATION "GNOME project"
++ CONTACT-INFO
++ "GNU Network Object Model Environment project
++
++ see http://www.gnome.org for contact persons of a particular
++ area or subproject of GNOME.
++
++ Administrative contact for MIB module:
++
++ Jochen Friedrich
++ Ramsaystr. 9
++ 63450 Hanau
++ Germany
++
++ email: jochen@scram.de"
++ DESCRIPTION
++ "The Structure of GNOME."
++
++ -- revision history
++
++ REVISION "200709070000Z" -- Sep 07, 2007
++ DESCRIPTION
++ "Fixed wrong enterprise number (how comes this
++ typo was unnoticed for so long?)."
++
++ REVISION "200505070000Z" -- May 07, 2005
++ DESCRIPTION
++ "Added gnomeLDAP subtree for LDAP definitions."
++
++ REVISION "200312070000Z" -- December 07, 2003
++ DESCRIPTION
++ "Added gnomeSysadmin subtree for GNOME project system administration.
++ Updated contact info."
++
++ REVISION "9809010000Z" -- September 01, 1998
++ DESCRIPTION
++ "Initial version."
++
++ ::= { enterprises 3319 } -- assigned by IANA
++
++gnomeProducts OBJECT-IDENTITY
++ STATUS current
++ DESCRIPTION
++ "gnomeProducts is the root OBJECT IDENTIFIER from
++ which sysObjectID values are assigned."
++ ::= { gnome 1 }
++
++gnomeMgmt OBJECT-IDENTITY
++ STATUS current
++ DESCRIPTION
++ "gnomeMgmt defines the subtree for production GNOME related
++ MIB registrations."
++ ::= { gnome 2 }
++
++gnomeTest OBJECT-IDENTITY
++ STATUS current
++ DESCRIPTION
++ "gnomeTest defines the subtree for testing GNOME related
++ MIB registrations."
++ ::= { gnome 3 }
++
++gnomeSysadmin OBJECT-IDENTITY
++ STATUS current
++ DESCRIPTION
++ "gnomeSysadmin defines the subtree for GNOME related Sysadmin
++ MIB registrations."
++ ::= { gnome 4 }
++
++gnomeLDAP OBJECT-IDENTITY
++ STATUS current
++ DESCRIPTION
++ "gnomeLDAP defines the subtree for GNOME related LDAP
++ registrations."
++ ::= { gnome 5 }
++
++-- more to come if necessary.
++
++END
+--- /dev/null
++++ b/mibs/OSPF-MIB.txt
+@@ -0,0 +1,2723 @@
++OSPF-MIB DEFINITIONS ::= BEGIN
++
++ IMPORTS
++ MODULE-IDENTITY, OBJECT-TYPE, Counter32, Gauge32,
++ Integer32, IpAddress
++ FROM SNMPv2-SMI
++ TEXTUAL-CONVENTION, TruthValue, RowStatus
++ FROM SNMPv2-TC
++ MODULE-COMPLIANCE, OBJECT-GROUP FROM SNMPv2-CONF
++ mib-2 FROM RFC1213-MIB;
++
++-- This MIB module uses the extended OBJECT-TYPE macro as
++-- defined in [9].
++
++ospf MODULE-IDENTITY
++ LAST-UPDATED "9501201225Z" -- Fri Jan 20 12:25:50 PST 1995
++ ORGANIZATION "IETF OSPF Working Group"
++ CONTACT-INFO
++ " Fred Baker
++ Postal: Cisco Systems
++ 519 Lado Drive
++ Santa Barbara, California 93111
++ Tel: +1 805 681 0115
++ E-Mail: fred@cisco.com
++
++ Rob Coltun
++ Postal: RainbowBridge Communications
++ Tel: (301) 340-9416
++ E-Mail: rcoltun@rainbow-bridge.com"
++ DESCRIPTION
++ "The MIB module to describe the OSPF Version 2
++ Protocol"
++ ::= { mib-2 14 }
++
++-- The Area ID, in OSPF, has the same format as an IP Address,
++-- but has the function of defining a summarization point for
++-- Link State Advertisements
++
++AreaID ::= TEXTUAL-CONVENTION
++ STATUS current
++ DESCRIPTION
++ "An OSPF Area Identifier."
++ SYNTAX IpAddress
++
++
++-- The Router ID, in OSPF, has the same format as an IP Address,
++-- but identifies the router independent of its IP Address.
++
++RouterID ::= TEXTUAL-CONVENTION
++ STATUS current
++ DESCRIPTION
++ "A OSPF Router Identifier."
++ SYNTAX IpAddress
++
++
++-- The OSPF Metric is defined as an unsigned value in the range
++
++Metric ::= TEXTUAL-CONVENTION
++ STATUS current
++ DESCRIPTION
++ "The OSPF Internal Metric."
++ SYNTAX Integer32 (0..'FFFF'h)
++
++BigMetric ::= TEXTUAL-CONVENTION
++ STATUS current
++ DESCRIPTION
++ "The OSPF External Metric."
++ SYNTAX Integer32 (0..'FFFFFF'h)
++
++-- Status Values
++
++Status ::= TEXTUAL-CONVENTION
++ STATUS current
++ DESCRIPTION
++ "The status of an interface: 'enabled' indicates that
++ it is willing to communicate with other OSPF Routers,
++ while 'disabled' indicates that it is not."
++ SYNTAX INTEGER { enabled (1), disabled (2) }
++
++-- Time Durations measured in seconds
++
++PositiveInteger ::= TEXTUAL-CONVENTION
++ STATUS current
++ DESCRIPTION
++ "A positive integer. Values in excess are precluded as
++ unnecessary and prone to interoperability issues."
++ SYNTAX Integer32 (0..'7FFFFFFF'h)
++
++HelloRange ::= TEXTUAL-CONVENTION
++ STATUS current
++ DESCRIPTION
++ "The range of intervals on which hello messages are
++ exchanged."
++ SYNTAX Integer32 (1..'FFFF'h)
++
++UpToMaxAge ::= TEXTUAL-CONVENTION
++ STATUS current
++ DESCRIPTION
++ "The values that one might find or configure for
++ variables bounded by the maximum age of an LSA."
++ SYNTAX Integer32 (0..3600)
++
++
++-- The range of ifIndex
++
++InterfaceIndex ::= TEXTUAL-CONVENTION
++ STATUS current
++ DESCRIPTION
++ "The range of ifIndex."
++ SYNTAX Integer32
++
++
++-- Potential Priorities for the Designated Router Election
++
++DesignatedRouterPriority ::= TEXTUAL-CONVENTION
++ STATUS current
++ DESCRIPTION
++ "The values defined for the priority of a system for
++ becoming the designated router."
++ SYNTAX Integer32 (0..'FF'h)
++
++TOSType ::= TEXTUAL-CONVENTION
++ STATUS current
++ DESCRIPTION
++ "Type of Service is defined as a mapping to the IP Type of
++ Service Flags as defined in the IP Forwarding Table MIB
++
++ +-----+-----+-----+-----+-----+-----+-----+-----+
++ | | | |
++ | PRECEDENCE | TYPE OF SERVICE | 0 |
++ | | | |
++ +-----+-----+-----+-----+-----+-----+-----+-----+
++
++ IP TOS IP TOS
++ Field Policy Field Policy
++
++ Contents Code Contents Code
++ 0 0 0 0 ==> 0 0 0 0 1 ==> 2
++ 0 0 1 0 ==> 4 0 0 1 1 ==> 6
++ 0 1 0 0 ==> 8 0 1 0 1 ==> 10
++ 0 1 1 0 ==> 12 0 1 1 1 ==> 14
++ 1 0 0 0 ==> 16 1 0 0 1 ==> 18
++ 1 0 1 0 ==> 20 1 0 1 1 ==> 22
++ 1 1 0 0 ==> 24 1 1 0 1 ==> 26
++ 1 1 1 0 ==> 28 1 1 1 1 ==> 30
++
++ The remaining values are left for future definition."
++ SYNTAX Integer32 (0..30)
++
++
++-- OSPF General Variables
++
++-- These parameters apply globally to the Router's
++-- OSPF Process.
++
++ospfGeneralGroup OBJECT IDENTIFIER ::= { ospf 1 }
++
++
++ ospfRouterId OBJECT-TYPE
++ SYNTAX RouterID
++ MAX-ACCESS read-write
++ STATUS current
++ DESCRIPTION
++ "A 32-bit integer uniquely identifying the
++ router in the Autonomous System.
++
++ By convention, to ensure uniqueness, this
++ should default to the value of one of the
++ router's IP interface addresses."
++ REFERENCE
++ "OSPF Version 2, C.1 Global parameters"
++ ::= { ospfGeneralGroup 1 }
++
++
++ ospfAdminStat OBJECT-TYPE
++ SYNTAX Status
++ MAX-ACCESS read-write
++ STATUS current
++ DESCRIPTION
++ "The administrative status of OSPF in the
++ router. The value 'enabled' denotes that the
++ OSPF Process is active on at least one inter-
++ face; 'disabled' disables it on all inter-
++ faces."
++ ::= { ospfGeneralGroup 2 }
++
++ ospfVersionNumber OBJECT-TYPE
++ SYNTAX INTEGER { version2 (2) }
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The current version number of the OSPF proto-
++ col is 2."
++ REFERENCE
++ "OSPF Version 2, Title"
++ ::= { ospfGeneralGroup 3 }
++
++
++ ospfAreaBdrRtrStatus OBJECT-TYPE
++ SYNTAX TruthValue
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "A flag to note whether this router is an area
++ border router."
++ REFERENCE
++ "OSPF Version 2, Section 3 Splitting the AS into
++ Areas"
++ ::= { ospfGeneralGroup 4 }
++
++
++ ospfASBdrRtrStatus OBJECT-TYPE
++ SYNTAX TruthValue
++ MAX-ACCESS read-write
++ STATUS current
++ DESCRIPTION
++ "A flag to note whether this router is config-
++ ured as an Autonomous System border router."
++ REFERENCE
++ "OSPF Version 2, Section 3.3 Classification of
++ routers"
++ ::= { ospfGeneralGroup 5 }
++
++ ospfExternLsaCount OBJECT-TYPE
++ SYNTAX Gauge32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The number of external (LS type 5) link-state
++ advertisements in the link-state database."
++ REFERENCE
++ "OSPF Version 2, Appendix A.4.5 AS external link
++ advertisements"
++ ::= { ospfGeneralGroup 6 }
++
++
++ ospfExternLsaCksumSum OBJECT-TYPE
++ SYNTAX Integer32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The 32-bit unsigned sum of the LS checksums of
++ the external link-state advertisements con-
++ tained in the link-state database. This sum
++ can be used to determine if there has been a
++ change in a router's link state database, and
++ to compare the link-state database of two
++ routers."
++ ::= { ospfGeneralGroup 7 }
++
++
++ ospfTOSSupport OBJECT-TYPE
++ SYNTAX TruthValue
++ MAX-ACCESS read-write
++ STATUS current
++ DESCRIPTION
++ "The router's support for type-of-service rout-
++ ing."
++ REFERENCE
++ "OSPF Version 2, Appendix F.1.2 Optional TOS
++ support"
++ ::= { ospfGeneralGroup 8 }
++
++ ospfOriginateNewLsas OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The number of new link-state advertisements
++ that have been originated. This number is in-
++ cremented each time the router originates a new
++ LSA."
++ ::= { ospfGeneralGroup 9 }
++
++
++ ospfRxNewLsas OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The number of link-state advertisements re-
++ ceived determined to be new instantiations.
++ This number does not include newer instantia-
++ tions of self-originated link-state advertise-
++ ments."
++ ::= { ospfGeneralGroup 10 }
++
++ ospfExtLsdbLimit OBJECT-TYPE
++ SYNTAX Integer32 (-1..'7FFFFFFF'h)
++ MAX-ACCESS read-write
++ STATUS current
++ DESCRIPTION
++ "The maximum number of non-default AS-
++ external-LSAs entries that can be stored in the
++ link-state database. If the value is -1, then
++ there is no limit.
++
++ When the number of non-default AS-external-LSAs
++ in a router's link-state database reaches
++ ospfExtLsdbLimit, the router enters Overflow-
++ State. The router never holds more than
++ ospfExtLsdbLimit non-default AS-external-LSAs
++ in its database. OspfExtLsdbLimit MUST be set
++ identically in all routers attached to the OSPF
++ backbone and/or any regular OSPF area. (i.e.,
++ OSPF stub areas and NSSAs are excluded)."
++ DEFVAL { -1 }
++ ::= { ospfGeneralGroup 11 }
++
++ ospfMulticastExtensions OBJECT-TYPE
++ SYNTAX Integer32
++ MAX-ACCESS read-write
++ STATUS current
++ DESCRIPTION
++ "A Bit Mask indicating whether the router is
++ forwarding IP multicast (Class D) datagrams
++ based on the algorithms defined in the Multi-
++ cast Extensions to OSPF.
++
++ Bit 0, if set, indicates that the router can
++ forward IP multicast datagrams in the router's
++ directly attached areas (called intra-area mul-
++ ticast routing).
++
++ Bit 1, if set, indicates that the router can
++ forward IP multicast datagrams between OSPF
++ areas (called inter-area multicast routing).
++
++ Bit 2, if set, indicates that the router can
++ forward IP multicast datagrams between Auto-
++ nomous Systems (called inter-AS multicast rout-
++ ing).
++
++ Only certain combinations of bit settings are
++ allowed, namely: 0 (no multicast forwarding is
++ enabled), 1 (intra-area multicasting only), 3
++ (intra-area and inter-area multicasting), 5
++ (intra-area and inter-AS multicasting) and 7
++ (multicasting everywhere). By default, no mul-
++ ticast forwarding is enabled."
++ DEFVAL { 0 }
++ ::= { ospfGeneralGroup 12 }
++
++ ospfExitOverflowInterval OBJECT-TYPE
++ SYNTAX PositiveInteger
++ MAX-ACCESS read-write
++ STATUS current
++ DESCRIPTION
++ "The number of seconds that, after entering
++ OverflowState, a router will attempt to leave
++ OverflowState. This allows the router to again
++ originate non-default AS-external-LSAs. When
++ set to 0, the router will not leave Overflow-
++ State until restarted."
++ DEFVAL { 0 }
++ ::= { ospfGeneralGroup 13 }
++
++
++ ospfDemandExtensions OBJECT-TYPE
++ SYNTAX TruthValue
++ MAX-ACCESS read-write
++ STATUS current
++ DESCRIPTION
++ "The router's support for demand routing."
++ REFERENCE
++ "OSPF Version 2, Appendix on Demand Routing"
++ ::= { ospfGeneralGroup 14 }
++
++
++-- The OSPF Area Data Structure contains information
++-- regarding the various areas. The interfaces and
++-- virtual links are configured as part of these areas.
++-- Area 0.0.0.0, by definition, is the Backbone Area
++
++
++ ospfAreaTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF OspfAreaEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "Information describing the configured parame-
++ ters and cumulative statistics of the router's
++ attached areas."
++ REFERENCE
++ "OSPF Version 2, Section 6 The Area Data Struc-
++ ture"
++ ::= { ospf 2 }
++
++
++ ospfAreaEntry OBJECT-TYPE
++ SYNTAX OspfAreaEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "Information describing the configured parame-
++ ters and cumulative statistics of one of the
++ router's attached areas."
++ INDEX { ospfAreaId }
++ ::= { ospfAreaTable 1 }
++
++OspfAreaEntry ::=
++ SEQUENCE {
++ ospfAreaId
++ AreaID,
++ ospfAuthType
++ Integer32,
++ ospfImportAsExtern
++ INTEGER,
++ ospfSpfRuns
++ Counter32,
++ ospfAreaBdrRtrCount
++ Gauge32,
++ ospfAsBdrRtrCount
++ Gauge32,
++ ospfAreaLsaCount
++ Gauge32,
++ ospfAreaLsaCksumSum
++ Integer32,
++ ospfAreaSummary
++ INTEGER,
++ ospfAreaStatus
++ RowStatus
++ }
++
++ ospfAreaId OBJECT-TYPE
++ SYNTAX AreaID
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "A 32-bit integer uniquely identifying an area.
++ Area ID 0.0.0.0 is used for the OSPF backbone."
++ REFERENCE
++ "OSPF Version 2, Appendix C.2 Area parameters"
++ ::= { ospfAreaEntry 1 }
++
++
++ ospfAuthType OBJECT-TYPE
++ SYNTAX Integer32
++ -- none (0),
++ -- simplePassword (1)
++ -- md5 (2)
++ -- reserved for specification by IANA (> 2)
++ MAX-ACCESS read-create
++ STATUS obsolete
++ DESCRIPTION
++ "The authentication type specified for an area.
++ Additional authentication types may be assigned
++ locally on a per Area basis."
++ REFERENCE
++ "OSPF Version 2, Appendix E Authentication"
++ DEFVAL { 0 } -- no authentication, by default
++ ::= { ospfAreaEntry 2 }
++
++ ospfImportAsExtern OBJECT-TYPE
++ SYNTAX INTEGER {
++ importExternal (1),
++ importNoExternal (2),
++ importNssa (3)
++ }
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The area's support for importing AS external
++ link- state advertisements."
++ REFERENCE
++ "OSPF Version 2, Appendix C.2 Area parameters"
++ DEFVAL { importExternal }
++ ::= { ospfAreaEntry 3 }
++
++
++ ospfSpfRuns OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The number of times that the intra-area route
++ table has been calculated using this area's
++ link-state database. This is typically done
++ using Dijkstra's algorithm."
++ ::= { ospfAreaEntry 4 }
++
++
++ ospfAreaBdrRtrCount OBJECT-TYPE
++ SYNTAX Gauge32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The total number of area border routers reach-
++ able within this area. This is initially zero,
++ and is calculated in each SPF Pass."
++ ::= { ospfAreaEntry 5 }
++
++ ospfAsBdrRtrCount OBJECT-TYPE
++ SYNTAX Gauge32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The total number of Autonomous System border
++ routers reachable within this area. This is
++ initially zero, and is calculated in each SPF
++ Pass."
++ ::= { ospfAreaEntry 6 }
++
++
++ ospfAreaLsaCount OBJECT-TYPE
++ SYNTAX Gauge32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The total number of link-state advertisements
++ in this area's link-state database, excluding
++ AS External LSA's."
++ ::= { ospfAreaEntry 7 }
++
++
++ ospfAreaLsaCksumSum OBJECT-TYPE
++ SYNTAX Integer32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The 32-bit unsigned sum of the link-state ad-
++ vertisements' LS checksums contained in this
++ area's link-state database. This sum excludes
++ external (LS type 5) link-state advertisements.
++ The sum can be used to determine if there has
++ been a change in a router's link state data-
++ base, and to compare the link-state database of
++ two routers."
++ DEFVAL { 0 }
++ ::= { ospfAreaEntry 8 }
++
++ ospfAreaSummary OBJECT-TYPE
++ SYNTAX INTEGER {
++ noAreaSummary (1),
++ sendAreaSummary (2)
++ }
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The variable ospfAreaSummary controls the im-
++ port of summary LSAs into stub areas. It has
++ no effect on other areas.
++
++ If it is noAreaSummary, the router will neither
++ originate nor propagate summary LSAs into the
++ stub area. It will rely entirely on its de-
++ fault route.
++
++ If it is sendAreaSummary, the router will both
++ summarize and propagate summary LSAs."
++ DEFVAL { noAreaSummary }
++ ::= { ospfAreaEntry 9 }
++
++
++ ospfAreaStatus OBJECT-TYPE
++ SYNTAX RowStatus
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "This variable displays the status of the en-
++ try. Setting it to 'invalid' has the effect of
++ rendering it inoperative. The internal effect
++ (row removal) is implementation dependent."
++ ::= { ospfAreaEntry 10 }
++
++
++-- OSPF Area Default Metric Table
++
++-- The OSPF Area Default Metric Table describes the metrics
++-- that a default Area Border Router will advertise into a
++-- Stub area.
++
++
++ ospfStubAreaTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF OspfStubAreaEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "The set of metrics that will be advertised by
++ a default Area Border Router into a stub area."
++ REFERENCE
++ "OSPF Version 2, Appendix C.2, Area Parameters"
++ ::= { ospf 3 }
++
++
++ ospfStubAreaEntry OBJECT-TYPE
++ SYNTAX OspfStubAreaEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "The metric for a given Type of Service that
++ will be advertised by a default Area Border
++ Router into a stub area."
++ REFERENCE
++ "OSPF Version 2, Appendix C.2, Area Parameters"
++ INDEX { ospfStubAreaId, ospfStubTOS }
++ ::= { ospfStubAreaTable 1 }
++
++OspfStubAreaEntry ::=
++ SEQUENCE {
++ ospfStubAreaId
++ AreaID,
++ ospfStubTOS
++ TOSType,
++ ospfStubMetric
++ BigMetric,
++ ospfStubStatus
++ RowStatus,
++ ospfStubMetricType
++ INTEGER
++ }
++
++ ospfStubAreaId OBJECT-TYPE
++ SYNTAX AreaID
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The 32 bit identifier for the Stub Area. On
++ creation, this can be derived from the in-
++ stance."
++ ::= { ospfStubAreaEntry 1 }
++
++
++ ospfStubTOS OBJECT-TYPE
++ SYNTAX TOSType
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The Type of Service associated with the
++ metric. On creation, this can be derived from
++ the instance."
++ ::= { ospfStubAreaEntry 2 }
++
++
++ ospfStubMetric OBJECT-TYPE
++ SYNTAX BigMetric
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The metric value applied at the indicated type
++ of service. By default, this equals the least
++ metric at the type of service among the inter-
++ faces to other areas."
++ ::= { ospfStubAreaEntry 3 }
++
++
++ ospfStubStatus OBJECT-TYPE
++ SYNTAX RowStatus
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "This variable displays the status of the en-
++ try. Setting it to 'invalid' has the effect of
++ rendering it inoperative. The internal effect
++ (row removal) is implementation dependent."
++ ::= { ospfStubAreaEntry 4 }
++
++ ospfStubMetricType OBJECT-TYPE
++ SYNTAX INTEGER {
++ ospfMetric (1), -- OSPF Metric
++ comparableCost (2), -- external type 1
++ nonComparable (3) -- external type 2
++ }
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "This variable displays the type of metric ad-
++ vertised as a default route."
++ DEFVAL { ospfMetric }
++ ::= { ospfStubAreaEntry 5 }
++
++-- OSPF Link State Database
++
++-- The Link State Database contains the Link State
++-- Advertisements from throughout the areas that the
++-- device is attached to.
++
++
++ ospfLsdbTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF OspfLsdbEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "The OSPF Process's Link State Database."
++ REFERENCE
++ "OSPF Version 2, Section 12 Link State Adver-
++ tisements"
++ ::= { ospf 4 }
++
++
++ ospfLsdbEntry OBJECT-TYPE
++ SYNTAX OspfLsdbEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "A single Link State Advertisement."
++ INDEX { ospfLsdbAreaId, ospfLsdbType,
++ ospfLsdbLsid, ospfLsdbRouterId }
++ ::= { ospfLsdbTable 1 }
++
++OspfLsdbEntry ::=
++ SEQUENCE {
++ ospfLsdbAreaId
++ AreaID,
++ ospfLsdbType
++ INTEGER,
++ ospfLsdbLsid
++ IpAddress,
++ ospfLsdbRouterId
++ RouterID,
++ ospfLsdbSequence
++ Integer32,
++ ospfLsdbAge
++ Integer32,
++ ospfLsdbChecksum
++ Integer32,
++ ospfLsdbAdvertisement
++ OCTET STRING
++ }
++ ospfLsdbAreaId OBJECT-TYPE
++ SYNTAX AreaID
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The 32 bit identifier of the Area from which
++ the LSA was received."
++ REFERENCE
++ "OSPF Version 2, Appendix C.2 Area parameters"
++ ::= { ospfLsdbEntry 1 }
++
++-- External Link State Advertisements are permitted
++-- for backward compatibility, but should be displayed in
++-- the ospfExtLsdbTable rather than here.
++
++ ospfLsdbType OBJECT-TYPE
++ SYNTAX INTEGER {
++ routerLink (1),
++ networkLink (2),
++ summaryLink (3),
++ asSummaryLink (4),
++ asExternalLink (5), -- but see ospfExtLsdbTable
++ multicastLink (6),
++ nssaExternalLink (7)
++ }
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The type of the link state advertisement.
++ Each link state type has a separate advertise-
++ ment format."
++ REFERENCE
++ "OSPF Version 2, Appendix A.4.1 The Link State
++ Advertisement header"
++ ::= { ospfLsdbEntry 2 }
++
++ ospfLsdbLsid OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The Link State ID is an LS Type Specific field
++ containing either a Router ID or an IP Address;
++ it identifies the piece of the routing domain
++ that is being described by the advertisement."
++ REFERENCE
++ "OSPF Version 2, Section 12.1.4 Link State ID"
++ ::= { ospfLsdbEntry 3 }
++ ospfLsdbRouterId OBJECT-TYPE
++ SYNTAX RouterID
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The 32 bit number that uniquely identifies the
++ originating router in the Autonomous System."
++ REFERENCE
++ "OSPF Version 2, Appendix C.1 Global parameters"
++ ::= { ospfLsdbEntry 4 }
++
++-- Note that the OSPF Sequence Number is a 32 bit signed
++-- integer. It starts with the value '80000001'h,
++-- or -'7FFFFFFF'h, and increments until '7FFFFFFF'h
++-- Thus, a typical sequence number will be very negative.
++
++ ospfLsdbSequence OBJECT-TYPE
++ SYNTAX Integer32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The sequence number field is a signed 32-bit
++ integer. It is used to detect old and dupli-
++ cate link state advertisements. The space of
++ sequence numbers is linearly ordered. The
++ larger the sequence number the more recent the
++ advertisement."
++ REFERENCE
++ "OSPF Version 2, Section 12.1.6 LS sequence
++ number"
++ ::= { ospfLsdbEntry 5 }
++
++
++ ospfLsdbAge OBJECT-TYPE
++ SYNTAX Integer32 -- Should be 0..MaxAge
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "This field is the age of the link state adver-
++ tisement in seconds."
++ REFERENCE
++ "OSPF Version 2, Section 12.1.1 LS age"
++ ::= { ospfLsdbEntry 6 }
++
++ ospfLsdbChecksum OBJECT-TYPE
++ SYNTAX Integer32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "This field is the checksum of the complete
++ contents of the advertisement, excepting the
++ age field. The age field is excepted so that
++ an advertisement's age can be incremented
++ without updating the checksum. The checksum
++ used is the same that is used for ISO connec-
++ tionless datagrams; it is commonly referred to
++ as the Fletcher checksum."
++ REFERENCE
++ "OSPF Version 2, Section 12.1.7 LS checksum"
++ ::= { ospfLsdbEntry 7 }
++
++
++ ospfLsdbAdvertisement OBJECT-TYPE
++ SYNTAX OCTET STRING (SIZE (1..65535))
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The entire Link State Advertisement, including
++ its header."
++ REFERENCE
++ "OSPF Version 2, Section 12 Link State Adver-
++ tisements"
++ ::= { ospfLsdbEntry 8 }
++
++
++-- Address Range Table
++
++-- The Address Range Table acts as an adjunct to the Area
++-- Table; It describes those Address Range Summaries that
++-- are configured to be propagated from an Area to reduce
++-- the amount of information about it which is known beyond
++-- its borders.
++
++ ospfAreaRangeTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF OspfAreaRangeEntry
++ MAX-ACCESS not-accessible
++ STATUS obsolete
++ DESCRIPTION
++ "A range if IP addresses specified by an IP
++ address/IP network mask pair. For example,
++ class B address range of X.X.X.X with a network
++ mask of 255.255.0.0 includes all IP addresses
++ from X.X.0.0 to X.X.255.255"
++ REFERENCE
++ "OSPF Version 2, Appendix C.2 Area parameters"
++ ::= { ospf 5 }
++ ospfAreaRangeEntry OBJECT-TYPE
++ SYNTAX OspfAreaRangeEntry
++ MAX-ACCESS not-accessible
++ STATUS obsolete
++ DESCRIPTION
++ "A range if IP addresses specified by an IP
++ address/IP network mask pair. For example,
++ class B address range of X.X.X.X with a network
++ mask of 255.255.0.0 includes all IP addresses
++ from X.X.0.0 to X.X.255.255"
++ REFERENCE
++ "OSPF Version 2, Appendix C.2 Area parameters"
++ INDEX { ospfAreaRangeAreaId, ospfAreaRangeNet }
++ ::= { ospfAreaRangeTable 1 }
++
++OspfAreaRangeEntry ::=
++ SEQUENCE {
++ ospfAreaRangeAreaId
++ AreaID,
++ ospfAreaRangeNet
++ IpAddress,
++ ospfAreaRangeMask
++ IpAddress,
++ ospfAreaRangeStatus
++ RowStatus,
++ ospfAreaRangeEffect
++ INTEGER
++ }
++
++ ospfAreaRangeAreaId OBJECT-TYPE
++ SYNTAX AreaID
++ MAX-ACCESS read-only
++ STATUS obsolete
++ DESCRIPTION
++ "The Area the Address Range is to be found
++ within."
++ REFERENCE
++ "OSPF Version 2, Appendix C.2 Area parameters"
++ ::= { ospfAreaRangeEntry 1 }
++
++
++ ospfAreaRangeNet OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS obsolete
++ DESCRIPTION
++ "The IP Address of the Net or Subnet indicated
++ by the range."
++ REFERENCE
++ "OSPF Version 2, Appendix C.2 Area parameters"
++ ::= { ospfAreaRangeEntry 2 }
++
++
++ ospfAreaRangeMask OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-create
++ STATUS obsolete
++ DESCRIPTION
++ "The Subnet Mask that pertains to the Net or
++ Subnet."
++ REFERENCE
++ "OSPF Version 2, Appendix C.2 Area parameters"
++ ::= { ospfAreaRangeEntry 3 }
++
++ ospfAreaRangeStatus OBJECT-TYPE
++ SYNTAX RowStatus
++ MAX-ACCESS read-create
++ STATUS obsolete
++ DESCRIPTION
++ "This variable displays the status of the en-
++ try. Setting it to 'invalid' has the effect of
++ rendering it inoperative. The internal effect
++ (row removal) is implementation dependent."
++ ::= { ospfAreaRangeEntry 4 }
++
++
++ ospfAreaRangeEffect OBJECT-TYPE
++ SYNTAX INTEGER {
++ advertiseMatching (1),
++ doNotAdvertiseMatching (2)
++ }
++ MAX-ACCESS read-create
++ STATUS obsolete
++ DESCRIPTION
++ "Subnets subsumed by ranges either trigger the
++ advertisement of the indicated summary (adver-
++ tiseMatching), or result in the subnet's not
++ being advertised at all outside the area."
++ DEFVAL { advertiseMatching }
++ ::= { ospfAreaRangeEntry 5 }
++
++
++
++-- OSPF Host Table
++
++-- The Host/Metric Table indicates what hosts are directly
++-- attached to the Router, and what metrics and types of
++-- service should be advertised for them.
++
++ ospfHostTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF OspfHostEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "The list of Hosts, and their metrics, that the
++ router will advertise as host routes."
++ REFERENCE
++ "OSPF Version 2, Appendix C.6 Host route param-
++ eters"
++ ::= { ospf 6 }
++
++
++ ospfHostEntry OBJECT-TYPE
++ SYNTAX OspfHostEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "A metric to be advertised, for a given type of
++ service, when a given host is reachable."
++ INDEX { ospfHostIpAddress, ospfHostTOS }
++ ::= { ospfHostTable 1 }
++
++OspfHostEntry ::=
++ SEQUENCE {
++ ospfHostIpAddress
++ IpAddress,
++ ospfHostTOS
++ TOSType,
++ ospfHostMetric
++ Metric,
++ ospfHostStatus
++ RowStatus,
++ ospfHostAreaID
++ AreaID
++ }
++
++ ospfHostIpAddress OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The IP Address of the Host."
++ REFERENCE
++ "OSPF Version 2, Appendix C.6 Host route parame-
++ ters"
++ ::= { ospfHostEntry 1 }
++
++
++ ospfHostTOS OBJECT-TYPE
++ SYNTAX TOSType
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The Type of Service of the route being config-
++ ured."
++ REFERENCE
++ "OSPF Version 2, Appendix C.6 Host route parame-
++ ters"
++ ::= { ospfHostEntry 2 }
++
++
++ ospfHostMetric OBJECT-TYPE
++ SYNTAX Metric
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The Metric to be advertised."
++ REFERENCE
++ "OSPF Version 2, Appendix C.6 Host route parame-
++ ters"
++ ::= { ospfHostEntry 3 }
++
++ ospfHostStatus OBJECT-TYPE
++ SYNTAX RowStatus
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "This variable displays the status of the en-
++ try. Setting it to 'invalid' has the effect of
++ rendering it inoperative. The internal effect
++ (row removal) is implementation dependent."
++ ::= { ospfHostEntry 4 }
++
++
++ ospfHostAreaID OBJECT-TYPE
++ SYNTAX AreaID
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The Area the Host Entry is to be found within.
++ By default, the area that a subsuming OSPF in-
++ terface is in, or 0.0.0.0"
++ REFERENCE
++ "OSPF Version 2, Appendix C.2 Area parameters"
++ ::= { ospfHostEntry 5 }
++
++
++-- OSPF Interface Table
++
++-- The OSPF Interface Table augments the ipAddrTable
++-- with OSPF specific information.
++
++ ospfIfTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF OspfIfEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "The OSPF Interface Table describes the inter-
++ faces from the viewpoint of OSPF."
++ REFERENCE
++ "OSPF Version 2, Appendix C.3 Router interface
++ parameters"
++ ::= { ospf 7 }
++
++
++ ospfIfEntry OBJECT-TYPE
++ SYNTAX OspfIfEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "The OSPF Interface Entry describes one inter-
++ face from the viewpoint of OSPF."
++ INDEX { ospfIfIpAddress, ospfAddressLessIf }
++ ::= { ospfIfTable 1 }
++
++OspfIfEntry ::=
++ SEQUENCE {
++ ospfIfIpAddress
++ IpAddress,
++ ospfAddressLessIf
++ Integer32,
++ ospfIfAreaId
++ AreaID,
++ ospfIfType
++ INTEGER,
++ ospfIfAdminStat
++ Status,
++ ospfIfRtrPriority
++ DesignatedRouterPriority,
++ ospfIfTransitDelay
++ UpToMaxAge,
++ ospfIfRetransInterval
++ UpToMaxAge,
++ ospfIfHelloInterval
++ HelloRange,
++ ospfIfRtrDeadInterval
++ PositiveInteger,
++ ospfIfPollInterval
++ PositiveInteger,
++ ospfIfState
++ INTEGER,
++ ospfIfDesignatedRouter
++ IpAddress,
++ ospfIfBackupDesignatedRouter
++ IpAddress,
++ ospfIfEvents
++ Counter32,
++ ospfIfAuthType
++ INTEGER,
++ ospfIfAuthKey
++ OCTET STRING,
++ ospfIfStatus
++ RowStatus,
++ ospfIfMulticastForwarding
++ INTEGER,
++ ospfIfDemand
++ TruthValue
++ }
++
++ ospfIfIpAddress OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The IP address of this OSPF interface."
++ ::= { ospfIfEntry 1 }
++
++ ospfAddressLessIf OBJECT-TYPE
++ SYNTAX Integer32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "For the purpose of easing the instancing of
++ addressed and addressless interfaces; This
++ variable takes the value 0 on interfaces with
++ IP Addresses, and the corresponding value of
++ ifIndex for interfaces having no IP Address."
++ ::= { ospfIfEntry 2 }
++ ospfIfAreaId OBJECT-TYPE
++ SYNTAX AreaID
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "A 32-bit integer uniquely identifying the area
++ to which the interface connects. Area ID
++ 0.0.0.0 is used for the OSPF backbone."
++ DEFVAL { '00000000'H } -- 0.0.0.0
++ ::= { ospfIfEntry 3 }
++
++ ospfIfType OBJECT-TYPE
++ SYNTAX INTEGER {
++ broadcast (1),
++ nbma (2),
++ pointToPoint (3),
++ pointToMultipoint (5)
++ }
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The OSPF interface type.
++
++ By way of a default, this field may be intuited
++ from the corresponding value of ifType. Broad-
++ cast LANs, such as Ethernet and IEEE 802.5,
++ take the value 'broadcast', X.25 and similar
++ technologies take the value 'nbma', and links
++ that are definitively point to point take the
++ value 'pointToPoint'."
++ ::= { ospfIfEntry 4 }
++
++
++ ospfIfAdminStat OBJECT-TYPE
++ SYNTAX Status
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The OSPF interface's administrative status.
++ The value formed on the interface, and the in-
++ terface will be advertised as an internal route
++ to some area. The value 'disabled' denotes
++ that the interface is external to OSPF."
++ DEFVAL { enabled }
++ ::= { ospfIfEntry 5 }
++
++ ospfIfRtrPriority OBJECT-TYPE
++ SYNTAX DesignatedRouterPriority
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The priority of this interface. Used in
++ multi-access networks, this field is used in
++ the designated router election algorithm. The
++ value 0 signifies that the router is not eligi-
++ ble to become the designated router on this
++ particular network. In the event of a tie in
++ this value, routers will use their Router ID as
++ a tie breaker."
++ DEFVAL { 1 }
++ ::= { ospfIfEntry 6 }
++
++
++ ospfIfTransitDelay OBJECT-TYPE
++ SYNTAX UpToMaxAge
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The estimated number of seconds it takes to
++ transmit a link state update packet over this
++ interface."
++ DEFVAL { 1 }
++ ::= { ospfIfEntry 7 }
++
++
++ ospfIfRetransInterval OBJECT-TYPE
++ SYNTAX UpToMaxAge
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The number of seconds between link-state ad-
++ vertisement retransmissions, for adjacencies
++ belonging to this interface. This value is
++ also used when retransmitting database descrip-
++ tion and link-state request packets."
++ DEFVAL { 5 }
++ ::= { ospfIfEntry 8 }
++
++
++ ospfIfHelloInterval OBJECT-TYPE
++ SYNTAX HelloRange
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The length of time, in seconds, between the
++ Hello packets that the router sends on the in-
++ terface. This value must be the same for all
++ routers attached to a common network."
++ DEFVAL { 10 }
++ ::= { ospfIfEntry 9 }
++
++
++ ospfIfRtrDeadInterval OBJECT-TYPE
++ SYNTAX PositiveInteger
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The number of seconds that a router's Hello
++ packets have not been seen before it's neigh-
++ bors declare the router down. This should be
++ some multiple of the Hello interval. This
++ value must be the same for all routers attached
++ to a common network."
++ DEFVAL { 40 }
++ ::= { ospfIfEntry 10 }
++
++
++ ospfIfPollInterval OBJECT-TYPE
++ SYNTAX PositiveInteger
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The larger time interval, in seconds, between
++ the Hello packets sent to an inactive non-
++ broadcast multi- access neighbor."
++ DEFVAL { 120 }
++ ::= { ospfIfEntry 11 }
++
++
++ ospfIfState OBJECT-TYPE
++ SYNTAX INTEGER {
++ down (1),
++ loopback (2),
++ waiting (3),
++ pointToPoint (4),
++ designatedRouter (5),
++ backupDesignatedRouter (6),
++ otherDesignatedRouter (7)
++ }
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The OSPF Interface State."
++ DEFVAL { down }
++ ::= { ospfIfEntry 12 }
++
++
++ ospfIfDesignatedRouter OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The IP Address of the Designated Router."
++ DEFVAL { '00000000'H } -- 0.0.0.0
++ ::= { ospfIfEntry 13 }
++
++
++ ospfIfBackupDesignatedRouter OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The IP Address of the Backup Designated
++ Router."
++ DEFVAL { '00000000'H } -- 0.0.0.0
++ ::= { ospfIfEntry 14 }
++
++ ospfIfEvents OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The number of times this OSPF interface has
++ changed its state, or an error has occurred."
++ ::= { ospfIfEntry 15 }
++
++
++ ospfIfAuthKey OBJECT-TYPE
++ SYNTAX OCTET STRING (SIZE (0..256))
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The Authentication Key. If the Area's Author-
++ ization Type is simplePassword, and the key
++ length is shorter than 8 octets, the agent will
++ left adjust and zero fill to 8 octets.
++
++ Note that unauthenticated interfaces need no
++ authentication key, and simple password authen-
++ tication cannot use a key of more than 8 oc-
++ tets. Larger keys are useful only with authen-
++ tication mechanisms not specified in this docu-
++ ment.
++
++ When read, ospfIfAuthKey always returns an Oc-
++ tet String of length zero."
++ REFERENCE
++ "OSPF Version 2, Section 9 The Interface Data
++ Structure"
++ DEFVAL { '0000000000000000'H } -- 0.0.0.0.0.0.0.0
++ ::= { ospfIfEntry 16 }
++
++ ospfIfStatus OBJECT-TYPE
++ SYNTAX RowStatus
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "This variable displays the status of the en-
++ try. Setting it to 'invalid' has the effect of
++ rendering it inoperative. The internal effect
++ (row removal) is implementation dependent."
++ ::= { ospfIfEntry 17 }
++
++
++ ospfIfMulticastForwarding OBJECT-TYPE
++ SYNTAX INTEGER {
++ blocked (1), -- no multicast forwarding
++ multicast (2), -- using multicast address
++ unicast (3) -- to each OSPF neighbor
++ }
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The way multicasts should forwarded on this
++ interface; not forwarded, forwarded as data
++ link multicasts, or forwarded as data link uni-
++ casts. Data link multicasting is not meaning-
++ ful on point to point and NBMA interfaces, and
++ setting ospfMulticastForwarding to 0 effective-
++ ly disables all multicast forwarding."
++ DEFVAL { blocked }
++ ::= { ospfIfEntry 18 }
++
++
++ ospfIfDemand OBJECT-TYPE
++ SYNTAX TruthValue
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "Indicates whether Demand OSPF procedures (hel-
++ lo supression to FULL neighbors and setting the
++ DoNotAge flag on proogated LSAs) should be per-
++ formed on this interface."
++ DEFVAL { false }
++ ::= { ospfIfEntry 19 }
++
++
++ ospfIfAuthType OBJECT-TYPE
++ SYNTAX INTEGER (0..255)
++ -- none (0),
++ -- simplePassword (1)
++ -- md5 (2)
++ -- reserved for specification by IANA (> 2)
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The authentication type specified for an in-
++ terface. Additional authentication types may
++ be assigned locally."
++ REFERENCE
++ "OSPF Version 2, Appendix E Authentication"
++ DEFVAL { 0 } -- no authentication, by default
++ ::= { ospfIfEntry 20 }
++
++
++-- OSPF Interface Metric Table
++
++-- The Metric Table describes the metrics to be advertised
++-- for a specified interface at the various types of service.
++-- As such, this table is an adjunct of the OSPF Interface
++-- Table.
++
++-- Types of service, as defined by RFC 791, have the ability
++-- to request low delay, high bandwidth, or reliable linkage.
++
++-- For the purposes of this specification, the measure of
++-- bandwidth
++
++-- Metric = 10^8 / ifSpeed
++
++-- is the default value. For multiple link interfaces, note
++-- that ifSpeed is the sum of the individual link speeds.
++-- This yields a number having the following typical values:
++
++-- Network Type/bit rate Metric
++
++-- >= 100 MBPS 1
++-- Ethernet/802.3 10
++-- E1 48
++-- T1 (ESF) 65
++-- 64 KBPS 1562
++-- 56 KBPS 1785
++-- 19.2 KBPS 5208
++-- 9.6 KBPS 10416
++
++-- Routes that are not specified use the default (TOS 0) metric
++
++ ospfIfMetricTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF OspfIfMetricEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "The TOS metrics for a non-virtual interface
++ identified by the interface index."
++ REFERENCE
++ "OSPF Version 2, Appendix C.3 Router interface
++ parameters"
++ ::= { ospf 8 }
++
++ ospfIfMetricEntry OBJECT-TYPE
++ SYNTAX OspfIfMetricEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "A particular TOS metric for a non-virtual in-
++ terface identified by the interface index."
++ REFERENCE
++ "OSPF Version 2, Appendix C.3 Router interface
++ parameters"
++ INDEX { ospfIfMetricIpAddress,
++ ospfIfMetricAddressLessIf,
++ ospfIfMetricTOS }
++ ::= { ospfIfMetricTable 1 }
++
++OspfIfMetricEntry ::=
++ SEQUENCE {
++ ospfIfMetricIpAddress
++ IpAddress,
++ ospfIfMetricAddressLessIf
++ Integer32,
++ ospfIfMetricTOS
++ TOSType,
++ ospfIfMetricValue
++ Metric,
++ ospfIfMetricStatus
++ RowStatus
++ }
++
++ ospfIfMetricIpAddress OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The IP address of this OSPF interface. On row
++ creation, this can be derived from the in-
++ stance."
++ ::= { ospfIfMetricEntry 1 }
++
++ ospfIfMetricAddressLessIf OBJECT-TYPE
++ SYNTAX Integer32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "For the purpose of easing the instancing of
++ addressed and addressless interfaces; This
++ variable takes the value 0 on interfaces with
++ IP Addresses, and the value of ifIndex for in-
++ terfaces having no IP Address. On row crea-
++ tion, this can be derived from the instance."
++ ::= { ospfIfMetricEntry 2 }
++
++
++ ospfIfMetricTOS OBJECT-TYPE
++ SYNTAX TOSType
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The type of service metric being referenced.
++ On row creation, this can be derived from the
++ instance."
++ ::= { ospfIfMetricEntry 3 }
++
++
++ ospfIfMetricValue OBJECT-TYPE
++ SYNTAX Metric
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The metric of using this type of service on
++ this interface. The default value of the TOS 0
++ Metric is 10^8 / ifSpeed."
++ ::= { ospfIfMetricEntry 4 }
++
++ ospfIfMetricStatus OBJECT-TYPE
++ SYNTAX RowStatus
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "This variable displays the status of the en-
++ try. Setting it to 'invalid' has the effect of
++ rendering it inoperative. The internal effect
++ (row removal) is implementation dependent."
++ ::= { ospfIfMetricEntry 5 }
++
++
++-- OSPF Virtual Interface Table
++
++-- The Virtual Interface Table describes the virtual
++-- links that the OSPF Process is configured to
++-- carry on.
++
++ ospfVirtIfTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF OspfVirtIfEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "Information about this router's virtual inter-
++ faces."
++ REFERENCE
++ "OSPF Version 2, Appendix C.4 Virtual link
++ parameters"
++ ::= { ospf 9 }
++
++
++ ospfVirtIfEntry OBJECT-TYPE
++ SYNTAX OspfVirtIfEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "Information about a single Virtual Interface."
++ INDEX { ospfVirtIfAreaId, ospfVirtIfNeighbor }
++ ::= { ospfVirtIfTable 1 }
++
++OspfVirtIfEntry ::=
++ SEQUENCE {
++ ospfVirtIfAreaId
++ AreaID,
++ ospfVirtIfNeighbor
++ RouterID,
++ ospfVirtIfTransitDelay
++ UpToMaxAge,
++ ospfVirtIfRetransInterval
++ UpToMaxAge,
++ ospfVirtIfHelloInterval
++ HelloRange,
++ ospfVirtIfRtrDeadInterval
++ PositiveInteger,
++ ospfVirtIfState
++ INTEGER,
++ ospfVirtIfEvents
++ Counter32,
++ ospfVirtIfAuthType
++ INTEGER,
++ ospfVirtIfAuthKey
++ OCTET STRING,
++ ospfVirtIfStatus
++ RowStatus
++ }
++
++ ospfVirtIfAreaId OBJECT-TYPE
++ SYNTAX AreaID
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The Transit Area that the Virtual Link
++ traverses. By definition, this is not 0.0.0.0"
++ ::= { ospfVirtIfEntry 1 }
++
++
++ ospfVirtIfNeighbor OBJECT-TYPE
++ SYNTAX RouterID
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The Router ID of the Virtual Neighbor."
++ ::= { ospfVirtIfEntry 2 }
++
++
++ ospfVirtIfTransitDelay OBJECT-TYPE
++ SYNTAX UpToMaxAge
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The estimated number of seconds it takes to
++ transmit a link- state update packet over this
++ interface."
++ DEFVAL { 1 }
++ ::= { ospfVirtIfEntry 3 }
++
++
++ ospfVirtIfRetransInterval OBJECT-TYPE
++ SYNTAX UpToMaxAge
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The number of seconds between link-state ad-
++ vertisement retransmissions, for adjacencies
++ belonging to this interface. This value is
++ also used when retransmitting database descrip-
++ tion and link-state request packets. This
++ value should be well over the expected round-
++ trip time."
++ DEFVAL { 5 }
++ ::= { ospfVirtIfEntry 4 }
++
++
++ ospfVirtIfHelloInterval OBJECT-TYPE
++ SYNTAX HelloRange
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The length of time, in seconds, between the
++ Hello packets that the router sends on the in-
++ terface. This value must be the same for the
++ virtual neighbor."
++ DEFVAL { 10 }
++ ::= { ospfVirtIfEntry 5 }
++
++
++ ospfVirtIfRtrDeadInterval OBJECT-TYPE
++ SYNTAX PositiveInteger
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The number of seconds that a router's Hello
++ packets have not been seen before it's neigh-
++ bors declare the router down. This should be
++ some multiple of the Hello interval. This
++ value must be the same for the virtual neigh-
++ bor."
++ DEFVAL { 60 }
++ ::= { ospfVirtIfEntry 6 }
++
++
++ ospfVirtIfState OBJECT-TYPE
++ SYNTAX INTEGER {
++ down (1), -- these use the same encoding
++ pointToPoint (4) -- as the ospfIfTable
++ }
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "OSPF virtual interface states."
++ DEFVAL { down }
++ ::= { ospfVirtIfEntry 7 }
++
++
++ ospfVirtIfEvents OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The number of state changes or error events on
++ this Virtual Link"
++ ::= { ospfVirtIfEntry 8 }
++
++
++ ospfVirtIfAuthKey OBJECT-TYPE
++ SYNTAX OCTET STRING (SIZE(0..256))
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "If Authentication Type is simplePassword, the
++ device will left adjust and zero fill to 8 oc-
++ tets.
++
++ Note that unauthenticated interfaces need no
++ authentication key, and simple password authen-
++ tication cannot use a key of more than 8 oc-
++ tets. Larger keys are useful only with authen-
++ tication mechanisms not specified in this docu-
++ ment.
++
++ When read, ospfVifAuthKey always returns a
++ string of length zero."
++ REFERENCE
++ "OSPF Version 2, Section 9 The Interface Data
++ Structure"
++ DEFVAL { '0000000000000000'H } -- 0.0.0.0.0.0.0.0
++ ::= { ospfVirtIfEntry 9 }
++
++
++ ospfVirtIfStatus OBJECT-TYPE
++ SYNTAX RowStatus
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "This variable displays the status of the en-
++ try. Setting it to 'invalid' has the effect of
++ rendering it inoperative. The internal effect
++ (row removal) is implementation dependent."
++ ::= { ospfVirtIfEntry 10 }
++
++
++ ospfVirtIfAuthType OBJECT-TYPE
++ SYNTAX INTEGER (0..255)
++ -- none (0),
++ -- simplePassword (1)
++ -- md5 (2)
++ -- reserved for specification by IANA (> 2)
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The authentication type specified for a virtu-
++ al interface. Additional authentication types
++ may be assigned locally."
++ REFERENCE
++ "OSPF Version 2, Appendix E Authentication"
++ DEFVAL { 0 } -- no authentication, by default
++ ::= { ospfVirtIfEntry 11 }
++
++
++-- OSPF Neighbor Table
++
++-- The OSPF Neighbor Table describes all neighbors in
++-- the locality of the subject router.
++
++ ospfNbrTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF OspfNbrEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "A table of non-virtual neighbor information."
++ REFERENCE
++ "OSPF Version 2, Section 10 The Neighbor Data
++ Structure"
++ ::= { ospf 10 }
++
++
++ ospfNbrEntry OBJECT-TYPE
++ SYNTAX OspfNbrEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "The information regarding a single neighbor."
++ REFERENCE
++ "OSPF Version 2, Section 10 The Neighbor Data
++ Structure"
++ INDEX { ospfNbrIpAddr, ospfNbrAddressLessIndex }
++ ::= { ospfNbrTable 1 }
++
++OspfNbrEntry ::=
++ SEQUENCE {
++ ospfNbrIpAddr
++ IpAddress,
++ ospfNbrAddressLessIndex
++ InterfaceIndex,
++ ospfNbrRtrId
++ RouterID,
++ ospfNbrOptions
++ Integer32,
++ ospfNbrPriority
++ DesignatedRouterPriority,
++ ospfNbrState
++ INTEGER,
++ ospfNbrEvents
++ Counter32,
++ ospfNbrLsRetransQLen
++ Gauge32,
++ ospfNbmaNbrStatus
++ RowStatus,
++ ospfNbmaNbrPermanence
++ INTEGER,
++ ospfNbrHelloSuppressed
++ TruthValue
++ }
++
++ ospfNbrIpAddr OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The IP address this neighbor is using in its
++ IP Source Address. Note that, on addressless
++ links, this will not be 0.0.0.0, but the ad-
++ dress of another of the neighbor's interfaces."
++ ::= { ospfNbrEntry 1 }
++
++
++ ospfNbrAddressLessIndex OBJECT-TYPE
++ SYNTAX InterfaceIndex
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "On an interface having an IP Address, zero.
++ On addressless interfaces, the corresponding
++ value of ifIndex in the Internet Standard MIB.
++ On row creation, this can be derived from the
++ instance."
++ ::= { ospfNbrEntry 2 }
++
++
++ ospfNbrRtrId OBJECT-TYPE
++ SYNTAX RouterID
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "A 32-bit integer (represented as a type IpAd-
++ dress) uniquely identifying the neighboring
++ router in the Autonomous System."
++ DEFVAL { '00000000'H } -- 0.0.0.0
++ ::= { ospfNbrEntry 3 }
++
++
++ ospfNbrOptions OBJECT-TYPE
++ SYNTAX Integer32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "A Bit Mask corresponding to the neighbor's op-
++ tions field.
++
++ Bit 0, if set, indicates that the system will
++ operate on Type of Service metrics other than
++ TOS 0. If zero, the neighbor will ignore all
++ metrics except the TOS 0 metric.
++
++ Bit 1, if set, indicates that the associated
++ area accepts and operates on external informa-
++ tion; if zero, it is a stub area.
++
++ Bit 2, if set, indicates that the system is ca-
++ pable of routing IP Multicast datagrams; i.e.,
++ that it implements the Multicast Extensions to
++ OSPF.
++
++ Bit 3, if set, indicates that the associated
++ area is an NSSA. These areas are capable of
++ carrying type 7 external advertisements, which
++ are translated into type 5 external advertise-
++ ments at NSSA borders."
++ REFERENCE
++ "OSPF Version 2, Section 12.1.2 Options"
++ DEFVAL { 0 }
++ ::= { ospfNbrEntry 4 }
++
++
++ ospfNbrPriority OBJECT-TYPE
++ SYNTAX DesignatedRouterPriority
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The priority of this neighbor in the designat-
++ ed router election algorithm. The value 0 sig-
++ nifies that the neighbor is not eligible to be-
++ come the designated router on this particular
++ network."
++ DEFVAL { 1 }
++ ::= { ospfNbrEntry 5 }
++
++
++ ospfNbrState OBJECT-TYPE
++ SYNTAX INTEGER {
++ down (1),
++ attempt (2),
++ init (3),
++ twoWay (4),
++ exchangeStart (5),
++ exchange (6),
++ loading (7),
++ full (8)
++ }
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The State of the relationship with this Neigh-
++ bor."
++ REFERENCE
++ "OSPF Version 2, Section 10.1 Neighbor States"
++ DEFVAL { down }
++ ::= { ospfNbrEntry 6 }
++
++
++ ospfNbrEvents OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The number of times this neighbor relationship
++ has changed state, or an error has occurred."
++ ::= { ospfNbrEntry 7 }
++
++
++ ospfNbrLsRetransQLen OBJECT-TYPE
++ SYNTAX Gauge32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The current length of the retransmission
++ queue."
++ ::= { ospfNbrEntry 8 }
++
++
++ ospfNbmaNbrStatus OBJECT-TYPE
++ SYNTAX RowStatus
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "This variable displays the status of the en-
++ try. Setting it to 'invalid' has the effect of
++ rendering it inoperative. The internal effect
++ (row removal) is implementation dependent."
++ ::= { ospfNbrEntry 9 }
++
++
++ ospfNbmaNbrPermanence OBJECT-TYPE
++ SYNTAX INTEGER {
++ dynamic (1), -- learned through protocol
++ permanent (2) -- configured address
++ }
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "This variable displays the status of the en-
++ try. 'dynamic' and 'permanent' refer to how
++ the neighbor became known."
++ DEFVAL { permanent }
++ ::= { ospfNbrEntry 10 }
++
++
++ ospfNbrHelloSuppressed OBJECT-TYPE
++ SYNTAX TruthValue
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "Indicates whether Hellos are being suppressed
++ to the neighbor"
++ ::= { ospfNbrEntry 11 }
++
++
++-- OSPF Virtual Neighbor Table
++
++-- This table describes all virtual neighbors.
++-- Since Virtual Links are configured in the
++-- virtual interface table, this table is read-only.
++
++ ospfVirtNbrTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF OspfVirtNbrEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "A table of virtual neighbor information."
++ REFERENCE
++ "OSPF Version 2, Section 15 Virtual Links"
++ ::= { ospf 11 }
++
++
++ ospfVirtNbrEntry OBJECT-TYPE
++ SYNTAX OspfVirtNbrEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "Virtual neighbor information."
++ INDEX { ospfVirtNbrArea, ospfVirtNbrRtrId }
++ ::= { ospfVirtNbrTable 1 }
++
++OspfVirtNbrEntry ::=
++ SEQUENCE {
++ ospfVirtNbrArea
++ AreaID,
++ ospfVirtNbrRtrId
++ RouterID,
++ ospfVirtNbrIpAddr
++ IpAddress,
++ ospfVirtNbrOptions
++ Integer32,
++ ospfVirtNbrState
++ INTEGER,
++ ospfVirtNbrEvents
++ Counter32,
++ ospfVirtNbrLsRetransQLen
++ Gauge32,
++ ospfVirtNbrHelloSuppressed
++ TruthValue
++ }
++
++ ospfVirtNbrArea OBJECT-TYPE
++ SYNTAX AreaID
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The Transit Area Identifier."
++ ::= { ospfVirtNbrEntry 1 }
++
++
++ ospfVirtNbrRtrId OBJECT-TYPE
++ SYNTAX RouterID
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "A 32-bit integer uniquely identifying the
++ neighboring router in the Autonomous System."
++ ::= { ospfVirtNbrEntry 2 }
++
++
++ ospfVirtNbrIpAddr OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The IP address this Virtual Neighbor is us-
++ ing."
++ ::= { ospfVirtNbrEntry 3 }
++
++
++ ospfVirtNbrOptions OBJECT-TYPE
++ SYNTAX Integer32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "A Bit Mask corresponding to the neighbor's op-
++ tions field.
++
++ Bit 1, if set, indicates that the system will
++ operate on Type of Service metrics other than
++ TOS 0. If zero, the neighbor will ignore all
++ metrics except the TOS 0 metric.
++
++ Bit 2, if set, indicates that the system is
++ Network Multicast capable; ie, that it imple-
++ ments OSPF Multicast Routing."
++ ::= { ospfVirtNbrEntry 4 }
++ ospfVirtNbrState OBJECT-TYPE
++ SYNTAX INTEGER {
++ down (1),
++ attempt (2),
++ init (3),
++ twoWay (4),
++ exchangeStart (5),
++ exchange (6),
++ loading (7),
++ full (8)
++ }
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The state of the Virtual Neighbor Relation-
++ ship."
++ ::= { ospfVirtNbrEntry 5 }
++
++
++ ospfVirtNbrEvents OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The number of times this virtual link has
++ changed its state, or an error has occurred."
++ ::= { ospfVirtNbrEntry 6 }
++
++
++ ospfVirtNbrLsRetransQLen OBJECT-TYPE
++ SYNTAX Gauge32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The current length of the retransmission
++ queue."
++ ::= { ospfVirtNbrEntry 7 }
++
++
++ ospfVirtNbrHelloSuppressed OBJECT-TYPE
++ SYNTAX TruthValue
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "Indicates whether Hellos are being suppressed
++ to the neighbor"
++ ::= { ospfVirtNbrEntry 8 }
++
++-- OSPF Link State Database, External
++
++-- The Link State Database contains the Link State
++-- Advertisements from throughout the areas that the
++-- device is attached to.
++
++-- This table is identical to the OSPF LSDB Table in
++-- format, but contains only External Link State
++-- Advertisements. The purpose is to allow external
++-- LSAs to be displayed once for the router rather
++-- than once in each non-stub area.
++
++ ospfExtLsdbTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF OspfExtLsdbEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "The OSPF Process's Links State Database."
++ REFERENCE
++ "OSPF Version 2, Section 12 Link State Adver-
++ tisements"
++ ::= { ospf 12 }
++
++
++ ospfExtLsdbEntry OBJECT-TYPE
++ SYNTAX OspfExtLsdbEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "A single Link State Advertisement."
++ INDEX { ospfExtLsdbType, ospfExtLsdbLsid, ospfExtLsdbRouterId }
++ ::= { ospfExtLsdbTable 1 }
++
++OspfExtLsdbEntry ::=
++ SEQUENCE {
++ ospfExtLsdbType
++ INTEGER,
++ ospfExtLsdbLsid
++ IpAddress,
++ ospfExtLsdbRouterId
++ RouterID,
++ ospfExtLsdbSequence
++ Integer32,
++ ospfExtLsdbAge
++ Integer32,
++ ospfExtLsdbChecksum
++ Integer32,
++ ospfExtLsdbAdvertisement
++ OCTET STRING
++ }
++
++ ospfExtLsdbType OBJECT-TYPE
++ SYNTAX INTEGER {
++ asExternalLink (5)
++ }
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The type of the link state advertisement.
++ Each link state type has a separate advertise-
++ ment format."
++ REFERENCE
++ "OSPF Version 2, Appendix A.4.1 The Link State
++ Advertisement header"
++ ::= { ospfExtLsdbEntry 1 }
++
++
++ ospfExtLsdbLsid OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The Link State ID is an LS Type Specific field
++ containing either a Router ID or an IP Address;
++ it identifies the piece of the routing domain
++ that is being described by the advertisement."
++ REFERENCE
++ "OSPF Version 2, Section 12.1.4 Link State ID"
++ ::= { ospfExtLsdbEntry 2 }
++
++
++ ospfExtLsdbRouterId OBJECT-TYPE
++ SYNTAX RouterID
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The 32 bit number that uniquely identifies the
++ originating router in the Autonomous System."
++ REFERENCE
++ "OSPF Version 2, Appendix C.1 Global parameters"
++ ::= { ospfExtLsdbEntry 3 }
++
++-- Note that the OSPF Sequence Number is a 32 bit signed
++-- integer. It starts with the value '80000001'h,
++-- or -'7FFFFFFF'h, and increments until '7FFFFFFF'h
++-- Thus, a typical sequence number will be very negative.
++ ospfExtLsdbSequence OBJECT-TYPE
++ SYNTAX Integer32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The sequence number field is a signed 32-bit
++ integer. It is used to detect old and dupli-
++ cate link state advertisements. The space of
++ sequence numbers is linearly ordered. The
++ larger the sequence number the more recent the
++ advertisement."
++ REFERENCE
++ "OSPF Version 2, Section 12.1.6 LS sequence
++ number"
++ ::= { ospfExtLsdbEntry 4 }
++
++
++ ospfExtLsdbAge OBJECT-TYPE
++ SYNTAX Integer32 -- Should be 0..MaxAge
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "This field is the age of the link state adver-
++ tisement in seconds."
++ REFERENCE
++ "OSPF Version 2, Section 12.1.1 LS age"
++ ::= { ospfExtLsdbEntry 5 }
++
++
++ ospfExtLsdbChecksum OBJECT-TYPE
++ SYNTAX Integer32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "This field is the checksum of the complete
++ contents of the advertisement, excepting the
++ age field. The age field is excepted so that
++ an advertisement's age can be incremented
++ without updating the checksum. The checksum
++ used is the same that is used for ISO connec-
++ tionless datagrams; it is commonly referred to
++ as the Fletcher checksum."
++ REFERENCE
++ "OSPF Version 2, Section 12.1.7 LS checksum"
++ ::= { ospfExtLsdbEntry 6 }
++
++
++ ospfExtLsdbAdvertisement OBJECT-TYPE
++ SYNTAX OCTET STRING (SIZE(36))
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The entire Link State Advertisement, including
++ its header."
++ REFERENCE
++ "OSPF Version 2, Section 12 Link State Adver-
++ tisements"
++ ::= { ospfExtLsdbEntry 7 }
++
++
++-- OSPF Use of the CIDR Route Table
++
++ospfRouteGroup OBJECT IDENTIFIER ::= { ospf 13 }
++
++-- The IP Forwarding Table defines a number of objects for use by
++-- the routing protocol to externalize its information. Most of
++-- the variables (ipForwardDest, ipForwardMask, ipForwardPolicy,
++-- ipForwardNextHop, ipForwardIfIndex, ipForwardType,
++-- ipForwardProto, ipForwardAge, and ipForwardNextHopAS) are
++-- defined there.
++
++-- Those that leave some discretion are defined here.
++
++-- ipCidrRouteProto is, of course, ospf (13).
++
++-- ipCidrRouteAge is the time since the route was first calculated,
++-- as opposed to the time since the last SPF run.
++
++-- ipCidrRouteInfo is an OBJECT IDENTIFIER for use by the routing
++-- protocol. The following values shall be found there depending
++-- on the way the route was calculated.
++
++ospfIntraArea OBJECT IDENTIFIER ::= { ospfRouteGroup 1 }
++ospfInterArea OBJECT IDENTIFIER ::= { ospfRouteGroup 2 }
++ospfExternalType1 OBJECT IDENTIFIER ::= { ospfRouteGroup 3 }
++ospfExternalType2 OBJECT IDENTIFIER ::= { ospfRouteGroup 4 }
++
++-- ipCidrRouteMetric1 is, by definition, the primary routing
++-- metric. Therefore, it should be the metric that route
++-- selection is based on. For intra-area and inter-area routes,
++-- it is an OSPF metric. For External Type 1 (comparable value)
++-- routes, it is an OSPF metric plus the External Metric. For
++-- external Type 2 (non-comparable value) routes, it is the
++-- external metric.
++
++-- ipCidrRouteMetric2 is, by definition, a secondary routing
++-- metric. Therefore, it should be the metric that breaks a tie
++-- among routes having equal metric1 values and the same
++-- calculation rule. For intra-area, inter-area routes, and
++-- External Type 1 (comparable value) routes, it is unused. For
++-- external Type 2 (non-comparable value) routes, it is the metric
++-- to the AS border router.
++
++-- ipCidrRouteMetric3, ipCidrRouteMetric4, and ipCidrRouteMetric5 are
++-- unused.
++
++--
++-- The OSPF Area Aggregate Table
++--
++-- This table replaces the OSPF Area Summary Table, being an
++-- extension of that for CIDR routers.
++
++ ospfAreaAggregateTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF OspfAreaAggregateEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "A range of IP addresses specified by an IP
++ address/IP network mask pair. For example,
++ class B address range of X.X.X.X with a network
++ mask of 255.255.0.0 includes all IP addresses
++ from X.X.0.0 to X.X.255.255. Note that if
++ ranges are configured such that one range sub-
++ sumes another range (e.g., 10.0.0.0 mask
++ 255.0.0.0 and 10.1.0.0 mask 255.255.0.0), the
++ most specific match is the preferred one."
++ REFERENCE
++ "OSPF Version 2, Appendix C.2 Area parameters"
++ ::= { ospf 14 }
++
++
++ ospfAreaAggregateEntry OBJECT-TYPE
++ SYNTAX OspfAreaAggregateEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "A range of IP addresses specified by an IP
++ address/IP network mask pair. For example,
++ class B address range of X.X.X.X with a network
++ mask of 255.255.0.0 includes all IP addresses
++ from X.X.0.0 to X.X.255.255. Note that if
++ ranges are range configured such that one range
++ subsumes another range (e.g., 10.0.0.0 mask
++ 255.0.0.0 and 10.1.0.0 mask 255.255.0.0), the
++ most specific match is the preferred one."
++ REFERENCE
++ "OSPF Version 2, Appendix C.2 Area parameters"
++ INDEX { ospfAreaAggregateAreaID, ospfAreaAggregateLsdbType,
++ ospfAreaAggregateNet, ospfAreaAggregateMask }
++ ::= { ospfAreaAggregateTable 1 }
++
++
++OspfAreaAggregateEntry ::=
++ SEQUENCE {
++ ospfAreaAggregateAreaID
++ AreaID,
++ ospfAreaAggregateLsdbType
++ INTEGER,
++ ospfAreaAggregateNet
++ IpAddress,
++ ospfAreaAggregateMask
++ IpAddress,
++ ospfAreaAggregateStatus
++ RowStatus,
++ ospfAreaAggregateEffect
++ INTEGER
++ }
++
++ ospfAreaAggregateAreaID OBJECT-TYPE
++ SYNTAX AreaID
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The Area the Address Aggregate is to be found
++ within."
++ REFERENCE
++ "OSPF Version 2, Appendix C.2 Area parameters"
++ ::= { ospfAreaAggregateEntry 1 }
++
++
++ ospfAreaAggregateLsdbType OBJECT-TYPE
++ SYNTAX INTEGER {
++ summaryLink (3),
++ nssaExternalLink (7)
++ }
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The type of the Address Aggregate. This field
++ specifies the Lsdb type that this Address Ag-
++ gregate applies to."
++ REFERENCE
++ "OSPF Version 2, Appendix A.4.1 The Link State
++ Advertisement header"
++ ::= { ospfAreaAggregateEntry 2 }
++
++
++ ospfAreaAggregateNet OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The IP Address of the Net or Subnet indicated
++ by the range."
++ REFERENCE
++ "OSPF Version 2, Appendix C.2 Area parameters"
++ ::= { ospfAreaAggregateEntry 3 }
++
++
++ ospfAreaAggregateMask OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The Subnet Mask that pertains to the Net or
++ Subnet."
++ REFERENCE
++ "OSPF Version 2, Appendix C.2 Area parameters"
++ ::= { ospfAreaAggregateEntry 4 }
++
++
++ ospfAreaAggregateStatus OBJECT-TYPE
++ SYNTAX RowStatus
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "This variable displays the status of the en-
++ try. Setting it to 'invalid' has the effect of
++ rendering it inoperative. The internal effect
++ (row removal) is implementation dependent."
++ ::= { ospfAreaAggregateEntry 5 }
++
++
++ ospfAreaAggregateEffect OBJECT-TYPE
++ SYNTAX INTEGER {
++ advertiseMatching (1),
++ doNotAdvertiseMatching (2)
++ }
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "Subnets subsumed by ranges either trigger the
++ advertisement of the indicated aggregate (ad-
++ vertiseMatching), or result in the subnet's not
++ being advertised at all outside the area."
++ DEFVAL { advertiseMatching }
++ ::= { ospfAreaAggregateEntry 6 }
++
++
++-- conformance information
++
++ospfConformance OBJECT IDENTIFIER ::= { ospf 15 }
++
++ospfGroups OBJECT IDENTIFIER ::= { ospfConformance 1 }
++ospfCompliances OBJECT IDENTIFIER ::= { ospfConformance 2 }
++
++-- compliance statements
++
++ ospfCompliance MODULE-COMPLIANCE
++ STATUS current
++ DESCRIPTION
++ "The compliance statement "
++ MODULE -- this module
++ MANDATORY-GROUPS {
++ ospfBasicGroup,
++ ospfAreaGroup,
++ ospfStubAreaGroup,
++ ospfIfGroup,
++ ospfIfMetricGroup,
++ ospfVirtIfGroup,
++ ospfNbrGroup,
++ ospfVirtNbrGroup,
++ ospfAreaAggregateGroup
++ }
++ ::= { ospfCompliances 1 }
++
++
++-- units of conformance
++
++ ospfBasicGroup OBJECT-GROUP
++ OBJECTS {
++ ospfRouterId,
++ ospfAdminStat,
++ ospfVersionNumber,
++ ospfAreaBdrRtrStatus,
++ ospfASBdrRtrStatus,
++ ospfExternLsaCount,
++ ospfExternLsaCksumSum,
++ ospfTOSSupport,
++ ospfOriginateNewLsas,
++ ospfRxNewLsas,
++ ospfExtLsdbLimit,
++ ospfMulticastExtensions,
++ ospfExitOverflowInterval,
++ ospfDemandExtensions
++ }
++ STATUS current
++ DESCRIPTION
++ "These objects are required for OSPF systems."
++ ::= { ospfGroups 1 }
++
++
++ ospfAreaGroup OBJECT-GROUP
++ OBJECTS {
++ ospfAreaId,
++ ospfImportAsExtern,
++ ospfSpfRuns,
++ ospfAreaBdrRtrCount,
++ ospfAsBdrRtrCount,
++ ospfAreaLsaCount,
++ ospfAreaLsaCksumSum,
++ ospfAreaSummary,
++ ospfAreaStatus
++ }
++ STATUS current
++ DESCRIPTION
++ "These objects are required for OSPF systems
++ supporting areas."
++ ::= { ospfGroups 2 }
++
++
++ ospfStubAreaGroup OBJECT-GROUP
++ OBJECTS {
++ ospfStubAreaId,
++ ospfStubTOS,
++ ospfStubMetric,
++ ospfStubStatus,
++ ospfStubMetricType
++ }
++ STATUS current
++ DESCRIPTION
++ "These objects are required for OSPF systems
++ supporting stub areas."
++ ::= { ospfGroups 3 }
++
++
++ ospfLsdbGroup OBJECT-GROUP
++ OBJECTS {
++ ospfLsdbAreaId,
++ ospfLsdbType,
++ ospfLsdbLsid,
++ ospfLsdbRouterId,
++ ospfLsdbSequence,
++ ospfLsdbAge,
++ ospfLsdbChecksum,
++ ospfLsdbAdvertisement
++ }
++ STATUS current
++ DESCRIPTION
++ "These objects are required for OSPF systems
++ that display their link state database."
++ ::= { ospfGroups 4 }
++
++
++ ospfAreaRangeGroup OBJECT-GROUP
++ OBJECTS {
++ ospfAreaRangeAreaId,
++ ospfAreaRangeNet,
++ ospfAreaRangeMask,
++ ospfAreaRangeStatus,
++ ospfAreaRangeEffect
++ }
++ STATUS obsolete
++ DESCRIPTION
++ "These objects are required for non-CIDR OSPF
++ systems that support multiple areas."
++ ::= { ospfGroups 5 }
++
++
++ ospfHostGroup OBJECT-GROUP
++ OBJECTS {
++ ospfHostIpAddress,
++ ospfHostTOS,
++ ospfHostMetric,
++ ospfHostStatus,
++ ospfHostAreaID
++ }
++ STATUS current
++ DESCRIPTION
++ "These objects are required for OSPF systems
++ that support attached hosts."
++ ::= { ospfGroups 6 }
++
++
++ ospfIfGroup OBJECT-GROUP
++ OBJECTS {
++ ospfIfIpAddress,
++ ospfAddressLessIf,
++ ospfIfAreaId,
++ ospfIfType,
++ ospfIfAdminStat,
++ ospfIfRtrPriority,
++ ospfIfTransitDelay,
++ ospfIfRetransInterval,
++ ospfIfHelloInterval,
++ ospfIfRtrDeadInterval,
++ ospfIfPollInterval,
++ ospfIfState,
++ ospfIfDesignatedRouter,
++ ospfIfBackupDesignatedRouter,
++ ospfIfEvents,
++ ospfIfAuthType,
++ ospfIfAuthKey,
++ ospfIfStatus,
++ ospfIfMulticastForwarding,
++ ospfIfDemand
++ }
++ STATUS current
++ DESCRIPTION
++ "These objects are required for OSPF systems."
++ ::= { ospfGroups 7 }
++
++
++ ospfIfMetricGroup OBJECT-GROUP
++ OBJECTS {
++ ospfIfMetricIpAddress,
++ ospfIfMetricAddressLessIf,
++ ospfIfMetricTOS,
++ ospfIfMetricValue,
++ ospfIfMetricStatus
++ }
++ STATUS current
++ DESCRIPTION
++ "These objects are required for OSPF systems."
++ ::= { ospfGroups 8 }
++
++
++ ospfVirtIfGroup OBJECT-GROUP
++ OBJECTS {
++ ospfVirtIfAreaId,
++ ospfVirtIfNeighbor,
++ ospfVirtIfTransitDelay,
++ ospfVirtIfRetransInterval,
++ ospfVirtIfHelloInterval,
++ ospfVirtIfRtrDeadInterval,
++ ospfVirtIfState,
++ ospfVirtIfEvents,
++ ospfVirtIfAuthType,
++ ospfVirtIfAuthKey,
++ ospfVirtIfStatus
++ }
++ STATUS current
++ DESCRIPTION
++ "These objects are required for OSPF systems."
++ ::= { ospfGroups 9 }
++
++
++ ospfNbrGroup OBJECT-GROUP
++ OBJECTS {
++ ospfNbrIpAddr,
++ ospfNbrAddressLessIndex,
++ ospfNbrRtrId,
++ ospfNbrOptions,
++ ospfNbrPriority,
++ ospfNbrState,
++ ospfNbrEvents,
++ ospfNbrLsRetransQLen,
++ ospfNbmaNbrStatus,
++ ospfNbmaNbrPermanence,
++ ospfNbrHelloSuppressed
++ }
++ STATUS current
++ DESCRIPTION
++ "These objects are required for OSPF systems."
++ ::= { ospfGroups 10 }
++
++
++ ospfVirtNbrGroup OBJECT-GROUP
++ OBJECTS {
++ ospfVirtNbrArea,
++ ospfVirtNbrRtrId,
++ ospfVirtNbrIpAddr,
++ ospfVirtNbrOptions,
++ ospfVirtNbrState,
++ ospfVirtNbrEvents,
++ ospfVirtNbrLsRetransQLen,
++ ospfVirtNbrHelloSuppressed
++ }
++ STATUS current
++ DESCRIPTION
++ "These objects are required for OSPF systems."
++ ::= { ospfGroups 11 }
++
++
++ ospfExtLsdbGroup OBJECT-GROUP
++ OBJECTS {
++ ospfExtLsdbType,
++ ospfExtLsdbLsid,
++ ospfExtLsdbRouterId,
++ ospfExtLsdbSequence,
++ ospfExtLsdbAge,
++ ospfExtLsdbChecksum,
++ ospfExtLsdbAdvertisement
++ }
++ STATUS current
++ DESCRIPTION
++ "These objects are required for OSPF systems
++ that display their link state database."
++ ::= { ospfGroups 12 }
++
++
++ ospfAreaAggregateGroup OBJECT-GROUP
++ OBJECTS {
++ ospfAreaAggregateAreaID,
++ ospfAreaAggregateLsdbType,
++ ospfAreaAggregateNet,
++ ospfAreaAggregateMask,
++ ospfAreaAggregateStatus,
++ ospfAreaAggregateEffect
++ }
++ STATUS current
++ DESCRIPTION
++ "These objects are required for OSPF systems."
++ ::= { ospfGroups 13 }
++
++END
+--- /dev/null
++++ b/mibs/OSPF-TRAP-MIB.txt
+@@ -0,0 +1,443 @@
++OSPF-TRAP-MIB DEFINITIONS ::= BEGIN
++
++ IMPORTS
++ MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE, IpAddress
++ FROM SNMPv2-SMI
++ MODULE-COMPLIANCE, OBJECT-GROUP
++ FROM SNMPv2-CONF
++ ospfRouterId, ospfIfIpAddress, ospfAddressLessIf, ospfIfState,
++ ospfVirtIfAreaId, ospfVirtIfNeighbor, ospfVirtIfState,
++ ospfNbrIpAddr, ospfNbrAddressLessIndex, ospfNbrRtrId,
++ ospfNbrState, ospfVirtNbrArea, ospfVirtNbrRtrId, ospfVirtNbrState,
++ ospfLsdbType, ospfLsdbLsid, ospfLsdbRouterId, ospfLsdbAreaId,
++ ospfExtLsdbLimit, ospf
++ FROM OSPF-MIB;
++
++ ospfTrap MODULE-IDENTITY
++ LAST-UPDATED "9501201225Z" -- Fri Jan 20 12:25:50 PST 1995
++ ORGANIZATION "IETF OSPF Working Group"
++ CONTACT-INFO
++ " Fred Baker
++ Postal: Cisco Systems
++ 519 Lado Drive
++ Santa Barbara, California 93111
++ Tel: +1 805 681 0115
++ E-Mail: fred@cisco.com
++
++ Rob Coltun
++ Postal: RainbowBridge Communications
++ Tel: (301) 340-9416
++ E-Mail: rcoltun@rainbow-bridge.com"
++ DESCRIPTION
++ "The MIB module to describe traps for the OSPF
++ Version 2 Protocol."
++ ::= { ospf 16 }
++
++-- Trap Support Objects
++
++-- The following are support objects for the OSPF traps.
++
++ospfTrapControl OBJECT IDENTIFIER ::= { ospfTrap 1 }
++ospfTraps OBJECT IDENTIFIER ::= { ospfTrap 2 }
++
++ ospfSetTrap OBJECT-TYPE
++ SYNTAX OCTET STRING (SIZE(4))
++ MAX-ACCESS read-write
++ STATUS current
++ DESCRIPTION
++ "A four-octet string serving as a bit map for
++ the trap events defined by the OSPF traps. This
++ object is used to enable and disable specific
++ OSPF traps where a 1 in the bit field
++ represents enabled. The right-most bit (least
++ significant) represents trap 0."
++ ::= { ospfTrapControl 1 }
++
++
++ ospfConfigErrorType OBJECT-TYPE
++ SYNTAX INTEGER {
++ badVersion (1),
++ areaMismatch (2),
++ unknownNbmaNbr (3), -- Router is Dr eligible
++ unknownVirtualNbr (4),
++ authTypeMismatch(5),
++ authFailure (6),
++ netMaskMismatch (7),
++ helloIntervalMismatch (8),
++ deadIntervalMismatch (9),
++ optionMismatch (10) }
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "Potential types of configuration conflicts.
++ Used by the ospfConfigError and ospfConfigVir-
++ tError traps."
++ ::= { ospfTrapControl 2 }
++
++
++ ospfPacketType OBJECT-TYPE
++ SYNTAX INTEGER {
++ hello (1),
++ dbDescript (2),
++ lsReq (3),
++ lsUpdate (4),
++ lsAck (5) }
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "OSPF packet types."
++ ::= { ospfTrapControl 3 }
++
++
++ ospfPacketSrc OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The IP address of an inbound packet that can-
++ not be identified by a neighbor instance."
++ ::= { ospfTrapControl 4 }
++
++
++-- Traps
++
++
++ ospfIfStateChange NOTIFICATION-TYPE
++ OBJECTS {
++ ospfRouterId, -- The originator of the trap
++ ospfIfIpAddress,
++ ospfAddressLessIf,
++ ospfIfState -- The new state
++ }
++ STATUS current
++ DESCRIPTION
++ "An ospfIfStateChange trap signifies that there
++ has been a change in the state of a non-virtual
++ OSPF interface. This trap should be generated
++ when the interface state regresses (e.g., goes
++ from Dr to Down) or progresses to a terminal
++ state (i.e., Point-to-Point, DR Other, Dr, or
++ Backup)."
++ ::= { ospfTraps 16 }
++
++
++ ospfVirtIfStateChange NOTIFICATION-TYPE
++ OBJECTS {
++ ospfRouterId, -- The originator of the trap
++ ospfVirtIfAreaId,
++ ospfVirtIfNeighbor,
++ ospfVirtIfState -- The new state
++ }
++ STATUS current
++ DESCRIPTION
++ "An ospfIfStateChange trap signifies that there
++ has been a change in the state of an OSPF vir-
++ tual interface.
++ This trap should be generated when the inter-
++ face state regresses (e.g., goes from Point-
++ to-Point to Down) or progresses to a terminal
++ state (i.e., Point-to-Point)."
++ ::= { ospfTraps 1 }
++
++
++ ospfNbrStateChange NOTIFICATION-TYPE
++ OBJECTS {
++ ospfRouterId, -- The originator of the trap
++ ospfNbrIpAddr,
++ ospfNbrAddressLessIndex,
++ ospfNbrRtrId,
++ ospfNbrState -- The new state
++ }
++ STATUS current
++ DESCRIPTION
++ "An ospfNbrStateChange trap signifies that
++ there has been a change in the state of a non-
++ virtual OSPF neighbor. This trap should be
++ generated when the neighbor state regresses
++ (e.g., goes from Attempt or Full to 1-Way or
++ Down) or progresses to a terminal state (e.g.,
++ 2-Way or Full). When an neighbor transitions
++ from or to Full on non-broadcast multi-access
++ and broadcast networks, the trap should be gen-
++ erated by the designated router. A designated
++ router transitioning to Down will be noted by
++ ospfIfStateChange."
++ ::= { ospfTraps 2 }
++
++
++ ospfVirtNbrStateChange NOTIFICATION-TYPE
++ OBJECTS {
++ ospfRouterId, -- The originator of the trap
++ ospfVirtNbrArea,
++ ospfVirtNbrRtrId,
++ ospfVirtNbrState -- The new state
++ }
++ STATUS current
++ DESCRIPTION
++ "An ospfIfStateChange trap signifies that there
++ has been a change in the state of an OSPF vir-
++ tual neighbor. This trap should be generated
++ when the neighbor state regresses (e.g., goes
++ from Attempt or Full to 1-Way or Down) or
++ progresses to a terminal state (e.g., Full)."
++ ::= { ospfTraps 3 }
++ ospfIfConfigError NOTIFICATION-TYPE
++ OBJECTS {
++ ospfRouterId, -- The originator of the trap
++ ospfIfIpAddress,
++ ospfAddressLessIf,
++ ospfPacketSrc, -- The source IP address
++ ospfConfigErrorType, -- Type of error
++ ospfPacketType
++ }
++ STATUS current
++ DESCRIPTION
++ "An ospfIfConfigError trap signifies that a
++ packet has been received on a non-virtual in-
++ terface from a router whose configuration
++ parameters conflict with this router's confi-
++ guration parameters. Note that the event op-
++ tionMismatch should cause a trap only if it
++ prevents an adjacency from forming."
++ ::= { ospfTraps 4 }
++
++
++ ospfVirtIfConfigError NOTIFICATION-TYPE
++ OBJECTS {
++ ospfRouterId, -- The originator of the trap
++ ospfVirtIfAreaId,
++ ospfVirtIfNeighbor,
++ ospfConfigErrorType, -- Type of error
++ ospfPacketType
++ }
++ STATUS current
++ DESCRIPTION
++ "An ospfConfigError trap signifies that a pack-
++ et has been received on a virtual interface
++ from a router whose configuration parameters
++ conflict with this router's configuration
++ parameters. Note that the event optionMismatch
++ should cause a trap only if it prevents an ad-
++ jacency from forming."
++ ::= { ospfTraps 5 }
++
++
++ ospfIfAuthFailure NOTIFICATION-TYPE
++ OBJECTS {
++ ospfRouterId, -- The originator of the trap
++ ospfIfIpAddress,
++ ospfAddressLessIf,
++ ospfPacketSrc, -- The source IP address
++ ospfConfigErrorType, -- authTypeMismatch or
++ -- authFailure
++ ospfPacketType
++ }
++ STATUS current
++ DESCRIPTION
++ "An ospfIfAuthFailure trap signifies that a
++ packet has been received on a non-virtual in-
++ terface from a router whose authentication key
++ or authentication type conflicts with this
++ router's authentication key or authentication
++ type."
++ ::= { ospfTraps 6 }
++
++
++ ospfVirtIfAuthFailure NOTIFICATION-TYPE
++ OBJECTS {
++ ospfRouterId, -- The originator of the trap
++ ospfVirtIfAreaId,
++ ospfVirtIfNeighbor,
++ ospfConfigErrorType, -- authTypeMismatch or
++ -- authFailure
++ ospfPacketType
++ }
++ STATUS current
++ DESCRIPTION
++ "An ospfVirtIfAuthFailure trap signifies that a
++ packet has been received on a virtual interface
++ from a router whose authentication key or au-
++ thentication type conflicts with this router's
++ authentication key or authentication type."
++ ::= { ospfTraps 7 }
++
++
++ ospfIfRxBadPacket NOTIFICATION-TYPE
++ OBJECTS {
++ ospfRouterId, -- The originator of the trap
++ ospfIfIpAddress,
++ ospfAddressLessIf,
++ ospfPacketSrc, -- The source IP address
++ ospfPacketType
++ }
++ STATUS current
++ DESCRIPTION
++ "An ospfIfRxBadPacket trap signifies that an
++ OSPF packet has been received on a non-virtual
++ interface that cannot be parsed."
++ ::= { ospfTraps 8 }
++
++ ospfVirtIfRxBadPacket NOTIFICATION-TYPE
++ OBJECTS {
++ ospfRouterId, -- The originator of the trap
++ ospfVirtIfAreaId,
++ ospfVirtIfNeighbor,
++ ospfPacketType
++ }
++ STATUS current
++ DESCRIPTION
++ "An ospfRxBadPacket trap signifies that an OSPF
++ packet has been received on a virtual interface
++ that cannot be parsed."
++ ::= { ospfTraps 9 }
++
++
++ ospfTxRetransmit NOTIFICATION-TYPE
++ OBJECTS {
++ ospfRouterId, -- The originator of the trap
++ ospfIfIpAddress,
++ ospfAddressLessIf,
++ ospfNbrRtrId, -- Destination
++ ospfPacketType,
++ ospfLsdbType,
++ ospfLsdbLsid,
++ ospfLsdbRouterId
++ }
++ STATUS current
++ DESCRIPTION
++ "An ospfTxRetransmit trap signifies than an
++ OSPF packet has been retransmitted on a non-
++ virtual interface. All packets that may be re-
++ transmitted are associated with an LSDB entry.
++ The LS type, LS ID, and Router ID are used to
++ identify the LSDB entry."
++ ::= { ospfTraps 10 }
++
++
++ ospfVirtIfTxRetransmit NOTIFICATION-TYPE
++ OBJECTS {
++ ospfRouterId, -- The originator of the trap
++ ospfVirtIfAreaId,
++ ospfVirtIfNeighbor,
++ ospfPacketType,
++ ospfLsdbType,
++ ospfLsdbLsid,
++ ospfLsdbRouterId
++ }
++ STATUS current
++ DESCRIPTION
++ "An ospfTxRetransmit trap signifies than an
++ OSPF packet has been retransmitted on a virtual
++ interface. All packets that may be retransmit-
++ ted are associated with an LSDB entry. The LS
++ type, LS ID, and Router ID are used to identify
++ the LSDB entry."
++ ::= { ospfTraps 11 }
++
++
++ ospfOriginateLsa NOTIFICATION-TYPE
++ OBJECTS {
++ ospfRouterId, -- The originator of the trap
++ ospfLsdbAreaId, -- 0.0.0.0 for AS Externals
++ ospfLsdbType,
++ ospfLsdbLsid,
++ ospfLsdbRouterId
++ }
++ STATUS current
++ DESCRIPTION
++ "An ospfOriginateLsa trap signifies that a new
++ LSA has been originated by this router. This
++ trap should not be invoked for simple refreshes
++ of LSAs (which happesn every 30 minutes), but
++ instead will only be invoked when an LSA is
++ (re)originated due to a topology change. Addi-
++ tionally, this trap does not include LSAs that
++ are being flushed because they have reached
++ MaxAge."
++ ::= { ospfTraps 12 }
++
++
++ ospfMaxAgeLsa NOTIFICATION-TYPE
++ OBJECTS {
++ ospfRouterId, -- The originator of the trap
++ ospfLsdbAreaId, -- 0.0.0.0 for AS Externals
++ ospfLsdbType,
++ ospfLsdbLsid,
++ ospfLsdbRouterId
++ }
++ STATUS current
++ DESCRIPTION
++ "An ospfMaxAgeLsa trap signifies that one of
++ the LSA in the router's link-state database has
++ aged to MaxAge."
++ ::= { ospfTraps 13 }
++
++
++ ospfLsdbOverflow NOTIFICATION-TYPE
++ OBJECTS {
++ ospfRouterId, -- The originator of the trap
++ ospfExtLsdbLimit
++ }
++ STATUS current
++ DESCRIPTION
++ "An ospfLsdbOverflow trap signifies that the
++ number of LSAs in the router's link-state data-
++ base has exceeded ospfExtLsdbLimit."
++ ::= { ospfTraps 14 }
++
++
++ ospfLsdbApproachingOverflow NOTIFICATION-TYPE
++ OBJECTS {
++ ospfRouterId, -- The originator of the trap
++ ospfExtLsdbLimit
++ }
++ STATUS current
++ DESCRIPTION
++ "An ospfLsdbApproachingOverflow trap signifies
++ that the number of LSAs in the router's link-
++ state database has exceeded ninety percent of
++ ospfExtLsdbLimit."
++ ::= { ospfTraps 15 }
++
++
++-- conformance information
++
++ospfTrapConformance OBJECT IDENTIFIER ::= { ospfTrap 3 }
++
++ospfTrapGroups OBJECT IDENTIFIER ::= { ospfTrapConformance 1 }
++ospfTrapCompliances OBJECT IDENTIFIER ::= { ospfTrapConformance 2 }
++
++-- compliance statements
++
++ ospfTrapCompliance MODULE-COMPLIANCE
++ STATUS current
++ DESCRIPTION
++ "The compliance statement "
++ MODULE -- this module
++ MANDATORY-GROUPS { ospfTrapControlGroup }
++
++
++ GROUP ospfTrapControlGroup
++ DESCRIPTION
++ "This group is optional but recommended for all
++ OSPF systems"
++ ::= { ospfTrapCompliances 1 }
++
++
++-- units of conformance
++
++ ospfTrapControlGroup OBJECT-GROUP
++ OBJECTS {
++ ospfSetTrap,
++ ospfConfigErrorType,
++ ospfPacketType,
++ ospfPacketSrc
++ }
++ STATUS current
++ DESCRIPTION
++ "These objects are required to control traps
++ from OSPF systems."
++ ::= { ospfTrapGroups 1 }
++
++
++END
+--- /dev/null
++++ b/mibs/RIPv2-MIB.txt
+@@ -0,0 +1,530 @@
++ RIPv2-MIB DEFINITIONS ::= BEGIN
++
++ IMPORTS
++ MODULE-IDENTITY, OBJECT-TYPE, Counter32,
++ TimeTicks, IpAddress FROM SNMPv2-SMI
++ TEXTUAL-CONVENTION, RowStatus FROM SNMPv2-TC
++ MODULE-COMPLIANCE, OBJECT-GROUP FROM SNMPv2-CONF
++ mib-2 FROM RFC1213-MIB;
++
++ -- This MIB module uses the extended OBJECT-TYPE macro as
++ -- defined in [9].
++
++ rip2 MODULE-IDENTITY
++ LAST-UPDATED "9407272253Z" -- Wed Jul 27 22:53:04 PDT 1994
++ ORGANIZATION "IETF RIP-II Working Group"
++ CONTACT-INFO
++ " Fred Baker
++ Postal: Cisco Systems
++ 519 Lado Drive
++ Santa Barbara, California 93111
++ Tel: +1 805 681 0115
++ E-Mail: fbaker@cisco.com
++
++ Postal: Gary Malkin
++ Xylogics, Inc.
++ 53 Third Avenue
++ Burlington, MA 01803
++
++ Phone: (617) 272-8140
++ EMail: gmalkin@Xylogics.COM"
++ DESCRIPTION
++ "The MIB module to describe the RIP2 Version 2 Protocol"
++ ::= { mib-2 23 }
++
++ -- RIP-2 Management Information Base
++
++ -- the RouteTag type represents the contents of the
++ -- Route Domain field in the packet header or route entry.
++ -- The use of the Route Domain is deprecated.
++
++ RouteTag ::= TEXTUAL-CONVENTION
++ STATUS current
++ DESCRIPTION
++ "the RouteTag type represents the contents of the Route Domain
++ field in the packet header or route entry"
++ SYNTAX OCTET STRING (SIZE (2))
++
++--4.1 Global Counters
++
++-- The RIP-2 Globals Group.
++-- Implementation of this group is mandatory for systems
++-- which implement RIP-2.
++
++-- These counters are intended to facilitate debugging quickly
++-- changing routes or failing neighbors
++
++rip2Globals OBJECT IDENTIFIER ::= { rip2 1 }
++
++ rip2GlobalRouteChanges OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The number of route changes made to the IP Route
++ Database by RIP. This does not include the refresh
++ of a route's age."
++ ::= { rip2Globals 1 }
++
++ rip2GlobalQueries OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The number of responses sent to RIP queries
++ from other systems."
++ ::= { rip2Globals 2 }
++
++--4.2 RIP Interface Tables
++
++-- RIP Interfaces Groups
++-- Implementation of these Groups is mandatory for systems
++-- which implement RIP-2.
++
++-- The RIP Interface Status Table.
++
++ rip2IfStatTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF Rip2IfStatEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "A list of subnets which require separate
++ status monitoring in RIP."
++ ::= { rip2 2 }
++
++ rip2IfStatEntry OBJECT-TYPE
++ SYNTAX Rip2IfStatEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "A Single Routing Domain in a single Subnet."
++ INDEX { rip2IfStatAddress }
++ ::= { rip2IfStatTable 1 }
++
++ Rip2IfStatEntry ::=
++ SEQUENCE {
++ rip2IfStatAddress
++ IpAddress,
++ rip2IfStatRcvBadPackets
++ Counter32,
++ rip2IfStatRcvBadRoutes
++ Counter32,
++ rip2IfStatSentUpdates
++ Counter32,
++ rip2IfStatStatus
++ RowStatus
++ }
++
++ rip2IfStatAddress OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The IP Address of this system on the indicated
++ subnet. For unnumbered interfaces, the value 0.0.0.N,
++ where the least significant 24 bits (N) is the ifIndex
++ for the IP Interface in network byte order."
++ ::= { rip2IfStatEntry 1 }
++
++ rip2IfStatRcvBadPackets OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The number of RIP response packets received by
++ the RIP process which were subsequently discarded
++ for any reason (e.g. a version 0 packet, or an
++ unknown command type)."
++ ::= { rip2IfStatEntry 2 }
++
++ rip2IfStatRcvBadRoutes OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The number of routes, in valid RIP packets,
++ which were ignored for any reason (e.g. unknown
++ address family, or invalid metric)."
++ ::= { rip2IfStatEntry 3 }
++
++ rip2IfStatSentUpdates OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The number of triggered RIP updates actually
++ sent on this interface. This explicitly does
++ NOT include full updates sent containing new
++ information."
++ ::= { rip2IfStatEntry 4 }
++
++ rip2IfStatStatus OBJECT-TYPE
++ SYNTAX RowStatus
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "Writing invalid has the effect of deleting
++ this interface."
++ ::= { rip2IfStatEntry 5 }
++
++-- The RIP Interface Configuration Table.
++
++ rip2IfConfTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF Rip2IfConfEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "A list of subnets which require separate
++ configuration in RIP."
++ ::= { rip2 3 }
++
++ rip2IfConfEntry OBJECT-TYPE
++ SYNTAX Rip2IfConfEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "A Single Routing Domain in a single Subnet."
++ INDEX { rip2IfConfAddress }
++ ::= { rip2IfConfTable 1 }
++
++ Rip2IfConfEntry ::=
++ SEQUENCE {
++ rip2IfConfAddress
++ IpAddress,
++ rip2IfConfDomain
++ RouteTag,
++ rip2IfConfAuthType
++ INTEGER,
++ rip2IfConfAuthKey
++ OCTET STRING (SIZE(0..16)),
++ rip2IfConfSend
++ INTEGER,
++ rip2IfConfReceive
++ INTEGER,
++ rip2IfConfDefaultMetric
++ INTEGER,
++ rip2IfConfStatus
++ RowStatus,
++ rip2IfConfSrcAddress
++ IpAddress
++ }
++
++ rip2IfConfAddress OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The IP Address of this system on the indicated
++ subnet. For unnumbered interfaces, the value 0.0.0.N,
++ where the least significant 24 bits (N) is the ifIndex
++ for the IP Interface in network byte order."
++ ::= { rip2IfConfEntry 1 }
++
++ rip2IfConfDomain OBJECT-TYPE
++ SYNTAX RouteTag
++ MAX-ACCESS read-create
++ STATUS obsolete
++ DESCRIPTION
++ "Value inserted into the Routing Domain field
++ of all RIP packets sent on this interface."
++ DEFVAL { '0000'h }
++ ::= { rip2IfConfEntry 2 }
++
++ rip2IfConfAuthType OBJECT-TYPE
++ SYNTAX INTEGER {
++ noAuthentication (1),
++ simplePassword (2),
++ md5 (3)
++ }
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The type of Authentication used on this
++ interface."
++ DEFVAL { noAuthentication }
++ ::= { rip2IfConfEntry 3 }
++
++ rip2IfConfAuthKey OBJECT-TYPE
++ SYNTAX OCTET STRING (SIZE(0..16))
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The value to be used as the Authentication Key
++ whenever the corresponding instance of
++ rip2IfConfAuthType has a value other than
++ noAuthentication. A modification of the corresponding
++ instance of rip2IfConfAuthType does not modify
++ the rip2IfConfAuthKey value. If a string shorter
++ than 16 octets is supplied, it will be left-
++ justified and padded to 16 octets, on the right,
++ with nulls (0x00).
++
++ Reading this object always results in an OCTET
++ STRING of length zero; authentication may not
++ be bypassed by reading the MIB object."
++ DEFVAL { ''h }
++ ::= { rip2IfConfEntry 4 }
++
++ rip2IfConfSend OBJECT-TYPE
++ SYNTAX INTEGER {
++ doNotSend (1),
++ ripVersion1 (2),
++ rip1Compatible (3),
++ ripVersion2 (4),
++ ripV1Demand (5),
++ ripV2Demand (6)
++ }
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "What the router sends on this interface.
++ ripVersion1 implies sending RIP updates compliant
++ with RFC 1058. rip1Compatible implies
++ broadcasting RIP-2 updates using RFC 1058 route
++ subsumption rules. ripVersion2 implies
++ multicasting RIP-2 updates. ripV1Demand indicates
++ the use of Demand RIP on a WAN interface under RIP
++ Version 1 rules. ripV2Demand indicates the use of
++ Demand RIP on a WAN interface under Version 2 rules."
++ DEFVAL { rip1Compatible }
++ ::= { rip2IfConfEntry 5 }
++
++ rip2IfConfReceive OBJECT-TYPE
++ SYNTAX INTEGER {
++ rip1 (1),
++ rip2 (2),
++ rip1OrRip2 (3),
++ doNotRecieve (4)
++ }
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "This indicates which version of RIP updates
++ are to be accepted. Note that rip2 and
++ rip1OrRip2 implies reception of multicast
++ packets."
++ DEFVAL { rip1OrRip2 }
++ ::= { rip2IfConfEntry 6 }
++
++ rip2IfConfDefaultMetric OBJECT-TYPE
++ SYNTAX INTEGER ( 0..15 )
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "This variable indicates the metric that is to
++ be used for the default route entry in RIP updates
++ originated on this interface. A value of zero
++ indicates that no default route should be
++ originated; in this case, a default route via
++ another router may be propagated."
++ ::= { rip2IfConfEntry 7 }
++
++ rip2IfConfStatus OBJECT-TYPE
++ SYNTAX RowStatus
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "Writing invalid has the effect of deleting
++ this interface."
++ ::= { rip2IfConfEntry 8 }
++
++ rip2IfConfSrcAddress OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-create
++ STATUS current
++ DESCRIPTION
++ "The IP Address this system will use as a source
++ address on this interface. If it is a numbered
++ interface, this MUST be the same value as
++ rip2IfConfAddress. On unnumbered interfaces,
++ it must be the value of rip2IfConfAddress for
++ some interface on the system."
++ ::= { rip2IfConfEntry 9 }
++
++--4.3 Peer Table
++
++-- Peer Table
++
++-- The RIP Peer Group
++-- Implementation of this Group is Optional
++
++-- This group provides information about active peer
++-- relationships intended to assist in debugging. An
++-- active peer is a router from which a valid RIP
++-- updated has been heard in the last 180 seconds.
++
++ rip2PeerTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF Rip2PeerEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "A list of RIP Peers."
++ ::= { rip2 4 }
++
++ rip2PeerEntry OBJECT-TYPE
++ SYNTAX Rip2PeerEntry
++ MAX-ACCESS not-accessible
++ STATUS current
++ DESCRIPTION
++ "Information regarding a single routing peer."
++ INDEX { rip2PeerAddress, rip2PeerDomain }
++ ::= { rip2PeerTable 1 }
++
++ Rip2PeerEntry ::=
++ SEQUENCE {
++ rip2PeerAddress
++ IpAddress,
++ rip2PeerDomain
++ RouteTag,
++ rip2PeerLastUpdate
++ TimeTicks,
++ rip2PeerVersion
++ INTEGER,
++ rip2PeerRcvBadPackets
++ Counter32,
++ rip2PeerRcvBadRoutes
++ Counter32
++ }
++
++ rip2PeerAddress OBJECT-TYPE
++ SYNTAX IpAddress
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The IP Address that the peer is using as its source
++ address. Note that on an unnumbered link, this may
++ not be a member of any subnet on the system."
++ ::= { rip2PeerEntry 1 }
++
++ rip2PeerDomain OBJECT-TYPE
++ SYNTAX RouteTag
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The value in the Routing Domain field in RIP
++ packets received from the peer. As domain suuport
++ is deprecated, this must be zero."
++ ::= { rip2PeerEntry 2 }
++
++ rip2PeerLastUpdate OBJECT-TYPE
++ SYNTAX TimeTicks
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The value of sysUpTime when the most recent
++ RIP update was received from this system."
++ ::= { rip2PeerEntry 3 }
++
++ rip2PeerVersion OBJECT-TYPE
++ SYNTAX INTEGER ( 0..255 )
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The RIP version number in the header of the
++ last RIP packet received."
++ ::= { rip2PeerEntry 4 }
++
++ rip2PeerRcvBadPackets OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The number of RIP response packets from this
++ peer discarded as invalid."
++ ::= { rip2PeerEntry 5 }
++
++
++ rip2PeerRcvBadRoutes OBJECT-TYPE
++ SYNTAX Counter32
++ MAX-ACCESS read-only
++ STATUS current
++ DESCRIPTION
++ "The number of routes from this peer that were
++ ignored because the entry format was invalid."
++ ::= { rip2PeerEntry 6 }
++
++-- conformance information
++
++rip2Conformance OBJECT IDENTIFIER ::= { rip2 5 }
++
++rip2Groups OBJECT IDENTIFIER ::= { rip2Conformance 1 }
++rip2Compliances OBJECT IDENTIFIER ::= { rip2Conformance 2 }
++
++-- compliance statements
++rip2Compliance MODULE-COMPLIANCE
++ STATUS current
++ DESCRIPTION
++ "The compliance statement "
++ MODULE -- this module
++ MANDATORY-GROUPS {
++ rip2GlobalGroup,
++ rip2IfStatGroup,
++ rip2IfConfGroup,
++ rip2PeerGroup
++ }
++ GROUP rip2GlobalGroup
++ DESCRIPTION
++ "This group defines global controls for RIP-II systems."
++ GROUP rip2IfStatGroup
++ DESCRIPTION
++ "This group defines interface statistics for RIP-II systems."
++ GROUP rip2IfConfGroup
++ DESCRIPTION
++ "This group defines interface configuration for RIP-II systems."
++ GROUP rip2PeerGroup
++ DESCRIPTION
++ "This group defines peer information for RIP-II systems."
++ ::= { rip2Compliances 1 }
++
++-- units of conformance
++
++rip2GlobalGroup OBJECT-GROUP
++ OBJECTS {
++ rip2GlobalRouteChanges,
++ rip2GlobalQueries
++ }
++ STATUS current
++ DESCRIPTION
++ "This group defines global controls for RIP-II systems."
++ ::= { rip2Groups 1 }
++rip2IfStatGroup OBJECT-GROUP
++ OBJECTS {
++ rip2IfStatAddress,
++ rip2IfStatRcvBadPackets,
++ rip2IfStatRcvBadRoutes,
++ rip2IfStatSentUpdates,
++ rip2IfStatStatus
++ }
++ STATUS current
++ DESCRIPTION
++ "This group defines interface statistics for RIP-II systems."
++ ::= { rip2Groups 2 }
++rip2IfConfGroup OBJECT-GROUP
++ OBJECTS {
++ rip2IfConfAddress,
++ rip2IfConfAuthType,
++ rip2IfConfAuthKey,
++ rip2IfConfSend,
++ rip2IfConfReceive,
++ rip2IfConfDefaultMetric,
++ rip2IfConfStatus,
++ rip2IfConfSrcAddress
++ }
++ STATUS current
++ DESCRIPTION
++ "This group defines interface configuration for RIP-II systems."
++ ::= { rip2Groups 3 }
++rip2PeerGroup OBJECT-GROUP
++ OBJECTS {
++ rip2PeerAddress,
++ rip2PeerDomain,
++ rip2PeerLastUpdate,
++ rip2PeerVersion,
++ rip2PeerRcvBadPackets,
++ rip2PeerRcvBadRoutes
++ }
++ STATUS current
++ DESCRIPTION
++ "This group defines peer information for RIP-II systems."
++ ::= { rip2Groups 4 }
++END
+--- /dev/null
++++ b/mibs/SOURCE-ROUTING-MIB.txt
+@@ -0,0 +1,452 @@
++SOURCE-ROUTING-MIB DEFINITIONS ::= BEGIN
++
++IMPORTS
++ Counter, Gauge
++ FROM RFC1155-SMI
++ dot1dBridge, dot1dSr
++ FROM BRIDGE-MIB
++ OBJECT-TYPE
++ FROM RFC-1212;
++
++-- groups in the SR MIB
++
++-- dot1dSr is imported from the Bridge MIB
++
++dot1dPortPair OBJECT IDENTIFIER ::= { dot1dBridge 10 }
++
++-- the dot1dSr group
++
++-- this group is implemented by those bridges that
++-- support the source route bridging mode, including Source
++-- Routing and SRT bridges.
++
++dot1dSrPortTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF Dot1dSrPortEntry
++ ACCESS not-accessible
++ STATUS mandatory
++ DESCRIPTION
++ "A table that contains information about every
++ port that is associated with this source route
++ bridge."
++ ::= { dot1dSr 1 }
++
++dot1dSrPortEntry OBJECT-TYPE
++ SYNTAX Dot1dSrPortEntry
++ ACCESS not-accessible
++ STATUS mandatory
++ DESCRIPTION
++ "A list of information for each port of a source
++ route bridge."
++ INDEX { dot1dSrPort }
++
++ ::= { dot1dSrPortTable 1 }
++
++Dot1dSrPortEntry ::=
++ SEQUENCE {
++ dot1dSrPort
++ INTEGER,
++ dot1dSrPortHopCount
++ INTEGER,
++ dot1dSrPortLocalSegment
++ INTEGER,
++ dot1dSrPortBridgeNum
++ INTEGER,
++ dot1dSrPortTargetSegment
++ INTEGER,
++ dot1dSrPortLargestFrame
++ INTEGER,
++ dot1dSrPortSTESpanMode
++ INTEGER,
++ dot1dSrPortSpecInFrames
++ Counter,
++ dot1dSrPortSpecOutFrames
++ Counter,
++ dot1dSrPortApeInFrames
++ Counter,
++ dot1dSrPortApeOutFrames
++ Counter,
++ dot1dSrPortSteInFrames
++ Counter,
++ dot1dSrPortSteOutFrames
++ Counter,
++ dot1dSrPortSegmentMismatchDiscards
++ Counter,
++ dot1dSrPortDuplicateSegmentDiscards
++ Counter,
++ dot1dSrPortHopCountExceededDiscards
++ Counter,
++ dot1dSrPortDupLanIdOrTreeErrors
++ Counter,
++ dot1dSrPortLanIdMismatches
++ Counter
++ }
++
++dot1dSrPort OBJECT-TYPE
++ SYNTAX INTEGER (1..65535)
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The port number of the port for which this entry
++
++ contains Source Route management information."
++ ::= { dot1dSrPortEntry 1 }
++
++dot1dSrPortHopCount OBJECT-TYPE
++ SYNTAX INTEGER
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "The maximum number of routing descriptors allowed
++ in an All Paths or Spanning Tree Explorer frames."
++ ::= { dot1dSrPortEntry 2 }
++
++dot1dSrPortLocalSegment OBJECT-TYPE
++ SYNTAX INTEGER
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "The segment number that uniquely identifies the
++ segment to which this port is connected. Current
++ source routing protocols limit this value to the
++ range: 0 through 4095. (The value 0 is used by
++ some management applications for special test
++ cases.) A value of 65535 signifies that no segment
++ number is assigned to this port."
++ ::= { dot1dSrPortEntry 3 }
++
++dot1dSrPortBridgeNum OBJECT-TYPE
++ SYNTAX INTEGER
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "A bridge number uniquely identifies a bridge when
++ more than one bridge is used to span the same two
++ segments. Current source routing protocols limit
++ this value to the range: 0 through 15. A value of
++ 65535 signifies that no bridge number is assigned
++ to this bridge."
++ ::= { dot1dSrPortEntry 4 }
++
++dot1dSrPortTargetSegment OBJECT-TYPE
++ SYNTAX INTEGER
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "The segment number that corresponds to the target
++ segment this port is considered to be connected to
++ by the bridge. Current source routing protocols
++ limit this value to the range: 0 through 4095.
++
++ (The value 0 is used by some management
++ applications for special test cases.) A value of
++ 65535 signifies that no target segment is assigned
++ to this port."
++ ::= { dot1dSrPortEntry 5 }
++
++-- It would be nice if we could use ifMtu as the size of the
++-- largest frame, but we can't because ifMtu is defined to be
++-- the size that the (inter-)network layer can use which can
++-- differ from the MAC layer (especially if several layers of
++-- encapsulation are used).
++
++dot1dSrPortLargestFrame OBJECT-TYPE
++ SYNTAX INTEGER
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "The maximum size of the INFO field (LLC and
++ above) that this port can send/receive. It does
++ not include any MAC level (framing) octets. The
++ value of this object is used by this bridge to
++ determine whether a modification of the
++ LargestFrame (LF, see [14]) field of the Routing
++ Control field of the Routing Information Field is
++ necessary.
++
++ 64 valid values are defined by the IEEE 802.5M SRT
++ Addendum: 516, 635, 754, 873, 993, 1112, 1231,
++ 1350, 1470, 1542, 1615, 1688, 1761, 1833, 1906,
++ 1979, 2052, 2345, 2638, 2932, 3225, 3518, 3812,
++ 4105, 4399, 4865, 5331, 5798, 6264, 6730, 7197,
++ 7663, 8130, 8539, 8949, 9358, 9768, 10178, 10587,
++ 10997, 11407, 12199, 12992, 13785, 14578, 15370,
++ 16163, 16956, 17749, 20730, 23711, 26693, 29674,
++ 32655, 35637, 38618, 41600, 44591, 47583, 50575,
++ 53567, 56559, 59551, and 65535.
++
++ An illegal value will not be accepted by the
++ bridge."
++ ::= { dot1dSrPortEntry 6 }
++
++dot1dSrPortSTESpanMode OBJECT-TYPE
++ SYNTAX INTEGER {
++ auto-span(1),
++ disabled(2),
++ forced(3)
++ }
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "Determines how this port behaves when presented
++ with a Spanning Tree Explorer frame. The value
++ 'disabled(2)' indicates that the port will not
++ accept or send Spanning Tree Explorer packets; any
++ STE packets received will be silently discarded.
++ The value 'forced(3)' indicates the port will
++ always accept and propagate Spanning Tree Explorer
++ frames. This allows a manually configured
++ Spanning Tree for this class of packet to be
++ configured. Note that unlike transparent
++ bridging, this is not catastrophic to the network
++ if there are loops. The value 'auto-span(1)' can
++ only be returned by a bridge that both implements
++ the Spanning Tree Protocol and has use of the
++ protocol enabled on this port. The behavior of the
++ port for Spanning Tree Explorer frames is
++ determined by the state of dot1dStpPortState. If
++ the port is in the 'forwarding' state, the frame
++ will be accepted or propagated. Otherwise, it
++ will be silently discarded."
++ ::= { dot1dSrPortEntry 7 }
++
++dot1dSrPortSpecInFrames OBJECT-TYPE
++ SYNTAX Counter
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The number of Specifically Routed frames, also
++ referred to as Source Routed Frames, that have
++ been received from this port's segment."
++ ::= { dot1dSrPortEntry 8 }
++
++dot1dSrPortSpecOutFrames OBJECT-TYPE
++ SYNTAX Counter
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The number of Specifically Routed frames, also
++ referred to as Source Routed Frames, that this
++ port has transmitted on its segment."
++ ::= { dot1dSrPortEntry 9 }
++
++dot1dSrPortApeInFrames OBJECT-TYPE
++ SYNTAX Counter
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The number of All Paths Explorer frames, also
++ referred to as All Routes Explorer frames, that
++ have been received by this port from its segment."
++ ::= { dot1dSrPortEntry 10 }
++
++dot1dSrPortApeOutFrames OBJECT-TYPE
++ SYNTAX Counter
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The number of all Paths Explorer Frames, also
++ referred to as All Routes Explorer frames, that
++ have been transmitted by this port on its
++ segment."
++ ::= { dot1dSrPortEntry 11 }
++
++dot1dSrPortSteInFrames OBJECT-TYPE
++ SYNTAX Counter
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The number of spanning tree explorer frames that
++ have been received by this port from its segment."
++ ::= { dot1dSrPortEntry 12 }
++
++dot1dSrPortSteOutFrames OBJECT-TYPE
++ SYNTAX Counter
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The number of spanning tree explorer frames that
++ have been transmitted by this port on its
++ segment."
++ ::= { dot1dSrPortEntry 13 }
++
++dot1dSrPortSegmentMismatchDiscards OBJECT-TYPE
++ SYNTAX Counter
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The number of explorer frames that have been
++ discarded by this port because the routing
++ descriptor field contained an invalid adjacent
++ segment value."
++ ::= { dot1dSrPortEntry 14 }
++
++dot1dSrPortDuplicateSegmentDiscards OBJECT-TYPE
++ SYNTAX Counter
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The number of frames that have been discarded by
++ this port because the routing descriptor field
++ contained a duplicate segment identifier."
++ ::= { dot1dSrPortEntry 15 }
++
++dot1dSrPortHopCountExceededDiscards OBJECT-TYPE
++ SYNTAX Counter
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The number of explorer frames that have been
++ discarded by this port because the Routing
++ Information Field has exceeded the maximum route
++ descriptor length."
++ ::= { dot1dSrPortEntry 16 }
++
++dot1dSrPortDupLanIdOrTreeErrors OBJECT-TYPE
++ SYNTAX Counter
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The number of duplicate LAN IDs or Tree errors.
++ This helps in detection of problems in networks
++ containing older IBM Source Routing Bridges."
++ ::= { dot1dSrPortEntry 17 }
++
++dot1dSrPortLanIdMismatches OBJECT-TYPE
++ SYNTAX Counter
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The number of ARE and STE frames that were
++ discarded because the last LAN ID in the routing
++ information field did not equal the LAN-in ID.
++ This error can occur in implementations which do
++ only a LAN-in ID and Bridge Number check instead
++ of a LAN-in ID, Bridge Number, and LAN-out ID
++ check before they forward broadcast frames."
++ ::= { dot1dSrPortEntry 18 }
++
++-- scalar object in dot1dSr
++
++dot1dSrBridgeLfMode OBJECT-TYPE
++ SYNTAX INTEGER {
++ mode3(1),
++ mode6(2)
++ }
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "Indicates whether the bridge operates using older
++ 3 bit length negotiation fields or the newer 6 bit
++ length field in its RIF."
++ ::= { dot1dSr 2 }
++
++-- The Port-Pair Database
++
++-- Implementation of this group is optional.
++
++-- This group is implemented by those bridges that support
++-- the direct multiport model of the source route bridging
++-- mode as defined in the IEEE 802.5 SRT Addendum to
++-- 802.1d.
++
++-- Bridges implementing this group may report 65535 for
++-- dot1dSrPortBridgeNumber and dot1dSrPortTargetSegment,
++-- indicating that those objects are not applicable.
++
++dot1dPortPairTableSize OBJECT-TYPE
++ SYNTAX Gauge
++ ACCESS read-only
++ STATUS mandatory
++ DESCRIPTION
++ "The total number of entries in the Bridge Port
++ Pair Database."
++ ::= { dot1dPortPair 1 }
++
++-- the Bridge Port-Pair table
++
++-- this table represents port pairs within a bridge forming
++-- a unique bridge path, as defined in the IEEE 802.5M SRT
++-- Addendum.
++
++dot1dPortPairTable OBJECT-TYPE
++ SYNTAX SEQUENCE OF Dot1dPortPairEntry
++ ACCESS not-accessible
++ STATUS mandatory
++ DESCRIPTION
++ "A table that contains information about every
++
++ port pair database entity associated with this
++ source routing bridge."
++ ::= { dot1dPortPair 2 }
++
++dot1dPortPairEntry OBJECT-TYPE
++ SYNTAX Dot1dPortPairEntry
++ ACCESS not-accessible
++ STATUS mandatory
++ DESCRIPTION
++ "A list of information for each port pair entity
++ of a bridge."
++ INDEX { dot1dPortPairLowPort, dot1dPortPairHighPort }
++ ::= { dot1dPortPairTable 1 }
++
++Dot1dPortPairEntry ::=
++ SEQUENCE {
++ dot1dPortPairLowPort
++ INTEGER,
++ dot1dPortPairHighPort
++ INTEGER,
++ dot1dPortPairBridgeNum
++ INTEGER,
++ dot1dPortPairBridgeState
++ INTEGER
++ }
++
++dot1dPortPairLowPort OBJECT-TYPE
++ SYNTAX INTEGER (1..65535)
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "The port number of the lower numbered port for
++ which this entry contains port pair database
++ information."
++ ::= { dot1dPortPairEntry 1 }
++
++dot1dPortPairHighPort OBJECT-TYPE
++ SYNTAX INTEGER (1..65535)
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "The port number of the higher numbered port for
++ which this entry contains port pair database
++ information."
++ ::= { dot1dPortPairEntry 2 }
++
++dot1dPortPairBridgeNum OBJECT-TYPE
++ SYNTAX INTEGER
++
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "A bridge number that uniquely identifies the path
++ provided by this source routing bridge between the
++ segments connected to dot1dPortPairLowPort and
++ dot1dPortPairHighPort. The purpose of bridge
++ number is to disambiguate between multiple paths
++ connecting the same two LANs."
++ ::= { dot1dPortPairEntry 3 }
++
++dot1dPortPairBridgeState OBJECT-TYPE
++ SYNTAX INTEGER {
++ enabled(1),
++ disabled(2),
++ invalid(3)
++ }
++ ACCESS read-write
++ STATUS mandatory
++ DESCRIPTION
++ "The state of dot1dPortPairBridgeNum. Writing
++ 'invalid(3)' to this object removes the
++ corresponding entry."
++ ::= { dot1dPortPairEntry 4 }
++
++END
--- /dev/null
+--- a/configure
++++ b/configure
+@@ -10216,7 +10216,7 @@ linux* | k*bsd*-gnu)
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++ finish_cmds=''
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ # This implies no fast_install, which is unacceptable.
--- /dev/null
+--- a/Makefile.top
++++ b/Makefile.top
+@@ -81,7 +81,7 @@ LIBCURRENT = 16
+ LIBAGE = 1
+ LIBREVISION = 3
+
+-LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o
++LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) $(LDFLAGS) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o
+ LIB_EXTENSION = la
+ LIB_VERSION =
+ LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(libdir)
--- /dev/null
+--- /dev/null
++++ b/agent/mibgroup/ieee802dot11.c
+@@ -0,0 +1,4915 @@
++/****************************************************************************
++* *
++* File Name: ieee802dot11.c *
++* Used By: *
++* *
++* Operating System: *
++* Purpose: *
++* *
++* Comments: *
++* *
++* Author: Larry Simmons *
++* lsimmons@avantcom.com *
++* www.avantcom.com *
++* *
++* Creation Date: 09/02/03 *
++* *
++* Ver Date Inits Modification *
++* ----- -------- ----- ------------ *
++* 0.0.1 09/02/03 LRS created *
++* 0.0.2 09/24/03 LRS wouldn't build after fresh ./configure *
++****************************************************************************/
++/****************************************************************************
++* Includes *
++****************************************************************************/
++#include <net-snmp/net-snmp-config.h>
++#include <net-snmp/net-snmp-includes.h>
++#include <net-snmp/agent/net-snmp-agent-includes.h>
++#include "ieee802dot11.h"
++#include "iwlib.h"
++
++/****************************************************************************
++* Defines *
++****************************************************************************/
++#define DISPLAYWIEXT // display wireless ext info
++#define TABLE_SIZE 1
++//#define MINLOADFREQ 15 // min reload frequency in seconds
++#define MINLOADFREQ 5 // min reload frequency in seconds // for testing
++#define PROC_NET_DEV "/proc/net/dev"
++#define PROC_NET_WIRELESS "/proc/net/wireless"
++
++#ifndef UCHAR
++ typedef unsigned char UCHAR;
++#endif
++
++/****************************************************************************
++* Private Functions *
++****************************************************************************/
++static void loadTables();
++static void loadWiExt ( int, char *, struct wireless_info * );
++static void load80211Structs ( int, char *, struct wireless_info * );
++static void initStructs();
++
++// Wireless Extensions Specific Functions
++static void loadWiExtTo80211Structs ( int, char *, struct wireless_info * );
++static void displayWiExt ( struct wireless_info );
++
++// Linked List Functions
++static void addList ( char *, char *, int );
++static void initLists(); // initialize all the linked lists
++static void flushLists(); // flush all the linked lists
++static void flushList ( char * ); // flush a single linked list
++
++// Utility Functions
++static int openSocket ( void );
++static int mWatt2dbm ( int );
++static char *htob ( char * );
++static int hasChanged ( char *, int );
++
++/****************************************************************************
++* Private Variables *
++****************************************************************************/
++static unsigned long lastLoad = 0; // ET in secs at last table load
++
++static struct avNode *lastNode, *newNode, *np;
++
++/****************************************************************************
++* External Functions *
++****************************************************************************/
++
++/****************************************************************************
++* ieee802dot11_variables_oid: *
++* this is the top level oid that we want to register under. This *
++* is essentially a prefix, with the suffix appearing in the *
++* variable below. *
++****************************************************************************/
++oid ieee802dot11_variables_oid[] = { 1,2,840,10036 };
++
++/****************************************************************************
++* variable7 ieee802dot11_variables: *
++* this variable defines function callbacks and type return information *
++* for the ieee802dot11 mib section *
++****************************************************************************/
++struct variable7 ieee802dot11_variables[] = {
++/* magic number , variable type , ro/rw , callback fn , L, oidsuffix */
++#define DOT11STATIONID 3
++ { DOT11STATIONID , ASN_OCTET_STR , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,1 } },
++#define DOT11MEDIUMOCCUPANCYLIMIT 4
++ { DOT11MEDIUMOCCUPANCYLIMIT, ASN_INTEGER , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,2 } },
++#define DOT11CFPOLLABLE 5
++ { DOT11CFPOLLABLE , ASN_INTEGER , RONLY , var_dot11StationConfigTable, 4, { 1,1,1,3 } },
++#define DOT11CFPPERIOD 6
++ { DOT11CFPPERIOD , ASN_INTEGER , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,4 } },
++#define DOT11CFPMAXDURATION 7
++ { DOT11CFPMAXDURATION , ASN_INTEGER , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,5 } },
++#define DOT11AUTHENTICATIONRESPONSETIMEOUT 8
++ { DOT11AUTHENTICATIONRESPONSETIMEOUT, ASN_INTEGER , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,6 } },
++#define DOT11PRIVACYOPTIONIMPLEMENTED 9
++ { DOT11PRIVACYOPTIONIMPLEMENTED, ASN_INTEGER , RONLY , var_dot11StationConfigTable, 4, { 1,1,1,7 } },
++#define DOT11POWERMANAGEMENTMODE 10
++ { DOT11POWERMANAGEMENTMODE, ASN_INTEGER , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,8 } },
++#define DOT11DESIREDSSID 11
++ { DOT11DESIREDSSID , ASN_OCTET_STR , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,9 } },
++#define DOT11DESIREDBSSTYPE 12
++ { DOT11DESIREDBSSTYPE , ASN_INTEGER , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,10 } },
++#define DOT11OPERATIONALRATESET 13
++ { DOT11OPERATIONALRATESET, ASN_OCTET_STR , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,11 } },
++#define DOT11BEACONPERIOD 14
++ { DOT11BEACONPERIOD , ASN_INTEGER , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,12 } },
++#define DOT11DTIMPERIOD 15
++ { DOT11DTIMPERIOD , ASN_INTEGER , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,13 } },
++#define DOT11ASSOCIATIONRESPONSETIMEOUT 16
++ { DOT11ASSOCIATIONRESPONSETIMEOUT, ASN_INTEGER , RWRITE, var_dot11StationConfigTable, 4, { 1,1,1,14 } },
++#define DOT11DISASSOCIATEREASON 17
++ { DOT11DISASSOCIATEREASON, ASN_INTEGER , RONLY , var_dot11StationConfigTable, 4, { 1,1,1,15 } },
++#define DOT11DISASSOCIATESTATION 18
++ { DOT11DISASSOCIATESTATION, ASN_OCTET_STR , RONLY , var_dot11StationConfigTable, 4, { 1,1,1,16 } },
++#define DOT11DEAUTHENTICATEREASON 19
++ { DOT11DEAUTHENTICATEREASON, ASN_INTEGER , RONLY , var_dot11StationConfigTable, 4, { 1,1,1,17 } },
++#define DOT11DEAUTHENTICATESTATION 20
++ { DOT11DEAUTHENTICATESTATION, ASN_OCTET_STR , RONLY , var_dot11StationConfigTable, 4, { 1,1,1,18 } },
++#define DOT11AUTHENTICATEFAILSTATUS 21
++ { DOT11AUTHENTICATEFAILSTATUS, ASN_INTEGER , RONLY , var_dot11StationConfigTable, 4, { 1,1,1,19 } },
++#define DOT11AUTHENTICATEFAILSTATION 22
++ { DOT11AUTHENTICATEFAILSTATION, ASN_OCTET_STR , RONLY , var_dot11StationConfigTable, 4, { 1,1,1,20 } },
++
++#define DOT11AUTHENTICATIONALGORITHM 26
++ { DOT11AUTHENTICATIONALGORITHM, ASN_INTEGER , RONLY , var_dot11AuthenticationAlgorithmsTable, 4, { 1,2,1,2 } },
++#define DOT11AUTHENTICATIONALGORITHMSENABLE 27
++ { DOT11AUTHENTICATIONALGORITHMSENABLE, ASN_INTEGER , RWRITE, var_dot11AuthenticationAlgorithmsTable, 4, { 1,2,1,3 } },
++
++#define DOT11WEPDEFAULTKEYVALUE 31
++ { DOT11WEPDEFAULTKEYVALUE, ASN_OCTET_STR , RWRITE, var_dot11WEPDefaultKeysTable, 4, { 1,3,1,2 } },
++
++#define DOT11WEPKEYMAPPINGADDRESS 35
++ { DOT11WEPKEYMAPPINGADDRESS, ASN_OCTET_STR , RWRITE, var_dot11WEPKeyMappingsTable, 4, { 1,4,1,2 } },
++#define DOT11WEPKEYMAPPINGWEPON 36
++ { DOT11WEPKEYMAPPINGWEPON, ASN_INTEGER , RWRITE, var_dot11WEPKeyMappingsTable, 4, { 1,4,1,3 } },
++#define DOT11WEPKEYMAPPINGVALUE 37
++ { DOT11WEPKEYMAPPINGVALUE, ASN_OCTET_STR , RWRITE, var_dot11WEPKeyMappingsTable, 4, { 1,4,1,4 } },
++#define DOT11WEPKEYMAPPINGSTATUS 38
++ { DOT11WEPKEYMAPPINGSTATUS, ASN_INTEGER , RWRITE, var_dot11WEPKeyMappingsTable, 4, { 1,4,1,5 } },
++
++#define DOT11PRIVACYINVOKED 41
++ { DOT11PRIVACYINVOKED , ASN_INTEGER , RWRITE, var_dot11PrivacyTable, 4, { 1,5,1,1 } },
++#define DOT11WEPDEFAULTKEYID 42
++ { DOT11WEPDEFAULTKEYID, ASN_INTEGER , RWRITE, var_dot11PrivacyTable, 4, { 1,5,1,2 } },
++#define DOT11WEPKEYMAPPINGLENGTH 43
++ { DOT11WEPKEYMAPPINGLENGTH, ASN_INTEGER , RWRITE, var_dot11PrivacyTable, 4, { 1,5,1,3 } },
++#define DOT11EXCLUDEUNENCRYPTED 44
++ { DOT11EXCLUDEUNENCRYPTED, ASN_INTEGER , RWRITE, var_dot11PrivacyTable, 4, { 1,5,1,4 } },
++#define DOT11WEPICVERRORCOUNT 45
++ { DOT11WEPICVERRORCOUNT, ASN_COUNTER , RONLY , var_dot11PrivacyTable, 4, { 1,5,1,5 } },
++#define DOT11WEPEXCLUDEDCOUNT 46
++ { DOT11WEPEXCLUDEDCOUNT, ASN_COUNTER , RONLY , var_dot11PrivacyTable, 4, { 1,5,1,6 } },
++
++#define DOT11MACADDRESS 49
++ { DOT11MACADDRESS , ASN_OCTET_STR , RONLY , var_dot11OperationTable, 4, { 2,1,1,1 } },
++#define DOT11RTSTHRESHOLD 50
++ { DOT11RTSTHRESHOLD , ASN_INTEGER , RWRITE, var_dot11OperationTable, 4, { 2,1,1,2 } },
++#define DOT11SHORTRETRYLIMIT 51
++ { DOT11SHORTRETRYLIMIT, ASN_INTEGER , RWRITE, var_dot11OperationTable, 4, { 2,1,1,3 } },
++#define DOT11LONGRETRYLIMIT 52
++ { DOT11LONGRETRYLIMIT , ASN_INTEGER , RWRITE, var_dot11OperationTable, 4, { 2,1,1,4 } },
++#define DOT11FRAGMENTATIONTHRESHOLD 53
++ { DOT11FRAGMENTATIONTHRESHOLD, ASN_INTEGER , RWRITE, var_dot11OperationTable, 4, { 2,1,1,5 } },
++#define DOT11MAXTRANSMITMSDULIFETIME 54
++ { DOT11MAXTRANSMITMSDULIFETIME, ASN_INTEGER , RWRITE, var_dot11OperationTable, 4, { 2,1,1,6 } },
++#define DOT11MAXRECEIVELIFETIME 55
++ { DOT11MAXRECEIVELIFETIME, ASN_INTEGER , RWRITE, var_dot11OperationTable, 4, { 2,1,1,7 } },
++#define DOT11MANUFACTURERID 56
++ { DOT11MANUFACTURERID , ASN_OCTET_STR , RONLY , var_dot11OperationTable, 4, { 2,1,1,8 } },
++#define DOT11PRODUCTID 57
++ { DOT11PRODUCTID , ASN_OCTET_STR , RONLY , var_dot11OperationTable, 4, { 2,1,1,9 } },
++
++#define DOT11TRANSMITTEDFRAGMENTCOUNT 60
++ { DOT11TRANSMITTEDFRAGMENTCOUNT, ASN_COUNTER , RONLY , var_dot11CountersTable, 4, { 2,2,1,1 } },
++#define DOT11MULTICASTTRANSMITTEDFRAMECOUNT 61
++ { DOT11MULTICASTTRANSMITTEDFRAMECOUNT, ASN_COUNTER , RONLY , var_dot11CountersTable, 4, { 2,2,1,2 } },
++#define DOT11FAILEDCOUNT 62
++ { DOT11FAILEDCOUNT , ASN_COUNTER , RONLY , var_dot11CountersTable, 4, { 2,2,1,3 } },
++#define DOT11RETRYCOUNT 63
++ { DOT11RETRYCOUNT , ASN_COUNTER , RONLY , var_dot11CountersTable, 4, { 2,2,1,4 } },
++#define DOT11MULTIPLERETRYCOUNT 64
++ { DOT11MULTIPLERETRYCOUNT, ASN_COUNTER , RONLY , var_dot11CountersTable, 4, { 2,2,1,5 } },
++#define DOT11FRAMEDUPLICATECOUNT 65
++ { DOT11FRAMEDUPLICATECOUNT, ASN_COUNTER , RONLY , var_dot11CountersTable, 4, { 2,2,1,6 } },
++#define DOT11RTSSUCCESSCOUNT 66
++ { DOT11RTSSUCCESSCOUNT, ASN_COUNTER , RONLY , var_dot11CountersTable, 4, { 2,2,1,7 } },
++#define DOT11RTSFAILURECOUNT 67
++ { DOT11RTSFAILURECOUNT, ASN_COUNTER , RONLY , var_dot11CountersTable, 4, { 2,2,1,8 } },
++#define DOT11ACKFAILURECOUNT 68
++ { DOT11ACKFAILURECOUNT, ASN_COUNTER , RONLY , var_dot11CountersTable, 4, { 2,2,1,9 } },
++#define DOT11RECEIVEDFRAGMENTCOUNT 69
++ { DOT11RECEIVEDFRAGMENTCOUNT, ASN_COUNTER , RONLY , var_dot11CountersTable, 4, { 2,2,1,10 } },
++#define DOT11MULTICASTRECEIVEDFRAMECOUNT 70
++ { DOT11MULTICASTRECEIVEDFRAMECOUNT, ASN_COUNTER , RONLY , var_dot11CountersTable, 4, { 2,2,1,11 } },
++#define DOT11FCSERRORCOUNT 71
++ { DOT11FCSERRORCOUNT , ASN_COUNTER , RONLY , var_dot11CountersTable, 4, { 2,2,1,12 } },
++#define DOT11TRANSMITTEDFRAMECOUNT 72
++ { DOT11TRANSMITTEDFRAMECOUNT, ASN_COUNTER , RONLY , var_dot11CountersTable, 4, { 2,2,1,13 } },
++#define DOT11WEPUNDECRYPTABLECOUNT 73
++ { DOT11WEPUNDECRYPTABLECOUNT, ASN_COUNTER , RONLY , var_dot11CountersTable, 4, { 2,2,1,14 } },
++
++#define DOT11ADDRESS 77
++ { DOT11ADDRESS , ASN_OCTET_STR , RWRITE, var_dot11GroupAddressesTable, 4, { 2,3,1,2 } },
++#define DOT11GROUPADDRESSESSTATUS 78
++ { DOT11GROUPADDRESSESSTATUS, ASN_INTEGER , RWRITE, var_dot11GroupAddressesTable, 4, { 2,3,1,3 } },
++
++#define DOT11RESOURCETYPEIDNAME 79
++ { DOT11RESOURCETYPEIDNAME, ASN_OCTET_STR , RONLY , var_ieee802dot11, 3, { 3,1,1 } },
++#define DOT11MANUFACTUREROUI 82
++ { DOT11MANUFACTUREROUI, ASN_OCTET_STR , RONLY , var_dot11ResourceInfoTable, 5, { 3,1,2,1,1 } },
++#define DOT11MANUFACTURERNAME 83
++ { DOT11MANUFACTURERNAME, ASN_OCTET_STR , RONLY , var_dot11ResourceInfoTable, 5, { 3,1,2,1,2 } },
++#define DOT11MANUFACTURERPRODUCTNAME 84
++ { DOT11MANUFACTURERPRODUCTNAME, ASN_OCTET_STR , RONLY , var_dot11ResourceInfoTable, 5, { 3,1,2,1,3 } },
++#define DOT11MANUFACTURERPRODUCTVERSION 85
++ { DOT11MANUFACTURERPRODUCTVERSION, ASN_OCTET_STR , RONLY , var_dot11ResourceInfoTable, 5, { 3,1,2,1,4 } },
++
++#define DOT11PHYTYPE 88
++ { DOT11PHYTYPE , ASN_INTEGER , RONLY , var_dot11PhyOperationTable, 4, { 4,1,1,1 } },
++#define DOT11CURRENTREGDOMAIN 89
++ { DOT11CURRENTREGDOMAIN, ASN_INTEGER , RWRITE, var_dot11PhyOperationTable, 4, { 4,1,1,2 } },
++#define DOT11TEMPTYPE 90
++ { DOT11TEMPTYPE , ASN_INTEGER , RONLY , var_dot11PhyOperationTable, 4, { 4,1,1,3 } },
++#define DOT11CURRENTTXANTENNA 93
++ { DOT11CURRENTTXANTENNA, ASN_INTEGER , RWRITE, var_dot11PhyAntennaTable, 4, { 4,2,1,1 } },
++#define DOT11DIVERSITYSUPPORT 94
++ { DOT11DIVERSITYSUPPORT, ASN_INTEGER , RONLY , var_dot11PhyAntennaTable, 4, { 4,2,1,2 } },
++#define DOT11CURRENTRXANTENNA 95
++ { DOT11CURRENTRXANTENNA, ASN_INTEGER , RWRITE, var_dot11PhyAntennaTable, 4, { 4,2,1,3 } },
++#define DOT11NUMBERSUPPORTEDPOWERLEVELS 98
++ { DOT11NUMBERSUPPORTEDPOWERLEVELS, ASN_INTEGER , RONLY , var_dot11PhyTxPowerTable, 4, { 4,3,1,1 } },
++#define DOT11TXPOWERLEVEL1 99
++ { DOT11TXPOWERLEVEL1 , ASN_INTEGER , RONLY , var_dot11PhyTxPowerTable, 4, { 4,3,1,2 } },
++#define DOT11TXPOWERLEVEL2 100
++ { DOT11TXPOWERLEVEL2 , ASN_INTEGER , RONLY , var_dot11PhyTxPowerTable, 4, { 4,3,1,3 } },
++#define DOT11TXPOWERLEVEL3 101
++ { DOT11TXPOWERLEVEL3 , ASN_INTEGER , RONLY , var_dot11PhyTxPowerTable, 4, { 4,3,1,4 } },
++#define DOT11TXPOWERLEVEL4 102
++ { DOT11TXPOWERLEVEL4 , ASN_INTEGER , RONLY , var_dot11PhyTxPowerTable, 4, { 4,3,1,5 } },
++#define DOT11TXPOWERLEVEL5 103
++ { DOT11TXPOWERLEVEL5 , ASN_INTEGER , RONLY , var_dot11PhyTxPowerTable, 4, { 4,3,1,6 } },
++#define DOT11TXPOWERLEVEL6 104
++ { DOT11TXPOWERLEVEL6 , ASN_INTEGER , RONLY , var_dot11PhyTxPowerTable, 4, { 4,3,1,7 } },
++#define DOT11TXPOWERLEVEL7 105
++ { DOT11TXPOWERLEVEL7 , ASN_INTEGER , RONLY , var_dot11PhyTxPowerTable, 4, { 4,3,1,8 } },
++#define DOT11TXPOWERLEVEL8 106
++ { DOT11TXPOWERLEVEL8 , ASN_INTEGER , RONLY , var_dot11PhyTxPowerTable, 4, { 4,3,1,9 } },
++#define DOT11CURRENTTXPOWERLEVEL 107
++ { DOT11CURRENTTXPOWERLEVEL, ASN_INTEGER , RWRITE, var_dot11PhyTxPowerTable, 4, { 4,3,1,10 } },
++
++#define DOT11HOPTIME 110
++ { DOT11HOPTIME , ASN_INTEGER , RONLY , var_dot11PhyFHSSTable, 4, { 4,4,1,1 } },
++#define DOT11CURRENTCHANNELNUMBER 111
++ { DOT11CURRENTCHANNELNUMBER, ASN_INTEGER , RWRITE, var_dot11PhyFHSSTable, 4, { 4,4,1,2 } },
++#define DOT11MAXDWELLTIME 112
++ { DOT11MAXDWELLTIME , ASN_INTEGER , RONLY , var_dot11PhyFHSSTable, 4, { 4,4,1,3 } },
++#define DOT11CURRENTDWELLTIME 113
++ { DOT11CURRENTDWELLTIME, ASN_INTEGER , RWRITE, var_dot11PhyFHSSTable, 4, { 4,4,1,4 } },
++#define DOT11CURRENTSET 114
++ { DOT11CURRENTSET , ASN_INTEGER , RWRITE, var_dot11PhyFHSSTable, 4, { 4,4,1,5 } },
++#define DOT11CURRENTPATTERN 115
++ { DOT11CURRENTPATTERN , ASN_INTEGER , RWRITE, var_dot11PhyFHSSTable, 4, { 4,4,1,6 } },
++#define DOT11CURRENTINDEX 116
++ { DOT11CURRENTINDEX , ASN_INTEGER , RWRITE, var_dot11PhyFHSSTable, 4, { 4,4,1,7 } },
++
++#define DOT11CURRENTCHANNEL 119
++ { DOT11CURRENTCHANNEL , ASN_INTEGER , RWRITE, var_dot11PhyDSSSTable, 4, { 4,5,1,1 } },
++#define DOT11CCAMODESUPPORTED 120
++ { DOT11CCAMODESUPPORTED, ASN_INTEGER , RONLY , var_dot11PhyDSSSTable, 4, { 4,5,1,2 } },
++#define DOT11CURRENTCCAMODE 121
++ { DOT11CURRENTCCAMODE , ASN_INTEGER , RWRITE, var_dot11PhyDSSSTable, 4, { 4,5,1,3 } },
++#define DOT11EDTHRESHOLD 122
++ { DOT11EDTHRESHOLD , ASN_INTEGER , RWRITE, var_dot11PhyDSSSTable, 4, { 4,5,1,4 } },
++
++#define DOT11CCAWATCHDOGTIMERMAX 125
++ { DOT11CCAWATCHDOGTIMERMAX, ASN_INTEGER , RWRITE, var_dot11PhyIRTable, 4, { 4,6,1,1 } },
++#define DOT11CCAWATCHDOGCOUNTMAX 126
++ { DOT11CCAWATCHDOGCOUNTMAX, ASN_INTEGER , RWRITE, var_dot11PhyIRTable, 4, { 4,6,1,2 } },
++#define DOT11CCAWATCHDOGTIMERMIN 127
++ { DOT11CCAWATCHDOGTIMERMIN, ASN_INTEGER , RWRITE, var_dot11PhyIRTable, 4, { 4,6,1,3 } },
++#define DOT11CCAWATCHDOGCOUNTMIN 128
++ { DOT11CCAWATCHDOGCOUNTMIN, ASN_INTEGER , RWRITE, var_dot11PhyIRTable, 4, { 4,6,1,4 } },
++
++#define DOT11REGDOMAINSSUPPORTVALUE 132
++ { DOT11REGDOMAINSSUPPORTVALUE, ASN_INTEGER , RONLY , var_dot11RegDomainsSupportedTable, 4, { 4,7,1,2 } },
++
++#define DOT11SUPPORTEDTXANTENNA 136
++ { DOT11SUPPORTEDTXANTENNA, ASN_INTEGER , RWRITE, var_dot11AntennasListTable, 4, { 4,8,1,2 } },
++#define DOT11SUPPORTEDRXANTENNA 137
++ { DOT11SUPPORTEDRXANTENNA, ASN_INTEGER , RWRITE, var_dot11AntennasListTable, 4, { 4,8,1,3 } },
++#define DOT11DIVERSITYSELECTIONRX 138
++ { DOT11DIVERSITYSELECTIONRX, ASN_INTEGER , RWRITE, var_dot11AntennasListTable, 4, { 4,8,1,4 } },
++
++#define DOT11SUPPORTEDDATARATESTXVALUE 142
++ { DOT11SUPPORTEDDATARATESTXVALUE, ASN_INTEGER , RONLY , var_dot11SupportedDataRatesTxTable, 4, { 4,9,1,2 } },
++
++#define DOT11SUPPORTEDDATARATESRXVALUE 146
++ { DOT11SUPPORTEDDATARATESRXVALUE, ASN_INTEGER , RONLY , var_dot11SupportedDataRatesRxTable, 4, { 4,10,1,2 } },
++};
++// ( L = length of the oidsuffix )
++
++/****************************************************************************
++* *
++* init_ieee802dot11() - perform any required initialization *
++* *
++****************************************************************************/
++void init_ieee802dot11 ( void ) {
++
++ /* register ourselves with the agent to handle our mib tree */
++ REGISTER_MIB("ieee802dot11", ieee802dot11_variables, variable7,
++ ieee802dot11_variables_oid);
++
++ initLists();
++}
++
++/****************************************************************************
++* *
++* shutdown_ieee802dot11() - perform any required cleanup @ shutdown *
++* *
++****************************************************************************/
++void shutdown_ieee802dot11 ( void )
++{
++ flushLists();
++}
++
++/****************************************************************************
++* *
++* var_ieee802dot11() - *
++* *
++****************************************************************************/
++unsigned char *
++var_ieee802dot11 ( struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method)
++{
++ loadTables();
++
++ if ( header_generic ( vp, name, length, exact,var_len,write_method )
++ == MATCH_FAILED )
++ return NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11RESOURCETYPEIDNAME:
++ if ( !haveResourceTypeIDName )
++ return NULL;
++ *var_len = strlen ( resourceTypeIDName );
++ return ( UCHAR * ) resourceTypeIDName;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11StationConfigTable() - return a variable value from the table *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11StationConfigTable ( struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method )
++{
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++ static char MACWork[17];
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &scList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ sc = ( struct scTbl_data * ) np->data;
++ rName[vp->namelen] = sc->ifIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) > 0 ))) {
++
++ switch ( vp->magic ) { // found requested OID, now check for requested variable
++ case DOT11STATIONID:
++ if ( sc->haveStationID ) found = TRUE; break;
++ case DOT11MEDIUMOCCUPANCYLIMIT:
++ if ( sc->haveMediumOccupancyLimit ) found = TRUE; break;
++ case DOT11CFPOLLABLE:
++ if ( sc->haveCFPPollable ) found = TRUE; break;
++ case DOT11CFPPERIOD:
++ if ( sc->haveCFPPeriod ) found = TRUE; break;
++ case DOT11CFPMAXDURATION:
++ if ( sc->haveMaxDuration ) found = TRUE; break;
++ case DOT11AUTHENTICATIONRESPONSETIMEOUT:
++ if ( sc->haveAuthenticationResponseTimeOut ) found = TRUE; break;
++ case DOT11PRIVACYOPTIONIMPLEMENTED:
++ if ( sc->havePrivacyOptionImplemented ) found = TRUE; break;
++ case DOT11POWERMANAGEMENTMODE:
++ if ( sc->havePowerManagementMode ) found = TRUE; break;
++ case DOT11DESIREDSSID:
++ if ( sc->haveDesiredSSID ) found = TRUE; break;
++ case DOT11DESIREDBSSTYPE:
++ if ( sc->haveDesiredBSSType ) found = TRUE; break;
++ case DOT11OPERATIONALRATESET:
++ if ( sc->haveOperationalRateSet ) found = TRUE; break;
++ case DOT11BEACONPERIOD:
++ if ( sc->haveBeaconPeriod ) found = TRUE; break;
++ case DOT11DTIMPERIOD:
++ if ( sc->haveDTIMPeriod ) found = TRUE; break;
++ case DOT11ASSOCIATIONRESPONSETIMEOUT:
++ if ( sc->haveAssociationResponseTimeOut ) found = TRUE; break;
++ case DOT11DISASSOCIATEREASON:
++ if ( sc->disAssociationReason ) found = TRUE; break;
++ case DOT11DISASSOCIATESTATION:
++ if ( sc->haveDisAssociationStation ) found = TRUE; break;
++ case DOT11DEAUTHENTICATEREASON:
++ if ( sc->deAuthenticationReason ) found = TRUE; break;
++ case DOT11DEAUTHENTICATESTATION:
++ if ( sc->haveDeAuthenticationStation ) found = TRUE; break;
++ case DOT11AUTHENTICATEFAILSTATUS:
++ if ( sc->authenticateFailStatus ) found = TRUE; break;
++ case DOT11AUTHENTICATEFAILSTATION:
++ if ( sc->haveAuthenticateFailStation ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
++ *length = vp->namelen + 1;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11STATIONID:
++// *write_method = write_dot11StationID;
++ MACWork[ 0] = sc->stationID [ 0];
++ MACWork[ 1] = sc->stationID [ 1];
++ MACWork[ 2] = sc->stationID [ 3];
++ MACWork[ 3] = sc->stationID [ 4];
++ MACWork[ 4] = sc->stationID [ 6];
++ MACWork[ 5] = sc->stationID [ 7];
++ MACWork[ 6] = sc->stationID [ 9];
++ MACWork[ 7] = sc->stationID [10];
++ MACWork[ 8] = sc->stationID [12];
++ MACWork[ 9] = sc->stationID [13];
++ MACWork[10] = sc->stationID [15];
++ MACWork[11] = sc->stationID [16];
++ MACWork[12] = '\0';
++ *var_len = 6;
++ return ( UCHAR * ) htob ( MACWork );
++
++ case DOT11MEDIUMOCCUPANCYLIMIT:
++// *write_method = write_dot11MediumOccupancyLimit;
++ sc->mediumOccupancyLimit = 5;
++ return ( UCHAR * ) &sc->mediumOccupancyLimit;
++
++ case DOT11CFPOLLABLE:
++ return ( UCHAR * ) &sc->CFPPollable;
++
++ case DOT11CFPPERIOD:
++// *write_method = write_dot11CFPPeriod;
++ return ( UCHAR * ) &sc->CFPPeriod;
++
++ case DOT11CFPMAXDURATION:
++// *write_method = write_dot11CFPMaxDuration;
++ return ( UCHAR * ) &sc->maxDuration;
++
++ case DOT11AUTHENTICATIONRESPONSETIMEOUT:
++// *write_method = write_dot11AuthenticationResponseTimeOut;
++ return ( UCHAR * ) &sc->authenticationResponseTimeOut;
++
++ case DOT11PRIVACYOPTIONIMPLEMENTED:
++ return ( UCHAR * ) &sc->privacyOptionImplemented;
++
++ case DOT11POWERMANAGEMENTMODE:
++// *write_method = write_dot11PowerManagementMode;
++ return ( UCHAR * ) &sc->powerManagementMode;
++
++ case DOT11DESIREDSSID:
++// *write_method = write_dot11DesiredSSID;
++ *var_len = strlen ( sc->desiredSSID );
++ return ( UCHAR * ) sc->desiredSSID;
++
++ case DOT11DESIREDBSSTYPE:
++// *write_method = write_dot11DesiredBSSType;
++ return ( UCHAR * ) &sc->desiredBSSType;
++
++ case DOT11OPERATIONALRATESET:
++// *write_method = write_dot11OperationalRateSet;
++ *var_len = strlen ( sc->operationalRateSet );
++ return ( UCHAR * ) sc->operationalRateSet;
++
++ case DOT11BEACONPERIOD:
++// *write_method = write_dot11BeaconPeriod;
++ return ( UCHAR * ) &sc->beaconPeriod;
++
++ case DOT11DTIMPERIOD:
++// *write_method = write_dot11DTIMPeriod;
++ return ( UCHAR * ) &sc->DTIMPeriod;
++
++ case DOT11ASSOCIATIONRESPONSETIMEOUT:
++// *write_method = write_dot11AssociationResponseTimeOut;
++ return ( UCHAR * ) &sc->associationResponseTimeOut;
++
++ case DOT11DISASSOCIATEREASON:
++ return ( UCHAR * ) &sc->disAssociationReason;
++
++ case DOT11DISASSOCIATESTATION:
++ MACWork[ 0] = sc->disAssociationStation[ 0];
++ MACWork[ 1] = sc->disAssociationStation[ 1];
++ MACWork[ 2] = sc->disAssociationStation[ 3];
++ MACWork[ 3] = sc->disAssociationStation[ 4];
++ MACWork[ 4] = sc->disAssociationStation[ 6];
++ MACWork[ 5] = sc->disAssociationStation[ 7];
++ MACWork[ 6] = sc->disAssociationStation[ 9];
++ MACWork[ 7] = sc->disAssociationStation[10];
++ MACWork[ 8] = sc->disAssociationStation[12];
++ MACWork[ 9] = sc->disAssociationStation[13];
++ MACWork[10] = sc->disAssociationStation[15];
++ MACWork[11] = sc->disAssociationStation[16];
++ MACWork[12] = '\0';
++ *var_len = 6;
++ return ( UCHAR * ) htob ( MACWork );
++
++ case DOT11DEAUTHENTICATEREASON:
++ return ( UCHAR * ) &sc->deAuthenticationReason;
++
++ case DOT11DEAUTHENTICATESTATION:
++ MACWork[ 0] = sc->deAuthenticationStation[ 0];
++ MACWork[ 1] = sc->deAuthenticationStation[ 1];
++ MACWork[ 2] = sc->deAuthenticationStation[ 3];
++ MACWork[ 3] = sc->deAuthenticationStation[ 4];
++ MACWork[ 4] = sc->deAuthenticationStation[ 6];
++ MACWork[ 5] = sc->deAuthenticationStation[ 7];
++ MACWork[ 6] = sc->deAuthenticationStation[ 9];
++ MACWork[ 7] = sc->deAuthenticationStation[10];
++ MACWork[ 8] = sc->deAuthenticationStation[12];
++ MACWork[ 9] = sc->deAuthenticationStation[13];
++ MACWork[10] = sc->deAuthenticationStation[15];
++ MACWork[11] = sc->deAuthenticationStation[16];
++ MACWork[12] = '\0';
++ *var_len = 6;
++ return ( UCHAR * ) htob ( MACWork );
++
++ case DOT11AUTHENTICATEFAILSTATUS:
++ return ( UCHAR * ) &sc->authenticateFailStatus;
++
++ case DOT11AUTHENTICATEFAILSTATION:
++ MACWork[ 0] = sc->authenticateFailStation[ 0];
++ MACWork[ 1] = sc->authenticateFailStation[ 1];
++ MACWork[ 2] = sc->authenticateFailStation[ 3];
++ MACWork[ 3] = sc->authenticateFailStation[ 4];
++ MACWork[ 4] = sc->authenticateFailStation[ 6];
++ MACWork[ 5] = sc->authenticateFailStation[ 7];
++ MACWork[ 6] = sc->authenticateFailStation[ 9];
++ MACWork[ 7] = sc->authenticateFailStation[10];
++ MACWork[ 8] = sc->authenticateFailStation[12];
++ MACWork[ 9] = sc->authenticateFailStation[13];
++ MACWork[10] = sc->authenticateFailStation[15];
++ MACWork[11] = sc->authenticateFailStation[16];
++ MACWork[12] = '\0';
++ *var_len = 6;
++ return ( UCHAR * ) htob ( MACWork );
++
++ default:
++ ERROR_MSG ( "" );
++ }
++
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11AuthenticationAlgorithmsTable() - *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11AuthenticationAlgorithmsTable ( struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method )
++{
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &aaList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ aa = ( struct aaTbl_data * ) np->data;
++ rName[vp->namelen + 0] = aa->ifIndex;
++ rName[vp->namelen + 1] = aa->authenticationAlgorithmsIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) > 0 ))) {
++ switch ( vp->magic ) {
++ case DOT11AUTHENTICATIONALGORITHM:
++ if ( aa->haveAuthenticationAlgorithm ) found = TRUE; break;
++ case DOT11AUTHENTICATIONALGORITHMSENABLE:
++ if ( aa->authenticationAlgorithmsEnable ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 2 ) * sizeof ( oid ));
++ *length = vp->namelen + 2;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11AUTHENTICATIONALGORITHM:
++ return ( UCHAR * ) &aa->authenticationAlgorithm;
++
++ case DOT11AUTHENTICATIONALGORITHMSENABLE:
++// *write_method = write_dot11AuthenticationAlgorithmsEnable;
++ return ( UCHAR * ) &aa->authenticationAlgorithmsEnable;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11WEPDefaultKeysTable() - *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11WEPDefaultKeysTable ( struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method )
++{
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &dfList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ df = ( struct dfTbl_data * ) np->data;
++ rName[vp->namelen + 0] = df->ifIndex;
++ rName[vp->namelen + 1] = df->WEPDefaultKeyIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) > 0 ))) {
++ switch ( vp->magic ) {
++ case DOT11WEPDEFAULTKEYVALUE:
++ if ( df->haveWEPDefaultKeyValue ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 2 ) * sizeof ( oid ));
++ *length = vp->namelen + 2;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11WEPDEFAULTKEYVALUE:
++// *write_method = write_dot11WEPDefaultKeyValue;
++ *var_len = strlen ( df->WEPDefaultKeyValue );
++ return ( UCHAR * ) df->WEPDefaultKeyValue;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11WEPKeyMappingsTable() - *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11WEPKeyMappingsTable ( struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method)
++{
++ static char MACWork[17];
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &kmList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ km = ( struct kmTbl_data * ) np->data;
++ rName[vp->namelen + 0] = km->ifIndex;
++ rName[vp->namelen + 1] = km->WEPKeyMappingIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) > 0 ))) {
++ switch ( vp->magic ) {
++ case DOT11WEPKEYMAPPINGADDRESS:
++ if ( km->haveWEPKeyMappingAddress ) found = TRUE; break;
++ case DOT11WEPKEYMAPPINGWEPON:
++ if ( km->haveWEPKeyMappingWEPOn ) found = TRUE; break;
++ case DOT11WEPKEYMAPPINGVALUE:
++ if ( km->haveWEPKeyMappingValue ) found = TRUE; break;
++ case DOT11WEPKEYMAPPINGSTATUS:
++ if ( km->haveWEPKeyMappingStatus ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 2 ) * sizeof ( oid ));
++ *length = vp->namelen + 2;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11WEPKEYMAPPINGADDRESS:
++// *write_method = write_dot11WEPKeyMappingAddress;
++ MACWork[ 0] = km->WEPKeyMappingAddress[ 0];
++ MACWork[ 1] = km->WEPKeyMappingAddress[ 1];
++ MACWork[ 2] = km->WEPKeyMappingAddress[ 3];
++ MACWork[ 3] = km->WEPKeyMappingAddress[ 4];
++ MACWork[ 4] = km->WEPKeyMappingAddress[ 6];
++ MACWork[ 5] = km->WEPKeyMappingAddress[ 7];
++ MACWork[ 6] = km->WEPKeyMappingAddress[ 9];
++ MACWork[ 7] = km->WEPKeyMappingAddress[10];
++ MACWork[ 8] = km->WEPKeyMappingAddress[12];
++ MACWork[ 9] = km->WEPKeyMappingAddress[13];
++ MACWork[10] = km->WEPKeyMappingAddress[15];
++ MACWork[11] = km->WEPKeyMappingAddress[16];
++ MACWork[12] = '\0';
++ *var_len = 6;
++ return ( UCHAR * ) htob ( MACWork );
++
++ case DOT11WEPKEYMAPPINGWEPON:
++// *write_method = write_dot11WEPKeyMappingWEPOn;
++ return ( UCHAR * ) &km->WEPKeyMappingWEPOn;
++
++ case DOT11WEPKEYMAPPINGVALUE:
++// *write_method = write_dot11WEPKeyMappingValue;
++ *var_len = strlen ( km->WEPKeyMappingValue );
++ return ( UCHAR * ) km->WEPKeyMappingValue;
++
++ case DOT11WEPKEYMAPPINGSTATUS:
++// *write_method = write_dot11WEPKeyMappingStatus;
++ return ( UCHAR * ) &km->WEPKeyMappingStatus;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11PrivacyTable() - *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11PrivacyTable ( struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method )
++{
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &prList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ pr = ( struct prTbl_data * ) np->data;
++ rName[vp->namelen] = pr->ifIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) > 0 ))) {
++ switch ( vp->magic ) {
++ case DOT11PRIVACYINVOKED:
++ if ( pr->havePrivacyInvoked ) found = TRUE; break;
++ case DOT11WEPDEFAULTKEYID:
++ if ( pr->haveWEPDefaultKeyID ) found = TRUE; break;
++ case DOT11WEPKEYMAPPINGLENGTH:
++ if ( pr->haveWEPKeyMappingLength ) found = TRUE; break;
++ case DOT11EXCLUDEUNENCRYPTED:
++ if ( pr->haveExcludeUnencrypted ) found = TRUE; break;
++ case DOT11WEPICVERRORCOUNT:
++ if ( pr->haveWEPICVErrorCount ) found = TRUE; break;
++ case DOT11WEPEXCLUDEDCOUNT:
++ if ( pr->haveWEPExcludedCount ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
++ *length = vp->namelen + 1;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11PRIVACYINVOKED:
++// *write_method = write_dot11PrivacyInvoked;
++ return ( UCHAR * ) &pr->privacyInvoked;
++
++ case DOT11WEPDEFAULTKEYID:
++// *write_method = write_dot11WEPDefaultKeyID;
++ return ( UCHAR * ) &pr->WEPDefaultKeyID;
++
++ case DOT11WEPKEYMAPPINGLENGTH:
++// *write_method = write_dot11WEPKeyMappingLength;
++ return ( UCHAR * ) &pr->WEPKeyMappingLength;
++
++ case DOT11EXCLUDEUNENCRYPTED:
++// *write_method = write_dot11ExcludeUnencrypted;
++ return ( UCHAR * ) &pr->excludeUnencrypted;
++
++ case DOT11WEPICVERRORCOUNT:
++ return ( UCHAR * ) &pr->WEPICVErrorCount;
++
++ case DOT11WEPEXCLUDEDCOUNT:
++ return ( UCHAR * ) &pr->WEPExcludedCount;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11OperationTable() - *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11OperationTable ( struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method )
++{
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++ static char MACWork[17];
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &opList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ op = ( struct opTbl_data * ) np->data;
++ rName[vp->namelen] = op->ifIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) > 0 ))) {
++
++ switch ( vp->magic ) { // found requested OID, now check for requested variable
++ case DOT11MACADDRESS:
++ if ( op->haveMACAddress ) found = TRUE; break;
++ case DOT11RTSTHRESHOLD:
++ if ( op->haveRTSThreshold ) found = TRUE; break;
++ case DOT11SHORTRETRYLIMIT:
++ if ( op->haveShortRetryLimit ) found = TRUE; break;
++ case DOT11LONGRETRYLIMIT:
++ if ( op->haveLongRetryLimit ) found = TRUE; break;
++ case DOT11FRAGMENTATIONTHRESHOLD:
++ if ( op->haveFragmentationThreshold ) found = TRUE; break;
++ case DOT11MAXTRANSMITMSDULIFETIME:
++ if ( op->haveMaxTransmitMSDULifetime ) found = TRUE; break;
++ case DOT11MAXRECEIVELIFETIME:
++ if ( op->haveMaxReceiveLifetime ) found = TRUE; break;
++ case DOT11MANUFACTURERID:
++ if ( op->haveManufacturerID ) found = TRUE; break;
++ case DOT11PRODUCTID:
++ if ( op->haveProductID ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
++ *length = vp->namelen + 1;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11MACADDRESS:
++ MACWork[ 0] = op->MACAddress[ 0];
++ MACWork[ 1] = op->MACAddress[ 1];
++ MACWork[ 2] = op->MACAddress[ 3];
++ MACWork[ 3] = op->MACAddress[ 4];
++ MACWork[ 4] = op->MACAddress[ 6];
++ MACWork[ 5] = op->MACAddress[ 7];
++ MACWork[ 6] = op->MACAddress[ 9];
++ MACWork[ 7] = op->MACAddress[10];
++ MACWork[ 8] = op->MACAddress[12];
++ MACWork[ 9] = op->MACAddress[13];
++ MACWork[10] = op->MACAddress[15];
++ MACWork[11] = op->MACAddress[16];
++ MACWork[12] = '\0';
++ *var_len = 6;
++ return ( UCHAR * ) htob ( MACWork );
++
++ case DOT11RTSTHRESHOLD:
++// *write_method = write_dot11RTSThreshold;
++ return ( UCHAR * ) &op->RTSThreshold;
++
++ case DOT11SHORTRETRYLIMIT:
++// *write_method = write_dot11ShortRetryLimit;
++ return ( UCHAR * ) &op->shortRetryLimit;
++
++ case DOT11LONGRETRYLIMIT:
++// *write_method = write_dot11LongRetryLimit;
++ return ( UCHAR * ) &op->longRetryLimit;
++
++ case DOT11FRAGMENTATIONTHRESHOLD:
++// *write_method = write_dot11FragmentationThreshold;
++ return ( UCHAR * ) &op->fragmentationThreshold;
++
++ case DOT11MAXTRANSMITMSDULIFETIME:
++// *write_method = write_dot11MaxTransmitMSDULifetime;
++ return ( UCHAR * ) &op->maxTransmitMSDULifetime;
++
++ case DOT11MAXRECEIVELIFETIME:
++// *write_method = write_dot11MaxReceiveLifetime;
++ return ( UCHAR * ) &op->maxReceiveLifetime;
++
++ case DOT11MANUFACTURERID:
++ *var_len = strlen ( op->manufacturerID );
++ return ( UCHAR * ) op->manufacturerID;
++
++ case DOT11PRODUCTID:
++ *var_len = strlen ( op->productID );
++ return ( UCHAR * ) op->productID;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11CountersTable() - *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11CountersTable(struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method)
++{
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &coList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ co = ( struct coTbl_data * ) np->data;
++ rName[vp->namelen] = co->ifIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) > 0 ))) {
++ switch ( vp->magic ) {
++ case DOT11TRANSMITTEDFRAGMENTCOUNT:
++ if ( co->haveTransmittedFragmentCount ) found = TRUE; break;
++ case DOT11MULTICASTTRANSMITTEDFRAMECOUNT:
++ if ( co->haveTransmittedFrameCount ) found = TRUE; break;
++ case DOT11FAILEDCOUNT:
++ if ( co->haveFailedCount ) found = TRUE; break;
++ case DOT11RETRYCOUNT:
++ if ( co->haveRetryCount ) found = TRUE; break;
++ case DOT11MULTIPLERETRYCOUNT:
++ if ( co->haveMultipleRetryCount ) found = TRUE; break;
++ case DOT11FRAMEDUPLICATECOUNT:
++ if ( co->haveFrameDuplicateCount ) found = TRUE; break;
++ case DOT11RTSSUCCESSCOUNT:
++ if ( co->haveRTSSuccessCount ) found = TRUE; break;
++ case DOT11RTSFAILURECOUNT:
++ if ( co->haveRTSFailureCount ) found = TRUE; break;
++ case DOT11ACKFAILURECOUNT:
++ if ( co->haveACKFailureCount ) found = TRUE; break;
++ case DOT11RECEIVEDFRAGMENTCOUNT:
++ if ( co->haveReceivedFragmentCount ) found = TRUE; break;
++ case DOT11MULTICASTRECEIVEDFRAMECOUNT:
++ if ( co->haveMulticastReceivedFrameCount ) found = TRUE; break;
++ case DOT11FCSERRORCOUNT:
++ if ( co->haveFCSErrorCount ) found = TRUE; break;
++ case DOT11TRANSMITTEDFRAMECOUNT:
++ if ( co->haveTransmittedFrameCount ) found = TRUE; break;
++ case DOT11WEPUNDECRYPTABLECOUNT:
++ if ( co->haveWEPUndecryptableCount ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
++ *length = vp->namelen + 1;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11TRANSMITTEDFRAGMENTCOUNT: return ( UCHAR * ) &co->transmittedFragmentCount;
++ case DOT11MULTICASTTRANSMITTEDFRAMECOUNT: return ( UCHAR * ) &co->transmittedFrameCount;
++ case DOT11FAILEDCOUNT: return ( UCHAR * ) &co->failedCount;
++ case DOT11RETRYCOUNT: return ( UCHAR * ) &co->retryCount;
++ case DOT11MULTIPLERETRYCOUNT: return ( UCHAR * ) &co->multipleRetryCount;
++ case DOT11FRAMEDUPLICATECOUNT: return ( UCHAR * ) &co->frameDuplicateCount;
++ case DOT11RTSSUCCESSCOUNT: return ( UCHAR * ) &co->RTSSuccessCount;
++ case DOT11RTSFAILURECOUNT: return ( UCHAR * ) &co->RTSFailureCount;
++ case DOT11ACKFAILURECOUNT: return ( UCHAR * ) &co->ACKFailureCount;
++ case DOT11RECEIVEDFRAGMENTCOUNT: return ( UCHAR * ) &co->receivedFragmentCount;
++ case DOT11MULTICASTRECEIVEDFRAMECOUNT: return ( UCHAR * ) &co->multicastReceivedFrameCount;
++ case DOT11FCSERRORCOUNT: return ( UCHAR * ) &co->FCSErrorCount;
++ case DOT11TRANSMITTEDFRAMECOUNT: return ( UCHAR * ) &co->transmittedFrameCount;
++ case DOT11WEPUNDECRYPTABLECOUNT: return ( UCHAR * ) &co->WEPUndecryptableCount;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11GroupAddressesTable() - *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11GroupAddressesTable(struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method)
++{
++ static char MACWork[17];
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &gaList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ ga = ( struct gaTbl_data * ) np->data;
++ rName[vp->namelen + 0] = ga->ifIndex;
++ rName[vp->namelen + 1] = ga->groupAddressesIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) > 0 ))) {
++ switch ( vp->magic ) {
++ case DOT11ADDRESS:
++ if ( ga->haveAddress ) found = TRUE; break;
++ case DOT11GROUPADDRESSESSTATUS:
++ if ( ga->haveGroupAddressesStatus ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 2 ) * sizeof ( oid ));
++ *length = vp->namelen + 2;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11ADDRESS:
++// *write_method = write_dot11Address;
++ MACWork[ 0] = ga->address[ 0];
++ MACWork[ 1] = ga->address[ 1];
++ MACWork[ 2] = ga->address[ 3];
++ MACWork[ 3] = ga->address[ 4];
++ MACWork[ 4] = ga->address[ 6];
++ MACWork[ 5] = ga->address[ 7];
++ MACWork[ 6] = ga->address[ 9];
++ MACWork[ 7] = ga->address[10];
++ MACWork[ 8] = ga->address[12];
++ MACWork[ 9] = ga->address[13];
++ MACWork[10] = ga->address[15];
++ MACWork[11] = ga->address[16];
++ MACWork[12] = '\0';
++ *var_len = 6;
++ return ( UCHAR * ) htob ( MACWork );
++
++ case DOT11GROUPADDRESSESSTATUS:
++// *write_method = write_dot11GroupAddressesStatus;
++ return ( UCHAR * ) &ga->groupAddressesStatus;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11ResourceInfoTable() - *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11ResourceInfoTable ( struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method )
++{
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &riList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ ri = ( struct riTbl_data * ) np->data;
++ rName[vp->namelen] = ri->ifIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) > 0 ))) {
++ switch ( vp->magic ) {
++ case DOT11MANUFACTUREROUI:
++ if ( ri->haveManufacturerOUI ) found = TRUE; break;
++ case DOT11MANUFACTURERNAME:
++ if ( ri->haveManufacturerName ) found = TRUE; break;
++ case DOT11MANUFACTURERPRODUCTNAME:
++ if ( ri->haveManufacturerProductName ) found = TRUE; break;
++ case DOT11MANUFACTURERPRODUCTVERSION:
++ if ( ri->haveManufacturerProductVersion ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
++ *length = vp->namelen + 1;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11MANUFACTUREROUI:
++ *var_len = strlen ( ri->manufacturerOUI );
++ return ( UCHAR * ) ri->manufacturerOUI;
++
++ case DOT11MANUFACTURERNAME:
++ *var_len = strlen ( ri->manufacturerName );
++ return ( UCHAR * ) ri->manufacturerName;
++
++ case DOT11MANUFACTURERPRODUCTNAME:
++ *var_len = strlen ( ri->manufacturerProductName );
++ return ( UCHAR * ) ri->manufacturerProductName;
++
++ case DOT11MANUFACTURERPRODUCTVERSION:
++ *var_len = strlen ( ri->manufacturerProductVersion );
++ return ( UCHAR * ) ri->manufacturerProductVersion;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11PhyOperationTable() - *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11PhyOperationTable ( struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method )
++{
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &poList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ po = ( struct poTbl_data * ) np->data;
++ rName[vp->namelen] = po->ifIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) > 0 ))) {
++ switch ( vp->magic ) {
++ case DOT11PHYTYPE:
++ if ( po->havePHYType ) found = TRUE; break;
++ case DOT11CURRENTREGDOMAIN:
++ if ( po->haveCurrentRegDomain ) found = TRUE; break;
++ case DOT11TEMPTYPE:
++ if ( po->haveTempType ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
++ *length = vp->namelen + 1;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11PHYTYPE:
++ return ( UCHAR * ) &po->PHYType;
++
++ case DOT11CURRENTREGDOMAIN:
++// *write_method = write_dot11CurrentRegDomain;
++ return ( UCHAR * ) &po->currentRegDomain;
++
++ case DOT11TEMPTYPE:
++ return ( UCHAR * ) &po->tempType;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11PhyAntennaTable() - *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11PhyAntennaTable ( struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method )
++{
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &paList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ pa = ( struct paTbl_data * ) np->data;
++ rName[vp->namelen] = pa->ifIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) > 0 ))) {
++ switch ( vp->magic ) {
++ case DOT11CURRENTTXANTENNA:
++ if ( pa->haveCurrentTxAntenna ) found = TRUE; break;
++ case DOT11DIVERSITYSUPPORT:
++ if ( pa->haveDiversitySupport ) found = TRUE; break;
++ case DOT11CURRENTRXANTENNA:
++ if ( pa->haveCurrentRxAntenna ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
++ *length = vp->namelen + 1;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11CURRENTTXANTENNA:
++// *write_method = write_dot11CurrentTxAntenna;
++ return ( UCHAR * ) &pa->currentTxAntenna;
++
++ case DOT11DIVERSITYSUPPORT:
++ return ( UCHAR * ) &pa->diversitySupport;
++
++ case DOT11CURRENTRXANTENNA:
++// *write_method = write_dot11CurrentRxAntenna;
++ return ( UCHAR * ) &pa->currentRxAntenna;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11PhyTxPowerTable() - *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11PhyTxPowerTable ( struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method )
++{
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &ptList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ pt = ( struct ptTbl_data * ) np->data;
++ rName[vp->namelen] = pt->ifIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) > 0 ))) {
++ switch ( vp->magic ) {
++ case DOT11NUMBERSUPPORTEDPOWERLEVELS:
++ if ( pt->haveNumberSupportedPowerLevels ) found = TRUE; break;
++ case DOT11TXPOWERLEVEL1:
++ if ( pt->haveTxPowerLevel1 ) found = TRUE; break;
++ case DOT11TXPOWERLEVEL2:
++ if ( pt->haveTxPowerLevel2 ) found = TRUE; break;
++ case DOT11TXPOWERLEVEL3:
++ if ( pt->haveTxPowerLevel3 ) found = TRUE; break;
++ case DOT11TXPOWERLEVEL4:
++ if ( pt->haveTxPowerLevel4 ) found = TRUE; break;
++ case DOT11TXPOWERLEVEL5:
++ if ( pt->haveTxPowerLevel5 ) found = TRUE; break;
++ case DOT11TXPOWERLEVEL6:
++ if ( pt->haveTxPowerLevel6 ) found = TRUE; break;
++ case DOT11TXPOWERLEVEL7:
++ if ( pt->haveTxPowerLevel7 ) found = TRUE; break;
++ case DOT11TXPOWERLEVEL8:
++ if ( pt->haveTxPowerLevel8 ) found = TRUE; break;
++ case DOT11CURRENTTXPOWERLEVEL:
++ if ( pt->currentTxPowerLevel ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
++ *length = vp->namelen + 1;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11NUMBERSUPPORTEDPOWERLEVELS:
++ return ( UCHAR * ) &pt->numberSupportedPowerLevels;
++
++ case DOT11TXPOWERLEVEL1: return ( UCHAR * ) &pt->TxPowerLevel1;
++ case DOT11TXPOWERLEVEL2: return ( UCHAR * ) &pt->TxPowerLevel2;
++ case DOT11TXPOWERLEVEL3: return ( UCHAR * ) &pt->TxPowerLevel3;
++ case DOT11TXPOWERLEVEL4: return ( UCHAR * ) &pt->TxPowerLevel4;
++ case DOT11TXPOWERLEVEL5: return ( UCHAR * ) &pt->TxPowerLevel5;
++ case DOT11TXPOWERLEVEL6: return ( UCHAR * ) &pt->TxPowerLevel6;
++ case DOT11TXPOWERLEVEL7: return ( UCHAR * ) &pt->TxPowerLevel7;
++ case DOT11TXPOWERLEVEL8: return ( UCHAR * ) &pt->TxPowerLevel8;
++
++ case DOT11CURRENTTXPOWERLEVEL:
++// *write_method = write_dot11CurrentTxPowerLevel;
++ return ( UCHAR * ) &pt->currentTxPowerLevel;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11PhyFHSSTable() - *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11PhyFHSSTable ( struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method )
++{
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &pfList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ pf = ( struct pfTbl_data * ) np->data;
++ rName[vp->namelen] = pf->ifIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) > 0 ))) {
++ switch ( vp->magic ) {
++ case DOT11HOPTIME:
++ if ( pf->haveHopTime ) found = TRUE; break;
++ case DOT11CURRENTCHANNELNUMBER:
++ if ( pf->haveCurrentChannelNumber ) found = TRUE; break;
++ case DOT11MAXDWELLTIME:
++ if ( pf->haveMaxDwellTime ) found = TRUE; break;
++ case DOT11CURRENTDWELLTIME:
++ if ( pf->haveCurrentDwellTime ) found = TRUE; break;
++ case DOT11CURRENTSET:
++ if ( pf->haveCurrentSet ) found = TRUE; break;
++ case DOT11CURRENTPATTERN:
++ if ( pf->haveCurrentPattern ) found = TRUE; break;
++ case DOT11CURRENTINDEX:
++ if ( pf->haveCurrentIndex ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
++ *length = vp->namelen + 1;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11HOPTIME:
++ return ( UCHAR * ) &pf->hopTime;
++
++ case DOT11CURRENTCHANNELNUMBER:
++// *write_method = write_dot11CurrentChannelNumber;
++ return ( UCHAR * ) &pf->currentChannelNumber;
++
++ case DOT11MAXDWELLTIME:
++ return ( UCHAR * ) &pf->maxDwellTime;
++
++ case DOT11CURRENTDWELLTIME:
++// *write_method = write_dot11CurrentDwellTime;
++ return ( UCHAR * ) &pf->currentDwellTime;
++
++ case DOT11CURRENTSET:
++// *write_method = write_dot11CurrentSet;
++ return ( UCHAR * ) &pf->currentSet;
++
++ case DOT11CURRENTPATTERN:
++// *write_method = write_dot11CurrentPattern;
++ return ( UCHAR * ) &pf->currentPattern;
++
++ case DOT11CURRENTINDEX:
++// *write_method = write_dot11CurrentIndex;
++ return ( UCHAR * ) &pf->currentIndex;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11PhyDSSSTable() - *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11PhyDSSSTable ( struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method )
++{
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &pdList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ pd = ( struct pdTbl_data * ) np->data;
++ rName[vp->namelen] = pd->ifIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) > 0 ))) {
++ switch ( vp->magic ) {
++ case DOT11CURRENTCHANNEL:
++ if ( pd->haveCurrentChannel ) found = TRUE; break;
++ case DOT11CCAMODESUPPORTED:
++ if ( pd->haveCCAModeSupported ) found = TRUE; break;
++ case DOT11CURRENTCCAMODE:
++ if ( pd->haveCurrentCCAMode ) found = TRUE; break;
++ case DOT11EDTHRESHOLD:
++ if ( pd->haveEDThreshold ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
++ *length = vp->namelen + 1;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11CURRENTCHANNEL:
++// *write_method = write_dot11CurrentChannel;
++ return ( UCHAR * ) &pd->currentChannel;
++
++ case DOT11CCAMODESUPPORTED:
++ return ( UCHAR * ) &pd->CCAModeSupported;
++
++ case DOT11CURRENTCCAMODE:
++// *write_method = write_dot11CurrentCCAMode;
++ return ( UCHAR * ) &pd->currentCCAMode;
++
++ case DOT11EDTHRESHOLD:
++// *write_method = write_dot11EDThreshold;
++ return ( UCHAR * ) &pd->EDThreshold;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11PhyIRTable() - *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11PhyIRTable ( struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method)
++{
++
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &piList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ pi = ( struct piTbl_data * ) np->data;
++ rName[vp->namelen] = pi->ifIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 1, name, *length ) > 0 ))) {
++ switch ( vp->magic ) {
++ case DOT11CCAWATCHDOGTIMERMAX:
++ if ( pi->CCAWatchdogTimerMax ) found = TRUE; break;
++ case DOT11CCAWATCHDOGCOUNTMAX:
++ if ( pi->CCAWatchdogCountMax ) found = TRUE; break;
++ case DOT11CCAWATCHDOGTIMERMIN:
++ if ( pi->CCAWatchdogTimerMin ) found = TRUE; break;
++ case DOT11CCAWATCHDOGCOUNTMIN:
++ if ( pi->CCAWatchdogCountMin ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 1 ) * sizeof ( oid ));
++ *length = vp->namelen + 1;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11CCAWATCHDOGTIMERMAX:
++// *write_method = write_dot11CCAWatchdogTimerMax;
++ return ( UCHAR * ) &pi->CCAWatchdogTimerMax;
++
++ case DOT11CCAWATCHDOGCOUNTMAX:
++// *write_method = write_dot11CCAWatchdogCountMax;
++ return ( UCHAR * ) &pi->CCAWatchdogCountMax;
++
++ case DOT11CCAWATCHDOGTIMERMIN:
++// *write_method = write_dot11CCAWatchdogTimerMin;
++ return ( UCHAR * ) &pi->CCAWatchdogTimerMin;
++
++ case DOT11CCAWATCHDOGCOUNTMIN:
++// *write_method = write_dot11CCAWatchdogCountMin;
++ return ( UCHAR * ) &pi->CCAWatchdogCountMin;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11RegDomainsSupportedTable() - *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11RegDomainsSupportedTable ( struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method)
++{
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &rdList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ rd = ( struct rdTbl_data * ) np->data;
++ rName[vp->namelen + 0] = rd->ifIndex;
++ rName[vp->namelen + 1] = rd->regDomainsSupportIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) > 0 ))) {
++ switch ( vp->magic ) {
++ case DOT11REGDOMAINSSUPPORTVALUE:
++ if ( rd->haveRegDomainsSupportValue ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 2 ) * sizeof ( oid ));
++ *length = vp->namelen + 2;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11REGDOMAINSSUPPORTVALUE:
++ return ( UCHAR * ) &rd->regDomainsSupportValue;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11AntennasListTable() - *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11AntennasListTable(struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method)
++{
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &alList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ al = ( struct alTbl_data * ) np->data;
++ rName[vp->namelen + 0] = al->ifIndex;
++ rName[vp->namelen + 1] = al->antennaListIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) > 0 ))) {
++ switch ( vp->magic ) {
++ case DOT11SUPPORTEDTXANTENNA:
++ if ( al->haveSupportedTxAntenna ) found = TRUE; break;
++ case DOT11SUPPORTEDRXANTENNA:
++ if ( al->haveSupportedRxAntenna ) found = TRUE; break;
++ case DOT11DIVERSITYSELECTIONRX:
++ if ( al->haveDiversitySelectionRx ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 2 ) * sizeof ( oid ));
++ *length = vp->namelen + 2;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11SUPPORTEDTXANTENNA:
++// *write_method = write_dot11SupportedTxAntenna;
++ return ( UCHAR * ) &al->supportedTxAntenna;
++
++ case DOT11SUPPORTEDRXANTENNA:
++// *write_method = write_dot11SupportedRxAntenna;
++ return ( UCHAR * ) &al->supportedRxAntenna;
++
++ case DOT11DIVERSITYSELECTIONRX:
++// *write_method = write_dot11DiversitySelectionRx;
++ return ( UCHAR * ) &al->diversitySelectionRx;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11SupportedDataRatesTxTable() - *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11SupportedDataRatesTxTable ( struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method )
++{
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &rtList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ rt = ( struct rtTbl_data * ) np->data;
++ rName[vp->namelen + 0] = rt->ifIndex;
++ rName[vp->namelen + 1] = rt->supportedDataRatesTxIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) > 0 ))) {
++ switch ( vp->magic ) {
++ case DOT11SUPPORTEDDATARATESTXVALUE:
++ if ( rt->haveSupportedDataRatesTxValue ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 2 ) * sizeof ( oid ));
++ *length = vp->namelen + 2;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11SUPPORTEDDATARATESTXVALUE:
++ return ( UCHAR * ) &rt->supportedDataRatesTxValue;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++
++ return NULL;
++}
++
++/****************************************************************************
++* *
++* var_dot11SupportedDataRatesRxTable() - *
++* *
++****************************************************************************/
++unsigned char *
++var_dot11SupportedDataRatesRxTable ( struct variable *vp,
++ oid *name,
++ size_t *length,
++ int exact,
++ size_t *var_len,
++ WriteMethod **write_method )
++{
++ int found = FALSE;
++ oid rName [ MAX_OID_LEN ]; // OID to be returned
++
++ loadTables();
++ memcpy (( char * ) rName, ( char * ) vp->name, ( int ) vp->namelen * sizeof ( oid ));
++ for ( np = LIST_FIRST ( &rrList ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ rr = ( struct rrTbl_data * ) np->data;
++ rName[vp->namelen + 0] = rr->ifIndex;
++ rName[vp->namelen + 1] = rr->supportedDataRatesRxIndex;
++ if (( exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) == 0 )) ||
++ ( !exact && ( snmp_oid_compare ( rName, vp->namelen + 2, name, *length ) > 0 ))) {
++ switch ( vp->magic ) {
++ case DOT11SUPPORTEDDATARATESRXVALUE:
++ if ( rr->haveSupportedDataRatesRxValue ) found = TRUE; break;
++ }
++ }
++ if ( found )
++ break;
++ }
++
++ if ( !found )
++ return NULL;
++
++ memcpy (( char * ) name, ( char * ) rName, ( vp->namelen + 2 ) * sizeof ( oid ));
++ *length = vp->namelen + 2;
++ *var_len = sizeof ( long );
++ *write_method = NULL;
++
++ switch ( vp->magic ) {
++
++ case DOT11SUPPORTEDDATARATESRXVALUE:
++ return ( UCHAR * ) &rr->supportedDataRatesRxValue;
++
++ default:
++ ERROR_MSG ( "" );
++ }
++
++ return NULL;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11StationID(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static unsigned char string[SPRINT_MAX_LEN];
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_OCTET_STR ) {
++ fprintf ( stderr, "write to dot11StationID not ASN_OCTET_STR\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( string )) {
++ fprintf ( stderr,"write to dot11StationID: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11MediumOccupancyLimit(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11MediumOccupancyLimit not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr,"write to dot11MediumOccupancyLimit: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11CFPPeriod(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11CFPPeriod not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11CFPPeriod: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11CFPMaxDuration(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11CFPMaxDuration not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11CFPMaxDuration: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11AuthenticationResponseTimeOut(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11AuthenticationResponseTimeOut not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11AuthenticationResponseTimeOut: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11PowerManagementMode(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11PowerManagementMode not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )) {
++ fprintf ( stderr, "write to dot11PowerManagementMode: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11DesiredSSID(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static unsigned char string[SPRINT_MAX_LEN];
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_OCTET_STR ) {
++ fprintf ( stderr, "write to dot11DesiredSSID not ASN_OCTET_STR\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( string )){
++ fprintf ( stderr, "write to dot11DesiredSSID: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11DesiredBSSType(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11DesiredBSSType not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11DesiredBSSType: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11OperationalRateSet(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static unsigned char string[SPRINT_MAX_LEN];
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_OCTET_STR ) {
++ fprintf ( stderr, "write to dot11OperationalRateSet not ASN_OCTET_STR\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( string )){
++ fprintf ( stderr, "write to dot11OperationalRateSet: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11BeaconPeriod(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11BeaconPeriod not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr,"write to dot11BeaconPeriod: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11DTIMPeriod(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11DTIMPeriod not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr,"write to dot11DTIMPeriod: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11AssociationResponseTimeOut(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11AssociationResponseTimeOut not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )) {
++ fprintf ( stderr,"write to dot11AssociationResponseTimeOut: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11AuthenticationAlgorithmsEnable(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11AuthenticationAlgorithmsEnable not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr,"write to dot11AuthenticationAlgorithmsEnable: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11WEPDefaultKeyValue(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static unsigned char string[SPRINT_MAX_LEN];
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_OCTET_STR ) {
++ fprintf ( stderr, "write to dot11WEPDefaultKeyValue not ASN_OCTET_STR\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( string )){
++ fprintf ( stderr,"write to dot11WEPDefaultKeyValue: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11WEPKeyMappingAddress(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static unsigned char string[SPRINT_MAX_LEN];
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_OCTET_STR ) {
++ fprintf ( stderr, "write to dot11WEPKeyMappingAddress not ASN_OCTET_STR\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( string )) {
++ fprintf ( stderr,"write to dot11WEPKeyMappingAddress: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11WEPKeyMappingWEPOn(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11WEPKeyMappingWEPOn not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11WEPKeyMappingWEPOn: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11WEPKeyMappingValue(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static unsigned char string[SPRINT_MAX_LEN];
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_OCTET_STR ) {
++ fprintf ( stderr, "write to dot11WEPKeyMappingValue not ASN_OCTET_STR\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( string )) {
++ fprintf ( stderr, "write to dot11WEPKeyMappingValue: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11WEPKeyMappingStatus(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11WEPKeyMappingStatus not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11WEPKeyMappingStatus: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11PrivacyInvoked(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11PrivacyInvoked not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11PrivacyInvoked: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11WEPDefaultKeyID(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11WEPDefaultKeyID not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11WEPDefaultKeyID: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11WEPKeyMappingLength(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11WEPKeyMappingLength not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11WEPKeyMappingLength: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11ExcludeUnencrypted(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11ExcludeUnencrypted not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr,"write to dot11ExcludeUnencrypted: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11RTSThreshold(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ){
++ fprintf ( stderr, "write to dot11RTSThreshold not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11RTSThreshold: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11ShortRetryLimit(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11ShortRetryLimit not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11ShortRetryLimit: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11LongRetryLimit(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11LongRetryLimit not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr,"write to dot11LongRetryLimit: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11FragmentationThreshold(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11FragmentationThreshold not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr,"write to dot11FragmentationThreshold: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11MaxTransmitMSDULifetime(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11MaxTransmitMSDULifetime not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11MaxTransmitMSDULifetime: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11MaxReceiveLifetime(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11MaxReceiveLifetime not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11MaxReceiveLifetime: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11Address(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static unsigned char string[SPRINT_MAX_LEN];
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_OCTET_STR ) {
++ fprintf ( stderr, "write to dot11Address not ASN_OCTET_STR\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( string )){
++ fprintf ( stderr, "write to dot11Address: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11GroupAddressesStatus(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11GroupAddressesStatus not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr,"write to dot11GroupAddressesStatus: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11CurrentRegDomain(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11CurrentRegDomain not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11CurrentRegDomain: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11CurrentTxAntenna(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11CurrentTxAntenna not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11CurrentTxAntenna: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11CurrentRxAntenna(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11CurrentRxAntenna not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr,"write to dot11CurrentRxAntenna: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11CurrentTxPowerLevel(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11CurrentTxPowerLevel not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11CurrentTxPowerLevel: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11CurrentChannelNumber(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11CurrentChannelNumber not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr,"write to dot11CurrentChannelNumber: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11CurrentDwellTime(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11CurrentDwellTime not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11CurrentDwellTime: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11CurrentSet(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11CurrentSet not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11CurrentSet: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11CurrentPattern(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11CurrentPattern not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11CurrentPattern: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11CurrentIndex(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11CurrentIndex not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11CurrentIndex: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11CurrentChannel(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11CurrentChannel not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11CurrentChannel: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11CurrentCCAMode(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11CurrentCCAMode not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr,"write to dot11CurrentCCAMode: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11EDThreshold(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11EDThreshold not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11EDThreshold: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11CCAWatchdogTimerMax(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11CCAWatchdogTimerMax not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11CCAWatchdogTimerMax: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11CCAWatchdogCountMax(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11CCAWatchdogCountMax not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11CCAWatchdogCountMax: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11CCAWatchdogTimerMin(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11CCAWatchdogTimerMin not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11CCAWatchdogTimerMin: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11CCAWatchdogCountMin(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11CCAWatchdogCountMin not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11CCAWatchdogCountMin: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11SupportedTxAntenna(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11SupportedTxAntenna not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11SupportedTxAntenna: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11SupportedRxAntenna(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11SupportedRxAntenna not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr,"write to dot11SupportedRxAntenna: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++****************************************************************************/
++int
++write_dot11DiversitySelectionRx(int action,
++ u_char *var_val,
++ u_char var_val_type,
++ size_t var_val_len,
++ u_char *statP,
++ oid *name,
++ size_t name_len)
++{
++ static long *long_ret;
++ int size;
++
++ switch ( action ) {
++
++ case RESERVE1:
++ if ( var_val_type != ASN_INTEGER ) {
++ fprintf ( stderr, "write to dot11DiversitySelectionRx not ASN_INTEGER\n" );
++ return SNMP_ERR_WRONGTYPE;
++ }
++ if ( var_val_len > sizeof ( long_ret )){
++ fprintf ( stderr, "write to dot11DiversitySelectionRx: bad length\n" );
++ return SNMP_ERR_WRONGLENGTH;
++ }
++ break;
++
++ case RESERVE2:
++ case FREE:
++ case ACTION:
++ case UNDO:
++ break;
++
++ case COMMIT:
++ break;
++ }
++
++ return SNMP_ERR_NOERROR;
++}
++
++/****************************************************************************
++* *
++* loadTables() - Load the Tables *
++* *
++****************************************************************************/
++static void loadTables()
++{
++ int skfd; // generic raw socket desc
++ struct iwreq wrq; // ioctl request structure
++ struct ifreq ifr;
++ struct timeval et; // elapsed time
++ struct wireless_info info; // workarea for wireless ioctl information
++ FILE *fp;
++ char bfr[1024], ifName[1024];
++ char *s, *t;
++
++ gettimeofday ( &et, ( struct timezone * ) 0 ); // get time-of-day
++ if ( et.tv_sec < lastLoad + MINLOADFREQ ) // only reload so often
++ return;
++ lastLoad = et.tv_sec;
++
++ skfd = openSocket(); // open socket
++ if ( skfd < 0 ) {
++ syslog ( LOG_ERR, "SNMP ieee802dot11.loadTables() - %s\n", "socket open failure" );
++ return;
++ }
++
++ flushLists();
++
++ // find interfaces in /proc/net/dev and find the wireless interfaces
++ fp = fopen ( PROC_NET_DEV, "r" );
++ if ( fp ) {
++ while ( fgets ( bfr, sizeof ( bfr ), fp )) {
++ if ( strstr ( bfr, ":" )) {
++ s = bfr; t = ifName;
++ while ( isspace ( *s )) // discard white space
++ *s++;
++ while ( *s != ':' ) // get interface name
++ *t++ = *s++;
++ *t = '\0';
++
++ // verify as a wireless device
++ memset (( char * ) &info, 0, sizeof ( struct wireless_info ));
++ strncpy ( wrq.ifr_name, ifName, IFNAMSIZ );
++ if ( ioctl ( skfd, SIOCGIWNAME, &wrq ) >= 0 ) {
++ printf ( "%s ifName: %s\n", "loadTables() -", ifName );
++ initStructs();
++ loadWiExt( skfd, ifName, &info );
++ displayWiExt ( info );
++ load80211Structs ( skfd, ifName, &info );
++ }
++ }
++ }
++ fclose ( fp );
++ }
++
++ close ( skfd );
++}
++
++/****************************************************************************
++* *
++* load80211Structs() - load the 802.11 structures *
++* *
++****************************************************************************/
++static void
++load80211Structs ( int skfd, char *ifName, struct wireless_info *wi )
++{
++ int rc, ifIndex = 0;
++ struct ifreq ifr;
++ char MACAddress [ MACADDR_LEN + 1 ];
++
++ strcpy ( ifr.ifr_name, ifName );
++ rc = ioctl ( skfd, SIOCGIFHWADDR, &ifr );
++ if ( rc >= 0 ) {
++
++ sprintf ( MACAddress, "%02X:%02X:%02X:%02X:%02X:%02X\0",
++ ( UCHAR ) ifr.ifr_hwaddr.sa_data[0], ( UCHAR ) ifr.ifr_hwaddr.sa_data[1],
++ ( UCHAR ) ifr.ifr_hwaddr.sa_data[2], ( UCHAR ) ifr.ifr_hwaddr.sa_data[3],
++ ( UCHAR ) ifr.ifr_hwaddr.sa_data[4], ( UCHAR ) ifr.ifr_hwaddr.sa_data[5] );
++
++ nSc.haveStationID = TRUE;
++ strcpy ( nSc.stationID, MACAddress );
++ nOp.haveMACAddress = TRUE;
++ strcpy ( nOp.MACAddress, MACAddress );
++ nRi.haveManufacturerOUI = TRUE;
++ strncpy ( nRi.manufacturerOUI, MACAddress, MAN_OUI_LEN );
++
++ ifIndex = if_nametoindex ( ifName );
++ if ( !ifIndex ) {
++ syslog ( LOG_ERR, "SNMP %s - %s %s\n",
++ "ieee802dot11.load80211Structs()", ifName, "has no ifIndex" );
++ return;
++ }
++
++ loadWiExtTo80211Structs ( ifIndex, ifName, wi );
++
++ if ( hasChanged (( char * ) &nSc, sizeof ( nSc ))) {
++ nSc.ifIndex = ifIndex;
++ sprintf ( nSc.UID, "%04d\0", nSc.ifIndex );
++ strcpy ( nSc.ifName, ifName );
++ addList (( char * ) &scList, ( char * ) &nSc, sizeof ( nSc ));
++ }
++
++ if ( hasChanged (( char * ) &nPr, sizeof ( nPr ))) {
++ nPr.ifIndex = ifIndex;
++ sprintf ( nPr.UID, "%04d\0", nPr.ifIndex );
++ strcpy ( nPr.ifName, ifName );
++ addList (( char * ) &prList, ( char * ) &nPr, sizeof ( nPr ));
++ }
++
++ if ( hasChanged (( char * ) &nOp, sizeof ( nOp ))) {
++ nOp.ifIndex = ifIndex;
++ sprintf ( nOp.UID, "%04d\0", nOp.ifIndex );
++ strcpy ( nOp.ifName, ifName );
++ addList (( char * ) &opList, ( char * ) &nOp, sizeof ( nOp ));
++ }
++
++ if ( hasChanged (( char * ) &nCo, sizeof ( nCo ))) {
++ nCo.ifIndex = ifIndex;
++ sprintf ( nCo.UID, "%04d\0", nCo.ifIndex );
++ strcpy ( nCo.ifName, ifName );
++ addList (( char * ) &coList, ( char * ) &nCo, sizeof ( nCo ));
++ }
++
++ if ( hasChanged (( char * ) &nRi, sizeof ( nRi ))) {
++ nRi.ifIndex = ifIndex;
++ sprintf ( nRi.UID, "%04d\0", nRi.ifIndex );
++ strcpy ( nRi.ifName, ifName );
++ addList (( char * ) &riList, ( char * ) &nRi, sizeof ( nRi ));
++ }
++
++ if ( hasChanged (( char * ) &nPo, sizeof ( nPo ))) {
++ nPo.ifIndex = ifIndex;
++ sprintf ( nPo.UID, "%04d\0", nPo.ifIndex );
++ strcpy ( nPo.ifName, ifName );
++ addList (( char * ) &poList, ( char * ) &nPo, sizeof ( nPo ));
++ }
++
++ if ( hasChanged (( char * ) &nPa, sizeof ( nPa ))) {
++ nPa.ifIndex = ifIndex;
++ sprintf ( nPa.UID, "%04d\0", nPa.ifIndex );
++ strcpy ( nPa.ifName, ifName );
++ addList (( char * ) &paList, ( char * ) &nPa, sizeof ( nPa ));
++ }
++
++ if ( hasChanged (( char * ) &nPt, sizeof ( nPt ))) {
++ nPt.ifIndex = ifIndex;
++ sprintf ( nPt.UID, "%04d\0", nPt.ifIndex );
++ strcpy ( nPt.ifName, ifName );
++ addList (( char * ) &ptList, ( char * ) &nPt, sizeof ( nPt ));
++ }
++
++ if ( hasChanged (( char * ) &nPf, sizeof ( nPf ))) {
++ nPf.ifIndex = ifIndex;
++ sprintf ( nPf.UID, "%04d\0", nPf.ifIndex );
++ strcpy ( nPf.ifName, ifName );
++ addList (( char * ) &pfList, ( char * ) &nPf, sizeof ( nPf ));
++ }
++
++ if ( hasChanged (( char * ) &nPd, sizeof ( nPd ))) {
++ nPd.ifIndex = ifIndex;
++ sprintf ( nPd.UID, "%04d\0", nPd.ifIndex );
++ strcpy ( nPd.ifName, ifName );
++ addList (( char * ) &pdList, ( char * ) &nPd, sizeof ( nPd ));
++ }
++
++ if ( hasChanged (( char * ) &nPi, sizeof ( nPi ))) {
++ nPi.ifIndex = ifIndex;
++ sprintf ( nPi.UID, "%04d\0", nPi.ifIndex );
++ strcpy ( nPi.ifName, ifName );
++ addList (( char * ) &piList, ( char * ) &nPi, sizeof ( nPi ));
++ }
++ }
++
++//printf ( "%s - ifIndex: %d ifName: %s UID: %s\n",
++// "load80211Structs() - HASCHANGED", ifIndex, ifName, nSc.UID );
++}
++
++/****************************************************************************
++* *
++* initStructs() - initialize structures *
++* *
++****************************************************************************/
++static void initStructs()
++{
++ int i;
++
++ // 802.11 MIB Stuctures
++ memset (( char * ) &nSc, 0, sizeof ( nSc )); memset (( char * ) &nAa, 0, sizeof ( nAa ));
++ memset (( char * ) &nDf, 0, sizeof ( nDf )); memset (( char * ) &nKm, 0, sizeof ( nKm ));
++ memset (( char * ) &nPr, 0, sizeof ( nPr )); memset (( char * ) &nOp, 0, sizeof ( nOp ));
++ memset (( char * ) &nCo, 0, sizeof ( nCo )); memset (( char * ) &nGa, 0, sizeof ( nGa ));
++ memset (( char * ) &nRi, 0, sizeof ( nRi )); memset (( char * ) &nPo, 0, sizeof ( nPo ));
++ memset (( char * ) &nPa, 0, sizeof ( nPa )); memset (( char * ) &nPt, 0, sizeof ( nPt ));
++ memset (( char * ) &nPf, 0, sizeof ( nPf )); memset (( char * ) &nPd, 0, sizeof ( nPd ));
++ memset (( char * ) &nPi, 0, sizeof ( nPi )); memset (( char * ) &nRd, 0, sizeof ( nRd ));
++ memset (( char * ) &nAl, 0, sizeof ( nAl )); memset (( char * ) &nRt, 0, sizeof ( nRt ));
++ memset (( char * ) &nRr, 0, sizeof ( nRr ));
++
++ // Wireless Extensions
++ wepCurrentKey = 0;
++ haveWepCurrentKey = FALSE;
++ for ( i = 0; i < MAX_WEP_KEYS; i++ ) {
++ wep[i].len = 0;
++ wep[i].key[0] = '\0';
++ wep[i].haveKey = FALSE;
++ }
++}
++
++/****************************************************************************
++* *
++* Wireless Extensions Specific Functions *
++* *
++****************************************************************************/
++/****************************************************************************
++* *
++* loadWiExtTo80211Structs() - load wireless extensions to 802.11 structures *
++* *
++****************************************************************************/
++static void
++loadWiExtTo80211Structs ( int ifIndex, char *ifName, struct wireless_info *wi )
++{
++ int i, j = 0;
++
++ // dot11Smt Group
++ // dot11StationConfigTable
++ nSc.havePrivacyOptionImplemented = TRUE;
++ nSc.privacyOptionImplemented = 1; // assume we support WEP
++
++ if ( wi->has_power ) {
++ nSc.havePowerManagementMode = TRUE;
++ nSc.powerManagementMode = 1; // assume power is active
++ if ( !wi->power.disabled &&
++ wi->power.flags & IW_POWER_MIN )
++ nSc.powerManagementMode = 2; // power save mode
++ }
++
++ if ( wi->has_essid && strlen ( wi->essid )) {
++ nSc.haveDesiredSSID = TRUE;
++ strcpy ( nSc.desiredSSID, wi->essid );
++ }
++
++ if ( wi->has_mode ) {
++ nSc.haveDesiredBSSType = TRUE;
++ if ( wi->mode == IW_MODE_ADHOC )
++ nSc.desiredBSSType = 2; // independent
++ else if ( wi->has_ap_addr )
++ nSc.desiredBSSType = 1; // infrastructure
++ else
++ nSc.desiredBSSType = 3; // any
++ }
++
++ if ( wi->has_range ) {
++ for ( i = 0; i < wi->range.num_bitrates && j < 126; i++ ) {
++ nSc.haveOperationalRateSet = TRUE;
++ nSc.operationalRateSet[j++] = ( char ) ( wi->range.bitrate[i] / 500000L );
++ }
++ }
++
++ // dot11AuthenticationAlgorithmsTable
++ nAa.haveAuthenticationAlgorithm = TRUE; // it's a rule to always have
++ nAa.haveAuthenticationAlgorithmsEnable = TRUE; // 'open' supported
++ nAa.ifIndex = ifIndex;
++ nAa.authenticationAlgorithmsIndex = 1; // index number one
++ nAa.authenticationAlgorithm = 1; // 1 => open key
++ sprintf ( nAa.UID, "%04d%04d\0", nAa.ifIndex, nAa.authenticationAlgorithmsIndex );
++ nAa.authenticationAlgorithmsEnable = 1; // enabled by default
++ if ( ( wi->has_key ) &&
++ ( wi->key_size != 0 ) &&
++ !( wi->key_flags & IW_ENCODE_DISABLED ))
++ nAa.authenticationAlgorithmsEnable = 2;
++ addList (( char * ) &aaList, ( char * ) &nAa, sizeof ( nAa ));
++
++ nAa.haveAuthenticationAlgorithm = TRUE; // I'm gonna assume we always support WEP
++ nAa.haveAuthenticationAlgorithmsEnable = TRUE;
++ nAa.ifIndex = ifIndex;
++ nAa.authenticationAlgorithmsIndex = 2; // index number 2
++ nAa.authenticationAlgorithm = 2; // 2 => shared key
++ sprintf ( nAa.UID, "%04d%04d\0", nAa.ifIndex, nAa.authenticationAlgorithmsIndex );
++ nAa.authenticationAlgorithmsEnable = 2;
++ if ( ( wi->has_key ) &&
++ ( wi->key_size != 0 ) &&
++ !( wi->key_flags & IW_ENCODE_DISABLED ))
++ nAa.authenticationAlgorithmsEnable = 1; // disabled by default
++ addList (( char * ) &aaList, ( char * ) &nAa, sizeof ( nAa ));
++
++ //dot11WEPDefaultKeysTable
++ if ( wi->has_range ) {
++ for ( i = 0; i < MAX_WEP_KEYS; i++ ) {
++ nDf.haveWEPDefaultKeyValue = TRUE;
++ nDf.ifIndex = ifIndex;
++ nDf.WEPDefaultKeyIndex = i + 1; // index number
++ sprintf ( nDf.UID, "%04d%04d\0", nDf.ifIndex, nDf.WEPDefaultKeyIndex );
++ if ( wep[i].haveKey )
++ strcpy ( nDf.WEPDefaultKeyValue, "*****" );
++ else
++ nDf.WEPDefaultKeyValue[0] = '\0';
++ addList (( char * ) &dfList, ( char * ) &nDf, sizeof ( nDf ));
++ }
++ }
++
++ // dot11PrivacyTable
++ nPr.havePrivacyInvoked = TRUE;
++ nPr.privacyInvoked = 2; // 2 => FALSE
++ nPr.haveWEPDefaultKeyID = TRUE;
++ nPr.WEPDefaultKeyID = 0;
++ nPr.haveExcludeUnencrypted = TRUE;
++ nPr.excludeUnencrypted = 2; // 2 => FALSE
++ if ( wi->has_range ) {
++ if ( ( wi->key_size != 0 ) &&
++ !( wi->key_flags & IW_ENCODE_DISABLED )) {
++ nPr.privacyInvoked = 1;
++ if ( wi->key_flags & IW_ENCODE_RESTRICTED )
++ nPr.excludeUnencrypted = 1;
++ nPr.WEPDefaultKeyID = wepCurrentKey;
++ }
++ }
++
++ // dot11Mac Group
++ // dot11OperationTable
++ if ( wi->has_range ) {
++ nOp.haveRTSThreshold = TRUE;
++ nOp.RTSThreshold = wi->range.max_rts;
++ }
++
++ if ( wi->has_frag && wi->frag.value ) {
++ nOp.haveFragmentationThreshold = TRUE;
++ nOp.fragmentationThreshold = wi->frag.value;
++ }
++
++ // dot11Phy Group
++ // dot11PhyOperationTable
++ if ( strstr ( wi->name, "IEEE 802.11-FS" )) nPo.PHYType = 1; // So what if I
++ if ( strstr ( wi->name, "IEEE 802.11-DS" )) nPo.PHYType = 2; // made up a couple?
++ if ( strstr ( wi->name, "IEEE 802.11-IR" )) nPo.PHYType = 3;
++ if ( strstr ( wi->name, "IEEE 802.11-OFDM" )) nPo.PHYType = 4; // 802.11a
++ if ( strstr ( wi->name, "IEEE 802.11-OFDM/DS" )) nPo.PHYType = 5; // 802.11g
++ if ( strstr ( wi->name, "IEEE 802.11-TURBO" )) nPo.PHYType = 6; // Atheros TURBO mode
++ if ( nPo.PHYType ) nPo.havePHYType = TRUE;
++
++ // dot11PhyDSSSTable
++ if ( wi->has_range ) { // && wi->freq <= ( double ) 2483000000 ) { // DSSS frequencies only
++ for ( i = 0; i < wi->range.num_frequency; i++ ) {
++ if ((( double ) ( wi->range.freq[i].e * 10 ) * ( double ) wi->range.freq[i].m ) == wi->freq ) {
++ nPd.haveCurrentChannel = TRUE;
++ nPd.currentChannel = wi->range.freq[i].i;
++ }
++ }
++ }
++
++ // dot11SupportedDataRatesTxTable
++ if ( wi->has_range ) {
++ for ( i = 0; i < wi->range.num_bitrates; i++ ) {
++ nRt.ifIndex = ifIndex;
++ nRt.supportedDataRatesTxIndex = i + 1;
++ nRt.supportedDataRatesTxValue = wi->range.bitrate[i] / 500000L;
++ nRt.haveSupportedDataRatesTxValue = TRUE;
++ sprintf ( nRt.UID, "%04d%04d\0", nRt.ifIndex, nRt.supportedDataRatesTxIndex );
++ strcpy ( nRt.ifName, ifName );
++ addList (( char * ) &rtList, ( char * ) &nRt, sizeof ( nRt ));
++ }
++ }
++
++ // dot11SupportedDataRatesRxTable
++ if ( wi->has_range ) {
++ for ( i = 0; i < wi->range.num_bitrates; i++ ) {
++ nRr.ifIndex = ifIndex;
++ nRr.supportedDataRatesRxIndex = i + 1;
++ nRr.supportedDataRatesRxValue = wi->range.bitrate[i] / 500000L;
++ nRr.haveSupportedDataRatesRxValue = TRUE;
++ sprintf ( nRr.UID, "%04d%04d\0", nRr.ifIndex, nRr.supportedDataRatesRxIndex );
++ strcpy ( nRr.ifName, ifName );
++ addList (( char * ) &rrList, ( char * ) &nRr, sizeof ( nRr ));
++ }
++ }
++
++//printf ( "%s max_encoding_tokens: %d\n",
++// "loadWiExtTo80211Structs() - ", wi->range.max_encoding_tokens );
++}
++
++/****************************************************************************
++* *
++* loadWiExt() - load wireless extensions structures; *
++* use ioctl calls and read /proc/net/wireless *
++* *
++****************************************************************************/
++static void loadWiExt ( int skfd, char *ifname, struct wireless_info *wi )
++{
++ struct iwreq wrq; // ioctl request structure
++ FILE *fp;
++ char bfr[1024];
++ char buffer[sizeof ( iwrange ) * 2]; /* Large enough */
++ char *s, *t;
++ int i, j;
++
++ strncpy ( wrq.ifr_name, ifname, IFNAMSIZ );
++
++ /* Get wireless name */
++ if ( ioctl ( skfd, SIOCGIWNAME, &wrq ) >= 0 ) {
++ strncpy ( wi->name, wrq.u.name, IFNAMSIZ );
++ wi->name[IFNAMSIZ] = '\0';
++ }
++
++ /* Get ranges */ // NOTE: some version checking in iwlib.c
++ memset ( buffer, 0, sizeof ( buffer ));
++ wrq.u.data.pointer = ( caddr_t ) &buffer;
++ wrq.u.data.length = sizeof ( buffer );
++ wrq.u.data.flags = 0;
++ if ( ioctl ( skfd, SIOCGIWRANGE, &wrq ) >= 0 ) {
++ memcpy (( char * ) &wi->range, buffer, sizeof ( iwrange ));
++ wi->has_range = 1;
++ }
++
++ /* Get network ID */
++ if ( ioctl ( skfd, SIOCGIWNWID, &wrq ) >= 0 ) {
++ memcpy ( &wi->nwid, &wrq.u.nwid, sizeof ( iwparam ));
++ wi->has_nwid = 1;
++ }
++
++ /* Get frequency / channel */ // THIS NUMBER LOOKS FUNNY
++ if ( ioctl ( skfd, SIOCGIWFREQ, &wrq ) >= 0 ) {
++ wi->has_freq = 1;
++ wi->freq = (( double ) wrq.u.freq.m ) * pow ( 10, wrq.u.freq.e );
++ }
++
++ /* Get sensitivity */
++ if ( ioctl ( skfd, SIOCGIWSENS, &wrq ) >= 0 ) {
++ wi->has_sens = 1;
++ memcpy ( &wi->sens, &wrq.u.sens, sizeof ( iwparam ));
++ }
++
++ /* Get encryption information */
++ wrq.u.data.pointer = ( caddr_t ) &wi->key;
++ wrq.u.data.length = IW_ENCODING_TOKEN_MAX;
++ wrq.u.data.flags = 0;
++ if ( ioctl ( skfd, SIOCGIWENCODE, &wrq ) >= 0 ) {
++ wi->has_key = 1;
++ wi->key_size = wrq.u.data.length;
++ wi->key_flags = wrq.u.data.flags;
++ wepCurrentKey = wrq.u.data.flags & IW_ENCODE_INDEX;
++ }
++
++ for ( i = 0; i < wi->range.max_encoding_tokens; i++ ) {
++ wrq.u.data.pointer = ( caddr_t ) &wi->key;
++ wrq.u.data.length = IW_ENCODING_TOKEN_MAX;
++ wrq.u.data.flags = i;
++ if ( ioctl ( skfd, SIOCGIWENCODE, &wrq ) >= 0 ) {
++ if ( ( wrq.u.data.length != 0 ) &&
++ !( wrq.u.data.flags & IW_ENCODE_DISABLED )) {
++ wep[i].len = wrq.u.data.length;
++ wep[i].haveKey = TRUE;
++ t = wep[i].key;
++ for ( j = 0; j < wrq.u.data.length; j++ ) {
++ if (( j & 0x1 ) == 0 && j != 0 )
++ strcpy ( t++, "-");
++ sprintf ( t, "%.2X", wi->key[j] );
++ t += 2;
++ }
++ t = '\0';
++ }
++ }
++ }
++
++ /* Get ESSID */
++ wrq.u.essid.pointer = ( caddr_t ) &wi->essid;
++ wrq.u.essid.length = IW_ESSID_MAX_SIZE + 1;
++ wrq.u.essid.flags = 0;
++ if ( ioctl ( skfd, SIOCGIWESSID, &wrq ) >= 0 ) {
++ wi->has_essid = 1;
++ wi->essid_on = wrq.u.data.flags;
++ }
++
++ /* Get AP address */
++ if ( ioctl ( skfd, SIOCGIWAP, &wrq ) >= 0 ) {
++ wi->has_ap_addr = 1;
++ memcpy ( &wi->ap_addr, &wrq.u.ap_addr, sizeof ( sockaddr ));
++ }
++
++ /* Get NickName */
++ wrq.u.essid.pointer = ( caddr_t ) &wi->nickname;
++ wrq.u.essid.length = IW_ESSID_MAX_SIZE + 1;
++ wrq.u.essid.flags = 0;
++ if ( ioctl ( skfd, SIOCGIWNICKN, &wrq ) >= 0 ) {
++ if ( wrq.u.data.length > 1 )
++ wi->has_nickname = 1;
++ }
++
++ /* Get bit rate */
++ if ( ioctl ( skfd, SIOCGIWRATE, &wrq ) >= 0 ) {
++ wi->has_bitrate = 1;
++ memcpy ( &wi->bitrate, &wrq.u.bitrate, sizeof ( iwparam ));
++ }
++
++ /* Get RTS threshold */
++ if ( ioctl ( skfd, SIOCGIWRTS, &wrq ) >= 0 ) {
++ wi->has_rts = 1;
++ memcpy ( &wi->rts, &wrq.u.rts, sizeof ( iwparam ));
++ }
++
++ /* Get fragmentation threshold */
++ if ( ioctl ( skfd, SIOCGIWFRAG, &wrq ) >= 0 ) {
++ wi->has_frag = 1;
++ memcpy ( &wi->frag, &wrq.u.frag, sizeof ( iwparam ));
++ }
++
++ /* Get operation mode */
++ if ( ioctl ( skfd, SIOCGIWMODE, &wrq ) >= 0 ) {
++ wi->mode = wrq.u.mode;
++ if ( wi->mode < IW_NUM_OPER_MODE && wi->mode >= 0 )
++ wi->has_mode = 1;
++ }
++
++ /* Get Power Management settings */ // #if WIRELESS_EXT > 9
++ wrq.u.power.flags = 0;
++ if ( ioctl ( skfd, SIOCGIWPOWER, &wrq ) >= 0 ) {
++ wi->has_power = 1;
++ memcpy ( &wi->power, &wrq.u.power, sizeof ( iwparam ));
++ }
++
++ /* Get retry limit/lifetime */ // #if WIRELESS_EXT > 10
++ if ( ioctl ( skfd, SIOCGIWRETRY, &wrq ) >= 0 ) {
++ wi->has_retry = 1;
++ memcpy ( &wi->retry, &wrq.u.retry, sizeof ( iwparam ));
++ }
++
++ /* Get stats */ // #if WIRELESS_EXT > 11
++ wrq.u.data.pointer = ( caddr_t ) &wi->stats;
++ wrq.u.data.length = 0;
++ wrq.u.data.flags = 1; /* Clear updated flag */
++ if ( ioctl ( skfd, SIOCGIWSTATS, &wrq ) < 0 )
++ wi->has_stats = 1;
++
++ if ( !wi->has_stats ) { // no ioctl support, go to file
++ fp = fopen ( PROC_NET_WIRELESS, "r" );
++ if ( fp ) {
++ while ( fgets ( bfr, sizeof ( bfr ), fp )) {
++ bfr [ sizeof ( bfr ) - 1 ] = '\0'; // no buffer overruns here!
++ strtok (( char * ) &bfr, "\n" ); // '\n' => '\0'
++ if ( strstr ( bfr, ifname ) && strstr ( bfr, ":" )) {
++ wi->has_stats = 1;
++ s = bfr;
++ s = strchr ( s, ':' ); s++; /* Skip ethX: */
++ s = strtok ( s, " " ); /* ' ' => '\0' */
++ sscanf ( s, "%X", &wi->stats.status ); // status
++
++ s = strtok ( NULL, " " ); // link quality
++ if ( strchr ( s, '.' ) != NULL )
++ wi->stats.qual.updated |= 1;
++ sscanf ( s, "%d", &wi->stats.qual.qual );
++
++ s = strtok ( NULL, " " ); // signal level
++ if ( strchr ( s,'.' ) != NULL )
++ wi->stats.qual.updated |= 2;
++ sscanf ( s, "%d", &wi->stats.qual.level );
++
++ s = strtok ( NULL, " " ); // noise level
++ if ( strchr ( s, '.' ) != NULL )
++ wi->stats.qual.updated += 4;
++ sscanf ( s, "%d", &wi->stats.qual.noise );
++
++ s = strtok ( NULL, " " ); sscanf ( s, "%d", &wi->stats.discard.nwid );
++ s = strtok ( NULL, " " ); sscanf ( s, "%d", &wi->stats.discard.code );
++ s = strtok ( NULL, " " ); sscanf ( s, "%d", &wi->stats.discard.fragment );
++ s = strtok ( NULL, " " ); sscanf ( s, "%d", &wi->stats.discard.retries );
++ s = strtok ( NULL, " " ); sscanf ( s, "%d", &wi->stats.discard.misc );
++ s = strtok ( NULL, " " ); sscanf ( s, "%d", &wi->stats.miss.beacon );
++ }
++ }
++ fclose ( fp );
++ }
++ }
++
++// printf ( "%s bfr: %s\n", "loadTables()", bfr );
++}
++
++/****************************************************************************
++* *
++* displayWiExt() - show what I got from Wireless Extensions *
++* *
++****************************************************************************/
++static void displayWiExt ( struct wireless_info info )
++{
++#ifdef DISPLAYWIEXT
++ int i;
++ char title[] = "displayWiExt() -";
++
++ printf ( "========================================\n" );
++ printf ( "===> Wireless Extension IOCTL calls <===\n" );
++ printf ( "========================================\n" );
++
++ if ( strlen ( info.name ))
++ printf ( "%s name: %s\n", "SIOCGIWNAME", info.name );
++ else
++ printf ( "%s\n", "no info.name support" );
++
++ if ( info.has_nickname = 1 )
++ printf ( "%s nickname: %s\n", "SIOCGIWNICKN", info.nickname );
++ else
++ printf ( "%s %s\n", "SIOCGIWNICKN", " ===> no info.nickname support" );
++
++ if ( info.has_essid )
++ printf ( "%s essid_on: %d essid: %s\n", "SIOCGIWESSID", info.essid_on, info.essid );
++ else
++ printf ( "%s %s\n", "SIOCGIWESSID", " ===> no info.essid support" );
++
++ if ( info.has_range ) {
++ printf ( "%s throughput: %d\n", "SIOCGIWRANGE", info.range.throughput );
++ printf ( "%s min_nwid: %d\n", "SIOCGIWRANGE", info.range.min_nwid );
++ printf ( "%s max_nwid: %d\n", "SIOCGIWRANGE", info.range.max_nwid );
++ printf ( "%s sensitivity: %d\n", "SIOCGIWRANGE", info.range.sensitivity );
++ printf ( "%s num_bitrates: %d\n", "SIOCGIWRANGE", info.range.num_bitrates );
++ for ( i = 0; i < info.range.num_bitrates; i++ )
++ printf ( "%s bitrate[%d]: %d\n", "SIOCGIWRANGE", i, info.range.bitrate[i] );
++ printf ( "%s min_rts: %d\n", "SIOCGIWRANGE", info.range.min_rts );
++ printf ( "%s max_rts: %d\n", "SIOCGIWRANGE", info.range.max_rts );
++ printf ( "%s min_frag: %d\n", "SIOCGIWRANGE", info.range.min_frag );
++ printf ( "%s max_frag: %d\n", "SIOCGIWRANGE", info.range.max_frag );
++ printf ( "%s min_pmp: %d\n", "SIOCGIWRANGE", info.range.min_pmp );
++ printf ( "%s max_pmp: %d\n", "SIOCGIWRANGE", info.range.max_pmp );
++ printf ( "%s min_pmt: %d\n", "SIOCGIWRANGE", info.range.min_pmt );
++ printf ( "%s max_pmt: %d\n", "SIOCGIWRANGE", info.range.max_pmt );
++ printf ( "%s pmp_flags: %d\n", "SIOCGIWRANGE", info.range.pmp_flags );
++ printf ( "%s pmt_flags: %d\n", "SIOCGIWRANGE", info.range.pmt_flags );
++ printf ( "%s pm_capa: %d\n", "SIOCGIWRANGE", info.range.pm_capa );
++ printf ( "%s num_encoding_sizes: %d\n", "SIOCGIWRANGE", info.range.num_encoding_sizes );
++ for ( i = 0; i < info.range.num_encoding_sizes; i++ )
++ printf ( "%s encoding_size[%d]: %d\n", "SIOCGIWRANGE", i, info.range.encoding_size[i] );
++ printf ( "%s max_encoding_tokens: %d\n", "SIOCGIWRANGE", info.range.max_encoding_tokens );
++// printf ( "%s encoding_login_index: %d\n", "SIOCGIWRANGE", info.range.encoding_login_index );
++ printf ( "%s txpower_capa: %d\n", "SIOCGIWRANGE", info.range.txpower_capa );
++ printf ( "%s num_txpower: %d dBm\n", "SIOCGIWRANGE", info.range.num_txpower );
++ for ( i = 0; i < info.range.num_txpower; i++ )
++ printf ( "%s txpower[%d]: %d\n", "SIOCGIWRANGE", i, info.range.txpower[i] );
++ printf ( "%s we_version_compiled: %d\n", "SIOCGIWRANGE", info.range.we_version_compiled );
++ printf ( "%s we_version_source: %d\n", "SIOCGIWRANGE", info.range.we_version_source );
++ printf ( "%s retry_capa: %d\n", "SIOCGIWRANGE", info.range.retry_capa );
++ printf ( "%s retry_flags: %d\n", "SIOCGIWRANGE", info.range.retry_flags );
++ printf ( "%s r_time_flags: %d\n", "SIOCGIWRANGE", info.range.r_time_flags );
++ printf ( "%s min_retry: %d\n", "SIOCGIWRANGE", info.range.min_retry );
++ printf ( "%s max_retry: %d\n", "SIOCGIWRANGE", info.range.max_retry );
++ printf ( "%s min_r_time: %d\n", "SIOCGIWRANGE", info.range.min_r_time );
++ printf ( "%s max_r_time: %d\n", "SIOCGIWRANGE", info.range.max_r_time );
++ printf ( "%s num_channels: %d\n", "SIOCGIWRANGE", info.range.num_channels );
++ printf ( "%s num_frequency: %d\n", "SIOCGIWRANGE", info.range.num_frequency );
++ for ( i = 0; i < info.range.num_frequency; i++ )
++ printf ( "%s freq[%d].i: %d freq[%d].e: %d freq[%d].m: %d\n", "SIOCGIWRANGE",
++ i, info.range.freq[i].i, i, info.range.freq[i].e, i, info.range.freq[i].m );
++ }
++ else
++ printf ( "%s %s\n", "SIOCGIWRANGE", " ===> no info.range support" );
++
++ if ( info.has_nwid )
++ printf ( "%s nwid - disabled: %d value: %X\n", "SIOCGIWNWID", info.nwid.disabled, info.nwid.value );
++ else
++ printf ( "%s %s\n", "SIOCGIWNWID", " ===> no info.nwid support" );
++
++ if ( info.has_freq ) {
++// printf ( "%s freq: %g\n", "SIOCGIWFREQ", info.freq / GIGA );
++ printf ( "%s freq: %g\n", "SIOCGIWFREQ", info.freq );
++ }
++ else
++ printf ( "%s %s\n", "SIOCGIWFREQ", " ===> no info.freq support" );
++
++ if ( info.has_sens )
++ printf ( "%s sens: %d\n", "SIOCGIWSENS", info.sens );
++ else
++ printf ( "%s %s\n", "SIOCGIWSENS", " ===> no info.sens support" );
++
++ if ( info.has_key ) {
++ printf ( "%s key_size: %d key_flags: %d wepCurrentKey: %d\n",
++ "SIOCGIWENCODE", info.key_size, info.key_flags, wepCurrentKey );
++ printf ( "%s MODE: %d DISABLED: %d INDEX: %d OPEN: %d RESTRICTED: %d NOKEY: %d TEMP: %d\n",
++ "SIOCGIWENCODE", info.key_flags & IW_ENCODE_MODE,
++ info.key_flags & IW_ENCODE_DISABLED ? 1:0, info.key_flags & IW_ENCODE_INDEX,
++ info.key_flags & IW_ENCODE_OPEN ? 1:0, info.key_flags & IW_ENCODE_RESTRICTED ? 1:0,
++ info.key_flags & IW_ENCODE_NOKEY ? 1:0, info.key_flags & IW_ENCODE_TEMP ? 1:0 );
++ }
++ else
++ printf ( "%s %s\n", "SIOCGIWENCODE", " ===> no info.key support" );
++
++ for ( i = 0; i < MAX_WEP_KEYS; i++ ) {
++ if ( wep[i].haveKey )
++ printf ( "%s wep[%d].len: %d wep[%d].key: %s\n",
++ "SIOCGIWENCODE", i, wep[i].len, i, wep[i].key );
++ }
++
++ if ( info.has_ap_addr )
++ printf ( "%s ap_addr.sa_data: %02X:%02X:%02X:%02X:%02X:%02X ap_addr.sa_family: %d\n",
++ "SIOCGIWAP", ( UCHAR ) info.ap_addr.sa_data[0], ( UCHAR ) info.ap_addr.sa_data[1],
++ ( UCHAR ) info.ap_addr.sa_data[2], ( UCHAR ) info.ap_addr.sa_data[3],
++ ( UCHAR ) info.ap_addr.sa_data[4], ( UCHAR ) info.ap_addr.sa_data[5],
++ info.ap_addr.sa_family );
++ else
++ printf ( "%s %s\n", "SIOCGIWAP", " ===> no ap_addr information" );
++
++ if ( info.has_bitrate )
++ printf ( "%s bitrate: %d value: %d fixed: %d disabled: %d flags: %d\n",
++ "SIOCGIWRATE", info.bitrate, info.bitrate.value, info.bitrate.fixed,
++ info.bitrate.disabled, info.bitrate.flags );
++ else
++ printf ( "%s %s\n", "SIOCGIWRATE", " ===> no info.bitrate support" );
++
++ if ( info.has_rts )
++ printf ( "%s rts: %d\n", "SIOCGIWRTS", info.rts );
++ else
++ printf ( "%s %s\n", "SIOCGIWRTS", " ===> no info.rts support" );
++
++ if ( info.has_frag )
++ printf ( "%s frag: %d\n", "SIOCGIWFRAG", info.frag );
++ else
++ printf ( "%s %s\n", "SIOCGIWFRAG", " ===> no info.frag support" );
++
++ if ( info.has_mode )
++ printf ( "%s mode: %d\n", "SIOCGIWMODE", info.mode );
++ else
++ printf ( "%s %s\n", "SIOCGIWMODE", " ===> no info.mode support" );
++
++ if ( info.has_power ) {
++ printf ( "%s power: %d\n", "SIOCGIWPOWER", info.power );
++ printf ( "%s disabled: %d MIN: %d MAX: %d TIMEOUT: %d RELATIVE: %d\n",
++ "SIOCGIWPOWER",
++ info.power.disabled ? 1:0,
++ info.power.flags & IW_POWER_MIN ? 1:0,
++ info.power.flags & IW_POWER_MAX ? 1:0,
++ info.power.flags & IW_POWER_TIMEOUT ? 1:0,
++ info.power.flags & IW_POWER_RELATIVE ? 1:0 );
++ printf ( "%s UNICAST: %d MULTICAST: %d ALL: %d FORCE: %d REPEATER: %d\n",
++ "SIOCGIWPOWER",
++ info.power.flags & IW_POWER_UNICAST_R ? 1:0,
++ info.power.flags & IW_POWER_MULTICAST_R ? 1:0,
++ info.power.flags & IW_POWER_ALL_R ? 1:0,
++ info.power.flags & IW_POWER_FORCE_S ? 1:0,
++ info.power.flags & IW_POWER_REPEATER ? 1:0 );
++ }
++ else
++ printf ( "%s %s\n", "SIOCGIWPOWER", " ===> no info.power support" );
++
++ if ( info.has_retry )
++ printf ( "%s retry: %d\n", "SIOCGIWRETRY", info.retry );
++ else
++ printf ( "%s %s\n", "SIOCGIWRETRY", " ===> no info.retry support" );
++
++ if ( info.has_stats ) {
++ printf ( "%s status: %d\n", "SIOCGIWSTATS", info.stats.status );
++ printf ( "%s qual.level: %d\n", "SIOCGIWSTATS", info.stats.qual.level );
++ printf ( "%s qual.noise: %d\n", "SIOCGIWSTATS", info.stats.qual.noise );
++ printf ( "%s qual.qual: %d\n", "SIOCGIWSTATS", info.stats.qual.qual );
++ printf ( "%s qual.updated: %d\n", "SIOCGIWSTATS", info.stats.qual.updated );
++ printf ( "%s discard.code: %d\n", "SIOCGIWSTATS", info.stats.discard.code );
++ printf ( "%s discard.fragment: %d\n", "SIOCGIWSTATS", info.stats.discard.fragment );
++ printf ( "%s discard.misc: %d\n", "SIOCGIWSTATS", info.stats.discard.misc );
++ printf ( "%s discard.nwid: %d\n", "SIOCGIWSTATS", info.stats.discard.nwid );
++ printf ( "%s discard.retries: %d\n", "SIOCGIWSTATS", info.stats.discard.retries );
++ printf ( "%s miss.beacon: %d\n", "SIOCGIWSTATS", info.stats.miss.beacon );
++ }
++ else
++ printf ( "%s %s\n", "SIOCGIWSTATS", " ===> no info.stats support" );
++
++ if ( info.txpower.flags & IW_TXPOW_MWATT )
++ printf ( "%s txpower1: %d dBm disabled: %d fixed: %d flags: %d\n", "SIOCGIWRANGE",
++ mWatt2dbm ( info.txpower.value ), info.txpower.disabled, info.txpower.fixed, info.txpower.flags);
++ else
++ printf ( "%s txpower2: %d dBm disabled: %d fixed: %d flags: %d\n", "SIOCGIWRANGE", info.txpower.value, info.txpower.disabled, info.txpower.fixed, info.txpower.flags );
++
++ if ( info.has_range )
++ if ( info.sens.value < 0 )
++ printf ( "%s sens: %d dBm\n", "SIOCGIWRANGE", info.sens.value );
++ else
++ printf ( "%s sens: %d/%d\n", "SIOCGIWRANGE", info.sens.value, info.range.sensitivity );
++
++ if ( info.has_range && ( info.stats.qual.level != 0 ))
++ if ( info.stats.qual.level > info.range.max_qual.level )
++ /* Statistics are in dBm (absolute power measurement) */
++ printf ( "%s Quality: %d/%d Signal level: %d dBm Noise level: %d dBm\n",
++ "SIOCGIWRANGE",
++ info.stats.qual.qual, info.range.max_qual.qual,
++ info.stats.qual.level - 0x100,
++ info.stats.qual.noise - 0x100 );
++ else
++ printf ( "%s Quality: %d/%d Signal level: %d/%d Noise level: %d/%d",
++ "SIOCGIWRANGE",
++ info.stats.qual.qual, info.range.max_qual.qual,
++ info.stats.qual.level, info.range.max_qual.level,
++ info.stats.qual.noise, info.range.max_qual.noise );
++
++#endif // #ifdef DISPLAYWIEXT
++}
++
++/****************************************************************************
++* *
++* Linked List Functions *
++* *
++****************************************************************************/
++/****************************************************************************
++* *
++* addList() - add an entry to a linked list *
++* *
++****************************************************************************/
++static void
++addList ( char *l, char *data, int len )
++{
++ char uid[256];
++ LIST_HEAD ( , avNode ) *list;
++
++ // NOTE: this assumes the UID is at the begining of the
++ // data structure and that UIDs are strings
++
++ list = ( LIST_HEAD ( , avNode ) * ) l; // NOTE: don't know how to get
++ strcpy ( uid, data ); // rid of compiler warning on
++ // LISTHEAD typecast
++ // create a new node and the data that goes in it
++ newNode = malloc ( sizeof ( struct avNode ));
++ newNode->data = malloc ( len );
++ memcpy ( newNode->data, data, len );
++
++ // this deals with an empty list
++ if ( LIST_EMPTY ( list )) {
++ LIST_INSERT_HEAD ( list, newNode, nodes );
++ return;
++ }
++
++ // this deals with UIDs that match
++ for ( np = LIST_FIRST ( list ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ if ( strncmp ( uid, np->data, strlen ( uid )) == 0 ) { // found matching UID
++ LIST_INSERT_AFTER ( np, newNode, nodes );
++ if ( np->data )
++ free ( np->data );
++ LIST_REMOVE ( np, nodes );
++ free ( np );
++ return;
++ }
++ }
++
++ // this deals with inserting a new UID in the list
++ for ( np = LIST_FIRST ( list ); np != NULL; np = LIST_NEXT ( np, nodes )) {
++ lastNode = np;
++ if ( strncmp ( np->data, uid, strlen ( uid )) > 0 ) { // old ID > new ID AND
++ LIST_INSERT_BEFORE ( np, newNode, nodes );
++ return;
++ }
++ }
++
++ // this deals with a UID that needs to go on the end of the list
++ LIST_INSERT_AFTER ( lastNode, newNode, nodes );
++
++ return;
++}
++
++/****************************************************************************
++* *
++* initLists() - initialize all the linked lists *
++* *
++****************************************************************************/
++static void initLists()
++{
++ LIST_INIT ( &scList ); LIST_INIT ( &aaList ); LIST_INIT ( &dfList );
++ LIST_INIT ( &kmList ); LIST_INIT ( &prList );
++ LIST_INIT ( &opList ); LIST_INIT ( &coList );
++ LIST_INIT ( &gaList ); LIST_INIT ( &riList ); LIST_INIT ( &poList );
++ LIST_INIT ( &paList ); LIST_INIT ( &ptList ); LIST_INIT ( &pfList );
++ LIST_INIT ( &pdList ); LIST_INIT ( &piList ); LIST_INIT ( &rdList );
++ LIST_INIT ( &alList ); LIST_INIT ( &rtList ); LIST_INIT ( &rrList );
++}
++/****************************************************************************
++* *
++* flushLists() - flush all linked lists *
++* *
++****************************************************************************/
++static void flushLists()
++{
++ flushList (( char * ) &scList ); flushList (( char * ) &aaList );
++ flushList (( char * ) &dfList ); flushList (( char * ) &kmList );
++ flushList (( char * ) &prList );
++ flushList (( char * ) &opList ); flushList (( char * ) &coList );
++ flushList (( char * ) &gaList ); flushList (( char * ) &riList );
++ flushList (( char * ) &poList ); flushList (( char * ) &paList );
++ flushList (( char * ) &ptList ); flushList (( char * ) &pfList );
++ flushList (( char * ) &pdList ); flushList (( char * ) &piList );
++ flushList (( char * ) &rdList ); flushList (( char * ) &alList );
++ flushList (( char * ) &rtList ); flushList (( char * ) &rrList );
++}
++
++/****************************************************************************
++* *
++* flushList() - flush a linked list *
++* *
++****************************************************************************/
++static void flushList ( char *l )
++{
++ LIST_HEAD ( , avNode ) *list;
++
++ list = ( LIST_HEAD ( , avNode ) * ) l; // NOTE: don't know how to get
++ while ( !LIST_EMPTY ( list )) { // rid of compiler warning on
++ np = LIST_FIRST ( list ); // LISTHEAD typecast
++ if ( np->data )
++ free ( np->data );
++ LIST_REMOVE ( np, nodes );
++ free ( np );
++ }
++}
++
++/****************************************************************************
++* *
++* Utility Functions *
++* *
++****************************************************************************/
++/****************************************************************************
++* *
++* The following two routines were taken directly from iwlib.c *
++* *
++****************************************************************************/
++ /*
++ * Open a socket.
++ * Depending on the protocol present, open the right socket. The socket
++ * will allow us to talk to the driver.
++ */
++static int openSocket ( void )
++{
++ static const int families[] = {
++ AF_INET, AF_IPX, AF_AX25, AF_APPLETALK
++ };
++ unsigned int i;
++ int sock;
++
++ /*
++ * Now pick any (exisiting) useful socket family for generic queries
++ * Note : don't open all the socket, only returns when one matches,
++ * all protocols might not be valid.
++ * Workaround by Jim Kaba <jkaba@sarnoff.com>
++ * Note : in 99% of the case, we will just open the inet_sock.
++ * The remaining 1% case are not fully correct...
++ */
++
++ /* Try all families we support */
++ for(i = 0; i < sizeof(families)/sizeof(int); ++i) {
++ /* Try to open the socket, if success returns it */
++ sock = socket(families[i], SOCK_DGRAM, 0);
++ if(sock >= 0)
++ return sock;
++ }
++
++ return -1;
++}
++
++/*------------------------------------------------------------------*/
++/*
++ * Convert a value in milliWatt to a value in dBm.
++ */
++static int mWatt2dbm ( int in )
++{
++#ifdef WE_NOLIBM
++ /* Version without libm : slower */
++ double fin = (double) in;
++ int res = 0;
++
++ /* Split integral and floating part to avoid accumulating rounding errors */
++ while(fin > 10.0)
++ {
++ res += 10;
++ fin /= 10.0;
++ }
++ while(fin > 1.000001) /* Eliminate rounding errors, take ceil */
++ {
++ res += 1;
++ fin /= LOG10_MAGIC;
++ }
++ return(res);
++#else /* WE_NOLIBM */
++ /* Version with libm : faster */
++ return((int) (ceil(10.0 * log10((double) in))));
++#endif /* WE_NOLIBM */
++}
++
++/****************************************************************************
++* *
++* htob - converts hex string to binary *
++* *
++****************************************************************************/
++static char *htob ( char *s )
++{
++ char nibl, *byt;
++ static char bin[20];
++
++ byt = bin;
++
++ while ((nibl = *s++) && nibl != ' ') { /* While not end of string. */
++ nibl -= ( nibl > '9') ? ('A' - 10): '0';
++ *byt = nibl << 4; /* place high nibble */
++ if((nibl = *s++) && nibl != ' ') {
++ nibl -= ( nibl > '9') ? ('A' - 10): '0';
++ *byt |= nibl; /* place low nibble */
++ }
++ else break;
++ ++byt;
++ }
++ *++byt = '\0';
++ return ( bin );
++}
++
++/****************************************************************************
++* *
++* hasChanged() - see if area has been changed from NULLs *
++* *
++****************************************************************************/
++static int hasChanged ( char *loc, int len )
++{
++ char *wrk;
++ int changed = TRUE;
++
++ wrk = malloc ( len );
++ memset ( wrk, 0, len );
++ if ( memcmp ( loc, wrk, len ) == 0 )
++ changed = FALSE;
++ free ( wrk );
++
++ return ( changed );
++}
++
+--- /dev/null
++++ b/agent/mibgroup/ieee802dot11.h
+@@ -0,0 +1,730 @@
++/****************************************************************************
++* *
++* File Name: ieee802dot11.h *
++* Used By: *
++* *
++* Operating System: *
++* Purpose: *
++* *
++* Comments: *
++* *
++* Author: Larry Simmons *
++* lsimmons@avantcom.com *
++* www.avantcom.com *
++* *
++* Creation Date: 09/02/03 *
++* *
++* Ver Date Inits Modification *
++* ----- -------- ----- ------------ *
++* 0.0.1 09/02/03 LRS created *
++* 0.0.2 09/24/03 LRS wouldn't build after fresh ./configure *
++****************************************************************************/
++/* This file was generated by mib2c and is intended for use as a mib module
++ for the ucd-snmp snmpd agent. */
++#ifndef _MIBGROUP_IEEE802DOT11_H
++#define _MIBGROUP_IEEE802DOT11_H
++/* we may use header_generic and header_simple_table from the util_funcs module */
++
++/****************************************************************************
++* Includes *
++****************************************************************************/
++#include <sys/queue.h>
++
++/****************************************************************************
++* Linked List Defines *
++****************************************************************************/
++// here are some Linked List MACROS I wanted to use,
++// but curiously were not in /usr/includes/sys/queue.h
++
++#ifndef LIST_EMPTY
++ #define LIST_EMPTY(head) ((head)->lh_first == NULL)
++#endif
++
++#ifndef LIST_NEXT
++ #define LIST_NEXT(elm, field) ((elm)->field.le_next)
++#endif
++
++#ifndef LIST_INSERT_BEFORE
++ #define LIST_INSERT_BEFORE(listelm, elm, field) do { \
++ (elm)->field.le_prev = (listelm)->field.le_prev; \
++ LIST_NEXT((elm), field) = (listelm); \
++ *(listelm)->field.le_prev = (elm); \
++ (listelm)->field.le_prev = &LIST_NEXT((elm), field); \
++ } while (0)
++#endif
++
++#ifndef LIST_FIRST
++ #define LIST_FIRST(head) ((head)->lh_first)
++#endif
++
++/****************************************************************************
++* 802.11 MIB Defines *
++****************************************************************************/
++#define SYS_STRING_LEN 256
++#define MACADDR_LEN ( 6 * 2 ) + 5
++#define OPER_RATE_SET_LEN 126
++#define MAN_OUI_LEN ( 3 * 2 ) + 2
++#define WEP_STR_LEN 64
++#define SNMP_STR_LEN 128
++#define TEXT_LEN 80
++#define IFINDEX_LEN 4
++#define IFNAME_LEN 16
++#define MAX_WEP_KEYS 4
++
++#define AUTHENICATION_ALGORITHMS_INDEX_LEN 4
++#define WEP_DEFAULT_KEY_INDEX_LEN 4
++#define WEP_KEY_MAPPING_INDEX_LEN 4
++#define GROUP_ADDRESS_INDEX_LEN 4
++#define REG_DOMAIN_SUPPORT_INDEX_LEN 4
++#define ANTENNA_LIST_INDEX_LEN 4
++#define SUPPORTED_DATA_RATES_TX_INDEX_LEN 4
++#define SUPPORTED_DATA_RATES_RX_INDEX_LEN 4
++
++#define SC_UID_LEN IFINDEX_LEN
++#define AA_UID_LEN IFINDEX_LEN + AUTHENICATION_ALGORITHMS_INDEX_LEN
++#define DF_UID_LEN IFINDEX_LEN + WEP_DEFAULT_KEY_INDEX_LEN
++#define KM_UID_LEN IFINDEX_LEN + WEP_KEY_MAPPING_INDEX_LEN
++#define PR_UID_LEN IFINDEX_LEN
++#define OP_UID_LEN IFINDEX_LEN
++#define CO_UID_LEN IFINDEX_LEN
++#define GA_UID_LEN IFINDEX_LEN + GROUP_ADDRESS_INDEX_LEN
++#define RI_UID_LEN IFINDEX_LEN
++#define PO_UID_LEN IFINDEX_LEN
++#define PA_UID_LEN IFINDEX_LEN
++#define PT_UID_LEN IFINDEX_LEN
++#define PF_UID_LEN IFINDEX_LEN
++#define PD_UID_LEN IFINDEX_LEN
++#define PI_UID_LEN IFINDEX_LEN
++#define RD_UID_LEN IFINDEX_LEN + REG_DOMAIN_SUPPORT_INDEX_LEN
++#define AL_UID_LEN IFINDEX_LEN + ANTENNA_LIST_INDEX_LEN
++#define RT_UID_LEN IFINDEX_LEN + SUPPORTED_DATA_RATES_TX_INDEX_LEN
++#define RR_UID_LEN IFINDEX_LEN + SUPPORTED_DATA_RATES_RX_INDEX_LEN
++
++/****************************************************************************
++* Linked List Structure *
++****************************************************************************/
++static struct avNode {
++ LIST_ENTRY ( avNode ) nodes;
++ char *data; // pointer to data
++};
++
++typedef LIST_HEAD ( , avNode ) avList_t;
++
++/****************************************************************************
++* 802.11 MIB structures *
++****************************************************************************/
++/****************************************************************************
++* dot11Smt Group *
++****************************************************************************/
++/****************************************************************************
++* dot11StationConfigTable *
++****************************************************************************/
++static struct scTbl_data {
++
++ char UID [ SC_UID_LEN + 1 ]; // unique ID
++ char ifName [ IFNAME_LEN + 1 ]; // ifName of card
++
++ long ifIndex; // ifindex of card
++
++ char stationID [ MACADDR_LEN + 1 ]; // Default actual MacAddr
++ long mediumOccupancyLimit;
++ long CFPPollable;
++ long CFPPeriod;
++ long maxDuration;
++ long authenticationResponseTimeOut;
++ long privacyOptionImplemented;
++ long powerManagementMode;
++ char desiredSSID [ SNMP_STR_LEN + 1 ];
++ long desiredBSSType;
++ char operationalRateSet [ OPER_RATE_SET_LEN + 1];
++ long beaconPeriod;
++ long DTIMPeriod;
++ long associationResponseTimeOut;
++ long disAssociationReason;
++ char disAssociationStation [ MACADDR_LEN + 1 ];
++ long deAuthenticationReason;
++ char deAuthenticationStation [ MACADDR_LEN + 1 ];
++ long authenticateFailStatus;
++ char authenticateFailStation [ MACADDR_LEN + 1 ];
++
++ long haveStationID;
++ long haveMediumOccupancyLimit;
++ long haveCFPPollable;
++ long haveCFPPeriod;
++ long haveMaxDuration;
++ long haveAuthenticationResponseTimeOut;
++ long havePrivacyOptionImplemented;
++ long havePowerManagementMode;
++ long haveDesiredSSID;
++ long haveDesiredBSSType;
++ long haveOperationalRateSet;
++ long haveBeaconPeriod;
++ long haveDTIMPeriod;
++ long haveAssociationResponseTimeOut;
++ long haveDisAssociationReason;
++ long haveDisAssociationStation;
++ long haveDeAuthenticationReason;
++ long haveDeAuthenticationStation;
++ long haveAuthenticateFailStatus;
++ long haveAuthenticateFailStation;
++
++} nSc, *sc = &nSc;
++
++static avList_t scList;
++
++/****************************************************************************
++* dot11AuthenticationAlgorithmsTable *
++****************************************************************************/
++static struct aaTbl_data {
++
++ char UID [ AA_UID_LEN + 1 ];
++ char ifName [ IFNAME_LEN + 1 ]; // ifName of card
++
++ long ifIndex; // ifindex of card
++ long authenticationAlgorithmsIndex;
++
++ long authenticationAlgorithm;
++ long authenticationAlgorithmsEnable;
++
++ long haveAuthenticationAlgorithm;
++ long haveAuthenticationAlgorithmsEnable;
++
++} nAa, *aa = &nAa;
++
++static avList_t aaList;
++
++/****************************************************************************
++* dot11WEPDefaultKeysTable *
++****************************************************************************/
++static struct dfTbl_data {
++
++ char UID [ DF_UID_LEN + 1 ];
++ char ifName [ IFNAME_LEN + 1 ];
++
++ long ifIndex; // ifindex of card
++ long WEPDefaultKeyIndex;
++
++ char WEPDefaultKeyValue [ WEP_STR_LEN + 1 ];
++ long haveWEPDefaultKeyValue;
++
++} nDf, *df = &nDf;
++
++static avList_t dfList;
++
++/****************************************************************************
++* dot11WEPKeyMappingsTable *
++****************************************************************************/
++static struct kmTbl_data {
++
++ char UID [ KM_UID_LEN + 1 ];
++ char ifName [ IFNAME_LEN + 1 ];
++
++ long ifIndex;
++ long WEPKeyMappingIndex;
++
++ char WEPKeyMappingAddress [ MACADDR_LEN + 1 ];
++ long WEPKeyMappingWEPOn;
++ char WEPKeyMappingValue [ WEP_STR_LEN + 1 ];
++ long WEPKeyMappingStatus;
++
++ long haveWEPKeyMappingIndex;
++ long haveWEPKeyMappingAddress;
++ long haveWEPKeyMappingWEPOn;
++ long haveWEPKeyMappingValue;
++ long haveWEPKeyMappingStatus;
++
++} nKm, *km = &nKm;
++
++static avList_t kmList;
++
++/****************************************************************************
++* dot11PrivacyTable *
++****************************************************************************/
++static struct prTbl_data {
++
++ char UID [ PR_UID_LEN + 1 ];
++ char ifName [ IFNAME_LEN + 1 ];
++
++ long ifIndex;
++
++ long privacyInvoked;
++ long WEPDefaultKeyID;
++ long WEPKeyMappingLength;
++ long excludeUnencrypted;
++ unsigned long WEPICVErrorCount;
++ unsigned long WEPExcludedCount;
++
++ long havePrivacyInvoked;
++ long haveWEPDefaultKeyID;
++ long haveWEPKeyMappingLength;
++ long haveExcludeUnencrypted;
++ long haveWEPICVErrorCount;
++ long haveWEPExcludedCount;
++
++} nPr, *pr = &nPr;
++
++static avList_t prList;
++
++/****************************************************************************
++* dot11Mac Group *
++****************************************************************************/
++/****************************************************************************
++* dot11OperationTable *
++****************************************************************************/
++static struct opTbl_data {
++
++ char UID [ OP_UID_LEN + 1 ]; // unique ID
++ char ifName [ IFNAME_LEN + 1 ]; // ifName of card
++
++ long ifIndex; // ifindex of card
++
++ char MACAddress [ MACADDR_LEN + 1 ];
++ long RTSThreshold;
++ long shortRetryLimit;
++ long longRetryLimit;
++ long fragmentationThreshold;
++ long maxTransmitMSDULifetime;
++ long maxReceiveLifetime;
++ char manufacturerID [ SNMP_STR_LEN + 1 ];
++ char productID [ SNMP_STR_LEN + 1 ];
++
++ long haveMACAddress;
++ long haveRTSThreshold;
++ long haveShortRetryLimit;
++ long haveLongRetryLimit;
++ long haveFragmentationThreshold;
++ long haveMaxTransmitMSDULifetime;
++ long haveMaxReceiveLifetime;
++ long haveManufacturerID;
++ long haveProductID;
++
++} nOp, *op = &nOp;
++
++static avList_t opList;
++
++/****************************************************************************
++* dot11CountersTable *
++****************************************************************************/
++static struct coTbl_data {
++
++ char UID [ CO_UID_LEN + 1 ]; // unique ID
++ char ifName [ IFNAME_LEN + 1 ]; // ifName of card
++
++ long ifIndex; // ifindex of card
++
++ unsigned long transmittedFragmentCount;
++ unsigned long multicastTransmittedFrameCount;
++ unsigned long failedCount;
++ unsigned long retryCount;
++ unsigned long multipleRetryCount;
++ unsigned long frameDuplicateCount;
++ unsigned long RTSSuccessCount;
++ unsigned long RTSFailureCount;
++ unsigned long ACKFailureCount;
++ unsigned long receivedFragmentCount;
++ unsigned long multicastReceivedFrameCount;
++ unsigned long FCSErrorCount;
++ unsigned long transmittedFrameCount;
++ unsigned long WEPUndecryptableCount;
++
++ long haveTransmittedFragmentCount;
++ long haveMulticastTransmittedFrameCount;
++ long haveFailedCount;
++ long haveRetryCount;
++ long haveMultipleRetryCount;
++ long haveFrameDuplicateCount;
++ long haveRTSSuccessCount;
++ long haveRTSFailureCount;
++ long haveACKFailureCount;
++ long haveReceivedFragmentCount;
++ long haveMulticastReceivedFrameCount;
++ long haveFCSErrorCount;
++ long haveTransmittedFrameCount;
++ long haveWEPUndecryptableCount;
++
++} nCo, *co = &nCo;
++
++static avList_t coList;
++
++/****************************************************************************
++* dot11GroupAddressesTable *
++****************************************************************************/
++static struct gaTbl_data {
++
++ char UID [ GA_UID_LEN + 1 ];
++ char ifName [ IFNAME_LEN + 1 ];
++
++ long ifIndex; // ifindex of card
++ long groupAddressesIndex;
++
++ char address [ MACADDR_LEN + 1 ];
++ long groupAddressesStatus;
++
++ long haveAddress;
++ long haveGroupAddressesStatus;
++
++} nGa, *ga = &nGa;
++
++static avList_t gaList;
++
++/****************************************************************************
++* dot11Res Group *
++****************************************************************************/
++static char resourceTypeIDName[] = "RTID";
++static long haveResourceTypeIDName = 1;
++
++/****************************************************************************
++* dot11ResourceInfoTable *
++****************************************************************************/
++static struct riTbl_data {
++
++ char UID [ RI_UID_LEN + 1 ]; // unique ID
++ char ifName [ IFNAME_LEN + 1 ]; // ifName of card
++
++ long ifIndex; // ifindex of card
++
++ char manufacturerOUI [ MAN_OUI_LEN + 1 ];
++ char manufacturerName [ SYS_STRING_LEN + 1 ];
++ char manufacturerProductName [ SYS_STRING_LEN + 1 ];
++ char manufacturerProductVersion [ SYS_STRING_LEN + 1 ];
++
++ char haveManufacturerOUI;
++ char haveManufacturerName;
++ char haveManufacturerProductName;
++ char haveManufacturerProductVersion;
++
++} nRi, *ri = &nRi;
++
++static avList_t riList;
++
++/****************************************************************************
++* dot11Phy Group *
++****************************************************************************/
++/****************************************************************************
++* dot11PhyOperationTable *
++****************************************************************************/
++static struct poTbl_data {
++
++ char UID [ PO_UID_LEN + 1 ]; // unique ID
++ char ifName [ IFNAME_LEN + 1 ]; // ifName of card
++
++ long ifIndex; // ifindex of card
++
++ long PHYType;
++ long currentRegDomain;
++ long tempType;
++
++ long havePHYType;
++ long haveCurrentRegDomain;
++ long haveTempType;
++
++} nPo, *po = &nPo;
++
++static avList_t poList;
++
++/****************************************************************************
++* dot11PhyAntennaEntry *
++****************************************************************************/
++static struct paTbl_data {
++
++ char UID [ PA_UID_LEN + 1 ]; // unique ID
++ char ifName [ IFNAME_LEN + 1 ]; // ifName of card
++
++ long ifIndex; // ifindex of card
++
++ long currentTxAntenna;
++ long diversitySupport;
++ long currentRxAntenna;
++
++ long haveCurrentTxAntenna;
++ long haveDiversitySupport;
++ long haveCurrentRxAntenna;
++
++} nPa, *pa = &nPa;
++
++static avList_t paList;
++
++/****************************************************************************
++* dot11PhyTxPowerTable *
++****************************************************************************/
++static struct ptTbl_data {
++
++ char UID [ PT_UID_LEN + 1 ]; // unique ID
++ char ifName [ IFNAME_LEN + 1 ]; // ifName of card
++
++ long ifIndex; // ifindex of card
++
++ long numberSupportedPowerLevels;
++ long TxPowerLevel1;
++ long TxPowerLevel2;
++ long TxPowerLevel3;
++ long TxPowerLevel4;
++ long TxPowerLevel5;
++ long TxPowerLevel6;
++ long TxPowerLevel7;
++ long TxPowerLevel8;
++ long currentTxPowerLevel;
++
++ long haveNumberSupportedPowerLevels;
++ long haveTxPowerLevel1;
++ long haveTxPowerLevel2;
++ long haveTxPowerLevel3;
++ long haveTxPowerLevel4;
++ long haveTxPowerLevel5;
++ long haveTxPowerLevel6;
++ long haveTxPowerLevel7;
++ long haveTxPowerLevel8;
++ long haveCurrentTxPowerLevel ;
++
++} nPt, *pt = &nPt;
++
++static avList_t ptList;
++
++/****************************************************************************
++* dot11PhyFHSSTable *
++****************************************************************************/
++static struct pfTbl_data {
++
++ char UID [ PF_UID_LEN + 1 ]; // unique ID
++ char ifName [ IFNAME_LEN + 1 ]; // ifName of card
++
++ long ifIndex; // ifindex of card
++
++ long hopTime;
++ long currentChannelNumber;
++ long maxDwellTime;
++ long currentDwellTime;
++ long currentSet;
++ long currentPattern;
++ long currentIndex;
++
++ long haveHopTime;
++ long haveCurrentChannelNumber;
++ long haveMaxDwellTime;
++ long haveCurrentDwellTime;
++ long haveCurrentSet;
++ long haveCurrentPattern;
++ long haveCurrentIndex;
++
++} nPf, *pf = &nPf;
++
++static avList_t pfList;
++
++/****************************************************************************
++* dot11PhyDSSSTable *
++****************************************************************************/
++static struct pdTbl_data {
++
++ char UID [ PD_UID_LEN + 1 ]; // unique ID
++ char ifName [ IFNAME_LEN + 1 ]; // ifName of card
++
++ long ifIndex; // ifindex of card
++
++ long currentChannel;
++ long CCAModeSupported;
++ long currentCCAMode;
++ long EDThreshold;
++
++ long haveCurrentChannel;
++ long haveCCAModeSupported ;
++ long haveCurrentCCAMode;
++ long haveEDThreshold;
++
++} nPd, *pd = &nPd;
++
++static avList_t pdList;
++
++/****************************************************************************
++* dot11PhyIRTable *
++****************************************************************************/
++static struct piTbl_data {
++
++ char UID [ PI_UID_LEN + 1 ]; // unique ID
++ char ifName [ IFNAME_LEN + 1 ]; // ifName of card
++
++ long ifIndex; // ifindex of card
++
++ long CCAWatchdogTimerMax;
++ long CCAWatchdogCountMax;
++ long CCAWatchdogTimerMin;
++ long CCAWatchdogCountMin;
++
++ long haveCCAWatchdogTimerMax;
++ long haveCCAWatchdogCountMax;
++ long haveCCAWatchdogTimerMin;
++ long haveCCAWatchdogCountMin;
++
++} nPi, *pi = &nPi;
++
++static avList_t piList;
++
++/****************************************************************************
++* dot11RegDomainsSupportedTable *
++****************************************************************************/
++static struct rdTbl_data {
++
++ char UID [ RD_UID_LEN + 1 ];
++ char ifName [ IFNAME_LEN + 1 ];
++
++ long ifIndex; // ifindex of card
++ long regDomainsSupportIndex;
++
++ long regDomainsSupportValue;
++ long haveRegDomainsSupportValue;
++
++} nRd, *rd = &nRd;
++
++static avList_t rdList;
++
++/****************************************************************************
++* dot11AntennasListTable *
++****************************************************************************/
++static struct alTbl_data {
++
++ char UID [ AL_UID_LEN + 1 ];
++ char ifName [ IFNAME_LEN + 1 ];
++
++ long ifIndex; // ifindex of card
++ long antennaListIndex;
++
++ long supportedTxAntenna;
++ long supportedRxAntenna;
++ long diversitySelectionRx ;
++
++ long haveSupportedTxAntenna;
++ long haveSupportedRxAntenna;
++ long haveDiversitySelectionRx ;
++
++} nAl, *al = &nAl;
++
++static avList_t alList;
++
++/****************************************************************************
++* dot11SupportedDataRatesTxTable *
++****************************************************************************/
++static struct rtTbl_data {
++
++ char UID [ RT_UID_LEN + 1 ];
++ char ifName [ IFNAME_LEN + 1 ];
++
++ long ifIndex; // ifindex of card
++ long supportedDataRatesTxIndex;
++
++ long supportedDataRatesTxValue;
++ long haveSupportedDataRatesTxValue;
++
++} nRt, *rt = &nRt;
++
++static avList_t rtList;
++
++/****************************************************************************
++* dot11SupportedDataRatesRxTable *
++****************************************************************************/
++static struct rrTbl_data {
++
++ char UID [ RR_UID_LEN + 1 ];
++ char ifName [ IFNAME_LEN + 1 ];
++
++ long ifIndex; // ifindex of card
++ long supportedDataRatesRxIndex;
++
++ long supportedDataRatesRxValue;
++ long haveSupportedDataRatesRxValue;
++
++} nRr, *rr = &nRr;
++
++static avList_t rrList;
++
++/****************************************************************************
++* Wireless Extensions Structures *
++****************************************************************************/
++static long wepCurrentKey;
++static long haveWepCurrentKey;
++static struct wepTbl_data {
++
++ long len;
++ char key [ WEP_STR_LEN + 1 ];
++ long haveKey;
++
++} wep[4];
++
++/****************************************************************************
++* *
++****************************************************************************/
++config_require(util_funcs)
++
++/* function prototypes */
++
++void init_ieee802dot11 ( void );
++FindVarMethod var_ieee802dot11;
++FindVarMethod var_dot11StationConfigTable;
++FindVarMethod var_dot11AuthenticationAlgorithmsTable;
++FindVarMethod var_dot11WEPDefaultKeysTable;
++FindVarMethod var_dot11WEPKeyMappingsTable;
++FindVarMethod var_dot11PrivacyTable;
++FindVarMethod var_dot11OperationTable;
++FindVarMethod var_dot11CountersTable;
++FindVarMethod var_dot11GroupAddressesTable;
++FindVarMethod var_dot11ResourceInfoTable;
++FindVarMethod var_dot11PhyOperationTable;
++FindVarMethod var_dot11PhyAntennaTable;
++FindVarMethod var_dot11PhyTxPowerTable;
++FindVarMethod var_dot11PhyFHSSTable;
++FindVarMethod var_dot11PhyDSSSTable;
++FindVarMethod var_dot11PhyIRTable;
++FindVarMethod var_dot11RegDomainsSupportedTable;
++FindVarMethod var_dot11AntennasListTable;
++FindVarMethod var_dot11SupportedDataRatesTxTable;
++FindVarMethod var_dot11SupportedDataRatesRxTable;
++
++WriteMethod write_dot11StationID;
++WriteMethod write_dot11MediumOccupancyLimit;
++WriteMethod write_dot11CFPPeriod;
++WriteMethod write_dot11CFPMaxDuration;
++WriteMethod write_dot11AuthenticationResponseTimeOut;
++WriteMethod write_dot11PowerManagementMode;
++WriteMethod write_dot11DesiredSSID;
++WriteMethod write_dot11DesiredBSSType;
++WriteMethod write_dot11OperationalRateSet;
++WriteMethod write_dot11BeaconPeriod;
++WriteMethod write_dot11DTIMPeriod;
++WriteMethod write_dot11AssociationResponseTimeOut;
++WriteMethod write_dot11AuthenticationAlgorithmsEnable;
++WriteMethod write_dot11WEPDefaultKeyValue;
++WriteMethod write_dot11WEPKeyMappingAddress;
++WriteMethod write_dot11WEPKeyMappingWEPOn;
++WriteMethod write_dot11WEPKeyMappingValue;
++WriteMethod write_dot11WEPKeyMappingStatus;
++WriteMethod write_dot11PrivacyInvoked;
++WriteMethod write_dot11WEPDefaultKeyID;
++WriteMethod write_dot11WEPKeyMappingLength;
++WriteMethod write_dot11ExcludeUnencrypted;
++WriteMethod write_dot11RTSThreshold;
++WriteMethod write_dot11ShortRetryLimit;
++WriteMethod write_dot11LongRetryLimit;
++WriteMethod write_dot11FragmentationThreshold;
++WriteMethod write_dot11MaxTransmitMSDULifetime;
++WriteMethod write_dot11MaxReceiveLifetime;
++WriteMethod write_dot11Address;
++WriteMethod write_dot11GroupAddressesStatus;
++WriteMethod write_dot11CurrentRegDomain;
++WriteMethod write_dot11CurrentTxAntenna;
++WriteMethod write_dot11CurrentRxAntenna;
++WriteMethod write_dot11CurrentTxPowerLevel;
++WriteMethod write_dot11CurrentChannelNumber;
++WriteMethod write_dot11CurrentDwellTime;
++WriteMethod write_dot11CurrentSet;
++WriteMethod write_dot11CurrentPattern;
++WriteMethod write_dot11CurrentIndex;
++WriteMethod write_dot11CurrentChannel;
++WriteMethod write_dot11CurrentCCAMode;
++WriteMethod write_dot11EDThreshold;
++WriteMethod write_dot11CCAWatchdogTimerMax;
++WriteMethod write_dot11CCAWatchdogCountMax;
++WriteMethod write_dot11CCAWatchdogTimerMin;
++WriteMethod write_dot11CCAWatchdogCountMin;
++WriteMethod write_dot11SupportedTxAntenna;
++WriteMethod write_dot11SupportedRxAntenna;
++WriteMethod write_dot11DiversitySelectionRx;
++
++#endif /* _MIBGROUP_IEEE802DOT11_H */
+--- /dev/null
++++ b/agent/mibgroup/iwlib.h
+@@ -0,0 +1,502 @@
++/*
++ * Wireless Tools
++ *
++ * Jean II - HPLB 97->99 - HPL 99->02
++ *
++ * Common header for the Wireless Extension library...
++ *
++ * This file is released under the GPL license.
++ * Copyright (c) 1997-2002 Jean Tourrilhes <jt@hpl.hp.com>
++ */
++
++#ifndef IWLIB_H
++#define IWLIB_H
++
++/*#include "CHANGELOG.h"*/
++
++/***************************** INCLUDES *****************************/
++
++/* Standard headers */
++#include <sys/types.h>
++#include <sys/ioctl.h>
++#include <stdio.h>
++#include <math.h>
++#include <errno.h>
++#include <fcntl.h>
++#include <ctype.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++#include <netdb.h> /* gethostbyname, getnetbyname */
++#include <net/ethernet.h> /* struct ether_addr */
++#include <sys/time.h> /* struct timeval */
++#include <unistd.h>
++
++/* This is our header selection. Try to hide the mess and the misery :-(
++ * Don't look, you would go blind ;-) */
++
++#ifndef LINUX_VERSION_CODE
++#include <linux/version.h>
++#endif
++
++/* Kernel headers 2.4.X + Glibc 2.2 - Mandrake 8.0, Debian 2.3, RH 7.1
++ * Kernel headers 2.2.X + Glibc 2.2 - Slackware 8.0 */
++#if defined(__GLIBC__) \
++ && __GLIBC__ == 2 \
++ && __GLIBC_MINOR__ >= 2 \
++ && LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
++//#define GLIBC22_HEADERS
++#define GENERIC_HEADERS
++
++/* Kernel headers 2.4.X + Glibc 2.1 - Debian 2.2 upgraded, RH 7.0
++ * Kernel headers 2.2.X + Glibc 2.1 - Debian 2.2, RH 6.1 */
++#elif defined(__GLIBC__) \
++ && __GLIBC__ == 2 \
++ && __GLIBC_MINOR__ == 1 \
++ && LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
++//#define GLIBC_HEADERS
++#define GENERIC_HEADERS
++
++/* Kernel headers 2.2.X + Glibc 2.0 - Debian 2.1 */
++#elif defined(__GLIBC__) \
++ && __GLIBC__ == 2 \
++ && __GLIBC_MINOR__ == 0 \
++ && LINUX_VERSION_CODE >= KERNEL_VERSION(2,0,0) \
++ && LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
++#define GLIBC_HEADERS
++#define KLUDGE_HEADERS
++
++/* Note : is it really worth supporting kernel 2.0.X, knowing that
++ * we require WE v9, which is only available in 2.2.X and higher ?
++ * I guess one could use 2.0.x with an upgraded wireless.h... */
++
++/* Kernel headers 2.0.X + Glibc 2.0 - Debian 2.0, RH 5 */
++#elif defined(__GLIBC__) \
++ && __GLIBC__ == 2 \
++ && __GLIBC_MINOR__ == 0 \
++ && LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0) \
++ && LINUX_VERSION_CODE >= KERNEL_VERSION(2,0,0)
++#define GLIBC_HEADERS
++
++/* Kernel headers 2.0.X + libc5 - old systems */
++#elif defined(_LINUX_C_LIB_VERSION_MAJOR) \
++ && _LINUX_C_LIB_VERSION_MAJOR == 5 \
++ && LINUX_VERSION_CODE >= KERNEL_VERSION(2,0,0) \
++ && LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
++#define LIBC5_HEADERS
++
++/* Unsupported combination */
++#else
++#error "Your kernel/libc combination is not supported"
++#endif
++
++#ifdef GENERIC_HEADERS
++/* Proposed by Dr. Michael Rietz <rietz@mail.amps.de>, 27.3.2 */
++/* If this works for all, it might be more stable on the long term - Jean II */
++#include <net/if_arp.h> /* For ARPHRD_ETHER */
++#include <sys/socket.h> /* For AF_INET & struct sockaddr */
++#include <netinet/in.h> /* For struct sockaddr_in */
++#include <netinet/if_ether.h>
++#endif /* GENERIC_HEADERS */
++
++#ifdef GLIBC22_HEADERS
++/* Added by Ross G. Miller <Ross_Miller@baylor.edu>, 3/28/01 */
++#include <linux/if_arp.h> /* For ARPHRD_ETHER */
++#include <linux/socket.h> /* For AF_INET & struct sockaddr */
++#include <sys/socket.h>
++#endif /* GLIBC22_HEADERS */
++
++#ifdef KLUDGE_HEADERS
++#include <socketbits.h>
++#endif /* KLUDGE_HEADERS */
++
++#ifdef GLIBC_HEADERS
++#include <linux/if_arp.h> /* For ARPHRD_ETHER */
++#include <linux/socket.h> /* For AF_INET & struct sockaddr */
++#include <linux/in.h> /* For struct sockaddr_in */
++#endif /* KLUDGE_HEADERS || GLIBC_HEADERS */
++
++#ifdef LIBC5_HEADERS
++#include <sys/socket.h> /* For AF_INET & struct sockaddr & socket() */
++#include <linux/if_arp.h> /* For ARPHRD_ETHER */
++#include <linux/in.h> /* For struct sockaddr_in */
++#endif /* LIBC5_HEADERS */
++
++/* Those 3 headers were previously included in wireless.h */
++#include <linux/types.h> /* for "caddr_t" et al */
++#include <linux/socket.h> /* for "struct sockaddr" et al */
++#include <linux/if.h> /* for IFNAMSIZ and co... */
++
++#ifdef WEXT_HEADER
++/* Private copy of Wireless extensions */
++#include WEXT_HEADER
++#else /* !WEXT_HEADER */
++/* System wide Wireless extensions */
++#include <linux/wireless.h>
++#endif /* !WEXT_HEADER */
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/****************************** DEBUG ******************************/
++
++
++/************************ CONSTANTS & MACROS ************************/
++
++/* Paths */
++#define PROC_NET_WIRELESS "/proc/net/wireless"
++#define PROC_NET_DEV "/proc/net/dev"
++
++/* Some usefull constants */
++#define KILO 1e3
++#define MEGA 1e6
++#define GIGA 1e9
++/* For doing log10/exp10 without libm */
++#define LOG10_MAGIC 1.25892541179
++
++/* Backward compatibility for Wireless Extension 9 */
++#ifndef IW_POWER_MODIFIER
++#define IW_POWER_MODIFIER 0x000F /* Modify a parameter */
++#define IW_POWER_MIN 0x0001 /* Value is a minimum */
++#define IW_POWER_MAX 0x0002 /* Value is a maximum */
++#define IW_POWER_RELATIVE 0x0004 /* Value is not in seconds/ms/us */
++#endif /* IW_POWER_MODIFIER */
++
++#ifndef IW_ENCODE_NOKEY
++#define IW_ENCODE_NOKEY 0x0800 /* Key is write only, so not here */
++#define IW_ENCODE_MODE 0xF000 /* Modes defined below */
++#endif /* IW_ENCODE_NOKEY */
++#ifndef IW_ENCODE_TEMP
++#define IW_ENCODE_TEMP 0x0400 /* Temporary key */
++#endif /* IW_ENCODE_TEMP */
++
++/* More backward compatibility */
++#ifndef SIOCSIWCOMMIT
++#define SIOCSIWCOMMIT SIOCSIWNAME
++#endif /* SIOCSIWCOMMIT */
++
++/****************************** TYPES ******************************/
++
++/* Shortcuts */
++typedef struct iw_statistics iwstats;
++typedef struct iw_range iwrange;
++typedef struct iw_param iwparam;
++typedef struct iw_freq iwfreq;
++typedef struct iw_quality iwqual;
++typedef struct iw_priv_args iwprivargs;
++typedef struct sockaddr sockaddr;
++
++/* Structure for storing all wireless information for each device
++ * This is pretty exhaustive... */
++typedef struct wireless_info
++{
++ char name[IFNAMSIZ + 1]; /* Wireless/protocol name */
++ int has_nwid;
++ iwparam nwid; /* Network ID */
++ int has_freq;
++ double freq; /* Frequency/channel */
++ int has_sens;
++ iwparam sens; /* sensitivity */
++ int has_key;
++ unsigned char key[IW_ENCODING_TOKEN_MAX]; /* Encoding key used */
++ int key_size; /* Number of bytes */
++ int key_flags; /* Various flags */
++ int has_essid;
++ int essid_on;
++ char essid[IW_ESSID_MAX_SIZE + 1]; /* ESSID (extended network) */
++ int has_nickname;
++ char nickname[IW_ESSID_MAX_SIZE + 1]; /* NickName */
++ int has_ap_addr;
++ sockaddr ap_addr; /* Access point address */
++ int has_bitrate;
++ iwparam bitrate; /* Bit rate in bps */
++ int has_rts;
++ iwparam rts; /* RTS threshold in bytes */
++ int has_frag;
++ iwparam frag; /* Fragmentation threshold in bytes */
++ int has_mode;
++ int mode; /* Operation mode */
++ int has_power;
++ iwparam power; /* Power management parameters */
++ int has_txpower;
++ iwparam txpower; /* Transmit Power in dBm */
++ int has_retry;
++ iwparam retry; /* Retry limit or lifetime */
++
++ /* Stats */
++ iwstats stats;
++ int has_stats;
++ iwrange range;
++ int has_range;
++} wireless_info;
++
++/* Structure for storing all wireless information for each device
++ * This is a cut down version of the one above, containing only
++ * the things *truly* needed to configure a card.
++ * Don't add other junk, I'll remove it... */
++typedef struct wireless_config
++{
++ char name[IFNAMSIZ + 1]; /* Wireless/protocol name */
++ int has_nwid;
++ iwparam nwid; /* Network ID */
++ int has_freq;
++ double freq; /* Frequency/channel */
++ int has_key;
++ unsigned char key[IW_ENCODING_TOKEN_MAX]; /* Encoding key used */
++ int key_size; /* Number of bytes */
++ int key_flags; /* Various flags */
++ int has_essid;
++ int essid_on;
++ char essid[IW_ESSID_MAX_SIZE + 1]; /* ESSID (extended network) */
++ int has_mode;
++ int mode; /* Operation mode */
++} wireless_config;
++
++typedef struct stream_descr
++{
++ char * end; /* End of the stream */
++ char * current; /* Current event in stream of events */
++ char * value; /* Current value in event */
++} stream_descr;
++
++/* Prototype for handling display of each single interface on the
++ * system - see iw_enum_devices() */
++typedef int (*iw_enum_handler)(int skfd,
++ char * ifname,
++ char * args[],
++ int count);
++
++/**************************** PROTOTYPES ****************************/
++/*
++ * All the functions in iwcommon.c
++ */
++
++/* ---------------------- SOCKET SUBROUTINES -----------------------*/
++int
++ iw_sockets_open(void);
++void
++ iw_enum_devices(int skfd,
++ iw_enum_handler fn,
++ char * args[],
++ int count);
++/* --------------------- WIRELESS SUBROUTINES ----------------------*/
++int
++ iw_get_range_info(int skfd,
++ char * ifname,
++ iwrange * range);
++int
++ iw_print_version_info(char * toolname);
++int
++ iw_get_priv_info(int skfd,
++ char * ifname,
++ iwprivargs * priv,
++ int maxpriv);
++int
++ iw_get_basic_config(int skfd,
++ char * ifname,
++ wireless_config * info);
++int
++ iw_set_basic_config(int skfd,
++ char * ifname,
++ wireless_config * info);
++/* --------------------- PROTOCOL SUBROUTINES --------------------- */
++int
++ iw_protocol_compare(char * protocol1,
++ char * protocol2);
++/* -------------------- FREQUENCY SUBROUTINES --------------------- */
++void
++ iw_float2freq(double in,
++ iwfreq * out);
++double
++ iw_freq2float(iwfreq * in);
++void
++ iw_print_freq(char * buffer,
++ double freq);
++int
++ iw_freq_to_channel(double freq,
++ struct iw_range * range);
++void
++ iw_print_bitrate(char * buffer,
++ int bitrate);
++/* ---------------------- POWER SUBROUTINES ----------------------- */
++int
++ iw_dbm2mwatt(int in);
++int
++ iw_mwatt2dbm(int in);
++/* -------------------- STATISTICS SUBROUTINES -------------------- */
++int
++ iw_get_stats(int skfd,
++ char * ifname,
++ iwstats * stats);
++void
++ iw_print_stats(char * buffer,
++ iwqual * qual,
++ iwrange * range,
++ int has_range);
++/* --------------------- ENCODING SUBROUTINES --------------------- */
++void
++ iw_print_key(char * buffer,
++ unsigned char * key,
++ int key_size,
++ int key_flags);
++int
++ iw_in_key(char * input,
++ unsigned char * key);
++int
++ iw_in_key_full(int skfd,
++ char * ifname,
++ char * input,
++ unsigned char * key,
++ __u16 * flags);
++/* ----------------- POWER MANAGEMENT SUBROUTINES ----------------- */
++void
++ iw_print_pm_value(char * buffer,
++ int value,
++ int flags);
++void
++ iw_print_pm_mode(char * buffer,
++ int flags);
++/* --------------- RETRY LIMIT/LIFETIME SUBROUTINES --------------- */
++#if WIRELESS_EXT > 10
++void
++ iw_print_retry_value(char * buffer,
++ int value,
++ int flags);
++#endif
++/* ----------------------- TIME SUBROUTINES ----------------------- */
++void
++ iw_print_timeval(char * buffer,
++ const struct timeval * time);
++/* --------------------- ADDRESS SUBROUTINES ---------------------- */
++int
++ iw_check_mac_addr_type(int skfd,
++ char * ifname);
++int
++ iw_check_if_addr_type(int skfd,
++ char * ifname);
++#if 0
++int
++ iw_check_addr_type(int skfd,
++ char * ifname);
++#endif
++void
++ iw_ether_ntop(const struct ether_addr* eth, char* buf);
++char*
++ iw_ether_ntoa(const struct ether_addr* eth);
++int
++ iw_ether_aton(const char* bufp, struct ether_addr* eth);
++int
++ iw_in_inet(char *bufp, struct sockaddr *sap);
++int
++ iw_in_addr(int skfd,
++ char * ifname,
++ char * bufp,
++ struct sockaddr * sap);
++/* ----------------------- MISC SUBROUTINES ------------------------ */
++int
++ iw_get_priv_size(int args);
++
++#if WIRELESS_EXT > 13
++/* ---------------------- EVENT SUBROUTINES ---------------------- */
++void
++ iw_init_event_stream(struct stream_descr * stream,
++ char * data,
++ int len);
++int
++ iw_extract_event_stream(struct stream_descr * stream,
++ struct iw_event * iwe);
++#endif /* WIRELESS_EXT > 13 */
++
++/**************************** VARIABLES ****************************/
++
++extern const char * const iw_operation_mode[];
++#define IW_NUM_OPER_MODE 7
++
++/************************* INLINE FUNTIONS *************************/
++/*
++ * Functions that are so simple that it's more efficient inlining them
++ */
++
++/*
++ * Note : I've defined wrapper for the ioctl request so that
++ * it will be easier to migrate to other kernel API if needed
++ */
++
++/*------------------------------------------------------------------*/
++/*
++ * Wrapper to push some Wireless Parameter in the driver
++ */
++static inline int
++iw_set_ext(int skfd, /* Socket to the kernel */
++ char * ifname, /* Device name */
++ int request, /* WE ID */
++ struct iwreq * pwrq) /* Fixed part of the request */
++{
++ /* Set device name */
++ strncpy(pwrq->ifr_name, ifname, IFNAMSIZ);
++ /* Do the request */
++ return(ioctl(skfd, request, pwrq));
++}
++
++/*------------------------------------------------------------------*/
++/*
++ * Wrapper to extract some Wireless Parameter out of the driver
++ */
++static inline int
++iw_get_ext(int skfd, /* Socket to the kernel */
++ char * ifname, /* Device name */
++ int request, /* WE ID */
++ struct iwreq * pwrq) /* Fixed part of the request */
++{
++ /* Set device name */
++ strncpy(pwrq->ifr_name, ifname, IFNAMSIZ);
++ /* Do the request */
++ return(ioctl(skfd, request, pwrq));
++}
++
++/*------------------------------------------------------------------*/
++/* Backwards compatability
++ * Actually, those form are much easier to use when dealing with
++ * struct sockaddr... */
++static inline char*
++iw_pr_ether(char* bufp, const unsigned char* addr)
++{
++ iw_ether_ntop((const struct ether_addr *) addr, bufp);
++ return bufp;
++}
++/* Backwards compatability */
++static inline int
++iw_in_ether(const char *bufp, struct sockaddr *sap)
++{
++ sap->sa_family = ARPHRD_ETHER;
++ return iw_ether_aton(bufp, (struct ether_addr *) sap->sa_data) ? 0 : -1;
++}
++
++/*------------------------------------------------------------------*/
++/*
++ * Create an Ethernet broadcast address
++ */
++static inline void
++iw_broad_ether(struct sockaddr *sap)
++{
++ sap->sa_family = ARPHRD_ETHER;
++ memset((char *) sap->sa_data, 0xFF, ETH_ALEN);
++}
++
++/*------------------------------------------------------------------*/
++/*
++ * Create an Ethernet NULL address
++ */
++static inline void
++iw_null_ether(struct sockaddr *sap)
++{
++ sap->sa_family = ARPHRD_ETHER;
++ memset((char *) sap->sa_data, 0x00, ETH_ALEN);
++}
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif /* IWLIB_H */
--- /dev/null
+--- a/agent/mibgroup/host/hr_filesys.c
++++ b/agent/mibgroup/host/hr_filesys.c
+@@ -322,13 +322,13 @@ var_hrfilesys(struct variable *vp,
+ long_return = fsys_idx;
+ return (u_char *) & long_return;
+ case HRFSYS_MOUNT:
+- snprintf(string, sizeof(string), HRFS_entry->HRFS_mount);
++ snprintf(string, sizeof(string), "%s", HRFS_entry->HRFS_mount);
+ string[ sizeof(string)-1 ] = 0;
+ *var_len = strlen(string);
+ return (u_char *) string;
+ case HRFSYS_RMOUNT:
+ if (Check_HR_FileSys_NFS()) {
+- snprintf(string, sizeof(string), HRFS_entry->HRFS_name);
++ snprintf(string, sizeof(string), "%s", HRFS_entry->HRFS_name);
+ string[ sizeof(string)-1 ] = 0;
+ } else
+ string[0] = '\0';
+--- a/agent/mibgroup/ucd-snmp/extensible.c
++++ b/agent/mibgroup/ucd-snmp/extensible.c
+@@ -513,7 +513,7 @@ fixExecError(int action,
+ }
+ tmp = *((long *) var_val);
+ if ((tmp == 1) && (action == COMMIT) && (exten->fixcmd[0] != 0)) {
+- sprintf(ex.command, exten->fixcmd);
++ sprintf(ex.command, "%s", exten->fixcmd);
+ if ((fd = get_exec_output(&ex)) != -1) {
+ file = fdopen(fd, "r");
+ while (fgets(ex.output, sizeof(ex.output), file) != NULL);
SUBMENU:=Filesystem
DEPENDS:=+libwrap +libblkid +libuuid $(LIBRPC_DEPENDS)
URL:=http://nfs.sourceforge.net/
+ MAINTAINER:=Peter Wagner <tripolar@gmx.at>
endef
define Package/nfs-kernel-server
CONFIGURE_ARGS += --without-protobuf
endif
+define Package/ocserv/conffiles
+/etc/config/ocserv
+endef
+
define Package/ocserv/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ocserv $(1)/usr/sbin/
logger -t openconnect "initializing..."
serv_addr=
- for ip in $(resolveip -t 5 "$server"); do
- proto_add_host_dependency "$config" "$server"
+ for ip in $(resolveip -t 10 "$server"); do
+ ( proto_add_host_dependency "$config" "$ip" )
serv_addr=1
- done
+ fi
[ -n "$serv_addr" ] || {
- logger -t openconnect "Could not resolve server address"
- sleep 5
+ logger -t openconnect "Could not resolve server address: '$server'"
+ sleep 20
proto_setup_failed "$config"
exit 1
}
--- /dev/null
+#
+# Copyright (C) 2006-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=portmap
+PKG_VERSION:=6.0
+PKG_RELEASE:=4
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://neil.brown.name/portmap/
+PKG_MD5SUM:=ac108ab68bf0f34477f8317791aaf1ff
+
+PKG_LICENSE:=BSD-4c
+PKG_LICENSE_FILES:=portmap.man
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/portmap
+ SECTION:=net
+ CATEGORY:=Network
+ DEPENDS:=+libwrap $(LIBRPC_DEPENDS)
+ TITLE:=The RPC Portmapper
+ URL:=http://neil.brown.name/portmap/
+ MAINTAINER:=Peter Wagner <tripolar@gmx.at>
+endef
+
+define Package/portmap/description
+ Portmap is a server that converts RPC (Remote Procedure Call) program
+ numbers into DARPA protocol port numbers.
+endef
+
+MAKE_FLAGS += \
+ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -DHOSTS_ACCESS -DFACILITY=LOG_DAEMON -DIGNORE_SIGCHLD" \
+ RPCUSER="rpc" \
+ LDLIBS="$(TARGET_LDFLAGS) -lwrap $(LIBRPC)" \
+ all
+
+define Package/portmap/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/portmap $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_BIN) ./files/portmap.init $(1)/etc/init.d/portmap
+endef
+
+$(eval $(call BuildPackage,portmap))
--- /dev/null
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006-2011 OpenWrt.org
+
+START=19
+STOP=19
+
+USE_PROCD=1
+
+start_service() {
+ user_exists rpc 65533 || user_add rpc 65533 65533 rpc /var/empty
+ group_exists rpc 65533 || group_add rpc 65533
+
+ procd_open_instance
+ procd_set_param command /usr/sbin/portmap -f
+ procd_close_instance
+}
--- /dev/null
+diff -ur portmap_6.0.org/Makefile portmap_6.0/Makefile
+--- portmap_6.0.org/Makefile 2008-04-19 22:44:35.000000000 +0200
++++ portmap_6.0/Makefile 2008-04-19 00:02:01.000000000 +0200
+@@ -127,7 +127,7 @@
+ CPPFLAGS += $(HOSTS_ACCESS)
+ portmap: CFLAGS += -fpie
+ portmap: LDLIBS += $(WRAP_LIB)
+-portmap: LDFLAGS += -pie
++#portmap: LDFLAGS += -pie
+ portmap: portmap.o pmap_check.o from_local.o
+
+ from_local: CPPFLAGS += -DTEST
TITLE:=BitTorrent client for ncurses
URL:=http://libtorrent.rakshasa.no/
DEPENDS:=+libcurl +libtorrent +libncursesw +libsigcxx +libpthread
+ MAINTAINER:=Peter Wagner <tripolar@gmx.at>
endef
define Package/rtorrent/Default/description
define Package/pulseaudio-daemon
$(call Package/pulseaudio/Default)
- VARIANT:=noavahi
-endef
-
-define Package/pulseaudio-daemon-avahi
- $(call Package/pulseaudio/Default)
- DEPENDS+=+dbus +libavahi-client +avahi-daemon
- TITLE+= (avahi)
- VARIANT:=avahi
endef
define Package/pulseaudio/Default/description
$(call Package/pulseaudio/Default/description)
endef
-define Package/pulseaudio-daemon-avahi/description
- $(call Package/pulseaudio/Default/description)
- This package is compiled against dbus and avahi.
-endef
-
define Package/pulseaudio-daemon/conffiles
/etc/pulse/client.conf
/etc/pulse/daemon.conf
/etc/pulse/system.pa
endef
-define Package/pulseaudio-daemon-avahi/conffiles
-/etc/pulse/client.conf
-/etc/pulse/daemon.conf
-/etc/pulse/default.pa
-/etc/pulse/system.pa
-endef
-
define Package/pulseaudio-tools
SECTION:=sound
CATEGORY:=Sound
DEPENDS:=+libsndfile pulseaudio
TITLE:=Tools for Pulseaudio
URL:=http://www.pulseaudio.org
- VARIANT:=noavahi
endef
define Package/pulseaudio-profiles
--disable-lirc \
--disable-bluez \
--disable-udev \
- --without-fftw
-
-ifeq ($(BUILD_VARIANT),avahi)
-CONFIGURE_ARGS += \
- --enable-avahi \
- --enable-dbus
-endif
-
-ifeq ($(BUILD_VARIANT),noavahi)
-CONFIGURE_ARGS += \
+ --without-fftw \
--disable-avahi \
--disable-dbus
-endif
CONFIGURE_VARS += \
PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
chmod -R 0644 $(1)/etc/pulse/*
endef
-define Package/pulseaudio-daemon-avahi/install
- $(INSTALL_DIR) \
- $(1)/etc/pulse \
- $(1)/etc/init.d \
- $(1)/usr/bin \
- $(1)/usr/lib \
- $(1)/usr/lib/pulseaudio \
- $(1)/usr/lib/pulse-$(PKG_VERSION)/modules \
- $(1)/etc/dbus-1/system.d
-
- $(INSTALL_BIN) \
- $(PKG_INSTALL_DIR)/usr/bin/pulseaudio \
- $(1)/usr/bin/pulseaudio
-
- $(INSTALL_BIN) \
- ./files/pulseaudio.init \
- $(1)/etc/init.d/pulseaudio
-
- $(INSTALL_CONF) \
- $(PKG_INSTALL_DIR)/etc/pulse/* \
- $(1)/etc/pulse
-
- $(CP) \
- $(PKG_INSTALL_DIR)/usr/lib/*.so* \
- $(1)/usr/lib/
-
- $(CP) \
- $(PKG_INSTALL_DIR)/usr/lib/pulseaudio/* \
- $(1)/usr/lib/pulseaudio/
-
- $(CP) \
- $(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/lib*.so \
- $(1)/usr/lib/
-
- $(CP) \
- $(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/module*.so \
- $(1)/usr/lib/pulse-$(PKG_VERSION)/modules/
-
- $(INSTALL_CONF) \
- $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/pulseaudio-system.conf \
- $(1)/etc/dbus-1/system.d/pulseaudio-system.conf
-
- chmod -R 0644 $(1)/etc/pulse/* $(1)/etc/dbus-1/system.d/pulseaudio-system.conf
-endef
-
define Package/pulseaudio-tools/install
$(INSTALL_DIR) \
$(1)/usr/bin
endef
$(eval $(call BuildPackage,pulseaudio-daemon))
-$(eval $(call BuildPackage,pulseaudio-daemon-avahi))
$(eval $(call BuildPackage,pulseaudio-tools))
$(eval $(call BuildPackage,pulseaudio-profiles))
--- /dev/null
+#
+# Copyright (C) 2010-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=grep
+PKG_VERSION:=2.20
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=@GNU/grep
+PKG_MD5SUM:=2cbea44a4f1548aee20b9ff2d3076908
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/grep
+ SECTION:=utils
+ CATEGORY:=Utilities
+ TITLE:=grep search utility - full version
+ DEPENDS:=+libpcre
+ URL:=http://www.gnu.org/software/grep/
+endef
+
+define Package/grep/description
+The grep command searches one or more input files for lines
+containing a match to a specified pattern. By default, grep
+prints the matching lines.
+endef
+
+define Package/grep/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/grep $(1)/usr/bin/grep
+endef
+
+define Package/grep/postinst
+#!/bin/sh
+[ -L "$${IPKG_INSTROOT}/bin/grep" ] && rm -f "$${IPKG_INSTROOT}/bin/grep"
+exit 0
+endef
+
+define Package/grep/prerm
+$${IPKG_INSTROOT}/bin/busybox grep -h 2>&1 | grep -q BusyBox && \
+ln -sf busybox $${IPKG_INSTROOT}/bin/grep
+exit 0
+endef
+
+$(eval $(call BuildPackage,grep))
--- /dev/null
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lm-sensors
+PKG_VERSION:=3.3.5
+PKG_RELEASE:=1
+
+PKG_SOURCE:=lm_sensors-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://dl.lm-sensors.org/lm-sensors/releases
+PKG_MD5SUM:=da506dedceb41822e64865f6ba34828a
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=GPL-2.0+ LGPL-2.1+
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/lm_sensors-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/lm-sensors/Default
+ DEPENDS:=+sysfsutils
+ URL:=http://www.lm-sensors.org/
+endef
+
+define Package/lm-sensors
+ $(call Package/lm-sensors/Default)
+ SECTION:=utils
+ CATEGORY:=Utilities
+ TITLE:=lm-sensors
+ DEPENDS+=+libsensors
+endef
+
+define Package/lm-sensors-detect
+ $(call Package/lm-sensors/Default)
+ SECTION:=utils
+ CATEGORY:=Utilities
+ TITLE:=lm-sensors-detect
+ DEPENDS+=+lm-sensors +perl +perlbase-essential +perlbase-fcntl +perlbase-file +perlbase-xsloader
+endef
+
+define Package/libsensors
+ $(call Package/lm-sensors/Default)
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=libsensors
+endef
+
+define Package/lm-sensors/description
+ utility to read hardware sensor data
+endef
+
+define Package/lm-sensors-detect/description
+ script to autodetect sensor hardware
+endef
+
+define Package/libsensors/description
+ lm-sensors libraries
+endef
+
+define Package/lm-sensors/conffiles
+/etc/sensors.conf
+endef
+
+define Build/Compile
+ +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+ $(TARGET_CONFIGURE_OPTS) \
+ KERNELVERSION="$(LINUX_VERSION)" \
+ LINUX="$(LINUX_DIR)" \
+ CC="$(TARGET_CC)" \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ CPPFLAGS="$(TARGET_CPPFLAGS)" \
+ STAGING_DIR="$(STAGING_DIR)" \
+ PREFIX="/usr" \
+ MACHINE="$(ARCH)" \
+ EXLDFLAGS="" \
+ user
+endef
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(1)/usr/include/sensors
+ $(CP) \
+ $(PKG_BUILD_DIR)/lib/sensors.h \
+ $(1)/usr/include/sensors
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) \
+ $(PKG_BUILD_DIR)/lib/libsensors.{a,so*} \
+ $(1)/usr/lib
+endef
+
+define Package/lm-sensors/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/prog/sensors/sensors $(1)/usr/sbin
+ifeq ($(ARCH),i386)
+ $(INSTALL_DIR) $(1)/etc
+ $(INSTALL_CONF) ./files/sensors.conf $(1)/etc/sensors.conf
+endif
+endef
+
+define Package/lm-sensors-detect/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/prog/detect/sensors-detect $(1)/usr/sbin
+endef
+
+define Package/libsensors/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/libsensors.so* $(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,lm-sensors))
+$(eval $(call BuildPackage,lm-sensors-detect))
+$(eval $(call BuildPackage,libsensors))
--- /dev/null
+chip "pc87366-*"
+
+# Soekris net4801 configuration
+
+# Written by Henrik Brix Andersen <henrik@brixandersen.dk>
+# Latest version can be found at http://www.brixandersen.dk/
+
+# The configuration is partly based on the PC87366 datasheet and
+# partly borrowed from the env4801 utility by Poul-Henning
+# Kamp <phk@phk.freebsd.dk>
+
+# Datasheet: http://www.winbond.com/PDF/APCsheet/PC87366.pdf
+# env4801: http://phk.freebsd.dk/soekris/env4801/
+
+
+# Voltage inputs
+ ignore vid
+
+ # Unknown
+ # label in0 "avi0"
+ ignore in0
+
+
+ # Core Voltage, +2.0V
+ label in1 "VCORE"
+ set in1_min 1.9
+ set in1_max 2.1
+
+
+ # VCC, +5.0V
+ label in2 "VCC"
+ compute in2 @*2, @/2
+
+
+ # Power Supply Input, +6.0V - +28.0V
+ label in3 "VPWR"
+ compute in3 @*20.1, @/20.1
+ set in3_min 6.0
+ set in3_max 28.0
+
+
+ # +12V
+ label in4 "+12V"
+ compute in4 @*4.83, @/4.83
+ set in4_min 11
+ set in4_max 13
+
+
+ # -12V
+ label in5 "-12V"
+ # If in10 on your net4801 doesn't have the 3.3V reference, use this
+ # compute line instead:
+ # compute in5 (@-3.3)*19.2+3.3, (@-3.3)/19.2+3.3
+ compute in5 (@-in10)*19.2+in10, (@-in10)/19.2+in10
+ set in5_min -13
+ set in5_max -11
+
+
+ # GND, 0V
+ label in6 "GND"
+ set in6_min 0
+ set in6_max 0
+
+
+ # Standby Voltage, +3.3V
+ # Internally divided by 2
+ label in7 "Vsb"
+ compute in7 @*2, @/2
+ set in7_min 3.0
+ set in7_max 3.6
+
+
+ # Supply Voltage, +3.3V
+ # Internally divided by 2
+ label in8 "Vdd"
+ compute in8 @*2, @/2
+ set in8_min 3.0
+ set in8_max 3.6
+
+
+ # Battery Backup Supply Voltage, +3.0V
+ label in9 "Vbat"
+ set in9_min 2.4
+ set in9_max 3.6
+
+
+ # Analog Supply Voltage, +3.3V
+ # Internally divided by 2
+ label in10 "AVdd"
+ compute in10 @*2, @/2
+ set in10_min 3.0
+ set in10_max 3.6
+
+
+# Temperature inputs
+ ignore temp1
+ ignore temp2
+
+ # PC87366 Internal Temperature
+ # PC87366 Recommended Operating Conditions: 0 - 70C
+ # SC1100 Recommended Operating Conditions: 0 - 85C
+ label temp3 "Temp"
+ label temp3_crit "Critical"
+ set temp3_min 0
+ set temp3_max 70
+ set temp3_crit 85
+
+
+ ignore temp4
+ ignore temp5
+ ignore temp6
+
+
+# Fan inputs
+ ignore fan1
+ ignore fan2
+ ignore fan3
CATEGORY:=Libraries
TITLE:=PKCS11 spying wrapper
URL:=https://github.com/OpenSC/OpenSC/wiki
+ DEPENDS:=+libopenssl +libpthread
endef
define Package/libpkcs11-spy/dscription
--- /dev/null
+#
+# Copyright (C) 2008-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=owfs
+PKG_VERSION:=2.9p5
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/$(PKG_NAME)
+PKG_MD5SUM:=b5c20998e8ffc6fa3974daef99c02402
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=GPL-2.0
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+#
+# templates
+#
+
+define Package/$(PKG_NAME)/Default
+ TITLE:=OWFS (1-Wire File System)
+ URL:=http://owfs.sourceforge.net/
+ SECTION:=net
+ CATEGORY:=Network
+ SUBMENU:=Filesystem
+endef
+
+define Package/$(PKG_NAME)/Default/description
+ OWFS is a suite of programs that designed to make the 1-wire bus and its
+ devices easily accessible. The underlying priciple is to create a virtual
+ filesystem, with the unique ID being the directory, and the individual
+ properties of the device are represented as simple files that can be read
+ and written.
+
+ Details of the individual slave or master design are hidden behind a
+ consistent interface. The goal is to provide an easy set of tools for a
+ software designer to create monitoring or control applications. There are
+ some performance enhancements in the implementation, including data caching,
+ parallel access to bus masters, and aggregation of device communication.
+ Still the fundemental goal has been ease of use, flexibility and correctness
+ rather than speed.
+endef
+
+define Package/owfs/Server
+ $(call Package/owfs/Default)
+ DEPENDS:=+libow +libpthread
+endef
+
+define Package/owfs/Library
+ $(call Package/owfs/Default)
+ SECTION:=libs
+ CATEGORY:=Libraries
+endef
+
+define Package/owfs/Utility
+ $(call Package/owfs/Default)
+ SECTION:=utils
+ CATEGORY:=Utilities
+ DEPENDS:=+libow
+endef
+
+#
+# shared libraries
+#
+
+define Package/libow
+ $(call Package/owfs/Library)
+ DEPENDS:=+libusb-compat +libpthread
+ TITLE:=OWFS - common shared library
+endef
+
+define Package/libow/description
+ $(call Package/$(PKG_NAME)/Default/description)
+
+ This package contains the OWFS library.
+endef
+
+define Package/libow-capi
+ $(call Package/owfs/Library)
+ DEPENDS:=+libow
+ TITLE:=OWFS - C-API library
+endef
+
+define Package/libow-capi/description
+ $(call Package/$(PKG_NAME)/Default/description)
+
+ This package contains the OWFS C-API library.
+endef
+
+#
+# utilities
+#
+
+define Package/owshell
+ $(call Package/owfs/Utility)
+ TITLE:=OWFS - shell utilities
+ DEPENDS+= +USE_UCLIBC:librpc
+endef
+
+define Package/owshell/description
+ $(call Package/$(PKG_NAME)/Default/description)
+
+ This package contains the OWFS shell utilities.
+endef
+
+define Package/owfs
+ $(call Package/owfs/Utility)
+ # libfuse depends on kmod-fuse, no need to declare dependency
+ DEPENDS+= +libfuse +fuse-utils
+ TITLE:=OWFS - fuse file system
+endef
+
+define Package/owfs/description
+ $(call Package/$(PKG_NAME)/Default/description)
+
+ This package contains the OWFS fuse filesystem.
+endef
+
+#
+# network daemons
+#
+
+define Package/owhttpd
+ $(call Package/owfs/Server)
+ TITLE:=OWFS - http server
+endef
+
+define Package/owhttpd/description
+ $(call Package/$(PKG_NAME)/Default/description)
+
+ This package contains the OWFS http server.
+endef
+
+define Package/owftpd
+ $(call Package/owfs/Server)
+ TITLE:=OWFS - ftp server
+endef
+
+define Package/owftpd/description
+ $(call Package/$(PKG_NAME)/Default/description)
+
+ This package contains the OWFS ftp server.
+endef
+
+define Package/owserver
+ $(call Package/owfs/Server)
+ TITLE:=OWFS - network server
+endef
+
+define Package/owserver/description
+ $(call Package/$(PKG_NAME)/Default/description)
+
+ This package contains the OWFS network server.
+endef
+
+CONFIGURE_ARGS += \
+ --enable-owftpd \
+ --enable-owserver \
+ --enable-owhttpd \
+ --enable-owfs \
+ --with-fuseinclude="$(STAGING_DIR)/usr/include" \
+ --with-fuselib="$(STAGING_DIR)/usr/lib" \
+ --enable-shared \
+ --enable-zero \
+ --disable-parport \
+ --disable-ownet \
+ --disable-owpython \
+ --disable-owphp \
+ --disable-owtcl \
+ --disable-swig \
+
+CONFIGURE_VARS += \
+ LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link=$(STAGING_DIR)/usr/lib -Wl,-rpath-link=$(TOOLCHAIN_DIR)/usr/lib" \
+ lt_cv_sys_lib_dlsearch_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
+ lt_cv_sys_lib_search_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
+ shrext_cmds=".so" \
+
+MAKE_FLAGS += \
+ CC="$(TARGET_CC)" \
+ HOST_CPU="$(PKGARCH)"
+
+define Build/InstallDev
+ $(INSTALL_DIR) $(STAGING_DIR)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/ow{capi,fs_config}.h $(STAGING_DIR)/usr/include/
+ $(INSTALL_DIR) $(STAGING_DIR)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libow{,capi}*.so* $(STAGING_DIR)/usr/lib/
+endef
+
+define Package/owfs/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owfs $(1)/usr/bin/
+endef
+
+define Package/owshell/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owget $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owread $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owwrite $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owdir $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owpresent $(1)/usr/bin/
+endef
+
+
+define Package/owserver/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owserver $(1)/usr/bin/
+endef
+
+define Package/owhttpd/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owhttpd $(1)/usr/bin/
+endef
+
+define Package/owftpd/install
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/owftpd $(1)/usr/bin/
+endef
+
+
+define Package/libow/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libow-*.so.* $(1)/usr/lib/
+endef
+
+define Package/libow-capi/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libowcapi-*.so.* $(1)/usr/lib/
+endef
+
+
+$(eval $(call BuildPackage,owfs))
+$(eval $(call BuildPackage,owshell))
+
+$(eval $(call BuildPackage,owserver))
+$(eval $(call BuildPackage,owhttpd))
+$(eval $(call BuildPackage,owftpd))
+
+$(eval $(call BuildPackage,libow))
+$(eval $(call BuildPackage,libow-capi))
projects / feed / packages.git / commitdiff