svn commit: r236181 - projects/pf/head/usr.sbin/bsnmpd/modules/snmp_pf

[Gleb Smirnoff]

Author: glebius
Date: Mon May 28 13:49:52 2012
New Revision: 236181
URL: http://svn.freebsd.org/changeset/base/236181

Log:
  Catch up with struct pfi_kif change.

Modified:
  projects/pf/head/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt
  projects/pf/head/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
  projects/pf/head/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def

Modified: projects/pf/head/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt
==============================================================================
--- projects/pf/head/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt	Mon May 28 13:27:40 2012	(r236180)
+++ projects/pf/head/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt	Mon May 28 13:49:52 2012	(r236181)
@@ -585,7 +585,6 @@ PfInterfacesIfEntry ::= SEQUENCE {
     pfInterfacesIfDescr		    OCTET STRING,
     pfInterfacesIfType		    INTEGER,
     pfInterfacesIfTZero		    TimeTicks,
-    pfInterfacesIfRefsState	    Unsigned32,
     pfInterfacesIfRefsRule	    Unsigned32,
     pfInterfacesIf4BytesInPass	    Counter64,
     pfInterfacesIf4BytesInBlock	    Counter64,

Modified: projects/pf/head/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
==============================================================================
--- projects/pf/head/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c	Mon May 28 13:27:40 2012	(r236180)
+++ projects/pf/head/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c	Mon May 28 13:49:52 2012	(r236181)
@@ -586,11 +586,8 @@ pf_iftable(struct snmp_context __unused 
 			val->v.uint32 =
 			    (time(NULL) - e->pfi.pfik_tzero) * 100;
 			break;
-		case LEAF_pfInterfacesIfRefsState:
-			val->v.uint32 = e->pfi.pfik_states;
-			break;
 		case LEAF_pfInterfacesIfRefsRule:
-			val->v.uint32 = e->pfi.pfik_rules;
+			val->v.uint32 = e->pfi.pfik_rulerefs;
 			break;
 		case LEAF_pfInterfacesIf4BytesInPass:
 			val->v.counter64 =

Modified: projects/pf/head/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def
==============================================================================
--- projects/pf/head/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def	Mon May 28 13:27:40 2012	(r236180)
+++ projects/pf/head/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def	Mon May 28 13:49:52 2012	(r236181)
@@ -108,24 +108,23 @@
                     (2 pfInterfacesIfDescr OCTETSTRING GET)
                     (3 pfInterfacesIfType ENUM ( 0 group 1 instance 2 detached ) GET)
 		    (4 pfInterfacesIfTZero TIMETICKS GET)
-                    (5 pfInterfacesIfRefsState UNSIGNED32 GET)
-                    (6 pfInterfacesIfRefsRule UNSIGNED32 GET)
-                    (7 pfInterfacesIf4BytesInPass COUNTER64 GET)
-                    (8 pfInterfacesIf4BytesInBlock COUNTER64 GET)
-                    (9 pfInterfacesIf4BytesOutPass COUNTER64 GET)
-                    (10 pfInterfacesIf4BytesOutBlock COUNTER64 GET)
-                    (11 pfInterfacesIf4PktsInPass COUNTER64 GET)
-                    (12 pfInterfacesIf4PktsInBlock COUNTER64 GET)
-                    (13 pfInterfacesIf4PktsOutPass COUNTER64 GET)
-                    (14 pfInterfacesIf4PktsOutBlock COUNTER64 GET)
-                    (15 pfInterfacesIf6BytesInPass COUNTER64 GET)
-                    (16 pfInterfacesIf6BytesInBlock COUNTER64 GET)
-                    (17 pfInterfacesIf6BytesOutPass COUNTER64 GET)
-                    (18 pfInterfacesIf6BytesOutBlock COUNTER64 GET)
-                    (19 pfInterfacesIf6PktsInPass COUNTER64 GET)
-                    (20 pfInterfacesIf6PktsInBlock COUNTER64 GET)
-                    (21 pfInterfacesIf6PktsOutPass COUNTER64 GET)
-                    (22 pfInterfacesIf6PktsOutBlock COUNTER64 GET)
+                    (5 pfInterfacesIfRefsRule UNSIGNED32 GET)
+                    (6 pfInterfacesIf4BytesInPass COUNTER64 GET)
+                    (7 pfInterfacesIf4BytesInBlock COUNTER64 GET)
+                    (8 pfInterfacesIf4BytesOutPass COUNTER64 GET)
+                    (9 pfInterfacesIf4BytesOutBlock COUNTER64 GET)
+                    (10 pfInterfacesIf4PktsInPass COUNTER64 GET)
+                    (11 pfInterfacesIf4PktsInBlock COUNTER64 GET)
+                    (12 pfInterfacesIf4PktsOutPass COUNTER64 GET)
+                    (13 pfInterfacesIf4PktsOutBlock COUNTER64 GET)
+                    (14 pfInterfacesIf6BytesInPass COUNTER64 GET)
+                    (15 pfInterfacesIf6BytesInBlock COUNTER64 GET)
+                    (16 pfInterfacesIf6BytesOutPass COUNTER64 GET)
+                    (17 pfInterfacesIf6BytesOutBlock COUNTER64 GET)
+                    (18 pfInterfacesIf6PktsInPass COUNTER64 GET)
+                    (19 pfInterfacesIf6PktsInBlock COUNTER64 GET)
+                    (20 pfInterfacesIf6PktsOutPass COUNTER64 GET)
+                    (21 pfInterfacesIf6PktsOutBlock COUNTER64 GET)
                   )
                 )
               )