[tor-commits] [ooni-probe/master] Merge branch 'master' into http_requests

[art at torproject.org]

commit 2ab4dfc17c30f1f8eaa84c81ac742eb56cdd84a8
Merge: 4a7d322 50df3ff
Author: Arturo Filastò <art at fuffa.org>
Date:   Sat Nov 10 11:43:39 2012 +0100

    Merge branch 'master' into http_requests
    
    * master: (35 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.
      ...

 CHANGES.yaml                            |    5 -
 HACKING                                 |  141 ++++++------
 Makefile                                |  198 ++++++++++++++++
 TODO                                    |    2 +-
 before_i_commit.sh                      |    7 +-
 bin/ooniprobe                           |   12 +-
 data/Makefile                           |   10 +
 docs/source/index.rst                   |    2 +-
 docs/source/install.rst                 |   35 +--
 inputs/README                           |   46 ++++
 nettests/bridge_reachability/bridget.py |    2 +-
 nettests/bridge_reachability/echo.py    |   43 +---
 nettests/core/chinatrigger.py           |  108 +++++++++
 nettests/core/dnstamper.py              |   28 ++-
 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/examples/example_scapyt.py     |   35 ++--
 nettests/simpletest.py                  |   21 ++-
 ooni/config.py                          |   17 ++
 ooni/inputunit.py                       |   24 +--
 ooni/lib/rfc3339.py                     |  283 -----------------------
 ooni/lib/secdev.org.pem                 |   20 ++
 ooni/lib/txscapy.py                     |  381 -------------------------------
 ooni/nettest.py                         |  120 +++++------
 ooni/nodes.py                           |   24 +-
 ooni/oonicli.py                         |   94 +++++---
 ooni/protocols/daphn3.py                |  311 -------------------------
 ooni/reporter.py                        |  213 ++++-------------
 ooni/runner.py                          |  222 ++++++++++--------
 ooni/templates/httpt.py                 |   44 +----
 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                   |   29 ++--
 ooni/utils/hacks.py                     |   38 +---
 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                          |    7 +-
 submit-patch                            |    7 +-
 test_inputs/README                      |   48 +----
 to-be-ported/old-api/chinatrigger.py    |  140 -----------
 to-be-ported/protocols/daphn3.py        |  311 +++++++++++++++++++++++++
 51 files changed, 1540 insertions(+), 2847 deletions(-)