From: hno <>
Date: Thu, 18 Oct 2001 01:05:37 +0000 (+0000)
Subject: ANSI:fied the SNMP functions, and removed some stale junk
X-Git-Tag: SQUID_3_0_PRE1~1347
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c52f59a50e431c999f9d30032e95bf150ffab41;p=thirdparty%2Fsquid.git

ANSI:fied the SNMP functions, and removed some stale junk
and some const cleanup
---

diff --git a/include/parse.h b/include/parse.h
index eff4c142b4..06e4469e08 100644
--- a/include/parse.h
+++ b/include/parse.h
@@ -1,5 +1,5 @@
 /*
- * $Id: parse.h,v 1.10 2001/10/08 16:18:31 hno Exp $
+ * $Id: parse.h,v 1.11 2001/10/17 19:05:37 hno Exp $
  */
 
 #ifndef SQUID_PARSE_H
@@ -50,7 +50,7 @@ struct snmp_mib_tree {
     u_int subid;		/* This node's integer subidentifier */
     int type;			/* This node's object type */
     struct enum_list *enums;	/* (optional) list of enumerated integers (otherwise NULL) */
-    void (*printer) ();		/* Value printing function */
+    void (*printer) (char *buf, variable_list *var, void *foo, int quiet);		/* Value printing function */
 };
 
 /* non-aggregate types for tree end nodes */
diff --git a/include/snmp_api_error.h b/include/snmp_api_error.h
index 7831c10259..83a6525ac3 100644
--- a/include/snmp_api_error.h
+++ b/include/snmp_api_error.h
@@ -26,7 +26,7 @@
  * 
  * Author: Ryan Troll <ryan+@andrew.cmu.edu>
  * 
- * $Id: snmp_api_error.h,v 1.3 2001/10/08 16:18:31 hno Exp $
+ * $Id: snmp_api_error.h,v 1.4 2001/10/17 19:05:37 hno Exp $
  * 
  ***************************************************************************/
 
