v0.14.1 (#301)

* Fix output-file

* Fix tunnel interface

Author: buger

Makefile

@@ -62,7 +62,7 @@ profile_test:
 
 # Used mainly for debugging, because docker container do not have access to parent machine ports
 run:
-	$(RUN) go run $(LDFLAGS) $(SOURCE) --input-dummy=0 --output-http="http://localhost:9000" --input-raw-track-response --input-raw 127.0.0.1:9000 --input-http 127.0.0.1:9000 --verbose --debug --middleware "./examples/middleware/echo.sh"
+	$(RUN) go run $(LDFLAGS) $(SOURCE) --input-dummy=0 --output-http="http://localhost:9000" --input-raw-track-response --input-raw 127.0.0.1:9000 --input-http 127.0.0.1:9000 --verbose --debug --middleware "./examples/middleware/echo.sh" --output-file requests.gor
 
 run-2:
 	sudo -E go run $(SOURCE) --input-dummy="" --output-tcp localhost:27001 --verbose --debug

plugins.go

@@ -117,7 +117,7 @@ func InitPlugins() {
 	}
 
 	for _, options := range Settings.outputFile {
-		registerPlugin(NewFileOutput, options, Settings.outputFileConfig)
+		registerPlugin(NewFileOutput, options, &Settings.outputFileConfig)
 	}
 
 	for _, options := range Settings.inputHTTP {

raw_socket_listener/listener.go

@@ -325,8 +325,16 @@ func (t *Listener) readPcap() {
 			}
 			t.mu.Unlock()
 
-			linkType := handle.LinkType()
-			source := gopacket.NewPacketSource(handle, linkType)
+			var decoder gopacket.Decoder
+
+			// Special case for tunnel interface https://github.com/google/gopacket/issues/99
+			if handle.LinkType() == 12 {
+			    decoder = layers.LayerTypeIPv4
+			} else {
+			    decoder = handle.LinkType()
+			}
+
+			source := gopacket.NewPacketSource(handle, decoder)
 			source.Lazy = true
 			source.NoCopy = true
 
@@ -343,13 +351,14 @@ func (t *Listener) readPcap() {
 					continue
 				}
 
-				if linkType == layers.LinkTypeEthernet {
+				if decoder == layers.LinkTypeEthernet {
 					// Skip ethernet layer, 14 bytes
 					data = packet.Data()[14:]
-				} else if linkType == layers.LinkTypeNull || linkType == layers.LinkTypeLoop {
+				} else if decoder == layers.LinkTypeNull || decoder == layers.LinkTypeLoop {
 					data = packet.Data()[4:]
 				} else {
-					log.Fatal("Unknown packet layer", packet)
+					log.Println("Unknown packet layer", packet)
+					break
 				}
 
 				version := uint8(data[0]) >> 4