]> git.ipfire.org Git - thirdparty/squid.git/blobdiff - snmplib/snmp_pdu.c
SourceFormat Enforcement
[thirdparty/squid.git] / snmplib / snmp_pdu.c
index f2843fb0faa92653f190336e36f1ce697e6aba3e..d5b4d4fdff26aa3643892a12c581197b7b237d8b 100644 (file)
@@ -10,9 +10,9 @@
 /**********************************************************************
  *
  *           Copyright 1997 by Carnegie Mellon University
- * 
+ *
  *                       All Rights Reserved
- * 
+ *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation for any purpose and without fee is hereby granted,
  * provided that the above copyright notice appear in all copies and that
@@ -20,7 +20,7 @@
  * supporting documentation, and that the name of CMU not be
  * used in advertising or publicity pertaining to distribution of the
  * software without specific, written prior permission.
- * 
+ *
  * CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
  * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
  * CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
  * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
- * 
+ *
  * Author: Ryan Troll <ryan+@andrew.cmu.edu>
- * 
+ *
  **********************************************************************/
 
-#include "config.h"
+#include "squid.h"
 
 #include <stdio.h>
 
 #endif
 #if HAVE_GNUMALLOC_H
 #include <gnumalloc.h>
-#elif HAVE_MALLOC_H && !defined(_SQUID_FREEBSD_) && !defined(_SQUID_NEXT_)
+#elif HAVE_MALLOC_H
 #include <malloc.h>
 #endif
 #if HAVE_MEMORY_H
 #include <memory.h>
 #endif
-#ifdef HAVE_STRING_H
+#if HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
+#if HAVE_STRINGS_H
 #include <strings.h>
 #endif
 #if HAVE_BSTRING_H
  */
 
 struct snmp_pdu *