@@ -57,10 +57,10 @@ extern "C" {
 
 /* extern int snmp_errno */
 
-    char *snmp_api_error(int);
+    const char *snmp_api_error(int);
     int snmp_api_errno(void);
 
-    char *api_errstring(int);	/* Backwards compatibility */
+    const char *api_errstring(int);	/* Backwards compatibility */
     void snmp_set_api_error(int);
 
 #ifdef __cplusplus
diff --git a/include/snmp_debug.h b/include/snmp_debug.h
index f08bc59aa6..242091136c 100644
--- a/include/snmp_debug.h
+++ b/include/snmp_debug.h
@@ -1,14 +1,10 @@
 /*
- * $Id: snmp_debug.h,v 1.7 2001/10/08 16:18:31 hno Exp $
+ * $Id: snmp_debug.h,v 1.8 2001/10/17 19:05:37 hno Exp $
  */
 
 #ifndef SQUID_SNMP_DEBUG_H
 #define SQUID_SNMP_DEBUG_H
 
-#if STDC_HEADERS
-extern void snmplib_debug(int, char *,...);
-#else
-extern void snmplib_debug(va_alist);
-#endif
+extern void snmplib_debug(int, const char *,...);
 
 #endif /* SQUID_SNMP_DEBUG_H */
diff --git a/include/snmp_error.h b/include/snmp_error.h
index 6045a9d030..eb1c7ad238 100644
--- a/include/snmp_error.h
+++ b/include/snmp_error.h
@@ -24,7 +24,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  * 
- * $Id: snmp_error.h,v 1.3 2001/10/08 16:18:31 hno Exp $
+ * $Id: snmp_error.h,v 1.4 2001/10/17 19:05:37 hno Exp $
  * 
  **********************************************************************/
 
@@ -59,7 +59,7 @@
 extern "C" {
 #endif
 
-    char *snmp_errstring(int);
+    const char *snmp_errstring(int);
 
 #ifdef __cplusplus
 }
diff --git a/include/snmp_pdu.h b/include/snmp_pdu.h
index 1167e40e6d..517e03cb73 100644
--- a/include/snmp_pdu.h
+++ b/include/snmp_pdu.h
@@ -25,7 +25,7 @@
  * 
  * Author: Ryan Troll <ryan+@andrew.cmu.edu>
  * 
- * $Id: snmp_pdu.h,v 1.5 2001/10/08 16:18:31 hno Exp $
+ * $Id: snmp_pdu.h,v 1.6 2001/10/17 19:05:37 hno Exp $
  * 
  **********************************************************************/
 
@@ -64,7 +64,7 @@ void snmp_pdu_free(struct snmp_pdu *);
 
 u_char *snmp_pdu_encode(u_char *, int *, struct snmp_pdu *);
 u_char *snmp_pdu_decode(u_char *, int *, struct snmp_pdu *);
-char *snmp_pdu_type(struct snmp_pdu *);
+const char *snmp_pdu_type(struct snmp_pdu *);
 
     /* Add a NULL Variable to a PDU */
 void snmp_add_null_var(struct snmp_pdu *, oid *, int);
diff --git a/include/snmp_session.h b/include/snmp_session.h
index 751a5c372d..3462f7d135 100644
--- a/include/snmp_session.h
+++ b/include/snmp_session.h
@@ -24,7 +24,7 @@
  * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  * 
- * $Id: snmp_session.h,v 1.3 2001/10/08 16:18:31 hno Exp $
+ * $Id: snmp_session.h,v 1.4 2001/10/17 19:05:37 hno Exp $
  * 
  **********************************************************************/
 
@@ -39,13 +39,6 @@ struct snmp_session {
     char *peername;		/* Domain name or dotted IP address of default peer */
     u_short remote_port;	/* UDP port number of peer. */
     u_short local_port;		/* My UDP port number, 0 for default, picked randomly */
-    /* This isn't used, but is here so that libraries compiled with this
-     * in place still work.
-     */
-    u_char *(*authenticator) ();
-    int (*callback) ();		/* Function to interpret incoming data */
-    /* Pointer to data that the callback function may consider important */
-    void *callback_magic;
 };
 
 #define RECEIVED_MESSAGE   1
diff --git a/snmplib/mib.c b/snmplib/mib.c
index 582a7933d8..14da2d396b 100644
--- a/snmplib/mib.c
+++ b/snmplib/mib.c
@@ -82,400 +82,7 @@ SOFTWARE.
 
 #include "util.h"
 #include "snprintf.h"
-#if 0
-static void sprint_by_type();
-#endif
-
-#if 0
-static char *
-uptimeString(timeticks, buf)
-     int timeticks;
-     char *buf;
-{
-    int seconds, minutes, hours, days;
-
-    timeticks /= 100;
-    days = timeticks / (60 * 60 * 24);
-    timeticks %= (60 * 60 * 24);
-
-    hours = timeticks / (60 * 60);
-    timeticks %= (60 * 60);
-
-    minutes = timeticks / 60;
-    seconds = timeticks % 60;
-
-    if (days == 0) {
-	snprintf(buf, 32, "%d:%02d:%02d", hours, minutes, seconds);
-    } else if (days == 1) {
-	snprintf(buf, 32, "%d day, %d:%02d:%02d", days, hours, minutes, seconds);
-    } else {
-	snprintf(buf, 32, "%d days, %d:%02d:%02d", days, hours, minutes, seconds);
-    }
-    return buf;
-}
-
-static void
-sprint_hexstring(buf, cp, len)
-     char *buf;
-     u_char *cp;
-     int len;
-{
-
-    for (; len >= 16; len -= 16) {
-	snprintf(buf, 26, "%02X %02X %02X %02X %02X %02X %02X %02X ", cp[0], cp[1], cp[2], cp[3], cp[4], cp[5], cp[6], cp[7]);
-	buf += strlen(buf);
-	cp += 8;
-	snprintf(buf, 26, "%02X %02X %02X %02X %02X %02X %02X %02X\n", cp[0], cp[1], cp[2], cp[3], cp[4], cp[5], cp[6], cp[7]);
-	buf += strlen(buf);
-	cp += 8;
-    }
-    for (; len > 0; len--) {
-	snprintf(buf, 4, "%02X ", *cp++);
-	buf += strlen(buf);
-    }
-    *buf = '\0';
-}
-
-static void
-sprint_asciistring(buf, cp, len)
-     char *buf;
-     u_char *cp;
-     int len;
-{
-    int x;
-
-    for (x = 0; x < len; x++) {
-	if (isprint(*cp)) {
-	    *buf++ = *cp++;
-	} else {
-	    *buf++ = '.';
-	    cp++;
-	}
-	if ((x % 48) == 47)
-	    *buf++ = '\n';
-    }
-    *buf = '\0';
-}
-
-static void
-sprint_octet_string(buf, var, foo, quiet)
-     char *buf;
-     variable_list *var;
-     void *foo;
-     int quiet;
-{
-    int hex, x;
-    u_char *cp;
-
-    if (var->type != ASN_OCTET_STR) {
-	sprintf(buf, "Wrong Type (should be OCTET STRING): ");
-	buf += strlen(buf);
-	sprint_by_type(buf, var, (struct enum_list *) NULL, quiet);
-	return;
-    }
-    hex = 0;
-    for (cp = var->val.string, x = 0; x < var->val_len; x++, cp++) {
-	if (!(isprint(*cp) || isspace(*cp)))
-	    hex = 1;
-    }
-    if (var->val_len <= 4)
-	hex = 1;		/* not likely to be ascii */
-    if (hex) {
-	if (!quiet) {
-	    sprintf(buf, "OCTET STRING-   (hex):\t");
-	    buf += strlen(buf);
-	}
-	sprint_hexstring(buf, var->val.string, var->val_len);
-    } else {
-	if (!quiet) {
-	    sprintf(buf, "OCTET STRING- (ascii):\t");
-	    buf += strlen(buf);
-	}
-	sprint_asciistring(buf, var->val.string, var->val_len);
-    }
-}
-
-static void
-sprint_opaque(buf, var, foo, quiet)
-     char *buf;
-     variable_list *var;
-     void *foo;
-     int quiet;
-{
-
-    if (var->type != SMI_OPAQUE) {
-	sprintf(buf, "Wrong Type (should be Opaque): ");
-	buf += strlen(buf);
-	sprint_by_type(buf, var, (struct enum_list *) NULL, quiet);
-	return;
-    }
-    if (!quiet) {
-	sprintf(buf, "OPAQUE -   (hex):\t");
-	buf += strlen(buf);
-    }
-    sprint_hexstring(buf, var->val.string, var->val_len);
-}
-
-static void
-sprint_object_identifier(buf, var, foo, quiet)
-     char *buf;
-     variable_list *var;
-     void *foo;
-     int quiet;
-{
-    if (var->type != SMI_OBJID) {
-	sprintf(buf, "Wrong Type (should be OBJECT IDENTIFIER): ");
-	buf += strlen(buf);
-	sprint_by_type(buf, var, (struct enum_list *) NULL, quiet);
-	return;
-    }
-    if (!quiet) {
-	sprintf(buf, "OBJECT IDENTIFIER:\t");
-	buf += strlen(buf);
-    }
-    sprint_objid(buf, (oid *) (var->val.objid), var->val_len / sizeof(oid));
-}
 
-static void
-sprint_timeticks(buf, var, foo, quiet)
-     char *buf;
-     variable_list *var;
-     void *foo;
-     int quiet;
-{
-    char timebuf[32];
-
-    if (var->type != SMI_TIMETICKS) {
-	sprintf(buf, "Wrong Type (should be Timeticks): ");
-	buf += strlen(buf);
-	sprint_by_type(buf, var, (struct enum_list *) NULL, quiet);
-	return;
-    }
-    if (!quiet) {
-	sprintf(buf, "Timeticks: ");
-	buf += strlen(buf);
-    }
-    sprintf(buf, "(%u) %s",
-	*(var->val.integer),
-	uptimeString(*(var->val.integer), timebuf));
-}
-
-static void
-sprint_integer(buf, var, enums, quiet)
-     char *buf;
-     variable_list *var;
-     struct enum_list *enums;
-     int quiet;
-{
-    char *enum_string = NULL;
-
-    if (var->type != SMI_INTEGER) {
-	sprintf(buf, "Wrong Type (should be INTEGER): ");
-	buf += strlen(buf);
-	sprint_by_type(buf, var, (struct enum_list *) NULL, quiet);
-	return;
-    }
-    for (; enums; enums = enums->next)
-	if (enums->value == *var->val.integer) {
-	    enum_string = enums->label;
-	    break;
-	}
-    if (!quiet) {
-	sprintf(buf, "INTEGER: ");
-	buf += strlen(buf);
-    }
-    if (enum_string == NULL)
-	sprintf(buf, "%u", *var->val.integer);
-    else
-	sprintf(buf, "%s(%u)", enum_string, *var->val.integer);
-}
-
-static void
-sprint_gauge(buf, var, foo, quiet)
-     char *buf;
-     variable_list *var;
-     void *foo;
-     int quiet;
-{
-    if (var->type != SMI_GAUGE32) {
-	sprintf(buf, "Wrong Type (should be Gauge): ");
-	buf += strlen(buf);
-	sprint_by_type(buf, var, (struct enum_list *) NULL, quiet);
-	return;
-    }
-    if (!quiet) {
-	sprintf(buf, "Gauge: ");
-	buf += strlen(buf);
-    }
-    sprintf(buf, "%u", *var->val.integer);
-}
-
-static void
-sprint_counter(buf, var, foo, quiet)
-     char *buf;
-     variable_list *var;
-     void *foo;
-     int quiet;
-{
-    if (var->type != SMI_COUNTER32) {
-	sprintf(buf, "Wrong Type (should be Counter): ");
-	buf += strlen(buf);
-	sprint_by_type(buf, var, (struct enum_list *) NULL, quiet);
-	return;
-    }
-    if (!quiet) {
-	sprintf(buf, "Counter: ");
-	buf += strlen(buf);
-    }
-    sprintf(buf, "%u", *var->val.integer);
-}
-
-static void
-sprint_networkaddress(buf, var, foo, quiet)
-     char *buf;
-     variable_list *var;
-     void *foo;
-     int quiet;
-{
-    int x, len;
-    u_char *cp;
-
-    if (!quiet) {
-	sprintf(buf, "Network Address:\t");
-	buf += strlen(buf);
-    }
-    cp = var->val.string;
-    len = var->val_len;
-    for (x = 0; x < len; x++) {
-	sprintf(buf, "%02X", *cp++);
-	buf += strlen(buf);
-	if (x < (len - 1))
-	    *buf++ = ':';
-    }
-}
-
-static void
-sprint_ipaddress(buf, var, foo, quiet)
-     char *buf;
-     variable_list *var;
-     void *foo;
-     int quiet;
-{
-    u_char *ip;
-
-    if (var->type != SMI_IPADDRESS) {
-	sprintf(buf, "Wrong Type (should be Ipaddress): ");
-	buf += strlen(buf);
-	sprint_by_type(buf, var, (struct enum_list *) NULL, quiet);
-	return;
-    }
-    ip = var->val.string;
-    if (!quiet) {
-	sprintf(buf, "IPAddress:\t");
-	buf += strlen(buf);
-    }
-    sprintf(buf, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
-}
-#endif
-
-#if 0
-static void
-sprint_unsigned_short(buf, var, foo, quiet)
-     char *buf;
-     variable_list *var;
-     void *foo;
-     int quiet;
-{
-    if (var->type != SMI_INTEGER) {
-	sprintf(buf, "Wrong Type (should be INTEGER): ");
-	buf += strlen(buf);
-	sprint_by_type(buf, var, (struct enum_list *) NULL, quiet);
-	return;
-    }
-    if (!quiet) {
-	sprintf(buf, "INTEGER (0..65535): ");
-	buf += strlen(buf);
-    }
-    sprintf(buf, "%u", *var->val.integer);
-}
-#endif
-
-#if 0
-static void
-sprint_null(buf, var, foo, quiet)
-     char *buf;
-     variable_list *var;
-     void *foo;
-     int quiet;
-{
-    if (var->type != SMI_NULLOBJ) {
-	sprintf(buf, "Wrong Type (should be NULL): ");
-	buf += strlen(buf);
-	sprint_by_type(buf, var, (struct enum_list *) NULL, quiet);
-	return;
-    }
-    sprintf(buf, "NULL");
-}
-
-static void
-sprint_unknowntype(buf, var, foo, quiet)
-     char *buf;
-     variable_list *var;
-     void *foo;
-     int quiet;
-{
-/*    sprintf(buf, "Variable has bad type"); */
-    sprint_by_type(buf, var, foo, quiet);
-}
-
-static void
-sprint_badtype(buf)
-     char *buf;
-{
-    sprintf(buf, "Variable has bad type");
-}
-
-static void
-sprint_by_type(buf, var, enums, quiet)
-     char *buf;
-     variable_list *var;
-     struct enum_list *enums;
-     int quiet;
-{
-    switch (var->type) {
-    case SMI_INTEGER:
-	sprint_integer(buf, var, enums, quiet);
-	break;
-    case SMI_STRING:
-	sprint_octet_string(buf, var, enums, quiet);
-	break;
-    case SMI_OPAQUE:
-	sprint_opaque(buf, var, enums, quiet);
-	break;
-    case SMI_OBJID:
-	sprint_object_identifier(buf, var, enums, quiet);
-	break;
-    case SMI_TIMETICKS:
-	sprint_timeticks(buf, var, enums, quiet);
-	break;
-    case SMI_GAUGE32:
-	sprint_gauge(buf, var, enums, quiet);
-	break;
-    case SMI_COUNTER32:
-	sprint_counter(buf, var, enums, quiet);
-	break;
-    case SMI_IPADDRESS:
-	sprint_ipaddress(buf, var, enums, quiet);
-	break;
-    case SMI_NULLOBJ:
-	sprint_null(buf, var, enums, quiet);
-	break;
-    default:
-	sprint_badtype(buf, enums, quiet);
-	break;
-    }
-}
-#endif
 
 static struct snmp_mib_tree *get_symbol(oid *objid, int objidlen, struct snmp_mib_tree *subtree, char *buf);
 
@@ -484,53 +91,6 @@ oid RFC1066_MIB[] =
 unsigned char RFC1066_MIB_text[] = ".iso.org.dod.internet.mgmt.mib";
 struct snmp_mib_tree *Mib;
 
-#if 0
-static void
-set_functions(subtree)
-     struct snmp_mib_tree *subtree;
-{
-    for (; subtree; subtree = subtree->next_peer) {
-	switch (subtree->type) {
-	case TYPE_OBJID:
-	    subtree->printer = sprint_object_identifier;
-	    break;
-	case TYPE_OCTETSTR:
-	    subtree->printer = sprint_octet_string;
-	    break;
-	case TYPE_INTEGER:
-	    subtree->printer = sprint_integer;
-	    break;
-	case TYPE_NETADDR:
-	    subtree->printer = sprint_networkaddress;
-	    break;
-	case TYPE_IPADDR:
-	    subtree->printer = sprint_ipaddress;
-	    break;
-	case TYPE_COUNTER:
-	    subtree->printer = sprint_counter;
-	    break;
-	case TYPE_GAUGE:
-	    subtree->printer = sprint_gauge;
-	    break;
-	case TYPE_TIMETICKS:
-	    subtree->printer = sprint_timeticks;
-	    break;
-	case TYPE_OPAQUE:
-	    subtree->printer = sprint_opaque;
-	    break;
-	case TYPE_NULL:
-	    subtree->printer = sprint_null;
-	    break;
-	case TYPE_OTHER:
-	default:
-	    subtree->printer = sprint_unknowntype;
-	    break;
-	}
-	set_functions(subtree->child_list);
-    }
-}
-#endif
-
 void
 init_mib(char *file)
 {
@@ -539,15 +99,11 @@ init_mib(char *file)
 
     if (file != NULL)
 	Mib = read_mib(file);
-#if 0
-    set_functions(Mib);
-#endif
 }
 
 
 static struct snmp_mib_tree *
-find_rfc1066_mib(root)
-     struct snmp_mib_tree *root;
+find_rfc1066_mib(struct snmp_mib_tree *root)
 {
     oid *op = RFC1066_MIB;
     struct snmp_mib_tree *tp;
@@ -567,8 +123,7 @@ find_rfc1066_mib(root)
 }
 
 static int
-lc_cmp(s1, s2)
-     char *s1, *s2;
+lc_cmp(const char *s1, const char *s2)
 {
     char c1, c2;
 
@@ -595,11 +150,7 @@ lc_cmp(s1, s2)
 }
 
 static int
-parse_subtree(subtree, input, output, out_len)
-     struct snmp_mib_tree *subtree;
-     char *input;
-     oid *output;
-     int *out_len;		/* number of subid's */
+parse_subtree(struct snmp_mib_tree *subtree, char *input, oid *output, int *out_len)
 {
     char buf[128], *to = buf;
     u_int subid = 0;
@@ -735,98 +286,6 @@ sprint_objid(buf, objid, objidlen)
     get_symbol(objid, objidlen, subtree, buf + 1);
 }
 
-#if 0
-void
-print_variable(objid, objidlen, pvariable)
-     oid *objid;
-     int objidlen;
-     struct variable_list *pvariable;
-{
-    char buf[1024], *cp;
-    struct snmp_mib_tree *subtree = Mib;
-
-    *buf = '.';			/* this is a fully qualified name */
-    subtree = get_symbol(objid, objidlen, subtree, buf + 1);
-    cp = buf;
-    if ((strlen(buf) >= strlen((char *) RFC1066_MIB_text)) && !memcmp(buf, (char *) RFC1066_MIB_text,
-	    strlen((char *) RFC1066_MIB_text))) {
-	cp += sizeof(RFC1066_MIB_text);
-    }
-    printf("Name: %s -> ", cp);
-    *buf = '\0';
-    if (subtree->printer)
-	(*subtree->printer) (buf, pvariable, subtree->enums, 0);
-    else {
-	sprint_by_type(buf, pvariable, subtree->enums, 0);
-    }
-    printf("%s\n", buf);
-}
-
-
-void
-sprint_variable(buf, objid, objidlen, pvariable)
-     char *buf;
-     oid *objid;
-     int objidlen;
-     struct variable_list *pvariable;
-{
-    char tempbuf[512], *cp;
-    struct snmp_mib_tree *subtree = Mib;
-
-    *tempbuf = '.';		/* this is a fully qualified name */
-    subtree = get_symbol(objid, objidlen, subtree, tempbuf + 1);
-    cp = tempbuf;
-    if ((strlen(buf) >= strlen((char *) RFC1066_MIB_text)) && !memcmp(buf, (char *) RFC1066_MIB_text,
-	    strlen((char *) RFC1066_MIB_text))) {
-	cp += sizeof(RFC1066_MIB_text);
-    }
-    sprintf(buf, "Name: %s -> ", cp);
-    buf += strlen(buf);
-    if (subtree->printer)
-	(*subtree->printer) (buf, pvariable, subtree->enums, 0);
-    else {
-	sprint_by_type(buf, pvariable, subtree->enums, 0);
-    }
-    strcat(buf, "\n");
-}
-
-void
-sprint_value(buf, objid, objidlen, pvariable)
-     char *buf;
-     oid *objid;
-     int objidlen;
-     struct variable_list *pvariable;
-{
-    char tempbuf[512];
-    struct snmp_mib_tree *subtree = Mib;
-
-    subtree = get_symbol(objid, objidlen, subtree, tempbuf);
-    if (subtree->printer)
-	(*subtree->printer) (buf, pvariable, subtree->enums, 0);
-    else {
-	sprint_by_type(buf, pvariable, subtree->enums, 0);
-    }
-}
-
-void
-print_value(objid, objidlen, pvariable)
-     oid *objid;
-     int objidlen;
-     struct variable_list *pvariable;
-{
-    char tempbuf[512];
-    struct snmp_mib_tree *subtree = Mib;
-
-    subtree = get_symbol(objid, objidlen, subtree, tempbuf);
-    if (subtree->printer)
-	(*subtree->printer) (tempbuf, pvariable, subtree->enums, 0);
-    else {
-	sprint_by_type(tempbuf, pvariable, subtree->enums, 0);
-    }
-    printf("%s\n", tempbuf);
-}
-#endif
-
 static struct snmp_mib_tree *
 get_symbol(objid, objidlen, subtree, buf)
      oid *objid;
@@ -866,74 +325,6 @@ get_symbol(objid, objidlen, subtree, buf)
 	return subtree;
 }
 
-
-
-
-#if 0
-void
-print_variable_list(variable_list * V)
-{
-    print_variable(V->name, V->name_length, V);
-}
-
-void
-print_variable_list_value(variable_list * pvariable)
-{
-    char buf[512];
-    struct snmp_mib_tree *subtree = Mib;
-
-    *buf = '.';			/* this is a fully qualified name */
-    subtree = get_symbol(pvariable->name, pvariable->name_length, subtree, buf + 1);
-    *buf = '\0';
-
-    if (subtree->printer)
-	(*subtree->printer) (buf, pvariable, subtree->enums, 1);
-    else {
-	sprint_by_type(buf, pvariable, subtree->enums, 1);
-    }
-    printf("%s", buf);
-}
-#endif
-
-#if UNUSED_CODE
-void
-print_type(variable_list * var)
-{
-    switch (var->type) {
-    case SMI_INTEGER:
-	printf("Integer");
-	break;
-    case SMI_STRING:
-	printf("Octet String");
-	break;
-    case SMI_OPAQUE:
-	printf("Opaque");
-	break;
-    case SMI_OBJID:
-	printf("Object Identifier");
-	break;
-    case SMI_TIMETICKS:
-	printf("Timeticks");
-	break;
-    case SMI_GAUGE32:
-	printf("Gauge");
-	break;
-    case SMI_COUNTER32:
-	printf("Counter");
-	break;
-    case SMI_IPADDRESS:
-	printf("IP Address");
-	break;
-    case SMI_NULLOBJ:
-	printf("NULL");
-	break;
-    default:
-	printf("Unknown type %d\n", var->type);
-	break;
-    }
-}
-#endif
-
 void
 print_oid_nums(oid * O, int len)
 {
diff --git a/snmplib/parse.c b/snmplib/parse.c
index 311666ac27..03f2b44b7b 100644
--- a/snmplib/parse.c
+++ b/snmplib/parse.c
@@ -154,7 +154,7 @@ int Line = 1;
 #define QUOTE       37
 
 struct tok {
-    char *name;			/* token name */
+    const char *name;			/* token name */
     int len;			/* length not counting nul */
     int token;			/* value */
     int hash;			/* hash of name */
@@ -217,10 +217,10 @@ struct tok tokens[] =
 static struct tok *buckets[HASHSIZE];
 
 static void
-hash_init()
+hash_init(void)
 {
     register struct tok *tp;
-    register char *cp;
+    register const char *cp;
     register int h;
     register int b;
 
@@ -241,8 +241,7 @@ hash_init()
 struct node *nbuckets[NHASHSIZE];
 
 static void
-init_node_hash(nodes)
-     struct node *nodes;
+init_node_hash(struct node *nodes)
 {
     register struct node *np, *nextp;
     register char *cp;
@@ -262,10 +261,7 @@ init_node_hash(nodes)
 
 
 static void
-print_error(string, token, type)
-     char *string;
-     char *token;
-     int type;
+print_error(const char *string, const char *token, int type)
 {
     assert(string != NULL);
     if (type == ENDOFFILE)
@@ -302,7 +298,7 @@ print_subtree(tree, count)
 int translation_table[40];
 
 static void
-build_translation_table()
+build_translation_table(void)
 {
     int count;
 
@@ -350,9 +346,7 @@ build_translation_table()
  * tree and out of the nodes list.
  */
 static void
-do_subtree(root, nodes)
-     struct snmp_mib_tree *root;
-     struct node **nodes;
+do_subtree(struct snmp_mib_tree *root, struct node **nodes)
 {
     register struct snmp_mib_tree *tp;
     struct snmp_mib_tree *peer = NULL;
@@ -435,8 +429,7 @@ do_subtree(root, nodes)
 static
 #endif
 struct snmp_mib_tree *
-build_tree(nodes)
-     struct node *nodes;
+build_tree(struct node *nodes)
 {
     struct node *np;
     struct snmp_mib_tree *tp;
@@ -487,9 +480,7 @@ build_tree(nodes)
 static char last = ' ';
 
 static int
-get_token(fp, token)
-     register FILE *fp;
-     register char *token;
+get_token(register FILE *fp, register char *token)
 {
     register int ch;
     register char *cp = token;
@@ -568,12 +559,11 @@ get_token(fp, token)
  * { iso org(3) dod(6) 1 }
  * and creates several nodes, one for each parent-child pair.
  * Returns NULL on error.
+ *   register struct subid *SubOid;	an array of subids
+ *   int length;			the length of the array
  */
 static int
-getoid(fp, SubOid, length)
-     register FILE *fp;
-     register struct subid *SubOid;	/* an array of subids */
-     int length;		/* the length of the array */
+getoid(register FILE *fp, register struct subid *SubOid, int length)
 {
     register int count;
     int type;
@@ -627,8 +617,7 @@ getoid(fp, SubOid, length)
 }
 
 static void
-free_node(np)
-     struct node *np;
+free_node(struct node *np)
 {
     struct enum_list *ep, *tep;
 
@@ -648,9 +637,7 @@ free_node(np)
  * Returns 0 on error.
  */
 static struct node *
-parse_objectid(fp, name)
-     FILE *fp;
-     char *name;
+parse_objectid(FILE *fp, char *name)
 {
     int type;
     char token[64];
@@ -737,8 +724,7 @@ parse_objectid(fp, name)
  * Returns NULL on error.
  */
 static int
-parse_asntype(fp)
-     FILE *fp;
+parse_asntype(FILE *fp)
 {
     int type;
     char token[64];
@@ -761,9 +747,7 @@ parse_asntype(fp)
  * Returns 0 on error.
  */
 static struct node *
-parse_objecttype(fp, name)
-     register FILE *fp;
-     char *name;
+parse_objecttype(register FILE *fp, char *name)
 {
     register int type;
     char token[64];
@@ -998,8 +982,7 @@ parse_objecttype(fp, name)
 static
 #endif
 struct node *
-parse(fp)
-     FILE *fp;
+parse(FILE *fp)
 {
     char token[64];
     char name[64];
diff --git a/snmplib/snmp_api.c b/snmplib/snmp_api.c
index 1019868b77..d5ad882d5b 100644
--- a/snmplib/snmp_api.c
+++ b/snmplib/snmp_api.c
@@ -79,310 +79,19 @@
 #include "snmp-internal.h"
 #include "snmp_impl.h"
 #include "snmp_session.h"
-#if 0
-#include "mibii.h"
-#include "snmp_dump.h"
-#endif
 #include "snmp_error.h"
 #include "snmp_vars.h"
 #include "snmp_pdu.h"
 #include "snmp_msg.h"
 
 #include "snmp_api.h"
-#if 0
-#include "snmp_client.h"
-#endif
 #include "snmp_api_error.h"
 #include "snmp_api_util.h"
 
 #include "util.h"
 
-extern int snmp_errno;
-
-
-/*#define DEBUG_API 1 */
-
-/*
- * RFC 1906: Transport Mappings for SNMPv2
- */
-
-
-oid default_enterprise[] =
-{1, 3, 6, 1, 4, 1, 3, 1, 1};	/* enterprises.cmu.systems.cmuSNMP */
-
-#define DEFAULT_COMMUNITY   "public"
-#define DEFAULT_RETRIES	    4
-#define DEFAULT_TIMEOUT	    1000000L
-#define DEFAULT_REMPORT	    SNMP_PORT
-#define DEFAULT_ENTERPRISE  default_enterprise
-#define DEFAULT_TIME	    0
-
-extern int snmp_errno;
-
-
-struct session_list *Sessions = NULL;
-
-#if 0
-/*
- * Get initial request ID for all transactions.
- */
-static int Reqid = 0;
-
-static void
-init_snmp(void)
-{
-    struct timeval tv;
-
-    gettimeofday(&tv, (struct timezone *) 0);
-    squid_srandom(tv.tv_sec ^ tv.tv_usec);
-    Reqid = squid_random();
-}
-
-
-/*
- * Free each element in the input request list.
- */
-static void
-free_request_list(rp)
-     struct request_list *rp;
-{
-    struct request_list *orp;
-
-    while (rp) {
-	orp = rp;
-	rp = rp->next_request;
-	if (orp->pdu != NULL)
-	    snmp_free_pdu(orp->pdu);
-	xfree((char *) orp);
-    }
-}
-
-#endif
-
 /**********************************************************************/
 
-/*
- * Sets up the session with the snmp_session information provided
- * by the user.  Then opens and binds the necessary UDP port.
- * A handle to the created session is returned (this is different than
- * the pointer passed to snmp_open()).  On any error, NULL is returned
- * and snmp_errno is set to the appropriate error code.
- */
-#if 0
-struct snmp_session *
-snmp_open(struct snmp_session *session)
-{
-    struct session_list *slp;
-    struct snmp_internal_session *isp;
-    u_char *cp;
-    int sd;
-    u_int addr;
-    struct sockaddr_in me;
-    struct hostent *hp;
-    struct servent *servp;
-
-    if (Reqid == 0)
-	init_snmp();
-
-    /* Copy session structure and link into list */
-    slp = (struct session_list *) xmalloc(sizeof(struct session_list));
-    if (slp == NULL) {
-	snmp_set_api_error(SNMPERR_OS_ERR);
-	return (NULL);
-    }
-    /* Internal session */
-    isp = (struct snmp_internal_session *) xmalloc(sizeof(struct snmp_internal_session));
-    if (isp == NULL) {
-	xfree(slp);
-	snmp_set_api_error(SNMPERR_OS_ERR);
-	return (NULL);
-    }
-    slp->internal = isp;
-    memset((char *) isp, '\0', sizeof(struct snmp_internal_session));
-    slp->internal->sd = -1;	/* mark it not set */
-
-    /* The actual session */
-    slp->session = (struct snmp_session *) xmalloc(sizeof(struct snmp_session));
-    if (slp->session == NULL) {
-	xfree(isp);
-	xfree(slp);
-	snmp_set_api_error(SNMPERR_OS_ERR);
-	return (NULL);
-    }
-    xmemcpy((char *) slp->session, (char *) session, sizeof(struct snmp_session));
-    session = slp->session;
-    /* now link it in. */
-    slp->next = Sessions;
-    Sessions = slp;
-
-    /*
-     * session now points to the new structure that still contains pointers to
-     * data allocated elsewhere.  Some of this data is copied to space malloc'd
-     * here, and the pointer replaced with the new one.
-     */
-
-    if (session->peername != NULL) {
-	cp = (u_char *) xmalloc((unsigned) strlen(session->peername) + 1);
-	if (cp == NULL) {
-	    xfree(slp->session);
-	    xfree(isp);
-	    xfree(slp);
-	    snmp_set_api_error(SNMPERR_OS_ERR);
-	    return (NULL);
-	}
-	strcpy((char *) cp, session->peername);
-	session->peername = (char *) cp;
-    }
-    /* Fill in defaults if necessary */
-    if (session->community_len != SNMP_DEFAULT_COMMUNITY_LEN) {
-	cp = (u_char *) xmalloc((unsigned) session->community_len);
-	if (cp)
-	    xmemcpy((char *) cp, (char *) session->community, session->community_len);
-    } else {
-	session->community_len = strlen(DEFAULT_COMMUNITY);
-	cp = (u_char *) xmalloc((unsigned) session->community_len);
-	if (cp)
-	    xmemcpy((char *) cp, (char *) DEFAULT_COMMUNITY,
-		session->community_len);
-    }
-    if (cp == NULL) {
-	xfree(session->peername);
-	xfree(slp->session);
-	xfree(isp);
-	xfree(slp);
-	snmp_set_api_error(SNMPERR_OS_ERR);
-	return (NULL);
-    }
-    session->community = cp;	/* replace pointer with pointer to new data */
-
-    if (session->retries == SNMP_DEFAULT_RETRIES)
-	session->retries = DEFAULT_RETRIES;
-    if (session->timeout == SNMP_DEFAULT_TIMEOUT)
-	session->timeout = DEFAULT_TIMEOUT;
-    isp->requests = NULL;
-
-    /* Set up connections */
-    sd = socket(AF_INET, SOCK_DGRAM, 0);
-    if (sd < 0) {
-	perror("socket");
-	snmp_set_api_error(SNMPERR_OS_ERR);
-	if (!snmp_close(session)) {
-	    snmplib_debug(5, "Couldn't abort session: %s. Exiting\n",
-		api_errstring(snmp_errno));
-	    exit(1);
-	}
-	return (NULL);
-    }
-#ifdef SO_BSDCOMPAT
-    /* Patch for Linux.  Without this, UDP packets that fail get an ICMP
-     * response.  Linux turns the failed ICMP response into an error message
-     * and return value, unlike all other OS's.
-     */
-    {
-	int one = 1;
-	setsockopt(sd, SOL_SOCKET, SO_BSDCOMPAT, &one, sizeof(one));
-    }
-#endif /* SO_BSDCOMPAT */
-
-    isp->sd = sd;
-    if (session->peername != SNMP_DEFAULT_PEERNAME) {
-	if ((addr = inet_addr(session->peername)) != -1) {
-	    xmemcpy((char *) &isp->addr.sin_addr, (char *) &addr,
-		sizeof(isp->addr.sin_addr));
-	} else {
-	    hp = gethostbyname(session->peername);
-	    if (hp == NULL) {
-		snmplib_debug(3, "unknown host: %s\n", session->peername);
-		snmp_errno = SNMPERR_BAD_ADDRESS;
-		if (!snmp_close(session)) {
-		    snmplib_debug(3, "Couldn't abort session: %s. Exiting\n",
-			api_errstring(snmp_errno));
-		    exit(2);
-		}
-		return (NULL);
-	    } else {
-		xmemcpy((char *) &isp->addr.sin_addr, (char *) hp->h_addr,
-		    hp->h_length);
-	    }
-	}
-
-	isp->addr.sin_family = AF_INET;
-	if (session->remote_port == SNMP_DEFAULT_REMPORT) {
-	    servp = getservbyname("snmp", "udp");
-	    if (servp != NULL) {
-		isp->addr.sin_port = servp->s_port;
-	    } else {
-		isp->addr.sin_port = htons(SNMP_PORT);
-	    }
-	} else {
-	    isp->addr.sin_port = htons(session->remote_port);
-	}
-    } else {
-	isp->addr.sin_addr.s_addr = SNMP_DEFAULT_ADDRESS;
-    }
-
-    memset(&me, '\0', sizeof(me));
-    me.sin_family = AF_INET;
-    me.sin_addr.s_addr = INADDR_ANY;
-    me.sin_port = htons(session->local_port);
-    if (bind(sd, (struct sockaddr *) &me, sizeof(me)) != 0) {
-	perror("bind");
-	snmp_errno = SNMPERR_BAD_LOCPORT;
-	if (!snmp_close(session)) {
-	    snmplib_debug(3, "Couldn't abort session: %s. Exiting\n",
-		api_errstring(snmp_errno));
-	    exit(3);
-	}
-	return (NULL);
-    }
-    return (session);
-}
-
-
-/*
- * Close the input session.  Frees all data allocated for the session,
- * dequeues any pending requests, and closes any sockets allocated for
- * the session.  Returns 0 on error, 1 otherwise.
- */
-int
-snmp_close(struct snmp_session *session)
-{
-    struct session_list *slp = NULL, *oslp = NULL;
-
-    if (Sessions->session == session) {		/* If first entry */
-	slp = Sessions;
-	Sessions = slp->next;
-    } else {
-	for (slp = Sessions; slp; slp = slp->next) {
-	    if (slp->session == session) {
-		if (oslp)	/* if we found entry that points here */
-		    oslp->next = slp->next;	/* link around this entry */
-		break;
-	    }
-	    oslp = slp;
-	}
-    }
-
-    /* If we found the session, free all data associated with it */
-    if (slp) {
-	if (slp->session->community != NULL)
-	    xfree((char *) slp->session->community);
-	if (slp->session->peername != NULL)
-	    xfree((char *) slp->session->peername);
-	xfree((char *) slp->session);
-	if (slp->internal->sd != -1)
-	    close(slp->internal->sd);
-	free_request_list(slp->internal->requests);
-	xfree((char *) slp->internal);
-	xfree((char *) slp);
-    } else {
-	snmp_errno = SNMPERR_BAD_SESSION;
-	return (0);
-    }
-    return (1);
-}
-#endif
-
 /*
  * Takes a session and a pdu and serializes the ASN PDU into the area
  * pointed to by packet.  out_length is the size of the data area available.
@@ -440,454 +149,3 @@ snmp_parse(struct snmp_session * session,
     strcpy((char *) bufp, (char *) Community);
     return (bufp);
 }
-
-/*
- * Sends the input pdu on the session after calling snmp_build to create
- * a serialized packet.  If necessary, set some of the pdu data from the
- * session defaults.  Add a request corresponding to this pdu to the list
- * of outstanding requests on this session, then send the pdu.
- * Returns the request id of the generated packet if applicable, otherwise 1.
- * On any error, 0 is returned.
- * The pdu is freed by snmp_send() unless a failure occured.
- */
-#if 0
-int
-snmp_send(struct snmp_session *session, struct snmp_pdu *pdu)
-{
-    struct session_list *slp;
-    struct snmp_internal_session *isp = NULL;
-    u_char packet[PACKET_LENGTH];
-    int length = PACKET_LENGTH;
-    struct request_list *rp;
-    struct timeval tv;
-
-    if (Reqid == 0)
-	init_snmp();
-
-    for (slp = Sessions; slp; slp = slp->next) {
-	if (slp->session == session) {
-	    isp = slp->internal;
-	    break;
-	}
-    }
-    if (isp == NULL) {
-	snmp_errno = SNMPERR_BAD_SESSION;
-	return 0;
-    }
-    if (pdu->command == SNMP_PDU_GET ||
-	pdu->command == SNMP_PDU_GETNEXT ||
-	pdu->command == SNMP_PDU_RESPONSE ||
-	pdu->command == SNMP_PDU_SET) {
-
-	if (pdu->reqid == SNMP_DEFAULT_REQID)
-	    pdu->reqid = ++Reqid;
-	if (pdu->errstat == SNMP_DEFAULT_ERRSTAT)
-	    pdu->errstat = 0;
-	if (pdu->errindex == SNMP_DEFAULT_ERRINDEX)
-	    pdu->errindex = 0;
-
-    } else if (pdu->command == SNMP_PDU_INFORM ||
-	    pdu->command == SNMP_PDU_GETBULK ||
-	pdu->command == SNMP_PDU_V2TRAP) {
-
-	if (session->Version != SNMP_VERSION_2) {
-	    snmplib_debug(3, "Cant send SNMPv2 PDU's in SNMP message.\n");
-	    snmp_errno = SNMPERR_GENERR;	/* Fix this XXXXX */
-	    return 0;
-	}
-	if (pdu->reqid == SNMP_DEFAULT_REQID)
-	    pdu->reqid = ++Reqid;
-	if (pdu->errstat == SNMP_DEFAULT_ERRSTAT)
-	    pdu->errstat = 0;
-	if (pdu->errindex == SNMP_DEFAULT_ERRINDEX)
-	    pdu->errindex = 0;
-
-    } else {
-	/* fill in trap defaults */
-	pdu->reqid = 1;		/* give a bogus non-error reqid for traps */
-	if (pdu->enterprise_length == SNMP_DEFAULT_ENTERPRISE_LENGTH) {
-	    pdu->enterprise = (oid *) xmalloc(sizeof(DEFAULT_ENTERPRISE));
-	    xmemcpy((char *) pdu->enterprise, (char *) DEFAULT_ENTERPRISE,
-		sizeof(DEFAULT_ENTERPRISE));
-	    pdu->enterprise_length = sizeof(DEFAULT_ENTERPRISE) / sizeof(oid);
-	}
-	if (pdu->time == SNMP_DEFAULT_TIME)
-	    pdu->time = DEFAULT_TIME;
-    }
-
-    if (pdu->address.sin_addr.s_addr == SNMP_DEFAULT_ADDRESS) {
-	if (isp->addr.sin_addr.s_addr != SNMP_DEFAULT_ADDRESS) {
-	    xmemcpy((char *) &pdu->address, (char *) &isp->addr,
-		sizeof(pdu->address));
-	} else {
-	    snmplib_debug(3, "No remote IP address specified\n");
-	    snmp_errno = SNMPERR_BAD_ADDRESS;
-	    return 0;
-	}
-    }
-    if (snmp_build(session, pdu, packet, &length) < 0) {
-	snmplib_debug(3, "Error building packet\n");
-	snmp_errno = SNMPERR_GENERR;
-	return 0;
-    }
-    snmp_dump(packet, length, "sending", pdu->address.sin_addr);
-
-    gettimeofday(&tv, (struct timezone *) 0);
-    if (sendto(isp->sd, (char *) packet, length, 0,
-	    (struct sockaddr *) &pdu->address, sizeof(pdu->address)) < 0) {
-	perror("sendto");
-	snmp_errno = SNMPERR_GENERR;
-	return 0;
-    }
-    snmplib_debug(6, "LIBSNMP:  Sent PDU %s, Reqid %d\n",
-	snmp_pdu_type(pdu), pdu->reqid);
-
-    if (pdu->command == SNMP_PDU_GET ||
-	pdu->command == SNMP_PDU_GETNEXT ||
-	pdu->command == SNMP_PDU_SET ||
-	pdu->command == SNMP_PDU_GETBULK ||
-	pdu->command == SNMP_PDU_INFORM) {
-
-	snmplib_debug(6, "LIBSNMP:  Setting up to recieve a response for reqid %d\n",
-	    pdu->reqid);
-
-	/* set up to expect a response */
-	rp = (struct request_list *) xmalloc(sizeof(struct request_list));
-	rp->next_request = isp->requests;
-	isp->requests = rp;
-
-	rp->pdu = pdu;
-	rp->request_id = pdu->reqid;
-
-	rp->retries = 1;
-	rp->timeout = session->timeout;
-	rp->time = tv;
-	tv.tv_usec += rp->timeout;
-	tv.tv_sec += tv.tv_usec / 1000000L;
-	tv.tv_usec %= 1000000L;
-	rp->expire = tv;
-    }
-    return (pdu->reqid);
-}
-
-/*
- * Checks to see if any of the fd's set in the fdset belong to
- * snmp.  Each socket with it's fd set has a packet read from it
- * and snmp_parse is called on the packet received.  The resulting pdu
- * is passed to the callback routine for that session.  If the callback
- * routine returns successfully, the pdu and it's request are deleted.
- */
-void
-snmp_read(fdset)
-     fd_set *fdset;
-{
-    struct session_list *slp;
-    struct snmp_session *sp;
-    struct snmp_internal_session *isp;
-    u_char packet[PACKET_LENGTH];
-    struct sockaddr_in from;
-    int length, fromlength;
-    struct snmp_pdu *pdu;
-    struct request_list *rp, *orp;
-    u_char *bufp;
-
-    for (slp = Sessions; slp; slp = slp->next) {
-	if (FD_ISSET(slp->internal->sd, fdset)) {
-	    sp = slp->session;
-	    isp = slp->internal;
-	    fromlength = sizeof from;
-	    length = recvfrom(isp->sd, (char *) packet,
-		PACKET_LENGTH, 0, (struct sockaddr *) &from,
-		&fromlength);
-	    if (length == -1)
-		perror("recvfrom");
-
-	    snmp_dump(packet, length, "received", from.sin_addr);
-
-	    pdu = snmp_pdu_create(0);
-	    pdu->address = from;
-	    pdu->reqid = 0;
-
-	    /* Parse the incoming packet */
-	    bufp = snmp_parse(sp, pdu, packet, length);
-	    if (bufp == NULL) {
-		snmplib_debug(3, "Mangled packet\n");
-		snmp_free_pdu(pdu);
-		return;
-	    }
-	    if (sp->community)
-		xfree(sp->community);
-	    sp->community = bufp;
-	    sp->community_len = strlen((char *) bufp);
-
-	    snmplib_debug(6, "LIBSNMP:  Read PDU %s, ReqId %d\n", snmp_pdu_type(pdu), pdu->reqid);
-
-	    if (pdu->command == SNMP_PDU_RESPONSE) {
-		for (rp = isp->requests; rp; rp = rp->next_request) {
-		    if (rp->request_id == pdu->reqid) {
-			snmplib_debug(6, "LIBSNMP:  ReqId %d:  Calling callback\n", pdu->reqid);
-			if (sp->callback(RECEIVED_MESSAGE, sp,
-				pdu->reqid, pdu,
-				sp->callback_magic) == 1) {
-			    /* successful, so delete request */
-			    snmplib_debug(6, "LIBSNMP:  ReqId %d:  Success.  Removing ReqId.\n", pdu->reqid);
-			    orp = rp;
-			    if (isp->requests == orp) {
-				/* first in list */
-				isp->requests = orp->next_request;
-			    } else {
-				for (rp = isp->requests; rp; rp = rp->next_request) {
-				    if (rp->next_request == orp) {
-					/* link around it */
-					rp->next_request = orp->next_request;
-					break;
-				    }
-				}
-			    }
-			    snmp_free_pdu(orp->pdu);
-			    xfree((char *) orp);
-			    /* there shouldn't be another req with the same reqid */
-			    break;
-			}
-		    }
-		}
-	    } else if (pdu->command == SNMP_PDU_GET ||
-		    pdu->command == SNMP_PDU_GETNEXT ||
-		    pdu->command == TRP_REQ_MSG ||
-		    pdu->command == SNMP_PDU_SET ||
-		    pdu->command == SNMP_PDU_GETBULK ||
-		    pdu->command == SNMP_PDU_INFORM ||
-		pdu->command == SNMP_PDU_V2TRAP) {
-		sp->callback(RECEIVED_MESSAGE, sp, pdu->reqid,
-		    pdu, sp->callback_magic);
-	    }
-	    snmp_free_pdu(pdu);
-	}
-    }
-}
-
-/*
- * Returns info about what snmp requires from a select statement.
- * numfds is the number of fds in the list that are significant.
- * All file descriptors opened for SNMP are OR'd into the fdset.
- * If activity occurs on any of these file descriptors, snmp_read
- * should be called with that file descriptor set
- *
- * The timeout is the latest time that SNMP can wait for a timeout.  The
- * select should be done with the minimum time between timeout and any other
- * timeouts necessary.  This should be checked upon each invocation of select.
- * If a timeout is received, snmp_timeout should be called to check if the
- * timeout was for SNMP.  (snmp_timeout is idempotent)
- *
- * Block is 1 if the select is requested to block indefinitely, rather than time out.
- * If block is input as 1, the timeout value will be treated as undefined, but it must
- * be available for setting in snmp_select_info.  On return, if block is true, the value
- * of timeout will be undefined.
- *
- * snmp_select_info returns the number of open sockets.  (i.e. The number of sessions open)
- */
-int
-snmp_select_info(numfds, fdset, timeout, block)
-     int *numfds;
-     fd_set *fdset;
-     struct timeval *timeout;
-     int *block;		/* should the select block until input arrives (i.e. no input) */
-{
-    struct session_list *slp;
-    struct snmp_internal_session *isp;
-    struct request_list *rp;
-    struct timeval now, earliest;
-    int active = 0, requests = 0;
-
-    timerclear(&earliest);
-    /*
-     * For each request outstanding, add it's socket to the fdset,
-     * and if it is the earliest timeout to expire, mark it as lowest.
-     */
-    for (slp = Sessions; slp; slp = slp->next) {
-
-	active++;
-	isp = slp->internal;
-	if ((isp->sd + 1) > *numfds)
-	    *numfds = (isp->sd + 1);
-	FD_SET(isp->sd, fdset);
-	snmplib_debug(6, "LIBSNMP:  select():  Adding port %d\n", isp->sd);
-	if (isp->requests) {
-	    /* found another session with outstanding requests */
-	    requests++;
-	    for (rp = isp->requests; rp; rp = rp->next_request) {
-		if (!timerisset(&earliest) ||
-		    timercmp(&rp->expire, &earliest, <))
-		    earliest = rp->expire;
-	    }
-	}
-    }
-    snmplib_debug(6, "LIBSNMP:  Select Info:  %d active, %d requests pending.\n",
-	active, requests);
-
-    if (requests == 0)		/* if none are active, skip arithmetic */
-	return active;
-
-    /*
-     * Now find out how much time until the earliest timeout.  This
-     * transforms earliest from an absolute time into a delta time, the
-     * time left until the select should timeout.
-     */
-    gettimeofday(&now, (struct timezone *) 0);
-    earliest.tv_sec--;		/* adjust time to make arithmetic easier */
-    earliest.tv_usec += 1000000L;
-    earliest.tv_sec -= now.tv_sec;
-    earliest.tv_usec -= now.tv_usec;
-    while (earliest.tv_usec >= 1000000L) {
-	earliest.tv_usec -= 1000000L;
-	earliest.tv_sec += 1;
-    }
-    if (earliest.tv_sec < 0) {
-	earliest.tv_sec = 0;
-	earliest.tv_usec = 0;
-    }
-    /* if it was blocking before or our delta time is less, reset timeout */
-    if (*block == 1 || timercmp(&earliest, timeout, <)) {
-	*timeout = earliest;
-	*block = 0;
-    }
-    return active;
-}
-
-/*
- * snmp_timeout should be called whenever the timeout from snmp_select_info 
- * expires, but it is idempotent, so snmp_timeout can be polled (probably a 
- * cpu expensive proposition).  snmp_timeout checks to see if any of the 
- * sessions have an outstanding request that has timed out.  If it finds one 
- * (or more), and that pdu has more retries available, a new packet is formed
- * from the pdu and is resent.  If there are no more retries available, the 
- * callback for the session is used to alert the user of the timeout.
- */
-void
-snmp_timeout(void)
-{
-    struct session_list *slp;
-    struct snmp_session *sp;
-    struct snmp_internal_session *isp;
-    struct request_list *rp, *orp, *freeme = NULL;
-    struct timeval now;
-
-    gettimeofday(&now, (struct timezone *) 0);
-
-    /*
-     * For each request outstanding, check to see if it has expired.
-     */
-    for (slp = Sessions; slp; slp = slp->next) {
-	sp = slp->session;
-	isp = slp->internal;
-	orp = NULL;
-	snmplib_debug(6, "LIBSNMP:  Checking session %s\n",
-	    (sp->peername != NULL) ? sp->peername : "<NULL>");
-	for (rp = isp->requests; rp; rp = rp->next_request) {
-	    snmplib_debug(6, "LIBSNMP:  Checking session request %d, expire at %u, Retry %d/%d\n",
-		rp->request_id, rp->expire.tv_sec, rp->retries, sp->retries);
-
-	    if (freeme != NULL) {
-		/* frees rp's after the for loop goes on to the next_request */
-		xfree((char *) freeme);
-		freeme = NULL;
-	    }
-	    if (timercmp(&rp->expire, &now, <)) {
-
-		snmplib_debug(6, "LIBSNMP:  Expired.\n");
-
-		/* this timer has expired */
-		if (rp->retries >= sp->retries) {
-		    /* No more chances, delete this entry */
-		    sp->callback(TIMED_OUT, sp, rp->pdu->reqid,
-			rp->pdu, sp->callback_magic);
-		    if (orp == NULL) {
-			isp->requests = rp->next_request;
-		    } else {
-			orp->next_request = rp->next_request;
-		    }
-		    snmp_free_pdu(rp->pdu);
-		    freeme = rp;
-		    continue;	/* don't update orp below */
-		} else {
-		    u_char packet[PACKET_LENGTH];
-		    int length = PACKET_LENGTH;
-		    struct timeval tv;
-
-		    snmplib_debug(6, "LIBSNMP:  Retransmitting.\n");
-		    /* retransmit this pdu */
-		    rp->retries++;
-		    rp->timeout <<= 1;
-		    if (snmp_build(sp, rp->pdu, packet, &length) < 0) {
-			snmplib_debug(3, "Error building packet\n");
-		    }
-		    snmp_dump(packet, length,
-			"sending", rp->pdu->address.sin_addr);
-
-		    gettimeofday(&tv, (struct timezone *) 0);
-		    if (sendto(isp->sd, (char *) packet, length, 0, (struct sockaddr *) &rp->pdu->address, sizeof(rp->pdu->address)) < 0) {
-			perror("sendto");
-		    }
-		    rp->time = tv;
-		    tv.tv_usec += rp->timeout;
-		    tv.tv_sec += tv.tv_usec / 1000000L;
-		    tv.tv_usec %= 1000000L;
-		    rp->expire = tv;
-		}
-	    }
-	    orp = rp;
-	}
-	if (freeme != NULL) {
-	    xfree((char *) freeme);
-	    freeme = NULL;
-	}
-    }
-}
-
-
-/* Print some API stats */
-void
-snmp_api_stats(void *outP)
-{
-    struct session_list *slp;
-    struct request_list *rp;
-    struct snmp_internal_session *isp;
-    FILE *out = (FILE *) outP;
-
-    int active = 0;
-    int requests = 0;
-    int count = 0;
-    int rcount = 0;
-
-    fprintf(out, "LIBSNMP: Session List Dump\n");
-    fprintf(out, "LIBSNMP: ----------------------------------------\n");
-    for (slp = Sessions; slp; slp = slp->next) {
-
-	isp = slp->internal;
-	active++;
-	count++;
-	fprintf(out, "LIBSNMP: %2d: Host %s\n", count,
-	    (slp->session->peername == NULL) ? "NULL" : slp->session->peername);
-
-	if (isp->requests) {
-	    /* found another session with outstanding requests */
-	    requests++;
-	    rcount = 0;
-	    for (rp = isp->requests; rp; rp = rp->next_request) {
-		rcount++;
-		{
-		    struct hostent *hp;
-		    hp = gethostbyaddr((char *) &(rp->pdu->address),
-			sizeof(u_int), AF_INET);
-		    fprintf(out, "LIBSNMP: %2d: ReqId %d (%s) (%s)\n",
-			rcount, rp->request_id, snmp_pdu_type(rp->pdu),
-			(hp == NULL) ? "NULL" : hp->h_name);
-		}
-	    }
-	}
-	fprintf(out, "LIBSNMP: ----------------------------------------\n");
-    }
-    fprintf(out, "LIBSNMP: Session List: %d active, %d have requests pending.\n",
-	active, requests);
-}
-#endif
diff --git a/snmplib/snmp_api_error.c b/snmplib/snmp_api_error.c
index 4d99043f47..fc4c9eade4 100644
--- a/snmplib/snmp_api_error.c
+++ b/snmplib/snmp_api_error.c
@@ -44,7 +44,7 @@
 
 int snmp_errno = 0;
 
-static char *api_errors[17] =
+static const char *api_errors[17] =
 {
     "Unknown Error",
     "Generic Error",
@@ -75,7 +75,7 @@ snmp_set_api_error(int x)
     snmp_errno = x;
 }
 
-char *
+const char *
 snmp_api_error(int err)
 {
     int foo = (err * -1);
@@ -92,7 +92,7 @@ snmp_api_errno(void)
     return (snmp_errno);
 }
 
-char *
+const char *
 api_errstring(int snmp_errnumber)
 {
     return (snmp_api_error(snmp_errnumber));
diff --git a/snmplib/snmp_error.c b/snmplib/snmp_error.c
index 68ab35a36e..470fa432f9 100644
--- a/snmplib/snmp_error.c
+++ b/snmplib/snmp_error.c
@@ -33,7 +33,7 @@
 #include "snmp_error.h"
 
 
-static char *error_string[19] =
+static const char *error_string[19] =
 {
     "No Error",
     "Response message would have been too large.",
@@ -59,7 +59,7 @@ static char *error_string[19] =
 
 };
 
-char *
+const char *
 snmp_errstring(int errstat)
 {
     if ((errstat <= (SNMP_ERR_INCONSISTENTNAME)) &&
diff --git a/snmplib/snmp_pdu.c b/snmplib/snmp_pdu.c
index f2843fb0fa..3037bc4bd6 100644
--- a/snmplib/snmp_pdu.c
+++ b/snmplib/snmp_pdu.c
@@ -184,7 +184,7 @@ 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
@@ -212,12 +212,12 @@ 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) {
+    if (pdu->errindex == i) {
 	var = var->next_variable;
-	index++;
+	i++;
     }
     if (var != NULL) {
 
@@ -237,7 +237,7 @@ snmp_fix_pdu(struct snmp_pdu *pdu, int command)
 	while (var->next_variable) {
 
 	    /* Skip the item that was bad */
-	    if (++index == pdu->errindex) {
+	    if (++i == pdu->errindex) {
 		var = var->next_variable;
 		continue;
 	    }
@@ -255,7 +255,7 @@ snmp_fix_pdu(struct snmp_pdu *pdu, int command)
 	newvar->next_variable = NULL;
     }
     /* If we didn't copy anything, free the new pdu. */
-    if (index < pdu->errindex || copied == 0) {
+    if (i < pdu->errindex || copied == 0) {
 	snmp_free_pdu(newpdu);
 	snmp_set_api_error(SNMPERR_UNABLE_TO_FIX);
 	return (NULL);
@@ -628,7 +628,7 @@ snmp_pdu_decode(u_char * Packet,	/* data */
 }
 
 
-char *
+const char *
 snmp_pdu_type(struct snmp_pdu *PDU)
 {
     switch (PDU->command) {
diff --git a/snmplib/snmplib_debug.c b/snmplib/snmplib_debug.c
index 2228a6ea19..e0808a8329 100644
--- a/snmplib/snmplib_debug.c
+++ b/snmplib/snmplib_debug.c
@@ -25,7 +25,7 @@ void (*snmplib_debug_hook) (va_alist) = NULL;
 
 extern void
 #if STDC_HEADERS
-snmplib_debug(int lvl, char *fmt,...)
+snmplib_debug(int lvl, const char *fmt,...)
 {
     char buf[BUFSIZ];
     va_list args;