Skip to content

Commit bf2304b

Browse files
authored
Merge pull request #2754 from gpotter2/fix-doc
Fix doc for sphinx 3.2.0
2 parents c731e1f + cebd2c0 commit bf2304b

1 file changed

Lines changed: 14 additions & 18 deletions

File tree

scapy/sendrecv.py

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,24 +1047,20 @@ def sniff(*args, **kwargs):
10471047
def bridge_and_sniff(if1, if2, xfrm12=None, xfrm21=None, prn=None, L2socket=None, # noqa: E501
10481048
*args, **kargs):
10491049
"""Forward traffic between interfaces if1 and if2, sniff and return
1050-
the exchanged packets.
1051-
1052-
Arguments:
1053-
1054-
if1, if2: the interfaces to use (interface names or opened sockets).
1055-
1056-
xfrm12: a function to call when forwarding a packet from if1 to
1057-
if2. If it returns True, the packet is forwarded as it. If it
1058-
returns False or None, the packet is discarded. If it returns a
1059-
packet, this packet is forwarded instead of the original packet
1060-
one.
1061-
1062-
xfrm21: same as xfrm12 for packets forwarded from if2 to if1.
1063-
1064-
The other arguments are the same than for the function sniff(),
1065-
except for offline, opened_socket and iface that are ignored.
1066-
See help(sniff) for more.
1067-
1050+
the exchanged packets.
1051+
1052+
:param if1: the interfaces to use (interface names or opened sockets).
1053+
:param if2:
1054+
:param xfrm12: a function to call when forwarding a packet from if1 to
1055+
if2. If it returns True, the packet is forwarded as it. If it
1056+
returns False or None, the packet is discarded. If it returns a
1057+
packet, this packet is forwarded instead of the original packet
1058+
one.
1059+
:param xfrm21: same as xfrm12 for packets forwarded from if2 to if1.
1060+
1061+
The other arguments are the same than for the function sniff(),
1062+
except for offline, opened_socket and iface that are ignored.
1063+
See help(sniff) for more.
10681064
"""
10691065
for arg in ['opened_socket', 'offline', 'iface']:
10701066
if arg in kargs:

0 commit comments

Comments
 (0)