July 2017 - tor-commits - lists.torproject.org

[webwml/master] Add new Tor Browser version: 7.0.3, for Linux only
by boklm＠torproject.org 27 Jul '17

27 Jul '17

commit c2868884b4267628a93d62baf57b64d9c00bd025 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jul 27 23:22:03 2017 +0200 Add new Tor Browser version: 7.0.3, for Linux only --- include/versions.wmi | 8 ++++---- projects/torbrowser/RecommendedTBBVersions | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 84fbcd64..3a6f0a69 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -10,10 +10,10 @@ <define-tag version-torbrowserbundlebeta whitespace=delete>7.5a2</define-tag> <define-tag releasedate-torbrowserbundlebeta whitespace=delete>2017-07-06</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>7.0.2</define-tag> -<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2017-07-04</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>7.0.2</define-tag> -<define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2017-07-04</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>7.0.3</define-tag> +<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2017-07-27</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>7.0.3</define-tag> +<define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2017-07-27</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>7.5a2</define-tag> <define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2017-07-06</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>7.5a2</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 95137742..27bbc9ff 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,6 +3,8 @@ "7.0.2-Linux", "7.0.2-MacOS", "7.0.2-Windows", +"7.0.3", +"7.0.3-Linux", "7.5a2", "7.5a2-Linux", "7.5a2-MacOS",

1 0

[tor-browser-bundle/maint-7.0] Apply patch for bug 23044
by gk＠torproject.org 27 Jul '17

27 Jul '17

commit a11a8b301950e1c25adcfd5bea07c773f5082533 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 27 08:10:20 2017 +0000 Apply patch for bug 23044 --- gitian/descriptors/linux/gitian-firefox.yml | 2 ++ gitian/patches/gio.patch | 48 +++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 1ff66a2..49c457c 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -33,6 +33,7 @@ files: - "gcc-linux32-utils.zip" - "gcc-linux64-utils.zip" - "get-moz-build-date" +- "gio.patch" - "re-dzip.sh" - "dzip.sh" - "versions" @@ -88,6 +89,7 @@ script: | mkdir -p $INSTDIR/Debug/Browser/ cd tor-browser + patch -p1 < ../gio.patch # run get-moz-build-date before removing .git, which is used to get the year chmod +x ~/build/get-moz-build-date eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) diff --git a/gitian/patches/gio.patch b/gitian/patches/gio.patch new file mode 100644 index 0000000..1edae4d --- /dev/null +++ b/gitian/patches/gio.patch @@ -0,0 +1,48 @@ +From a96f898e0da42de751a5e1367a9899cc96fadb1f Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Thu, 27 Jul 2017 07:31:38 +0000 +Subject: [PATCH] Bug 23044: Don't allow GIO supported protocols by default + + +diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js +index aaeba630422d..3edaad88f59e 100644 +--- a/browser/app/profile/000-tor-browser.js ++++ b/browser/app/profile/000-tor-browser.js +@@ -210,6 +210,9 @@ pref("network.protocol-handler.warn-external.mailto", true); + pref("network.protocol-handler.warn-external.news", true); + pref("network.protocol-handler.warn-external.nntp", true); + pref("network.protocol-handler.warn-external.snews", true); ++// Make sure we don't have any GIO supported protocols (defense in depth ++// measure) ++pref("network.gio.supported-protocols", ""); + pref("plugin.disable", true); // Disable to search plugins on first start + pref("plugins.click_to_play", true); + pref("plugin.state.flash", 1); +diff --git a/extensions/gio/nsGIOProtocolHandler.cpp b/extensions/gio/nsGIOProtocolHandler.cpp +index a378e8700821..5f6b2a0a2a57 100644 +--- a/extensions/gio/nsGIOProtocolHandler.cpp ++++ b/extensions/gio/nsGIOProtocolHandler.cpp +@@ -922,16 +922,16 @@ nsGIOProtocolHandler::InitSupportedProtocolsPref(nsIPrefBranch *prefs) + // Get user preferences to determine which protocol is supported. + // Gvfs/GIO has a set of supported protocols like obex, network, archive, + // computer, dav, cdda, gphoto2, trash, etc. Some of these seems to be +- // irrelevant to process by browser. By default accept only smb and sftp +- // protocols so far. ++ // irrelevant to process by browser. By default accept none. + nsresult rv = prefs->GetCharPref(MOZ_GIO_SUPPORTED_PROTOCOLS, + getter_Copies(mSupportedProtocols)); + if (NS_SUCCEEDED(rv)) { + mSupportedProtocols.StripWhitespace(); + ToLowerCase(mSupportedProtocols); + } +- else +- mSupportedProtocols.AssignLiteral("smb:,sftp:"); // use defaults ++ else { ++ mSupportedProtocols.AssignLiteral(""); // use none by default ++ } + + LOG(("gio: supported protocols \"%s\"\n", mSupportedProtocols.get())); + } +-- +2.13.2 +

