--------------------- PatchSet 5990 Date: 2007/10/22 20:50:27 Author: rmartinez Branch: squid3-ipv6 Tag: (none) Log: Updating IPC MIB table. Support for neutral IP address (IPv4/IPv6). See rfc4001.txt for more info Members: src/mib.txt:1.3.8.5->1.3.8.6 Index: squid3/src/mib.txt =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/mib.txt,v retrieving revision 1.3.8.5 retrieving revision 1.3.8.6 diff -u -r1.3.8.5 -r1.3.8.6 --- squid3/src/mib.txt 9 Oct 2007 08:46:59 -0000 1.3.8.5 +++ squid3/src/mib.txt 22 Oct 2007 20:50:27 -0000 1.3.8.6 @@ -2,7 +2,7 @@ SQUID-MIB DEFINITIONS ::= BEGIN -- --- $Id: mib.txt,v 1.3.8.5 2007/10/09 08:46:59 rmartinez Exp $ +-- $Id: mib.txt,v 1.3.8.6 2007/10/22 20:50:27 rmartinez Exp $ -- IMPORTS @@ -13,8 +13,8 @@ DisplayString FROM SNMPv2-TC - Ipv6Address - FROM IPV6-TC; + InetAddressType, InetAddress + FROM INET-ADDRESS-MIB; nlanr OBJECT IDENTIFIER ::= { enterprises 3495 } @@ -719,12 +719,13 @@ STATUS current DESCRIPTION " An entry in cachePeerTable " - INDEX { cachePeerAddr } + INDEX { cachePeerAddressType, cachePeerAddress } ::= { cachePeerTable 1 } CachePeerEntry ::= SEQUENCE { cachePeerName DisplayString, - cachePeerAddr IpAddress, + cachePeerAddressType InetAddressType, + cachePeerAddress InetAddress, cachePeerPortHttp Integer32 (1..65535), cachePeerPortIcp Integer32 (1..65535), cachePeerType Integer32, @@ -747,13 +748,41 @@ peer cache " ::= { cachePeerEntry 1 } - cachePeerAddr OBJECT-TYPE - SYNTAX IpAddress - MAX-ACCESS read-only - STATUS current - DESCRIPTION - " The IP Address of the peer cache " - ::= { cachePeerEntry 2 } + cachePeerAddressType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The type of Internet address by which the peer + cache is reachable." + + ::= { cachePeerEntry 2 } + + cachePeerAddress OBJECT-TYPE + SYNTAX InetAddress (SIZE (1..64)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Internet address for the peer cache. The type of this + address is determined by the value of the peerAddressType + object. Note that implementations must limit themselves + to a single entry in this table per reachable peer. + The peerAddress may not be empty due to the SIZE + restriction. + + If a row is created administratively by an SNMP + operation and the address type value is dns(16), then + the agent stores the DNS name internally. A DNS name + lookup must be performed on the internally stored DNS + name whenever it is being used to contact the peer. + + If a row is created by the managed entity itself and + the address type value is dns(16), then the agent + stores the IP address internally. A DNS reverse lookup + must be performed on the internally stored IP address + whenever the value is retrieved via SNMP." + ::= { cachePeerEntry 3 } + cachePeerPortHttp OBJECT-TYPE SYNTAX Integer32 @@ -761,7 +790,7 @@ STATUS current DESCRIPTION " The port the peer listens for HTTP requests " - ::= { cachePeerEntry 3 } + ::= { cachePeerEntry 4 } cachePeerPortIcp OBJECT-TYPE SYNTAX Integer32 @@ -770,7 +799,7 @@ DESCRIPTION " The port the peer listens for ICP requests should be 0 if not configured to send ICP requests " - ::= { cachePeerEntry 4 } + ::= { cachePeerEntry 5 } cachePeerType OBJECT-TYPE SYNTAX INTEGER @@ -778,7 +807,7 @@ STATUS current DESCRIPTION " Peer Type " - ::= { cachePeerEntry 5 } + ::= { cachePeerEntry 6 } cachePeerState OBJECT-TYPE SYNTAX INTEGER @@ -786,7 +815,7 @@ STATUS current DESCRIPTION " The operational state of this peer " - ::= { cachePeerEntry 6 } + ::= { cachePeerEntry 7 } cachePeerPingsSent OBJECT-TYPE SYNTAX Counter32 @@ -794,7 +823,7 @@ STATUS current DESCRIPTION " Number of pings sent to peer " - ::= { cachePeerEntry 7 } + ::= { cachePeerEntry 8 } cachePeerPingsAcked OBJECT-TYPE SYNTAX Counter32 @@ -802,7 +831,7 @@ STATUS current DESCRIPTION " Number of pings received from peer " - ::= { cachePeerEntry 8 } + ::= { cachePeerEntry 9 } cachePeerFetches OBJECT-TYPE SYNTAX Counter32 @@ -810,7 +839,7 @@ STATUS current DESCRIPTION " Number of times this peer was selected " - ::= { cachePeerEntry 9 } + ::= { cachePeerEntry 10 } cachePeerRtt OBJECT-TYPE SYNTAX Integer32 @@ -818,7 +847,7 @@ STATUS current DESCRIPTION " Last known round-trip time to the peer (in ms) " - ::= { cachePeerEntry 10 } + ::= { cachePeerEntry 11 } cachePeerIgnored OBJECT-TYPE SYNTAX Counter32 @@ -826,7 +855,7 @@ STATUS current DESCRIPTION " How many times this peer was ignored " - ::= { cachePeerEntry 11 } + ::= { cachePeerEntry 12 } cachePeerKeepAlSent OBJECT-TYPE SYNTAX Counter32 @@ -834,7 +863,7 @@ STATUS current DESCRIPTION " Number of keepalives sent " - ::= { cachePeerEntry 12 } + ::= { cachePeerEntry 13 } cachePeerKeepAlRecv OBJECT-TYPE SYNTAX Counter32 @@ -842,7 +871,7 @@ STATUS current DESCRIPTION " Number of keepalives received " - ::= { cachePeerEntry 13 } + ::= { cachePeerEntry 14 } --- --- Table of cache's clients, with statistics. Children caches can be identified @@ -857,17 +886,19 @@ "A list of cache client entries." ::= { cacheMesh 2 } + cacheClientEntry OBJECT-TYPE SYNTAX CacheClientEntry ACCESS not-accessible STATUS mandatory DESCRIPTION "An entry in cacheClientTable " - INDEX { cacheClientAddr } + INDEX { cacheClientAddressType, cacheClientAddress } ::= { cacheClientTable 1 } CacheClientEntry ::= SEQUENCE { - cacheClientAddr IpAddress, + cacheClientAddressType InetAddressType, + cacheClientAddress InetAddress, cacheClientHttpRequests Counter32, cacheClientHttpKb Counter32, cacheClientHttpHits Counter32, @@ -878,21 +909,46 @@ cacheClientIcpHitKb Counter32 } - cacheClientAddr OBJECT-TYPE - SYNTAX IpAddress + cacheClientAddressType OBJECT-TYPE + SYNTAX InetAddressType MAX-ACCESS read-only STATUS current DESCRIPTION "The client's IP address " ::= { cacheClientEntry 1 } + cacheClientAddress OBJECT-TYPE + SYNTAX InetAddress (SIZE (1..64)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The Internet address for the client. The type of this + address is determined by the value of the peerAddressType + object. Note that implementations must limit themselves + to a single entry in this table per reachable peer. + The peerAddress may not be empty due to the SIZE + restriction. + + If a row is created administratively by an SNMP + operation and the address type value is dns(16), then + the agent stores the DNS name internally. A DNS name + lookup must be performed on the internally stored DNS + name whenever it is being used to contact the peer. + + If a row is created by the managed entity itself and + the address type value is dns(16), then the agent + stores the IP address internally. A DNS reverse lookup + must be performed on the internally stored IP address + whenever the value is retrieved via SNMP." + ::= { cacheClientEntry 2 } + cacheClientHttpRequests OBJECT-TYPE SYNTAX Counter32 MAX-ACCESS read-only STATUS current DESCRIPTION " Number of HTTP requests received from client " - ::= { cacheClientEntry 2 } + ::= { cacheClientEntry 3 } cacheClientHttpKb OBJECT-TYPE SYNTAX Counter32 @@ -900,7 +956,7 @@ STATUS current DESCRIPTION " Amount of total HTTP traffic to this client " - ::= { cacheClientEntry 3 } + ::= { cacheClientEntry 4 } cacheClientHttpHits OBJECT-TYPE SYNTAX Counter32 @@ -908,7 +964,7 @@ STATUS current DESCRIPTION " Number of hits in response to this client's HTTP requests " - ::= { cacheClientEntry 4 } + ::= { cacheClientEntry 5 } cacheClientHTTPHitKb OBJECT-TYPE SYNTAX Counter32 @@ -916,7 +972,7 @@ STATUS current DESCRIPTION " Amount of HTTP hit traffic in KB " - ::= { cacheClientEntry 5 } + ::= { cacheClientEntry 6 } cacheClientIcpRequests OBJECT-TYPE SYNTAX Counter32 @@ -924,7 +980,7 @@ STATUS current DESCRIPTION " Number of ICP requests received from client " - ::= { cacheClientEntry 6 } + ::= { cacheClientEntry 7 } cacheClientIcpKb OBJECT-TYPE SYNTAX Counter32 @@ -932,7 +988,7 @@ STATUS current DESCRIPTION " Amount of total ICP traffic to this client (child) " - ::= { cacheClientEntry 7 } + ::= { cacheClientEntry 8 } cacheClientIcpHits OBJECT-TYPE SYNTAX Counter32 @@ -940,7 +996,7 @@ STATUS current DESCRIPTION " Number of hits in response to this client's ICP requests " - ::= { cacheClientEntry 8 } + ::= { cacheClientEntry 9 } cacheClientIcpHitKb OBJECT-TYPE SYNTAX Counter32