Use MEM_SNMP_SNINT type for allocating SNMP reply stuff

diff --git a/src/client_db.cc b/src/client_db.cc
index 6964882345a39762372725ae30db21a8dbc9b673..e9672377d852ab07100db9e2f0df47eb7097c6c9 100644 (file)
--- a/src/client_db.cc
+++ b/src/client_db.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_db.cc,v 1.44 1999/04/15 06:15:49 wessels Exp $
+ * $Id: client_db.cc,v 1.45 1999/06/17 20:23:08 wessels Exp $
  *
  * DEBUG: section 0     Client Database
  * AUTHOR: Duane Wessels
@@ -256,18 +256,18 @@ snmp_meshCtblFn(variable_list * Var, snint * ErrP)
     case MESH_CTBL_ADDR:
        Answer->type = SMI_IPADDRESS;
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        *(Answer->val.integer) = (snint) c->addr.s_addr;
        break;
     case MESH_CTBL_HTBYTES:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = SMI_COUNTER32;
        *(Answer->val.integer) = (snint) c->Http.kbytes_out.kb;
        break;
     case MESH_CTBL_HTREQ:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = SMI_COUNTER32;
        *(Answer->val.integer) = (snint) c->Http.n_requests;
        break;
@@ -278,38 +278,38 @@ snmp_meshCtblFn(variable_list * Var, snint * ErrP)
                aggr += c->Http.result_hist[l];
        }
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = SMI_COUNTER32;
        *(Answer->val.integer) = (snint) aggr;
        break;
     case MESH_CTBL_HTHITBYTES:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = SMI_COUNTER32;
        *(Answer->val.integer) = (snint) c->Http.hit_kbytes_out.kb;
        break;
     case MESH_CTBL_ICPBYTES:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = SMI_COUNTER32;
        *(Answer->val.integer) = (snint) c->Icp.kbytes_out.kb;
        break;
     case MESH_CTBL_ICPREQ:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = SMI_COUNTER32;
        *(Answer->val.integer) = (snint) c->Icp.n_requests;
        break;
     case MESH_CTBL_ICPHITS:
        aggr = c->Icp.result_hist[LOG_UDP_HIT];
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = SMI_COUNTER32;
        *(Answer->val.integer) = (snint) aggr;
        break;
     case MESH_CTBL_ICPHITBYTES:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = SMI_COUNTER32;
        *(Answer->val.integer) = (snint) c->Icp.hit_kbytes_out.kb;
        break;

diff --git a/src/dns.cc b/src/dns.cc
index 3b074cc8597b50ba2d81b330ffc7549cada39511..afc406f7d4afe4a5ce27489104f0f3e5258e31cc 100644 (file)
--- a/src/dns.cc
+++ b/src/dns.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dns.cc,v 1.77 1999/05/25 06:53:40 wessels Exp $
+ * $Id: dns.cc,v 1.78 1999/06/17 20:23:09 wessels Exp $
  *
  * DEBUG: section 34    Dnsserver interface
  * AUTHOR: Harvest Derived
@@ -112,7 +112,7 @@ snmp_netDnsFn(variable_list * Var, snint * ErrP)
     Answer = snmp_var_new(Var->name, Var->name_length);
     *ErrP = SNMP_ERR_NOERROR;
     Answer->val_len = sizeof(snint);
