summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2017-03-20 13:51:01 +0100
committeranonym <anonym@riseup.net>2017-03-20 13:51:01 +0100
commit8198f251a50b2acd743c9b77c99eef5c6489898e (patch)
tree50a7619841dd9643242293d7712e365fe584e195
parentb715ce42449785d4e44010cc9711b3585ab8bcd5 (diff)
parentf03e4f28e7be18922c526000b3c8451d5516ab9b (diff)
Merge branch 'devel' into feature/stretch
-rw-r--r--features/support/helpers/firewall_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/features/support/helpers/firewall_helper.rb b/features/support/helpers/firewall_helper.rb
index 9bdb0a3..f88091d 100644
--- a/features/support/helpers/firewall_helper.rb
+++ b/features/support/helpers/firewall_helper.rb
@@ -58,11 +58,11 @@ def pcap_connections_helper(pcap_file, opts = {})
begin
packet_info[:saddr] = ip_packet.ip_saddr
packet_info[:daddr] = ip_packet.ip_daddr
- rescue NoMethodError
+ rescue NoMethodError, NameError
begin
packet_info[:saddr] = ip_packet.ipv6_saddr
packet_info[:daddr] = ip_packet.ipv6_daddr
- rescue NoMethodError
+ rescue NoMethodError, NameError
puts "We were hit by #11508. PacketFu bug? Packet info: #{ip_packet}"
packet_info[:saddr] = nil
packet_info[:daddr] = nil