diff options
author | Nils Gillmann <ng0@n0.is> | 2018-05-19 14:43:13 +0000 |
---|---|---|
committer | Nils Gillmann <ng0@n0.is> | 2018-05-19 14:43:13 +0000 |
commit | 6ab60d4920bb3199aee8cd872b930e9e3e808ba7 (patch) | |
tree | 3d761dbf8793a1d2422fbd14667255c7e0292ea4 /contrib | |
parent | c2f27dfe8218545c327ab49d225a49910347c5c6 (diff) | |
download | gnunet-6ab60d4920bb3199aee8cd872b930e9e3e808ba7.tar.gz gnunet-6ab60d4920bb3199aee8cd872b930e9e3e808ba7.zip |
Restructure contrib folder.
contrib/pogen.sh -> bin/pogen.sh
bootstrap: Use new pogen location and execute it.
contrib/openvpn-tap32: Move to contrib/3rdparty/Windows/openvpn-tap32.
contrib/gnunet-logo*: Move to contrib/branding/logo/
Delete old patches in contrib, predating git.
Move buildbot data to contrib/ci/buildbot,
move docker data to contrib/ci/docker.
Create contrib/conf and populate it with config files found in contrib and bin.
Move gns related data to contrib/gns.
delete contrib/repeat.sh
Move contrib/log.php into contrib/web/log.php.
Create folder contrib/scripts and use it for most scripts in contrib.
Remove trailing whitespace in doc/Makefile.am
Signed-off-by: Nils Gillmann <ng0@n0.is>
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/3rdparty/Windows/openvpn-tap32/COPYING (renamed from contrib/openvpn-tap32/COPYING) | 0 | ||||
-rw-r--r-- | contrib/3rdparty/Windows/openvpn-tap32/INSTALL (renamed from contrib/openvpn-tap32/INSTALL) | 0 | ||||
-rw-r--r-- | contrib/3rdparty/Windows/openvpn-tap32/tap32-signed-i386-2.1.zip (renamed from contrib/openvpn-tap32/tap32-signed-i386-2.1.zip) | bin | 33754 -> 33754 bytes | |||
-rw-r--r-- | contrib/3rdparty/Windows/openvpn-tap32/tap32-source-2.1.zip (renamed from contrib/openvpn-tap32/tap32-source-2.1.zip) | bin | 53335 -> 53335 bytes | |||
-rw-r--r-- | contrib/3rdparty/Windows/openvpn-tap32/tapw32/OemWin2k.inf (renamed from contrib/openvpn-tap32/tapw32/OemWin2k.inf) | 0 | ||||
-rw-r--r-- | contrib/3rdparty/Windows/openvpn-tap32/tapw32/tap0901.cat (renamed from contrib/openvpn-tap32/tapw32/tap0901.cat) | bin | 6551 -> 6551 bytes | |||
-rw-r--r-- | contrib/3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys (renamed from contrib/openvpn-tap32/tapw32/tap0901.sys) | bin | 31360 -> 31360 bytes | |||
-rw-r--r-- | contrib/3rdparty/Windows/openvpn-tap32/tapw64/OemWin2k.inf (renamed from contrib/openvpn-tap32/tapw64/OemWin2k.inf) | 0 | ||||
-rw-r--r-- | contrib/3rdparty/Windows/openvpn-tap32/tapw64/tap0901.cat (renamed from contrib/openvpn-tap32/tapw64/tap0901.cat) | bin | 6587 -> 6587 bytes | |||
-rw-r--r-- | contrib/3rdparty/Windows/openvpn-tap32/tapw64/tap0901.sys (renamed from contrib/openvpn-tap32/tapw64/tap0901.sys) | bin | 36736 -> 36736 bytes | |||
-rw-r--r-- | contrib/Makefile.am | 92 | ||||
-rw-r--r-- | contrib/branding/logo/gnunet-logo-big.png (renamed from contrib/gnunet-logo-big.png) | bin | 250489 -> 250489 bytes | |||
-rw-r--r-- | contrib/branding/logo/gnunet-logo-color.png (renamed from contrib/gnunet-logo-color.png) | bin | 6851 -> 6851 bytes | |||
-rw-r--r-- | contrib/branding/logo/gnunet-logo.pdf (renamed from contrib/gnunet-logo.pdf) | bin | 91138 -> 91138 bytes | |||
-rw-r--r-- | contrib/buildslave-0.8.6p1-gnunet-w32.patch | 202 | ||||
-rwxr-xr-x | contrib/ci/buildbot/buildbot-update.sh (renamed from contrib/buildbot-update.sh) | 0 | ||||
-rw-r--r-- | contrib/ci/buildbot/ssh-config (renamed from contrib/ssh-config) | 0 | ||||
-rw-r--r-- | contrib/ci/buildbot/ssh-keys (renamed from contrib/ssh-keys) | 0 | ||||
-rw-r--r-- | contrib/ci/docker/Dockerfile (renamed from contrib/Dockerfile) | 0 | ||||
-rw-r--r-- | contrib/ci/docker/docker-entrypoint.sh (renamed from contrib/docker-entrypoint.sh) | 0 | ||||
-rw-r--r-- | contrib/conf/colorit/colorit.conf (renamed from contrib/colorit.conf) | 0 | ||||
-rw-r--r-- | contrib/conf/editors/eclipse/gnunet_codingstyle.xml (renamed from contrib/gnunet_codingstyle.xml) | 0 | ||||
-rw-r--r-- | contrib/conf/gnunet/no_autostart_above_core.conf (renamed from contrib/no_autostart_above_core.conf) | 0 | ||||
-rw-r--r-- | contrib/conf/gnunet/no_forcestart.conf (renamed from contrib/no_forcestart.conf) | 0 | ||||
-rw-r--r-- | contrib/conf/nss/nssswitch.conf (renamed from contrib/nssswitch.conf) | 0 | ||||
-rw-r--r-- | contrib/conf/wireshark/wireshark.lua | 150 | ||||
-rw-r--r-- | contrib/gns/bootstrap.min.css (renamed from contrib/bootstrap.min.css) | 0 | ||||
-rw-r--r-- | contrib/gns/def.tex (renamed from contrib/def.tex) | 0 | ||||
-rw-r--r-- | contrib/gns/gns-bcd.html (renamed from contrib/gns-bcd.html) | 0 | ||||
-rw-r--r-- | contrib/gns/gns-bcd.tex (renamed from contrib/gns-bcd.tex) | 2 | ||||
-rw-r--r-- | contrib/gns/gns-form-fields.xml (renamed from contrib/gns-form-fields.xml) | 0 | ||||
-rw-r--r-- | contrib/gns/gns-form.xslt (renamed from contrib/gns-form.xslt) | 0 | ||||
-rw-r--r-- | contrib/nse/experiments/infiniband.conf (renamed from contrib/experiments/nse/infiniband.conf) | 0 | ||||
-rw-r--r-- | contrib/patches/lrn-indent.diff (renamed from contrib/lrn-indent.diff) | 0 | ||||
-rw-r--r-- | contrib/patches/texi2html5-indent.diff (renamed from contrib/texi2html5-indent.diff) | 0 | ||||
-rw-r--r-- | contrib/patches/transport_ats_years.diff (renamed from contrib/transport_ats_years.diff) | 0 | ||||
-rwxr-xr-x | contrib/pogen.sh | 4 | ||||
-rwxr-xr-x | contrib/repeat.sh | 1 | ||||
-rwxr-xr-x | contrib/scripts/coverage.sh (renamed from contrib/coverage.sh) | 0 | ||||
-rwxr-xr-x | contrib/scripts/debug (renamed from contrib/debug) | 0 | ||||
-rw-r--r-- | contrib/scripts/find_typedefs.py (renamed from contrib/find_typedefs.py) | 0 | ||||
-rw-r--r-- | contrib/scripts/gdb-iterate-dll.py (renamed from contrib/gdb-iterate-dll.py) | 0 | ||||
-rwxr-xr-x | contrib/scripts/generate-monkey-db.sh (renamed from contrib/generate-monkey-db.sh) | 0 | ||||
-rwxr-xr-x | contrib/scripts/gnunet-chk.py.in (renamed from contrib/gnunet-chk.py.in) | 0 | ||||
-rwxr-xr-x | contrib/scripts/gnunet-logread/gnunet-logread (renamed from contrib/gnunet-logread) | 2 | ||||
-rwxr-xr-x | contrib/scripts/gnunet-logread/gnunet-logread-ipc (renamed from contrib/gnunet-logread-ipc) | 1 | ||||
-rwxr-xr-x | contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit (renamed from contrib/gnunet-logread-ipc-sdedit) | 2 | ||||
-rwxr-xr-x | contrib/scripts/gnunet-suidfix (renamed from contrib/gnunet-suidfix) | 0 | ||||
-rw-r--r-- | contrib/scripts/gnunet_janitor.py.in (renamed from contrib/gnunet_janitor.py.in) | 0 | ||||
-rw-r--r-- | contrib/scripts/gnunet_pyexpect.py.in (renamed from contrib/gnunet_pyexpect.py.in) | 0 | ||||
-rwxr-xr-x | contrib/scripts/process_log.sh (renamed from contrib/process_log.sh) | 0 | ||||
-rw-r--r-- | contrib/scripts/pydiffer.py.in (renamed from contrib/pydiffer.py.in) | 0 | ||||
-rwxr-xr-x | contrib/scripts/pydmesg (renamed from contrib/pydmesg) | 0 | ||||
-rwxr-xr-x | contrib/scripts/regression.sh (renamed from contrib/regression.sh) | 0 | ||||
-rwxr-xr-x | contrib/scripts/removetrailingwhitespace.py.in (renamed from contrib/removetrailingwhitespace.py.in) | 0 | ||||
-rwxr-xr-x | contrib/scripts/report.sh (renamed from contrib/report.sh) | 0 | ||||
-rwxr-xr-x | contrib/scripts/revisionary.sh (renamed from contrib/revisionary.sh) | 0 | ||||
-rw-r--r-- | contrib/scripts/terminate.py.in (renamed from contrib/terminate.py.in) | 0 | ||||
-rwxr-xr-x | contrib/scripts/testbed_cleanup.sh (renamed from contrib/testbed_cleanup.sh) | 0 | ||||
-rw-r--r-- | contrib/scripts/texinfo-hacks.el (renamed from contrib/texinfo-hacks.el) | 0 | ||||
-rwxr-xr-x | contrib/scripts/visualize_stats.sh (renamed from contrib/visualize_stats.sh) | 0 | ||||
-rwxr-xr-x | contrib/scripts/zonewalk-to-types.sh (renamed from contrib/zonewalk-to-types.sh) | 0 | ||||
-rw-r--r-- | contrib/testbed_perfhacks.patch | 90 | ||||
-rwxr-xr-x | contrib/testbed_setup_pre_ecc_tree.sh | 9 | ||||
-rw-r--r-- | contrib/transpot_delay.patch | 77 | ||||
-rw-r--r-- | contrib/web/log.php (renamed from contrib/log.php) | 0 |
66 files changed, 200 insertions, 432 deletions
diff --git a/contrib/openvpn-tap32/COPYING b/contrib/3rdparty/Windows/openvpn-tap32/COPYING index 3912109b5..3912109b5 100644 --- a/contrib/openvpn-tap32/COPYING +++ b/contrib/3rdparty/Windows/openvpn-tap32/COPYING | |||
diff --git a/contrib/openvpn-tap32/INSTALL b/contrib/3rdparty/Windows/openvpn-tap32/INSTALL index 8e02c1890..8e02c1890 100644 --- a/contrib/openvpn-tap32/INSTALL +++ b/contrib/3rdparty/Windows/openvpn-tap32/INSTALL | |||
diff --git a/contrib/openvpn-tap32/tap32-signed-i386-2.1.zip b/contrib/3rdparty/Windows/openvpn-tap32/tap32-signed-i386-2.1.zip index e13473203..e13473203 100644 --- a/contrib/openvpn-tap32/tap32-signed-i386-2.1.zip +++ b/contrib/3rdparty/Windows/openvpn-tap32/tap32-signed-i386-2.1.zip | |||
Binary files differ | |||
diff --git a/contrib/openvpn-tap32/tap32-source-2.1.zip b/contrib/3rdparty/Windows/openvpn-tap32/tap32-source-2.1.zip index 9ffc0b4ef..9ffc0b4ef 100644 --- a/contrib/openvpn-tap32/tap32-source-2.1.zip +++ b/contrib/3rdparty/Windows/openvpn-tap32/tap32-source-2.1.zip | |||
Binary files differ | |||
diff --git a/contrib/openvpn-tap32/tapw32/OemWin2k.inf b/contrib/3rdparty/Windows/openvpn-tap32/tapw32/OemWin2k.inf index 167e30fff..167e30fff 100644 --- a/contrib/openvpn-tap32/tapw32/OemWin2k.inf +++ b/contrib/3rdparty/Windows/openvpn-tap32/tapw32/OemWin2k.inf | |||
diff --git a/contrib/openvpn-tap32/tapw32/tap0901.cat b/contrib/3rdparty/Windows/openvpn-tap32/tapw32/tap0901.cat index a6772f9fd..a6772f9fd 100644 --- a/contrib/openvpn-tap32/tapw32/tap0901.cat +++ b/contrib/3rdparty/Windows/openvpn-tap32/tapw32/tap0901.cat | |||
Binary files differ | |||
diff --git a/contrib/openvpn-tap32/tapw32/tap0901.sys b/contrib/3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys index 3ecf2391b..3ecf2391b 100644 --- a/contrib/openvpn-tap32/tapw32/tap0901.sys +++ b/contrib/3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys | |||
Binary files differ | |||
diff --git a/contrib/openvpn-tap32/tapw64/OemWin2k.inf b/contrib/3rdparty/Windows/openvpn-tap32/tapw64/OemWin2k.inf index 9b1676afd..9b1676afd 100644 --- a/contrib/openvpn-tap32/tapw64/OemWin2k.inf +++ b/contrib/3rdparty/Windows/openvpn-tap32/tapw64/OemWin2k.inf | |||
diff --git a/contrib/openvpn-tap32/tapw64/tap0901.cat b/contrib/3rdparty/Windows/openvpn-tap32/tapw64/tap0901.cat index 1cac5f5c4..1cac5f5c4 100644 --- a/contrib/openvpn-tap32/tapw64/tap0901.cat +++ b/contrib/3rdparty/Windows/openvpn-tap32/tapw64/tap0901.cat | |||
Binary files differ | |||
diff --git a/contrib/openvpn-tap32/tapw64/tap0901.sys b/contrib/3rdparty/Windows/openvpn-tap32/tapw64/tap0901.sys index 566e168ea..566e168ea 100644 --- a/contrib/openvpn-tap32/tapw64/tap0901.sys +++ b/contrib/3rdparty/Windows/openvpn-tap32/tapw64/tap0901.sys | |||
Binary files differ | |||
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 40e6d3e92..8e07a5d8c 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am | |||
@@ -17,54 +17,62 @@ timeout_watchdog_SOURCES = \ | |||
17 | endif | 17 | endif |
18 | 18 | ||
19 | noinst_SCRIPTS = \ | 19 | noinst_SCRIPTS = \ |
20 | terminate.py \ | 20 | scripts/terminate.py \ |
21 | pydiffer.py \ | 21 | scripts/pydiffer.py \ |
22 | removetrailingwhitespace.py \ | 22 | scripts/removetrailingwhitespace.py \ |
23 | gnunet_pyexpect.py \ | 23 | scripts/gnunet_pyexpect.py \ |
24 | gnunet_janitor.py \ | 24 | scripts/gnunet_janitor.py \ |
25 | gnunet-chk.py | 25 | scripts/gnunet-chk.py |
26 | 26 | ||
27 | dist_pkgdata_DATA = \ | 27 | dist_pkgdata_DATA = \ |
28 | gns-bcd.html \ | 28 | gns/gns-bcd.html \ |
29 | gns-bcd.tex \ | 29 | gns/gns-bcd.tex \ |
30 | gnunet-logo.pdf \ | 30 | gns/def.tex \ |
31 | gnunet-logo-color.png \ | 31 | gns/gns-form-fields.xml \ |
32 | gns/gns-form.xslt \ | ||
33 | branding/logo/gnunet-logo.pdf \ | ||
34 | branding/logo/gnunet-logo-color.png \ | ||
35 | scripts/report.sh \ | ||
32 | testing_hostkeys.ecc | 36 | testing_hostkeys.ecc |
33 | 37 | ||
34 | if MINGW | 38 | if MINGW |
35 | tap32_DATA = \ | 39 | tap32_DATA = \ |
36 | openvpn-tap32/tapw32/tap0901.sys \ | 40 | 3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys \ |
37 | openvpn-tap32/tapw32/tap0901.cat \ | 41 | 3rdparty/Windows/openvpn-tap32/tapw32/tap0901.cat \ |
38 | openvpn-tap32/tapw32/OemWin2k.inf | 42 | 3rdparty/Windows/openvpn-tap32/tapw32/OemWin2k.inf |
39 | 43 | ||
40 | tap64_DATA = \ | 44 | tap64_DATA = \ |
41 | openvpn-tap32/tapw64/tap0901.sys \ | 45 | 3rdparty/Windows/openvpn-tap32/tapw64/tap0901.sys \ |
42 | openvpn-tap32/tapw64/tap0901.cat \ | 46 | 3rdparty/Windows/openvpn-tap32/tapw64/tap0901.cat \ |
43 | openvpn-tap32/tapw64/OemWin2k.inf | 47 | 3rdparty/Windows/openvpn-tap32/tapw64/OemWin2k.inf |
44 | endif | 48 | endif |
45 | 49 | ||
46 | EXTRA_DIST = \ | 50 | EXTRA_DIST = \ |
47 | no_forcestart.conf \ | 51 | conf/colorit/colorit.conf \ |
48 | no_autostart_above_core.conf \ | 52 | conf/editors/eclipse/gnunet_codingstyle.xml \ |
49 | coverage.sh \ | 53 | conf/gnunet/no_forcestart.conf \ |
50 | nssswitch.conf \ | 54 | conf/gnunet/no_autostart_above_core.conf \ |
51 | report.sh \ | 55 | conf/nss/nssswitch.conf \ |
52 | terminate.py.in \ | 56 | conf/wireshark/wireshark.lua \ |
53 | gnunet_pyexpect.py.in \ | 57 | scripts/coverage.sh \ |
54 | gnunet_janitor.py.in \ | 58 | scripts/terminate.py.in \ |
55 | gnunet-chk.py.in \ | 59 | scripts/gnunet_pyexpect.py.in \ |
56 | removetrailingwhitespace.py.in \ | 60 | scripts/gnunet_janitor.py.in \ |
57 | pydiffer.py.in \ | 61 | scripts/gnunet-chk.py.in \ |
58 | gnunet-gns-import.sh \ | 62 | scripts/removetrailingwhitespace.py.in \ |
59 | openvpn-tap32/tapw32/tap0901.sys \ | 63 | scripts/pydiffer.py.in \ |
60 | openvpn-tap32/tapw32/tap0901.cat \ | 64 | scripts/gnunet-gns-import.sh \ |
61 | openvpn-tap32/tapw32/OemWin2k.inf \ | 65 | packages/nix/default.nix \ |
62 | openvpn-tap32/tapw64/tap0901.sys \ | 66 | packages/nix/gnunet-dex.nix \ |
63 | openvpn-tap32/tapw64/tap0901.cat \ | 67 | 3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys \ |
64 | openvpn-tap32/tapw64/OemWin2k.inf \ | 68 | 3rdparty/Windows/openvpn-tap32/tapw32/tap0901.cat \ |
65 | openvpn-tap32/INSTALL \ | 69 | 3rdparty/Windows/openvpn-tap32/tapw32/OemWin2k.inf \ |
66 | openvpn-tap32/tap32-signed-i386-2.1.zip \ | 70 | 3rdparty/Windows/openvpn-tap32/tapw64/tap0901.sys \ |
67 | openvpn-tap32/tap32-source-2.1.zip | 71 | 3rdparty/Windows/openvpn-tap32/tapw64/tap0901.cat \ |
72 | 3rdparty/Windows/openvpn-tap32/tapw64/OemWin2k.inf \ | ||
73 | 3rdparty/Windows/openvpn-tap32/INSTALL \ | ||
74 | 3rdparty/Windows/openvpn-tap32/tap32-signed-i386-2.1.zip \ | ||
75 | 3rdparty/Windows/openvpn-tap32/tap32-source-2.1.zip | ||
68 | 76 | ||
69 | CLEANFILES = \ | 77 | CLEANFILES = \ |
70 | $(noinst_SCRIPTS) | 78 | $(noinst_SCRIPTS) |
@@ -82,21 +90,13 @@ do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' | |||
82 | # | 90 | # |
83 | # instead of this: | 91 | # instead of this: |
84 | 92 | ||
93 | SUFFIXES = | ||
85 | SUFFIXES = .py.in .py | 94 | SUFFIXES = .py.in .py |
86 | 95 | ||
87 | .py.in.py: | 96 | .py.in.py: |
88 | $(do_subst) < $< > $@ | 97 | $(do_subst) < $< > $@ |
89 | chmod +x $@ | 98 | chmod +x $@ |
90 | 99 | ||
91 | # init_gnunet_redhat \ | ||
92 | # init_gnunet_ubuntu \ | ||
93 | # visualize_stats.sh \ | ||
94 | # gnmessage.sh \ | ||
95 | # junkinsert.sh \ | ||
96 | # junklookup.sh \ | ||
97 | # namespacehelper.sh | ||
98 | |||
99 | |||
100 | check_PROGRAMS = \ | 100 | check_PROGRAMS = \ |
101 | test_gnunet_prefix | 101 | test_gnunet_prefix |
102 | 102 | ||
diff --git a/contrib/gnunet-logo-big.png b/contrib/branding/logo/gnunet-logo-big.png index 54c418f8f..54c418f8f 100644 --- a/contrib/gnunet-logo-big.png +++ b/contrib/branding/logo/gnunet-logo-big.png | |||
Binary files differ | |||
diff --git a/contrib/gnunet-logo-color.png b/contrib/branding/logo/gnunet-logo-color.png index 326822ebd..326822ebd 100644 --- a/contrib/gnunet-logo-color.png +++ b/contrib/branding/logo/gnunet-logo-color.png | |||
Binary files differ | |||
diff --git a/contrib/gnunet-logo.pdf b/contrib/branding/logo/gnunet-logo.pdf index fcc7b10bf..fcc7b10bf 100644 --- a/contrib/gnunet-logo.pdf +++ b/contrib/branding/logo/gnunet-logo.pdf | |||
Binary files differ | |||
diff --git a/contrib/buildslave-0.8.6p1-gnunet-w32.patch b/contrib/buildslave-0.8.6p1-gnunet-w32.patch deleted file mode 100644 index 265db4d71..000000000 --- a/contrib/buildslave-0.8.6p1-gnunet-w32.patch +++ /dev/null | |||
@@ -1,202 +0,0 @@ | |||
1 | diff -urN /src/buildbot-slave-0.8.6p1.orig/buildslave/runprocess.py /src/buildbot-slave-0.8.6p1/buildslave/runprocess.py | ||
2 | --- buildbot-slave-0.8.6p1.orig/buildslave/runprocess.py 2012-03-26 04:09:10 +0400 | ||
3 | +++ buildbot-slave-0.8.6p1/buildslave/runprocess.py 2013-03-31 05:18:55 +0400 | ||
4 | @@ -24,6 +24,7 @@ | ||
5 | import re | ||
6 | import subprocess | ||
7 | import traceback | ||
8 | +import tempfile | ||
9 | import stat | ||
10 | from collections import deque | ||
11 | |||
12 | @@ -36,6 +37,89 @@ | ||
13 | if runtime.platformType == 'posix': | ||
14 | from twisted.internet.process import Process | ||
15 | |||
16 | +if os.name == 'nt': | ||
17 | + import win32api | ||
18 | + import win32process | ||
19 | + import win32event | ||
20 | + import pywintypes | ||
21 | + | ||
22 | +def safe_terminate_process (proc, code): | ||
23 | + if os.name == 'nt': | ||
24 | + log.msg ("Obtaining current process handle") | ||
25 | + cp = win32api.GetCurrentProcess () | ||
26 | + result = False | ||
27 | + log.msg ("Expanding target process handle permissions") | ||
28 | + dupproc = win32api.DuplicateHandle (cp, proc._handle, cp, 2 | 1024 | 8 | 32 | 16 | 0x100000, 0, 0) | ||
29 | + log.msg ("Expanded.") | ||
30 | + try: | ||
31 | + log.msg ("Checking exit code of target process") | ||
32 | + exitcode = win32process.GetExitCodeProcess (dupproc) | ||
33 | + log.msg ("Exit code is %d" % exitcode) | ||
34 | + if exitcode == 0x103: | ||
35 | + log.msg ("Opening kernel32.dll") | ||
36 | + kernel32 = win32api.GetModuleHandle ("kernel32") | ||
37 | + log.msg ("Getting ExitProcess() address") | ||
38 | + exitprocess = win32api.GetProcAddress (kernel32, "ExitProcess") | ||
39 | + try: | ||
40 | + log.msg ("Creating remote thread") | ||
41 | + th = 0 | ||
42 | + tid = 0 | ||
43 | + failed = False | ||
44 | + th, tid = win32process.CreateRemoteThread (dupproc, None, 0, exitprocess, code, 0) | ||
45 | + log.msg ("Created remote thread %d" % tid) | ||
46 | + except pywintypes.error as e: | ||
47 | + if e[0] == 5: | ||
48 | + log.msg ("Access denied. It still might die, so don't fail yet") | ||
49 | + pass | ||
50 | + else: | ||
51 | + log.msg("exception %s - %s" % (sys.exc_info()[0], sys.exc_info()[1])) | ||
52 | + failed = True | ||
53 | + except Exception as e: | ||
54 | + log.msg("exception %s - %s" % (sys.exc_info()[0], sys.exc_info()[1])) | ||
55 | + failed = True | ||
56 | + if not failed: | ||
57 | + log.msg ("Wait for 5 seconds or until it dies (usually takes around 1 microsecond)") | ||
58 | + waitresult = win32event.WaitForSingleObject (dupproc, 5) | ||
59 | + log.msg ("Result of waiting: %d" % waitresult) | ||
60 | + win32api.CloseHandle (th) | ||
61 | + if waitresult == 0: | ||
62 | + result = True | ||
63 | + else: | ||
64 | + result = True | ||
65 | + except: | ||
66 | + log.msg("exception %s - %s" % (sys.exc_info()[0], sys.exc_info()[1])) | ||
67 | + finally: | ||
68 | + win32api.CloseHandle (dupproc) | ||
69 | + return result | ||
70 | + else: | ||
71 | + return proc.kill () | ||
72 | + | ||
73 | +class Dummy(object): | ||
74 | + def SetHandle (self, h): | ||
75 | + self._handle = h | ||
76 | + | ||
77 | +def safe_terminate_process_by_pid (proc, code): | ||
78 | + if os.name == 'nt': | ||
79 | + try: | ||
80 | + log.msg("Opening process %d" % proc) | ||
81 | + openproc = win32api.OpenProcess (2 | 1024 | 8 | 32 | 16 | 0x100000, 0, proc) | ||
82 | + log.msg("Opened process %d" % proc) | ||
83 | + try: | ||
84 | + d = Dummy () | ||
85 | + d.SetHandle (openproc) | ||
86 | + log.msg("Terminating it safely") | ||
87 | + safe_terminate_process (d, code) | ||
88 | + log.msg("Finished terminating") | ||
89 | + finally: | ||
90 | + log.msg("Closing process handle") | ||
91 | + win32api.CloseHandle (openproc) | ||
92 | + except: | ||
93 | + log.msg("exception %s - %s" % (sys.exc_info()[0], sys.exc_info()[1])) | ||
94 | + pass | ||
95 | + else: | ||
96 | + return os.kill (proc, code) | ||
97 | + | ||
98 | + | ||
99 | def shell_quote(cmd_list): | ||
100 | # attempt to quote cmd_list such that a shell will properly re-interpret | ||
101 | # it. The pipes module is only available on UNIX, and Windows "shell" | ||
102 | @@ -148,6 +232,7 @@ | ||
103 | self.pending_stdin = "" | ||
104 | self.stdin_finished = False | ||
105 | self.killed = False | ||
106 | + self.scriptfile = "" | ||
107 | |||
108 | def setStdin(self, data): | ||
109 | assert not self.connected | ||
110 | @@ -198,6 +283,11 @@ | ||
111 | rc = 1 | ||
112 | else: | ||
113 | rc = -1 | ||
114 | + if self.scriptfile: | ||
115 | + try: | ||
116 | + os.remove (self.scriptfile) | ||
117 | + except: | ||
118 | + pass | ||
119 | self.command.finished(sig, rc) | ||
120 | |||
121 | |||
122 | @@ -408,9 +498,14 @@ | ||
123 | |||
124 | if type(self.command) in types.StringTypes: | ||
125 | if runtime.platformType == 'win32': | ||
126 | - argv = os.environ['COMSPEC'].split() # allow %COMSPEC% to have args | ||
127 | - if '/c' not in argv: argv += ['/c'] | ||
128 | - argv += [self.command] | ||
129 | + if os.environ['BUILDSLAVE_SHELL']: | ||
130 | + argv = os.environ['BUILDSLAVE_SHELL'].split() # allow %COMSPEC% to have args | ||
131 | + argv += [self.command] | ||
132 | + else: | ||
133 | + argv = os.environ['COMSPEC'].split() # allow %COMSPEC% to have args | ||
134 | + if '/c' not in argv: | ||
135 | + argv += ['/c'] | ||
136 | + argv += [self.command] | ||
137 | else: | ||
138 | # for posix, use /bin/sh. for other non-posix, well, doesn't | ||
139 | # hurt to try | ||
140 | @@ -424,9 +519,26 @@ | ||
141 | # handle path searching, etc. | ||
142 | if runtime.platformType == 'win32' and not \ | ||
143 | (self.command[0].lower().endswith(".exe") and os.path.isabs(self.command[0])): | ||
144 | - argv = os.environ['COMSPEC'].split() # allow %COMSPEC% to have args | ||
145 | - if '/c' not in argv: argv += ['/c'] | ||
146 | - argv += list(self.command) | ||
147 | + if os.environ['BUILDSLAVE_SHELL']: | ||
148 | + argv = os.environ['BUILDSLAVE_SHELL'].split() | ||
149 | + # Create a temporary script file that changes current directory | ||
150 | + # and runs the command we want | ||
151 | + # It will be deleted after command is finished running (see RunProcessPP) | ||
152 | + tf, tf_name = tempfile.mkstemp () | ||
153 | + f = os.fdopen (tf, 'wb') | ||
154 | + fcontents = '#!/bin/sh\ncd {}\n{}'.format ( | ||
155 | + re.sub(r'(?<!\\) ','\\ ', self.workdir.replace('\\','/')), | ||
156 | + ' '.join (self.command)) | ||
157 | + f.write (fcontents) | ||
158 | + log.msg("Script: {}".format (fcontents)) | ||
159 | + f.close () | ||
160 | + self.pp.scriptfile = tf_name | ||
161 | + argv += [tf_name.replace('\\','/')] | ||
162 | + else: | ||
163 | + argv = os.environ['COMSPEC'].split() # allow %COMSPEC% to have args | ||
164 | + if '/c' not in argv: | ||
165 | + argv += ['/c'] | ||
166 | + argv += list(self.command) | ||
167 | else: | ||
168 | argv = self.command | ||
169 | # Attempt to format this for use by a shell, although the process isn't perfect | ||
170 | @@ -439,7 +551,7 @@ | ||
171 | self.environ['PWD'] = os.path.abspath(self.workdir) | ||
172 | |||
173 | # self.stdin is handled in RunProcessPP.connectionMade | ||
174 | - | ||
175 | + log.msg("Running {}".format (argv)) | ||
176 | log.msg(" " + display) | ||
177 | self._addToBuffers('header', display+"\n") | ||
178 | |||
179 | @@ -770,9 +882,7 @@ | ||
180 | if self.interruptSignal == None: | ||
181 | log.msg("self.interruptSignal==None, only pretending to kill child") | ||
182 | else: | ||
183 | - log.msg("using TASKKILL /F PID /T to kill pid %s" % self.process.pid) | ||
184 | - subprocess.check_call("TASKKILL /F /PID %s /T" % self.process.pid) | ||
185 | - log.msg("taskkill'd pid %s" % self.process.pid) | ||
186 | + safe_terminate_process_by_pid (self.process.pid, 1) | ||
187 | hit = 1 | ||
188 | |||
189 | # try signalling the process itself (works on Windows too, sorta) | ||
190 | @@ -795,10 +905,11 @@ | ||
191 | if not hit: | ||
192 | log.msg("signalProcess/os.kill failed both times") | ||
193 | |||
194 | - if runtime.platformType == "posix": | ||
195 | + if runtime.platformType == "posix" or runtime.platformType == "win32": | ||
196 | # we only do this under posix because the win32eventreactor | ||
197 | # blocks here until the process has terminated, while closing | ||
198 | # stderr. This is weird. | ||
199 | + # LRN: Turns out, things don't work without this on W32. At all. | ||
200 | self.pp.transport.loseConnection() | ||
201 | |||
202 | if self.deferred: | ||
diff --git a/contrib/buildbot-update.sh b/contrib/ci/buildbot/buildbot-update.sh index 6c9d28b25..6c9d28b25 100755 --- a/contrib/buildbot-update.sh +++ b/contrib/ci/buildbot/buildbot-update.sh | |||
diff --git a/contrib/ssh-config b/contrib/ci/buildbot/ssh-config index 857354bf3..857354bf3 100644 --- a/contrib/ssh-config +++ b/contrib/ci/buildbot/ssh-config | |||
diff --git a/contrib/ssh-keys b/contrib/ci/buildbot/ssh-keys index 8a786d9cd..8a786d9cd 100644 --- a/contrib/ssh-keys +++ b/contrib/ci/buildbot/ssh-keys | |||
diff --git a/contrib/Dockerfile b/contrib/ci/docker/Dockerfile index 974e41a5e..974e41a5e 100644 --- a/contrib/Dockerfile +++ b/contrib/ci/docker/Dockerfile | |||
diff --git a/contrib/docker-entrypoint.sh b/contrib/ci/docker/docker-entrypoint.sh index 807d86d6f..807d86d6f 100644 --- a/contrib/docker-entrypoint.sh +++ b/contrib/ci/docker/docker-entrypoint.sh | |||
diff --git a/contrib/colorit.conf b/contrib/conf/colorit/colorit.conf index 77d57aa59..77d57aa59 100644 --- a/contrib/colorit.conf +++ b/contrib/conf/colorit/colorit.conf | |||
diff --git a/contrib/gnunet_codingstyle.xml b/contrib/conf/editors/eclipse/gnunet_codingstyle.xml index a58c2ed0c..a58c2ed0c 100644 --- a/contrib/gnunet_codingstyle.xml +++ b/contrib/conf/editors/eclipse/gnunet_codingstyle.xml | |||
diff --git a/contrib/no_autostart_above_core.conf b/contrib/conf/gnunet/no_autostart_above_core.conf index 7bcf6c8ae..7bcf6c8ae 100644 --- a/contrib/no_autostart_above_core.conf +++ b/contrib/conf/gnunet/no_autostart_above_core.conf | |||
diff --git a/contrib/no_forcestart.conf b/contrib/conf/gnunet/no_forcestart.conf index a332d6da7..a332d6da7 100644 --- a/contrib/no_forcestart.conf +++ b/contrib/conf/gnunet/no_forcestart.conf | |||
diff --git a/contrib/nssswitch.conf b/contrib/conf/nss/nssswitch.conf index 89af6471e..89af6471e 100644 --- a/contrib/nssswitch.conf +++ b/contrib/conf/nss/nssswitch.conf | |||
diff --git a/contrib/conf/wireshark/wireshark.lua b/contrib/conf/wireshark/wireshark.lua new file mode 100644 index 000000000..ac77029f6 --- /dev/null +++ b/contrib/conf/wireshark/wireshark.lua | |||
@@ -0,0 +1,150 @@ | |||
1 | -- declare our protocol | ||
2 | gwlan_proto = Proto("gnunet","Gnunet Layer") | ||
3 | -- create a function to dissect it | ||
4 | local f = gwlan_proto.fields | ||
5 | |||
6 | f.len = ProtoField.uint16 ("gnunet.len", "Gnunet Message Len") | ||
7 | f.type = ProtoField.uint16 ("gnunet.type", "Gnunet Message Type") | ||
8 | -- rhs_proto.fields.sequence = ProtoField.uint16("rhs.sequence","Sequence number") | ||
9 | f_proto = DissectorTable.new("gnunet.proto", "Gnunet Protocoll", FT_UINT16, BASE_DEC) | ||
10 | --gwlan_proto.fields = {f_len, f_type} | ||
11 | |||
12 | function gwlan_proto.dissector(buffer,pinfo,tree) | ||
13 | pinfo.cols.protocol = "Gnunet Packet" | ||
14 | gnunet_packet_disector(buffer,pinfo,tree) | ||
15 | end | ||
16 | |||
17 | function gwlan_proto.init() | ||
18 | end | ||
19 | |||
20 | function gnunet_packet_disector(buffer,pinfo,tree) | ||
21 | if (buffer:len() > 4) then | ||
22 | local len = buffer(0,2):uint() | ||
23 | local type = buffer(2,2):uint() | ||
24 | if (len <= buffer:len()) then | ||
25 | local dissect = f_proto:get_dissector(type) | ||
26 | if dissect ~= nil then | ||
27 | dissect:call(buffer(0, len):tvb(), pinfo, tree) | ||
28 | else | ||
29 | local subtree = tree:add(fragmentack, buffer(),"Gnunet Packet Type: " .. buffer(2,2):uint() .. "(" .. buffer:len() .. ")") | ||
30 | gnunet_message_header(buffer, pinfo, subtree) | ||
31 | end | ||
32 | end | ||
33 | --if (len < buffer:len()) then | ||
34 | -- gwlan_proto.dissector(buffer(len, buffer:len() - len):tvb(), pinfo, tree) | ||
35 | --end | ||
36 | else | ||
37 | if (buffer:len() == 4) then | ||
38 | local subtree = tree:add(fragmentack, buffer(),"Gnunet Packet (" .. buffer:len() .. ")") | ||
39 | gnunet_message_header(buffer, pinfo, subtree) | ||
40 | end | ||
41 | end | ||
42 | end | ||
43 | |||
44 | function gnunet_message_header(buffer, pinfo, tree) | ||
45 | if (buffer:len() >= 4) then | ||
46 | local len = buffer(0,2) | ||
47 | local type = buffer(2,2) | ||
48 | tree:add(buffer(0,2), "Message Len: " .. buffer(0,2):uint()) | ||
49 | tree:add(buffer(2,2), "Message Type: " .. buffer(2,2):uint()) | ||
50 | end | ||
51 | end | ||
52 | |||
53 | -- load the udp.port table | ||
54 | llc_table = DissectorTable.get("llc.dsap") | ||
55 | -- register our protocol to handle llc.dsap 0x1e | ||
56 | llc_table:add(31,gwlan_proto) | ||
57 | |||
58 | fragmentack = Proto("gnunet.fragmentack","Gnunet Fragment Ack") | ||
59 | |||
60 | function fragmentack.dissector(buffer,pinfo,tree) | ||
61 | pinfo.cols.protocol = "Gnunet Fragment Ack" | ||
62 | local subtree = tree:add(fragmentack, buffer(),"Gnunet Data ack (" .. buffer:len() .. ")") | ||
63 | gnunet_message_header(buffer, pinfo, subtree) | ||
64 | if buffer:len() >= 16 then | ||
65 | subtree:add(buffer(4,4),"Fragment Id: " .. buffer(4,4):uint()) | ||
66 | subtree:add(buffer(8,8),"Bits: " .. buffer(8,8)) | ||
67 | end | ||
68 | end | ||
69 | |||
70 | fragment = Proto("gnunet.fragment","Gnunet Fragment") | ||
71 | |||
72 | function fragment.dissector(buffer,pinfo,tree) | ||
73 | pinfo.cols.protocol = "Gnunet Fragment" | ||
74 | local subtree = tree:add(fragment, buffer(),"Gnunet Fragment (" .. buffer:len() .. ")") | ||
75 | gnunet_message_header(buffer, pinfo, subtree) | ||
76 | if buffer:len() >= 13 then | ||
77 | subtree:add(buffer(4,4),"Fragment Id: " .. buffer(4,4):uint()) | ||
78 | subtree:add(buffer(8,2),"Total Size: " .. buffer(8,2):uint()) | ||
79 | subtree:add(buffer(10,2),"Offset: " .. buffer(10,2):uint()) | ||
80 | if buffer(10,2):uint() == 0 then | ||
81 | if (buffer(8,2):uint() <= buffer:len() - 12) then | ||
82 | gnunet_packet_disector(buffer(12):tvb(),pinfo,tree) | ||
83 | end | ||
84 | else | ||
85 | subtree:add(buffer(12), "Data: " .. buffer(12)) | ||
86 | end | ||
87 | end | ||
88 | end | ||
89 | |||
90 | hello = Proto("gnunet.hello","Gnunet Hello Message") | ||
91 | |||
92 | function hello.dissector(buffer,pinfo,tree) | ||
93 | pinfo.cols.protocol = "Gnunet Hello Message" | ||
94 | local subtree = tree:add(hello, buffer(),"Gnunet Hello Message (" .. buffer:len() .. ")") | ||
95 | gnunet_message_header(buffer, pinfo, subtree) | ||
96 | if buffer:len() > (264 + 8) then | ||
97 | subtree:add(buffer(4,4),"Reserved: " .. buffer(4,4):uint()) | ||
98 | RsaPublicKeyBinaryEncoded(buffer(8 , 264):tvb(),pinfo, subtree) | ||
99 | else | ||
100 | subtree:add(buffer(4), "SIZE WRONG (< 272)") | ||
101 | end | ||
102 | end | ||
103 | |||
104 | wlan = Proto("gnunet.wlan","Gnunet WLAN Message") | ||
105 | |||
106 | function wlan.dissector(buffer,pinfo,tree) | ||
107 | pinfo.cols.protocol = "Gnunet WLAN Message" | ||
108 | local subtree = tree:add(wlan, buffer(),"Gnunet WLAN Message (" .. buffer:len() .. ")") | ||
109 | gnunet_message_header(buffer, pinfo, subtree) | ||
110 | if buffer:len() > (4 + 4 + 2*64) then | ||
111 | subtree:add(buffer(4,4),"CRC: " .. buffer(4,4):uint()) | ||
112 | local peer = GNUNET_PeerIdentity(buffer(8,64), pinfo, subtree) | ||
113 | peer:append_text(" Traget") | ||
114 | peer = GNUNET_PeerIdentity(buffer(8 + 64,64), pinfo, subtree) | ||
115 | peer:append_text(" Source") | ||
116 | else | ||
117 | subtree:add(buffer(8), "SIZE WRONG (< 4 + 4 + 2*64)") | ||
118 | end | ||
119 | if (buffer:len() - (4 + 4 + 2*64) > 0) then | ||
120 | gnunet_packet_disector(buffer(4 + 4 + 2*64):tvb(),pinfo,tree) | ||
121 | end | ||
122 | end | ||
123 | |||
124 | function RsaPublicKeyBinaryEncoded(buffer,pinfo,tree) | ||
125 | local subtree = tree:add(gwlan_proto,buffer(),"Gnunet RsaPublicKeyBinaryEncoded(" .. buffer:len() .. ")") | ||
126 | subtree:add(buffer(0,2),"Len: " .. buffer(0,2):uint()) | ||
127 | subtree:add(buffer(2,2),"Sizen: " .. buffer(2,2):uint()) | ||
128 | subtree:add(buffer(4,258),"Pub Key: " .. buffer(4,258)) | ||
129 | subtree:add(buffer(262,2),"Padding: " .. buffer(262,2):uint()) | ||
130 | end | ||
131 | |||
132 | function GNUNET_PeerIdentity(buffer,pinfo,tree) | ||
133 | local subtree = tree:add(gwlan_proto,buffer(),"Gnunet PeerIdentity(" .. buffer:len() .. ")") | ||
134 | subtree:add(buffer(0),"hashPubKey: " .. buffer(0)) | ||
135 | return subtree | ||
136 | end | ||
137 | |||
138 | transport_session_keepalive = Proto("gnunet.transport_session_keepalive","Gnunet transport session keepalive") | ||
139 | |||
140 | function transport_session_keepalive.dissector(buffer,pinfo,tree) | ||
141 | pinfo.cols.protocol = "Gnunet transport session keepalive" | ||
142 | local subtree = tree:add(transport_session_keepalive, buffer(),"Gnunet transport session keepalive (" .. buffer:len() .. ")") | ||
143 | gnunet_message_header(buffer, pinfo, subtree) | ||
144 | end | ||
145 | |||
146 | f_proto:add(43,wlan) | ||
147 | f_proto:add(39,transport_session_keepalive) | ||
148 | f_proto:add(19,fragmentack) | ||
149 | f_proto:add(18,fragment) | ||
150 | f_proto:add(16,hello) | ||
diff --git a/contrib/bootstrap.min.css b/contrib/gns/bootstrap.min.css index c547283bb..c547283bb 100644 --- a/contrib/bootstrap.min.css +++ b/contrib/gns/bootstrap.min.css | |||
diff --git a/contrib/def.tex b/contrib/gns/def.tex index 669302b08..669302b08 100644 --- a/contrib/def.tex +++ b/contrib/gns/def.tex | |||
diff --git a/contrib/gns-bcd.html b/contrib/gns/gns-bcd.html index de2fdb6e6..de2fdb6e6 100644 --- a/contrib/gns-bcd.html +++ b/contrib/gns/gns-bcd.html | |||
diff --git a/contrib/gns-bcd.tex b/contrib/gns/gns-bcd.tex index 73a302985..f3a033ebc 100644 --- a/contrib/gns-bcd.tex +++ b/contrib/gns/gns-bcd.tex | |||
@@ -18782,7 +18782,7 @@ | |||
18782 | \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-29.0mm) {\ifthenelse{\equal{#1}{english}}{\textit{\jobtitleenglish}}{\textit{\jobtitlegerman}}}; | 18782 | \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-29.0mm) {\ifthenelse{\equal{#1}{english}}{\textit{\jobtitleenglish}}{\textit{\jobtitlegerman}}}; |
18783 | } | 18783 | } |
18784 | { | 18784 | { |
18785 | \node at (78mm,-7mm) {\logo}; %\includegraphics[height=7mm]{gnunet-logo.pdf}}; | 18785 | \node at (78mm,-7mm) {\logo}; %\includegraphics[height=7mm]{../branding/logo/gnunet-logo.pdf}}; |
18786 | \node[rectangle,draw=white,line width=1pt,inner sep=0pt] at (17mm,-17mm) {\begin{pspicture}(15mm,15mm) \psbarcode{gnunet://gns/\gns}{eclevel=Q}{qrcode}\end{pspicture}}; | 18786 | \node[rectangle,draw=white,line width=1pt,inner sep=0pt] at (17mm,-17mm) {\begin{pspicture}(15mm,15mm) \psbarcode{gnunet://gns/\gns}{eclevel=Q}{qrcode}\end{pspicture}}; |
18787 | \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-35.0mm) {\ifthenelse{\equal{\prefix}{}}{}{\tiny \prefix}}; | 18787 | \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-35.0mm) {\ifthenelse{\equal{\prefix}{}}{}{\tiny \prefix}}; |
18788 | \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-41.5mm) {\fontsize{8pt}{8pt}\selectfont \textbf{\name}\ifthenelse{\equal{\suffix}{}}{}{, \tiny \suffix}}; | 18788 | \node[rectangle,draw=white,minimum height=7pt,text width=41mm,inner sep=0pt] at (24.25mm,-41.5mm) {\fontsize{8pt}{8pt}\selectfont \textbf{\name}\ifthenelse{\equal{\suffix}{}}{}{, \tiny \suffix}}; |
diff --git a/contrib/gns-form-fields.xml b/contrib/gns/gns-form-fields.xml index 308e66e0d..308e66e0d 100644 --- a/contrib/gns-form-fields.xml +++ b/contrib/gns/gns-form-fields.xml | |||
diff --git a/contrib/gns-form.xslt b/contrib/gns/gns-form.xslt index bf2585616..bf2585616 100644 --- a/contrib/gns-form.xslt +++ b/contrib/gns/gns-form.xslt | |||
diff --git a/contrib/experiments/nse/infiniband.conf b/contrib/nse/experiments/infiniband.conf index c7b7f2a59..c7b7f2a59 100644 --- a/contrib/experiments/nse/infiniband.conf +++ b/contrib/nse/experiments/infiniband.conf | |||
diff --git a/contrib/lrn-indent.diff b/contrib/patches/lrn-indent.diff index 8ba3b77cc..8ba3b77cc 100644 --- a/contrib/lrn-indent.diff +++ b/contrib/patches/lrn-indent.diff | |||
diff --git a/contrib/texi2html5-indent.diff b/contrib/patches/texi2html5-indent.diff index 2abbcb766..2abbcb766 100644 --- a/contrib/texi2html5-indent.diff +++ b/contrib/patches/texi2html5-indent.diff | |||
diff --git a/contrib/transport_ats_years.diff b/contrib/patches/transport_ats_years.diff index f48c9555d..f48c9555d 100644 --- a/contrib/transport_ats_years.diff +++ b/contrib/patches/transport_ats_years.diff | |||
diff --git a/contrib/pogen.sh b/contrib/pogen.sh deleted file mode 100755 index 87c90adf2..000000000 --- a/contrib/pogen.sh +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | find src -name "*.c" | grep -v \# | grep -v /test_ | grep -v /perf_ | grep -v _old | grep -v chat | grep -v .libs/ | sort > po/POTFILES.in | ||
3 | grep -l _\( `find src -name "*.h"` | grep -v "platform.h" | grep -v _old | grep -v chat | sort >> po/POTFILES.in | ||
4 | |||
diff --git a/contrib/repeat.sh b/contrib/repeat.sh deleted file mode 100755 index 3efc95f07..000000000 --- a/contrib/repeat.sh +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | while true; do rm -rf /tmp/test-gnunetd-*; make check || break; done | ||
diff --git a/contrib/coverage.sh b/contrib/scripts/coverage.sh index dd6a6ab53..dd6a6ab53 100755 --- a/contrib/coverage.sh +++ b/contrib/scripts/coverage.sh | |||
diff --git a/contrib/debug b/contrib/scripts/debug index 3de2c9a14..3de2c9a14 100755 --- a/contrib/debug +++ b/contrib/scripts/debug | |||
diff --git a/contrib/find_typedefs.py b/contrib/scripts/find_typedefs.py index 68f5c2782..68f5c2782 100644 --- a/contrib/find_typedefs.py +++ b/contrib/scripts/find_typedefs.py | |||
diff --git a/contrib/gdb-iterate-dll.py b/contrib/scripts/gdb-iterate-dll.py index 79d46aa96..79d46aa96 100644 --- a/contrib/gdb-iterate-dll.py +++ b/contrib/scripts/gdb-iterate-dll.py | |||
diff --git a/contrib/generate-monkey-db.sh b/contrib/scripts/generate-monkey-db.sh index 2afe55501..2afe55501 100755 --- a/contrib/generate-monkey-db.sh +++ b/contrib/scripts/generate-monkey-db.sh | |||
diff --git a/contrib/gnunet-chk.py.in b/contrib/scripts/gnunet-chk.py.in index c976b2143..c976b2143 100755 --- a/contrib/gnunet-chk.py.in +++ b/contrib/scripts/gnunet-chk.py.in | |||
diff --git a/contrib/gnunet-logread b/contrib/scripts/gnunet-logread/gnunet-logread index e4b6752b8..9b1c65401 100755 --- a/contrib/gnunet-logread +++ b/contrib/scripts/gnunet-logread/gnunet-logread | |||
@@ -1,4 +1,4 @@ | |||
1 | #!/usr/bin/env perl | 1 | #!@PERL@ |
2 | # helper tool to make gnunet logs more readable | 2 | # helper tool to make gnunet logs more readable |
3 | # try 'gnunet-logread -h' for usage | 3 | # try 'gnunet-logread -h' for usage |
4 | 4 | ||
diff --git a/contrib/gnunet-logread-ipc b/contrib/scripts/gnunet-logread/gnunet-logread-ipc index 77515d890..72f9f47df 100755 --- a/contrib/gnunet-logread-ipc +++ b/contrib/scripts/gnunet-logread/gnunet-logread-ipc | |||
@@ -4,6 +4,7 @@ | |||
4 | # | 4 | # |
5 | # ... obsoleted by gnunet-logread's new -f option that does the same thing | 5 | # ... obsoleted by gnunet-logread's new -f option that does the same thing |
6 | 6 | ||
7 | # FIXME: Replace /tmp with our use of $TMPDIR and similar. | ||
7 | ipc=${1:-/tmp/gnunet-logread-ipc.sock} | 8 | ipc=${1:-/tmp/gnunet-logread-ipc.sock} |
8 | test -e "$ipc" || mkfifo "$ipc" | 9 | test -e "$ipc" || mkfifo "$ipc" |
9 | cat "$ipc" | 10 | cat "$ipc" |
diff --git a/contrib/gnunet-logread-ipc-sdedit b/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit index 197e6f575..f8b7dc735 100755 --- a/contrib/gnunet-logread-ipc-sdedit +++ b/contrib/scripts/gnunet-logread/gnunet-logread-ipc-sdedit | |||
@@ -1,4 +1,4 @@ | |||
1 | #!/usr/bin/env perl | 1 | #!@PERL@ |
2 | 2 | ||
3 | # 1. Start sdedit and enable 'RT diagram server' in 'Global preferences'. | 3 | # 1. Start sdedit and enable 'RT diagram server' in 'Global preferences'. |
4 | # | 4 | # |
diff --git a/contrib/gnunet-suidfix b/contrib/scripts/gnunet-suidfix index 992378966..992378966 100755 --- a/contrib/gnunet-suidfix +++ b/contrib/scripts/gnunet-suidfix | |||
diff --git a/contrib/gnunet_janitor.py.in b/contrib/scripts/gnunet_janitor.py.in index 74fc70886..74fc70886 100644 --- a/contrib/gnunet_janitor.py.in +++ b/contrib/scripts/gnunet_janitor.py.in | |||
diff --git a/contrib/gnunet_pyexpect.py.in b/contrib/scripts/gnunet_pyexpect.py.in index cfeb06d8d..cfeb06d8d 100644 --- a/contrib/gnunet_pyexpect.py.in +++ b/contrib/scripts/gnunet_pyexpect.py.in | |||
diff --git a/contrib/process_log.sh b/contrib/scripts/process_log.sh index c25c515c2..c25c515c2 100755 --- a/contrib/process_log.sh +++ b/contrib/scripts/process_log.sh | |||
diff --git a/contrib/pydiffer.py.in b/contrib/scripts/pydiffer.py.in index 10145371c..10145371c 100644 --- a/contrib/pydiffer.py.in +++ b/contrib/scripts/pydiffer.py.in | |||
diff --git a/contrib/pydmesg b/contrib/scripts/pydmesg index d60e08fe3..d60e08fe3 100755 --- a/contrib/pydmesg +++ b/contrib/scripts/pydmesg | |||
diff --git a/contrib/regression.sh b/contrib/scripts/regression.sh index 1f799797a..1f799797a 100755 --- a/contrib/regression.sh +++ b/contrib/scripts/regression.sh | |||
diff --git a/contrib/removetrailingwhitespace.py.in b/contrib/scripts/removetrailingwhitespace.py.in index 5824fb591..5824fb591 100755 --- a/contrib/removetrailingwhitespace.py.in +++ b/contrib/scripts/removetrailingwhitespace.py.in | |||
diff --git a/contrib/report.sh b/contrib/scripts/report.sh index 7fbb2f46c..7fbb2f46c 100755 --- a/contrib/report.sh +++ b/contrib/scripts/report.sh | |||
diff --git a/contrib/revisionary.sh b/contrib/scripts/revisionary.sh index 5778cf148..5778cf148 100755 --- a/contrib/revisionary.sh +++ b/contrib/scripts/revisionary.sh | |||
diff --git a/contrib/terminate.py.in b/contrib/scripts/terminate.py.in index 4a6719f38..4a6719f38 100644 --- a/contrib/terminate.py.in +++ b/contrib/scripts/terminate.py.in | |||
diff --git a/contrib/testbed_cleanup.sh b/contrib/scripts/testbed_cleanup.sh index 57413fba0..57413fba0 100755 --- a/contrib/testbed_cleanup.sh +++ b/contrib/scripts/testbed_cleanup.sh | |||
diff --git a/contrib/texinfo-hacks.el b/contrib/scripts/texinfo-hacks.el index bfb5c98fa..bfb5c98fa 100644 --- a/contrib/texinfo-hacks.el +++ b/contrib/scripts/texinfo-hacks.el | |||
diff --git a/contrib/visualize_stats.sh b/contrib/scripts/visualize_stats.sh index aaa5e657b..aaa5e657b 100755 --- a/contrib/visualize_stats.sh +++ b/contrib/scripts/visualize_stats.sh | |||
diff --git a/contrib/zonewalk-to-types.sh b/contrib/scripts/zonewalk-to-types.sh index c453702e6..c453702e6 100755 --- a/contrib/zonewalk-to-types.sh +++ b/contrib/scripts/zonewalk-to-types.sh | |||
diff --git a/contrib/testbed_perfhacks.patch b/contrib/testbed_perfhacks.patch deleted file mode 100644 index 1ad524a30..000000000 --- a/contrib/testbed_perfhacks.patch +++ /dev/null | |||
@@ -1,90 +0,0 @@ | |||
1 | Index: src/include/gnunet_constants.h | ||
2 | =================================================================== | ||
3 | --- src/include/gnunet_constants.h (revision 26030) | ||
4 | +++ src/include/gnunet_constants.h (working copy) | ||
5 | @@ -49,7 +49,7 @@ | ||
6 | * After how long do we consider a connection to a peer dead | ||
7 | * if we don't receive messages from the peer? | ||
8 | */ | ||
9 | -#define GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5) | ||
10 | +#define GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS, 5) | ||
11 | |||
12 | /** | ||
13 | * How long do we delay reading more from a peer after a quota violation? | ||
14 | @@ -61,7 +61,7 @@ | ||
15 | * even if we assume that the service commonly does not | ||
16 | * respond instantly (DNS, Database, etc.). | ||
17 | */ | ||
18 | -#define GNUNET_CONSTANTS_SERVICE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 10) | ||
19 | +#define GNUNET_CONSTANTS_SERVICE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS, 10) | ||
20 | |||
21 | /** | ||
22 | * How long do we delay messages to get larger packet sizes (CORKing)? | ||
23 | Index: src/transport/gnunet-service-transport_neighbours.c | ||
24 | =================================================================== | ||
25 | --- src/transport/gnunet-service-transport_neighbours.c (revision 26030) | ||
26 | +++ src/transport/gnunet-service-transport_neighbours.c (working copy) | ||
27 | @@ -65,7 +65,7 @@ | ||
28 | * send 3 keepalives in each interval, so 3 messages would need to be | ||
29 | * lost in a row for a disconnect). | ||
30 | */ | ||
31 | -#define KEEPALIVE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100) | ||
32 | +#define KEEPALIVE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS, 100) | ||
33 | |||
34 | /** | ||
35 | * How long are we willing to wait for a response from ATS before timing out? | ||
36 | Index: src/transport/gnunet-service-transport_validation.c | ||
37 | =================================================================== | ||
38 | --- src/transport/gnunet-service-transport_validation.c (revision 26030) | ||
39 | +++ src/transport/gnunet-service-transport_validation.c (working copy) | ||
40 | @@ -43,7 +43,7 @@ | ||
41 | * OTOH, we don't want to spend too much time generating PONG signatures, | ||
42 | * so they must have some lifetime to reduce our CPU usage. | ||
43 | */ | ||
44 | -#define PONG_SIGNATURE_LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 1) | ||
45 | +#define PONG_SIGNATURE_LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 12) | ||
46 | |||
47 | /** | ||
48 | * After how long do we expire an address in a HELLO that we just | ||
49 | @@ -58,24 +58,24 @@ | ||
50 | * we cannot validate (because after this time we can destroy the | ||
51 | * validation record). | ||
52 | */ | ||
53 | -#define UNVALIDATED_PING_KEEPALIVE GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5) | ||
54 | +#define UNVALIDATED_PING_KEEPALIVE GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 4) | ||
55 | |||
56 | /** | ||
57 | * How often do we PING an address that we have successfully validated | ||
58 | * in the past but are not actively using? Should be (significantly) | ||
59 | * smaller than HELLO_ADDRESS_EXPIRATION. | ||
60 | */ | ||
61 | -#define VALIDATED_PING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15) | ||
62 | +#define VALIDATED_PING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 6) | ||
63 | |||
64 | /** | ||
65 | * How often do we PING an address that we are currently using? | ||
66 | */ | ||
67 | -#define CONNECTED_PING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2) | ||
68 | +#define CONNECTED_PING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS, 2) | ||
69 | |||
70 | /** | ||
71 | * How much delay is acceptable for sending the PING or PONG? | ||
72 | */ | ||
73 | -#define ACCEPTABLE_PING_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1) | ||
74 | +#define ACCEPTABLE_PING_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 1) | ||
75 | |||
76 | /** | ||
77 | * Size of the validation map hashmap. | ||
78 | @@ -745,9 +745,9 @@ | ||
79 | void | ||
80 | GST_validation_start (unsigned int max_fds) | ||
81 | { | ||
82 | - validation_next = GNUNET_TIME_absolute_get(); | ||
83 | - validation_delay.rel_value = (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value) / max_fds; | ||
84 | - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Delay between validations: %u ms\n ", validation_delay.rel_value); | ||
85 | + validation_next = GNUNET_TIME_absolute_get(); | ||
86 | + validation_delay.rel_value = GNUNET_TIME_UNIT_MILLISECONDS.rel_value; | ||
87 | + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Delay between validations: %u ms\n ", validation_delay.rel_value); | ||
88 | validation_map = GNUNET_CONTAINER_multihashmap_create (VALIDATION_MAP_SIZE, | ||
89 | GNUNET_NO); | ||
90 | pnc = GNUNET_PEERINFO_notify (GST_cfg, &process_peerinfo_hello, NULL); | ||
diff --git a/contrib/testbed_setup_pre_ecc_tree.sh b/contrib/testbed_setup_pre_ecc_tree.sh deleted file mode 100755 index 4c6920144..000000000 --- a/contrib/testbed_setup_pre_ecc_tree.sh +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | svn up -r26032 | ||
4 | svn up -r26167 src/nse/ | ||
5 | svn up -r26079 src/include/gnunet_helper_lib.h src/util/helper.c | ||
6 | svn up -r26219 src/include/gnunet_protocols.h | ||
7 | svn up src/include/gnunet_testbed_service.h src/testbed/ src/regex/ src/dht/ | ||
8 | svn up contrib | ||
9 | svn up configure.ac | ||
diff --git a/contrib/transpot_delay.patch b/contrib/transpot_delay.patch deleted file mode 100644 index 9ba806960..000000000 --- a/contrib/transpot_delay.patch +++ /dev/null | |||
@@ -1,77 +0,0 @@ | |||
1 | Index: src/transport/gnunet-service-transport_neighbours.c | ||
2 | =================================================================== | ||
3 | --- src/transport/gnunet-service-transport_neighbours.c (revision 27335) | ||
4 | +++ src/transport/gnunet-service-transport_neighbours.c (working copy) | ||
5 | @@ -65,7 +65,7 @@ | ||
6 | * send 3 keepalives in each interval, so 3 messages would need to be | ||
7 | * lost in a row for a disconnect). | ||
8 | */ | ||
9 | -#define KEEPALIVE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100) | ||
10 | +#define KEEPALIVE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS, 100) | ||
11 | |||
12 | /** | ||
13 | * How long are we willing to wait for a response from ATS before timing out? | ||
14 | Index: src/transport/gnunet-service-transport_validation.c | ||
15 | =================================================================== | ||
16 | --- src/transport/gnunet-service-transport_validation.c (revision 27335) | ||
17 | +++ src/transport/gnunet-service-transport_validation.c (working copy) | ||
18 | @@ -42,7 +42,7 @@ | ||
19 | * OTOH, we don't want to spend too much time generating PONG signatures, | ||
20 | * so they must have some lifetime to reduce our CPU usage. | ||
21 | */ | ||
22 | -#define PONG_SIGNATURE_LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 1) | ||
23 | +#define PONG_SIGNATURE_LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 12) | ||
24 | |||
25 | /** | ||
26 | * After how long do we expire an address in a HELLO that we just | ||
27 | @@ -57,24 +57,24 @@ | ||
28 | * we cannot validate (because after this time we can destroy the | ||
29 | * validation record). | ||
30 | */ | ||
31 | -#define UNVALIDATED_PING_KEEPALIVE GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5) | ||
32 | +#define UNVALIDATED_PING_KEEPALIVE GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 4) | ||
33 | |||
34 | /** | ||
35 | * How often do we PING an address that we have successfully validated | ||
36 | * in the past but are not actively using? Should be (significantly) | ||
37 | * smaller than HELLO_ADDRESS_EXPIRATION. | ||
38 | */ | ||
39 | -#define VALIDATED_PING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15) | ||
40 | +#define VALIDATED_PING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 6) | ||
41 | |||
42 | /** | ||
43 | * How often do we PING an address that we are currently using? | ||
44 | */ | ||
45 | -#define CONNECTED_PING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2) | ||
46 | +#define CONNECTED_PING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS, 2) | ||
47 | |||
48 | /** | ||
49 | * How much delay is acceptable for sending the PING or PONG? | ||
50 | */ | ||
51 | -#define ACCEPTABLE_PING_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1) | ||
52 | +#define ACCEPTABLE_PING_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 1) | ||
53 | |||
54 | /** | ||
55 | * Size of the validation map hashmap. | ||
56 | Index: src/include/gnunet_constants.h | ||
57 | =================================================================== | ||
58 | --- src/include/gnunet_constants.h (revision 27335) | ||
59 | +++ src/include/gnunet_constants.h (working copy) | ||
60 | @@ -49,7 +49,7 @@ | ||
61 | * After how long do we consider a connection to a peer dead | ||
62 | * if we don't receive messages from the peer? | ||
63 | */ | ||
64 | -#define GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5) | ||
65 | +#define GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS, 5) | ||
66 | |||
67 | /** | ||
68 | * How long do we delay reading more from a peer after a quota violation? | ||
69 | @@ -61,7 +61,7 @@ | ||
70 | * even if we assume that the service commonly does not | ||
71 | * respond instantly (DNS, Database, etc.). | ||
72 | */ | ||
73 | -#define GNUNET_CONSTANTS_SERVICE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 10) | ||
74 | +#define GNUNET_CONSTANTS_SERVICE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_YEARS, 10) | ||
75 | |||
76 | /** | ||
77 | * How long do we delay messages to get larger packet sizes (CORKing)? | ||
diff --git a/contrib/log.php b/contrib/web/log.php index b2ca9ed6c..b2ca9ed6c 100644 --- a/contrib/log.php +++ b/contrib/web/log.php | |||