github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-23 06:36:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Handle more potential panics in parser functions

Browse source
This commit is contained in:
eenblam 2018-09-10 13:21:46 -07:00
commit cd210d8bd8
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/net_sniff_parsers.go
View file

@ -12,7 +12,11 @@ import (
) )
func tcpParser(ip *layers.IPv4, pkt gopacket.Packet, verbose bool) { func tcpParser(ip *layers.IPv4, pkt gopacket.Packet, verbose bool) {
tcp := pkt.Layer(layers.LayerTypeTCP).(*layers.TCP) tcp, tcpOk := pkt.Layer(layers.LayerTypeTCP).(*layers.TCP)
if !tcpOk {
log.Debug("Could not parse TCP layer, skipping packet")
return
}
if sniParser(ip, pkt, tcp) { if sniParser(ip, pkt, tcp) {
return return
@ -41,7 +45,11 @@ func tcpParser(ip *layers.IPv4, pkt gopacket.Packet, verbose bool) {
} }
func udpParser(ip *layers.IPv4, pkt gopacket.Packet, verbose bool) { func udpParser(ip *layers.IPv4, pkt gopacket.Packet, verbose bool) {
udp := pkt.Layer(layers.LayerTypeUDP).(*layers.UDP) udp, udpOk := pkt.Layer(layers.LayerTypeUDP).(*layers.UDP)
if !udpOk {
log.Debug("Could not parse UDP layer, skipping packet")
return
}
if dnsParser(ip, pkt, udp) { if dnsParser(ip, pkt, udp) {
return return
@ -122,8 +130,8 @@ func mainParser(pkt gopacket.Packet, verbose bool) bool {
return false return false
} }
ip, ok := nlayer.(*layers.IPv4) ip, ipOk := nlayer.(*layers.IPv4)
if !ok { if !ipOk {
log.Debug("Could not extract network layer, skipping packet") log.Debug("Could not extract network layer, skipping packet")
return false return false
} }