]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-snmp.c
More UNALIGNED_MEM{CPY,CMP} on IP addresses.
[tcpdump] / print-snmp.c
index 5c417e7b73757c6c324f4148cd0e45330aa27c72..4acc5b287bfe48c58188a97d0600fd0747ababbc 100644 (file)
@@ -1,16 +1,29 @@
 /*
  * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
- *     The Regents of the University of California.  All rights reserved.
+ *     John Robert LoVerso. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by John Robert LoVerso.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * This implementation has been influenced by the CMU SNMP release,
  * by Steve Waldbusser.  However, this shares no code with that system.
@@ -21,6 +34,9 @@
  * that work is preserved below, even though it may not rightly apply
  * to this file.
  *
+ * Support for SNMPv2c/SNMPv3 and the ability to link the module against
+ * the libsmi was added by J. Schoenwaelder, Copyright (c) 1999.
+ *
  * This started out as a very simple program, but the incremental decoding
  * (into the BE structure) complicated things.
  *
  #     @(#)snmp.awk.x  1.1 (LANL) 1/15/90
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.36 1999-10-17 22:18:02 mcr Exp $ (LBL)";
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
 
-#include <sys/param.h>
-#include <sys/time.h>
+#include <tcpdump-stdinc.h>
 
-#include <ctype.h>
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 
+#ifdef HAVE_SMI_H
+#include <smi.h>
+#endif
+
 #include "interface.h"
 #include "addrtoname.h"
 
+#undef OPAQUE  /* defined in <wingdi.h> */
+
+static const char tstr[] = "[|snmp]";
+
 /*
  * Universal ASN.1 types
  * (we only care about the tag values for those allowed in the Internet SMI)
  */
