Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pcap_ex.c: fix immediate mode for linux #15

Merged
merged 1 commit into from Apr 18, 2016
Merged

pcap_ex.c: fix immediate mode for linux #15

merged 1 commit into from Apr 18, 2016

Conversation

bassosimone
Copy link
Contributor

@bassosimone bassosimone commented Apr 18, 2016

Hello!

The code that sets immediate mode should also consider that apparently on Linux BIOCIMMEDIATE is not (or could be not in certain cases) included. Currently this is not done, and a MacOS specific ioctl is invoked instead. Which should explain the "couldn't enable immediate mode error" that I reported in TheTorProject/ooni-probe#472 and possibly also #12.

The shell session below, taken from a Vagrant precise32 test box shows that BIOCIMMEDIATE is not available in /usr/include. Also, with the patched pypcap, ooni-probe's tests using pypcap work on such box, while with 1.1.4 they fail (and note that they used to work with 1.1.3.).

vagrant@precise32:/ooni$ uname -a
Linux precise32 3.2.0-23-generic-pae #36-Ubuntu SMP Tue Apr 10 22:19:09 UTC 2012 i686 i686 i386 GNU/Linux
vagrant@precise32:/ooni$ cat /etc/lsb-release 
DISTRIB_ID=Ubuntu
DISTRIB_RELEASE=12.04
DISTRIB_CODENAME=precise
DISTRIB_DESCRIPTION="Ubuntu 12.04 LTS"
vagrant@precise32:/ooni$ grep -Rn BIOCIMMEDIATE /usr/include/pcap/* /usr/include/pcap.h
vagrant@precise32:/ooni$ grep -Rn BIOCIMMEDIATE /usr/include/
vagrant@precise32:/ooni$

(I don't exactly know what immediate mode is. This diff just ensures that what was happening with 1.1.3 continues to happen on Linux. If there are better ways to deal with this in Linux, let me know.)

Thanks!

@hellais
Copy link
Member

hellais commented Apr 18, 2016

Thanks for looking into this. This behaviour does indeed seem much more robust.

I am going to proceed in merging this and will include this into a new release.

@hellais hellais merged commit f579535 into pynetwork:master Apr 18, 2016
@bassosimone bassosimone deleted the fix/linux-immediate-mode branch April 18, 2016 20:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants