diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2014-09-02 11:43:29 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2014-09-02 11:43:29 +0000 |
commit | 955ff4fab42b80bb8e508cabbf683ffe2d1ae768 (patch) | |
tree | ec167fae071ffbbb23db902812e8b2ea2df3947c /src/transport | |
parent | f861dd18a5a9fc7a7862d74f68ef378e5d8f9d08 (diff) | |
download | gnunet-955ff4fab42b80bb8e508cabbf683ffe2d1ae768.tar.gz gnunet-955ff4fab42b80bb8e508cabbf683ffe2d1ae768.zip |
fix: bluetooth helper with suid installer
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/Makefile.am | 12 | ||||
-rwxr-xr-x | src/transport/profile_transport.sh | 8 |
2 files changed, 8 insertions, 12 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index bab29d0f3..d4a1001c9 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -66,6 +66,9 @@ endif | |||
66 | if LINUX | 66 | if LINUX |
67 | install-exec-hook: | 67 | install-exec-hook: |
68 | $(top_srcdir)/src/transport/install-wlan-helper.sh $(libexecdir) $(SUDO_BINARY) || true | 68 | $(top_srcdir)/src/transport/install-wlan-helper.sh $(libexecdir) $(SUDO_BINARY) || true |
69 | if HAVE_LIBBLUETOOTH | ||
70 | $(top_srcdir)/src/transport/install-bluetooth-helper.sh $(libexecdir) $(SUDO_BINARY) || true | ||
71 | endif | ||
69 | else | 72 | else |
70 | install-exec-hook: | 73 | install-exec-hook: |
71 | endif | 74 | endif |
@@ -88,14 +91,7 @@ if MINGW | |||
88 | endif | 91 | endif |
89 | endif | 92 | endif |
90 | 93 | ||
91 | if LINUX | 94 | |
92 | if HAVE_LIBBLUETOOTH | ||
93 | install-exec-hook2: | ||
94 | $(top_srcdir)/src/transport/install-bluetooth-helper.sh $(libexecdir) $(SUDO_BINARY) || true | ||
95 | endif | ||
96 | else | ||
97 | install-exec-hook2: | ||
98 | endif | ||
99 | 95 | ||
100 | if !MINGW | 96 | if !MINGW |
101 | UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la | 97 | UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la |
diff --git a/src/transport/profile_transport.sh b/src/transport/profile_transport.sh index 595c993a1..aa5c4a88f 100755 --- a/src/transport/profile_transport.sh +++ b/src/transport/profile_transport.sh | |||
@@ -1,9 +1,9 @@ | |||
1 | #!/bin/bash | 1 | #!/bin/bash |
2 | 2 | ||
3 | C_ITERATIONS=5 | 3 | C_ITERATIONS=5 |
4 | C_MESSAGE_DELTA=1000 | 4 | C_MESSAGE_DELTA=10 |
5 | C_MESSAGE_START=23000 | 5 | C_MESSAGE_START=10 |
6 | C_MESSAGE_END=65500 | 6 | C_MESSAGE_END=2000 |
7 | 7 | ||
8 | #for i in {$C_MESSAGE_START..$C_MESSAGE_END..$C_MESSAGE_DELTA} | 8 | #for i in {$C_MESSAGE_START..$C_MESSAGE_END..$C_MESSAGE_DELTA} |
9 | # do | 9 | # do |
@@ -13,6 +13,6 @@ C_MESSAGE_END=65500 | |||
13 | 13 | ||
14 | for ((cur=$C_MESSAGE_START; cur<=$C_MESSAGE_END; cur = cur + $C_MESSAGE_DELTA)) | 14 | for ((cur=$C_MESSAGE_START; cur<=$C_MESSAGE_END; cur = cur + $C_MESSAGE_DELTA)) |
15 | { | 15 | { |
16 | ./gnunet-transport-profiler -p NSGWRTMHG2YJK9KZSTEWKJ5TK20AGRDBWHFA1ZNKKZ7T360MZ8S0 -s -c perf_https_peer1.conf -n 10240 -m $cur -i 4 | 16 | ./gnunet-transport-profiler -p NSGWRTMHG2YJK9KZSTEWKJ5TK20AGRDBWHFA1ZNKKZ7T360MZ8S0 -s -c perf_https_peer1.conf -n 20240 -m $cur -i 4 |
17 | sleep 1 | 17 | sleep 1 |
18 | } | 18 | } |