X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/721bd3430d6983a4bd0aed7a74a903b4d0dc6100..refs/heads/tcpdump-3.8:/print-snmp.c diff --git a/print-snmp.c b/print-snmp.c index e89fcc3e..e6079f82 100644 --- a/print-snmp.c +++ b/print-snmp.c @@ -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. @@ -44,18 +57,16 @@ */ #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.43 2000-11-04 22:50:23 fenner Exp $ (LBL)"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.56.2.3 2004-03-23 06:59:59 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include -#include +#include -#include #include #include @@ -70,7 +81,7 @@ static const char rcsid[] = * Universal ASN.1 types * (we only care about the tag values for those allowed in the Internet SMI) */ -char *Universal[] = { +const char *Universal[] = { "U-0", "Boolean", "Integer", @@ -93,7 +104,7 @@ char *Universal[] = { /* * Application-wide ASN.1 types from the Internet SMI and their tags */ -char *Application[] = { +const char *Application[] = { "IpAddress", #define IPADDR 0 "Counter", @@ -112,7 +123,7 @@ char *Application[] = { /* * Context-specific ASN.1 types for the SNMP PDUs and their tags */ -char *Context[] = { +const char *Context[] = { "GetRequest", #define GETREQ 0 "GetNextRequest", @@ -142,7 +153,7 @@ char *Context[] = { /* * Context-specific ASN.1 types for the SNMP Exceptions and their tags */ -char *Exceptions[] = { +const char *Exceptions[] = { "noSuchObject", #define NOSUCHOBJECT 0 "noSuchInstance", @@ -155,14 +166,14 @@ char *Exceptions[] = { * Private ASN.1 types * The Internet SMI does not specify any */ -char *Private[] = { +const char *Private[] = { "P-0" }; /* * error-status values for any SNMP PDU */ -char *ErrorStatus[] = { +const char *ErrorStatus[] = { "noError", "tooBig", "noSuchName", @@ -184,14 +195,14 @@ char *ErrorStatus[] = { "inconsistentName" }; #define DECODE_ErrorStatus(e) \ - ( e >= 0 && e < sizeof(ErrorStatus)/sizeof(ErrorStatus[0]) \ + ( 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[] = { +const char *GenericTrap[] = { "coldStart", "warmStart", "linkDown", @@ -199,10 +210,10 @@ 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]) \ + ( t >= 0 && (size_t)t < sizeof(GenericTrap)/sizeof(GenericTrap[0]) \ ? GenericTrap[t] \ : (snprintf(buf, sizeof(buf), "gt=%d", t), buf)) @@ -213,8 +224,8 @@ char *GenericTrap[] = { */ #define defineCLASS(x) { "x", x, sizeof(x)/sizeof(x[0]) } /* not ANSI-C */ struct { - char *name; - char **Id; + const char *name; + const char **Id; int numIDs; } Class[] = { defineCLASS(Universal), @@ -232,7 +243,7 @@ struct { /* * defined forms for ASN.1 types */ -char *Form[] = { +const char *Form[] = { "Primitive", #define PRIMITIVE 0 "Constructed", @@ -244,7 +255,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 */ @@ -266,9 +277,9 @@ struct obj { * private enterprises tree, and the experimental tree. */ struct obj_abrev { - char *prefix; /* prefix for this 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 */ @@ -347,7 +358,7 @@ struct be { /* * SNMP versions recognized by this module */ -char *SnmpVersion[] = { +const char *SnmpVersion[] = { "SNMPv1", #define SNMP_VERSION_1 0 "SNMPv2c", @@ -428,16 +439,11 @@ 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); + for (id = 0; *p & ASN_BIT8 && len > 0; len--, hdr++, p++) id = (id << 7) | (*p & ~ASN_BIT8); - } if (len == 0 && *p & ASN_BIT8) { ifNotTruncated fputs("[Xtagfield?]", stdout); return -1; @@ -452,21 +458,16 @@ asn1_parse(register const u_char *p, u_int len, struct be *elem) return -1; } 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); return -1; } - for (; noct-- > 0; len--, hdr++) { - if (vflag) - printf("|%.2x", *p); + for (; noct-- > 0; len--, hdr++) elem->asnlen = (elem->asnlen << ASN_SHIFT8) | *p++; - } } if (len < elem->asnlen) { if (!truncated) { @@ -556,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; } @@ -648,7 +649,7 @@ 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) { @@ -682,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) @@ -718,9 +723,9 @@ 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???*/ +#if 0 /*is looks illegal, but what is the intention?*/ printf("%.f", d); #else printf("%f", d); @@ -728,7 +733,7 @@ asn1_print(struct be *elem) break; } d += (elem->data.uns64.low & 0xfffff000); -#if 0 /*is looks illegal, but what is the intention???*/ +#if 0 /*is looks illegal, but what is the intention?*/ snprintf(first, sizeof(first), "%.f", d); #else snprintf(first, sizeof(first), "%f", d); @@ -776,7 +781,7 @@ asn1_print(struct be *elem) case BE_INETADDR: if (asnlen != ASNLEN_INETADDR) printf("[inetaddr len!=%d]", ASNLEN_INETADDR); - for (i = asnlen; i-- > 0; p++) { + for (i = asnlen; i-- != 0; p++) { printf((i == asnlen-1) ? "%u" : ".%u", *p); } break; @@ -837,31 +842,12 @@ asn1_decode(u_char *p, u_int length) #ifdef LIBSMI -#if (SMI_VERSION_MAJOR == 0 && SMI_VERSION_MINOR >= 2) || (SMI_VERSION_MAJOR > 0) -#define LIBSMI_API_V2 -#else -#define LIBSMI_API_V1 -#endif - -#ifdef LIBSMI_API_V1 -/* Some of the API revisions introduced new calls that can be - * represented by macros. - */ -#define smiGetNodeType(n) smiGetType((n)->typemodule, (n)->typename) - -#else -/* These calls in the V1 API were removed in V2. */ -#define smiFreeRange(r) -#define smiFreeType(r) -#define smiFreeNode(r) -#endif - struct smi2be { SmiBasetype basetype; int be; }; -struct smi2be smi2betab[] = { +static struct smi2be smi2betab[] = { { SMI_BASETYPE_INTEGER32, BE_INT }, { SMI_BASETYPE_OCTETSTRING, BE_STR }, { SMI_BASETYPE_OCTETSTRING, BE_INETADDR }, @@ -878,7 +864,7 @@ struct smi2be smi2betab[] = { }; static void smi_decode_oid(struct be *elem, unsigned int *oid, - unsigned int *oidlen) + unsigned int oidsize, unsigned int *oidlen) { u_char *p = (u_char *)elem->data.raw; u_int32_t asnlen = elem->asnlen; @@ -888,16 +874,23 @@ 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; - oid[(*oidlen)++] = o/OIDMUX; - o %= OIDMUX; + 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; } - oid[(*oidlen)++] = o; o = 0; } } @@ -918,8 +911,8 @@ static int smi_check_type(SmiBasetype basetype, int be) static int smi_check_a_range(SmiType *smiType, SmiRange *smiRange, struct be *elem) { - int ok; - + int ok = 1; + switch (smiType->basetype) { case SMI_BASETYPE_OBJECTIDENTIFIER: case SMI_BASETYPE_OCTETSTRING: @@ -936,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; @@ -966,37 +959,22 @@ static int smi_check_range(SmiType *smiType, struct be *elem) SmiRange *smiRange; int ok = 1; -#ifdef LIBSMI_API_V1 - for (smiRange = smiGetFirstRange(smiType->module, smiType->name); -#else for (smiRange = smiGetFirstRange(smiType); -#endif smiRange; smiRange = smiGetNextRange(smiRange)) { ok = smi_check_a_range(smiType, smiRange, elem); if (ok) { - smiFreeRange(smiRange); break; } } - if (ok -#ifdef LIBSMI_API_V1 - && smiType->parentmodule && smiType->parentname -#endif - ) { + if (ok) { SmiType *parentType; -#ifdef LIBSMI_API_V1 - parentType = smiGetType(smiType->parentmodule, - smiType->parentname); -#else parentType = smiGetParentType(smiType); -#endif if (parentType) { ok = smi_check_range(parentType, elem); - smiFreeType(parentType); } } @@ -1009,18 +987,14 @@ static SmiNode *smi_print_variable(struct be *elem) SmiNode *smiNode = NULL; int i; - smi_decode_oid(elem, oid, &oidlen); + smi_decode_oid(elem, oid, sizeof(oid)/sizeof(unsigned int), &oidlen); smiNode = smiGetNodeByOID(oidlen, oid); if (! smiNode) { asn1_print(elem); return NULL; } if (vflag) { -#ifdef LIBSMI_API_V1 - fputs(smiNode->module, stdout); -#else fputs(smiGetNodeModule(smiNode)->name, stdout); -#endif fputs("::", stdout); } fputs(smiNode->name, stdout); @@ -1045,6 +1019,13 @@ static void smi_print_value(SmiNode *smiNode, u_char pduid, struct be *elem) return; } + if (elem->type == BE_NOSUCHOBJECT + || elem->type == BE_NOSUCHINST + || elem->type == BE_ENDOFMIBVIEW) { + asn1_print(elem); + return; + } + if (NOTIFY_CLASS(pduid) && smiNode->access < SMI_ACCESS_NOTIFY) { fputs("[notNotifyable]", stdout); } @@ -1062,26 +1043,18 @@ static void smi_print_value(SmiNode *smiNode, u_char pduid, struct be *elem) fputs("[noAccess]", stdout); } -#ifdef LIBSMI_API_V1 - smiType = smiGetType(smiNode->typemodule, smiNode->typename); -#else smiType = smiGetNodeType(smiNode); -#endif if (! smiType) { asn1_print(elem); return; } -#ifdef LIBSMI_API_V1 - if (! smi_check_type(smiNode->basetype, elem->type)) { -#else if (! smi_check_type(smiType->basetype, elem->type)) { -#endif fputs("[wrongType]", stdout); } if (! smi_check_range(smiType, elem)) { - fputs("[wrongLength]", stdout); + fputs("[outOfRange]", stdout); } /* resolve bits to named bits */ @@ -1091,26 +1064,24 @@ 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) { /* print bit labels */ } else { - smi_decode_oid(elem, oid, &oidlen); + smi_decode_oid(elem, oid, + sizeof(oid)/sizeof(unsigned int), + &oidlen); smiNode = smiGetNodeByOID(oidlen, oid); if (smiNode) { if (vflag) { -#ifdef LIBSMI_API_V1 - fputs(smiNode->module, stdout); -#else fputs(smiGetNodeModule(smiNode)->name, stdout); -#endif fputs("::", stdout); } fputs(smiNode->name, stdout); if (smiNode->oidlen < oidlen) { - for (i = smiNode->oidlen; + for (i = smiNode->oidlen; i < oidlen; i++) { printf(".%u", oid[i]); } @@ -1121,15 +1092,8 @@ static void smi_print_value(SmiNode *smiNode, u_char pduid, struct be *elem) break; case BE_INT: -#ifdef LIBSMI_API_V1 - if (smiNode->basetype == SMI_BASETYPE_ENUM - && smiNode->typemodule && smiNode->typename) { - for (nn = smiGetFirstNamedNumber(smiNode->typemodule, - smiNode->typename); -#else if (smiType->basetype == SMI_BASETYPE_ENUM) { for (nn = smiGetFirstNamedNumber(smiType); -#endif nn; nn = smiGetNextNamedNumber(nn)) { if (nn->value.value.integer32 @@ -1147,10 +1111,6 @@ static void smi_print_value(SmiNode *smiNode, u_char pduid, struct be *elem) if (! done) { asn1_print(elem); } - - if (smiType) { - smiFreeType(smiType); - } } #endif @@ -1207,7 +1167,7 @@ varbind_print(u_char pduid, const u_char *np, u_int length) 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; @@ -1266,7 +1226,6 @@ varbind_print(u_char pduid, const u_char *np, u_int length) if (elem.type != BE_NULL) { #ifdef LIBSMI smi_print_value(smiNode, pduid, &elem); - smiFreeNode(smiNode); #else asn1_print(&elem); #endif @@ -1295,7 +1254,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; @@ -1460,15 +1420,19 @@ 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); + if (vflag) { + fputs("{ ", stdout); + } asn1_print(&pdu); + 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; @@ -1494,6 +1458,10 @@ pdu_print(const u_char *np, u_int length, int version) snmppdu_print(pdu.id, np, length); break; } + + if (vflag) { + fputs(" } ", stdout); + } } /* @@ -1567,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; @@ -1616,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; @@ -1629,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; @@ -1669,7 +1638,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); } @@ -1697,6 +1666,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; @@ -1732,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; @@ -1758,12 +1731,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); @@ -1786,13 +1763,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); + } } /* @@ -1823,7 +1807,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; @@ -1843,7 +1827,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); @@ -1865,4 +1849,8 @@ snmp_print(const u_char *np, u_int length) printf("[version = %d]", elem.data.integer); break; } + + if (vflag) { + fputs("} ", stdout); + } }