1 0

[tor-browser-bundle/maint-7.0] Changelog update, and config.yml changes
by gk＠torproject.org 27 Jul '17

27 Jul '17

commit fb678ac1a95ed724f0edb8bc1f7c748d0ef8b8d1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 27 08:06:44 2017 +0000 Changelog update, and config.yml changes --- Bundle-Data/Docs/ChangeLog.txt | 4 ++++ tools/update-responses/config.yml | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c7cb8c2..d509505 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 7.0.3 -- July 27 2017 + * Linux + * Bug 23044: Don't allow GIO supported protocols by default + Tor Browser 7.0.2 -- July 3 2017 * All Platforms * Update Tor to 0.3.0.9, fixing bug #22753 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 9ff92ce..1547dfd 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,13 +20,13 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 7.0a4 - release: 7.0.2 + release: 7.0.3 versions: - 7.0.2: + 7.0.3: platformVersion: 52.2.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-702-released + detailsURL: https://blog.torproject.org/blog/tor-browser-703-released incremental_from: - - 7.0.1 + - 7.0.2 migrate_archs: osx32: osx64 migrate_langs:

1 0

[webwml/staging] Add new Tor Browser version: 7.0.3, for Linux only
by boklm＠torproject.org 27 Jul '17

27 Jul '17

commit c2868884b4267628a93d62baf57b64d9c00bd025 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jul 27 23:22:03 2017 +0200 Add new Tor Browser version: 7.0.3, for Linux only --- include/versions.wmi | 8 ++++---- projects/torbrowser/RecommendedTBBVersions | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 84fbcd64..3a6f0a69 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -10,10 +10,10 @@ <define-tag version-torbrowserbundlebeta whitespace=delete>7.5a2</define-tag> <define-tag releasedate-torbrowserbundlebeta whitespace=delete>2017-07-06</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>7.0.2</define-tag> -<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2017-07-04</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>7.0.2</define-tag> -<define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2017-07-04</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>7.0.3</define-tag> +<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2017-07-27</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>7.0.3</define-tag> +<define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2017-07-27</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>7.5a2</define-tag> <define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2017-07-06</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>7.5a2</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 95137742..27bbc9ff 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,6 +3,8 @@ "7.0.2-Linux", "7.0.2-MacOS", "7.0.2-Windows", +"7.0.3", +"7.0.3-Linux", "7.5a2", "7.5a2-Linux", "7.5a2-MacOS",

1 0

[tor-browser/tor-browser-52.2.0esr-7.5-1] Bug 23044: Don't allow GIO supported protocols by default
by gk＠torproject.org 27 Jul '17

27 Jul '17

