[jboss-cvs] JBossAS SVN: r109630 - branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/trapd.

[jboss-cvs-commits at lists.jboss.org]

Author: thauser at redhat.com
Date: 2010-12-01 12:47:13 -0500 (Wed, 01 Dec 2010)
New Revision: 109630

Modified:
   branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java
Log:
correct the trap PDU types. 

Modified: branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java
===================================================================
--- branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java	2010-12-01 17:41:24 UTC (rev 109629)
+++ branches/snmp4j-integration-1.11.1/varia/src/main/java/org/jboss/jmx/adaptor/snmp/trapd/TrapdService.java	2010-12-01 17:47:13 UTC (rev 109630)
@@ -213,22 +213,50 @@
 			
 			if (pdu instanceof PDUv1){
 				processPDUv1((PDUv1)pdu);
-			} else if (pdu instanceof ScopedPDU) {
+			}
+			else if (pdu instanceof ScopedPDU) {
 				processScopedPDU((ScopedPDU)pdu);
-			} else {
+			} 
+			else if (pdu instanceof PDU){
+				processPDUv2c(pdu);
+			}
+			else {
 				log.warn("Unknown PDU type: " + PDU.getTypeString(pdu.getType()));
 			}
 			
 		}
 	}
+	
+	private void processPDUv2c(PDU pdu){
+	      StringBuffer sbuf = new StringBuffer();
+	      //sbuf.append("\n***************NEW SNMP4J ADAPTOR******************");
+	      sbuf.append("\nV2 Trap from agent ").append(this.bindAddress.toString());
+	      sbuf.append(" on port ").append(this.port);
+	      sbuf.append("\n");
+		
+	      Vector bindings = pdu.getVariableBindings();
+	      Iterator it = bindings.iterator();
+	      int counter = 0;
+	      while (it.hasNext())
+	      {
+	         VariableBinding vb = (VariableBinding)it.next();
+	         if (vb != null) {
+		         sbuf.append("Varbind[").append(counter++).append("] := ");
+//		         sbuf.append(vb.toString());
+		         sbuf.append(vb.getOid().toString()).append(" --> ");
+		         sbuf.append(vb.getVariable().toString()).append("\n");
+	         }
+	      }
+	      sbuf.append("\nLength............. ").append(counter);
+	      log.debug(sbuf.toString());
+	}
 
 	private void processScopedPDU(ScopedPDU pdu) {
 		//****
 	      StringBuffer sbuf = new StringBuffer();
 	      //sbuf.append("\n***************NEW SNMP4J ADAPTOR******************");
-	      sbuf.append("\nV2/V3 Trap from agent ").append(this.bindAddress.toString());
+	      sbuf.append("\nV3 Trap from agent ").append(this.bindAddress.toString());
 	      sbuf.append(" on port ").append(this.port);
-	     
 	      //sbuf.append("\nCommunity string... ").append(community.toString());
 	      sbuf.append("\n");