-    Answer->val.integer = xmalloc(Answer->val_len);
+    Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
     Answer->type = SMI_COUNTER32;
     switch (Var->name[LEN_SQ_NET + 1]) {
     case DNS_REQ:

diff --git a/src/enums.h b/src/enums.h
index b6a10f9989e21bf4ad2abce9f17e62c4bf164fb2..e3a330fa68b0c45e6410842b597088a38b512601 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: enums.h,v 1.154 1999/05/26 20:41:19 wessels Exp $
+ * $Id: enums.h,v 1.155 1999/06/17 20:23:10 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -558,6 +558,9 @@ typedef enum {
     MEM_STORE_IO,
     MEM_IDNS_QUERY,
     MEM_EVENT,
+#if SQUID_SNMP
+    MEM_SNMP_SNINT,
+#endif
     MEM_MAX
 } mem_type;
 

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index d376cf6b7c0e38963fa0ffbc76cfe1c4c1397a9a..d883a6f22b74e1a1c7a16e2e0d7118f2bc1670bb 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -1,7 +1,7 @@
 
 
 /*
- * $Id: fqdncache.cc,v 1.129 1999/04/19 05:15:55 wessels Exp $
+ * $Id: fqdncache.cc,v 1.130 1999/06/17 20:23:11 wessels Exp $
  *
  * DEBUG: section 35    FQDN Cache
  * AUTHOR: Harvest Derived
@@ -689,7 +689,7 @@ snmp_netFqdnFn(variable_list * Var, snint * ErrP)
     Answer = snmp_var_new(Var->name, Var->name_length);
     *ErrP = SNMP_ERR_NOERROR;
     Answer->val_len = sizeof(snint);
-    Answer->val.integer = xmalloc(Answer->val_len);
+    Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
     Answer->type = SMI_COUNTER32;
 
     switch (Var->name[LEN_SQ_NET + 1]) {

diff --git a/src/ipcache.cc b/src/ipcache.cc
index 14bcf21b9cd6cf612f5801a8e57d08e626b9e825..1d7c6bf77f5b3d38e46f17a70f84e4bf07f12876 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ipcache.cc,v 1.215 1999/04/19 05:15:54 wessels Exp $
+ * $Id: ipcache.cc,v 1.216 1999/06/17 20:23:13 wessels Exp $
  *
  * DEBUG: section 14    IP Cache
  * AUTHOR: Harvest Derived
@@ -873,7 +873,7 @@ snmp_netIpFn(variable_list * Var, snint * ErrP)
     Answer = snmp_var_new(Var->name, Var->name_length);
     *ErrP = SNMP_ERR_NOERROR;
     Answer->val_len = sizeof(snint);
-    Answer->val.integer = xmalloc(Answer->val_len);
+    Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
     Answer->type = SMI_COUNTER32;
 
     switch (Var->name[LEN_SQ_NET + 1]) {

diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc
index 2c713f5f6d6c71b67e25b311f90d9a07cea12287..371d279b0a5ddaf723920ccbbfcf973c9e5d8b2e 100644 (file)
--- a/src/snmp_agent.cc
+++ b/src/snmp_agent.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: snmp_agent.cc,v 1.69 1999/06/11 22:40:34 wessels Exp $
+ * $Id: snmp_agent.cc,v 1.70 1999/06/17 20:23:14 wessels Exp $
  *
  * DEBUG: section 49     SNMP Interface
  * AUTHOR: Kostas Anagnostakis
@@ -59,19 +59,19 @@ snmp_sysFn(variable_list * Var, snint * ErrP)
     switch (Var->name[LEN_SQ_SYS]) {
     case SYSVMSIZ:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = ASN_INTEGER;
        *(Answer->val.integer) = store_mem_size >> 10;
        break;
     case SYSSTOR:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = ASN_INTEGER;
        *(Answer->val.integer) = store_swap_size;
        break;
     case SYS_UPTIME:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = SMI_TIMETICKS;
        *(Answer->val.integer) = tvSubDsec(squid_start, current_time) * 100;
        break;
@@ -115,25 +115,25 @@ snmp_confFn(variable_list * Var, snint * ErrP)
        switch (Var->name[LEN_SQ_CONF + 1]) {
        case CONF_ST_MMAXSZ:
            Answer->val_len = sizeof(snint);
-           Answer->val.integer = xmalloc(Answer->val_len);
+           Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
            Answer->type = ASN_INTEGER;
            *(Answer->val.integer) = (snint) Config.memMaxSize >> 20;
            break;
        case CONF_ST_SWMAXSZ:
            Answer->val_len = sizeof(snint);
-           Answer->val.integer = xmalloc(Answer->val_len);
+           Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
            Answer->type = ASN_INTEGER;
            *(Answer->val.integer) = (snint) Config.Swap.maxSize >> 10;
            break;
        case CONF_ST_SWHIWM:
            Answer->val_len = sizeof(snint);
-           Answer->val.integer = xmalloc(Answer->val_len);
+           Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
            Answer->type = ASN_INTEGER;
            *(Answer->val.integer) = (snint) Config.Swap.highWaterMark;
            break;
        case CONF_ST_SWLOWM:
            Answer->val_len = sizeof(snint);
-           Answer->val.integer = xmalloc(Answer->val_len);
+           Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
            Answer->type = ASN_INTEGER;
            *(Answer->val.integer) = (snint) Config.Swap.lowWaterMark;
            break;
@@ -192,72 +192,72 @@ snmp_meshPtblFn(variable_list * Var, snint * ErrP)
     case MESH_PTBL_IP:
        Answer->type = SMI_IPADDRESS;
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        *(Answer->val.integer) = (snint) (p->in_addr.sin_addr.s_addr);
        break;
     case MESH_PTBL_HTTP:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = ASN_INTEGER;
        *(Answer->val.integer) = (snint) p->http_port;
        break;
     case MESH_PTBL_ICP:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = ASN_INTEGER;
        *(Answer->val.integer) = (snint) p->icp.port;
        break;
     case MESH_PTBL_TYPE:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = ASN_INTEGER;
        *(Answer->val.integer) = (snint) p->type;
        break;
     case MESH_PTBL_STATE:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = ASN_INTEGER;
        *(Answer->val.integer) = (snint) neighborUp(p);
        break;
     case MESH_PTBL_SENT:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = SMI_COUNTER32;
        *(Answer->val.integer) = p->stats.pings_sent;
        break;
     case MESH_PTBL_PACKED:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = SMI_COUNTER32;
        *(Answer->val.integer) = p->stats.pings_acked;
        break;
     case MESH_PTBL_FETCHES:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = SMI_COUNTER32;
        *(Answer->val.integer) = p->stats.fetches;
        break;
     case MESH_PTBL_RTT:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = ASN_INTEGER;
        *(Answer->val.integer) = p->stats.rtt;
        break;
     case MESH_PTBL_IGN:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = SMI_COUNTER32;
        *(Answer->val.integer) = p->stats.ignored_replies;
        break;
     case MESH_PTBL_KEEPAL_S:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = SMI_COUNTER32;
        *(Answer->val.integer) = p->stats.n_keepalives_sent;
        break;
     case MESH_PTBL_KEEPAL_R:
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        Answer->type = SMI_COUNTER32;
        *(Answer->val.integer) = p->stats.n_keepalives_recv;
        break;
@@ -281,7 +281,7 @@ snmp_prfSysFn(variable_list * Var, snint * ErrP)
     Answer = snmp_var_new(Var->name, Var->name_length);
     *ErrP = SNMP_ERR_NOERROR;
     Answer->val_len = sizeof(snint);
-    Answer->val.integer = xmalloc(Answer->val_len);
+    Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
     Answer->type = ASN_INTEGER;
 
     switch (Var->name[LEN_SQ_PRF + 1]) {
@@ -356,7 +356,7 @@ snmp_prfProtoFn(variable_list * Var, snint * ErrP)
     case PERF_PROTOSTAT_AGGR:  /* cacheProtoAggregateStats */
        Answer->type = SMI_COUNTER32;
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
        switch (Var->name[LEN_SQ_PRF + 2]) {
        case PERF_PROTOSTAT_AGGR_HTTP_REQ:
            *(Answer->val.integer) = (snint) Counter.client_http.requests;
@@ -427,7 +427,7 @@ snmp_prfProtoFn(variable_list * Var, snint * ErrP)
            Var->name[LEN_SQ_PRF + 3], l, f);
        Answer->type = SMI_INTEGER;
        Answer->val_len = sizeof(snint);
-       Answer->val.integer = xmalloc(Answer->val_len);
+       Answer->val.integer = memAllocate(MEM_SNMP_SNINT);
 
        debug(49, 8) ("median: l= %x , f = %x\n", l, f);
        switch (Var->name[LEN_SQ_PRF + 3]) {

diff --git a/src/snmp_core.cc b/src/snmp_core.cc
index ac63c216ab1cdfbc74b5f8cbd44dab734781682a..91e3454da92a11842f693340fd1bf3c91144bce3 100644 (file)
--- a/src/snmp_core.cc
+++ b/src/snmp_core.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: snmp_core.cc,v 1.37 1999/05/04 21:58:35 wessels Exp $
+ * $Id: snmp_core.cc,v 1.38 1999/06/17 20:23:15 wessels Exp $
  *
  * DEBUG: section 49    SNMP support
  * AUTHOR: Glenn Chisholm
@@ -333,6 +333,7 @@ snmpInit(void)
        );
 
     debug(49, 9) ("snmpInit: Completed SNMP mib tree structure\n");
+    memDataInit(MEM_SNMP_SNINT, "snmp_snint", sizeof(snint), 0);
 }
 
 void