Fixed template retreats

OpenNMS · Dec 14, 2017 · 583abb3 · 583abb3
1 parent d36f993
commit 583abb3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/.../org/opennms/netmgt/telemetry/listeners/flow/ipfix/proto/OptionsTemplateRecordHeader.java b/.../org/opennms/netmgt/telemetry/listeners/flow/ipfix/proto/OptionsTemplateRecordHeader.java
@@ -58,14 +58,10 @@ public OptionsTemplateRecordHeader(final ByteBuffer buffer) throws InvalidPacket
         this.scopeFieldCount = uint16(buffer);
 
         // Since Template IDs are used as Set IDs in the Sets they describe
-        if (this.templateId <= 255) {
+        if (this.templateId <= 255 && this.templateId != SetHeader.OPTIONS_TEMPLATE_SET_ID) {
             throw new InvalidPacketException("Invalid template ID: %d", this.templateId);
         }
 
-        if (this.fieldCount <= 0) {
-            throw new InvalidPacketException("Empty template");
-        }
-
         if (this.scopeFieldCount > this.fieldCount) {
             throw new InvalidPacketException("More scope fields than fields available: %d > %d", this.scopeFieldCount, this.fieldCount);
         }

diff --git a/...flow/src/main/java/org/opennms/netmgt/telemetry/listeners/flow/ipfix/proto/SetHeader.java b/...flow/src/main/java/org/opennms/netmgt/telemetry/listeners/flow/ipfix/proto/SetHeader.java
@@ -64,7 +64,7 @@ public SetHeader(final ByteBuffer buffer) throws InvalidPacketException {
 
         // The Set ID values of 0 and 1 are not used, for historical reasons [RFC3954], values from 4 to 255 are
         // reserved for future use.
-        if (this.setId < 256 && this.setId != 2 && this.setId != 3) {
+        if (this.setId < 256 && this.setId != TEMPLATE_SET_ID && this.setId != OPTIONS_TEMPLATE_SET_ID) {
             throw new InvalidPacketException("Invalid set ID: %d", this.setId);
         }
     }

diff --git a/...in/java/org/opennms/netmgt/telemetry/listeners/flow/ipfix/proto/TemplateRecordHeader.java b/...in/java/org/opennms/netmgt/telemetry/listeners/flow/ipfix/proto/TemplateRecordHeader.java
@@ -54,13 +54,9 @@ public TemplateRecordHeader(final ByteBuffer buffer) throws InvalidPacketExcepti
         this.fieldCount = uint16(buffer);
 
         // Since Template IDs are used as Set IDs in the Sets they describe
-        if (this.templateId <= 255) {
+        if (this.templateId <= 255 && this.templateId != SetHeader.TEMPLATE_SET_ID) {
             throw new InvalidPacketException("Invalid template ID: %d", this.templateId);
         }
-
-        if (this.fieldCount <= 0) {
-            throw new InvalidPacketException("Empty template");
-        }
     }
 
     @Override