-char *Universal[] = {
+static const char *Universal[] = {
        "U-0",
        "Boolean",
        "Integer",
@@ -85,7 +103,7 @@ char *Universal[] = {
 /*
  * Application-wide ASN.1 types from the Internet SMI and their tags
  */
-char *Application[] = {
+static const char *Application[] = {
        "IpAddress",
 #define IPADDR 0
        "Counter",
@@ -104,7 +122,7 @@ char *Application[] = {
 /*
  * Context-specific ASN.1 types for the SNMP PDUs and their tags
  */
-char *Context[] = {
+static const char *Context[] = {
        "GetRequest",
 #define GETREQ 0
        "GetNextRequest",
@@ -125,10 +143,16 @@ char *Context[] = {
 #define REPORT 8
 };
 
+#define NOTIFY_CLASS(x)            (x == TRAP || x == V2TRAP || x == INFORMREQ)
+#define READ_CLASS(x)       (x == GETREQ || x == GETNEXTREQ || x == GETBULKREQ)
+#define WRITE_CLASS(x)     (x == SETREQ)
+#define RESPONSE_CLASS(x)   (x == GETRESP)
+#define INTERNAL_CLASS(x)   (x == REPORT)
+
 /*
  * Context-specific ASN.1 types for the SNMP Exceptions and their tags
  */
-char *Exceptions[] = {
+static const char *Exceptions[] = {
        "noSuchObject",
 #define NOSUCHOBJECT 0
        "noSuchInstance",
@@ -141,14 +165,14 @@ char *Exceptions[] = {
  * Private ASN.1 types
  * The Internet SMI does not specify any
  */
-char *Private[] = {
+static const char *Private[] = {
        "P-0"
 };
 
 /*
  * error-status values for any SNMP PDU
  */
-char *ErrorStatus[] = {
+static const char *ErrorStatus[] = {
        "noError",
        "tooBig",
        "noSuchName",
@@ -170,13 +194,14 @@ char *ErrorStatus[] = {
        "inconsistentName"
 };
 #define DECODE_ErrorStatus(e) \
-       ( e >= 0 && e < sizeof(ErrorStatus)/sizeof(ErrorStatus[0]) \
-       ? ErrorStatus[e] : (sprintf(errbuf, "err=%u", e), errbuf))
+       ( e >= 0 && (size_t)e < sizeof(ErrorStatus)/sizeof(ErrorStatus[0]) \
+               ? ErrorStatus[e] \
+               : (snprintf(errbuf, sizeof(errbuf), "err=%u", e), errbuf))
 
 /*
  * generic-trap values in the SNMP Trap-PDU
  */
-char *GenericTrap[] = {
+static const char *GenericTrap[] = {
        "coldStart",
        "warmStart",
        "linkDown",
@@ -184,11 +209,12 @@ char *GenericTrap[] = {
        "authenticationFailure",
        "egpNeighborLoss",
        "enterpriseSpecific"
-#define GT_ENTERPRISE 7
+#define GT_ENTERPRISE 6
 };
 #define DECODE_GenericTrap(t) \
-       ( t >= 0 && t < sizeof(GenericTrap)/sizeof(GenericTrap[0]) \
-       ? GenericTrap[t] : (sprintf(buf, "gt=%d", t), buf))
+       ( t >= 0 && (size_t)t < sizeof(GenericTrap)/sizeof(GenericTrap[0]) \
+               ? GenericTrap[t] \
+               : (snprintf(buf, sizeof(buf), "gt=%d", t), buf))
 
 /*
  * ASN.1 type class table
@@ -196,9 +222,9 @@ char *GenericTrap[] = {
  * type definitions.
  */
 #define defineCLASS(x) { "x", x, sizeof(x)/sizeof(x[0]) } /* not ANSI-C */
-struct {
-       char    *name;
-       char    **Id;
+static const struct {
+       const char      *name;
+       const char      **Id;
            int numIDs;
     } Class[] = {
        defineCLASS(Universal),
@@ -216,7 +242,7 @@ struct {
 /*
  * defined forms for ASN.1 types
  */
-char *Form[] = {
+static const char *Form[] = {
        "Primitive",
 #define PRIMITIVE      0
        "Constructed",
@@ -228,7 +254,7 @@ char *Form[] = {
  * This is stored as a general-order tree.
  */
 struct obj {
-       char    *desc;                  /* name of object */
+       const char      *desc;          /* name of object */
        u_char  oid;                    /* sub-id following parent */
        u_char  type;                   /* object type (unused) */
        struct obj *child, *next;       /* child and next sibling pointers */
@@ -249,10 +275,10 @@ struct obj {
  * Currently, this includes the prefixes for the Internet MIB, the
  * private enterprises tree, and the experimental tree.
  */
-struct obj_abrev {
-       char *prefix;                   /* prefix for this abrev */
+static const struct obj_abrev {
+       const char *prefix;             /* prefix for this abrev */
        struct obj *node;               /* pointer into object table */
-       char *oid;                      /* ASN.1 encoded OID */
+       const char *oid;                /* ASN.1 encoded OID */
 } obj_abrev_list[] = {
 #ifndef NO_ABREV_MIB
        /* .iso.org.dod.internet.mgmt.mib */
@@ -331,7 +357,7 @@ struct be {
 /*
  * SNMP versions recognized by this module
  */
-char *SnmpVersion[] = {
+static const char *SnmpVersion[] = {
        "SNMPv1",
 #define SNMP_VERSION_1 0
        "SNMPv2c",
@@ -365,13 +391,6 @@ char *SnmpVersion[] = {
 
 #define ASN_ID_EXT 0x1f                /* extension ID in tag field */
 
-/*
- * truncated==1 means the packet was complete, but we don't have all of
- * it to decode.
- */
-static int truncated;
-#define ifNotTruncated if (truncated) fputs("[|snmp]", stdout); else
-
 /*
  * This decodes the next ASN.1 object in the stream pointed to by "p"
  * (and of real-length "len") and stores the intermediate data in the
@@ -389,9 +408,10 @@ asn1_parse(register const u_char *p, u_int len, struct be *elem)
        elem->asnlen = 0;
        elem->type = BE_ANY;
        if (len < 1) {
-               ifNotTruncated fputs("[nothing to parse]", stdout);
+               fputs("[nothing to parse]", stdout);
                return -1;
        }
+       TCHECK(*p);
 
        /*
         * it would be nice to use a bit field, but you can't depend on them.
@@ -412,65 +432,69 @@ asn1_parse(register const u_char *p, u_int len, struct be *elem)
        elem->form = form;
        elem->class = class;
        elem->id = id;
-       if (vflag)
-               printf("|%.2x", *p);
        p++; len--; hdr = 1;
        /* extended tag field */
        if (id == ASN_ID_EXT) {
-               for (id = 0; *p & ASN_BIT8 && len > 0; len--, hdr++, p++) {
-                       if (vflag)
-                               printf("|%.2x", *p);
+               /*
+                * The ID follows, as a sequence of octets with the
+                * 8th bit set and the remaining 7 bits being
+                * the next 7 bits of the value, terminated with
+                * an octet with the 8th bit not set.
+                *
+                * First, assemble all the octets with the 8th
+                * bit set.  XXX - this doesn't handle a value
+                * that won't fit in 32 bits.
+                */
+               for (id = 0; *p & ASN_BIT8; len--, hdr++, p++) {
+                       if (len < 1) {
+                               fputs("[Xtagfield?]", stdout);
+                               return -1;
+                       }
+                       TCHECK(*p);
                        id = (id << 7) | (*p & ~ASN_BIT8);
                }
-               if (len == 0 && *p & ASN_BIT8) {
-                       ifNotTruncated fputs("[Xtagfield?]", stdout);
+               if (len < 1) {
+                       fputs("[Xtagfield?]", stdout);
                        return -1;
                }
+               TCHECK(*p);
                elem->id = id = (id << 7) | *p;
                --len;
                ++hdr;
                ++p;
        }
        if (len < 1) {
-               ifNotTruncated fputs("[no asnlen]", stdout);
+               fputs("[no asnlen]", stdout);
                return -1;
        }
+       TCHECK(*p);
        elem->asnlen = *p;
-       if (vflag)
-               printf("|%.2x", *p);
        p++; len--; hdr++;
        if (elem->asnlen & ASN_BIT8) {
-               int noct = elem->asnlen % ASN_BIT8;
+               u_int32_t noct = elem->asnlen % ASN_BIT8;
                elem->asnlen = 0;
                if (len < noct) {
-                       ifNotTruncated printf("[asnlen? %d<%d]", len, noct);
+                       printf("[asnlen? %d<%d]", len, noct);
                        return -1;
                }
-               for (; noct-- > 0; len--, hdr++) {
-                       if (vflag)
-                               printf("|%.2x", *p);
+               TCHECK2(*p, noct);
+               for (; noct-- > 0; len--, hdr++)
                        elem->asnlen = (elem->asnlen << ASN_SHIFT8) | *p++;
-               }
        }
        if (len < elem->asnlen) {
-               if (!truncated) {
-                       printf("[len%d<asnlen%u]", len, elem->asnlen);
-                       return -1;
-               }
-               /* maybe should check at least 4? */
-               elem->asnlen = len;
+               printf("[len%d<asnlen%u]", len, elem->asnlen);
+               return -1;
        }
        if (form >= sizeof(Form)/sizeof(Form[0])) {
-               ifNotTruncated printf("[form?%d]", form);
+               printf("[form?%d]", form);
                return -1;
        }
        if (class >= sizeof(Class)/sizeof(Class[0])) {
-               ifNotTruncated printf("[class?%c/%d]", *Form[form], class);
+               printf("[class?%c/%d]", *Form[form], class);
                return -1;
        }
        if ((int)id >= Class[class].numIDs) {
-               ifNotTruncated printf("[id?%c/%s/%d]", *Form[form],
-                       Class[class].name, id);
+               printf("[id?%c/%s/%d]", *Form[form], Class[class].name, id);
                return -1;
        }
 
@@ -489,6 +513,7 @@ asn1_parse(register const u_char *p, u_int len, struct be *elem)
                                elem->type = BE_INT;
                                data = 0;
 
+                               TCHECK2(*p, elem->asnlen);
                                if (*p & ASN_BIT8)      /* negative */
                                        data = -1;
                                for (i = elem->asnlen; i-- > 0; p++)
@@ -527,6 +552,7 @@ asn1_parse(register const u_char *p, u_int len, struct be *elem)
                        case GAUGE:
                        case TIMETICKS: {
                                register u_int32_t data;
+                               TCHECK2(*p, elem->asnlen);
                                elem->type = BE_UNS;
                                data = 0;
                                for (i = elem->asnlen; i-- > 0; p++)
@@ -537,10 +563,11 @@ asn1_parse(register const u_char *p, u_int len, struct be *elem)
 
                        case COUNTER64: {
                                register u_int32_t high, low;
+                               TCHECK2(*p, elem->asnlen);
                                elem->type = BE_UNS64;
                                high = 0, low = 0;
                                for (i = elem->asnlen; i-- > 0; p++) {
-                                       high = (high << 8) | 
+                                       high = (high << 8) |
                                            ((low & 0xFF000000) >> 24);
                                        low = (low << 8) | *p;
                                }
@@ -578,10 +605,11 @@ asn1_parse(register const u_char *p, u_int len, struct be *elem)
                        break;
 
                default:
-                       elem->type = BE_OCTET;
-                       elem->data.raw = (caddr_t)p;
                        printf("[P/%s/%s]",
                                Class[class].name, Class[class].Id[id]);
+                       TCHECK2(*p, elem->asnlen);
+                       elem->type = BE_OCTET;
+                       elem->data.raw = (caddr_t)p;
                        break;
                }
                break;
@@ -620,6 +648,10 @@ asn1_parse(register const u_char *p, u_int len, struct be *elem)
        p += elem->asnlen;
        len -= elem->asnlen;
        return elem->asnlen + hdr;
+
+trunc:
+       printf("%s", tstr);
+       return -1;
 }
 
 /*
@@ -627,17 +659,18 @@ asn1_parse(register const u_char *p, u_int len, struct be *elem)
  * This used to be an integral part of asn1_parse() before the intermediate
  * BE form was added.
  */
-static void
+static int
 asn1_print(struct be *elem)
 {
        u_char *p = (u_char *)elem->data.raw;
        u_int32_t asnlen = elem->asnlen;
-       int i;
+       u_int32_t i;
 
        switch (elem->type) {
 
        case BE_OCTET:
-               for (i = asnlen; i-- > 0; p++);
+               TCHECK2(*p, asnlen);
+               for (i = asnlen; i-- > 0; p++)
                        printf("_%.2x", *p);
                break;
 
@@ -645,13 +678,14 @@ asn1_print(struct be *elem)
                break;
 
        case BE_OID: {
-       int o = 0, first = -1, i = asnlen;
+               int o = 0, first = -1, i = asnlen;
 
-               if (!nflag && asnlen > 2) {
-                       struct obj_abrev *a = &obj_abrev_list[0];
+               if (!sflag && !nflag && asnlen > 2) {
+                       const struct obj_abrev *a = &obj_abrev_list[0];
+                       size_t a_len = strlen(a->oid);
                        for (; a->node; a++) {
-                               if (!memcmp(a->oid, (char *)p,
-                                   strlen(a->oid))) {
+                               TCHECK2(*p, a_len);
+                               if (memcmp(a->oid, (char *)p, a_len) == 0) {
                                        objp = a->node->child;
                                        i -= strlen(a->oid);
                                        p += strlen(a->oid);
@@ -661,20 +695,26 @@ asn1_print(struct be *elem)
                                }
                        }
                }
-               for (; i-- > 0; p++) {
+
+               for (; !sflag && i-- > 0; p++) {
+                       TCHECK(*p);
                        o = (o << ASN_SHIFT7) + (*p & ~ASN_BIT8);
                        if (*p & ASN_LONGLEN)
-                               continue;
+                               continue;
 
                        /*
                         * first subitem encodes two items with 1st*OIDMUX+2nd
+                        * (see X.690:1997 clause 8.19 for the details)
                         */
                        if (first < 0) {
+                               int s;
                                if (!nflag)
                                        objp = mibroot;
                                first = 0;
-                               OBJ_PRINT(o/OIDMUX, first);
-                               o %= OIDMUX;
+                               s = o / OIDMUX;
+                               if (s > 2) s = 2;
+                               OBJ_PRINT(s, first);
+                               o -= s * OIDMUX;
                        }
                        OBJ_PRINT(o, first);
                        if (--first < 0)
@@ -689,7 +729,7 @@ asn1_print(struct be *elem)
                break;
 
        case BE_UNS:
-               printf("%d", elem->data.uns);
+               printf("%u", elem->data.uns);
                break;
 
        case BE_UNS64: {        /* idea borrowed from by Marshall Rose */
@@ -701,14 +741,23 @@ asn1_print(struct be *elem)
                        break;
                }
                d = elem->data.uns64.high * 4294967296.0;       /* 2^32 */
-               if (elem->data.uns64.high <= 0x1fffff) { 
+               if (elem->data.uns64.high <= 0x1fffff) {
                        d += elem->data.uns64.low;
+#if 0 /*is looks illegal, but what is the intention?*/
                        printf("%.f", d);
+#else
+                       printf("%f", d);
+#endif
                        break;
                }
                d += (elem->data.uns64.low & 0xfffff000);
-               sprintf(first, "%.f", d);
-               sprintf(last, "%5.5d", elem->data.uns64.low & 0xfff);
+#if 0 /*is looks illegal, but what is the intention?*/
+               snprintf(first, sizeof(first), "%.f", d);
+#else
+               snprintf(first, sizeof(first), "%f", d);
+#endif
+               snprintf(last, sizeof(last), "%5.5d",
+                   elem->data.uns64.low & 0xfff);
                for (carry = 0, cpf = first+strlen(first)-1, cpl = last+4;
                     cpl >= last;
                     cpf--, cpl--) {
@@ -728,12 +777,16 @@ asn1_print(struct be *elem)
        case BE_STR: {
                register int printable = 1, first = 1;
                const u_char *p = elem->data.str;
+               TCHECK2(*p, asnlen);
                for (i = asnlen; printable && i-- > 0; p++)
                        printable = isprint(*p) || isspace(*p);
                p = elem->data.str;
                if (printable) {
                        putchar('"');
-                       (void)fn_print(p, p + asnlen);
+                       if (fn_printn(p, asnlen, snapend)) {
+                               putchar('"');
+                               goto trunc;
+                       }
                        putchar('"');
                } else
                        for (i = asnlen; i-- > 0; p++) {
@@ -747,18 +800,14 @@ asn1_print(struct be *elem)
                printf("Seq(%u)", elem->asnlen);
                break;
 
-       case BE_INETADDR: {
-               char sep;
+       case BE_INETADDR:
                if (asnlen != ASNLEN_INETADDR)
                        printf("[inetaddr len!=%d]", ASNLEN_INETADDR);
-               sep='[';
-               for (i = asnlen; i-- > 0; p++) {
-                       printf("%c%u", sep, *p);
-                       sep='.';
+               TCHECK2(*p, asnlen);
+               for (i = asnlen; i-- != 0; p++) {
+                       printf((i == asnlen-1) ? "%u" : ".%u", *p);
                }
-               putchar(']');
                break;
-       }
 
        case BE_NOSUCHOBJECT:
        case BE_NOSUCHINST:
@@ -779,6 +828,11 @@ asn1_print(struct be *elem)
                fputs("[be!?]", stdout);
                break;
        }
+       return 0;
+
+trunc:
+       printf("%s", tstr);
+       return -1;
 }
 
 #ifdef notdef
@@ -801,7 +855,8 @@ asn1_decode(u_char *p, u_int length)
                i = asn1_parse(p, length, &elem);
                if (i >= 0) {
                        fputs(" ", stdout);
-                       asn1_print(&elem);
+                       if (asn1_print(&elem) < 0)
+                               return;
                        if (elem.type == BE_SEQ || elem.type == BE_PDU) {
                                fputs(" {", stdout);
                                asn1_decode(elem.data.raw, elem.asnlen);
@@ -814,6 +869,294 @@ asn1_decode(u_char *p, u_int length)
 }
 #endif
 
+#ifdef LIBSMI
+
+struct smi2be {
+    SmiBasetype basetype;
+    int be;
+};
+
+static const struct smi2be smi2betab[] = {
+    { SMI_BASETYPE_INTEGER32,          BE_INT },
+    { SMI_BASETYPE_OCTETSTRING,                BE_STR },
+    { SMI_BASETYPE_OCTETSTRING,                BE_INETADDR },
+    { SMI_BASETYPE_OBJECTIDENTIFIER,   BE_OID },
+    { SMI_BASETYPE_UNSIGNED32,         BE_UNS },
+    { SMI_BASETYPE_INTEGER64,          BE_NONE },
+    { SMI_BASETYPE_UNSIGNED64,         BE_UNS64 },
+    { SMI_BASETYPE_FLOAT32,            BE_NONE },
+    { SMI_BASETYPE_FLOAT64,            BE_NONE },
+    { SMI_BASETYPE_FLOAT128,           BE_NONE },
+    { SMI_BASETYPE_ENUM,               BE_INT },
+    { SMI_BASETYPE_BITS,               BE_STR },
+    { SMI_BASETYPE_UNKNOWN,            BE_NONE }
+};
+
+static int
+smi_decode_oid(struct be *elem, unsigned int *oid,
+              unsigned int oidsize, unsigned int *oidlen)
+{
+       u_char *p = (u_char *)elem->data.raw;
+       u_int32_t asnlen = elem->asnlen;
+       int o = 0, first = -1, i = asnlen;
+
+       for (*oidlen = 0; sflag && i-- > 0; p++) {
+               TCHECK(*p);
+               o = (o << ASN_SHIFT7) + (*p & ~ASN_BIT8);
+               if (*p & ASN_LONGLEN)
+                   continue;
+
+               /*
+                * first subitem encodes two items with 1st*OIDMUX+2nd
+                * (see X.690:1997 clause 8.19 for the details)
+                */
+               if (first < 0) {
+                       first = 0;
+                       if (*oidlen < oidsize) {
+                           oid[*oidlen] = o / OIDMUX;
+                           if (oid[*oidlen] > 2) oid[*oidlen] = 2;
+                       }
+                       o -= oid[*oidlen] * OIDMUX;
+                       if (*oidlen < oidsize) (*oidlen)++;
+               }
+               if (*oidlen < oidsize) {
+                       oid[(*oidlen)++] = o;
+               }
+               o = 0;
+       }
+       return 0;
+
+trunc:
+       printf("%s", tstr);
+       return -1;
+}
+
+static int smi_check_type(SmiBasetype basetype, int be)
+{
+    int i;
+
+    for (i = 0; smi2betab[i].basetype != SMI_BASETYPE_UNKNOWN; i++) {
+       if (smi2betab[i].basetype == basetype && smi2betab[i].be == be) {
+           return 1;
+       }
+    }
+
+    return 0;
+}
+
+static int smi_check_a_range(SmiType *smiType, SmiRange *smiRange,
+                            struct be *elem)
+{
+    int ok = 1;
+
+    switch (smiType->basetype) {
+    case SMI_BASETYPE_OBJECTIDENTIFIER:
+    case SMI_BASETYPE_OCTETSTRING:
+       if (smiRange->minValue.value.unsigned32
+           == smiRange->maxValue.value.unsigned32) {
+           ok = (elem->asnlen == smiRange->minValue.value.unsigned32);
+       } else {
+           ok = (elem->asnlen >= smiRange->minValue.value.unsigned32
+                 && elem->asnlen <= smiRange->maxValue.value.unsigned32);
+       }
+       break;
+
+    case SMI_BASETYPE_INTEGER32:
+       ok = (elem->data.integer >= smiRange->minValue.value.integer32
+             && elem->data.integer <= smiRange->maxValue.value.integer32);
+       break;
+
+    case SMI_BASETYPE_UNSIGNED32:
+       ok = (elem->data.uns >= smiRange->minValue.value.unsigned32
+             && elem->data.uns <= smiRange->maxValue.value.unsigned32);
+       break;
+
+    case SMI_BASETYPE_UNSIGNED64:
+       /* XXX */
+       break;
+
+       /* case SMI_BASETYPE_INTEGER64: SMIng */
+       /* case SMI_BASETYPE_FLOAT32: SMIng */
+       /* case SMI_BASETYPE_FLOAT64: SMIng */
+       /* case SMI_BASETYPE_FLOAT128: SMIng */
+
+    case SMI_BASETYPE_ENUM:
+    case SMI_BASETYPE_BITS:
+    case SMI_BASETYPE_UNKNOWN:
+       ok = 1;
+       break;
+
+    default:
+       ok = 0;
+       break;
+    }
+
+    return ok;
+}
+
+static int smi_check_range(SmiType *smiType, struct be *elem)
+{
+        SmiRange *smiRange;
+       int ok = 1;
+
+       for (smiRange = smiGetFirstRange(smiType);
+            smiRange;
+            smiRange = smiGetNextRange(smiRange)) {
+
+           ok = smi_check_a_range(smiType, smiRange, elem);
+
+           if (ok) {
+               break;
+           }
+       }
+
+       if (ok) {
+           SmiType *parentType;
+           parentType = smiGetParentType(smiType);
+           if (parentType) {
+               ok = smi_check_range(parentType, elem);
+           }
+       }
+
+       return ok;
+}
+
+static SmiNode *smi_print_variable(struct be *elem, int *status)
+{
+       unsigned int oid[128], oidlen;
+       SmiNode *smiNode = NULL;
+       unsigned int i;
+
+       *status = smi_decode_oid(elem, oid, sizeof(oid)/sizeof(unsigned int),
+           &oidlen);
+       if (*status < 0)
+               return NULL;
+       smiNode = smiGetNodeByOID(oidlen, oid);
+       if (! smiNode) {
+               *status = asn1_print(elem);
+               return NULL;
+       }
+       if (vflag) {
+               fputs(smiGetNodeModule(smiNode)->name, stdout);
+               fputs("::", stdout);
+       }
+       fputs(smiNode->name, stdout);
+       if (smiNode->oidlen < oidlen) {
+               for (i = smiNode->oidlen; i < oidlen; i++) {
+                       printf(".%u", oid[i]);
+               }
+       }
+       *status = 0;
+       return smiNode;
+}
+
+static int
+smi_print_value(SmiNode *smiNode, u_char pduid, struct be *elem)
+{
+       unsigned int i, oid[128], oidlen;
+       SmiType *smiType;
+       SmiNamedNumber *nn;
+       int done = 0;
+
+       if (! smiNode || ! (smiNode->nodekind
+                           & (SMI_NODEKIND_SCALAR | SMI_NODEKIND_COLUMN))) {
+           return asn1_print(elem);
+       }
+
+       if (elem->type == BE_NOSUCHOBJECT
+           || elem->type == BE_NOSUCHINST
+           || elem->type == BE_ENDOFMIBVIEW) {
+           return asn1_print(elem);
+       }
+
+       if (NOTIFY_CLASS(pduid) && smiNode->access < SMI_ACCESS_NOTIFY) {
+           fputs("[notNotifyable]", stdout);
+       }
+
+       if (READ_CLASS(pduid) && smiNode->access < SMI_ACCESS_READ_ONLY) {
+           fputs("[notReadable]", stdout);
+       }
+
+       if (WRITE_CLASS(pduid) && smiNode->access < SMI_ACCESS_READ_WRITE) {
+           fputs("[notWritable]", stdout);
+       }
+
+       if (RESPONSE_CLASS(pduid)
+           && smiNode->access == SMI_ACCESS_NOT_ACCESSIBLE) {
+           fputs("[noAccess]", stdout);
+       }
+
+       smiType = smiGetNodeType(smiNode);
+       if (! smiType) {
+           return asn1_print(elem);
+       }
+
+       if (! smi_check_type(smiType->basetype, elem->type)) {
+           fputs("[wrongType]", stdout);
+       }
+
+       if (! smi_check_range(smiType, elem)) {
+           fputs("[outOfRange]", stdout);
+       }
+
+       /* resolve bits to named bits */
+
+       /* check whether instance identifier is valid */
+
+       /* apply display hints (integer, octetstring) */
+
+       /* convert instance identifier to index type values */
+
+       switch (elem->type) {
+       case BE_OID:
+               if (smiType->basetype == SMI_BASETYPE_BITS) {
+                       /* print bit labels */
+               } else {
+                       smi_decode_oid(elem, oid,
+                                      sizeof(oid)/sizeof(unsigned int),
+                                      &oidlen);
+                       smiNode = smiGetNodeByOID(oidlen, oid);
+                       if (smiNode) {
+                               if (vflag) {
+                                       fputs(smiGetNodeModule(smiNode)->name, stdout);
+                                       fputs("::", stdout);
+                               }
+                               fputs(smiNode->name, stdout);
+                               if (smiNode->oidlen < oidlen) {
+                                       for (i = smiNode->oidlen;
+                                            i < oidlen; i++) {
+                                               printf(".%u", oid[i]);
+                                       }
+                               }
+                               done++;
+                       }
+               }
+               break;
+
+       case BE_INT:
+               if (smiType->basetype == SMI_BASETYPE_ENUM) {
+                       for (nn = smiGetFirstNamedNumber(smiType);
+                            nn;
+                            nn = smiGetNextNamedNumber(nn)) {
+                                if (nn->value.value.integer32
+                                    == elem->data.integer) {
+                                        fputs(nn->name, stdout);
+                                        printf("(%d)", elem->data.integer);
+                                        done++;
+                                        break;
+                               }
+                       }
+               }
+               break;
+       }
+
+       if (! done) {
+               return asn1_print(elem);
+       }
+       return 0;
+}
+#endif
+
 /*
  * General SNMP header
  *     SEQUENCE {
@@ -851,10 +1194,14 @@ asn1_decode(u_char *p, u_int length)
  * Decode SNMP varBind
  */
 static void
-varbind_print(u_char pduid, const u_char *np, u_int length, int error)
+varbind_print(u_char pduid, const u_char *np, u_int length)
 {
        struct be elem;
        int count = 0, ind;
+#ifdef LIBSMI
+       SmiNode *smiNode = NULL;
+#endif
+       int status;
 
        /* Sequence of varBind */
        if ((count = asn1_parse(np, length, &elem)) < 0)
@@ -864,7 +1211,7 @@ varbind_print(u_char pduid, const u_char *np, u_int length, int error)
                asn1_print(&elem);
                return;
        }
-       if (count < length)
+       if ((u_int)count < length)
                printf("[%d extra after SEQ of varbind]", length - count);
        /* descend */
        length = elem.asnlen;
@@ -874,8 +1221,7 @@ varbind_print(u_char pduid, const u_char *np, u_int length, int error)
                const u_char *vbend;
                u_int vblength;
 
-               if (!error || ind == error)
-                       fputs(" ", stdout);
+               fputs(" ", stdout);
 
                /* Sequence */
                if ((count = asn1_parse(np, length, &elem)) < 0)
@@ -899,14 +1245,19 @@ varbind_print(u_char pduid, const u_char *np, u_int length, int error)
                        asn1_print(&elem);
                        return;
                }
-               if (!error || ind == error)
-                       asn1_print(&elem);
+#ifdef LIBSMI
+               smiNode = smi_print_variable(&elem, &status);
+#else
+               status = asn1_print(&elem);
+#endif
+               if (status < 0)
+                       return;
                length -= count;
                np += count;
 
                if (pduid != GETREQ && pduid != GETNEXTREQ
-                   && pduid != GETBULKREQ && !error)
-                               fputs("=", stdout);
+                   && pduid != GETBULKREQ)
+                       fputs("=", stdout);
 
                /* objVal (ANY) */
                if ((count = asn1_parse(np, length, &elem)) < 0)
@@ -915,14 +1266,20 @@ varbind_print(u_char pduid, const u_char *np, u_int length, int error)
                    || pduid == GETBULKREQ) {
                        if (elem.type != BE_NULL) {
                                fputs("[objVal!=NULL]", stdout);
-                               asn1_print(&elem);
+                               if (asn1_print(&elem) < 0)
+                                       return;
                        }
-               } else
-                       if (error && ind == error && elem.type != BE_NULL)
-                               fputs("[err objVal!=NULL]", stdout);
-                       if (!error || ind == error)
-                               asn1_print(&elem);
-
+               } else {
+                       if (elem.type != BE_NULL) {
+#ifdef LIBSMI
+                               status = smi_print_value(smiNode, pduid, &elem);
+#else
+                               status = asn1_print(&elem);
+#endif
+                       }
+                       if (status < 0)
+                               return;
+               }
                length = vblength;
                np = vbend;
        }
@@ -933,7 +1290,7 @@ varbind_print(u_char pduid, const u_char *np, u_int length, int error)
  * GetBulk, Inform, V2Trap, and Report
  */
 static void
-snmppdu_print(u_char pduid, const u_char *np, u_int length)
+snmppdu_print(u_short pduid, const u_char *np, u_int length)
 {
        struct be elem;
        int count = 0, error;
@@ -946,7 +1303,8 @@ snmppdu_print(u_char pduid, const u_char *np, u_int length)
                asn1_print(&elem);
                return;
        }
-       /* ignore the reqId */
+       if (vflag)
+               printf("R=%d ", elem.data.integer);
        length -= count;
        np += count;
 
@@ -962,13 +1320,13 @@ snmppdu_print(u_char pduid, const u_char *np, u_int length)
        if ((pduid == GETREQ || pduid == GETNEXTREQ || pduid == SETREQ
            || pduid == INFORMREQ || pduid == V2TRAP || pduid == REPORT)
            && elem.data.integer != 0) {
-               char errbuf[10];
+               char errbuf[20];
                printf("[errorStatus(%s)!=0]",
                        DECODE_ErrorStatus(elem.data.integer));
        } else if (pduid == GETBULKREQ) {
                printf(" N=%d", elem.data.integer);
        } else if (elem.data.integer != 0) {
-               char errbuf[10];
+               char errbuf[20];
                printf(" %s", DECODE_ErrorStatus(elem.data.integer));
                error = elem.data.integer;
        }
@@ -1004,7 +1362,7 @@ snmppdu_print(u_char pduid, const u_char *np, u_int length)
        length -= count;
        np += count;
 
-       varbind_print(pduid, np, length, error);
+       varbind_print(pduid, np, length);
        return;
 }
 
@@ -1027,7 +1385,8 @@ trappdu_print(const u_char *np, u_int length)
                asn1_print(&elem);
                return;
        }
-       asn1_print(&elem);
+       if (asn1_print(&elem) < 0)
+               return;
        length -= count;
        np += count;
 
@@ -1041,7 +1400,8 @@ trappdu_print(const u_char *np, u_int length)
                asn1_print(&elem);
                return;
        }
-       asn1_print(&elem);
+       if (asn1_print(&elem) < 0)
+               return;
        length -= count;
        np += count;
 
@@ -1055,7 +1415,7 @@ trappdu_print(const u_char *np, u_int length)
        }
        generic = elem.data.integer;
        {
-               char buf[10];
+               char buf[20];
                printf(" %s", DECODE_GenericTrap(generic));
        }
        length -= count;
@@ -1087,11 +1447,12 @@ trappdu_print(const u_char *np, u_int length)
                asn1_print(&elem);
                return;
        }
-       asn1_print(&elem);
+       if (asn1_print(&elem) < 0)
+               return;
        length -= count;
        np += count;
 
-       varbind_print (TRAP, np, length, 0);
+       varbind_print (TRAP, np, length);
        return;
 }
 
@@ -1111,15 +1472,20 @@ pdu_print(const u_char *np, u_int length, int version)
                fputs("[no PDU]", stdout);
                return;
        }
-       if (count < length)
+       if ((u_int)count < length)
                printf("[%d extra after PDU]", length - count);
-       asn1_print(&pdu);
+       if (vflag) {
+               fputs("{ ", stdout);
+       }
+       if (asn1_print(&pdu) < 0)
+               return;
+       fputs(" ", stdout);
        /* descend into PDU */
        length = pdu.asnlen;
        np = (u_char *)pdu.data.raw;
 
        if (version == SNMP_VERSION_1 &&
-           (pdu.id == GETBULKREQ || pdu.id == INFORMREQ || 
+           (pdu.id == GETBULKREQ || pdu.id == INFORMREQ ||
             pdu.id == V2TRAP || pdu.id == REPORT)) {
                printf("[v2 PDU in v1 message]");
                return;
@@ -1145,6 +1511,10 @@ pdu_print(const u_char *np, u_int length, int version)
                snmppdu_print(pdu.id, np, length);
                break;
        }
+
+       if (vflag) {
+               fputs(" } ", stdout);
+       }
 }
 
 /*
@@ -1218,8 +1588,9 @@ community_print(const u_char *np, u_int length, int version)
                return;
        }
        /* default community */
-       if (strncmp((char *)elem.data.str, DEF_COMMUNITY,
-           sizeof(DEF_COMMUNITY) - 1))
+       if (!(elem.asnlen == sizeof(DEF_COMMUNITY) - 1 &&
+           strncmp((char *)elem.data.str, DEF_COMMUNITY,
+                   sizeof(DEF_COMMUNITY) - 1) == 0))
                /* ! "public" */
                printf("C=%.*s ", (int)elem.asnlen, elem.data.str);
        length -= count;
@@ -1267,7 +1638,7 @@ usm_print(const u_char *np, u_int length)
                asn1_print(&elem);
                return;
        }
-       if (vflag) 
+       if (vflag)
                printf("B=%d ", elem.data.integer);
        length -= count;
        np += count;
@@ -1280,7 +1651,7 @@ usm_print(const u_char *np, u_int length)
                asn1_print(&elem);
                return;
        }
-       if (vflag) 
+       if (vflag)
                printf("T=%d ", elem.data.integer);
        length -= count;
        np += count;
@@ -1320,7 +1691,7 @@ usm_print(const u_char *np, u_int length)
        length -= count;
         np += count;
 
-       if (count < length)
+       if ((u_int)count < length)
                printf("[%d extra after usm SEQ]", length - count);
 }
 
@@ -1348,6 +1719,10 @@ v3msg_print(const u_char *np, u_int length)
        length = elem.asnlen;
        np = (u_char *)elem.data.raw;
 
+       if (vflag) {
+               fputs("{ ", stdout);
+       }
+
        /* msgID (INTEGER) */
        if ((count = asn1_parse(np, length, &elem)) < 0)
                return;
@@ -1383,7 +1758,7 @@ v3msg_print(const u_char *np, u_int length)
                return;
        }
        flags = elem.data.str[0];
-       if (flags != 0x00 && flags != 0x01 && flags != 0x03 
+       if (flags != 0x00 && flags != 0x01 && flags != 0x03
            && flags != 0x04 && flags != 0x05 && flags != 0x07) {
                printf("[msgFlags=0x%02X]", flags);
                return;
@@ -1409,12 +1784,16 @@ v3msg_print(const u_char *np, u_int length)
        length -= count;
        np += count;
 
-       if (count < length)
+       if ((u_int)count < length)
                printf("[%d extra after message SEQ]", length - count);
 
+       if (vflag) {
+               fputs("} ", stdout);
+       }
+
        if (model == 3) {
            if (vflag) {
-               fputs("USM ", stdout);
+               fputs("USM ", stdout);
            }
        } else {
            printf("[security model %d]", model);
@@ -1437,13 +1816,20 @@ v3msg_print(const u_char *np, u_int length)
 
        if (model == 3) {
            usm_print(elem.data.str, elem.asnlen);
+           if (vflag) {
+               fputs("} ", stdout);
+           }
        }
 
        if (vflag) {
-           fputs("ScopedPDU ", stdout);
+           fputs("ScopedPDU ", stdout);
        }
 
        scopedpdu_print(np, length, 3);
+
+       if (vflag) {
+               fputs("} ", stdout);
+       }
 }
 
 /*
@@ -1456,14 +1842,6 @@ snmp_print(const u_char *np, u_int length)
        int count = 0;
        int version = 0;
 
-       truncated = 0;
-
-       /* truncated packet? */
-       if (np + length > snapend) {
-               truncated = 1;
-               length = snapend - np;
-       }
-
        putchar(' ');
 
        /* initial Sequence */
@@ -1474,7 +1852,7 @@ snmp_print(const u_char *np, u_int length)
                asn1_print(&elem);
                return;
        }
-       if (count < length)
+       if ((u_int)count < length)
                printf("[%d extra after iSEQ]", length - count);
        /* descend */
        length = elem.asnlen;
@@ -1494,7 +1872,7 @@ snmp_print(const u_char *np, u_int length)
        case SNMP_VERSION_2:
        case SNMP_VERSION_3:
                if (vflag)
-                       printf("%s ", SnmpVersion[elem.data.integer]);
+                       printf("%s ", SnmpVersion[elem.data.integer]);
                break;
        default:
                printf("[version = %d]", elem.data.integer);
@@ -1516,4 +1894,8 @@ snmp_print(const u_char *np, u_int length)
                printf("[version = %d]", elem.data.integer);
                break;
        }
+
+       if (vflag) {
+               fputs("} ", stdout);
+       }
 }