print frame-relay flags & DLCI # for cisco style encaps

[tcpdump] / print-snmp.c

diff --git a/print-snmp.c b/print-snmp.c
index 634ffdbe9c33a170f9b2e9781a866c8046272037..ad3a0efd268e919e49d13eb81b718423e71d3a50 100644 (file)
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -57,8 +57,8 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.55 2002-08-01 08:53:30 risso Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.59 2004-03-23 06:59:15 guy Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -81,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)
  */
  * 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",
        "U-0",
        "Boolean",
        "Integer",


@@ -104,7 +104,7 @@ char *Universal[] = {
 /*
  * Application-wide ASN.1 types from the Internet SMI and their tags
  */
 /*
  * Application-wide ASN.1 types from the Internet SMI and their tags
  */

-char *Application[] = {
+const char *Application[] = {

        "IpAddress",
 #define IPADDR 0
        "Counter",
        "IpAddress",
 #define IPADDR 0
        "Counter",


@@ -123,7 +123,7 @@ char *Application[] = {
 /*
  * Context-specific ASN.1 types for the SNMP PDUs and their tags
  */
 /*
  * Context-specific ASN.1 types for the SNMP PDUs and their tags
  */

-char *Context[] = {
+const char *Context[] = {

        "GetRequest",
 #define GETREQ 0
        "GetNextRequest",
        "GetRequest",
 #define GETREQ 0
        "GetNextRequest",


@@ -153,7 +153,7 @@ char *Context[] = {
 /*
  * Context-specific ASN.1 types for the SNMP Exceptions and their tags
  */
 /*
  * Context-specific ASN.1 types for the SNMP Exceptions and their tags
  */

-char *Exceptions[] = {
+const char *Exceptions[] = {

        "noSuchObject",
 #define NOSUCHOBJECT 0
        "noSuchInstance",
        "noSuchObject",
 #define NOSUCHOBJECT 0
        "noSuchInstance",


@@ -166,14 +166,14 @@ char *Exceptions[] = {
  * Private ASN.1 types
  * The Internet SMI does not specify any
  */
  * 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
  */
        "P-0"
 };
 
 /*
  * error-status values for any SNMP PDU
  */

-char *ErrorStatus[] = {
+const char *ErrorStatus[] = {

        "noError",
        "tooBig",
        "noSuchName",
        "noError",
        "tooBig",
        "noSuchName",


@@ -195,14 +195,14 @@ char *ErrorStatus[] = {
        "inconsistentName"
 };
 #define DECODE_ErrorStatus(e) \
        "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
  */
                ? 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",
        "coldStart",
        "warmStart",
        "linkDown",


@@ -210,10 +210,10 @@ char *GenericTrap[] = {
        "authenticationFailure",
        "egpNeighborLoss",
        "enterpriseSpecific"
        "authenticationFailure",
        "egpNeighborLoss",
        "enterpriseSpecific"

-#define GT_ENTERPRISE 7
+#define GT_ENTERPRISE 6

 };
 #define DECODE_GenericTrap(t) \
 };
 #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))
 
                ? GenericTrap[t] \
                : (snprintf(buf, sizeof(buf), "gt=%d", t), buf))
 


@@ -224,8 +224,8 @@ char *GenericTrap[] = {
  */
 #define defineCLASS(x) { "x", x, sizeof(x)/sizeof(x[0]) } /* not ANSI-C */
 struct {
  */
 #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),
            int numIDs;
     } Class[] = {
        defineCLASS(Universal),


@@ -243,7 +243,7 @@ struct {
 /*
  * defined forms for ASN.1 types
  */
 /*
  * defined forms for ASN.1 types
  */

-char *Form[] = {
+const char *Form[] = {

        "Primitive",
 #define PRIMITIVE      0
        "Constructed",
        "Primitive",
 #define PRIMITIVE      0
        "Constructed",


@@ -255,7 +255,7 @@ char *Form[] = {
  * This is stored as a general-order tree.
  */
 struct obj {
  * 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 */
        u_char  oid;                    /* sub-id following parent */
        u_char  type;                   /* object type (unused) */
        struct obj *child, *next;       /* child and next sibling pointers */


@@ -277,9 +277,9 @@ struct obj {
  * private enterprises tree, and the experimental tree.
  */
 struct obj_abrev {
  * 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 */
        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 */
 } obj_abrev_list[] = {
 #ifndef NO_ABREV_MIB
        /* .iso.org.dod.internet.mgmt.mib */


@@ -358,7 +358,7 @@ struct be {
 /*
  * SNMP versions recognized by this module
  */
 /*
  * SNMP versions recognized by this module
  */

-char *SnmpVersion[] = {
+const char *SnmpVersion[] = {

        "SNMPv1",
 #define SNMP_VERSION_1 0
        "SNMPv2c",
        "SNMPv1",
 #define SNMP_VERSION_1 0
        "SNMPv2c",


@@ -460,7 +460,7 @@ asn1_parse(register const u_char *p, u_int len, struct be *elem)
        elem->asnlen = *p;
        p++; len--; hdr++;
        if (elem->asnlen & ASN_BIT8) {
        elem->asnlen = *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);
                elem->asnlen = 0;
                if (len < noct) {
                        ifNotTruncated printf("[asnlen? %d<%d]", len, noct);


@@ -649,7 +649,7 @@ asn1_print(struct be *elem)
 {
        u_char *p = (u_char *)elem->data.raw;
        u_int32_t asnlen = elem->asnlen;
 {
        u_char *p = (u_char *)elem->data.raw;
        u_int32_t asnlen = elem->asnlen;

-       int i;
+       u_int32_t i;

 
        switch (elem->type) {
 
 
        switch (elem->type) {
 


@@ -781,7 +781,7 @@ asn1_print(struct be *elem)
        case BE_INETADDR:
                if (asnlen != ASNLEN_INETADDR)
                        printf("[inetaddr len!=%d]", ASNLEN_INETADDR);
        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;
                        printf((i == asnlen-1) ? "%u" : ".%u", *p);
                }
                break;


@@ -1167,7 +1167,7 @@ varbind_print(u_char pduid, const u_char *np, u_int length)
                asn1_print(&elem);
                return;
        }
                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;
                printf("[%d extra after SEQ of varbind]", length - count);
        /* descend */
        length = elem.asnlen;


@@ -1420,7 +1420,7 @@ pdu_print(const u_char *np, u_int length, int version)
                fputs("[no PDU]", stdout);
                return;
        }
                fputs("[no PDU]", stdout);
                return;
        }

-       if (count < length)
+       if ((u_int)count < length)

                printf("[%d extra after PDU]", length - count);
        if (vflag) {
                fputs("{ ", stdout);
                printf("[%d extra after PDU]", length - count);
        if (vflag) {
                fputs("{ ", stdout);


@@ -1638,7 +1638,7 @@ usm_print(const u_char *np, u_int length)
        length -= count;
         np += count;
 
        length -= count;
         np += count;
 

-       if (count < length)
+       if ((u_int)count < length)

                printf("[%d extra after usm SEQ]", length - count);
 }
 
                printf("[%d extra after usm SEQ]", length - count);
 }
 


@@ -1731,7 +1731,7 @@ v3msg_print(const u_char *np, u_int length)
        length -= count;
        np += count;
 
        length -= count;
        np += count;
 

-       if (count < length)
+       if ((u_int)count < length)

                printf("[%d extra after message SEQ]", length - count);
 
        if (vflag) {
                printf("[%d extra after message SEQ]", length - count);
 
        if (vflag) {


@@ -1807,7 +1807,7 @@ snmp_print(const u_char *np, u_int length)
                asn1_print(&elem);
                return;
        }
                asn1_print(&elem);
                return;
        }

-       if (count < length)
+       if ((u_int)count < length)

                printf("[%d extra after iSEQ]", length - count);
        /* descend */
        length = elem.asnlen;
                printf("[%d extra after iSEQ]", length - count);
        /* descend */
        length = elem.asnlen;