squid-2.5.STABLE2-snmp_gauges.patch

   1 Index: squid/src/mib.txt
   2 diff -c squid/src/mib.txt:1.25.4.1 squid/src/mib.txt:1.25.4.2
   3 *** squid/src/mib.txt:1.25.4.1  Wed Feb 12 11:52:44 2003
   4 --- squid/src/mib.txt   Fri May  2 03:48:42 2003
   5 ***************
   6 *** 212,218 ****
   7           ::= { cacheSysPerf 6 }
   8
   9         cacheNumObjCount OBJECT-TYPE
  10 !                 SYNTAX Counter32
  11                 MAX-ACCESS read-only
  12                   STATUS  current
  13                   DESCRIPTION
  14 --- 212,218 ----
  15           ::= { cacheSysPerf 6 }
  16
  17         cacheNumObjCount OBJECT-TYPE
  18 !                 SYNTAX Gauge32
  19                 MAX-ACCESS read-only
  20                   STATUS  current
  21                   DESCRIPTION
  22 ***************
  23 *** 228,234 ****
  24           ::= { cacheSysPerf 8 }
  25
  26           cacheCurrentUnlinkRequests OBJECT-TYPE
  27 !                 SYNTAX Counter32
  28                   MAX-ACCESS read-only
  29                   STATUS current
  30                 DESCRIPTION
  31 --- 228,234 ----
  32           ::= { cacheSysPerf 8 }
  33
  34           cacheCurrentUnlinkRequests OBJECT-TYPE
  35 !                 SYNTAX Gauge32
  36                   MAX-ACCESS read-only
  37                   STATUS current
  38                 DESCRIPTION
  39 ***************
  40 *** 366,372 ****
  41           ::= { cacheProtoAggregateStats 13 }
  42
  43         cacheCurrentSwapSize OBJECT-TYPE
  44 !                 SYNTAX Counter32
  45                   MAX-ACCESS read-only
  46                   STATUS current
  47                 DESCRIPTION
  48 --- 366,372 ----
  49           ::= { cacheProtoAggregateStats 13 }
  50
  51         cacheCurrentSwapSize OBJECT-TYPE
  52 !                 SYNTAX Gauge32
  53                   MAX-ACCESS read-only
  54                   STATUS current
  55                 DESCRIPTION
  56 ***************
  57 *** 374,380 ****
  58           ::= { cacheProtoAggregateStats 14 }
  59
  60          cacheClients OBJECT-TYPE
  61 !                 SYNTAX Counter32
  62                   MAX-ACCESS read-only
  63                   STATUS current
  64                 DESCRIPTION
  65 --- 374,380 ----
  66           ::= { cacheProtoAggregateStats 14 }
  67
  68          cacheClients OBJECT-TYPE
  69 !                 SYNTAX Gauge32
  70                   MAX-ACCESS read-only
  71                   STATUS current
  72                 DESCRIPTION
  73 Index: squid/src/snmp_agent.c
  74 diff -c squid/src/snmp_agent.c:1.83 squid/src/snmp_agent.c:1.83.2.1
  75 *** squid/src/snmp_agent.c:1.83 Wed Oct 24 00:16:17 2001
  76 --- squid/src/snmp_agent.c      Fri May  2 03:48:43 2003
  77 ***************
  78 *** 285,291 ****
  79       case PERF_SYS_CURUNLREQ:
  80         Answer = snmp_var_new_integer(Var->name, Var->name_length,
  81             (snint) statCounter.unlink.requests,
  82 !           SMI_COUNTER32);
  83         break;
  84       case PERF_SYS_CURUNUSED_FD:
  85         Answer = snmp_var_new_integer(Var->name, Var->name_length,
  86 --- 285,291 ----
  87       case PERF_SYS_CURUNLREQ:
  88         Answer = snmp_var_new_integer(Var->name, Var->name_length,
  89             (snint) statCounter.unlink.requests,
  90 !           SMI_GAUGE32);
  91         break;
  92       case PERF_SYS_CURUNUSED_FD:
  93         Answer = snmp_var_new_integer(Var->name, Var->name_length,
  94 ***************
  95 *** 300,306 ****
  96       case PERF_SYS_NUMOBJCNT:
  97         Answer = snmp_var_new_integer(Var->name, Var->name_length,
  98             (snint) memInUse(MEM_STOREENTRY),
  99 !           SMI_COUNTER32);
 100         break;
 101       default:
 102         *ErrP = SNMP_ERR_NOSUCHNAME;
 103 --- 300,306 ----
 104       case PERF_SYS_NUMOBJCNT:
 105         Answer = snmp_var_new_integer(Var->name, Var->name_length,
 106             (snint) memInUse(MEM_STOREENTRY),
 107 !           SMI_GAUGE32);
 108         break;
 109       default:
 110         *ErrP = SNMP_ERR_NOSUCHNAME;
 111 ***************
 112 *** 390,401 ****
 113         case PERF_PROTOSTAT_AGGR_CURSWAP:
 114             Answer = snmp_var_new_integer(Var->name, Var->name_length,
 115                 (snint) store_swap_size,
 116 !               SMI_COUNTER32);
 117             break;
 118         case PERF_PROTOSTAT_AGGR_CLIENTS:
 119             Answer = snmp_var_new_integer(Var->name, Var->name_length,
 120                 (snint) statCounter.client_http.clients,
 121 !               SMI_COUNTER32);
 122             break;
 123         default:
 124             *ErrP = SNMP_ERR_NOSUCHNAME;
 125 --- 390,401 ----
 126         case PERF_PROTOSTAT_AGGR_CURSWAP:
 127             Answer = snmp_var_new_integer(Var->name, Var->name_length,
 128                 (snint) store_swap_size,
 129 !               SMI_GAUGE32);
 130             break;
 131         case PERF_PROTOSTAT_AGGR_CLIENTS:
 132             Answer = snmp_var_new_integer(Var->name, Var->name_length,
 133                 (snint) statCounter.client_http.clients,
 134 !               SMI_GAUGE32);
 135             break;
 136         default:
 137             *ErrP = SNMP_ERR_NOSUCHNAME;