commit a96f898e0da42de751a5e1367a9899cc96fadb1f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 27 07:31:38 2017 +0000 Bug 23044: Don't allow GIO supported protocols by default --- browser/app/profile/000-tor-browser.js | 3 +++ extensions/gio/nsGIOProtocolHandler.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index aaeba630422d..3edaad88f59e 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -210,6 +210,9 @@ pref("network.protocol-handler.warn-external.mailto", true); pref("network.protocol-handler.warn-external.news", true); pref("network.protocol-handler.warn-external.nntp", true); pref("network.protocol-handler.warn-external.snews", true); +// Make sure we don't have any GIO supported protocols (defense in depth +// measure) +pref("network.gio.supported-protocols", ""); pref("plugin.disable", true); // Disable to search plugins on first start pref("plugins.click_to_play", true); pref("plugin.state.flash", 1); diff --git a/extensions/gio/nsGIOProtocolHandler.cpp b/extensions/gio/nsGIOProtocolHandler.cpp index a378e8700821..5f6b2a0a2a57 100644 --- a/extensions/gio/nsGIOProtocolHandler.cpp +++ b/extensions/gio/nsGIOProtocolHandler.cpp @@ -922,16 +922,16 @@ nsGIOProtocolHandler::InitSupportedProtocolsPref(nsIPrefBranch *prefs) // Get user preferences to determine which protocol is supported. // Gvfs/GIO has a set of supported protocols like obex, network, archive, // computer, dav, cdda, gphoto2, trash, etc. Some of these seems to be - // irrelevant to process by browser. By default accept only smb and sftp - // protocols so far. + // irrelevant to process by browser. By default accept none. nsresult rv = prefs->GetCharPref(MOZ_GIO_SUPPORTED_PROTOCOLS, getter_Copies(mSupportedProtocols)); if (NS_SUCCEEDED(rv)) { mSupportedProtocols.StripWhitespace(); ToLowerCase(mSupportedProtocols); } - else - mSupportedProtocols.AssignLiteral("smb:,sftp:"); // use defaults + else { + mSupportedProtocols.AssignLiteral(""); // use none by default + } LOG(("gio: supported protocols \"%s\"\n", mSupportedProtocols.get())); }

1 0

[tor-browser/tor-browser-52.2.0esr-7.0-1] Bug 23044: Don't allow GIO supported protocols by default
by gk＠torproject.org 27 Jul '17

27 Jul '17

commit 720f9061496321aa978d2f022113c40e9aeb4847 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 27 07:31:38 2017 +0000 Bug 23044: Don't allow GIO supported protocols by default --- browser/app/profile/000-tor-browser.js | 3 +++ extensions/gio/nsGIOProtocolHandler.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index d2fb5e57378a..dc7e99701293 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -210,6 +210,9 @@ pref("network.protocol-handler.warn-external.mailto", true); pref("network.protocol-handler.warn-external.news", true); pref("network.protocol-handler.warn-external.nntp", true); pref("network.protocol-handler.warn-external.snews", true); +// Make sure we don't have any GIO supported protocols (defense in depth +// measure) +pref("network.gio.supported-protocols", ""); pref("plugin.disable", true); // Disable to search plugins on first start pref("plugins.click_to_play", true); pref("plugin.state.flash", 1); diff --git a/extensions/gio/nsGIOProtocolHandler.cpp b/extensions/gio/nsGIOProtocolHandler.cpp index a378e8700821..5f6b2a0a2a57 100644 --- a/extensions/gio/nsGIOProtocolHandler.cpp +++ b/extensions/gio/nsGIOProtocolHandler.cpp @@ -922,16 +922,16 @@ nsGIOProtocolHandler::InitSupportedProtocolsPref(nsIPrefBranch *prefs) // Get user preferences to determine which protocol is supported. // Gvfs/GIO has a set of supported protocols like obex, network, archive, // computer, dav, cdda, gphoto2, trash, etc. Some of these seems to be - // irrelevant to process by browser. By default accept only smb and sftp - // protocols so far. + // irrelevant to process by browser. By default accept none. nsresult rv = prefs->GetCharPref(MOZ_GIO_SUPPORTED_PROTOCOLS, getter_Copies(mSupportedProtocols)); if (NS_SUCCEEDED(rv)) { mSupportedProtocols.StripWhitespace(); ToLowerCase(mSupportedProtocols); } - else - mSupportedProtocols.AssignLiteral("smb:,sftp:"); // use defaults + else { + mSupportedProtocols.AssignLiteral(""); // use none by default + } LOG(("gio: supported protocols \"%s\"\n", mSupportedProtocols.get())); }

1 0

[tor/maint-0.3.1] Always start with one additional worker thread
by nickm＠torproject.org 27 Jul '17

27 Jul '17

commit 250c88014d81fcd4406359d44c9f3f3432844a2f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 12 12:23:33 2017 -0400 Always start with one additional worker thread Now that half the threads are permissive and half are strict, we need to make sure we have at least two threads, so that we'll have at least one of each kind. --- changes/more-threads | 3 +++ src/or/cpuworker.c | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/changes/more-threads b/changes/more-threads new file mode 100644 index 000000000..eae88b70f --- /dev/null +++ b/changes/more-threads @@ -0,0 +1,3 @@ + o Minor features (relay, performance): + - Always start relays with at least two worker threads, to prevent + priority inversion on slow tasks. Part of the fix for bug 22883. diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index ad99af64c..8d71483f8 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -89,7 +89,14 @@ cpu_init(void) event_add(reply_event, NULL); } if (!threadpool) { - threadpool = threadpool_new(get_num_cpus(get_options()), + /* + In our threadpool implementation, half the threads are permissive and + half are strict (when it comes to running lower-priority tasks). So we + always make sure we have at least two threads, so that there will be at + least one thread of each kind. + */ + const int n_threads = get_num_cpus(get_options()) + 1; + threadpool = threadpool_new(n_threads, replyqueue, worker_state_new, worker_state_free,

1 0

[tor/maint-0.3.1] Fix a pair of stale comments in workqueue.c
by nickm＠torproject.org 27 Jul '17

27 Jul '17

commit bddea78dede010cdf0115265546cdca0c47d64d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 12 11:52:13 2017 -0400 Fix a pair of stale comments in workqueue.c These comments said that each thread had a separate queue, but we haven't been using that design for some while. --- src/common/workqueue.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/common/workqueue.c b/src/common/workqueue.c index a372501f1..f44f566d2 100644 --- a/src/common/workqueue.c +++ b/src/common/workqueue.c @@ -113,9 +113,7 @@ struct replyqueue_s { alert_sockets_t alert; }; -/** A worker thread represents a single thread in a thread pool. To avoid - * contention, each gets its own queue. This breaks the guarantee that that - * queued work will get executed strictly in order. */ +/** A worker thread represents a single thread in a thread pool. */ typedef struct workerthread_s { /** Which thread it this? In range 0..in_pool->n_threads-1 */ int index; @@ -368,7 +366,7 @@ workerthread_new(int32_t lower_priority_chance, * take from the queued work with the highest prioirity, but will occasionally * visit lower-priority queues to keep them from starving completely. * - * Note that because each thread has its own work queue, work items may not + * Note that because of priorities and thread behavior, work items may not * be executed strictly in order. */ workqueue_entry_t *

1 0

[tor/maint-0.3.1] Merge branch 'multi-priority_squashed' into maint-0.3.1
by nickm＠torproject.org 27 Jul '17

27 Jul '17

commit ba334c00da539a78fdfca696d4b53224e9354a6a Merge: ced2dd5f9 fdd8156ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 27 16:29:34 2017 -0400 Merge branch 'multi-priority_squashed' into maint-0.3.1 changes/bug22883-priority | 8 +++ changes/more-threads | 3 + changes/multi-priority | 5 ++ src/common/workqueue.c | 145 +++++++++++++++++++++++++++++++++++++------- src/common/workqueue.h | 14 +++++ src/or/consdiffmgr.c | 6 +- src/or/cpuworker.c | 31 +++++++--- src/or/cpuworker.h | 2 + src/test/test_consdiffmgr.c | 5 +- src/test/test_workqueue.c | 4 +- 10 files changed, 189 insertions(+), 34 deletions(-)

1 0

[tor/maint-0.3.1] Queue consensus diffs at LOW priority.
by nickm＠torproject.org 27 Jul '17

27 Jul '17

commit 0ae0b5aa4136fe6df7863c8a5b7d239d519b7393 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 12 12:17:51 2017 -0400 Queue consensus diffs at LOW priority. Fixes bug 22883. --- changes/bug22883-priority | 8 ++++++++ src/or/consdiffmgr.c | 6 ++++-- src/or/cpuworker.c | 15 +++++++++------ src/or/cpuworker.h | 2 ++ src/test/test_consdiffmgr.c | 5 ++++- 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/changes/bug22883-priority b/changes/bug22883-priority new file mode 100644 index 000000000..4b3531c30 --- /dev/null +++ b/changes/bug22883-priority @@ -0,0 +1,8 @@ + o Major bugfixes (relay, performance): + + - Perform circuit handshake operations at a higher priority than we use + for consensus diff creation and compression. This should prevent + circuits from starving when a relay or bridge receive a new consensus, + especially on lower-powered machines. Fixes bug 22883; bugfix on + 0.3.1.1-alpha. + diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 638fcd679..8d0a0af3d 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -1605,7 +1605,8 @@ consensus_diff_queue_diff_work(consensus_cache_entry_t *diff_from, goto err; workqueue_entry_t *work; - work = cpuworker_queue_work(consensus_diff_worker_threadfn, + work = cpuworker_queue_work(WQ_PRI_LOW, + consensus_diff_worker_threadfn, consensus_diff_worker_replyfn, job); if (!work) @@ -1768,7 +1769,8 @@ consensus_queue_compression_work(const char *consensus, if (background_compression) { workqueue_entry_t *work; - work = cpuworker_queue_work(consensus_compress_worker_threadfn, + work = cpuworker_queue_work(WQ_PRI_LOW, + consensus_compress_worker_threadfn, consensus_compress_worker_replyfn, job); if (!work) { diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 1013fa555..ad99af64c 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -481,16 +481,18 @@ queue_pending_tasks(void) /** DOCDOC */ MOCK_IMPL(workqueue_entry_t *, -cpuworker_queue_work,(workqueue_reply_t (*fn)(void *, void *), +cpuworker_queue_work,(workqueue_priority_t priority, + workqueue_reply_t (*fn)(void *, void *), void (*reply_fn)(void *), void *arg)) { tor_assert(threadpool); - return threadpool_queue_work(threadpool, - fn, - reply_fn, - arg); + return threadpool_queue_work_priority(threadpool, + priority, + fn, + reply_fn, + arg); } /** Try to tell a cpuworker to perform the public key operations necessary to @@ -545,7 +547,8 @@ assign_onionskin_to_cpuworker(or_circuit_t *circ, memwipe(&req, 0, sizeof(req)); ++total_pending_tasks; - queue_entry = threadpool_queue_work(threadpool, + queue_entry = threadpool_queue_work_priority(threadpool, + WQ_PRI_HIGH, cpuworker_onion_handshake_threadfn, cpuworker_onion_handshake_replyfn, job); diff --git a/src/or/cpuworker.h b/src/or/cpuworker.h index aedf2fae3..320de9532 100644 --- a/src/or/cpuworker.h +++ b/src/or/cpuworker.h @@ -16,7 +16,9 @@ void cpu_init(void); void cpuworkers_rotate_keyinfo(void); struct workqueue_entry_s; enum workqueue_reply_t; +enum workqueue_priority_t; MOCK_DECL(struct workqueue_entry_s *, cpuworker_queue_work, ( + enum workqueue_priority_t priority, enum workqueue_reply_t (*fn)(void *, void *), void (*reply_fn)(void *), void *arg)); diff --git a/src/test/test_consdiffmgr.c b/src/test/test_consdiffmgr.c index 746d17a03..963a6e427 100644 --- a/src/test/test_consdiffmgr.c +++ b/src/test/test_consdiffmgr.c @@ -98,10 +98,13 @@ typedef struct fake_work_queue_ent_t { void *arg; } fake_work_queue_ent_t; static struct workqueue_entry_s * -mock_cpuworker_queue_work(enum workqueue_reply_t (*fn)(void *, void *), +mock_cpuworker_queue_work(workqueue_priority_t prio, + enum workqueue_reply_t (*fn)(void *, void *), void (*reply_fn)(void *), void *arg) { + (void) prio; + if (! fake_cpuworker_queue) fake_cpuworker_queue = smartlist_new();

1 0