more consistent use of the length: output;

[tcpdump] / print-snmp.c

diff --git a/print-snmp.c b/print-snmp.c
index aa8d78f05037bd59e2d8806c3b6e75f50482f948..634ffdbe9c33a170f9b2e9781a866c8046272037 100644 (file)
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -58,17 +58,15 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.50 2001-09-17 22:16:53 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.55 2002-08-01 08:53:30 risso Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/param.h>
-#include <sys/time.h>
+#include <tcpdump-stdinc.h>
 
-#include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -559,7 +557,7 @@ asn1_parse(register const u_char *p, u_int len, struct be *elem)
                                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;
                                }
@@ -685,16 +683,20 @@ asn1_print(struct be *elem)
                        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) {
+                               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)
@@ -721,7 +723,7 @@ 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);
@@ -872,19 +874,22 @@ static void smi_decode_oid(struct be *elem, unsigned int *oid,
                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;
+                           oid[*oidlen] = o / OIDMUX;
+                           if (oid[*oidlen] > 2) oid[*oidlen] = 2;
                        }
-                       o %= OIDMUX;
+                       o -= oid[*oidlen] * OIDMUX;
+                       if (*oidlen < oidsize) (*oidlen)++;
                }
                if (*oidlen < oidsize) {
-                   oid[(*oidlen)++] = o;
+                       oid[(*oidlen)++] = o;
                }
                o = 0;
        }
@@ -907,7 +912,7 @@ 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:
@@ -924,12 +929,12 @@ static int smi_check_a_range(SmiType *smiType, SmiRange *smiRange,
        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;
@@ -1059,7 +1064,7 @@ static void smi_print_value(SmiNode *smiNode, u_char pduid, struct be *elem)
        /* apply display hints (integer, octetstring) */
 
        /* convert instance identifier to index type values */
-       
+
        switch (elem->type) {
        case BE_OID:
                if (smiType->basetype == SMI_BASETYPE_BITS) {
@@ -1076,7 +1081,7 @@ static void smi_print_value(SmiNode *smiNode, u_char pduid, struct be *elem)
                                }
                                fputs(smiNode->name, stdout);
                                if (smiNode->oidlen < oidlen) {
-                                       for (i = smiNode->oidlen; 
+                                       for (i = smiNode->oidlen;
                                             i < oidlen; i++) {
                                                printf(".%u", oid[i]);
                                        }
@@ -1427,7 +1432,7 @@ pdu_print(const u_char *np, u_int length, int version)
        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;
@@ -1455,7 +1460,7 @@ pdu_print(const u_char *np, u_int length, int version)
        }
 
        if (vflag) {
-               fputs("} ", stdout);
+               fputs(" } ", stdout);
        }
 }
 
@@ -1530,8 +1535,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;
@@ -1579,7 +1585,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;
@@ -1592,7 +1598,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;
@@ -1699,7 +1705,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;