summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2017-03-20 13:50:48 +0100
committeranonym <anonym@riseup.net>2017-03-20 13:50:48 +0100
commitf03e4f28e7be18922c526000b3c8451d5516ab9b (patch)
tree4df15d6a88d76f06612c520abd5282fe955a864c
parentc336187d6df5a9dd3ea7d9192b70b876eaec598e (diff)
parenta1aa113b149ea0b83a9bd091361fdad84ae14412 (diff)
Merge branch 'stable' into devel
-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 62d9856..b608f7d 100644
--- a/features/support/helpers/firewall_helper.rb
+++ b/features/support/helpers/firewall_helper.rb
@@ -56,11 +56,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