Merge pull request #671 from andrewkroh/bugfix/pf_ring

Accept pf_ring or pfring in Packetbeat configuration
elastic · Jan 10, 2016 · ba5972c · ba5972c
2 parents 9b62f94 + e2f1e8a
commit ba5972c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -33,6 +33,7 @@ https://github.com/elastic/beats/compare/1.0.0...master[Check the HEAD diff]
 
 *Packetbeat*
 - Fix setting direction to out and use its value to decide when dropping events if ignore_outgoing is enabled {pull}557[557]
+- Allow PF_RING sniffer type to be configured using pf_ring or pfring {pull}671[671]
 
 *Topbeat*
 

diff --git a/packetbeat/sniffer/sniffer.go b/packetbeat/sniffer/sniffer.go
@@ -182,7 +182,7 @@ func (sniffer *SnifferSetup) setFromConfig(config *config.InterfacesConfig) erro
 		}
 
 		sniffer.DataSource = gopacket.PacketDataSource(sniffer.afpacketHandle)
-	case "pfring":
+	case "pfring", "pf_ring":
 		sniffer.pfringHandle, err = NewPfringHandle(
 			sniffer.config.Device,
 			sniffer.config.Snaplen,
@@ -371,7 +371,7 @@ func (sniffer *SnifferSetup) Close() error {
 		sniffer.pcapHandle.Close()
 	case "af_packet":
 		sniffer.afpacketHandle.Close()
-	case "pfring":
+	case "pfring", "pf_ring":
 		sniffer.pfringHandle.Close()
 	}
 	return nil