commit 91df89c7c489bee98c62eda663eecac0d884bbc3 Merge: e21fb2d 50df3ff Author: Arturo Filastò <art@fuffa.org> Date: Sat Nov 10 12:30:59 2012 +0100 Merge branch 'master' into oonib * master: (43 commits) Update example for writing scapy tests. * Make changes to test template of scapy tests Completely rewrite the txscapy. * It is now much cleaner and does not start the packet capture in a separate thread. It subclasses the twisted filedescriptor protocol and returns a deferred that will fire the callback with the packets it received and the ones it considers answers to the request. Do a very big cleanup and refactor of all the code in the repo. Do a very big cleanup and refactor of all the code in the repo. Add txscapy to the commit This should have been in the previous commit and I should not have tagged the release I must run git clean -r;./before_i_commit.sh; before pushing to master. Disregard the v0.0.2-alpha tag Implement logging to PCAP file support Finish refactor of the core of OONI. * Everything is passing * XXX there is a bug in blocking tests not making the reactor stop Completely refactor the logic for running tests * We no longer rely on calling trial * The code is now *much* more clean and readable * The purpose of this is to make room for the threadpool to capture packets Further progress on packet capture implementation Port china trigger to new API Rename keyword filtering test to HTTP keyword filtering Refactor install documentation. Convert header of ooniprobe script to a non docstring Move test inputs back to where they were. Disabled debug log in default config file * Make runner rename file to .old if it already exists Refactor reporting system * Fix import error in http host test * Moved metaclass code to separate branch 'meta'. * Removed unused code from assertions.py. * Deleted config.py and process.py. * Removed bug as a result of merging which reintroduced the bug for log messages being printed twice. * Made the submit-patch script create the /patches directory if it doesn't already exist. ... .gitignore | 2 + CHANGES.yaml | 5 - HACKING | 141 +++--- Makefile | 198 ++++++++ TODO | 2 +- before_i_commit.sh | 7 +- bin/ooniprobe | 12 +- data/Makefile | 10 + docs/source/api/modules.rst | 7 + docs/source/api/ooni.kit.rst | 19 + docs/source/api/ooni.lib.rst | 36 ++ docs/source/api/ooni.rst | 15 +- docs/source/api/ooni.templates.rst | 15 +- docs/source/api/ooni.utils.rst | 114 +++++- docs/source/index.rst | 41 ++- docs/source/install.rst | 35 +- docs/source/writing_tests.rst | 3 +- inputs/Makefile | 3 + inputs/README | 46 ++ inputs/captive_portal_tests.txt.good | 4 - inputs/cctld.txt | 511 -------------------- inputs/dns_servers.txt.bak | 6 - inputs/dns_servers.txt.bak2 | 1 - inputs/example_exp_list.txt | 3 - inputs/major_isp_dns_servers.txt | 796 ------------------------------- inputs/short_hostname_list.txt | 7 - inputs/tld-list-cc.txt | 511 -------------------- inputs/tld-list-mozilla.txt | 5 - inputs/top-1m.txt.bak2 | 11 - nettests/bridge_reachability/bridget.py | 462 ++++++++++++++++++ nettests/bridge_reachability/echo.py | 168 +++++++ nettests/bridget.py | 462 ------------------ nettests/core/chinatrigger.py | 108 +++++ nettests/core/dnstamper.py | 35 +- nettests/core/echo.py | 1 - nettests/core/http_host.py | 11 +- nettests/core/http_keyword_filtering.py | 42 ++ nettests/core/keyword_filtering.py | 39 -- nettests/core/url_list.py | 3 +- nettests/echo.py | 196 -------- nettests/examples/example_scapyt.py | 35 +- nettests/simpletest.py | 21 +- ooni/__init__.py | 11 +- ooni/config.py | 58 +++ ooni/custodiet.py | 421 ---------------- ooni/inputunit.py | 24 +- ooni/lib/Makefile | 36 -- ooni/lib/rfc3339.py | 283 ----------- ooni/lib/secdev.org.pem | 20 + ooni/lib/txscapy.py | 381 --------------- ooni/nettest.py | 122 ++--- ooni/nodes.py | 174 +++++++ ooni/oconfig.py | 8 - ooni/oonicli.py | 109 +++-- ooni/plugoo/__init__.py | 47 -- ooni/plugoo/assets.py | 62 --- ooni/plugoo/interface.py | 56 --- ooni/plugoo/nodes.py | 176 ------- ooni/plugoo/reports.py | 145 ------ ooni/plugoo/tests.py | 142 ------ ooni/plugoo/work.py | 148 ------ ooni/protocols/daphn3.py | 311 ------------ ooni/protocols/http.py | 141 ------ ooni/protocols/scapyproto.py | 55 --- ooni/reporter.py | 257 +++------- ooni/runner.py | 277 +++++------ ooni/scaffolding.py | 78 --- ooni/templates/httpt.py | 50 +-- ooni/templates/scapyt.py | 157 ++----- ooni/utils/__init__.py | 102 +---- ooni/utils/assertions.py | 180 ------- ooni/utils/config.py | 121 ----- ooni/utils/date.py | 30 -- ooni/utils/geodata.py | 52 ++- ooni/utils/hacks.py | 38 +-- ooni/utils/legacy.py | 459 ------------------ ooni/utils/log.py | 8 +- ooni/utils/meta.py | 241 ---------- ooni/utils/net.py | 83 +++- ooni/utils/onion.py | 17 +- ooni/utils/otime.py | 8 + ooni/utils/process.py | 73 --- ooni/utils/timer.py | 107 ----- ooni/utils/txscapy.py | 145 ++++++ ooniprobe.conf | 26 + requirements.txt | 27 +- submit-patch | 7 +- test_inputs/README | 48 +-- tests/test_dns.py | 24 + to-be-ported/old-api/chinatrigger.py | 140 ------ to-be-ported/protocols/daphn3.py | 311 ++++++++++++ 91 files changed, 2747 insertions(+), 7398 deletions(-)