-snmp_pdu_create(int command)
-{
+snmp_pdu_create(int command) {
     struct snmp_pdu *pdu;
 
-#ifdef DEBUG_PDU
+#if DEBUG_PDU
     snmplib_debug(8, "PDU:  Creating\n");
 #endif
 
     pdu = (struct snmp_pdu *) xmalloc(sizeof(struct snmp_pdu));
     if (pdu == NULL) {
-       snmp_set_api_error(SNMPERR_OS_ERR);
-       return (NULL);
+        snmp_set_api_error(SNMPERR_OS_ERR);
+        return (NULL);
     }
     memset((char *) pdu, '\0', sizeof(struct snmp_pdu));
 
@@ -127,7 +126,7 @@ snmp_pdu_create(int command)
     pdu->enterprise_length = 0;
     pdu->variables = NULL;
 
-#ifdef DEBUG_PDU
+#if DEBUG_PDU
     snmplib_debug(8, "PDU:  Created %x\n", (unsigned int) pdu);
 #endif
 
@@ -139,22 +138,21 @@ snmp_pdu_create(int command)
 /* Clone an existing PDU.
  */
 struct snmp_pdu *
-snmp_pdu_clone(struct snmp_pdu *Src)
-{
+snmp_pdu_clone(struct snmp_pdu *Src) {
     struct snmp_pdu *Dest;
 
-#ifdef DEBUG_PDU
+#if DEBUG_PDU
     snmplib_debug(8, "PDU %x:  Cloning\n", (unsigned int) Src);
 #endif
 
     Dest = (struct snmp_pdu *) xmalloc(sizeof(struct snmp_pdu));
     if (Dest == NULL) {
-       snmp_set_api_error(SNMPERR_OS_ERR);
-       return (NULL);
+        snmp_set_api_error(SNMPERR_OS_ERR);
+        return (NULL);
     }
-    xmemcpy((char *) Dest, (char *) Src, sizeof(struct snmp_pdu));
+    memcpy((char *) Dest, (char *) Src, sizeof(struct snmp_pdu));
 
-#ifdef DEBUG_PDU
+#if DEBUG_PDU
     snmplib_debug(8, "PDU %x:  Created %x\n", (unsigned int) Src, (unsigned int) Dest);
 #endif
     return (Dest);
@@ -174,34 +172,32 @@ snmp_pdu_clone(struct snmp_pdu *Src)
  * be returned.
  */
 struct snmp_pdu *
-snmp_pdu_fix(struct snmp_pdu *pdu, int command)
-{
+snmp_pdu_fix(struct snmp_pdu *pdu, int command) {
     return (snmp_fix_pdu(pdu, command));
 }
 
 struct snmp_pdu *
-snmp_fix_pdu(struct snmp_pdu *pdu, int command)
-{
+snmp_fix_pdu(struct snmp_pdu *pdu, int command) {
     struct variable_list *var, *newvar;
     struct snmp_pdu *newpdu;
-    int index;
+    int i;
     int copied = 0;
 
-#ifdef DEBUG_PDU
+#if DEBUG_PDU
     snmplib_debug(8, "PDU %x:  Fixing.  Err index is %d\n",
-       (unsigned int) pdu, (unsigned int) pdu->errindex);
+                  (unsigned int) pdu, (unsigned int) pdu->errindex);
 #endif
 
     if (pdu->command != SNMP_PDU_RESPONSE ||
-       pdu->errstat == SNMP_ERR_NOERROR ||
-       pdu->errindex <= 0) {
-       snmp_set_api_error(SNMPERR_UNABLE_TO_FIX);
-       return (NULL);
+            pdu->errstat == SNMP_ERR_NOERROR ||
+            pdu->errindex <= 0) {
+        snmp_set_api_error(SNMPERR_UNABLE_TO_FIX);
+        return (NULL);
     }
     /* clone the pdu */
     newpdu = snmp_pdu_clone(pdu);
     if (newpdu == NULL)
-       return (NULL);
+        return (NULL);
 
     newpdu->variables = 0;
     newpdu->command = command;
@@ -212,62 +208,61 @@ snmp_fix_pdu(struct snmp_pdu *pdu, int command)
     /* Loop through the variables, removing whatever isn't necessary */
 
     var = pdu->variables;
-    index = 1;
+    i = 1;
 
     /* skip first variable if necessary */
-    if (pdu->errindex == index) {
-       var = var->next_variable;
-       index++;
+    if (pdu->errindex == i) {
+        var = var->next_variable;
+        i++;
     }
     if (var != NULL) {
 
-       /* VAR is the first uncopied variable */
-
-       /* Clone this variable */
-       newpdu->variables = snmp_var_clone(var);
-       if (newpdu->variables == NULL) {
-           snmp_pdu_free(newpdu);
-           return (NULL);
-       }
-       copied++;
-
-       newvar = newpdu->variables;
-
-       /* VAR has been copied to NEWVAR. */
-       while (var->next_variable) {
-
-           /* Skip the item that was bad */
-           if (++index == pdu->errindex) {
-               var = var->next_variable;
-               continue;
-           }
-           /* Copy this var */
-           newvar->next_variable = snmp_var_clone(var->next_variable);
-           if (newvar->next_variable == NULL) {
-               snmp_pdu_free(newpdu);
-               return (NULL);
-           }
-           /* Move to the next one */
-           newvar = newvar->next_variable;
-           var = var->next_variable;
-           copied++;
-       }
-       newvar->next_variable = NULL;
+        /* VAR is the first uncopied variable */
+
+        /* Clone this variable */
+        newpdu->variables = snmp_var_clone(var);
+        if (newpdu->variables == NULL) {
+            snmp_pdu_free(newpdu);
+            return (NULL);
+        }
+        copied++;
+
+        newvar = newpdu->variables;
+
+        /* VAR has been copied to NEWVAR. */
+        while (var->next_variable) {
+
+            /* Skip the item that was bad */
+            if (++i == pdu->errindex) {
+                var = var->next_variable;
+                continue;
+            }
+            /* Copy this var */
+            newvar->next_variable = snmp_var_clone(var->next_variable);
+            if (newvar->next_variable == NULL) {
+                snmp_pdu_free(newpdu);
+                return (NULL);
+            }
+            /* Move to the next one */
+            newvar = newvar->next_variable;
+            var = var->next_variable;
+            copied++;
+        }
+        newvar->next_variable = NULL;
     }
     /* If we didn't copy anything, free the new pdu. */
-    if (index < pdu->errindex || copied == 0) {
-       snmp_free_pdu(newpdu);
-       snmp_set_api_error(SNMPERR_UNABLE_TO_FIX);
-       return (NULL);
+    if (i < pdu->errindex || copied == 0) {
+        snmp_free_pdu(newpdu);
+        snmp_set_api_error(SNMPERR_UNABLE_TO_FIX);
+        return (NULL);
     }
-#ifdef DEBUG_PDU
+#if DEBUG_PDU
     snmplib_debug(8, "PDU %x:  Fixed PDU is %x\n",
-       (unsigned int) pdu, (unsigned int) newpdu);
+                  (unsigned int) pdu, (unsigned int) newpdu);
 #endif
     return (newpdu);
 }
 
-
 /**********************************************************************/
 
 void
@@ -286,13 +281,13 @@ snmp_free_pdu(struct snmp_pdu *pdu)
 
     vp = pdu->variables;
     while (vp) {
-       ovp = vp;
-       vp = vp->next_variable;
-       snmp_var_free(ovp);
+        ovp = vp;
+        vp = vp->next_variable;
+        snmp_var_free(ovp);
     }
 
     if (pdu->enterprise)
-       xfree((char *) pdu->enterprise);
+        xfree((char *) pdu->enterprise);
     xfree((char *) pdu);
 }
 
@@ -307,7 +302,7 @@ snmp_free_pdu(struct snmp_pdu *pdu)
 /*
  * RFC 1902: Structure of Management Information for SNMPv2
  *
- *   PDU ::= 
+ *   PDU ::=
  *    SEQUENCE {
  *      request-id   INTEGER32
  *      error-status INTEGER
@@ -327,7 +322,7 @@ snmp_free_pdu(struct snmp_pdu *pdu)
 /*
  * RFC 1157: A Simple Network Management Protocol (SNMP)
  *
- *   PDU ::= 
+ *   PDU ::=
  *    SEQUENCE {
  *      request-id   INTEGER
  *      error-status INTEGER
@@ -347,127 +342,128 @@ snmp_free_pdu(struct snmp_pdu *pdu)
 
 u_char *
 snmp_pdu_encode(u_char * DestBuf, int *DestBufLen,
-    struct snmp_pdu *PDU)
+                struct snmp_pdu *PDU)
 {
     u_char *bufp;
 
-#ifdef DEBUG_PDU_ENCODE
+#if DEBUG_PDU_ENCODE
     snmplib_debug(8, "PDU: Encoding %d\n", PDU->command);
 #endif
 
     /* ASN.1 Header */
     switch (PDU->command) {
 
-/**********************************************************************/
-
+        /**********************************************************************/
+#if TRP_REQ_MSG
     case TRP_REQ_MSG:
 
-       /* SNMPv1 Trap */
-
-       /* enterprise */
-       bufp = asn_build_objid(DestBuf, DestBufLen,
-           (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_OBJECT_ID),
-           (oid *) PDU->enterprise, PDU->enterprise_length);
-       if (bufp == NULL)
-           return (NULL);
-
-       /* agent-addr */
-       bufp = asn_build_string(bufp, DestBufLen,
-           (u_char) (SMI_IPADDRESS | ASN_PRIMITIVE),
-           (u_char *) & PDU->agent_addr.sin_addr.s_addr,
-           sizeof(PDU->agent_addr.sin_addr.s_addr));
-       if (bufp == NULL)
-           return (NULL);
-
-       /* generic trap */
-       bufp = asn_build_int(bufp, DestBufLen,
-           (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
-           (int *) &PDU->trap_type, sizeof(PDU->trap_type));
-       if (bufp == NULL)
-           return (NULL);
-
-       /* specific trap */
-       bufp = asn_build_int(bufp, DestBufLen,
-           (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
-           (int *) &PDU->specific_type,
-           sizeof(PDU->specific_type));
-       if (bufp == NULL)
-           return (NULL);
-
-       /* timestamp */
-       bufp = asn_build_unsigned_int(bufp, DestBufLen,
-           (u_char) (SMI_TIMETICKS | ASN_PRIMITIVE),
-           &PDU->time, sizeof(PDU->time));
-       if (bufp == NULL)
-           return (NULL);
-       break;
+        /* SNMPv1 Trap */
+
+        /* enterprise */
+        bufp = asn_build_objid(DestBuf, DestBufLen,
+                               (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_OBJECT_ID),
+                               (oid *) PDU->enterprise, PDU->enterprise_length);
+        if (bufp == NULL)
+            return (NULL);
+
+        /* agent-addr */
+        bufp = asn_build_string(bufp, DestBufLen,
+                                (u_char) (SMI_IPADDRESS | ASN_PRIMITIVE),
+                                (u_char *) & PDU->agent_addr.sin_addr.s_addr,
+                                sizeof(PDU->agent_addr.sin_addr.s_addr));
+        if (bufp == NULL)
+            return (NULL);
+
+        /* generic trap */
+        bufp = asn_build_int(bufp, DestBufLen,
+                             (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
+                             (int *) &PDU->trap_type, sizeof(PDU->trap_type));
+        if (bufp == NULL)
+            return (NULL);
+
+        /* specific trap */
+        bufp = asn_build_int(bufp, DestBufLen,
+                             (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
+                             (int *) &PDU->specific_type,
+                             sizeof(PDU->specific_type));
+        if (bufp == NULL)
+            return (NULL);
+
+        /* timestamp */
+        bufp = asn_build_unsigned_int(bufp, DestBufLen,
+                                      (u_char) (SMI_TIMETICKS | ASN_PRIMITIVE),
+                                      &PDU->time, sizeof(PDU->time));
+        if (bufp == NULL)
+            return (NULL);
+        break;
+#endif
 
-/**********************************************************************/
+        /**********************************************************************/
 
     case SNMP_PDU_GETBULK:
 
-       /* SNMPv2 Bulk Request */
-
-       /* request id */
-       bufp = asn_build_int(DestBuf, DestBufLen,
-           (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
-           &PDU->reqid, sizeof(PDU->reqid));
-       if (bufp == NULL)
-           return (NULL);
-
-       /* non-repeaters */
-       bufp = asn_build_int(bufp, DestBufLen,
-           (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
-           &PDU->non_repeaters,
-           sizeof(PDU->non_repeaters));
-       if (bufp == NULL)
-           return (NULL);
-
-       /* max-repetitions */
-       bufp = asn_build_int(bufp, DestBufLen,
-           (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
-           &PDU->max_repetitions,
-           sizeof(PDU->max_repetitions));
-       if (bufp == NULL)
-           return (NULL);
-       break;
-
-/**********************************************************************/
+        /* SNMPv2 Bulk Request */
+
+        /* request id */
+        bufp = asn_build_int(DestBuf, DestBufLen,
+                             (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
+                             &PDU->reqid, sizeof(PDU->reqid));
+        if (bufp == NULL)
+            return (NULL);
+
+        /* non-repeaters */
+        bufp = asn_build_int(bufp, DestBufLen,
+                             (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
+                             &PDU->non_repeaters,
+                             sizeof(PDU->non_repeaters));
+        if (bufp == NULL)
+            return (NULL);
+
+        /* max-repetitions */
+        bufp = asn_build_int(bufp, DestBufLen,
+                             (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
+                             &PDU->max_repetitions,
+                             sizeof(PDU->max_repetitions));
+        if (bufp == NULL)
+            return (NULL);
+        break;
+
+        /**********************************************************************/
 
     default:
 
-       /* Normal PDU Encoding */
+        /* Normal PDU Encoding */
 
-       /* request id */
-#ifdef DEBUG_PDU_ENCODE
-       snmplib_debug(8, "PDU: Request ID %d (0x%x)\n", PDU->reqid, DestBuf);
+        /* request id */
+#if DEBUG_PDU_ENCODE
+        snmplib_debug(8, "PDU: Request ID %d (0x%x)\n", PDU->reqid, DestBuf);
 #endif
-       bufp = asn_build_int(DestBuf, DestBufLen,
-           (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
-           &PDU->reqid, sizeof(PDU->reqid));
-       if (bufp == NULL)
-           return (NULL);
-
-       /* error status */
-#ifdef DEBUG_PDU_ENCODE
-       snmplib_debug(8, "PDU: Error Status %d (0x%x)\n", PDU->errstat, bufp);
+        bufp = asn_build_int(DestBuf, DestBufLen,
+                             (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
+                             &PDU->reqid, sizeof(PDU->reqid));
+        if (bufp == NULL)
+            return (NULL);
+
+        /* error status */
+#if DEBUG_PDU_ENCODE
+        snmplib_debug(8, "PDU: Error Status %d (0x%x)\n", PDU->errstat, bufp);
 #endif
-       bufp = asn_build_int(bufp, DestBufLen,
-           (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
-           &PDU->errstat, sizeof(PDU->errstat));
-       if (bufp == NULL)
-           return (NULL);
-
-       /* error index */
-#ifdef DEBUG_PDU_ENCODE
-       snmplib_debug(8, "PDU: Error index %d (0x%x)\n", PDU->errindex, bufp);
+        bufp = asn_build_int(bufp, DestBufLen,
+                             (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
+                             &PDU->errstat, sizeof(PDU->errstat));
+        if (bufp == NULL)
+            return (NULL);
+
+        /* error index */
+#if DEBUG_PDU_ENCODE
+        snmplib_debug(8, "PDU: Error index %d (0x%x)\n", PDU->errindex, bufp);
 #endif
-       bufp = asn_build_int(bufp, DestBufLen,
-           (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
-           &PDU->errindex, sizeof(PDU->errindex));
-       if (bufp == NULL)
-           return (NULL);
-       break;
+        bufp = asn_build_int(bufp, DestBufLen,
+                             (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
+                             &PDU->errindex, sizeof(PDU->errindex));
+        if (bufp == NULL)
+            return (NULL);
+        break;
     }                          /* End of encoding */
 
     return (bufp);
@@ -482,190 +478,155 @@ snmp_pdu_encode(u_char * DestBuf, int *DestBufLen,
  */
 u_char *
 snmp_pdu_decode(u_char * Packet,       /* data */
-    int *Length,               /* &length */
-    struct snmp_pdu * PDU)
+                int *Length,           /* &length */
+                struct snmp_pdu * PDU)
 {                              /* pdu */
     u_char *bufp;
     u_char PDUType;
-    int four;
     u_char ASNType;
+#if UNUSED_CODE
+    int four;
     oid objid[MAX_NAME_LEN];
+#endif
 
     bufp = asn_parse_header(Packet, Length, &PDUType);
     if (bufp == NULL)
-       ASN_PARSE_ERROR(NULL);
+        ASN_PARSE_ERROR(NULL);
 
-#ifdef DEBUG_PDU_DECODE
+#if DEBUG_PDU_DECODE
     snmplib_debug(8, "PDU Type: %d\n", PDUType);
 #endif
 
     PDU->command = PDUType;
     switch (PDUType) {
 
+#if TRP_REQ_MSG
     case TRP_REQ_MSG:
 
-       /* SNMPv1 Trap Message */
-
-       /* enterprise */
-       PDU->enterprise_length = MAX_NAME_LEN;
-       bufp = asn_parse_objid(bufp, Length,
-           &ASNType, objid, &PDU->enterprise_length);
-       if (bufp == NULL)
-           ASN_PARSE_ERROR(NULL);
-
-       PDU->enterprise = (oid *) xmalloc(PDU->enterprise_length * sizeof(oid));
-       if (PDU->enterprise == NULL) {
-           snmp_set_api_error(SNMPERR_OS_ERR);
-           return (NULL);
-       }
-       xmemcpy((char *) PDU->enterprise, (char *) objid,
-           PDU->enterprise_length * sizeof(oid));
-
-       /* Agent-addr */
-       four = 4;
-       bufp = asn_parse_string(bufp, Length,
-           &ASNType,
-           (u_char *) & PDU->agent_addr.sin_addr.s_addr,
-           &four);
-       if (bufp == NULL)
-           ASN_PARSE_ERROR(NULL);
-
-       /* Generic trap */
-       bufp = asn_parse_int(bufp, Length,
-           &ASNType,
-           (int *) &PDU->trap_type,
-           sizeof(PDU->trap_type));
-       if (bufp == NULL)
-           ASN_PARSE_ERROR(NULL);
-
-       /* Specific Trap */
-       bufp = asn_parse_int(bufp, Length,
-           &ASNType,
-           (int *) &PDU->specific_type,
-           sizeof(PDU->specific_type));
-       if (bufp == NULL)
-           ASN_PARSE_ERROR(NULL);
-
-       /* Timestamp */
-       bufp = asn_parse_unsigned_int(bufp, Length,
-           &ASNType,
-           &PDU->time, sizeof(PDU->time));
-       if (bufp == NULL)
-           ASN_PARSE_ERROR(NULL);
-       break;
+        /* SNMPv1 Trap Message */
+
+        /* enterprise */
+        PDU->enterprise_length = MAX_NAME_LEN;
+        bufp = asn_parse_objid(bufp, Length,
+                               &ASNType, objid, &PDU->enterprise_length);
+        if (bufp == NULL)
+            ASN_PARSE_ERROR(NULL);
+
+        PDU->enterprise = (oid *) xmalloc(PDU->enterprise_length * sizeof(oid));
+        if (PDU->enterprise == NULL) {
+            snmp_set_api_error(SNMPERR_OS_ERR);
+            return (NULL);
+        }
+        memcpy((char *) PDU->enterprise, (char *) objid,
+               PDU->enterprise_length * sizeof(oid));
+
+        /* Agent-addr */
+        four = 4;
+        bufp = asn_parse_string(bufp, Length,
+                                &ASNType,
+                                (u_char *) & PDU->agent_addr.sin_addr.s_addr,
+                                &four);
+        if (bufp == NULL)
+            ASN_PARSE_ERROR(NULL);
+
+        /* Generic trap */
+        bufp = asn_parse_int(bufp, Length,
+                             &ASNType,
+                             (int *) &PDU->trap_type,
+                             sizeof(PDU->trap_type));
+        if (bufp == NULL)
+            ASN_PARSE_ERROR(NULL);
+
+        /* Specific Trap */
+        bufp = asn_parse_int(bufp, Length,
+                             &ASNType,
+                             (int *) &PDU->specific_type,
+                             sizeof(PDU->specific_type));
+        if (bufp == NULL)
+            ASN_PARSE_ERROR(NULL);
+
+        /* Timestamp */
+        bufp = asn_parse_unsigned_int(bufp, Length,
+                                      &ASNType,
+                                      &PDU->time, sizeof(PDU->time));
+        if (bufp == NULL)
+            ASN_PARSE_ERROR(NULL);
+        break;
+#endif
 
-/**********************************************************************/
+        /**********************************************************************/
 
     case SNMP_PDU_GETBULK:
 
-       /* SNMPv2 Bulk Request */
-
-       /* request id */
-       bufp = asn_parse_int(bufp, Length,
-           &ASNType,
-           &PDU->reqid, sizeof(PDU->reqid));
-       if (bufp == NULL)
-           ASN_PARSE_ERROR(NULL);
-
-       /* non-repeaters */
-       bufp = asn_parse_int(bufp, Length,
-           &ASNType,
-           &PDU->non_repeaters, sizeof(PDU->non_repeaters));
-       if (bufp == NULL)
-           ASN_PARSE_ERROR(NULL);
-
-       /* max-repetitions */
-       bufp = asn_parse_int(bufp, Length,
-           &ASNType,
-           &PDU->max_repetitions, sizeof(PDU->max_repetitions));
-       if (bufp == NULL)
-           ASN_PARSE_ERROR(NULL);
-
-       break;
-/**********************************************************************/
+        /* SNMPv2 Bulk Request */
+
+        /* request id */
+        bufp = asn_parse_int(bufp, Length,
+                             &ASNType,
+                             &PDU->reqid, sizeof(PDU->reqid));
+        if (bufp == NULL)
+            ASN_PARSE_ERROR(NULL);
+
+        /* non-repeaters */
+        bufp = asn_parse_int(bufp, Length,
+                             &ASNType,
+                             &PDU->non_repeaters, sizeof(PDU->non_repeaters));
+        if (bufp == NULL)
+            ASN_PARSE_ERROR(NULL);
+
+        /* max-repetitions */
+        bufp = asn_parse_int(bufp, Length,
+                             &ASNType,
+                             &PDU->max_repetitions, sizeof(PDU->max_repetitions));
+        if (bufp == NULL)
+            ASN_PARSE_ERROR(NULL);
+        break;
+
+        /**********************************************************************/
 
     default:
 
-       /* Normal PDU Encoding */
+        /* Normal PDU Encoding */
 
-       /* request id */
-       bufp = asn_parse_int(bufp, Length,
-           &ASNType,
-           &PDU->reqid, sizeof(PDU->reqid));
-       if (bufp == NULL)
-           ASN_PARSE_ERROR(NULL);
+        /* request id */
+        bufp = asn_parse_int(bufp, Length,
+                             &ASNType,
+                             &PDU->reqid, sizeof(PDU->reqid));
+        if (bufp == NULL)
+            ASN_PARSE_ERROR(NULL);
 
-#ifdef DEBUG_PDU_DECODE
-       snmplib_debug(8, "PDU Request ID: %d\n", PDU->reqid);
+#if DEBUG_PDU_DECODE
+        snmplib_debug(8, "PDU Request ID: %d\n", PDU->reqid);
 #endif
 
-       /* error status */
-       bufp = asn_parse_int(bufp, Length,
-           &ASNType,
-           &PDU->errstat, sizeof(PDU->errstat));
-       if (bufp == NULL)
-           ASN_PARSE_ERROR(NULL);
+        /* error status */
+        bufp = asn_parse_int(bufp, Length,
+                             &ASNType,
+                             &PDU->errstat, sizeof(PDU->errstat));
+        if (bufp == NULL)
+            ASN_PARSE_ERROR(NULL);
 
-#ifdef DEBUG_PDU_DECODE
-       snmplib_debug(8, "PDU Error Status: %d\n", PDU->errstat);
+#if DEBUG_PDU_DECODE
+        snmplib_debug(8, "PDU Error Status: %d\n", PDU->errstat);
 #endif
 
-       /* error index */
-       bufp = asn_parse_int(bufp, Length,
-           &ASNType,
-           &PDU->errindex, sizeof(PDU->errindex));
-       if (bufp == NULL)
-           ASN_PARSE_ERROR(NULL);
+        /* error index */
+        bufp = asn_parse_int(bufp, Length,
+                             &ASNType,
+                             &PDU->errindex, sizeof(PDU->errindex));
+        if (bufp == NULL)
+            ASN_PARSE_ERROR(NULL);
 
-#ifdef DEBUG_PDU_DECODE
-       snmplib_debug(8, "PDU Error Index: %d\n", PDU->errindex);
+#if DEBUG_PDU_DECODE
+        snmplib_debug(8, "PDU Error Index: %d\n", PDU->errindex);
 #endif
 
-       break;
+        break;
     }
 
     return (bufp);
 }
 
-
-char *
-snmp_pdu_type(struct snmp_pdu *PDU)
-{
-    switch (PDU->command) {
-    case SNMP_PDU_GET:
-       return ("GET");
-       break;
-    case SNMP_PDU_GETNEXT:
-       return ("GETNEXT");
-       break;
-    case SNMP_PDU_RESPONSE:
-       return ("RESPONSE");
-       break;
-    case SNMP_PDU_SET:
-       return ("SET");
-       break;
-    case SNMP_PDU_GETBULK:
-       return ("GETBULK");
-       break;
-    case SNMP_PDU_INFORM:
-       return ("INFORM");
-       break;
-    case SNMP_PDU_V2TRAP:
-       return ("V2TRAP");
-       break;
-    case SNMP_PDU_REPORT:
-       return ("REPORT");
-       break;
-
-    case TRP_REQ_MSG:
-       return ("V1TRAP");
-       break;
-    default:
-       return ("Unknown");
-       break;
-    }
-}
-
 /*
  * Add a null variable with the requested name to the end of the list of
  * variables for this pdu.
@@ -678,19 +639,19 @@ snmp_add_null_var(struct snmp_pdu *pdu, oid * name, int name_length)
 
     vars = snmp_var_new(name, name_length);
     if (vars == NULL) {
-       perror("snmp_add_null_var:xmalloc");
-       return;
+        perror("snmp_add_null_var:xmalloc");
+        return;
     }
     if (pdu->variables == NULL) {
-       pdu->variables = vars;
+        pdu->variables = vars;
     } else {
 
-       /* Insert at the end */
-       for (ptr = pdu->variables;
-           ptr->next_variable;
-           ptr = ptr->next_variable)
-           /*EXIT */ ;
-       ptr->next_variable = vars;
+        /* Insert at the end */
+        for (ptr = pdu->variables;
+                ptr->next_variable;
+                ptr = ptr->next_variable)
+            /*EXIT */ ;
+        ptr->next_variable = vars;
     }
 
     return;