From bb22ba4edd7160e6ec938b640a1c3ed449e59adb Mon Sep 17 00:00:00 2001
From: Pierre LALET <pierre.lalet@cea.fr>
Date: Thu, 24 Aug 2017 15:30:02 +0200
Subject: [PATCH] BPF: code clean-up
---
scapy/arch/bpf/supersocket.py | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/scapy/arch/bpf/supersocket.py b/scapy/arch/bpf/supersocket.py
index 41865be4..e3a6b6d0 100644
--- a/scapy/arch/bpf/supersocket.py
+++ b/scapy/arch/bpf/supersocket.py
@@ -363,22 +363,19 @@ def bpf_select(fds_list, timeout=None):
for tmp_fd in fds_list:
- # Specific BPF sockets
- if isBPFSocket(tmp_fd):
- # Get buffers status
- if tmp_fd.buffered_frames():
- bpf_scks_buffered.append(tmp_fd)
- continue
+ # Specific BPF sockets: get buffers status
+ if isBPFSocket(tmp_fd) and tmp_fd.buffered_frames():
+ bpf_scks_buffered.append(tmp_fd)
+ continue
# Regular file descriptors or empty BPF buffer
select_fds.append(tmp_fd)
- if len(select_fds):
+ if select_fds:
# Call select for sockets with empty buffers
if timeout is None:
timeout = 0.05
ready_list, _, _ = select(select_fds, [], [], timeout)
return bpf_scks_buffered + ready_list
-
else:
return bpf_scks_buffered
--
GitLab