diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-04-26 17:28:56 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-04-26 17:28:56 +0200 |
commit | 82a5d35360c4c882d9a5f92c4ac27c61bd4a4cc5 (patch) | |
tree | 8c50e8d74033214e711929c3244e5aca34f9705f /contrib | |
parent | 51c0c5072fa27f4964778512a0040c77cce7cd04 (diff) | |
download | gnunet-82a5d35360c4c882d9a5f92c4ac27c61bd4a4cc5.tar.gz gnunet-82a5d35360c4c882d9a5f92c4ac27c61bd4a4cc5.zip |
-fix misc typos
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/apparmor/abstractions/gnunet-common | 4 | ||||
-rw-r--r-- | contrib/apparmor/gnunet-fs-gtk | 12 | ||||
-rw-r--r-- | contrib/apparmor/gnunet-helper-dns | 4 | ||||
-rw-r--r-- | contrib/apparmor/gnunet-service-dns | 4 | ||||
-rwxr-xr-x | contrib/conf/uncrustify_precommit | 2 | ||||
-rw-r--r-- | contrib/conf/wireshark/wireshark.lua | 12 | ||||
-rw-r--r-- | contrib/guix.README | 2 | ||||
-rw-r--r-- | contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd | 2 | ||||
-rw-r--r-- | contrib/patches/lrn-indent.diff | 8 | ||||
-rwxr-xr-x | contrib/scripts/check-texinfo.awk.in | 5 | ||||
-rw-r--r-- | contrib/scripts/gdb-iterate-dll.py | 2 | ||||
-rwxr-xr-x | contrib/scripts/gnunet-chk.py.in | 6 | ||||
-rwxr-xr-x | contrib/scripts/visualize_stats.sh | 20 | ||||
-rw-r--r-- | contrib/vagrant/Vagrantfile | 2 |
14 files changed, 39 insertions, 46 deletions
diff --git a/contrib/apparmor/abstractions/gnunet-common b/contrib/apparmor/abstractions/gnunet-common index 3bf6806f5..cb41b2bff 100644 --- a/contrib/apparmor/abstractions/gnunet-common +++ b/contrib/apparmor/abstractions/gnunet-common | |||
@@ -3,10 +3,10 @@ | |||
3 | #GNUnet configuration file | 3 | #GNUnet configuration file |
4 | @{GNUNET_PREFIX}/share/gnunet/config.d/ r, | 4 | @{GNUNET_PREFIX}/share/gnunet/config.d/ r, |
5 | @{GNUNET_PREFIX}/share/gnunet/config.d/*.conf r, | 5 | @{GNUNET_PREFIX}/share/gnunet/config.d/*.conf r, |
6 | 6 | ||
7 | /etc/gnunet.conf r, | 7 | /etc/gnunet.conf r, |
8 | @{HOME}/.config/gnunet.conf r, | 8 | @{HOME}/.config/gnunet.conf r, |
9 | owner @{GNUNET_USER}/.config/gnunet.conf r, | 9 | owner @{GNUNET_USER}/.config/gnunet.conf r, |
10 | 10 | ||
11 | #GNUnet librairies | 11 | #GNUnet libraries |
12 | @{GNUNET_PREFIX}/lib/libgnunet*.so.* mr, | 12 | @{GNUNET_PREFIX}/lib/libgnunet*.so.* mr, |
diff --git a/contrib/apparmor/gnunet-fs-gtk b/contrib/apparmor/gnunet-fs-gtk index 0ffb0b38b..cd98febf7 100644 --- a/contrib/apparmor/gnunet-fs-gtk +++ b/contrib/apparmor/gnunet-fs-gtk | |||
@@ -9,7 +9,7 @@ profile @{GNUNET_PREFIX}/bin/gnunet-fs-gtk { | |||
9 | #include <abstractions/gnunet-gtk> | 9 | #include <abstractions/gnunet-gtk> |
10 | #include <abstractions/user-download> | 10 | #include <abstractions/user-download> |
11 | 11 | ||
12 | # /dev/shm/LE-* rw, | 12 | # /dev/shm/LE-* rw, |
13 | 13 | ||
14 | owner @{HOME}/.config/gtk-*/bookmarks r, | 14 | owner @{HOME}/.config/gtk-*/bookmarks r, |
15 | owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/download-child/* rw, | 15 | owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/download-child/* rw, |
@@ -21,8 +21,8 @@ profile @{GNUNET_PREFIX}/bin/gnunet-fs-gtk { | |||
21 | owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/publish-file/* rw, | 21 | owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/publish-file/* rw, |
22 | owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/publish/ ra, | 22 | owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/publish/ ra, |
23 | owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/publish/* rw, | 23 | owner @{HOME}/.local/share/gnunet/fs/persistence/gnunet-fs-gtk/publish/* rw, |
24 | 24 | ||
25 | #Acces to files to share ? (lets create a gnunet directory in home) | 25 | #Access to files to share ? (lets create a gnunet directory in home) |
26 | owner @{HOME}/gnunet-fs/ r, | 26 | owner @{HOME}/gnunet-fs/ r, |
27 | 27 | ||
28 | @{GNUNET_PREFIX}/bin/gnunet-fs-gtk mr, | 28 | @{GNUNET_PREFIX}/bin/gnunet-fs-gtk mr, |
@@ -31,13 +31,13 @@ profile @{GNUNET_PREFIX}/bin/gnunet-fs-gtk { | |||
31 | 31 | ||
32 | /usr/share/glib-*/schemas/gschemas.compiled r, | 32 | /usr/share/glib-*/schemas/gschemas.compiled r, |
33 | 33 | ||
34 | #abstractions/dconf but we need write right here | 34 | #abstractions/dconf but we need write right here |
35 | /run/user/*/dconf/user rw, | 35 | /run/user/*/dconf/user rw, |
36 | 36 | ||
37 | @{HOME}/.cache/thumbnails/normal/*.png r, | 37 | @{HOME}/.cache/thumbnails/normal/*.png r, |
38 | 38 | ||
39 | @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-fs-publish Px, | 39 | @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-fs-publish Px, |
40 | 40 | ||
41 | # Site-specific additions and overrides. See local/README for details. | 41 | # Site-specific additions and overrides. See local/README for details. |
42 | #include <local/gnunet> | 42 | #include <local/gnunet> |
43 | } | 43 | } |
diff --git a/contrib/apparmor/gnunet-helper-dns b/contrib/apparmor/gnunet-helper-dns index b5e219585..bd5fe2f0c 100644 --- a/contrib/apparmor/gnunet-helper-dns +++ b/contrib/apparmor/gnunet-helper-dns | |||
@@ -27,7 +27,7 @@ profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-dns { | |||
27 | /usr/bin/sysctl rix, | 27 | /usr/bin/sysctl rix, |
28 | /usr/bin/xtables-multi rix, | 28 | /usr/bin/xtables-multi rix, |
29 | 29 | ||
30 | #Librairies | 30 | # Libraries |
31 | /usr/lib/iptables/libxt_MARK.so mr, | 31 | /usr/lib/iptables/libxt_MARK.so mr, |
32 | /usr/lib/iptables/libxt_owner.so mr, | 32 | /usr/lib/iptables/libxt_owner.so mr, |
33 | /usr/lib/iptables/libxt_standard.so mr, | 33 | /usr/lib/iptables/libxt_standard.so mr, |
@@ -42,7 +42,7 @@ profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-dns { | |||
42 | /usr/lib/locale/locale-archive r, | 42 | /usr/lib/locale/locale-archive r, |
43 | 43 | ||
44 | @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-dns mr, | 44 | @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-helper-dns mr, |
45 | 45 | ||
46 | # Site-specific additions and overrides. See local/README for details. | 46 | # Site-specific additions and overrides. See local/README for details. |
47 | #include <local/gnunet> | 47 | #include <local/gnunet> |
48 | } | 48 | } |
diff --git a/contrib/apparmor/gnunet-service-dns b/contrib/apparmor/gnunet-service-dns index 394b97eb1..665fd7c43 100644 --- a/contrib/apparmor/gnunet-service-dns +++ b/contrib/apparmor/gnunet-service-dns | |||
@@ -14,11 +14,11 @@ profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-dns { | |||
14 | 14 | ||
15 | @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-dns mr, | 15 | @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-dns mr, |
16 | 16 | ||
17 | #Gnunet librairies | 17 | #Gnunet libraries |
18 | @{GNUNET_PREFIX}/lib/libgnunetdnsstub.so.* mr, | 18 | @{GNUNET_PREFIX}/lib/libgnunetdnsstub.so.* mr, |
19 | @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr, | 19 | @{GNUNET_PREFIX}/lib/libgnunetstatistics.so.* mr, |
20 | @{GNUNET_PREFIX}/lib/libgnunettun.so.* mr, | 20 | @{GNUNET_PREFIX}/lib/libgnunettun.so.* mr, |
21 | 21 | ||
22 | # Site-specific additions and overrides. See local/README for details. | 22 | # Site-specific additions and overrides. See local/README for details. |
23 | #include <local/gnunet-sgid> | 23 | #include <local/gnunet-sgid> |
24 | } | 24 | } |
diff --git a/contrib/conf/uncrustify_precommit b/contrib/conf/uncrustify_precommit index fd29998c3..24873330f 100755 --- a/contrib/conf/uncrustify_precommit +++ b/contrib/conf/uncrustify_precommit | |||
@@ -30,6 +30,6 @@ if [ $RET = 1 ]; | |||
30 | then | 30 | then |
31 | echo "Run" | 31 | echo "Run" |
32 | echo "uncrustify --no-backup -c uncrustify.cfg ${crustified}" | 32 | echo "uncrustify --no-backup -c uncrustify.cfg ${crustified}" |
33 | echo "before commiting." | 33 | echo "before committing." |
34 | fi | 34 | fi |
35 | exit $RET | 35 | exit $RET |
diff --git a/contrib/conf/wireshark/wireshark.lua b/contrib/conf/wireshark/wireshark.lua index ac77029f6..3571a693f 100644 --- a/contrib/conf/wireshark/wireshark.lua +++ b/contrib/conf/wireshark/wireshark.lua | |||
@@ -6,7 +6,7 @@ local f = gwlan_proto.fields | |||
6 | f.len = ProtoField.uint16 ("gnunet.len", "Gnunet Message Len") | 6 | f.len = ProtoField.uint16 ("gnunet.len", "Gnunet Message Len") |
7 | f.type = ProtoField.uint16 ("gnunet.type", "Gnunet Message Type") | 7 | f.type = ProtoField.uint16 ("gnunet.type", "Gnunet Message Type") |
8 | -- rhs_proto.fields.sequence = ProtoField.uint16("rhs.sequence","Sequence number") | 8 | -- rhs_proto.fields.sequence = ProtoField.uint16("rhs.sequence","Sequence number") |
9 | f_proto = DissectorTable.new("gnunet.proto", "Gnunet Protocoll", FT_UINT16, BASE_DEC) | 9 | f_proto = DissectorTable.new("gnunet.proto", "GNUnet Protocol", FT_UINT16, BASE_DEC) |
10 | --gwlan_proto.fields = {f_len, f_type} | 10 | --gwlan_proto.fields = {f_len, f_type} |
11 | 11 | ||
12 | function gwlan_proto.dissector(buffer,pinfo,tree) | 12 | function gwlan_proto.dissector(buffer,pinfo,tree) |
@@ -80,8 +80,8 @@ function fragment.dissector(buffer,pinfo,tree) | |||
80 | if buffer(10,2):uint() == 0 then | 80 | if buffer(10,2):uint() == 0 then |
81 | if (buffer(8,2):uint() <= buffer:len() - 12) then | 81 | if (buffer(8,2):uint() <= buffer:len() - 12) then |
82 | gnunet_packet_disector(buffer(12):tvb(),pinfo,tree) | 82 | gnunet_packet_disector(buffer(12):tvb(),pinfo,tree) |
83 | end | 83 | end |
84 | else | 84 | else |
85 | subtree:add(buffer(12), "Data: " .. buffer(12)) | 85 | subtree:add(buffer(12), "Data: " .. buffer(12)) |
86 | end | 86 | end |
87 | end | 87 | end |
@@ -92,7 +92,7 @@ hello = Proto("gnunet.hello","Gnunet Hello Message") | |||
92 | function hello.dissector(buffer,pinfo,tree) | 92 | function hello.dissector(buffer,pinfo,tree) |
93 | pinfo.cols.protocol = "Gnunet Hello Message" | 93 | pinfo.cols.protocol = "Gnunet Hello Message" |
94 | local subtree = tree:add(hello, buffer(),"Gnunet Hello Message (" .. buffer:len() .. ")") | 94 | local subtree = tree:add(hello, buffer(),"Gnunet Hello Message (" .. buffer:len() .. ")") |
95 | gnunet_message_header(buffer, pinfo, subtree) | 95 | gnunet_message_header(buffer, pinfo, subtree) |
96 | if buffer:len() > (264 + 8) then | 96 | if buffer:len() > (264 + 8) then |
97 | subtree:add(buffer(4,4),"Reserved: " .. buffer(4,4):uint()) | 97 | subtree:add(buffer(4,4),"Reserved: " .. buffer(4,4):uint()) |
98 | RsaPublicKeyBinaryEncoded(buffer(8 , 264):tvb(),pinfo, subtree) | 98 | RsaPublicKeyBinaryEncoded(buffer(8 , 264):tvb(),pinfo, subtree) |
@@ -110,7 +110,7 @@ function wlan.dissector(buffer,pinfo,tree) | |||
110 | if buffer:len() > (4 + 4 + 2*64) then | 110 | if buffer:len() > (4 + 4 + 2*64) then |
111 | subtree:add(buffer(4,4),"CRC: " .. buffer(4,4):uint()) | 111 | subtree:add(buffer(4,4),"CRC: " .. buffer(4,4):uint()) |
112 | local peer = GNUNET_PeerIdentity(buffer(8,64), pinfo, subtree) | 112 | local peer = GNUNET_PeerIdentity(buffer(8,64), pinfo, subtree) |
113 | peer:append_text(" Traget") | 113 | peer:append_text(" Target") |
114 | peer = GNUNET_PeerIdentity(buffer(8 + 64,64), pinfo, subtree) | 114 | peer = GNUNET_PeerIdentity(buffer(8 + 64,64), pinfo, subtree) |
115 | peer:append_text(" Source") | 115 | peer:append_text(" Source") |
116 | else | 116 | else |
@@ -118,7 +118,7 @@ function wlan.dissector(buffer,pinfo,tree) | |||
118 | end | 118 | end |
119 | if (buffer:len() - (4 + 4 + 2*64) > 0) then | 119 | if (buffer:len() - (4 + 4 + 2*64) > 0) then |
120 | gnunet_packet_disector(buffer(4 + 4 + 2*64):tvb(),pinfo,tree) | 120 | gnunet_packet_disector(buffer(4 + 4 + 2*64):tvb(),pinfo,tree) |
121 | end | 121 | end |
122 | end | 122 | end |
123 | 123 | ||
124 | function RsaPublicKeyBinaryEncoded(buffer,pinfo,tree) | 124 | function RsaPublicKeyBinaryEncoded(buffer,pinfo,tree) |
diff --git a/contrib/guix.README b/contrib/guix.README index d73b0f4aa..1e8bd3126 100644 --- a/contrib/guix.README +++ b/contrib/guix.README | |||
@@ -25,5 +25,5 @@ environment, run: | |||
25 | 25 | ||
26 | guix environment --load-path=<gnunet.git>/contrib/guix.scm --ad-hoc guix | 26 | guix environment --load-path=<gnunet.git>/contrib/guix.scm --ad-hoc guix |
27 | 27 | ||
28 | It is recommented to also pass the '--pure' option to guix, to make | 28 | It is recommended to also pass the '--pure' option to guix, to make |
29 | sure the environment is not polluted with existing packages. | 29 | sure the environment is not polluted with existing packages. |
diff --git a/contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd b/contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd index 2a4dcc1c4..ac5db666c 100644 --- a/contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd +++ b/contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd | |||
@@ -13,7 +13,7 @@ depend() { | |||
13 | } | 13 | } |
14 | 14 | ||
15 | start() { | 15 | start() { |
16 | # Enable GNS proxy for existant users. | 16 | # Enable GNS proxy for existing users. |
17 | for user in $users; do | 17 | for user in $users; do |
18 | # Create/Renew GNS certificate authority (CA) per user. | 18 | # Create/Renew GNS certificate authority (CA) per user. |
19 | su $user -c "gnunet-gns-proxy-setup-ca" | 19 | su $user -c "gnunet-gns-proxy-setup-ca" |
diff --git a/contrib/patches/lrn-indent.diff b/contrib/patches/lrn-indent.diff index 8ba3b77cc..2cf61d2cf 100644 --- a/contrib/patches/lrn-indent.diff +++ b/contrib/patches/lrn-indent.diff | |||
@@ -40,13 +40,13 @@ diff -u indent-2.2.11/src/handletoken.c indent-2.2.11.my/src/handletoken.c | |||
40 | + parser_state_tos->in_parameter_declaration = 0; | 40 | + parser_state_tos->in_parameter_declaration = 0; |
41 | + } | 41 | + } |
42 | } | 42 | } |
43 | 43 | ||
44 | /** | 44 | /** |
45 | diff -u indent-2.2.11/src/indent.h indent-2.2.11.my/src/indent.h | 45 | diff -u indent-2.2.11/src/indent.h indent-2.2.11.my/src/indent.h |
46 | --- indent-2.2.11/src/indent.h 2009-10-11 23:15:34 +0400 | 46 | --- indent-2.2.11/src/indent.h 2009-10-11 23:15:34 +0400 |
47 | +++ indent-2.2.11.my/src/indent.h 2011-08-16 14:19:37 +0400 | 47 | +++ indent-2.2.11.my/src/indent.h 2011-08-16 14:19:37 +0400 |
48 | @@ -318,6 +318,11 @@ | 48 | @@ -318,6 +318,11 @@ |
49 | int brace_indent; /*!< number of spaces to indent braces from the suround if, while, etc. in -bl | 49 | int brace_indent; /*!< number of spaces to indent braces from the surround if, while, etc. in -bl |
50 | * (bype_2 == 0) code */ | 50 | * (bype_2 == 0) code */ |
51 | int expect_output_file; /*!< Means "-o" was specified. */ | 51 | int expect_output_file; /*!< Means "-o" was specified. */ |
52 | + int diff_decls_and_defs; /*!< Makes indent think that function prototypes are terminated by ';', | 52 | + int diff_decls_and_defs; /*!< Makes indent think that function prototypes are terminated by ';', |
@@ -55,7 +55,7 @@ diff -u indent-2.2.11/src/indent.h indent-2.2.11.my/src/indent.h | |||
55 | + * This is the default. | 55 | + * This is the default. |
56 | + */ | 56 | + */ |
57 | } user_options_ty; | 57 | } user_options_ty; |
58 | 58 | ||
59 | extern user_options_ty settings; | 59 | extern user_options_ty settings; |
60 | @@ -430,6 +435,7 @@ | 60 | @@ -430,6 +435,7 @@ |
61 | * slightly different */ | 61 | * slightly different */ |
@@ -71,7 +71,7 @@ diff -u indent-2.2.11/src/lexi.c indent-2.2.11.my/src/lexi.c | |||
71 | @@ -616,8 +616,11 @@ | 71 | @@ -616,8 +616,11 @@ |
72 | * I've added '=' to this list to keep from breaking | 72 | * I've added '=' to this list to keep from breaking |
73 | * a non-valid C macro from libc. -jla */ | 73 | * a non-valid C macro from libc. -jla */ |
74 | 74 | ||
75 | - if (*tp != ';' && *tp != ',' && *tp != '(' && *tp != '=') | 75 | - if (*tp != ';' && *tp != ',' && *tp != '(' && *tp != '=') |
76 | + if ((*tp != ';' || !settings.diff_decls_and_defs) && | 76 | + if ((*tp != ';' || !settings.diff_decls_and_defs) && |
77 | + *tp != ',' && *tp != '(' && *tp != '=') | 77 | + *tp != ',' && *tp != '(' && *tp != '=') |
diff --git a/contrib/scripts/check-texinfo.awk.in b/contrib/scripts/check-texinfo.awk.in index 3d6a1c643..4efa73658 100755 --- a/contrib/scripts/check-texinfo.awk.in +++ b/contrib/scripts/check-texinfo.awk.in | |||
@@ -52,11 +52,6 @@ BEGIN { | |||
52 | } | 52 | } |
53 | 53 | ||
54 | { | 54 | { |
55 | if (/wether/) { | ||
56 | printf "...lines containing a popular typo\n" ; | ||
57 | print FILENAME":"NR":"$0 ; | ||
58 | } | ||
59 | |||
60 | if (/the the/) { | 55 | if (/the the/) { |
61 | printf "...lines containing a popular typo\n" ; | 56 | printf "...lines containing a popular typo\n" ; |
62 | print FILENAME":"NR":"$0 ; | 57 | print FILENAME":"NR":"$0 ; |
diff --git a/contrib/scripts/gdb-iterate-dll.py b/contrib/scripts/gdb-iterate-dll.py index 28c435ccb..882dee039 100644 --- a/contrib/scripts/gdb-iterate-dll.py +++ b/contrib/scripts/gdb-iterate-dll.py | |||
@@ -7,7 +7,7 @@ def search_dll(head, field, match, pfield): | |||
7 | 7 | ||
8 | head: name of the symbol denoting the head of the DLL | 8 | head: name of the symbol denoting the head of the DLL |
9 | field: the field that should be search for match | 9 | field: the field that should be search for match |
10 | match: the mathing value for field | 10 | match: the matching value for field |
11 | pfield: the field whose value is to be printed for matched elements; None to | 11 | pfield: the field whose value is to be printed for matched elements; None to |
12 | print all fields of the matched elemented | 12 | print all fields of the matched elemented |
13 | """ | 13 | """ |
diff --git a/contrib/scripts/gnunet-chk.py.in b/contrib/scripts/gnunet-chk.py.in index afc0924f4..74e9e4cf9 100755 --- a/contrib/scripts/gnunet-chk.py.in +++ b/contrib/scripts/gnunet-chk.py.in | |||
@@ -32,7 +32,7 @@ from functools import reduce | |||
32 | # Defaults | 32 | # Defaults |
33 | DBLOCK_SIZE = (32 * 1024) # Data block size | 33 | DBLOCK_SIZE = (32 * 1024) # Data block size |
34 | 34 | ||
35 | # Pick a multiple of 2 here to achive 8-byte alignment! We also | 35 | # Pick a multiple of 2 here to achieve 8-byte alignment! We also |
36 | # probably want DBlocks to have (roughly) the same size as IBlocks. | 36 | # probably want DBlocks to have (roughly) the same size as IBlocks. |
37 | # With SHA-512, the optimal value is 32768 byte / 128 byte = 256 (128 | 37 | # With SHA-512, the optimal value is 32768 byte / 128 byte = 256 (128 |
38 | # byte = 2 * 512 bits). DO NOT CHANGE! | 38 | # byte = 2 * 512 bits). DO NOT CHANGE! |
@@ -288,7 +288,7 @@ def compute_rootchk(readin, size): | |||
288 | current_depth = 0 | 288 | current_depth = 0 |
289 | chks = [None] * (depth * CHK_PER_INODE) # list buffer | 289 | chks = [None] * (depth * CHK_PER_INODE) # list buffer |
290 | read_offset = 0 | 290 | read_offset = 0 |
291 | logging.debug("Begining to calculate tree hash with depth: " + repr(depth)) | 291 | logging.debug("Beginning to calculate tree hash with depth: " + repr(depth)) |
292 | while True: | 292 | while True: |
293 | if (depth == current_depth): | 293 | if (depth == current_depth): |
294 | off = CHK_PER_INODE * (depth - 1) | 294 | off = CHK_PER_INODE * (depth - 1) |
@@ -370,7 +370,7 @@ if '__main__' == __name__: | |||
370 | opts, args = getopt.getopt(sys.argv[1:], "h", ["help"]) | 370 | opts, args = getopt.getopt(sys.argv[1:], "h", ["help"]) |
371 | except getopt.GetoptError as err: | 371 | except getopt.GetoptError as err: |
372 | print(err) | 372 | print(err) |
373 | print("Exception occured") | 373 | print("Exception occurred") |
374 | usage() | 374 | usage() |
375 | sys.exit(2) | 375 | sys.exit(2) |
376 | for option, value in opts: | 376 | for option, value in opts: |
diff --git a/contrib/scripts/visualize_stats.sh b/contrib/scripts/visualize_stats.sh index aaa5e657b..b3404b164 100755 --- a/contrib/scripts/visualize_stats.sh +++ b/contrib/scripts/visualize_stats.sh | |||
@@ -1,7 +1,7 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | # | 2 | # |
3 | # This script polls gnunet-stats repeatedly to create statistics plots. | 3 | # This script polls gnunet-stats repeatedly to create statistics plots. |
4 | # Use 'collect' to collect statistics and 'plot' to plot whats been | 4 | # Use 'collect' to collect statistics and 'plot' to plot what has been |
5 | # collected. All plots will be written to $STATDIR as separate .png files. | 5 | # collected. All plots will be written to $STATDIR as separate .png files. |
6 | # | 6 | # |
7 | # WARNING: calling 'collect' will delete all files in $STATDIR. | 7 | # WARNING: calling 'collect' will delete all files in $STATDIR. |
@@ -10,7 +10,7 @@ | |||
10 | # | 10 | # |
11 | # Note: gnuplot syntax has changed across versions. This | 11 | # Note: gnuplot syntax has changed across versions. This |
12 | # script perhaps will not produce color images with older gnuplots. | 12 | # script perhaps will not produce color images with older gnuplots. |
13 | # The script should work atleast with gnuplot 3.8k patchlevel 1. | 13 | # The script should work at least with gnuplot 3.8k patchlevel 1. |
14 | # | 14 | # |
15 | 15 | ||
16 | SLEEP=120 | 16 | SLEEP=120 |
@@ -26,10 +26,10 @@ mkdir -p $STATDIR | |||
26 | case "$1" in | 26 | case "$1" in |
27 | collect) | 27 | collect) |
28 | rm -f $STATDIR/* | 28 | rm -f $STATDIR/* |
29 | 29 | ||
30 | STARTTIME=`date +%s` | 30 | STARTTIME=`date +%s` |
31 | IFS=":" | 31 | IFS=":" |
32 | 32 | ||
33 | while true; do | 33 | while true; do |
34 | NOW=`date +%s` | 34 | NOW=`date +%s` |
35 | RELAT=$[$NOW-$STARTTIME] | 35 | RELAT=$[$NOW-$STARTTIME] |
@@ -45,7 +45,7 @@ case "$1" in | |||
45 | # Write new stats | 45 | # Write new stats |
46 | echo $RELAT $VALUE >>"$STATDIR/$KEY.dat" | 46 | echo $RELAT $VALUE >>"$STATDIR/$KEY.dat" |
47 | echo $RELAT $PREV $VALUE >>"$STATDIR/$KEY.diff" | 47 | echo $RELAT $PREV $VALUE >>"$STATDIR/$KEY.diff" |
48 | 48 | ||
49 | done | 49 | done |
50 | sleep $SLEEP | 50 | sleep $SLEEP |
51 | done | 51 | done |
@@ -61,13 +61,13 @@ case "$1" in | |||
61 | rm "$FILENAME.png" | 61 | rm "$FILENAME.png" |
62 | fi | 62 | fi |
63 | done | 63 | done |
64 | 64 | ||
65 | # Plot diff | 65 | # Plot diff |
66 | ls -1 $STATDIR/*.diff | while read FILENAME; do | 66 | ls -1 $STATDIR/*.diff | while read FILENAME; do |
67 | BASENAME=`basename "$FILENAME" | sed -e "s/ *\..*//g"` | 67 | BASENAME=`basename "$FILENAME" | sed -e "s/ *\..*//g"` |
68 | echo "set terminal png;set output '$FILENAME.png';set title '$BASENAME - diff';plot '$FILENAME' using (\$1/60):(\$3-\$2) title '' with lines;" | nice gnuplot 2> $TMP | 68 | echo "set terminal png;set output '$FILENAME.png';set title '$BASENAME - diff';plot '$FILENAME' using (\$1/60):(\$3-\$2) title '' with lines;" | nice gnuplot 2> $TMP |
69 | EC=`cat $TMP | grep "empty" | grep "Warning" | wc -l` | 69 | EC=`cat $TMP | grep "empty" | grep "Warning" | wc -l` |
70 | if test $EC -ge 1 | 70 | if test $EC -ge 1 |
71 | then | 71 | then |
72 | rm "$FILENAME.png" | 72 | rm "$FILENAME.png" |
73 | fi | 73 | fi |
@@ -80,7 +80,5 @@ case "$1" in | |||
80 | *) | 80 | *) |
81 | echo $"Usage: $0 {collect|plot|view}" | 81 | echo $"Usage: $0 {collect|plot|view}" |
82 | exit 1 | 82 | exit 1 |
83 | |||
84 | esac | ||
85 | 83 | ||
86 | 84 | esac | |
diff --git a/contrib/vagrant/Vagrantfile b/contrib/vagrant/Vagrantfile index d6b671b24..de7f07ed5 100644 --- a/contrib/vagrant/Vagrantfile +++ b/contrib/vagrant/Vagrantfile | |||
@@ -34,7 +34,7 @@ Vagrant.configure(2) do |config| | |||
34 | config.cache.scope = :box | 34 | config.cache.scope = :box |
35 | end | 35 | end |
36 | 36 | ||
37 | # use http proxy if avaiable | 37 | # use http proxy if available |
38 | if ENV['http_proxy'] && Vagrant.has_plugin?("vagrant-proxyconf") | 38 | if ENV['http_proxy'] && Vagrant.has_plugin?("vagrant-proxyconf") |
39 | config.proxy.http = "$http_proxy" | 39 | config.proxy.http = "$http_proxy" |
40 | config.proxy.https = "$https_proxy" | 40 | config.proxy.https = "$https_proxy" |