Revert "[feature] net.sniff.http truncate urls option"

This commit is contained in:
Simone Margaritelli 2018-02-05 15:27:23 +01:00 committed by GitHub
commit 8d877e5294
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 45 deletions

View file

@ -10,17 +10,12 @@ import (
"github.com/google/gopacket/layers"
)
func tcpParser(
ip *layers.IPv4,
pkt gopacket.Packet,
verbose bool,
truncateURLs bool,
) {
func tcpParser(ip *layers.IPv4, pkt gopacket.Packet, verbose bool) {
tcp := pkt.Layer(layers.LayerTypeTCP).(*layers.TCP)
if sniParser(ip, pkt, tcp) {
return
} else if httpParser(ip, pkt, tcp, truncateURLs) {
} else if httpParser(ip, pkt, tcp) {
return
}
@ -93,7 +88,7 @@ func unkParser(ip *layers.IPv4, pkt gopacket.Packet, verbose bool) {
}
}
func mainParser(pkt gopacket.Packet, verbose bool, truncateURLs bool) bool {
func mainParser(pkt gopacket.Packet, verbose bool) bool {
nlayer := pkt.NetworkLayer()
if nlayer == nil {
log.Debug("Missing network layer skipping packet.")
@ -114,7 +109,7 @@ func mainParser(pkt gopacket.Packet, verbose bool, truncateURLs bool) bool {
}
if tlayer.LayerType() == layers.LayerTypeTCP {
tcpParser(ip, pkt, verbose, truncateURLs)
tcpParser(ip, pkt, verbose)
} else if tlayer.LayerType() == layers.LayerTypeUDP {
udpParser(ip, pkt, verbose)
} else {