Skip to content

Commit 5d3c7ef

Browse files
authored
Merge pull request #2057 from gpotter2/drop_pcapy
Drop Python-libpcap integrations in favor of winpcapy.py
2 parents b201544 + 6edaa81 commit 5d3c7ef

File tree

9 files changed

+118
-296
lines changed

9 files changed

+118
-296
lines changed

.travis/pylibpcap.rb

Lines changed: 0 additions & 10 deletions
This file was deleted.

doc/scapy/installation.rst

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,12 @@ Here are the topics involved and some examples that you can use to try if your i
179179
Platform-specific instructions
180180
==============================
181181

182+
As a general rule (except on Windows), you can toggle the **libpcap** integration
183+
at any time, using::
184+
185+
from scapy.config import conf
186+
conf.use_pcap = True
187+
182188
Linux native
183189
------------
184190

@@ -213,9 +219,10 @@ All dependencies may be installed either via the platform-specific installer, or
213219
Mac OS X
214220
--------
215221

216-
On Mac OS X, Scapy does not work natively. You need to install Python bindings
217-
to use libdnet and libpcap. You can choose to install using either Homebrew or
218-
MacPorts. They both work fine, yet Homebrew is used to run unit tests with
222+
On Mac OS X, Scapy **DOES work natively** since the recent versions.
223+
However, you may want to make Scapy use libdnet and libpcap.
224+
You can choose to install using either Homebrew or MacPorts. They both
225+
work fine, yet Homebrew is used to run unit tests with
219226
`Travis CI <https://travis-ci.org>`_.
220227

221228

@@ -233,6 +240,9 @@ Install using Homebrew
233240
$ sudo brew install --with-python libdnet
234241
$ sudo brew install https://raw.githubusercontent.com/secdev/scapy/master/.travis/pylibpcap.rb
235242

243+
In Scapy::
244+
245+
conf.use_pcap = True
236246

237247
Install using MacPorts
238248
^^^^^^^^^^^^^^^^^^^^^^
@@ -249,18 +259,12 @@ Install using MacPorts
249259
OpenBSD
250260
-------
251261

252-
In a similar manner, to install Scapy on OpenBSD 5.9+, you will need to install the libpcap/libdnet bindings:
262+
In a similar manner, to install Scapy on OpenBSD 5.9+, you **may** want to install the libpcap/libdnet bindings:
253263

254264
.. code-block:: text
255265
256266
$ doas pkg_add py-libpcap py-libdnet tcpdump
257267
258-
An OpenBSD install may be lacking the ``/etc/ethertypes`` file. You may install it with
259-
260-
.. code-block:: text
261-
262-
# wget http://git.netfilter.org/ebtables/plain/ethertypes -O /etc/ethertypes
263-
264268
Then install Scapy via ``pip`` or ``pkg_add`` (bundled under ``python-scapy``)
265269
All dependencies may be installed either via the platform-specific installer, or via PyPI. See `Optional Dependencies <#optional-dependencies>`_ for more information.
266270

0 commit comments

Comments
 (0)