Architecture specific change in rpms/nodejs-istanbul-lib-hook.git
by githook-noreply＠fedoraproject.org 09 May '18
by githook-noreply＠fedoraproject.org 09 May '18
09 May '18
The package rpms/nodejs-istanbul-lib-hook.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nodejs-istanbul-lib-hook.git/commit….
Change:
+ExclusiveArch: %{nodejs_arches} noarch
Thanks.
Full change:
============
commit a05132400a0585612f45f0c442f92df7d42117d5
Author: Jared Smith <jsmith(a)fedoraproject.org>
Date: Wed May 9 10:09:25 2018 -0400
Initial packaging
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..26910c4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/istanbul-lib-hook-1.1.0.tgz
+/istanbul-lib-hook-tests-1.1.0.tar.bz2
diff --git a/README.md b/README.md
deleted file mode 100644
index dc958c0..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# nodejs-istanbul-lib-hook
-
-'Hooks for require, vm and script used in istanbul'
\ No newline at end of file
diff --git a/dl-istanbul-tests.sh b/dl-istanbul-tests.sh
new file mode 100755
index 0000000..67a4df1
--- /dev/null
+++ b/dl-istanbul-tests.sh
@@ -0,0 +1,133 @@
+#!/bin/bash
+
+tag=$(rpmspec -q --qf="%{version}\n" --srpm ./*.spec)
+url=$(rpmspec -q --qf="%{url}\n" --srpm ./*.spec)
+pkgdir=$(rpmspec -q --qf="%{name}" --srpm ./*.spec | sed -e 's/^nodejs-//')
+
+echo "tag: $tag"
+echo "URL: $url"
+echo "pkgdir: $pkgdir"
+
+set -e
+
+tmp=$(mktemp -d)
+
+trap cleanup EXIT
+cleanup() {
+ echo Cleaning up...
+ set +e
+ [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
+}
+
+unset CDPATH
+pwd=$(pwd)
+
+pushd "$tmp"
+git clone https://github.com/istanbuljs/istanbuljs
+newdir=packages/$pkgdir
+cd istanbuljs
+echo Finding git tag
+gittag=$(git show-ref --tags | cut -d' ' -f2 | grep "${pkgdir}@${tag}$" | head -n1 || git show-ref --tags | cut -d' ' -f2 | sort -Vr | head -n1)
+if [ -z $gittag ]; then
+ gittag=tags/$tag
+ echo "Could not find tag $tag, using $gittag instead"
+fi
+echo "Git Tag: $gittag"
+if [ -d "$newdir/test" ]; then
+ git archive --prefix='test/' --format=tar ${gittag}:$newdir/test/ \
+ | bzip2 > "$pwd"/$pkgdir-tests-${tag}.tar.bz2
+elif [ -d "$newdir/tests" ]; then
+ git archive --prefix='tests/' --format=tar ${gittag}:$newdir/tests/ \
+ | bzip2 > "$pwd"/$pkgdir-tests-${tag}.tar.bz2
+elif [ -d "$newdir/spec" ]; then
+ git archive --prefix='spec/' --format=tar ${gittag}:$newdir/spec/ \
+ | bzip2 > "$pwd"/$pkgdir-tests-${tag}.tar.bz2
+else
+ echo "No test directory found for tag ${gittag}"
+fi
+if [ -d "$newdir/support" ]; then
+ git archive --prefix='support/' --format=tar ${gittag}:$newdir/support/ \
+ | bzip2 > "$pwd"/$pkgdir-support-${tag}.tar.bz2
+fi
+if [ -d "$newdir/fixture" ]; then
+ git archive --prefix='fixture/' --format=tar ${gittag}:$newdir/fixture/ \
+ | bzip2 > "$pwd"/$pkgdir-fixture-${tag}.tar.bz2
+fi
+if [ -d "$newdir/examples" ]; then
+ git archive --prefix='examples/' --format=tar ${gittag}:$newdir/examples/ \
+ | bzip2 > "$pwd"/$pkgdir-examples-${tag}.tar.bz2
+elif [ -d "$newdir/example" ]; then
+ git archive --prefix='example/' --format=tar ${gittag}:$newdir/example/ \
+ | bzip2 > "$pwd"/$pkgdir-examples-${tag}.tar.bz2
+fi
+if [ -d "$newdir/tasks" ]; then
+ git archive --prefix='tasks/' --format=tar ${gittag}:$newdir/tasks/ \
+ | bzip2 > "$pwd"/$pkgdir-tasks-${tag}.tar.bz2
+fi
+if [ -d "$newdir/docs" ]; then
+ git archive --prefix='docs/' --format=tar ${gittag}:$newdir/docs/ \
+ | bzip2 > "$pwd"/$pkgdir-docs-${tag}.tar.bz2
+elif [ -d "$newdir/doc" ]; then
+ git archive --prefix='doc/' --format=tar ${gittag}:$newdir/doc/ \
+ | bzip2 > "$pwd"/$pkgdir-docs-${tag}.tar.bz2
+fi
+if [ -d "$newdir/src" ]; then
+ git archive --prefix='src/' --format=tar ${gittag}:$newdir/src/ \
+ | bzip2 > "$pwd"/$pkgdir-src-${tag}.tar.bz2
+elif [ -d "$newdir/source" ]; then
+ git archive --prefix='source/' --format=tar ${gittag}:$newdir/source/ \
+ | bzip2 > "$pwd"/$pkgdir-source-${tag}.tar.bz2
+fi
+if [ -d "$newdir/tools" ]; then
+ git archive --prefix='tools/' --format=tar ${gittag}:$newdir/tools/ \
+ | bzip2 > "$pwd"/$pkgdir-tools-${tag}.tar.bz2
+fi
+if [ -d "$newdir/scripts" ]; then
+ git archive --prefix='scripts/' --format=tar ${gittag}:$newdir/scripts/ \
+ | bzip2 > "$pwd"/$pkgdir-scripts-${tag}.tar.bz2
+fi
+if [ -d "$newdir/modules" ]; then
+ git archive --prefix='modules/' --format=tar ${gittag}:$newdir/modules/ \
+ | bzip2 > "$pwd"/$pkgdir-modules-${tag}.tar.bz2
+fi
+if [ -d "$newdir/ts" ]; then
+ git archive --prefix='ts/' --format=tar ${gittag}:$newdir/ts/ \
+ | bzip2 > "$pwd"/$pkgdir-ts-${tag}.tar.bz2
+fi
+if [ -d "$newdir/build" ]; then
+ git archive --prefix='build/' --format=tar ${gittag}:$newdir/build/ \
+ | bzip2 > "$pwd"/$pkgdir-build-${tag}.tar.bz2
+fi
+if [ -d "$newdir/fixtures" ]; then
+ git archive --prefix='fixtures/' --format=tar ${gittag}:$newdir/fixtures/ \
+ | bzip2 > "$pwd"/$pkgdir-fixtures-${tag}.tar.bz2
+fi
+if [ -d "$newdir/mocks" ]; then
+ git archive --prefix='mocks/' --format=tar ${gittag}:$newdir/mocks/ \
+ | bzip2 > "$pwd"/$pkgdir-mocks-${tag}.tar.bz2
+fi
+if [ -d "$newdir/typings" ]; then
+ git archive --prefix='typings/' --format=tar ${gittag}:$newdir/typings/ \
+ | bzip2 > "$pwd"/$pkgdir-typings-${tag}.tar.bz2
+fi
+if [ -d "$newdir/templates" ]; then
+ git archive --prefix='templates/' --format=tar ${gittag}:$newdir/templates/ \
+ | bzip2 > "$pwd"/$pkgdir-templates-${tag}.tar.bz2
+fi
+if [ -d "$newdir/benchmark" ]; then
+ git archive --prefix='benchmark/' --format=tar ${gittag}:$newdir/benchmark/ \
+ | bzip2 > "$pwd"/$pkgdir-benchmark-${tag}.tar.bz2
+fi
+if [ -d "$newdir/vendor" ]; then
+ git archive --prefix='vendor/' --format=tar ${gittag}:$newdir/vendor/ \
+ | bzip2 > "$pwd"/$pkgdir-vendor-${tag}.tar.bz2
+fi
+if [ -d "$newdir/packages" ]; then
+ git archive --prefix='packages/' --format=tar ${gittag}:$newdir/packages/ \
+ | bzip2 > "$pwd"/$pkgdir-packages-${tag}.tar.bz2
+fi
+if [ -d "$newdir/rollup" ]; then
+ git archive --prefix='rollup/' --format=tar ${gittag}:$newdir/rollup/ \
+ | bzip2 > "$pwd"/$pkgdir-rollup-${tag}.tar.bz2
+fi
+popd
diff --git a/nodejs-istanbul-lib-hook.spec b/nodejs-istanbul-lib-hook.spec
new file mode 100644
index 0000000..454db7b
--- /dev/null
+++ b/nodejs-istanbul-lib-hook.spec
@@ -0,0 +1,68 @@
+%{?nodejs_find_provides_and_requires}
+
+%global packagename istanbul-lib-hook
+%global enable_tests 1
+
+Name: nodejs-istanbul-lib-hook
+Version: 1.1.0
+Release: 1%{?dist}
+Summary: Hooks for require, vm and script used in istanbul
+
+License: BSD
+URL: https://github.com/istanbuljs/istanbuljs.git
+Source0: https://registry.npmjs.org/%{packagename}/-/%{packagename}-%{version}.tgz
+# The test files are not included in the npm tarball.
+# Source{1-9} are generated by running Source10, which pulls from the upstream
+# version control repository.
+Source1: %{packagename}-tests-%{version}.tar.bz2
+Source10: dl-istanbul-tests.sh
+
+
+BuildArch: noarch
+ExclusiveArch: %{nodejs_arches} noarch
+
+BuildRequires: nodejs-packaging
+BuildRequires: npm(append-transform)
+
+%if 0%{?enable_tests}
+BuildRequires: mocha
+BuildRequires: npm(chai)
+%endif
+
+%description
+Hooks for require, vm and script used in istanbul
+
+
+%prep
+%autosetup -n package
+# setup the tests
+%autosetup -T -D -a 1 -n package
+
+
+%build
+# nothing to do
+
+%install
+mkdir -p %{buildroot}%{nodejs_sitelib}/%{packagename}
+cp -pr package.json *.js lib/ \
+ %{buildroot}%{nodejs_sitelib}/%{packagename}
+
+%nodejs_symlink_deps
+
+%check
+%nodejs_symlink_deps --check
+%{__nodejs} -e 'require("./")'
+%if 0%{?enable_tests}
+NODE_ENV=test %{_bindir}/mocha -R spec
+%else
+%{_bindir}/echo -e "\e[101m -=#=- Tests disabled -=#=- \e[0m"
+%endif
+
+%files
+%doc *.md
+%license LICENSE
+%{nodejs_sitelib}/%{packagename}
+
+%changelog
+* Thu Apr 26 2018 Jared K. Smith <jsmith(a)fedoraproject.org> - 1.1.0-1
+- Initial packaging
diff --git a/sources b/sources
new file mode 100644
index 0000000..858b0c1
--- /dev/null
+++ b/sources
@@ -0,0 +1,2 @@
+SHA512 (istanbul-lib-hook-1.1.0.tgz) = 537a8483054351ead9d1bb7c71f9777523f74baa290683ad93744e3b97f611f06bfd24620fd150ab3c1a641a85391bbc5bb3b4117a5a8be93b9311cad776de46
+SHA512 (istanbul-lib-hook-tests-1.1.0.tar.bz2) = 85364c9a5aae39b529ef9297cb385382ca94f18ce089763386883ebb891ee7a47430964555a20e35eae364c3f64aab6dafe31d8dab418a7d7de67e59fa4170cf
1
0
Architecture specific change in rpms/golang-google-golangorg-cloud.git
by githook-noreply＠fedoraproject.org 09 May '18
by githook-noreply＠fedoraproject.org 09 May '18
09 May '18
The package rpms/golang-google-golangorg-cloud.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-google-golangorg-cloud.git/c….
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 36b4a98da9a437142d3d93436a8ab36eced1eb80
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed May 9 14:59:07 2018 +0200
Bootstrap needed to avoid circular dep with golang.org/x/build
diff --git a/golang-google-golangorg-cloud.spec b/golang-google-golangorg-cloud.spec
index 29ff4fb..dceddb7 100644
--- a/golang-google-golangorg-cloud.spec
+++ b/golang-google-golangorg-cloud.spec
@@ -1,3 +1,5 @@
+# Bootstrap needed to avoid circular dep with golang.org/x/build
+%bcond_without bootstrap
# Run tests in check
# Disabled for bootstrapping of golang-googlecode-goauth2
%bcond_with check
@@ -44,9 +46,11 @@ BuildRequires: golang(go.opencensus.io/stats)
BuildRequires: golang(go.opencensus.io/stats/view)
BuildRequires: golang(go.opencensus.io/tag)
BuildRequires: golang(go.opencensus.io/trace)
+%if %{without bootstrap}
BuildRequires: golang(golang.org/x/build/kubernetes)
BuildRequires: golang(golang.org/x/build/kubernetes/api)
BuildRequires: golang(golang.org/x/build/kubernetes/gke)
+%endif
BuildRequires: golang(golang.org/x/debug)
BuildRequires: golang(golang.org/x/debug/local)
BuildRequires: golang(golang.org/x/net/context)
commit 7b2ed5d46213eeef1c1d5d8b75782b2561998246
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed May 9 13:36:34 2018 +0200
Upload tarball
diff --git a/.gitignore b/.gitignore
index c34e48d..ff50124 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/google-cloud-go-872c736.tar.gz
+/google-cloud-go-0.21.0.tar.gz
diff --git a/sources b/sources
index 155ffb3..b801ef7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (google-cloud-go-872c736.tar.gz) = 032f83a570301a745eb0803447dfa8cd9007fba5627ff602cffd5c38aaa78be3d2696cc5fd1075dede3e1498f9ae68aa8c5b2afdaaaaeee8920144e0f1885854
+SHA512 (google-cloud-go-0.21.0.tar.gz) = 914c6096d07f9cd64149ab972d0fd8fe0d3bc458b9e3c32d1d3239255967be648e8f1bf67351f4b4144da37363a73477e84879ffde7c0925cd1a35806e16c5cd
commit 7c55b5bd2e9a3cdc2fd8fd2220d6b329304791c8
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed May 9 12:25:22 2018 +0200
Upload the patch
diff --git a/Increase-license-check-header-size-to-200.patch b/Increase-license-check-header-size-to-200.patch
new file mode 100644
index 0000000..6850a14
--- /dev/null
+++ b/Increase-license-check-header-size-to-200.patch
@@ -0,0 +1,25 @@
+From 2bd30663482cb1e1e2a76d35b84f035d707e9932 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup(a)redhat.com>
+Date: Wed, 9 May 2018 12:04:59 +0200
+Subject: [PATCH] Increase license check header size to 200
+
+---
+ license_test.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/license_test.go b/license_test.go
+index f93e9e0..6b1a64c 100644
+--- a/license_test.go
++++ b/license_test.go
+@@ -53,7 +53,7 @@ func TestLicense(t *testing.T) {
+ if err != nil {
+ return nil
+ }
+- src = src[:140] // Ensure all of the sentinel values are at the top of the file.
++ src = src[:200] // Ensure all of the sentinel values are at the top of the file.
+
+ // Find license
+ for _, sentinel := range sentinels {
+--
+2.7.5
+
commit b4ec79eb86750de6263838a399777da6c05e9e8b
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed May 9 12:25:22 2018 +0200
Update to v0.21.0
Change import path prefix to cloud.google.com/go
- resolves: #1558755
diff --git a/golang-google-golangorg-cloud.spec b/golang-google-golangorg-cloud.spec
index b20b658..29ff4fb 100644
--- a/golang-google-golangorg-cloud.spec
+++ b/golang-google-golangorg-cloud.spec
@@ -1,211 +1,161 @@
-# If any of the following macros should be set otherwise,
-# you can wrap any of them with the following conditions:
-# - %%if 0%%{centos} == 7
-# - %%if 0%%{?rhel} == 7
-# - %%if 0%%{?fedora} == 23
-# Or just test for particular distribution:
-# - %%if 0%%{centos}
-# - %%if 0%%{?rhel}
-# - %%if 0%%{?fedora}
-#
-# Be aware, on centos, both %%rhel and %%centos are set. If you want to test
-# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition.
-# (Don't forget to replace double percentage symbol with single one in order to apply a condition)
-
-# Generate devel rpm
-%global with_devel 1
-# Build project from bundled dependencies
-%global with_bundled 0
-# Build with debug info rpm
-%global with_debug 0
-# Run tests in check section
-# Cyclic deps among cloud, grpc and oauth2
-%global with_check 0
-# Generate unit-test rpm
-%global with_unit_test 1
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
+# Run tests in check
+# Disabled for bootstrapping of golang-googlecode-goauth2
+%bcond_with check
+
+# http://github.com/GoogleCloudPlatform/google-cloud-go
+%global forgeurl https://github.com/GoogleCloudPlatform/google-cloud-go
+%global goipath cloud.google.com/go
+%global gcommit 29f476ffa9c4cd4fd14336b6043090ac1ad76733
-%global provider github
-%global provider_tld com
-%global project GoogleCloudPlatform
-%global repo google-cloud-go
-# https://github.com/GoogleCloudPlatform/google-cloud-go
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path google.golang.org/cloud
-%global commit 872c736f496c2ba12786bedbb8325576bbdb33cf
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+Version: 0.21.0
+
+%gometa
Name: golang-google-golangorg-cloud
-Version: 0
-Release: 0.14.git%{shortcommit}%{?dist}
+Release: 1%{?dist}
Summary: Google Cloud Platform APIs related types and common functions
License: ASL 2.0
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+URL: %{gourl}
+Source0: %{gosource}
+Patch0: Increase-license-check-header-size-to-200.patch
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
+BuildRequires: golang(github.com/golang/mock/gomock)
BuildRequires: golang(github.com/golang/protobuf/proto)
+BuildRequires: golang(github.com/golang/protobuf/ptypes)
+BuildRequires: golang(github.com/golang/protobuf/ptypes/any)
+BuildRequires: golang(github.com/golang/protobuf/ptypes/duration)
+BuildRequires: golang(github.com/golang/protobuf/ptypes/empty)
+BuildRequires: golang(github.com/golang/protobuf/ptypes/struct)
+BuildRequires: golang(github.com/golang/protobuf/ptypes/timestamp)
+BuildRequires: golang(github.com/golang/protobuf/ptypes/wrappers)
+BuildRequires: golang(github.com/google/btree)
+BuildRequires: golang(github.com/google/go-cmp/cmp)
+BuildRequires: golang(github.com/google/pprof/profile)
+BuildRequires: golang(github.com/googleapis/gax-go)
+BuildRequires: golang(go.opencensus.io/plugin/ocgrpc)
+BuildRequires: golang(go.opencensus.io/stats)
+BuildRequires: golang(go.opencensus.io/stats/view)
+BuildRequires: golang(go.opencensus.io/tag)
+BuildRequires: golang(go.opencensus.io/trace)
+BuildRequires: golang(golang.org/x/build/kubernetes)
+BuildRequires: golang(golang.org/x/build/kubernetes/api)
+BuildRequires: golang(golang.org/x/build/kubernetes/gke)
+BuildRequires: golang(golang.org/x/debug)
+BuildRequires: golang(golang.org/x/debug/local)
BuildRequires: golang(golang.org/x/net/context)
-# cyclic deps among cloud, grpc and oauth2
+BuildRequires: golang(golang.org/x/net/context/ctxhttp)
BuildRequires: golang(golang.org/x/oauth2)
BuildRequires: golang(golang.org/x/oauth2/google)
+BuildRequires: golang(golang.org/x/oauth2/jwt)
+BuildRequires: golang(golang.org/x/sync/errgroup)
+BuildRequires: golang(golang.org/x/sync/semaphore)
+BuildRequires: golang(golang.org/x/text/language)
+BuildRequires: golang(golang.org/x/time/rate)
BuildRequires: golang(google.golang.org/api/bigquery/v2)
+BuildRequires: golang(google.golang.org/api/cloudbuild/v1)
+BuildRequires: golang(google.golang.org/api/clouddebugger/v2)
+BuildRequires: golang(google.golang.org/api/cloudresourcemanager/v1)
+BuildRequires: golang(google.golang.org/api/cloudtrace/v1)
+BuildRequires: golang(google.golang.org/api/compute/v1)
BuildRequires: golang(google.golang.org/api/container/v1)
+BuildRequires: golang(google.golang.org/api/gensupport)
BuildRequires: golang(google.golang.org/api/googleapi)
-BuildRequires: golang(google.golang.org/api/logging/v1beta3)
-BuildRequires: golang(google.golang.org/api/pubsub/v1)
+BuildRequires: golang(google.golang.org/api/iterator)
+BuildRequires: golang(google.golang.org/api/option)
BuildRequires: golang(google.golang.org/api/storage/v1)
-BuildRequires: golang(google.golang.org/appengine)
-BuildRequires: golang(google.golang.org/appengine/file)
-BuildRequires: golang(google.golang.org/appengine/log)
+BuildRequires: golang(google.golang.org/api/support/bundler)
+BuildRequires: golang(google.golang.org/api/transport)
+BuildRequires: golang(google.golang.org/api/transport/grpc)
+BuildRequires: golang(google.golang.org/api/transport/http)
+BuildRequires: golang(google.golang.org/genproto/googleapis/api/label)
+BuildRequires: golang(google.golang.org/genproto/googleapis/api/metric)
+BuildRequires: golang(google.golang.org/genproto/googleapis/api/monitoredres)
+BuildRequires: golang(google.golang.org/genproto/googleapis/appengine/logging/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/bigtable/admin/v2)
+BuildRequires: golang(google.golang.org/genproto/googleapis/bigtable/v2)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/audit)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/dataproc/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/language/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/language/v1beta2)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/oslogin/common)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/oslogin/v1beta)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/speech/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/speech/v1beta1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/videointelligence/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta…
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta…
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/vision/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/container/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/datastore/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/devtools/clouddebugger/v2)
+BuildRequires: golang(google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v…
+BuildRequires: golang(google.golang.org/genproto/googleapis/devtools/cloudprofiler/v2)
+BuildRequires: golang(google.golang.org/genproto/googleapis/devtools/cloudtrace/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/devtools/cloudtrace/v2)
+BuildRequires: golang(google.golang.org/genproto/googleapis/firestore/v1beta1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/iam/admin/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/iam/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/logging/type)
+BuildRequires: golang(google.golang.org/genproto/googleapis/logging/v2)
+BuildRequires: golang(google.golang.org/genproto/googleapis/longrunning)
+BuildRequires: golang(google.golang.org/genproto/googleapis/monitoring/v3)
+BuildRequires: golang(google.golang.org/genproto/googleapis/privacy/dlp/v2)
+BuildRequires: golang(google.golang.org/genproto/googleapis/privacy/dlp/v2beta1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/privacy/dlp/v2beta2)
+BuildRequires: golang(google.golang.org/genproto/googleapis/pubsub/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/rpc/code)
+BuildRequires: golang(google.golang.org/genproto/googleapis/rpc/errdetails)
+BuildRequires: golang(google.golang.org/genproto/googleapis/rpc/status)
+BuildRequires: golang(google.golang.org/genproto/googleapis/spanner/admin/database/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/spanner/admin/instance/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/spanner/v1)
+BuildRequires: golang(google.golang.org/genproto/googleapis/type/latlng)
+BuildRequires: golang(google.golang.org/genproto/protobuf/field_mask)
BuildRequires: golang(google.golang.org/grpc)
+BuildRequires: golang(google.golang.org/grpc/codes)
BuildRequires: golang(google.golang.org/grpc/credentials)
-BuildRequires: golang(google.golang.org/grpc/credentials/oauth)
-%endif
-
-Requires: golang(github.com/golang/protobuf/proto)
-Requires: golang(golang.org/x/net/context)
-# cyclic deps among cloud, grpc and oauth2
-Requires: golang(golang.org/x/oauth2)
-Requires: golang(golang.org/x/oauth2/google)
-Requires: golang(google.golang.org/api/bigquery/v2)
-Requires: golang(google.golang.org/api/container/v1)
-Requires: golang(google.golang.org/api/googleapi)
-Requires: golang(google.golang.org/api/logging/v1beta3)
-Requires: golang(google.golang.org/api/pubsub/v1)
-Requires: golang(google.golang.org/api/storage/v1)
-Requires: golang(google.golang.org/appengine)
-Requires: golang(google.golang.org/appengine/file)
-Requires: golang(google.golang.org/appengine/log)
-Requires: golang(google.golang.org/grpc)
-Requires: golang(google.golang.org/grpc/credentials)
-Requires: golang(google.golang.org/grpc/credentials/oauth)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/bigquery) = %{version}-%{release}
-Provides: golang(%{import_path}/bigtable) = %{version}-%{release}
-Provides: golang(%{import_path}/bigtable/bttest) = %{version}-%{release}
-Provides: golang(%{import_path}/compute/metadata) = %{version}-%{release}
-Provides: golang(%{import_path}/container) = %{version}-%{release}
-Provides: golang(%{import_path}/datastore) = %{version}-%{release}
-Provides: golang(%{import_path}/examples/storage/appengine) = %{version}-%{release}
-Provides: golang(%{import_path}/logging) = %{version}-%{release}
-Provides: golang(%{import_path}/pubsub) = %{version}-%{release}
-Provides: golang(%{import_path}/storage) = %{version}-%{release}
+BuildRequires: golang(google.golang.org/grpc/keepalive)
+BuildRequires: golang(google.golang.org/grpc/metadata)
+BuildRequires: golang(google.golang.org/grpc/status)
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test}
-%package unit-test
-Summary: Unit tests for %{name} package
-
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{goipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup -q
+%patch0 -p1
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go"); do
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-done
-%endif
+%goinstall
+%if %{with check}
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-gotest %{import_path}
-gotest %{import_path}/bigquery
-gotest %{import_path}/bigtable
-gotest %{import_path}/datastore
-gotest %{import_path}/pubsub
-gotest %{import_path}/storage
+%gochecks
%endif
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README.md CONTRIBUTING.md AUTHORS CONTRIBUTORS
-%dir %{gopath}/src/google.golang.org
-%dir %{gopath}/src/%{import_path}
-%endif
-
-%if 0%{?with_unit_test}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc README.md CONTRIBUTING.md AUTHORS CONTRIBUTORS
-%endif
%changelog
+* Wed May 09 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0.21.0-1
+- Update to v0.21.0
+ Change import path prefix to cloud.google.com/go
+ resolves: #1558755
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.14.git872c736
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
1
0
09 May '18
The package rpms/eccodes.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=33d19907f1b1…
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=9cab2c2bc3bb…
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=56ad6fdf0709…
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=9b16b23603aa….
Change:
-ExcludeArch: ppc64
-ExcludeArch: armv7hl
+ExcludeArch: ppc64
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit 9b16b23603aad46f5206650db104ace47b38c097
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Wed May 9 13:07:10 2018 +0200
reactivate the excludearch lines
diff --git a/eccodes.spec b/eccodes.spec
index fa49e86..3f03f0f 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -98,13 +98,13 @@ Requires: %{name}-data = %{version}-%{release}
Obsoletes: grib_api < %{final_grib_api_version}
# as explained in bugzilla #1562066
-#ExcludeArch: i686
+ExcludeArch: i686
# as explained in bugzilla #1562071
-#ExcludeArch: ppc64
+ExcludeArch: ppc64
# as explained in bugzilla #1562076
-#ExcludeArch: s390x
+ExcludeArch: s390x
# as explained in bugzilla #1562084
-#ExcludeArch: armv7hl
+ExcludeArch: armv7hl
%description
ecCodes is a package developed by ECMWF which provides an application
@@ -356,7 +356,6 @@ ctest -V %{?_smp_mflags}
* Tue May 08 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.7.3-1
- Upgrade to version 2.7.3
- adjust latest grib_api version to 1.26.1-1
-- for now, try to disable ExcludeArch statements to see what happens
* Thu Mar 29 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.7.0-2
- added ExcludeArch statements for the failing architectures
commit d241e7e09088ee86f24ee566e232823e65b6d87a
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Wed May 9 12:04:28 2018 +0200
reinsert the data package in the sources list
diff --git a/sources b/sources
index f1bdd17..1449418 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (eccodes-2.7.3-Source.tar.gz) = a6ac6dae5a785a14e2b69ecc698e72f4173c96655c8944f6e6f1c530e72a078036c2fd76d77473e17b33be606ec36f8236a0efa22afc8b4d7760d88a053902f4
+SHA512 (eccodes_test_data.tar.gz) = b0baa0867ac583ec9000e21b2653d11c26333a50bb817a41cad0ebc30b445fc9295f7b5cbc6908364aed502bfc4786929f2dcd0526b6540b26c1c024c90ede6a
commit 75a9b2b9f9f068c17aecdf52f8dfc194888ca420
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Wed May 9 11:39:41 2018 +0200
add tar file for updated version 2.7.3
diff --git a/.gitignore b/.gitignore
index d15f2b0..c9bee99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/eccodes-2.7.0-Source.tar.gz
/eccodes_test_data.tar.gz
+/eccodes-2.7.3-Source.tar.gz
diff --git a/sources b/sources
index 27a0e6e..f1bdd17 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (eccodes-2.7.0-Source.tar.gz) = 6b65902e0e82a038e6c705c68a5947ceef4f6950d83bdfcc78ec83b60bdcbc2b56a62971c5aa40c91b749c224ffa8ef120e9b72bf168032ffef9096207234103
-SHA512 (eccodes_test_data.tar.gz) = b0baa0867ac583ec9000e21b2653d11c26333a50bb817a41cad0ebc30b445fc9295f7b5cbc6908364aed502bfc4786929f2dcd0526b6540b26c1c024c90ede6a
+SHA512 (eccodes-2.7.3-Source.tar.gz) = a6ac6dae5a785a14e2b69ecc698e72f4173c96655c8944f6e6f1c530e72a078036c2fd76d77473e17b33be606ec36f8236a0efa22afc8b4d7760d88a053902f4
commit 9cab2c2bc3bb59f3a04a624da6ca4d03e60731b2
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Wed May 9 11:35:07 2018 +0200
upgrade to version 2.7.3
diff --git a/eccodes.spec b/eccodes.spec
index 0ccf629..fa49e86 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -1,16 +1,17 @@
Name: eccodes
-Version: 2.7.0
-Release: 2%{?dist}
+Version: 2.7.3
+Release: 1%{?dist}
Summary: WMO data format decoding and encoding
# force the shared libraries to have these so versions
%global so_version 0.1
%global so_version_f90 0.1
-# latest rawhide grib_api version is 1.25.0-4
+# latest rawhide grib_api version is 1.26.1-1
# but this version number is to be updated as soon as we know
# what the final release of grib_api by upstream will be.
-%global final_grib_api_version 1.25.0-4
+# latest upstream grib_api release is 1.26.1 (08-May-2018)
+%global final_grib_api_version 1.26.1-1
# license remarks:
# most of eccodes is licensed ASL 2.0 but some special cases must be noted.
@@ -36,6 +37,7 @@ URL: https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home
Source0: https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-%{ver…
# note: this data package is unversioned upstream but still it is updated
# now and then. The current copy was downloaded 03-Jan-2018
+# (it was still the same on 08-May-2018)
Source1: http://download.ecmwf.org/test-data/grib_api/eccodes_test_data.tar.gz
# Support 32-bit
# https://software.ecmwf.int/issues/browse/SUP-1813
@@ -96,13 +98,13 @@ Requires: %{name}-data = %{version}-%{release}
Obsoletes: grib_api < %{final_grib_api_version}
# as explained in bugzilla #1562066
-ExcludeArch: i686
+#ExcludeArch: i686
# as explained in bugzilla #1562071
-ExcludeArch: ppc64
+#ExcludeArch: ppc64
# as explained in bugzilla #1562076
-ExcludeArch: s390x
+#ExcludeArch: s390x
# as explained in bugzilla #1562084
-ExcludeArch: armv7hl
+#ExcludeArch: armv7hl
%description
ecCodes is a package developed by ECMWF which provides an application
@@ -138,7 +140,7 @@ and behaviour. A significant difference compared with GRIB-API tools is that
bufr_dump produces output in JSON format suitable for many web based
applications.
-
+#####################################################
%package devel
Summary: Contains ecCodes development files
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -150,7 +152,7 @@ Obsoletes: grib_api-devel < %{final_grib_api_version}
%description devel
Header files and libraries for ecCodes.
-# note: python3 is not yet supported by eccodes
+#####################################################
%package -n python2-%{name}
Summary: A python2 interface to ecCodes
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -163,6 +165,10 @@ Requires: jasper-devel%{?_isa}
%description -n python2-%{name}
A python2 interface to ecCodes. Also a legacy interface to gribapi is provided.
+#####################################################
+# note: python3 is not yet supported by eccodes
+
+#####################################################
%package data
Summary: Data needed by the eccodes library and tools
BuildArch: noarch
@@ -173,6 +179,7 @@ to encode and decode grib and bufr files, and includes
both the official WMO tables and a number of often used
local definitions by ECMWF and other meteorological centers.
+#####################################################
%package doc
Summary: Documentation and example code
BuildArch: noarch
@@ -185,6 +192,7 @@ This package contains the html documentation for ecCodes
and a fair number of example programs and scripts to use it
in C, Fortran 90, and Python.
+#####################################################
%prep
%autosetup -n %{name}-%{version}-Source -p1
@@ -345,6 +353,11 @@ ctest -V %{?_smp_mflags}
%doc %{_datadir}/doc/%{name}/
%changelog
+* Tue May 08 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.7.3-1
+- Upgrade to version 2.7.3
+- adjust latest grib_api version to 1.26.1-1
+- for now, try to disable ExcludeArch statements to see what happens
+
* Thu Mar 29 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.7.0-2
- added ExcludeArch statements for the failing architectures
commit 56ad6fdf070973d3705c549a7f99e02b3d0cee01
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Mon Apr 23 09:36:05 2018 +0200
add rpmlintrc and disable manual test runs
diff --git a/eccodes.rpmlintrc b/eccodes.rpmlintrc
new file mode 100644
index 0000000..60064d2
--- /dev/null
+++ b/eccodes.rpmlintrc
@@ -0,0 +1,56 @@
+# use like this:
+# rpmlint --file eccodes.rpmlintrc *.rpm
+# example: addFilter ("^foo-.*regex-match-for-rpmlint-warning")
+
+# these are invalid spelling warnings. GRIB and BUFR are correct, since these are
+# the names of the data files that this software handles.
+# the description itself is a 1-to-1 copy of what the (UK-based) upstream
+# writes, and I am not going to translate this to US spelling ...
+addFilter ("W: spelling-error %description -l en_US behaviour -> behavior")
+addFilter ("W: spelling-error %description -l en_US grib ->")
+addFilter ("W: spelling-error %description -l en_US bufr ->")
+
+# this data file with wrong line ending has been added to the software on purpose
+# for testing purposes, so this is no mistake
+addFilter ("eccodes-doc.noarch: W: wrong-file-end-of-line-encoding /usr/share/doc/eccodes/examples/python/flight_data.csv")
+
+# these data files are no scripts. The dataformat just has an unfortunate first line
+# starting with #! so it resembles a shebang line.
+# see also comment #3 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("^eccodes-data.noarch: E: wrong-script-interpreter /usr/share/eccodes/definitions/grib1/local.82.0.def")
+addFilter ("^eccodes-data.noarch: E: non-executable-script /usr/share/eccodes/definitions/grib1/local.82.0.def")
+addFilter ("^eccodes-data.noarch: E: wrong-script-interpreter /usr/share/eccodes/definitions/grib1/local.82.83.def")
+addFilter ("^eccodes-data.noarch: E: non-executable-script /usr/share/eccodes/definitions/grib1/local.82.83.def")
+
+# this is a false error (its an rpmlint bug).
+# the spec file now uses %ldconfig_scriptlets in stead of the old ldconfig-postin/postun
+# see also comment #18 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postin /usr/lib64/libeccodes.so.0.1")
+addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postun /usr/lib64/libeccodes.so.0.1")
+addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postin /usr/lib64/libeccodes_f90.so.0.1")
+addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postun /usr/lib64/libeccodes_f90.so.0.1")
+
+# this is an rpmlint bug
+# see also comment #8 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("eccodes-debuginfo.x86_64: E: useless-provides debuginfo\(build-id\)")
+
+# there is no full compatibility between the old grib_api and the new eccodes
+# so only obsoletes can be used bu no provides.
+# see also comment #21 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("^eccodes.x86_64: W: obsolete-not-provided grib_api")
+addFilter ("^eccodes-devel.x86_64: W: obsolete-not-provided grib_api-devel")
+addFilter ("^eccodes-devel.x86_64: W: only-non-binary-in-usr-lib")
+
+# documentation is in a dedicated doc subpackage,
+# so these warnings have no merit
+addFilter ("python2-eccodes.x86_64: W: no-documentation")
+addFilter ("eccodes-debugsource.x86_64: W: no-documentation")
+addFilter ("eccodes-devel.x86_64: W: no-documentation")
+addFilter ("eccodes-data.noarch: W: no-documentation")
+
+# temporary disable the man page warning, since it obscures other problems that
+# may be more important, and it has already been reported upstream
+# see also comment #3 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("eccodes.x86_64: W: no-manual-page-for-binary")
+
+# addFilter ("")
diff --git a/eccodes.spec b/eccodes.spec
index 48678b0..0ccf629 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -98,7 +98,7 @@ Obsoletes: grib_api < %{final_grib_api_version}
# as explained in bugzilla #1562066
ExcludeArch: i686
# as explained in bugzilla #1562071
-# ExcludeArch: ppc64
+ExcludeArch: ppc64
# as explained in bugzilla #1562076
ExcludeArch: s390x
# as explained in bugzilla #1562084
@@ -236,7 +236,6 @@ cd build
-DECCODES_SOVERSION_F90=%{so_version_f90} \
-DPYTHON_EXECUTABLE=%{_bindir}/python2 \
..
-# or: -DCMAKE_SKIP_RPATH=ON ??
%make_build
@@ -313,29 +312,9 @@ cd build
# so a patch has been added to solve this for now.
# See: https://software.ecmwf.int/issues/browse/SUP-1812
# (unfortunately this issue is not public)
-#LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
-#LIBRARY_PATH=%{buildroot}/%{_libdir} \
-# ctest -V %{?_smp_mflags}
-
-# manually run some problematic tests for ppc64:
-#echo "================================="
-#echo "================================="
-#echo "================================="
-#echo "output for: ctest -VV -R t_optimize_scaling_sh"
-#echo "================================="
-#LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
-#LIBRARY_PATH=%{buildroot}/%{_libdir} \
-#ctest -VV -R t_optimize_scaling_sh
-echo "================================="
-echo "================================="
-echo "================================="
-echo "output for: ctest -VV -R t_bufr_dump_encode_fortran"
LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
LIBRARY_PATH=%{buildroot}/%{_libdir} \
-ctest -VV -R t_bufr_dump_encode_fortran
-echo "================================="
-echo "================================="
-echo "================================="
+ctest -V %{?_smp_mflags}
%files
%license LICENSE
commit c1a58927ef8d1c24cbea38b1673c6a8912df14e8
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Thu Apr 19 17:11:34 2018 +0200
now run the second failing ppc test case
diff --git a/eccodes.spec b/eccodes.spec
index 246aafc..48678b0 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -318,21 +318,21 @@ cd build
# ctest -V %{?_smp_mflags}
# manually run some problematic tests for ppc64:
-echo "================================="
-echo "================================="
-echo "================================="
-echo "output for: ctest -VV -R t_optimize_scaling_sh"
-echo "================================="
-LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
-LIBRARY_PATH=%{buildroot}/%{_libdir} \
-ctest -VV -R t_optimize_scaling_sh; echo 'dummy'
+#echo "================================="
+#echo "================================="
+#echo "================================="
+#echo "output for: ctest -VV -R t_optimize_scaling_sh"
+#echo "================================="
+#LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
+#LIBRARY_PATH=%{buildroot}/%{_libdir} \
+#ctest -VV -R t_optimize_scaling_sh
echo "================================="
echo "================================="
echo "================================="
echo "output for: ctest -VV -R t_bufr_dump_encode_fortran"
LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
LIBRARY_PATH=%{buildroot}/%{_libdir} \
-ctest -VV -R t_bufr_dump_encode_fortran; echo 'dummy'
+ctest -VV -R t_bufr_dump_encode_fortran
echo "================================="
echo "================================="
echo "================================="
commit 2c7cee4496dbf037422cc52b76eadd7201d8d990
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Thu Apr 19 16:53:57 2018 +0200
correct stupid library path mistake
diff --git a/eccodes.spec b/eccodes.spec
index c9c017a..246aafc 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -313,8 +313,8 @@ cd build
# so a patch has been added to solve this for now.
# See: https://software.ecmwf.int/issues/browse/SUP-1812
# (unfortunately this issue is not public)
-LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
-LIBRARY_PATH=%{buildroot}/%{_libdir} \
+#LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
+#LIBRARY_PATH=%{buildroot}/%{_libdir} \
# ctest -V %{?_smp_mflags}
# manually run some problematic tests for ppc64:
@@ -323,11 +323,15 @@ echo "================================="
echo "================================="
echo "output for: ctest -VV -R t_optimize_scaling_sh"
echo "================================="
+LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
+LIBRARY_PATH=%{buildroot}/%{_libdir} \
ctest -VV -R t_optimize_scaling_sh; echo 'dummy'
echo "================================="
echo "================================="
echo "================================="
echo "output for: ctest -VV -R t_bufr_dump_encode_fortran"
+LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
+LIBRARY_PATH=%{buildroot}/%{_libdir} \
ctest -VV -R t_bufr_dump_encode_fortran; echo 'dummy'
echo "================================="
echo "================================="
commit 8f492aa41e94be95db7ed691f711f04584409ead
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Thu Apr 19 16:40:19 2018 +0200
disable the full test suite, since otherwise the individual tests are not executed
diff --git a/eccodes.spec b/eccodes.spec
index a8404c4..c9c017a 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -315,7 +315,7 @@ cd build
# (unfortunately this issue is not public)
LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
LIBRARY_PATH=%{buildroot}/%{_libdir} \
-ctest -V %{?_smp_mflags}; echo 'dummy'
+# ctest -V %{?_smp_mflags}
# manually run some problematic tests for ppc64:
echo "================================="
commit c7b500b2a0ff17eeaf39c0ecd58fbb9cb26ad684
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Thu Apr 19 16:22:37 2018 +0200
add echo statements behind the failing tests to let the code continue
diff --git a/eccodes.spec b/eccodes.spec
index 3c23d94..a8404c4 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -315,7 +315,7 @@ cd build
# (unfortunately this issue is not public)
LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
LIBRARY_PATH=%{buildroot}/%{_libdir} \
-ctest -V %{?_smp_mflags}
+ctest -V %{?_smp_mflags}; echo 'dummy'
# manually run some problematic tests for ppc64:
echo "================================="
@@ -323,12 +323,12 @@ echo "================================="
echo "================================="
echo "output for: ctest -VV -R t_optimize_scaling_sh"
echo "================================="
-ctest -VV -R t_optimize_scaling_sh
+ctest -VV -R t_optimize_scaling_sh; echo 'dummy'
echo "================================="
echo "================================="
echo "================================="
echo "output for: ctest -VV -R t_bufr_dump_encode_fortran"
-ctest -VV -R t_bufr_dump_encode_fortran
+ctest -VV -R t_bufr_dump_encode_fortran; echo 'dummy'
echo "================================="
echo "================================="
echo "================================="
commit 33d19907f1b1f28d060caad5d81266f47b35ea10
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Thu Apr 19 16:01:20 2018 +0200
undo the ppc64 exclude
diff --git a/eccodes.spec b/eccodes.spec
index 7b0e536..3c23d94 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -98,7 +98,7 @@ Obsoletes: grib_api < %{final_grib_api_version}
# as explained in bugzilla #1562066
ExcludeArch: i686
# as explained in bugzilla #1562071
-ExcludeArch: ppc64
+# ExcludeArch: ppc64
# as explained in bugzilla #1562076
ExcludeArch: s390x
# as explained in bugzilla #1562084
commit 9c52eec8a7ff51b07c10e93cca3c1a367041541e
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Thu Apr 19 15:51:14 2018 +0200
add running some problematic tests in verbose mode
diff --git a/eccodes.spec b/eccodes.spec
index 0ccf629..7b0e536 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -236,6 +236,7 @@ cd build
-DECCODES_SOVERSION_F90=%{so_version_f90} \
-DPYTHON_EXECUTABLE=%{_bindir}/python2 \
..
+# or: -DCMAKE_SKIP_RPATH=ON ??
%make_build
@@ -316,6 +317,22 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
LIBRARY_PATH=%{buildroot}/%{_libdir} \
ctest -V %{?_smp_mflags}
+# manually run some problematic tests for ppc64:
+echo "================================="
+echo "================================="
+echo "================================="
+echo "output for: ctest -VV -R t_optimize_scaling_sh"
+echo "================================="
+ctest -VV -R t_optimize_scaling_sh
+echo "================================="
+echo "================================="
+echo "================================="
+echo "output for: ctest -VV -R t_bufr_dump_encode_fortran"
+ctest -VV -R t_bufr_dump_encode_fortran
+echo "================================="
+echo "================================="
+echo "================================="
+
%files
%license LICENSE
%doc README ChangeLog AUTHORS
1
0
09 May '18
The package rpms/eccodes.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=9b16b23603aa….
Change:
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit 9b16b23603aad46f5206650db104ace47b38c097
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Wed May 9 13:07:10 2018 +0200
reactivate the excludearch lines
diff --git a/eccodes.spec b/eccodes.spec
index fa49e86..3f03f0f 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -98,13 +98,13 @@ Requires: %{name}-data = %{version}-%{release}
Obsoletes: grib_api < %{final_grib_api_version}
# as explained in bugzilla #1562066
-#ExcludeArch: i686
+ExcludeArch: i686
# as explained in bugzilla #1562071
-#ExcludeArch: ppc64
+ExcludeArch: ppc64
# as explained in bugzilla #1562076
-#ExcludeArch: s390x
+ExcludeArch: s390x
# as explained in bugzilla #1562084
-#ExcludeArch: armv7hl
+ExcludeArch: armv7hl
%description
ecCodes is a package developed by ECMWF which provides an application
@@ -356,7 +356,6 @@ ctest -V %{?_smp_mflags}
* Tue May 08 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.7.3-1
- Upgrade to version 2.7.3
- adjust latest grib_api version to 1.26.1-1
-- for now, try to disable ExcludeArch statements to see what happens
* Thu Mar 29 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.7.0-2
- added ExcludeArch statements for the failing architectures
1
0
09 May '18
The package rpms/eccodes.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=9cab2c2bc3bb…
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=56ad6fdf0709….
Change:
-ExcludeArch: armv7hl
+ExcludeArch: ppc64
Thanks.
Full change:
============
commit 75a9b2b9f9f068c17aecdf52f8dfc194888ca420
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Wed May 9 11:39:41 2018 +0200
add tar file for updated version 2.7.3
diff --git a/.gitignore b/.gitignore
index d15f2b0..c9bee99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/eccodes-2.7.0-Source.tar.gz
/eccodes_test_data.tar.gz
+/eccodes-2.7.3-Source.tar.gz
diff --git a/sources b/sources
index 27a0e6e..f1bdd17 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (eccodes-2.7.0-Source.tar.gz) = 6b65902e0e82a038e6c705c68a5947ceef4f6950d83bdfcc78ec83b60bdcbc2b56a62971c5aa40c91b749c224ffa8ef120e9b72bf168032ffef9096207234103
-SHA512 (eccodes_test_data.tar.gz) = b0baa0867ac583ec9000e21b2653d11c26333a50bb817a41cad0ebc30b445fc9295f7b5cbc6908364aed502bfc4786929f2dcd0526b6540b26c1c024c90ede6a
+SHA512 (eccodes-2.7.3-Source.tar.gz) = a6ac6dae5a785a14e2b69ecc698e72f4173c96655c8944f6e6f1c530e72a078036c2fd76d77473e17b33be606ec36f8236a0efa22afc8b4d7760d88a053902f4
commit 9cab2c2bc3bb59f3a04a624da6ca4d03e60731b2
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Wed May 9 11:35:07 2018 +0200
upgrade to version 2.7.3
diff --git a/eccodes.spec b/eccodes.spec
index 0ccf629..fa49e86 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -1,16 +1,17 @@
Name: eccodes
-Version: 2.7.0
-Release: 2%{?dist}
+Version: 2.7.3
+Release: 1%{?dist}
Summary: WMO data format decoding and encoding
# force the shared libraries to have these so versions
%global so_version 0.1
%global so_version_f90 0.1
-# latest rawhide grib_api version is 1.25.0-4
+# latest rawhide grib_api version is 1.26.1-1
# but this version number is to be updated as soon as we know
# what the final release of grib_api by upstream will be.
-%global final_grib_api_version 1.25.0-4
+# latest upstream grib_api release is 1.26.1 (08-May-2018)
+%global final_grib_api_version 1.26.1-1
# license remarks:
# most of eccodes is licensed ASL 2.0 but some special cases must be noted.
@@ -36,6 +37,7 @@ URL: https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home
Source0: https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-%{ver…
# note: this data package is unversioned upstream but still it is updated
# now and then. The current copy was downloaded 03-Jan-2018
+# (it was still the same on 08-May-2018)
Source1: http://download.ecmwf.org/test-data/grib_api/eccodes_test_data.tar.gz
# Support 32-bit
# https://software.ecmwf.int/issues/browse/SUP-1813
@@ -96,13 +98,13 @@ Requires: %{name}-data = %{version}-%{release}
Obsoletes: grib_api < %{final_grib_api_version}
# as explained in bugzilla #1562066
-ExcludeArch: i686
+#ExcludeArch: i686
# as explained in bugzilla #1562071
-ExcludeArch: ppc64
+#ExcludeArch: ppc64
# as explained in bugzilla #1562076
-ExcludeArch: s390x
+#ExcludeArch: s390x
# as explained in bugzilla #1562084
-ExcludeArch: armv7hl
+#ExcludeArch: armv7hl
%description
ecCodes is a package developed by ECMWF which provides an application
@@ -138,7 +140,7 @@ and behaviour. A significant difference compared with GRIB-API tools is that
bufr_dump produces output in JSON format suitable for many web based
applications.
-
+#####################################################
%package devel
Summary: Contains ecCodes development files
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -150,7 +152,7 @@ Obsoletes: grib_api-devel < %{final_grib_api_version}
%description devel
Header files and libraries for ecCodes.
-# note: python3 is not yet supported by eccodes
+#####################################################
%package -n python2-%{name}
Summary: A python2 interface to ecCodes
Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -163,6 +165,10 @@ Requires: jasper-devel%{?_isa}
%description -n python2-%{name}
A python2 interface to ecCodes. Also a legacy interface to gribapi is provided.
+#####################################################
+# note: python3 is not yet supported by eccodes
+
+#####################################################
%package data
Summary: Data needed by the eccodes library and tools
BuildArch: noarch
@@ -173,6 +179,7 @@ to encode and decode grib and bufr files, and includes
both the official WMO tables and a number of often used
local definitions by ECMWF and other meteorological centers.
+#####################################################
%package doc
Summary: Documentation and example code
BuildArch: noarch
@@ -185,6 +192,7 @@ This package contains the html documentation for ecCodes
and a fair number of example programs and scripts to use it
in C, Fortran 90, and Python.
+#####################################################
%prep
%autosetup -n %{name}-%{version}-Source -p1
@@ -345,6 +353,11 @@ ctest -V %{?_smp_mflags}
%doc %{_datadir}/doc/%{name}/
%changelog
+* Tue May 08 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.7.3-1
+- Upgrade to version 2.7.3
+- adjust latest grib_api version to 1.26.1-1
+- for now, try to disable ExcludeArch statements to see what happens
+
* Thu Mar 29 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.7.0-2
- added ExcludeArch statements for the failing architectures
commit 56ad6fdf070973d3705c549a7f99e02b3d0cee01
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Mon Apr 23 09:36:05 2018 +0200
add rpmlintrc and disable manual test runs
diff --git a/eccodes.rpmlintrc b/eccodes.rpmlintrc
new file mode 100644
index 0000000..60064d2
--- /dev/null
+++ b/eccodes.rpmlintrc
@@ -0,0 +1,56 @@
+# use like this:
+# rpmlint --file eccodes.rpmlintrc *.rpm
+# example: addFilter ("^foo-.*regex-match-for-rpmlint-warning")
+
+# these are invalid spelling warnings. GRIB and BUFR are correct, since these are
+# the names of the data files that this software handles.
+# the description itself is a 1-to-1 copy of what the (UK-based) upstream
+# writes, and I am not going to translate this to US spelling ...
+addFilter ("W: spelling-error %description -l en_US behaviour -> behavior")
+addFilter ("W: spelling-error %description -l en_US grib ->")
+addFilter ("W: spelling-error %description -l en_US bufr ->")
+
+# this data file with wrong line ending has been added to the software on purpose
+# for testing purposes, so this is no mistake
+addFilter ("eccodes-doc.noarch: W: wrong-file-end-of-line-encoding /usr/share/doc/eccodes/examples/python/flight_data.csv")
+
+# these data files are no scripts. The dataformat just has an unfortunate first line
+# starting with #! so it resembles a shebang line.
+# see also comment #3 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("^eccodes-data.noarch: E: wrong-script-interpreter /usr/share/eccodes/definitions/grib1/local.82.0.def")
+addFilter ("^eccodes-data.noarch: E: non-executable-script /usr/share/eccodes/definitions/grib1/local.82.0.def")
+addFilter ("^eccodes-data.noarch: E: wrong-script-interpreter /usr/share/eccodes/definitions/grib1/local.82.83.def")
+addFilter ("^eccodes-data.noarch: E: non-executable-script /usr/share/eccodes/definitions/grib1/local.82.83.def")
+
+# this is a false error (its an rpmlint bug).
+# the spec file now uses %ldconfig_scriptlets in stead of the old ldconfig-postin/postun
+# see also comment #18 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postin /usr/lib64/libeccodes.so.0.1")
+addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postun /usr/lib64/libeccodes.so.0.1")
+addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postin /usr/lib64/libeccodes_f90.so.0.1")
+addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postun /usr/lib64/libeccodes_f90.so.0.1")
+
+# this is an rpmlint bug
+# see also comment #8 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("eccodes-debuginfo.x86_64: E: useless-provides debuginfo\(build-id\)")
+
+# there is no full compatibility between the old grib_api and the new eccodes
+# so only obsoletes can be used bu no provides.
+# see also comment #21 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("^eccodes.x86_64: W: obsolete-not-provided grib_api")
+addFilter ("^eccodes-devel.x86_64: W: obsolete-not-provided grib_api-devel")
+addFilter ("^eccodes-devel.x86_64: W: only-non-binary-in-usr-lib")
+
+# documentation is in a dedicated doc subpackage,
+# so these warnings have no merit
+addFilter ("python2-eccodes.x86_64: W: no-documentation")
+addFilter ("eccodes-debugsource.x86_64: W: no-documentation")
+addFilter ("eccodes-devel.x86_64: W: no-documentation")
+addFilter ("eccodes-data.noarch: W: no-documentation")
+
+# temporary disable the man page warning, since it obscures other problems that
+# may be more important, and it has already been reported upstream
+# see also comment #3 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950
+addFilter ("eccodes.x86_64: W: no-manual-page-for-binary")
+
+# addFilter ("")
diff --git a/eccodes.spec b/eccodes.spec
index 48678b0..0ccf629 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -98,7 +98,7 @@ Obsoletes: grib_api < %{final_grib_api_version}
# as explained in bugzilla #1562066
ExcludeArch: i686
# as explained in bugzilla #1562071
-# ExcludeArch: ppc64
+ExcludeArch: ppc64
# as explained in bugzilla #1562076
ExcludeArch: s390x
# as explained in bugzilla #1562084
@@ -236,7 +236,6 @@ cd build
-DECCODES_SOVERSION_F90=%{so_version_f90} \
-DPYTHON_EXECUTABLE=%{_bindir}/python2 \
..
-# or: -DCMAKE_SKIP_RPATH=ON ??
%make_build
@@ -313,29 +312,9 @@ cd build
# so a patch has been added to solve this for now.
# See: https://software.ecmwf.int/issues/browse/SUP-1812
# (unfortunately this issue is not public)
-#LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
-#LIBRARY_PATH=%{buildroot}/%{_libdir} \
-# ctest -V %{?_smp_mflags}
-
-# manually run some problematic tests for ppc64:
-#echo "================================="
-#echo "================================="
-#echo "================================="
-#echo "output for: ctest -VV -R t_optimize_scaling_sh"
-#echo "================================="
-#LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
-#LIBRARY_PATH=%{buildroot}/%{_libdir} \
-#ctest -VV -R t_optimize_scaling_sh
-echo "================================="
-echo "================================="
-echo "================================="
-echo "output for: ctest -VV -R t_bufr_dump_encode_fortran"
LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
LIBRARY_PATH=%{buildroot}/%{_libdir} \
-ctest -VV -R t_bufr_dump_encode_fortran
-echo "================================="
-echo "================================="
-echo "================================="
+ctest -V %{?_smp_mflags}
%files
%license LICENSE
1
0
Architecture specific change in rpms/rust-take_mut.git
by githook-noreply＠fedoraproject.org 09 May '18
by githook-noreply＠fedoraproject.org 09 May '18
09 May '18
The package rpms/rust-take_mut.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-take_mut.git/commit/?id=fb1685….
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit fb1685b529a5c25188f198a8c46b26c7d590c2e1
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Wed May 9 10:45:19 2018 +0200
initial import
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6a26898
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/take_mut-0.2.2.crate
diff --git a/rust-take_mut.spec b/rust-take_mut.spec
new file mode 100644
index 0000000..af04176
--- /dev/null
+++ b/rust-take_mut.spec
@@ -0,0 +1,55 @@
+# Generated by rust2rpm
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate take_mut
+
+Name: rust-%{crate}
+Version: 0.2.2
+Release: 1%{?dist}
+Summary: Take a T from a &mut T temporarily
+
+License: MIT
+URL: https://crates.io/crates/take_mut
+Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{ve…
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: rust-packaging
+
+%description
+%{summary}.
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel
+Take a T from a &mut T temporarily.
+
+This package contains library source intended for building other packages
+which use %{crate} from crates.io.
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%files devel
+%license LICENSE
+%doc README.md
+%{cargo_registry}/%{crate}-%{version}/
+
+%changelog
+* Thu Apr 26 2018 Igor Gnatenko <ignatenko(a)redhat.com> - 0.2.2-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..59870e8
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (take_mut-0.2.2.crate) = f75a5ce723e710809130878b0ff5df368f5929201e557661dd0154f3b31ea58d7d30d84672ca5a684fbfcae5f82ab2c21b1b5d9edc4c67d08c221228bd9de814
1
0
08 May '18
The package rpms/ceph.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ceph.git/commit/?id=b79737d3dfe8949….
Change:
-%ifnarch armv7hl
Thanks.
Full change:
============
commit b79737d3dfe8949eee6764ee6298ee6a715a3042
Author: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
Date: Tue May 8 11:57:37 2018 -0400
New release (1:13.1.0-1)
Signed-off-by: Kaleb S. KEITHLEY <kkeithle(a)redhat.com>
diff --git a/0001-9df56dc509a6cbb7c1da8073e82fc1d2a284418d.patch b/0001-9df56dc509a6cbb7c1da8073e82fc1d2a284418d.patch
new file mode 100644
index 0000000..ffc38da
--- /dev/null
+++ b/0001-9df56dc509a6cbb7c1da8073e82fc1d2a284418d.patch
@@ -0,0 +1,165 @@
+--- ceph-13.1.0/src/mon/LogMonitor.cc.orig 2018-05-08 08:12:50.101933925 -0400
++++ ceph-13.1.0/src/mon/LogMonitor.cc 2018-05-08 08:12:59.470933925 -0400
+@@ -62,7 +62,6 @@
+ {
+ dout(10) << "create_initial -- creating initial map" << dendl;
+ LogEntry e;
+- memset(&e.who, 0, sizeof(e.who));
+ e.name = g_conf->name;
+ e.stamp = ceph_clock_now();
+ e.prio = CLOG_INFO;
+--- ceph-13.1.0/src/mon/MonMap.h.orig 2018-05-08 08:13:08.173933925 -0400
++++ ceph-13.1.0/src/mon/MonMap.h 2018-05-08 08:13:17.391933925 -0400
+@@ -118,7 +118,6 @@
+
+ MonMap()
+ : epoch(0) {
+- memset(&fsid, 0, sizeof(fsid));
+ }
+
+ uuid_d& get_fsid() { return fsid; }
+--- ceph-13.1.0/src/os/filestore/HashIndex.h.orig 2018-05-08 08:13:35.377933925 -0400
++++ ceph-13.1.0/src/os/filestore/HashIndex.h 2018-05-08 08:13:59.853933925 -0400
+@@ -395,7 +395,7 @@
+
+ struct CmpPairBitwise {
+ bool operator()(const pair<string, ghobject_t>& l,
+- const pair<string, ghobject_t>& r)
++ const pair<string, ghobject_t>& r) const
+ {
+ if (l.first < r.first)
+ return true;
+@@ -408,7 +408,7 @@
+ };
+
+ struct CmpHexdigitStringBitwise {
+- bool operator()(const string& l, const string& r) {
++ bool operator()(const string& l, const string& r) const {
+ return reverse_hexdigit_bits_string(l) < reverse_hexdigit_bits_string(r);
+ }
+ };
+--- ceph-13.1.0/src/os/filestore/LFNIndex.h.orig 2018-05-08 08:14:06.721933925 -0400
++++ ceph-13.1.0/src/os/filestore/LFNIndex.h 2018-05-08 08:14:34.671933925 -0400
+@@ -63,7 +63,7 @@
+ out: \
+ complete_inject_failure(); \
+ return r; \
+- } catch (RetryException) { \
++ } catch (RetryException&) { \
+ failed = true; \
+ } catch (...) { \
+ ceph_abort(); \
+--- ceph-13.1.0/src/client/Inode.h.orig 2018-05-08 08:08:26.305933925 -0400
++++ ceph-13.1.0/src/client/Inode.h 2018-05-08 08:08:38.029933925 -0400
+@@ -279,7 +279,6 @@
+ _ref(0), ll_ref(0)
+ {
+ memset(&dir_layout, 0, sizeof(dir_layout));
+- memset("a, 0, sizeof(quota));
+ }
+ ~Inode();
+
+--- ceph-13.1.0/src/osd/OSDMap.h.orig 2018-05-08 08:14:51.066933925 -0400
++++ ceph-13.1.0/src/osd/OSDMap.h 2018-05-08 08:15:14.148933925 -0400
+@@ -427,7 +427,6 @@
+ encode_features(0),
+ epoch(e), new_pool_max(-1), new_flags(-1), new_max_osd(-1),
+ have_crc(false), full_crc(0), inc_crc(0) {
+- memset(&fsid, 0, sizeof(fsid));
+ }
+ explicit Incremental(bufferlist &bl) {
+ bufferlist::iterator p = bl.begin();
+@@ -607,7 +606,6 @@
+ cached_up_osd_features(0),
+ crc_defined(false), crc(0),
+ crush(std::make_shared<CrushWrapper>()) {
+- memset(&fsid, 0, sizeof(fsid));
+ }
+
+ private:
+--- ceph-13.1.0/src/common/cmdparse.h.orig 2018-05-08 08:09:17.772933925 -0400
++++ ceph-13.1.0/src/common/cmdparse.h 2018-05-08 08:09:36.500933925 -0400
+@@ -54,7 +54,7 @@
+ try {
+ val = boost::get<T>(cmdmap.find(k)->second);
+ return true;
+- } catch (boost::bad_get) {
++ } catch (boost::bad_get&) {
+ handle_bad_get(cct, k, typeid(T).name());
+ }
+ }
+--- ceph-13.1.0/src/messages/MClientReply.h.orig 2018-05-08 08:10:22.281933925 -0400
++++ ceph-13.1.0/src/messages/MClientReply.h 2018-05-08 08:10:46.660933925 -0400
+@@ -187,7 +187,7 @@
+ if (features & CEPH_FEATURE_MDS_QUOTA)
+ decode(quota, p);
+ else
+- memset("a, 0, sizeof(quota));
++ quota = quota_info_t{};
+
+ if ((features & CEPH_FEATURE_FS_FILE_LAYOUT_V2))
+ decode(layout.pool_ns, p);
+--- ceph-13.1.0/src/messages/MMonSubscribeAck.h.orig 2018-05-08 08:10:58.478933925 -0400
++++ ceph-13.1.0/src/messages/MMonSubscribeAck.h 2018-05-08 08:11:17.484933925 -0400
+@@ -23,7 +23,6 @@
+
+ MMonSubscribeAck() : Message(CEPH_MSG_MON_SUBSCRIBE_ACK),
+ interval(0) {
+- memset(&fsid, 0, sizeof(fsid));
+ }
+ MMonSubscribeAck(uuid_d& f, int i) : Message(CEPH_MSG_MON_SUBSCRIBE_ACK),
+ interval(i), fsid(f) { }
+--- ceph-13.1.0/src/mgr/DaemonState.h.orig 2018-05-08 08:12:16.521933925 -0400
++++ ceph-13.1.0/src/mgr/DaemonState.h 2018-05-08 08:12:40.995933925 -0400
+@@ -130,7 +130,7 @@
+ auto p = config_defaults_bl.begin();
+ try {
+ decode(config_defaults, p);
+- } catch (buffer::error e) {
++ } catch (buffer::error& e) {
+ }
+ }
+ return config_defaults;
+--- ceph-13.1.0/cmake/modules/BuildDPDK.cmake.orig 2018-05-08 08:41:02.168933925 -0400
++++ ceph-13.1.0/cmake/modules/BuildDPDK.cmake 2018-05-08 08:41:47.411933925 -0400
+@@ -71,7 +71,7 @@
+ BUILD_IN_SOURCE 1
+ INSTALL_COMMAND "true")
+ ExternalProject_Add_Step(dpdk-ext patch-config
+- COMMAND ${CMAKE_MODULE_PATH}/patch-dpdk-conf.sh ${dpdk_dir} ${machine}
++ COMMAND ${CMAKE_MODULE_PATH}/patch-dpdk-conf.sh ${dpdk_dir} ${machine} ${arch}
+ DEPENDEES configure
+ DEPENDERS build)
+ # easier to adjust the config
+@@ -86,7 +86,7 @@
+ # target
+ file(MAKE_DIRECTORY ${DPDK_INCLUDE_DIR})
+ foreach(c
+- pci bus_pci
++ bus_pci pci
+ eal
+ mempool mempool_ring mempool_stack ring)
+ add_library(dpdk::${c} STATIC IMPORTED)
+--- ceph-13.1.0/cmake/modules/patch-dpdk-conf.sh.orig 2018-05-08 08:42:01.089933925 -0400
++++ ceph-13.1.0/cmake/modules/patch-dpdk-conf.sh 2018-05-08 08:43:11.781933925 -0400
+@@ -15,8 +15,12 @@
+ shift
+ machine=$1
+ shift
++arch=$1
++shift
+
+ setconf CONFIG_RTE_MACHINE "${machine}"
++setconf CONFIG_RTE_ARCH "${arch}"
++
+ # Disable experimental features
+ setconf CONFIG_RTE_NEXT_ABI n
+ setconf CONFIG_RTE_LIBRTE_MBUF_OFFLOAD n
+@@ -38,6 +42,7 @@
+ setconf CONFIG_RTE_LIBRTE_VMXNET3_PMD n
+ setconf CONFIG_RTE_LIBRTE_PMD_VHOST n
+ setconf CONFIG_RTE_APP_EVENTDEV n
++setconf CONFIG_RTE_MAX_VFIO_GROUPS 64
+
+ # no test
+ setconf CONFIG_RTE_APP_TEST n
diff --git a/0001-src-rocksdb-util-murmurhash.patch b/0001-src-rocksdb-util-murmurhash.patch
deleted file mode 100644
index f67a0ff..0000000
--- a/0001-src-rocksdb-util-murmurhash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ceph-12.1.1.orig/src/rocksdb/util/murmurhash.cc 2017-04-27 01:13:46.000000000 +0100
-+++ ceph-12.1.1.orig/src/rocksdb/util/murmurhash.cc 2017-07-25 11:37:28.910266684 +0100
-@@ -113,8 +113,8 @@ unsigned int MurmurHash2 ( const void *
-
- switch(len)
- {
-- case 3: h ^= data[2] << 16;
-- case 2: h ^= data[1] << 8;
-+ case 3: h ^= data[2] << 16; // fallthrough
-+ case 2: h ^= data[1] << 8; // fallthrough
- case 1: h ^= data[0];
- h *= m;
- };
diff --git a/0002-cmake-Support-ppc64.patch b/0002-cmake-Support-ppc64.patch
deleted file mode 100644
index 6b09549..0000000
--- a/0002-cmake-Support-ppc64.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 2f0a7153460acc3f21462236f470ec3471fa2ee1 Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto(a)redhat.com>
-Date: Mon, 31 Jul 2017 19:50:23 +0200
-Subject: [PATCH] cmake: Support ppc64
-
-The ppc64 support requires a couple of changes:
-- adding the ppc64 support to cmake
-- changing optimized crc32 code to compile on ppc64le only
-- moving ifdef condition before crc32_align to avoid defined but not
-used warning
-
-Signed-off-by: Boris Ranto <branto(a)redhat.com>
----
- cmake/modules/SIMDExt.cmake | 15 ++++++++++++++-
- src/CMakeLists.txt | 4 +++-
- src/arch/ppc.c | 8 ++++----
- src/common/crc32c_ppc.c | 6 +++---
- 4 files changed, 24 insertions(+), 9 deletions(-)
-
-diff --git a/cmake/modules/SIMDExt.cmake b/cmake/modules/SIMDExt.cmake
-index 5330835..c47667d 100644
---- a/cmake/modules/SIMDExt.cmake
-+++ b/cmake/modules/SIMDExt.cmake
-@@ -109,7 +109,20 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64")
- endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686|amd64|x86_64|AMD64")
- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(powerpc|ppc)64le")
- set(HAVE_PPC64LE 1)
-- message(STATUS " we are ppc64le")
-+ message(STATUS " we are ppc64")
-+ CHECK_C_COMPILER_FLAG("-maltivec" HAS_ALTIVEC)
-+ if(HAS_ALTIVEC)
-+ message(STATUS " HAS_ALTIVEC yes")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maltivec")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -maltivec")
-+ endif()
-+ CHECK_C_COMPILER_FLAG("-mcpu=power8" HAVE_POWER8)
-+ if(HAVE_POWER8)
-+ message(STATUS " HAVE_POWER8 yes")
-+ endif()
-+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(power|ppc)64")
-+ set(HAVE_PPC64 1)
-+ message(STATUS " we are ppc64")
- CHECK_C_COMPILER_FLAG("-maltivec" HAS_ALTIVEC)
- if(HAS_ALTIVEC)
- message(STATUS " HAS_ALTIVEC yes")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 66f0c14..38d1913 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -568,7 +568,9 @@ if(HAVE_INTEL)
- endif(HAVE_GOOD_YASM_ELF64)
- elseif(HAVE_POWER8)
- list(APPEND libcommon_files
-- common/crc32c_ppc.c
-+ common/crc32c_ppc.c)
-+elseif(HAVE_PPC64LE)
-+ list(APPEND libcommon_files
- common/crc32c_ppc_asm.S
- common/crc32c_ppc_fast_zero_asm.S)
- endif(HAVE_INTEL)
-diff --git a/src/arch/ppc.c b/src/arch/ppc.c
-index f21e2fe..11d3a49 100644
---- a/src/arch/ppc.c
-+++ b/src/arch/ppc.c
-@@ -14,10 +14,10 @@ int ceph_arch_ppc_crc32 = 0;
-
- #include <stdio.h>
-
--#if __linux__ && __powerpc64__
-+#ifdef HAVE_PPC64LE
- #include <sys/auxv.h>
- #include <asm/cputable.h>
--#endif /* __linux__ && __powerpc64__ */
-+#endif /* HAVE_PPC64LE */
-
- #ifndef PPC_FEATURE2_VEC_CRYPTO
- #define PPC_FEATURE2_VEC_CRYPTO 0x02000000
-@@ -31,9 +31,9 @@ int ceph_arch_ppc_probe(void)
- {
- ceph_arch_ppc_crc32 = 0;
-
--#if __linux__ && __powerpc64__
-+#ifdef HAVE_PPC64LE
- if (getauxval(AT_HWCAP2) & PPC_FEATURE2_VEC_CRYPTO) ceph_arch_ppc_crc32 = 1;
--#endif /* __linux__ && __powerpc64__ */
-+#endif /* HAVE_PPC64LE */
-
- return 0;
- }
-diff --git a/src/common/crc32c_ppc.c b/src/common/crc32c_ppc.c
-index 43756e2..52fd1c4 100644
---- a/src/common/crc32c_ppc.c
-+++ b/src/common/crc32c_ppc.c
-@@ -20,6 +20,7 @@
- #define VMX_ALIGN 16
- #define VMX_ALIGN_MASK (VMX_ALIGN-1)
-
-+#ifdef HAVE_PPC64LE
- #ifdef REFLECT
- static unsigned int crc32_align(unsigned int crc, unsigned char const *p,
- unsigned long len)
-@@ -38,7 +39,6 @@ static unsigned int crc32_align(unsigned int crc, unsigned char const *p,
- }
- #endif
-
--#ifdef HAVE_POWER8
- static inline unsigned long polynomial_multiply(unsigned int a, unsigned int b) {
- vector unsigned int va = {a, 0, 0, 0};
- vector unsigned int vb = {b, 0, 0, 0};
-@@ -134,7 +134,7 @@ uint32_t ceph_crc32c_ppc(uint32_t crc, unsigned char const *data, unsigned len)
- return crc;
- }
-
--#else /* HAVE_POWER8 */
-+#else /* HAVE_PPC64LE */
-
- /* This symbol has to exist on non-ppc architectures (and on legacy
- * ppc systems using power7 or below) in order to compile properly
-@@ -145,4 +145,4 @@ uint32_t ceph_crc32c_ppc(uint32_t crc, unsigned char const *data, unsigned len)
- return 0;
- }
-
--#endif /* HAVE_POWER8 */
-+#endif /* HAVE_PPC64LE */
---
-2.9.4
-
diff --git a/0003-librbd-Conditionally-import-TrimRequest.cc.patch b/0003-librbd-Conditionally-import-TrimRequest.cc.patch
deleted file mode 100644
index 2f02efb..0000000
--- a/0003-librbd-Conditionally-import-TrimRequest.cc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 74a754690736f6608b0d4d9c807df0bd777a129d Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto(a)redhat.com>
-Date: Fri, 8 Dec 2017 00:21:38 +0100
-Subject: [PATCH] librbd: Conditionally import TrimRequest.cc
-
-We include TrimRequest.cc in librbd tests at two places:
- - operation/test_mock_TrimRequest.cc
- - operation/test_mock_ResizeRequest.cc
-
-That causes linking errors when doing the builds because some of the
-structures are defined twice.
-
-Signed-off-by: Boris Ranto <branto(a)redhat.com>
----
- src/librbd/operation/TrimRequest.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/librbd/operation/TrimRequest.cc b/src/librbd/operation/TrimRequest.cc
-index 28f2deb..929ca51 100644
---- a/src/librbd/operation/TrimRequest.cc
-+++ b/src/librbd/operation/TrimRequest.cc
-@@ -362,4 +362,6 @@ void TrimRequest<I>::send_finish(int r) {
- } // namespace operation
- } // namespace librbd
-
-+#ifndef TEST_F
- template class librbd::operation::TrimRequest<librbd::ImageCtx>;
-+#endif
---
-2.9.5
-
diff --git a/0004-cmake-modules-BuildBoost.cmake.patch b/0004-cmake-modules-BuildBoost.cmake.patch
deleted file mode 100644
index 644a6c4..0000000
--- a/0004-cmake-modules-BuildBoost.cmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ceph-12.2.3/cmake/modules/BuildBoost.cmake.orig 2018-02-21 14:13:32.527899631 -0500
-+++ ceph-12.2.3/cmake/modules/BuildBoost.cmake 2018-02-21 14:14:04.796899631 -0500
-@@ -75,7 +75,7 @@
- set(install_command
- ${b2} install)
- set(boost_root_dir "${CMAKE_BINARY_DIR}/boost")
-- if(EXISTS "${PROJECT_SOURCE_DIR}/src/boost/libs/config/include/boost/config.hpp")
-+ if(EXISTS "${PROJECT_SOURCE_DIR}/src/boost/boost/config.hpp")
- message(STATUS "boost already in src")
- set(source_dir
- SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/boost")
diff --git a/0005-src-rocksdb-table-block.h.patch b/0005-src-rocksdb-table-block.h.patch
deleted file mode 100644
index 8acb401..0000000
--- a/0005-src-rocksdb-table-block.h.patch
+++ /dev/null
@@ -1,155 +0,0 @@
---- ceph-12.2.3/src/rocksdb/table/block.h.orig 2018-02-22 07:49:38.044899631 -0500
-+++ ceph-12.2.3/src/rocksdb/table/block.h 2018-02-22 07:58:55.855899631 -0500
-@@ -65,7 +65,8 @@
-
- // Create bitmap and set all the bits to 0
- bitmap_ = new std::atomic<uint32_t>[bitmap_size];
-- memset(bitmap_, 0, bitmap_size * kBytesPersEntry);
-+ // memset(bitmap_, 0, bitmap_size * kBytesPersEntry);
-+ { unsigned i = 0; for (; i < bitmap_size;) bitmap_[i++] = 0; }
-
- RecordTick(GetStatistics(), READ_AMP_TOTAL_READ_BYTES,
- num_bits_needed << bytes_per_bit_pow_);
---- ceph-12.2.3/src/rocksdb/db/c.cc.orig 2018-02-22 08:14:56.033899631 -0500
-+++ ceph-12.2.3/src/rocksdb/db/c.cc 2018-02-22 10:06:39.759899631 -0500
-@@ -1322,11 +1322,6 @@
- b->rep.PutLogData(Slice(blob, len));
- }
-
--void rocksdb_writebatch_iterate(
-- rocksdb_writebatch_t* b,
-- void* state,
-- void (*put)(void*, const char* k, size_t klen, const char* v, size_t vlen),
-- void (*deleted)(void*, const char* k, size_t klen)) {
- class H : public WriteBatch::Handler {
- public:
- void* state_;
-@@ -1339,6 +1334,12 @@
- (*deleted_)(state_, key.data(), key.size());
- }
- };
-+
-+void rocksdb_writebatch_iterate(
-+ rocksdb_writebatch_t* b,
-+ void* state,
-+ void (*put)(void*, const char* k, size_t klen, const char* v, size_t vlen),
-+ void (*deleted)(void*, const char* k, size_t klen)) {
- H handler;
- handler.state_ = state;
- handler.put_ = put;
-@@ -1579,18 +1580,6 @@
- void* state,
- void (*put)(void*, const char* k, size_t klen, const char* v, size_t vlen),
- void (*deleted)(void*, const char* k, size_t klen)) {
-- class H : public WriteBatch::Handler {
-- public:
-- void* state_;
-- void (*put_)(void*, const char* k, size_t klen, const char* v, size_t vlen);
-- void (*deleted_)(void*, const char* k, size_t klen);
-- virtual void Put(const Slice& key, const Slice& value) override {
-- (*put_)(state_, key.data(), key.size(), value.data(), value.size());
-- }
-- virtual void Delete(const Slice& key) override {
-- (*deleted_)(state_, key.data(), key.size());
-- }
-- };
- H handler;
- handler.state_ = state;
- handler.put_ = put;
-@@ -2532,13 +2521,9 @@
- delete filter;
- }
-
--rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom_format(int bits_per_key, bool original_format) {
-- // Make a rocksdb_filterpolicy_t, but override all of its methods so
-- // they delegate to a NewBloomFilterPolicy() instead of user
-- // supplied C functions.
-- struct Wrapper : public rocksdb_filterpolicy_t {
-+ struct WrapperFP : public rocksdb_filterpolicy_t {
- const FilterPolicy* rep_;
-- ~Wrapper() { delete rep_; }
-+ ~WrapperFP() { delete rep_; }
- const char* Name() const override { return rep_->Name(); }
- void CreateFilter(const Slice* keys, int n,
- std::string* dst) const override {
-@@ -2549,11 +2534,16 @@
- }
- static void DoNothing(void*) { }
- };
-- Wrapper* wrapper = new Wrapper;
-+
-+rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom_format(int bits_per_key, bool original_format) {
-+ // Make a rocksdb_filterpolicy_t, but override all of its methods so
-+ // they delegate to a NewBloomFilterPolicy() instead of user
-+ // supplied C functions.
-+ WrapperFP* wrapper = new WrapperFP;
- wrapper->rep_ = NewBloomFilterPolicy(bits_per_key, original_format);
- wrapper->state_ = nullptr;
- wrapper->delete_filter_ = nullptr;
-- wrapper->destructor_ = &Wrapper::DoNothing;
-+ wrapper->destructor_ = &WrapperFP::DoNothing;
- return wrapper;
- }
-
-@@ -2889,10 +2879,9 @@
- delete st;
- }
-
--rocksdb_slicetransform_t* rocksdb_slicetransform_create_fixed_prefix(size_t prefixLen) {
-- struct Wrapper : public rocksdb_slicetransform_t {
-+ struct WrapperST : public rocksdb_slicetransform_t {
- const SliceTransform* rep_;
-- ~Wrapper() { delete rep_; }
-+ ~WrapperST() { delete rep_; }
- const char* Name() const override { return rep_->Name(); }
- Slice Transform(const Slice& src) const override {
- return rep_->Transform(src);
-@@ -2903,31 +2892,20 @@
- bool InRange(const Slice& src) const override { return rep_->InRange(src); }
- static void DoNothing(void*) { }
- };
-- Wrapper* wrapper = new Wrapper;
-+
-+rocksdb_slicetransform_t* rocksdb_slicetransform_create_fixed_prefix(size_t prefixLen) {
-+ WrapperST* wrapper = new WrapperST;
- wrapper->rep_ = rocksdb::NewFixedPrefixTransform(prefixLen);
- wrapper->state_ = nullptr;
-- wrapper->destructor_ = &Wrapper::DoNothing;
-+ wrapper->destructor_ = &WrapperST::DoNothing;
- return wrapper;
- }
-
- rocksdb_slicetransform_t* rocksdb_slicetransform_create_noop() {
-- struct Wrapper : public rocksdb_slicetransform_t {
-- const SliceTransform* rep_;
-- ~Wrapper() { delete rep_; }
-- const char* Name() const override { return rep_->Name(); }
-- Slice Transform(const Slice& src) const override {
-- return rep_->Transform(src);
-- }
-- bool InDomain(const Slice& src) const override {
-- return rep_->InDomain(src);
-- }
-- bool InRange(const Slice& src) const override { return rep_->InRange(src); }
-- static void DoNothing(void*) { }
-- };
-- Wrapper* wrapper = new Wrapper;
-+ WrapperST* wrapper = new WrapperST;
- wrapper->rep_ = rocksdb::NewNoopTransform();
- wrapper->state_ = nullptr;
-- wrapper->destructor_ = &Wrapper::DoNothing;
-+ wrapper->destructor_ = &WrapperST::DoNothing;
- return wrapper;
- }
-
---- ceph-12.2.3/src/rocksdb/memtable/inlineskiplist.h.orig 2018-02-22 10:34:06.918899631 -0500
-+++ ceph-12.2.3/src/rocksdb/memtable/inlineskiplist.h 2018-02-22 10:34:44.145899631 -0500
-@@ -279,7 +279,7 @@
- // next_[0]. This is used for passing data from AllocateKey to Insert.
- void StashHeight(const int height) {
- assert(sizeof(int) <= sizeof(next_[0]));
-- memcpy(&next_[0], &height, sizeof(int));
-+ memcpy(static_cast<void*>(&next_[0]), &height, sizeof(int));
- }
-
- // Retrieves the value passed to StashHeight. Undefined after a call
diff --git a/ceph.spec b/ceph.spec
index 9017056..1fa45d7 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -17,57 +17,56 @@
%global _hardened_build 1
%bcond_without ocf
-%ifnarch armv7hl
-%bcond_without cephfs_java
-%else
-%bcond_with cephfs_java
-%endif
-%if 0%{?suse_version}
-%bcond_with ceph_test_package
-%else
-%bcond_without ceph_test_package
-%endif
%bcond_with make_check
%ifarch s390 s390x
%bcond_with tcmalloc
%else
%bcond_without tcmalloc
%endif
-%ifnarch armv7hl
-%bcond_with lowmem_builder
-%else
-%if 0%{?rhel}
-%ifnarch ppc64le
-%bcond_with lowmem_builder
-%else
-%bcond_without lowmem_builder
-%endif
-%else
-%bcond_without lowmem_builder
-%endif
-%endif
%if 0%{?fedora} || 0%{?rhel}
%bcond_without selinux
+%bcond_without ceph_test_package
+%bcond_without cephfs_java
+%bcond_without lttng
%endif
%if 0%{?suse_version}
%bcond_with selinux
+%bcond_with ceph_test_package
+%bcond_with cephfs_java
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+%global _fillupdir /var/adm/fillup-templates
%endif
-
-# LTTng-UST enabled on Fedora, RHEL 6+, and SLE (not openSUSE)
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%if ! 0%{?is_opensuse}
+%if 0%{?is_opensuse}
+%bcond_without lttng
+%else
+%ifarch x86_64 aarch64
%bcond_without lttng
+%else
+%bcond_with lttng
%endif
%endif
+%endif
+%if 0%{?suse_version} >= 1500
+%bcond_with python2
+%else
+%bcond_without python2
+%endif
+%if 0%{without python2}
+%global _defined_if_python2_absent 1
+%endif
%if %{with selinux}
# get selinux policy version
-%{!?_selinux_policy_version: %global _selinux_policy_version %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2>/dev/null || echo 0.0.0)}
+%{!?_selinux_policy_version: %global _selinux_policy_version 0.0.0}
%endif
%{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
%{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create}
%{!?python3_pkgversion: %global python3_pkgversion 3}
+# define _python_buildid macro which will expand to the empty string when
+# building with python2
+%global _python_buildid %{?_defined_if_python2_absent:%{python3_pkgversion}}
# unify libexec for all targets
%global _libexecdir %{_exec_prefix}/lib
@@ -85,7 +84,7 @@
# main package definition
#################################################################################
Name: ceph
-Version: 12.2.5
+Version: 13.1.0
Release: 1%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 1
@@ -102,12 +101,14 @@ Group: System/Filesystems
URL: http://ceph.com/
Source0: http://download.ceph.com/tarballs/%{name}-%{version}.tar.gz
# https://bugzilla.redhat.com/show_bug.cgi?id=1474773
-Patch001: 0001-src-rocksdb-util-murmurhash.patch
+Patch001: 0001-9df56dc509a6cbb7c1da8073e82fc1d2a284418d.patch
+#Patch001: 0001-src-rocksdb-util-murmurhash.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1474774
-Patch002: 0002-cmake-Support-ppc64.patch
-Patch003: 0003-librbd-Conditionally-import-TrimRequest.cc.patch
-Patch005: 0005-src-rocksdb-table-block.h.patch
+#Patch002: 0002-cmake-Support-ppc64.patch
+#Patch003: 0003-librbd-Conditionally-import-TrimRequest.cc.patch
+#Patch005: 0005-src-rocksdb-table-block.h.patch
%if 0%{?suse_version}
+# _insert_obs_source_lines_here
%if 0%{?is_opensuse}
ExclusiveArch: x86_64 aarch64 ppc64 ppc64le
%else
@@ -117,10 +118,10 @@ ExclusiveArch: x86_64 aarch64 ppc64le s390x
#################################################################################
# dependencies that apply across all distro families
#################################################################################
-Requires: ceph-osd = %{_epoch_prefix}%{version}-%{release}
-Requires: ceph-mds = %{_epoch_prefix}%{version}-%{release}
-Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
-Requires: ceph-mon = %{_epoch_prefix}%{version}-%{release}
+Requires: ceph-osd = %{_epoch_prefix}%{version}-%{release}
+Requires: ceph-mds = %{_epoch_prefix}%{version}-%{release}
+Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
+Requires: ceph-mon = %{_epoch_prefix}%{version}-%{release}
Requires(post): binutils
%if 0%{with cephfs_java}
BuildRequires: java-devel
@@ -129,50 +130,47 @@ BuildRequires: sharutils
%if 0%{with selinux}
BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel
-BuildRequires: selinux-policy-doc
-%endif
-%if 0%{with make_check}
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: python-cherrypy
-BuildRequires: python-werkzeug
-%endif
-%if 0%{?suse_version}
-BuildRequires: python-CherryPy
-BuildRequires: python-Werkzeug
-BuildRequires: python-numpy-devel
-%endif
-BuildRequires: python-coverage
-BuildRequires: python-pecan
-BuildRequires: socat
%endif
BuildRequires: bc
BuildRequires: gperf
-BuildRequires: cmake
+BuildRequires: cmake
BuildRequires: cryptsetup
BuildRequires: fuse-devel
+%if 0%{?rhel} == 7
+# devtoolset offers newer make and valgrind-devel, but the old ones are good
+# enough.
+BuildRequires: devtoolset-7-gcc-c++
+%else
BuildRequires: gcc-c++
+%endif
BuildRequires: gdbm
%if 0%{with tcmalloc}
BuildRequires: gperftools-devel >= 2.4
%endif
-BuildRequires: jq
+BuildRequires: jq
BuildRequires: leveldb-devel > 1.2
BuildRequires: libaio-devel
BuildRequires: libblkid-devel >= 2.17
BuildRequires: libcurl-devel
BuildRequires: libudev-devel
+BuildRequires: liboath-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
+BuildRequires: libuuid-devel
BuildRequires: make
BuildRequires: parted
BuildRequires: perl
BuildRequires: pkgconfig
-BuildRequires: python
-BuildRequires: python-devel
-BuildRequires: python-nose
-BuildRequires: python-requests
-BuildRequires: python-virtualenv
+BuildRequires: procps
+BuildRequires: python%{_python_buildid}
+BuildRequires: python%{_python_buildid}-devel
+BuildRequires: python%{_python_buildid}-nose
+BuildRequires: python%{_python_buildid}-requests
+BuildRequires: python%{_python_buildid}-virtualenv
BuildRequires: snappy-devel
+%if 0%{with make_check}
+BuildRequires: socat
+%endif
BuildRequires: udev
BuildRequires: util-linux
BuildRequires: valgrind-devel
@@ -186,27 +184,31 @@ BuildRequires: yasm
# distro-conditional dependencies
#################################################################################
%if 0%{?suse_version}
-BuildRequires: pkgconfig(systemd)
+BuildRequires: pkgconfig(systemd)
BuildRequires: systemd-rpm-macros
BuildRequires: systemd
%{?systemd_requires}
PreReq: %fillup_prereq
BuildRequires: net-tools
BuildRequires: libbz2-devel
-BuildRequires: btrfsprogs
+BuildRequires: btrfsprogs
BuildRequires: mozilla-nss-devel
BuildRequires: keyutils-devel
-BuildRequires: libopenssl-devel
-BuildRequires: lsb-release
-BuildRequires: openldap2-devel
-BuildRequires: python-Cython
-BuildRequires: python-PrettyTable
-BuildRequires: python-Sphinx
-BuildRequires: rdma-core-devel
+BuildRequires: libopenssl-devel
+BuildRequires: lsb-release
+BuildRequires: openldap2-devel
+BuildRequires: cunit-devel
+BuildRequires: python%{_python_buildid}-base
+BuildRequires: python%{_python_buildid}-Cython
+BuildRequires: python%{_python_buildid}-PrettyTable
+BuildRequires: python%{_python_buildid}-Sphinx
+BuildRequires: rdma-core-devel
+BuildRequires: liblz4-devel >= 1.7
+BuildRequires: rdma-core-devel
%endif
%if 0%{?fedora} || 0%{?rhel}
Requires: systemd
-BuildRequires: boost-random
+BuildRequires: boost-random
BuildRequires: btrfs-progs
BuildRequires: nss-devel
BuildRequires: keyutils-libs-devel
@@ -214,12 +216,14 @@ BuildRequires: keyutils-libs-devel
%ifnarch %{arm}
BuildRequires: rdma-core-devel
%endif
-BuildRequires: openldap-devel
-BuildRequires: openssl-devel
-BuildRequires: redhat-lsb-core
-BuildRequires: Cython
-BuildRequires: python-prettytable
-BuildRequires: python-sphinx
+BuildRequires: openldap-devel
+BuildRequires: openssl-devel
+BuildRequires: redhat-lsb-core
+BuildRequires: CUnit-devel
+BuildRequires: Cython%{_python_buildid}
+BuildRequires: python%{_python_buildid}-prettytable
+BuildRequires: python%{_python_buildid}-sphinx
+BuildRequires: lz4-devel >= 1.7
%endif
# python34-... for RHEL, python3-... for all other supported distros
%if ( 0%{?rhel} && 0%{?rhel} <= 7 )
@@ -231,6 +235,33 @@ BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-Cython
%endif
+# distro-conditional make check dependencies
+%if 0%{with make_check}
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: python%{_python_buildid}-cherrypy
+BuildRequires: python%{_python_buildid}-routes
+BuildRequires: python%{_python_buildid}-pecan
+BuildRequires: python%{_python_buildid}-werkzeug
+BuildRequires: python%{_python_buildid}-tox
+BuildRequires: python%{_python_buildid}-coverage
+%if 0%{?fedora}
+BuildRequires: python%{_python_buildid}-bcrypt
+%endif
+%if 0%{?rhel}
+BuildRequires: py-bcrypt
+%endif
+%endif
+%if 0%{?suse_version}
+BuildRequires: python%{_python_buildid}-CherryPy
+BuildRequires: python%{_python_buildid}-Routes
+BuildRequires: python%{_python_buildid}-Werkzeug
+BuildRequires: python%{_python_buildid}-pecan
+BuildRequires: python%{_python_buildid}-numpy-devel
+BuildRequires: python%{_python_buildid}-bcrypt
+BuildRequires: python%{_python_buildid}-tox
+BuildRequires: python%{_python_buildid}-coverage
+%endif
+%endif
# lttng and babeltrace for rbd-replay-prep
%if %{with lttng}
%if 0%{?fedora} || 0%{?rhel}
@@ -239,7 +270,7 @@ BuildRequires: libbabeltrace-devel
%endif
%if 0%{?suse_version}
BuildRequires: lttng-ust-devel
-BuildRequires: babeltrace-devel
+BuildRequires: babeltrace-devel
%endif
%endif
%if 0%{?suse_version}
@@ -250,7 +281,7 @@ BuildRequires: expat-devel
%endif
#hardened-cc1
%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: redhat-rpm-config
+BuildRequires: redhat-rpm-config
%endif
%description
@@ -262,33 +293,39 @@ on commodity hardware and delivers object, block and file system storage.
# subpackages
#################################################################################
%package base
-Summary: Ceph Base Package
+Summary: Ceph Base Package
%if 0%{?suse_version}
-Group: System/Filesystems
+Group: System/Filesystems
%endif
-Requires: ceph-common = %{_epoch_prefix}%{version}-%{release}
-Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
-Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
-Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
-Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
+Requires: ceph-common = %{_epoch_prefix}%{version}-%{release}
+Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
+Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
+Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
+Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
%if 0%{with selinux}
-Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release}
+Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release}
%endif
Requires(post):/sbin/ldconfig
Requires(postun):/sbin/ldconfig
-Requires: python
-Requires: python-requests
-Requires: python-setuptools
-Requires: grep
-Requires: xfsprogs
-Requires: logrotate
-Requires: util-linux
-Requires: cryptsetup
-Requires: findutils
-Requires: psmisc
-Requires: which
-%if 0%{?suse_version}
-Recommends: ntp-daemon
+Requires: cryptsetup
+Requires: e2fsprogs
+Requires: findutils
+Requires: grep
+Requires: logrotate
+Requires: parted
+Requires: psmisc
+Requires: python%{_python_buildid}-requests
+Requires: python%{_python_buildid}-setuptools
+Requires: util-linux
+Requires: xfsprogs
+Requires: which
+%if 0%{?fedora} || 0%{?rhel}
+Requires: gdisk
+%endif
+%if 0%{?suse_version}
+Recommends: ntp-daemon
+Recommends: chrony
+Requires: gptfdisk
%endif
%description base
Base is the package that includes all the files shared amongst ceph servers
@@ -301,17 +338,18 @@ Group: System/Filesystems
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
-Requires: python-rados = %{_epoch_prefix}%{version}-%{release}
-Requires: python-rbd = %{_epoch_prefix}%{version}-%{release}
-Requires: python-cephfs = %{_epoch_prefix}%{version}-%{release}
-Requires: python-rgw = %{_epoch_prefix}%{version}-%{release}
+Requires: python%{_python_buildid}-rados = %{_epoch_prefix}%{version}-%{release}
+Requires: python%{_python_buildid}-rbd = %{_epoch_prefix}%{version}-%{release}
+Requires: python%{_python_buildid}-cephfs = %{_epoch_prefix}%{version}-%{release}
+Requires: python%{_python_buildid}-rgw = %{_epoch_prefix}%{version}-%{release}
%if 0%{?fedora} || 0%{?rhel}
-Requires: python-prettytable
+Requires: python%{_python_buildid}-prettytable
+Requires: python%{_python_buildid}-requests
%endif
%if 0%{?suse_version}
-Requires: python-PrettyTable
+Requires: python%{_python_buildid}-PrettyTable
+Requires: python%{_python_buildid}-requests
%endif
-Requires: python-requests
%{?systemd_requires}
%if 0%{?suse_version}
Requires(pre): pwdutils
@@ -337,13 +375,6 @@ Summary: Ceph Monitor Daemon
Group: System/Filesystems
%endif
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
-# For ceph-rest-api
-%if 0%{?fedora} || 0%{?rhel}
-Requires: python-flask
-%endif
-%if 0%{?suse_version}
-Requires: python-Flask
-%endif
%description mon
ceph-mon is the cluster monitor daemon for the Ceph distributed file
system. One or more instances of ceph-mon form a Paxos part-time
@@ -351,24 +382,29 @@ parliament cluster that provides extremely reliable and durable storage
of cluster membership, configuration, and state.
%package mgr
-Summary: Ceph Manager Daemon
+Summary: Ceph Manager Daemon
%if 0%{?suse_version}
-Group: System/Filesystems
+Group: System/Filesystems
%endif
-Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
+Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
%if 0%{?fedora} || 0%{?rhel}
-Requires: python-cherrypy
-Requires: python-jinja2
-Requires: python-werkzeug
-Requires: pyOpenSSL
+Requires: python%{_python_buildid}-cherrypy
+Requires: python%{_python_buildid}-routes
+Requires: python%{_python_buildid}-jinja2
+Requires: python%{_python_buildid}-pecan
+Requires: python%{_python_buildid}-werkzeug
+Requires: pyOpenSSL%{_python_buildid}
+%endif
+%if 0%{?suse_version}
+Requires: python%{_python_buildid}-CherryPy
+Requires: python%{_python_buildid}-Routes
+Requires: python%{_python_buildid}-Jinja2
+Requires: python%{_python_buildid}-Werkzeug
+Requires: python%{_python_buildid}-pecan
+Requires: python%{_python_buildid}-pyOpenSSL
+Requires: python%{_python_buildid}-bcrypt
+Recommends: python%{_python_buildid}-influxdb
%endif
-%if 0%{?suse_version}
-Requires: python-CherryPy
-Requires: python-jinja2
-Requires: python-Werkzeug
-Requires: python-pyOpenSSL
-%endif
-Requires: python-pecan
%description mgr
ceph-mgr enables python modules that provide services (such as the REST
module derived from Calamari) and expose CLI hooks. ceph-mgr gathers
@@ -455,15 +491,7 @@ Summary: Ceph Object Storage Daemon
Group: System/Filesystems
%endif
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
-# for sgdisk, used by ceph-disk
-%if 0%{?fedora} || 0%{?rhel}
-Requires: gdisk
-%endif
-%if 0%{?suse_version}
-Requires: gptfdisk
-%endif
-Requires: parted
-Requires: lvm2
+Requires: lvm2
%description osd
ceph-osd is the object storage daemon for the Ceph distributed file
system. It is responsible for storing objects on a local file system
@@ -520,6 +548,7 @@ Obsoletes: librgw2-devel < %{_epoch_prefix}%{version}-%{release}
This package contains libraries and headers needed to develop programs
that use RADOS gateway client library.
+%if 0%{with python2}
%package -n python-rgw
Summary: Python 2 libraries for the RADOS gateway
%if 0%{?suse_version}
@@ -531,11 +560,12 @@ Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release}
%description -n python-rgw
This package contains Python 2 libraries for interacting with Cephs RADOS
gateway.
+%endif
%package -n python%{python3_pkgversion}-rgw
Summary: Python 3 libraries for the RADOS gateway
%if 0%{?suse_version}
-Group: Development/Languages/Python
+Group: Development/Libraries/Python
%endif
Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
@@ -543,6 +573,7 @@ Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{relea
This package contains Python 3 libraries for interacting with Cephs RADOS
gateway.
+%if 0%{with python2}
%package -n python-rados
Summary: Python 2 libraries for the RADOS object store
%if 0%{?suse_version}
@@ -553,11 +584,12 @@ Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release}
%description -n python-rados
This package contains Python 2 libraries for interacting with Cephs RADOS
object store.
+%endif
%package -n python%{python3_pkgversion}-rados
Summary: Python 3 libraries for the RADOS object store
%if 0%{?suse_version}
-Group: Development/Languages/Python
+Group: Development/Libraries/Python
%endif
Requires: python%{python3_pkgversion}
Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
@@ -623,10 +655,11 @@ Obsoletes: librbd1-devel < %{_epoch_prefix}%{version}-%{release}
This package contains libraries and headers needed to develop programs
that use RADOS block device.
+%if 0%{with python2}
%package -n python-rbd
Summary: Python 2 libraries for the RADOS block device
%if 0%{?suse_version}
-Group: Development/Languages/Python
+Group: Development/Libraries/Python
%endif
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
Requires: python-rados = %{_epoch_prefix}%{version}-%{release}
@@ -634,11 +667,12 @@ Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release}
%description -n python-rbd
This package contains Python 2 libraries for interacting with Cephs RADOS
block device.
+%endif
%package -n python%{python3_pkgversion}-rbd
Summary: Python 3 libraries for the RADOS block device
%if 0%{?suse_version}
-Group: Development/Languages/Python
+Group: Development/Libraries/Python
%endif
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
@@ -677,24 +711,26 @@ Obsoletes: libcephfs2-devel < %{_epoch_prefix}%{version}-%{release}
This package contains libraries and headers needed to develop programs
that use Cephs distributed file system.
+%if 0%{with python2}
%package -n python-cephfs
Summary: Python 2 libraries for Ceph distributed file system
%if 0%{?suse_version}
-Group: Development/Languages/Python
+Group: Development/Libraries/Python
%endif
Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
%if 0%{?suse_version}
-Recommends: python-rados = %{_epoch_prefix}%{version}-%{release}
+Recommends: python-rados = %{_epoch_prefix}%{version}-%{release}
%endif
Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release}
%description -n python-cephfs
This package contains Python 2 libraries for interacting with Cephs distributed
file system.
+%endif
%package -n python%{python3_pkgversion}-cephfs
Summary: Python 3 libraries for Ceph distributed file system
%if 0%{?suse_version}
-Group: Development/Languages/Python
+Group: Development/Libraries/Python
%endif
Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
@@ -702,16 +738,18 @@ Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{relea
This package contains Python 3 libraries for interacting with Cephs distributed
file system.
+%if 0%{with python2}
%package -n python%{python3_pkgversion}-ceph-argparse
Summary: Python 3 utility libraries for Ceph CLI
%if 0%{?suse_version}
-Group: Development/Languages/Python
+Group: Development/Libraries/Python
%endif
%description -n python%{python3_pkgversion}-ceph-argparse
This package contains types and routines for Python 3 used by the Ceph CLI as
well as the RESTful interface. These have to do with querying the daemons for
command-description information, validating user command input against those
descriptions, and submitting the command to the appropriate daemon.
+%endif
%if 0%{with ceph_test_package}
%package -n ceph-test
@@ -761,17 +799,18 @@ Group: System/Libraries
%endif
Requires: java
Requires: libcephfs_jni1 = %{_epoch_prefix}%{version}-%{release}
-Requires: junit
-BuildRequires: junit
+BuildRequires: junit
%description -n cephfs-java
This package contains the Java libraries for the Ceph File System.
%endif
%package -n rados-objclass-devel
-Summary: RADOS object class development kit
-Group: Development/Libraries
-Requires: librados2-devel = %{_epoch_prefix}%{version}-%{release}
+Summary: RADOS object class development kit
+%if 0%{?suse_version}
+Group: Development/Libraries/C and C++
+%endif
+Requires: librados2-devel = %{_epoch_prefix}%{version}-%{release}
%description -n rados-objclass-devel
This package contains libraries and headers needed to develop RADOS object
class plugins.
@@ -795,10 +834,11 @@ populated file-systems.
%endif
+%if 0%{with python2}
%package -n python-ceph-compat
Summary: Compatibility package for Cephs python libraries
%if 0%{?suse_version}
-Group: Development/Languages/Python
+Group: Development/Libraries/Python
%endif
Obsoletes: python-ceph
Requires: python-rados = %{_epoch_prefix}%{version}-%{release}
@@ -811,6 +851,7 @@ This is a compatibility package to accommodate python-ceph split into
python-rados, python-rbd, python-rgw and python-cephfs. Packages still
depending on python-ceph should be fixed to depend on python-rados,
python-rbd, python-rgw or python-cephfs instead.
+%endif
#################################################################################
# common
@@ -819,6 +860,11 @@ python-rbd, python-rgw or python-cephfs instead.
%autosetup -p1 -n %{name}-%{version}
%build
+
+%if 0%{?rhel} == 7
+. /opt/rh/devtoolset-7/enable
+%endif
+
%if 0%{with cephfs_java}
# Find jni.h
for i in /usr/{lib64,lib}/jvm/java/include{,/linux}; do
@@ -826,36 +872,39 @@ for i in /usr/{lib64,lib}/jvm/java/include{,/linux}; do
done
%endif
-%if %{with lowmem_builder}
+%if 0%{?suse_version}
+# the following setting fixed an OOM condition we once encountered in the OBS
RPM_OPT_FLAGS="$RPM_OPT_FLAGS --param ggc-min-expand=20 --param ggc-min-heapsize=32768"
%endif
-%ifnarch armv7hl
-export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
-%else
-export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/' -e 's/-pipe//g'`
-%endif
export CPPFLAGS="$java_inc"
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
export LDFLAGS="$RPM_LD_FLAGS"
-env | sort
-
-%if %{with lowmem_builder}
-%ifnarch armv7hl
-%if 0%{?jobs} > 8
-%define _smp_mflags -j8
-%endif
-%else
-%define _smp_mflags -j1
-%endif
-%endif
+# Parallel build settings ...
+CEPH_MFLAGS_JOBS="%{?_smp_mflags}"
+CEPH_SMP_NCPUS=$(echo "$CEPH_MFLAGS_JOBS" | sed 's/-j//')
+%if 0%{?__isa_bits} == 32
+# 32-bit builds can use 3G memory max, which is not enough even for -j2
+CEPH_SMP_NCPUS="1"
+%endif
+# do not eat all memory
+echo "Available memory:"
+free -h
+echo "System limits:"
+ulimit -a
+if test -n "$CEPH_SMP_NCPUS" -a "$CEPH_SMP_NCPUS" -gt 1 ; then
+ mem_per_process=1800
+ max_mem=$(LANG=C free -m | sed -n "s|^Mem: *\([0-9]*\).*$|\1|p")
+ max_jobs="$(($max_mem / $mem_per_process))"
+ test "$CEPH_SMP_NCPUS" -gt "$max_jobs" && CEPH_SMP_NCPUS="$max_jobs" && echo "Warning: Reducing build parallelism to -j$max_jobs because of memory limits"
+ test "$CEPH_SMP_NCPUS" -le 0 && CEPH_SMP_NCPUS="1" && echo "Warning: Not using parallel build at all because of memory limits"
+fi
+export CEPH_SMP_NCPUS
+export CEPH_MFLAGS_JOBS="-j$CEPH_SMP_NCPUS"
-# unlimit _smp_mflags in system macro if not set above
-%define _smp_ncpus_max 0
-# extract the number of processors for use with cmake
-%define _smp_ncpus %(echo %{_smp_mflags} | sed 's/-j//')
+env | sort
mkdir build
cd build
@@ -871,7 +920,13 @@ cmake .. \
-DWITH_EMBEDDED=OFF \
-DWITH_MANPAGE=ON \
-DWITH_PYTHON3=ON \
- -DWITH_SYSTEMD=ON \
+ -DWITH_MGR_DASHBOARD_FRONTEND=OFF \
+%if %{with python2}
+ -DWITH_PYTHON2=ON \
+%else
+ -DWITH_PYTHON2=OFF \
+ -DMGR_PYTHON_VERSION=3 \
+%endif
%if ( ( 0%{?rhel} && 0%{?rhel} <= 7) && ! 0%{?centos} )
-DWITH_SUBMAN=ON \
%endif
@@ -903,21 +958,18 @@ cmake .. \
%ifnarch %{arm}
-DWITH_RDMA=OFF \
%endif
- -DBOOST_J=%{_smp_ncpus}
-
-make %{?_smp_mflags}
+ -DBOOST_J=$CEPH_SMP_NCPUS
+make "$CEPH_MFLAGS_JOBS"
%if 0%{with make_check}
%check
# run in-tree unittests
cd build
-ctest %{?_smp_mflags}
-
+ctest "$CEPH_MFLAGS_JOBS"
%endif
-
%install
pushd build
make DESTDIR=%{buildroot} install
@@ -929,10 +981,9 @@ install -m 0644 -D src/etc-rbdmap %{buildroot}%{_sysconfdir}/ceph/rbdmap
install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_sysconfdir}/sysconfig/ceph
%endif
%if 0%{?suse_version}
-install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_fillupdir}/sysconfig.%{name}
%endif
install -m 0644 -D systemd/ceph.tmpfiles.d %{buildroot}%{_tmpfilesdir}/ceph-common.conf
-install -m 0755 -D systemd/ceph %{buildroot}%{_sbindir}/rcceph
install -m 0644 -D systemd/50-ceph.preset %{buildroot}%{_libexecdir}/systemd/system-preset/50-ceph.preset
mkdir -p %{buildroot}%{_sbindir}
install -m 0644 -D src/logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ceph
@@ -989,7 +1040,6 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
%{_libexecdir}/systemd/system-preset/50-ceph.preset
%{_sbindir}/ceph-create-keys
%{_sbindir}/ceph-disk
-%{_sbindir}/rcceph
%dir %{_libexecdir}/ceph
%{_libexecdir}/ceph/ceph_common.sh
%dir %{_libdir}/rados-classes
@@ -1012,17 +1062,28 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/ceph/bootstrap-rbd
%config(noreplace) %{_sysconfdir}/sysconfig/ceph
%endif
%if 0%{?suse_version}
-%{_localstatedir}/adm/fillup-templates/sysconfig.*
+%{_fillupdir}/sysconfig.*
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-mon
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ceph-osd-mds
%endif
%{_unitdir}/ceph-disk@.service
%{_unitdir}/ceph.target
+%if 0%{with python2}
%{python_sitelib}/ceph_detect_init*
%{python_sitelib}/ceph_disk*
+%else
+%{python3_sitelib}/ceph_detect_init*
+%{python3_sitelib}/ceph_disk*
+%endif
+%if 0%{with python2}
%dir %{python_sitelib}/ceph_volume
%{python_sitelib}/ceph_volume/*
%{python_sitelib}/ceph_volume-*
+%else
+%dir %{python3_sitelib}/ceph_volume
+%{python3_sitelib}/ceph_volume/*
+%{python3_sitelib}/ceph_volume-*
+%endif
%{_mandir}/man8/ceph-deploy.8*
%{_mandir}/man8/ceph-detect-init.8*
%{_mandir}/man8/ceph-create-keys.8*
@@ -1093,7 +1154,6 @@ fi
%{_bindir}/ceph-dencoder
%{_bindir}/ceph-rbdnamer
%{_bindir}/ceph-syn
-%{_bindir}/ceph-crush-location
%{_bindir}/cephfs-data-scan
%{_bindir}/cephfs-journal-tool
%{_bindir}/cephfs-table-tool
@@ -1139,8 +1199,15 @@ fi
%config %{_sysconfdir}/bash_completion.d/radosgw-admin
%config(noreplace) %{_sysconfdir}/ceph/rbdmap
%{_unitdir}/rbdmap.service
+%if 0%{with python2}
%{python_sitelib}/ceph_argparse.py*
%{python_sitelib}/ceph_daemon.py*
+%else
+%{python3_sitelib}/ceph_argparse.py
+%{python3_sitelib}/__pycache__/ceph_argparse.cpython*.py*
+%{python3_sitelib}/ceph_daemon.py
+%{python3_sitelib}/__pycache__/ceph_daemon.cpython*.py*
+%endif
%dir %{_udevrulesdir}
%{_udevrulesdir}/50-rbd.rules
%attr(3770,ceph,ceph) %dir %{_localstatedir}/log/ceph/
@@ -1282,11 +1349,8 @@ fi
%files mon
%{_bindir}/ceph-mon
-%{_bindir}/ceph-rest-api
%{_bindir}/ceph-monstore-tool
%{_mandir}/man8/ceph-mon.8*
-%{_mandir}/man8/ceph-rest-api.8*
-%{python_sitelib}/ceph_rest_api.py*
%{_unitdir}/ceph-mon@.service
%{_unitdir}/ceph-mon.target
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mon
@@ -1559,9 +1623,11 @@ fi
%{_bindir}/librados-config
%{_mandir}/man8/librados-config.8*
+%if 0%{with python2}
%files -n python-rados
%{python_sitearch}/rados.so
%{python_sitearch}/rados-*.egg-info
+%endif
%files -n python%{python3_pkgversion}-rados
%{python3_sitearch}/rados.cpython*.so
@@ -1597,6 +1663,10 @@ fi
%ldconfig_scriptlets -n librgw2
%files -n librgw2
%{_libdir}/librgw.so.*
+%if %{with lttng}
+%{_libdir}/librgw_op_tp.so*
+%{_libdir}/librgw_rados_tp.so*
+%endif
%files -n librgw-devel
%dir %{_includedir}/rados
@@ -1604,17 +1674,21 @@ fi
%{_includedir}/rados/rgw_file.h
%{_libdir}/librgw.so
+%if 0%{with python2}
%files -n python-rgw
%{python_sitearch}/rgw.so
%{python_sitearch}/rgw-*.egg-info
+%endif
%files -n python%{python3_pkgversion}-rgw
%{python3_sitearch}/rgw.cpython*.so
%{python3_sitearch}/rgw-*.egg-info
+%if 0%{with python2}
%files -n python-rbd
%{python_sitearch}/rbd.so
%{python_sitearch}/rbd-*.egg-info
+%endif
%files -n python%{python3_pkgversion}-rbd
%{python3_sitearch}/rbd.cpython*.so
@@ -1630,10 +1704,12 @@ fi
%{_includedir}/cephfs/ceph_statx.h
%{_libdir}/libcephfs.so
+%if 0%{with python2}
%files -n python-cephfs
%{python_sitearch}/cephfs.so
%{python_sitearch}/cephfs-*.egg-info
%{python_sitelib}/ceph_volume_client.py*
+%endif
%files -n python%{python3_pkgversion}-cephfs
%{python3_sitearch}/cephfs.cpython*.so
@@ -1641,11 +1717,13 @@ fi
%{python3_sitelib}/ceph_volume_client.py
%{python3_sitelib}/__pycache__/ceph_volume_client.cpython*.py*
+%if 0%{with python2}
%files -n python%{python3_pkgversion}-ceph-argparse
%{python3_sitelib}/ceph_argparse.py
%{python3_sitelib}/__pycache__/ceph_argparse.cpython*.py*
%{python3_sitelib}/ceph_daemon.py
%{python3_sitelib}/__pycache__/ceph_daemon.cpython*.py*
+%endif
%if 0%{with ceph_test_package}
%files -n ceph-test
@@ -1667,13 +1745,7 @@ fi
%{_bindir}/ceph_rgw_multiparser
%{_bindir}/ceph_scratchtool
%{_bindir}/ceph_scratchtoolpp
-%{_bindir}/ceph_smalliobench
-%{_bindir}/ceph_smalliobenchdumb
-%{_bindir}/ceph_smalliobenchfs
-%{_bindir}/ceph_smalliobenchrbd
%{_bindir}/ceph_test_*
-%{_bindir}/ceph_tpbench
-%{_bindir}/ceph_xattr_bench
%{_bindir}/ceph-coverage
%{_bindir}/ceph-debugpack
%{_mandir}/man8/ceph-debugpack.8*
@@ -1790,12 +1862,17 @@ exit 0
%endif # with selinux
+%if 0%{with python2}
%files -n python-ceph-compat
# We need an empty %%files list for python-ceph-compat, to tell rpmbuild to
# actually build this meta package.
+%endif
%changelog
+* Tue May 8 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:13.1.0-1
+- New release (1:13.1.0-1)
+
* Fri Apr 27 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:12.2.5-1
- New release (1:12.2.5-1)
diff --git a/sources b/sources
index 021832c..e0ac550 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ceph-12.2.5.tar.gz) = bd78358590eb077afcc3c1e12864fadee906c95ac8afee25bdca6155f99b75f89d923159fcc13430abba21a89fee3e566177ff5f9ffabdd3b3f220d05602ab86
+SHA512 (ceph-13.1.0.tar.gz) = d4feb0b0bac5e30232eddcc3f69c1d939f0b5268491acecba9a58dcadbbdaab6367f415ede924ca84de9a89a686410613cdc631f8aff15aec0eb4531138eec7a
1
0
Architecture specific change in rpms/golang-github-ncw-dropbox-sdk-go-unofficial.git
by githook-noreply＠fedoraproject.org 08 May '18
by githook-noreply＠fedoraproject.org 08 May '18
08 May '18
The package rpms/golang-github-ncw-dropbox-sdk-go-unofficial.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-ncw-dropbox-sdk-go-un….
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 66083d01aa084bd1a6237f63caa5803a6ffff980
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Tue May 8 16:35:01 2018 +0200
Renamed to golang-github-ncw-dropbox-sdk-unofficial.
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 89609d8..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/dropbox-sdk-go-unofficial-5d9f46f.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..be333f1
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Renamed to golang-github-ncw-dropbox-sdk-unofficial.
diff --git a/golang-github-ncw-dropbox-sdk-go-unofficial.spec b/golang-github-ncw-dropbox-sdk-go-unofficial.spec
deleted file mode 100644
index 2072672..0000000
--- a/golang-github-ncw-dropbox-sdk-go-unofficial.spec
+++ /dev/null
@@ -1,178 +0,0 @@
-# If any of the following macros should be set otherwise,
-# you can wrap any of them with the following conditions:
-# - %%if 0%%{centos} == 7
-# - %%if 0%%{?rhel} == 7
-# - %%if 0%%{?fedora} == 23
-# Or just test for particular distribution:
-# - %%if 0%%{centos}
-# - %%if 0%%{?rhel}
-# - %%if 0%%{?fedora}
-#
-# Be aware, on centos, both %%rhel and %%centos are set. If you want to test
-# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition.
-# (Don't forget to replace double percentage symbol with single one in order to apply a condition)
-
-# Generate devel rpm
-%global with_devel 1
-# Build project from bundled dependencies
-%global with_bundled 0
-# Build with debug info rpm
-%global with_debug 0
-# Run tests in check section
-%global with_check 1
-# Generate unit-test rpm
-%global with_unit_test 1
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-
-%global provider github
-%global provider_tld com
-%global project ncw
-%global repo dropbox-sdk-go-unofficial
-# https://github.com/ncw/dropbox-sdk-go-unofficial
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit 5d9f46f9862ae5f65e264e178de6ce2c41a32d40
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20170530
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
-Summary: An unofficial Go SDK for integrating with the Dropbox API v2
-# Detected licences
-# - MIT/X11 (BSD like) at 'LICENSE'
-License: MIT
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-
-
-%description
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(golang.org/x/oauth2)
-%endif
-
-Requires: golang(golang.org/x/oauth2)
-
-Provides: golang(%{import_path}/dropbox) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/async) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/auth) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/common) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/files) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/paper) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/properties) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/sharing) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/team) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/team_common) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/team_log) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/team_policies) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/users) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/users_common) = %{version}-%{release}
-Provides: golang(%{import_path}/generator/go_rsrc) = %{version}-%{release}
-Provides: golang(%{import_path}/generator/go_rsrc/files) = %{version}-%{release}
-Provides: golang(%{import_path}/generator/go_rsrc/sharing) = %{version}-%{release}
-
-%description devel
-%{summary}
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
-%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
-
-%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-
-%if 0%{?with_devel}
-%files devel -f devel.file-list
-%license LICENSE
-%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%changelog
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20170530git5d9f46f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Jul 24 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.1.20170530git5d9f46f
-- First package for Fedora
-
diff --git a/sources b/sources
deleted file mode 100644
index 5b4aa91..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (dropbox-sdk-go-unofficial-5d9f46f.tar.gz) = 32875c330e36433a6ec285c660355c37ab7070e6fa148d0f2f6bfbc20310f3966e6a782c4e216f949174bd551c8c24923c55908b22703f1905d64f07fe0480c7
1
0
Architecture specific change in rpms/golang-github-ncw-dropbox-sdk-go-unofficial.git
by githook-noreply＠fedoraproject.org 08 May '18
by githook-noreply＠fedoraproject.org 08 May '18
08 May '18
The package rpms/golang-github-ncw-dropbox-sdk-go-unofficial.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-ncw-dropbox-sdk-go-un….
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 1f3ee2e3dc76de3a96acea57fea77c19701a1336
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Tue May 8 16:34:41 2018 +0200
Renamed to golang-github-ncw-dropbox-sdk-unofficial.
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 89609d8..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/dropbox-sdk-go-unofficial-5d9f46f.tar.gz
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..be333f1
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Renamed to golang-github-ncw-dropbox-sdk-unofficial.
diff --git a/golang-github-ncw-dropbox-sdk-go-unofficial.spec b/golang-github-ncw-dropbox-sdk-go-unofficial.spec
deleted file mode 100644
index 2072672..0000000
--- a/golang-github-ncw-dropbox-sdk-go-unofficial.spec
+++ /dev/null
@@ -1,178 +0,0 @@
-# If any of the following macros should be set otherwise,
-# you can wrap any of them with the following conditions:
-# - %%if 0%%{centos} == 7
-# - %%if 0%%{?rhel} == 7
-# - %%if 0%%{?fedora} == 23
-# Or just test for particular distribution:
-# - %%if 0%%{centos}
-# - %%if 0%%{?rhel}
-# - %%if 0%%{?fedora}
-#
-# Be aware, on centos, both %%rhel and %%centos are set. If you want to test
-# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition.
-# (Don't forget to replace double percentage symbol with single one in order to apply a condition)
-
-# Generate devel rpm
-%global with_devel 1
-# Build project from bundled dependencies
-%global with_bundled 0
-# Build with debug info rpm
-%global with_debug 0
-# Run tests in check section
-%global with_check 1
-# Generate unit-test rpm
-%global with_unit_test 1
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-
-%global provider github
-%global provider_tld com
-%global project ncw
-%global repo dropbox-sdk-go-unofficial
-# https://github.com/ncw/dropbox-sdk-go-unofficial
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit 5d9f46f9862ae5f65e264e178de6ce2c41a32d40
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20170530
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
-Summary: An unofficial Go SDK for integrating with the Dropbox API v2
-# Detected licences
-# - MIT/X11 (BSD like) at 'LICENSE'
-License: MIT
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-
-
-%description
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-BuildRequires: golang(golang.org/x/oauth2)
-%endif
-
-Requires: golang(golang.org/x/oauth2)
-
-Provides: golang(%{import_path}/dropbox) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/async) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/auth) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/common) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/files) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/paper) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/properties) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/sharing) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/team) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/team_common) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/team_log) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/team_policies) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/users) = %{version}-%{release}
-Provides: golang(%{import_path}/dropbox/users_common) = %{version}-%{release}
-Provides: golang(%{import_path}/generator/go_rsrc) = %{version}-%{release}
-Provides: golang(%{import_path}/generator/go_rsrc/files) = %{version}-%{release}
-Provides: golang(%{import_path}/generator/go_rsrc/sharing) = %{version}-%{release}
-
-%description devel
-%{summary}
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
-%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
-
-%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%endif
-
-#define license tag if not already defined
-%{!?_licensedir:%global license %doc}
-
-
-%if 0%{?with_devel}
-%files devel -f devel.file-list
-%license LICENSE
-%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%changelog
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.2.20170530git5d9f46f
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Jul 24 2017 Robert-André Mauchin <zebob.m(a)gmail.com> - 0-0.1.20170530git5d9f46f
-- First package for Fedora
-
diff --git a/sources b/sources
deleted file mode 100644
index 5b4aa91..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (dropbox-sdk-go-unofficial-5d9f46f.tar.gz) = 32875c330e36433a6ec285c660355c37ab7070e6fa148d0f2f6bfbc20310f3966e6a782c4e216f949174bd551c8c24923c55908b22703f1905d64f07fe0480c7
1
0
Architecture specific change in rpms/firmware-addon-dell.git
by githook-noreply＠fedoraproject.org 08 May '18
by githook-noreply＠fedoraproject.org 08 May '18
08 May '18
The package rpms/firmware-addon-dell.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/firmware-addon-dell.git/commit/?id=….
Change:
-ExclusiveArch: x86_64 ia64 %{ix86}
Thanks.
Full change:
============
commit 23f8bab6e1a3dc30b6a49ed46e6b2b8c430ea4c0
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Tue May 8 10:19:45 2018 -0400
"The recommendation from Dell is to drop it. Other distros have dropped it too" -- Charles Rose, Dell
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f1f02ae..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-firmware-addon-dell-2.2.9.tar.bz2
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..06367a5
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+"The recommendation from Dell is to drop it. Other distros have dropped it too" -- Charles Rose, Dell
diff --git a/firmware-addon-dell.spec b/firmware-addon-dell.spec
deleted file mode 100644
index 87414a3..0000000
--- a/firmware-addon-dell.spec
+++ /dev/null
@@ -1,230 +0,0 @@
-# vim:tw=0:ts=4:sw=4:et
-%define major 2
-%define minor 2
-%define micro 9
-%define extra %{nil}
-%define release_version %{major}.%{minor}.%{micro}%{extra}
-
-# required by suse build system
-# norootforbuild
-
-%define run_unit_tests 1
-%{?_without_unit_tests: %define run_unit_tests 0}
-%{?_with_unit_tests: %define run_unit_tests 1}
-
-%define python_xml_BR %{nil}
-# Some variable definitions so that we can be compatible between SUSE Build service and Fedora build system
-# SUSE: fedora_version suse_version rhel_version centos_version sles_version
-# Fedora: fedora dist fc8 fc9
-%if 0%{?suse_version} || 0%{?sles_version}
- %define python_xml_BR python-xml
-%endif
-
-# per fedora python packaging guidelines
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
-# no debuginfo package, as there are no compiled binaries.
-%define debug_package %{nil}
-
-Name: firmware-addon-dell
-Version: %{release_version}
-Release: 17%{?dist}
-Summary: A firmware-tools plugin to handle BIOS/Firmware for Dell systems
-
-Group: Applications/System
-License: GPLv2+ or OSL 2.1
-URL: http://linux.dell.com/libsmbios/download/
-Source0: http://linux.dell.com/libsmbios/download/%{name}/%{name}-%{version}/%{name}…
-Patch0: replace_wineprefix_with_wineboot.patch
-
-# Dell only sells Intel-compat systems, so this package doesnt make much sense
-# on, eg. PPC. Also, we rely on libsmbios, which is only avail on Intel-compat
-ExclusiveArch: x86_64 ia64 %{ix86}
-
-BuildRequires: firmware-tools > 0:2.0
-BuildRequires: python3-smbios python2-devel %{python_xml_BR}
-
-Requires: smbios-utils python3-smbios
-Requires: firmware-tools >= 0:2.0.0
-Provides: firmware_inventory(system_bios) = 0:%{version}
-
-%description
-The firmware-addon-dell package provides plugins to firmware-tools which enable
-BIOS updates for Dell system, plus pulls in standard inventory modules
-applicable to most Dell systems.
-
-%prep
-%setup -q
-%patch0 -p1
-
-
-%build
-# this line lets us build an RPM directly from a git tarball
-[ -e ./configure ] || ./autogen.sh
-
-# only applicable on obs
-# # fix problems when buildsystem time is out of sync. ./configure will
-# # fail if newly created files are older than the packaged files.
-# # this should normally be a no-op on proper buildsystems.
-# touch configure
-# find . -type f -newer configure -print0 | xargs -r0 touch
-
-%configure RELEASE_MAJOR=%{major} RELEASE_MINOR=%{minor} RELEASE_MICRO=%{micro} RELEASE_EXTRA=%{extra}
-make %{?_smp_mflags}
-
-%check
-%if 0%{?run_unit_tests}
-make %{?_smp_mflags} check
-%endif
-
-%install
-# Fedora Packaging guidelines
-rm -rf $RPM_BUILD_ROOT
-# SUSE Packaging rpmlint
-mkdir -p $RPM_BUILD_ROOT
-
-make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/firmware/dell/bios
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING-GPL COPYING-OSL
-%{python_sitelib}/*
-%config(noreplace) %{_sysconfdir}/firmware/firmware.d/*.conf
-%{_datadir}/firmware/dell
-%{_datadir}/firmware-tools/*
-
-
-%changelog
-* Mon Mar 26 2018 Iryna Shcherbina <ishcherb(a)redhat.com> - 2.2.9-17
-- Update Python 2 dependency declarations to new packaging standards
- (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.9-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.9-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.9-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.9-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.9-12
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Pa…
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.9-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.9-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.9-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.9-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.9-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.9-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.9-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.9-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Fri Jun 24 2011 Praveen K Paladugu <praveen_paladugu(a)dell.com>
-- Added a patch to fix BZ#688046.This patch uses wineboot when available and falls back to legacy winprefixcreate if not.
-
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Sep 27 2010 Matt Domsch <mdomsch(a)fedoraproject.org> - 2.2.9-1
-- update to latest upstream
-
-* Wed Jul 21 2010 David Malcolm <dmalcolm(a)redhat.com> - 2.2.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
-
-* Fri Dec 11 2009 Matt Domsch <mdomsch(a)fedoraproject.org> - 2.2.1-2
-- remember to upload the tarball first
-
-* Fri Dec 11 2009 Matt Domsch <mdomsch(a)fedoraproject.org> - 2.2.1-1
-- rebase to latest upstream
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.1.2-5.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu May 14 2009 Matt Domsch <mdomsch(a)fedoraproject.org> - 2.1.2-4.3
-- rebase to latest upstream
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.4.8-2.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm(a)gmail.com> - 1.4.8-2.1
-- Rebuild for Python 2.6
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> - 1.4.8-1
-- Autorebuild for GCC 4.3
-
-* Wed Aug 22 2007 Michael E Brown <michael_e_brown at dell.com> - 1.4.7-1
-- rebase to latest upstream
-
-* Fri Aug 17 2007 Michael E Brown <michael_e_brown at dell.com> - 1.4.4-1
-- rebase to latest upstream
-
-* Wed Jul 11 2007 Michael E Brown <michael_e_brown at dell.com> - 1.3.1-1
-- up2date_repo_autoconf is now obsolete. dell-*-repository files no longer
- use it.
-
-* Sat Apr 7 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.11-1
-- enhance up2date_repo_autoconf by populating default configuration file
-
-* Fri Apr 6 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.10-1
-- Couple of changes so that the dell sysid plugin work on yum 2.4.3
- prior versions didnt crash, but didnt properly substitute mirrolist
- because the name of mirrolist var is different in 2.4.3.
-- Per discussion on mailing list, convert to arch-specific pkg
-- package bin/up2date_repo_autoconf only for RHEL{3,4} releases
-
-* Fri Apr 6 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.9-1
-- downgrade api needed to 2.1
-- Added up2date_repo_autoconf binary
-- fix changes from 1.2.7 that were accidentally reverted in 1.2.8. :(
-
-* Fri Apr 6 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.8-1
-- sysid plugin: Zero pad value for sysid up to 4 chars
-- sysid plugin: Add 0x to signify that it is a hex value
-
-* Fri Mar 30 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.7-1
-- yum plugin didnt work on FC5 due to extra, unneeded import.
-- dont need plugin api 2.5, 2.2 will do
-
-* Wed Mar 28 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.6-1
-- Add yum plugins for setting system ID variables. repos can use $sys_ven_id
- $sys_dev_id in their baseurl= or mirrorlist= arguments.
-
-* Sat Mar 17 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.5-1
-- Add ExcludeArch for s390
-- Remove python-abi dep for RHEL3 (it was broken)
-- fix sitelib path missing /lib/ dir
-
-* Fri Mar 16 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.4-1
-- Add ExcludeArch to fix problem where f-a-d was being added to ppc repo
-
-* Thu Mar 15 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.2-1
-- Trivial changes to add specific {_datadir}/firmware/dell
-
-* Thu Mar 15 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.1-1
-- Trivial changes to make rpmlint happier
-
-* Wed Mar 14 2007 Michael E Brown <michael_e_brown at dell.com> - 1.2.0-1
-- Fedora-compliant packaging changes.
diff --git a/replace_wineprefix_with_wineboot.patch b/replace_wineprefix_with_wineboot.patch
deleted file mode 100644
index f81398f..0000000
--- a/replace_wineprefix_with_wineboot.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up firmware-addon-dell-2.2.9/firmware_addon_dell/extract_bios.py.orig firmware-addon-dell-2.2.9/firmware_addon_dell/extract_bios.py
---- firmware-addon-dell-2.2.9/firmware_addon_dell/extract_bios.py.orig 2011-06-22 17:00:47.000000000 -0500
-+++ firmware-addon-dell-2.2.9/firmware_addon_dell/extract_bios.py 2011-06-22 17:02:44.000000000 -0500
-@@ -189,7 +189,12 @@ def setupWine():
- "HOME":os.environ["HOME"],
- "WINEPREFIX": wineprefix,
- }
-- common.loggedCmd(["wineprefixcreate", "-w", "--prefix", wineprefix], cwd=wineprefix, env=env, logger=getLog(), raiseExc=False)
-+ if os.path.exists('/usr/bin/wineboot'):
-+ cmd = ["wineboot", "-u"]
-+ elif os.path.exists('/usr/bin/wineprefixcreate'):
-+ cmd = ["wineprefixcreate", "-w", "--prefix", wineprefix]
-+ common.loggedCmd(cmd, cwd=wineprefix, env=env, logger=getLog(), raiseExc=False)
-+
- atexit.register(shutil.rmtree, wineprefix)
- getLog(prefix="verbose.").info("Wine pre-setup finished.")
-
diff --git a/sources b/sources
deleted file mode 100644
index b6001c0..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-dd7298c9dd2807893d1c01e4e473c098 firmware-addon-dell-2.2.9.tar.bz2
1
0
08 May '18
The package rpms/phd2.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/phd2.git/commit/?id=195a9fea693b22b…
https://src.fedoraproject.org/cgit/rpms/phd2.git/commit/?id=d05674d0db255df….
Change:
+%ifnarch %{ix86}
-%ifnarch %{ix86}
Thanks.
Full change:
============
commit 195a9fea693b22bf98b85797ee1d3920d0b2c53a
Author: Mattia Verga <mattia.verga(a)email.it>
Date: Mon May 7 19:34:42 2018 +0200
Specify libindi to be >= 1.5
Tests are still failing on i686, so exclude them again.
diff --git a/phd2.spec b/phd2.spec
index 7cd04a3..747f800 100644
--- a/phd2.spec
+++ b/phd2.spec
@@ -37,7 +37,7 @@ BuildRequires: wxGTK3-devel
BuildRequires: pkgconfig(cfitsio)
BuildRequires: pkgconfig(eigen3)
BuildRequires: pkgconfig(libcurl)
-BuildRequires: pkgconfig(libindi)
+BuildRequires: pkgconfig(libindi) >= 1.5
BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(zlib)
@@ -81,11 +81,11 @@ popd
%find_lang %{name}
%check
-# Tests are failing on x86 with GCC7
+# Tests are failing on x86 with GCC >= 7
# https://github.com/OpenPHDGuiding/phd2/issues/608
-#%%ifnarch %%{ix86}
+%ifnarch %{ix86}
env CTEST_OUTPUT_ON_FAILURE=1 make test -C %{_target_platform}
-#%%endif
+%endif
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml
@@ -106,6 +106,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.
- Upgrade to 2.6.5
- Remove obsolete scriptlets
- Use upstream patch to disable third party drivers
+- Specify libindi to be >= 1.5
* Fri Feb 23 2018 Christian Dersch <lupinix(a)mailbox.org> - 2.6.4-6
- rebuilt for cfitsio 3.420 (so version bump)
commit d05674d0db255df967d12a18ee2f4ce84c3cfdcf
Author: Mattia Verga <mattia.verga(a)email.it>
Date: Mon May 7 19:11:05 2018 +0200
Update to 2.6.5
Remove obsolete scriptlets
Use upstream patch to disable third party camera drivers
diff --git a/.gitignore b/.gitignore
index 755ab01..bfedc60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/phd2-2.6.4-purged.tar.xz
+/phd2-2.6.5-purged.tar.xz
diff --git a/phd2.spec b/phd2.spec
index b7cdc4f..7cd04a3 100644
--- a/phd2.spec
+++ b/phd2.spec
@@ -1,6 +1,6 @@
Name: phd2
-Version: 2.6.4
-Release: 6%{?dist}
+Version: 2.6.5
+Release: 1%{?dist}
Summary: Telescope guiding software
# Main program files are BSD licensed
# Some components have different licenses:
@@ -16,16 +16,12 @@ Source0: %{name}-%{version}-purged.tar.xz
# Script to purge binaries and unneeded files from downloaded sources
Source1: generate-tarball.sh
-# Correct appdata files location
-# https://github.com/OpenPHDGuiding/phd2/pull/658
-Patch1: phd2_appdata_location_change.patch
-
# Use C++14 flag
Patch99: phd2_cflags.patch
-# We need to disable camera firmwares we removed from sources
-# This is Fedora specific and not reported upstream
-Patch100: phd2_disable_cams.patch
+# Backported patch from upstream to disable camera firmwares we removed from sources
+# https://github.com/OpenPHDGuiding/phd2/issues/690
+Patch100: phd2_2.6.5_disable_cams.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
@@ -70,7 +66,9 @@ pushd %{_target_platform}
%{cmake} -DUSE_SYSTEM_CFITSIO=ON \
-DUSE_SYSTEM_LIBUSB=ON \
-DUSE_SYSTEM_EIGEN3=ON \
- -DUSE_SYSTEM_GTEST=ON ..
+ -DUSE_SYSTEM_GTEST=ON \
+ -DUSE_SYSTEM_LIBINDI=ON \
+ -DOPENSOURCE_ONLY=ON ..
%make_build
@@ -85,25 +83,13 @@ popd
%check
# Tests are failing on x86 with GCC7
# https://github.com/OpenPHDGuiding/phd2/issues/608
-%ifnarch %{ix86}
+#%%ifnarch %%{ix86}
env CTEST_OUTPUT_ON_FAILURE=1 make test -C %{_target_platform}
-%endif
+#%%endif
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
%files -f %{name}.lang
%doc README.txt README-PHD2.txt PHD_2.0_Architecture.docx
@@ -116,6 +102,11 @@ fi
%changelog
+* Mon May 07 2018 Mattia Verga <mattia.verga(a)email.it> - 2.6.5-1
+- Upgrade to 2.6.5
+- Remove obsolete scriptlets
+- Use upstream patch to disable third party drivers
+
* Fri Feb 23 2018 Christian Dersch <lupinix(a)mailbox.org> - 2.6.4-6
- rebuilt for cfitsio 3.420 (so version bump)
diff --git a/phd2_2.6.5_disable_cams.patch b/phd2_2.6.5_disable_cams.patch
new file mode 100644
index 0000000..db633c2
--- /dev/null
+++ b/phd2_2.6.5_disable_cams.patch
@@ -0,0 +1,146 @@
+From 0d87a84540e90bb17e6d4183fd32d422c410861f Mon Sep 17 00:00:00 2001
+From: Andy Galasso <andy.galasso(a)gmail.com>
+Date: Mon, 7 May 2018 12:19:46 -0400
+Subject: [PATCH] Linux: add option to exclude binary drivers from build (ZWO
+ and QHY)
+
+---
+ cameras.h | 4 +-
+ thirdparty/thirdparty.cmake | 104 +++++++++++++++++++++++---------------------
+ 2 files changed, 58 insertions(+), 50 deletions(-)
+
+diff --git a/cameras.h b/cameras.h
+index 4d4ba67c..a7cdff02 100644
+--- a/cameras.h
++++ b/cameras.h
+@@ -109,7 +109,9 @@
+ # define QHY_CAMERA
+ # endif
+ # define INDI_CAMERA
+-# define ZWO_ASI
++# ifdef HAVE_ZWO_CAMERA
++# define ZWO_ASI
++# endif
+ # define SXV
+ # ifdef HAVE_SBIG_CAMERA
+ # define SBIG
+diff --git a/thirdparty/thirdparty.cmake b/thirdparty/thirdparty.cmake
+index 2bb1de8c..88157b2d 100644
+--- a/thirdparty/thirdparty.cmake
++++ b/thirdparty/thirdparty.cmake
+@@ -1207,60 +1207,66 @@ endif() # APPLE
+ #############################################
+ if(UNIX AND NOT APPLE)
+
+- if (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv6(.*)")
+- set(arch "armv6")
+- set(qhyarch "armv6")
+- elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv7(.*)|arm64|aarch64|^armv8(.*)")
+- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+- set(arch "armv8")
+- set(qhyarch "armv8")
+- else()
+- set(arch "armv7")
+- set(qhyarch "armv7")
+- endif()
+- elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "x86|X86|amd64|AMD64|i.86")
+- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+- set(arch "x64")
+- set(qhyarch "x86_64")
+- else()
+- set(arch "x86")
+- set(qhyarch "x86_32")
+- endif()
+- else()
+- message(FATAL_ERROR "unknown system architecture")
+- endif()
+-
+- find_path(ZWO_INCLUDE_DIR ASICamera2.h
+- NO_DEFAULT_PATHS
+- PATHS ${PHD_PROJECT_ROOT_DIR}/cameras
+- )
++ if (NOT OPENSOURCE_ONLY)
++
++ if (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv6(.*)")
++ set(zwoarch "armv6")
++ set(qhyarch "armv6")
++ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv7(.*)|arm64|aarch64|^armv8(.*)")
++ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
++ set(zwoarch "armv8")
++ set(qhyarch "armv8")
++ else()
++ set(zwoarch "armv7")
++ set(qhyarch "armv7")
++ endif()
++ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "x86|X86|amd64|AMD64|i.86")
++ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
++ set(zwoarch "x64")
++ set(qhyarch "x86_64")
++ else()
++ set(zwoarch "x86")
++ set(qhyarch "x86_32")
++ endif()
++ else()
++ message(FATAL_ERROR "unknown system architecture")
++ endif()
+
+- find_library(asiCamera2
+- NAMES ASICamera2
+- NO_DEFAULT_PATHS
+- PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${arch})
+- if(NOT asiCamera2)
+- message(FATAL_ERROR "Cannot find the asiCamera2 drivers")
+- endif()
+- message(STATUS "Found ASICamera2 lib ${asiCamera2}")
+- set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2})
++ find_path(ZWO_INCLUDE_DIR ASICamera2.h
++ NO_DEFAULT_PATHS
++ PATHS ${PHD_PROJECT_ROOT_DIR}/cameras
++ )
+
+- if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
+- add_definitions(-DHAVE_QHY_CAMERA=1)
++ find_library(asiCamera2
++ NAMES ASICamera2
++ NO_DEFAULT_PATHS
++ PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${zwoarch})
+
+- # be careful not to pick up any other qhy lib on the system
+- find_library( qhylib
+- NAMES qhy
+- NO_DEFAULT_PATH
+- PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
+- if(NOT qhylib)
+- message(FATAL_ERROR "Cannot find the qhy SDK libs")
++ if(NOT asiCamera2)
++ message(FATAL_ERROR "Cannot find the asiCamera2 drivers")
+ endif()
+- set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib})
+- endif()
++ message(STATUS "Found ASICamera2 lib ${asiCamera2}")
++ add_definitions(-DHAVE_ZWO_CAMERA=1)
++ set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2})
++
++ if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
++ add_definitions(-DHAVE_QHY_CAMERA=1)
++
++ # be careful not to pick up any other qhy lib on the system
++ find_library(qhylib
++ NAMES qhy
++ NO_DEFAULT_PATH
++ PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
++ if(NOT qhylib)
++ message(FATAL_ERROR "Cannot find the qhy SDK libs")
++ endif()
++ set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib})
++ endif()
++
++ # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty
++ remove_definitions(-DHAVE_QHY_CAMERA=1)
+
+- # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty
+- remove_definitions(-DHAVE_QHY_CAMERA=1)
++ endif() # OPENSOURCE_ONLY
+
+ # math library is needed, and should be one of the last things to link to here
+ find_library(mathlib NAMES m)
diff --git a/phd2_appdata_location_change.patch b/phd2_appdata_location_change.patch
deleted file mode 100644
index 8e5aace..0000000
--- a/phd2_appdata_location_change.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -U 3 -dHrN -- a/cmake_modules/PHD2Packaging.cmake b/cmake_modules/PHD2Packaging.cmake
---- a/cmake_modules/PHD2Packaging.cmake 2017-09-26 00:21:15.000000000 +0200
-+++ b/cmake_modules/PHD2Packaging.cmake 2017-11-02 18:18:54.455096341 +0100
-@@ -74,7 +74,7 @@
- install(FILES ${phd_src_dir}/phd2.desktop
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/ )
- install(FILES ${phd_src_dir}/phd2.appdata.xml
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata/ )
-+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo/ )
-
- # Make Debian package
- set(CPACK_GENERATOR "DEB")
diff --git a/phd2_disable_cams.patch b/phd2_disable_cams.patch
deleted file mode 100644
index 96ad505..0000000
--- a/phd2_disable_cams.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -U 3 -dHrN -- a/cameras.h b/cameras.h
---- a/cameras.h 2017-09-04 23:55:17.000000000 +0200
-+++ b/cameras.h 2017-09-06 20:25:22.743663856 +0200
-@@ -109,7 +109,7 @@
- # define QHY_CAMERA
- # endif
- # define INDI_CAMERA
--# define ZWO_ASI
-+//# define ZWO_ASI
- # define SXV
- # ifdef HAVE_SBIG_CAMERA
- # define SBIG
-diff -U 3 -dHrN -- a/thirdparty/thirdparty.cmake b/thirdparty/thirdparty.cmake
---- a/thirdparty/thirdparty.cmake 2017-09-26 00:21:15.000000000 +0200
-+++ b/thirdparty/thirdparty.cmake 2017-11-02 19:04:42.283172290 +0100
-@@ -1042,35 +1042,35 @@
- set(qhyarch "x86_32")
- endif()
- else()
-- message(FATAL_ERROR "unknown system architecture")
-+ message(WARNING "unknown system architecture")
- endif()
-
-- find_path(ZWO_INCLUDE_DIR ASICamera2.h
-- PATHS
-- ${PHD_PROJECT_ROOT_DIR}/cameras
-- )
--
-- find_library(asiCamera2
-- NAMES ASICamera2
-- PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${arch})
-- if(NOT asiCamera2)
-- message(FATAL_ERROR "Cannot find the asiCamera2 drivers")
-- endif()
-- set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2})
--
-- if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
-- add_definitions(-DHAVE_QHY_CAMERA=1)
-+# find_path(ZWO_INCLUDE_DIR ASICamera2.h
-+# PATHS
-+# ${PHD_PROJECT_ROOT_DIR}/cameras
-+# )
-+#
-+# find_library(asiCamera2
-+# NAMES ASICamera2
-+# PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${arch})
-+# if(NOT asiCamera2)
-+# message(FATAL_ERROR "Cannot find the asiCamera2 drivers")
-+# endif()
-+# set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2})
-+#
-+# if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
-+# add_definitions(-DHAVE_QHY_CAMERA=1)
-
- # be careful not to pick up any other qhy lib on the system
-- find_library( qhylib
-- NAMES qhy
-- NO_DEFAULT_PATH
-- PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
-- if(NOT qhylib)
-- message(FATAL_ERROR "Cannot find the qhy SDK libs")
-- endif()
-- set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib})
-- endif()
-+# find_library( qhylib
-+# NAMES qhy
-+# NO_DEFAULT_PATH
-+# PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
-+# if(NOT qhylib)
-+# message(FATAL_ERROR "Cannot find the qhy SDK libs")
-+# endif()
-+# set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib})
-+# endif()
-
- # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty
- remove_definitions(-DHAVE_QHY_CAMERA=1)
diff --git a/sources b/sources
index a106e1d..21f6d85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (phd2-2.6.4-purged.tar.xz) = 1dedb5174d9a393cbf804a4539a38afe9fd035374cd73465bc2474180d58fdbb8b9c677b00204746de72d7d374303a17e07f8537ed71a22cafea1e889f476c86
+SHA512 (phd2-2.6.5-purged.tar.xz) = 7ec3d92d5181dca6f735f923940a464d31b1138a143e3bf31d6a6e231b8b77a504c172f2b6f833f2cab43051f0397d1901f6bc8780b92e16dbd6d556d319e92f
1
0
List of packages currently excluding arches (2597)
===========================================
- 0ad
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- 90-Second-Portraits
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
- GtkAda
ExclusiveArch: %{GPRbuild_arches}
- GtkAda3
ExclusiveArch: %{GPRbuild_arches}
- LuxRender
ExclusiveArch: x86_64
- OpenTK
ExclusiveArch: %mono_arches
- PragmARC
ExclusiveArch: %{GPRbuild_arches}
- R-DynDoc
ExclusiveArch: armv7, ppc, go_arch
- RdRand
ExclusiveArch: %{ix86} x86_64
- SLOF
ExclusiveArch: ppc64le
- YafaRay
ExclusiveArch: %{ix86} x86_64
- aboot
ExclusiveArch: alpha
- acpid
ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64
- ahven
ExclusiveArch: %{GPRbuild_arches}
- alleyoop
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64
- american-fuzzy-lop
ExclusiveArch: %{ix86} x86_64
- anet
ExclusiveArch: %{GPRbuild_arches}
- apmd
ExclusiveArch: %{ix86}
- apmud
ExclusiveArch: ppc
- appstream-generator
ExclusiveArch: x86_64 %{ix86} %{arm}
- arduino
ExclusiveArch: %{go_arches}
- arduino-builder
ExclusiveArch: %{go_arches}
- arm-boot-config
ExclusiveArch: %{arm}
- arm-trusted-firmware
ExclusiveArch: aarch64
- atomic
ExclusiveArch: %{go_arches}
- aunit
ExclusiveArch: %GPRbuild_arches
- avgtime
ExclusiveArch: %{ldc_arches}
- aws
ExclusiveArch: %GPRbuild_arches
- banshee
ExclusiveArch: %{mono_arches}
- banshee-community-extensions
ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x
- bareftp
ExclusiveArch: %{mono_arches}
- bcal
ExclusiveArch: x86_64 aarch64 ia64 ppc64 ppc64le s390x
- bcc
ExclusiveArch: x86_64 %{power64}
- bcm283x-firmware
ExclusiveArch: %{arm} aarch64
- beignet
ExclusiveArch: x86_64 %{ix86}
- berusky2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips}
- biosdevname
ExclusiveArch: %{ix86} x86_64
- bless
ExclusiveArch: %mono_arches
- boo
ExclusiveArch: %{mono_arches}
- buildah
ExclusiveArch: x86_64 %{arm} aarch64 ppc64le s390x
- bwa
ExclusiveArch: x86_64
- caddy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}}
- cadvisor
ExclusiveArch: %{ix86} x86_64 aarch64 ppc64le
- calamares
ExclusiveArch: %{ix86} x86_64
- carto
ExclusiveArch: %{nodejs_arches} noarch
- ccdciel
ExclusiveArch: %{fpc_arches}
- cdcollect
ExclusiveArch: %{mono_arches}
- ceph
ExclusiveArch: x86_64 aarch64 ppc64 ppc64le
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- chromium
ExclusiveArch: x86_64 i686
ExclusiveArch: x86_64 i686 aarch64
- cjdns
ExclusiveArch: %{nodejs_arches}
- cmospwd
ExclusiveArch: %{ix86} x86_64
- cmrt
ExclusiveArch: %{ix86} x86_64 ia64
- coffee-script
ExclusiveArch: %{nodejs_arches} noarch
- colorful
ExclusiveArch: %{fpc_arches}
- compat-gcc-296
ExclusiveArch: %{ix86} ia64 ppc
- consul
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- containerd
ExclusiveArch: %{go_arches}
- cpuid
ExclusiveArch: %{ix86} x86_64
- cqrlog
ExclusiveArch: %{fpc_arches}
- crash
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- cri-tools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- criu
ExclusiveArch: x86_64 %{arm} ppc64le aarch64
ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x
- cryptlib
ExclusiveArch: x86_64 %{ix86} aarch64 ppc64 ppc64le
- cryptobone
ExclusiveArch: x86_64 %{ix86} ppc64 ppc64le aarch64
- daq
ExclusiveArch: x86_64 aarch64
- darktable
ExclusiveArch: x86_64 aarch64
- dbus-sharp
ExclusiveArch: %mono_arches
- dbus-sharp-glib
ExclusiveArch: %mono_arches
- dbxtool
ExclusiveArch: i386 x86_64 aarch64
- deepin-api
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- deepin-daemon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-dbus-generator
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- deepin-gir-generator
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- derelict
ExclusiveArch: %{ldc_arches}
- direnv
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- dlm
ExclusiveArch: i686 x86_64
- dmidecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- dmtcp
ExclusiveArch: %ix86 x86_64 aarch64
- docco
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- docker
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- docker-anaconda-addon
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- docker-distribution
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- docker-latest
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- dolphin-emu
ExclusiveArch: x86_64 armv7l aarch64
- douceur
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- dpdk
ExclusiveArch: x86_64 i686 aarch64 ppc64le
- dssi-vst
ExclusiveArch: %{ix86} x86_64
- dustmite
ExclusiveArch: %{ldc_arches}
- dyninst
ExclusiveArch: %{ix86} x86_64 ppc ppc64
- e3
ExclusiveArch: %{ix86} x86_64
- edac-utils
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64}
- edb
ExclusiveArch: %{ix86} x86_64
- edk2
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
ExclusiveArch: x86_64 aarch64
- efibootmgr
ExclusiveArch: %{efi}
- efivar
ExclusiveArch: %{efi}
- elasticdump
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- elk
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- embree
ExclusiveArch: x86_64
- embree2
ExclusiveArch: x86_64
- envytools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- exciting
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64}
- exercism
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- expresso
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- extlinux-bootloader
ExclusiveArch: %{arm} aarch64
- fcitx-libpinyin
ExclusiveArch: %{qt5_qtwebengine_arches}
- fedora-developer-portal
ExclusiveArch: ix86 x86_64
- fedora-dockerfiles
ExclusiveArch: %{go_arches}
- fedora-gnat-project-common
ExclusiveArch: noarch %{GNAT_arches}
- fence-virt
ExclusiveArch: i686 x86_64
- fes
ExclusiveArch: x86_64
- firmware-addon-dell
ExclusiveArch: x86_64 ia64 %{ix86}
- flannel
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- florist
ExclusiveArch: %{GPRbuild_arches}
- fluxcapacitor
ExclusiveArch: %{ix86} x86_64 %{arm}
- fpc
ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64
- freshmaker
ExclusiveArch: %{ix86} x86_64
- frysk
ExclusiveArch: %{ix86} x86_64 ppc64
- fst
ExclusiveArch: i686
- fwts
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x %{power64}
- fwupdate
ExclusiveArch: %{efi}
- fzf
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- ga
ExclusiveArch: %{ix86} x86_64
- gbrainy
ExclusiveArch: %mono_arches
- gdata-sharp
ExclusiveArch: %mono_arches
- gdb-exploitable
ExclusiveArch: x86_64 i386
ExclusiveArch: x86_64 noarch
- gela-asis
ExclusiveArch: %GPRbuild_arches
- ghdl
ExclusiveArch: %{GNAT_arches}
- gio-sharp
ExclusiveArch: %mono_arches
- gir-to-d
ExclusiveArch: %{ldc_arches}
- git-lfs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x}
- git-octopus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- giver
ExclusiveArch: %{mono_arches}
- gkeyfile-sharp
ExclusiveArch: %mono_arches
- gl3n
ExclusiveArch: %{ldc_arches}
- glibc32
ExclusiveArch: x86_64 ppc64 s390x
- glusterd2
ExclusiveArch: %{go_arches}
- gmqcc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- gnatcoll
ExclusiveArch: %GPRbuild_arches
- gnome-boxes
ExclusiveArch: x86_64
- gnome-desktop-sharp
ExclusiveArch: %mono_arches
- gnome-do
ExclusiveArch: %mono_arches
- gnome-guitar
ExclusiveArch: %{mono_arches}
- gnome-keyring-sharp
ExclusiveArch: %mono_arches
- gnome-rdp
ExclusiveArch: %{mono_arches}
- gnome-sharp
ExclusiveArch: %mono_arches
- gnome-subtitles
ExclusiveArch: %mono_arches
- gnu-efi
ExclusiveArch: %{efi}
- gnu-smalltalk
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
- go-bindata
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- go-compilers
ExclusiveArch: %{go_arches}
- go-i18n
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gocomplete
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- godep
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- godotenv
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- gofed
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- golang
ExclusiveArch: %{golang_arches}
- golang-bitbucket-kardianos-osext
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-deepin-dbus-factory
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-deepin-go-lib
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-10gen-openssl
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- golang-github-AudriusButkevicius-cli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-AudriusButkevicius-go-nat-pmp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-AudriusButkevicius-kcp-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-AudriusButkevicius-pfilter
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-BurntSushi-freetype-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-BurntSushi-graphics-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-BurntSushi-toml-test
ExclusiveArch: %{go_arches}
- golang-github-BurntSushi-xgb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-BurntSushi-xgbutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-Jeffail-gabs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-PuerkitoBio-goquery
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-PuerkitoBio-purell
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-PuerkitoBio-urlesc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-RangelReale-osin
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-RangelReale-osincli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-SAP-go-hdb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-SeanDolphin-bqschema
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-SermoDigital-jose
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-Shopify-sarama
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-Shopify-toxiproxy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-ThomsonReutersEikon-go-ntlm
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-assert
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-chroma
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-alecthomas-colour
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-kingpin
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-repr
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-template
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-alecthomas-units
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-andybalholm-cascadia
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-appc-spec
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-armon-go-metrics
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-armon-go-proxyproto
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-asaskevich-govalidator
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-auth0-go-jwt-middleware
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-axgle-mahonia
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-bep-gitmap
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-bep-inflect
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-bgentry-go-netrc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-bkaradzic-go-lz4
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-boombuler-barcode
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-buger-jsonparser
ExclusiveArch: %{go_arches} noarch
- golang-github-calmh-du
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-calmh-luhn
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-calmh-xdr
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-ccding-go-stun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cespare-xxhash
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-chaseadamsio-goorgeous
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cheekybits-is
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-chmduquesne-rollinghash
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-chrismalek-oktasdk-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-client9-gospell
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cloudfoundry-incubator-candiedyaml
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cockroachdb-cockroach-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-codahale-aesnicheck
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-codegangsta-negroni
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-coreos-go-etcd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-cryptix-wav
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-cznic-b
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-fileutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-golex
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-internal
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-lex
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-lexer
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-lldb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-mathutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-ql
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-sortutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-strutil
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-cznic-zappy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-d4l3k-messagediff
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-danwakefield-fnmatch
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-dchest-cssmin
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-dchest-siphash
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-denisenkom-go-mssqldb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-disintegration-imaging
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-dlclark-regexp2
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-docker-libkv
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-docopt-docopt-go
ExclusiveArch: %{go_arches}
- golang-github-duosecurity-duo_api_golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-edsrzf-mmap-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-eknkc-amber
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-endophage-gotuf
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-fatih-color
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-fatih-structs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-flynn-go-shlex
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-fortytw2-leaktest
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-fsnotify-fsnotify
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-fsouza-go-dockerclient
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-fullsailor-pkcs7
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-gdamore-encoding
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-gdamore-tcell
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-git-lfs-wildmatch
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-glacjay-goini
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-go-errors-errors
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-go-macaron-inject
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-go-mgo-mgo
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-go-tomb-tomb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gobuffalo-envy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-gobwas-glob
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-gocql-gocql
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-golang-image
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-google-go-cmp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-google-go-github
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-goraft-raft
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gorilla-css
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-gorilla-sessions
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-gosexy-gettext
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-hailocab-go-hostpool
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-go-hclog
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-go-plugin
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-hashicorp-go-rootcerts
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-howeyc-fsnotify
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-inconshreveable-go-vhost
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-influxdb-influxdb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jackpal-gateway
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jdkato-prose
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jdkato-syllables
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-jefferai-jsonx
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-justinas-alice
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-kdar-factorlog
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-keybase-go-crypto
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-klauspost-cpuid
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-klauspost-reedsolomon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-knieriem-markdown
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-kyokomi-emoji
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-linuxdeepin-go-x11-client
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-lpabon-godbc
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-lucasb-eyer-go-colorful
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-markbates-inflect
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mattn-go-colorable
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mattn-go-shellwords
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mgutz-ansi
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mgutz-logxi
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-michaelklishin-rabbit-hole
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-miekg-mmark
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-miekg-pkcs11
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-milochristiansen-axis2
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-milochristiansen-lua
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-minio-sha256-simd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mistifyio-go-zfs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-mitchellh-cli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mitchellh-copystructure
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mitchellh-go-homedir
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-mitchellh-go-testing-interface
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mitchellh-go-wordwrap
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mitchellh-goamz
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-mitchellh-mapstructure
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mitchellh-reflectwalk
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-montanaflynn-stats
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mreiferson-go-httpclient
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-msteinert-pam
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-muesli-smartcrop
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-mvo5-goconfigparser
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-mvo5-uboot-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-mxk-go-flowrate
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-ncw-dropbox-sdk-go-unofficial
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-ncw-swift
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-neurosnap-sentences
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-nfnt-resize
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-noahdesu-go-ceph
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-ojii-gettext.go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-olekukonko-tablewriter
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-olekukonko-ts
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-olivere-elastic
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-onsi-ginkgo
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-onsi-gomega
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-opencontainers-runtime-spec
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-opencontainers-specs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-openshift-go-json-rest
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-openshift-go-systemd
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-openshift-openshift-sdn
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-oschwald-geoip2-golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-oschwald-maxminddb-golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-patrickmn-go-cache
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-paulrosania-go-charset
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-pelletier-go-buffruneio
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-petar-GoLLRB
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-peterh-liner
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-petermattis-goid
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-pkg-profile
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-pkg-sftp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-pmezard-go-difflib
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-pquerna-otp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-prometheus-client_golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-prometheus-client_model
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-prometheus-common
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-prometheus-procfs
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-prometheus-prometheus
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-racker-perigee
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-rackspace-gophercloud
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-rakyll-globalconf
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-rakyll-pb
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-rakyll-statik
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-rasky-go-xdr
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-rcrowley-go-metrics
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-remeh-sizedwaitgroup
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-remyoudompheng-bigfft
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-ryanuber-columnize
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-ryanuber-go-glob
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-samalba-dockerclient
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-samuel-go-zookeeper
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-sasha-s-go-deadlock
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-seccomp-libseccomp-golang
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-sergi-go-diff
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-sethgrid-pester
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-shiena-ansicolor
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-shogo82148-go-shuffle
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-shurcooL-sanitized_anchor_name
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-skarademir-naturalsort
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-skratchdot-open-golang
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-skynetservices-skydns
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-smartystreets-assertions
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-smartystreets-go-aws-auth
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-smartystreets-goconvey
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spacejam-loghisto
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-spacemonkeygo-openssl
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm} ppc64le s390x}
- golang-github-spaolacci-murmur3
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spf13-afero
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spf13-fsync
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-spf13-nitro
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-sstarcher-go-okta
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-stathat-go
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-stevvooe-resumable
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-streadway-amqp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-stretchr-objx
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-syndtr-gocapability
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-syndtr-goleveldb
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-syndtr-gosnappy
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-templexxx-cpufeat
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-templexxx-reedsolomon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-templexxx-xor
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-tent-http-link-go
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-thejerf-suture
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-tjfoc-gmsm
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-tonnerre-golang-pretty
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-urfave-cli
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-vaughan0-go-ini
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-vbatts-tar-split
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-vishvananda-netlink
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} aarch64 x86_64 %{arm}}
- golang-github-vishvananda-netns
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-vitrun-qart
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-vjeantet-asn1-ber
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-vmware-govcloudair
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-github-wsxiaoys-terminal
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xeipuuv-gojsonpointer
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xeipuuv-gojsonreference
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xeipuuv-gojsonschema
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xiang90-probing
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-xrash-smetrics
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xtaci-kcp-go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-xtaci-smux
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-yosssi-ace
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-yosssi-gohtml
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-github-yvasiyarov-go-metrics
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-yvasiyarov-gorelic
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-yvasiyarov-newrelic_platform_go
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-github-zillode-notify
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-google-golangorg-cloud
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-gcfg
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-googlecode-go-decimal-inf
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-googlecode-go-exp
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-googlecode-log4go
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-googlecode-sqlite
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
ExclusiveArch: %{go_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- golang-googlecode-uuid
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-gopkg-check
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-gopkg-go-check-check
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-gopkg-go-macaroon-macaroon
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- golang-gopkg-retry-v1
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-layeh-gopher-luar
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golang-torproject-pluggable-transports-goptlib
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- golint
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- gomtree
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- gotags
ExclusiveArch: %{go_arches}
- gotun
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: x86_64
- gprbuild
ExclusiveArch: %{GPRbuild_arches} %{bootstrap_arch}
- gprolog
ExclusiveArch: x86_64 %{ix86} ppc alpha
- gsf-sharp
ExclusiveArch: %mono_arches
- gtk-sharp-beans
ExclusiveArch: %mono_arches
- gtk-sharp2
ExclusiveArch: %mono_arches
- gtk-sharp3
ExclusiveArch: %{mono_arches}
- gtkd
ExclusiveArch: %{ldc_arches}
- gudev-sharp
ExclusiveArch: %mono_arches
- hedgewars
ExclusiveArch: %{fpc_arches}
- heketi
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- hsakmt
ExclusiveArch: x86_64 aarch64
- hub
ExclusiveArch: %{go_arches}
- hugo
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- hyena
ExclusiveArch: %{mono_arches}
- hyperscan
ExclusiveArch: x86_64
- hyperv-daemons
ExclusiveArch: i686 x86_64
- icaro
ExclusiveArch: %{ix86} %{arm} x86_64 noarch
- ikarus
ExclusiveArch: %{ix86}
- imvirt
ExclusiveArch: %{ix86} x86_64 ia64
- indistarter
ExclusiveArch: %{fpc_arches}
- infinipath-psm
ExclusiveArch: x86_64
- insect
ExclusiveArch: %{nodejs_arches} noarch
- intel-cmt-cat
ExclusiveArch: x86_64 i686 i586
ExclusiveArch: x86_64 i686 i586
- ioport
ExclusiveArch: %{ix86} x86_64
- ipw2100-firmware
ExclusiveArch: noarch i386 x86_64
- ipw2200-firmware
ExclusiveArch: noarch i386 x86_64
- ispc
ExclusiveArch: %{arm} %{ix86} x86_64
- iucode-tool
ExclusiveArch: %{ix86} x86_64
- iwyu
ExclusiveArch: %{ix86} x86_64
- ixpdimm_sw
ExclusiveArch: x86_64
- jake
ExclusiveArch: %{nodejs_arches} noarch
- jasmine-node
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- java-1.8.0-openjdk-aarch32
ExclusiveArch: %{arm}
- jid
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- josm
ExclusiveArch: %{ix86} x86_64
- julia
ExclusiveArch: %{ix86} x86_64
- keepass
ExclusiveArch: %{mono_arches}
- kernel
ExclusiveArch: %{all_x86} x86_64 ppc64 s390x %{arm} aarch64 ppc64le
- kicad
ExclusiveArch: %{ix86} x86_64 %{arm} ppc64 ppc64le aarch64
- knot-resolver
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- kompose
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x
- kosmtik
ExclusiveArch: %{nodejs_arches} noarch
- kubernetes
ExclusiveArch: x86_64 aarch64 ppc64le s390x %{arm}
- latrace
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64}
- lazarus
ExclusiveArch: %{fpc_arches}
- ldc
ExclusiveArch: %{ldc_arches}
- libbsr
ExclusiveArch: %{power64}
- libclc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x
- libcxl
ExclusiveArch: %{power64}
- libflatarray
ExclusiveArch: %{ix86} x86_64
- libhfi1
ExclusiveArch: x86_64
- libica
ExclusiveArch: s390 s390x
- libinvm-cim
ExclusiveArch: x86_64
- libinvm-cli
ExclusiveArch: x86_64
- libinvm-i18n
ExclusiveArch: x86_64
- libipt
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- libjingle
ExclusiveArch: %{ix86} x86_64 %{arm}
- libmfx
ExclusiveArch: %{ix86} x86_64
- libocxl
ExclusiveArch: ppc64le
- libpsm2
ExclusiveArch: x86_64
- libquentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- librtas
ExclusiveArch: ppc %{power64}
- libseccomp
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mipsel mips64el ppc64 ppc64le s390 s390x
- libservicelog
ExclusiveArch: ppc %{power64}
- libsmbios
ExclusiveArch: x86_64 %{ix86}
- libunwind
ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} %{ix86} x86_64
- libva-intel-hybrid-driver
ExclusiveArch: %{ix86} x86_64 ia64
- libvmi
ExclusiveArch: x86_64
- libvpd
ExclusiveArch: ppc %{power64}
- libxsmm
ExclusiveArch: x86_64
- libzfcphbaapi
ExclusiveArch: s390 s390x
- lldb
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- lodash
ExclusiveArch: %{nodejs_arches} noarch
- log4net
ExclusiveArch: %mono_arches
- lrmi
ExclusiveArch: %{ix86}
- lsvpd
ExclusiveArch: ppc %{power64}
- luajit
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mactel-boot
ExclusiveArch: x86_64
- manifest-tool
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- matreshka
ExclusiveArch: %GPRbuild_arches
- maven-eclipse-plugin
ExclusiveArch: %{ix86} x86_64
- maxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- mcelog
ExclusiveArch: i686 x86_64
- mediaconch
ExclusiveArch: %{qt5_qtwebengine_arches}
- mellowplayer
ExclusiveArch: %{qt5_qtwebengine_arches}
- memkind
ExclusiveArch: x86_64
- memtest86+
ExclusiveArch: %{ix86} x86_64
- mesos
ExclusiveArch: x86_64
- microcode_ctl
ExclusiveArch: %{ix86} x86_64
- micropython
ExclusiveArch: %{arm} x86_64
- mine_detector
ExclusiveArch: %{GPRbuild_arches}
- minetest
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- mingw-wine-gecko
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- mkbootdisk
ExclusiveArch: %{ix86} sparc sparc64 x86_64
- mnemosyne
ExclusiveArch: noarch %{qt5_qtwebengine_arches}
- mocha
ExclusiveArch: %{nodejs_arches} noarch
- mod_mono
ExclusiveArch: %mono_arches
- module-build-service
ExclusiveArch: %{ix86} x86_64 noarch
- mokutil
ExclusiveArch: %{ix86} x86_64 aarch64
- mongo-tools
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- mono
ExclusiveArch: %mono_arches
- mono-addins
ExclusiveArch: %mono_arches
- mono-basic
ExclusiveArch: %{mono_arches}
- mono-bouncycastle
ExclusiveArch: %mono_arches
- mono-cecil
ExclusiveArch: %mono_arches
- mono-cecil-flowanalysis
ExclusiveArch: %mono_arches
- mono-debugger
ExclusiveArch: %ix86 x86_64
- mono-reflection
ExclusiveArch: %mono_arches
- mono-tools
ExclusiveArch: %mono_arches
- mono-zeroconf
ExclusiveArch: %mono_arches
- monobristol
ExclusiveArch: %{mono_arches}
- monodevelop
ExclusiveArch: %mono_arches
- monodevelop-debugger-gdb
ExclusiveArch: %{mono_arches}
- monosim
ExclusiveArch: %mono_arches
- mrrescue
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
- msr-tools
ExclusiveArch: %{ix86} x86_64
- mustache-d
ExclusiveArch: %{ldc_arches}
- mysql-connector-net
ExclusiveArch: %{mono_arches}
- nacl-arm-binutils
ExclusiveArch: x86_64
- nacl-arm-gcc
ExclusiveArch: x86_64
- nacl-arm-newlib
ExclusiveArch: x86_64
- nacl-binutils
ExclusiveArch: x86_64
- nacl-gcc
ExclusiveArch: x86_64
- nacl-newlib
ExclusiveArch: x86_64
- nant
ExclusiveArch: %mono_arches
- nbc
ExclusiveArch: %{fpc_arches}
- nbdkit
ExclusiveArch: x86_64
- ndesk-dbus
ExclusiveArch: %{mono_arches}
- ndesk-dbus-glib
ExclusiveArch: %{mono_arches}
- newtonsoft-json
ExclusiveArch: %{mono_arches}
- nim
ExclusiveArch: %{nim_arches}
- nini
ExclusiveArch: %{mono_arches}
- node-gyp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs
ExclusiveArch: %{nodejs_arches}
- nodejs-Base64
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-abbrev
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-accepts
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-acorn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-acorn-object-spread
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-add-stream
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-after
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-agent-base
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-agentkeepalive
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ain2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-align-text
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-alter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgblack
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgblue
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgcyan
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bggreen
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgmagenta
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgred
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgwhite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bgyellow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-black
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-blue
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-bold
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-cyan
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-dim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-escapes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-font
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-gray
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-green
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-grey
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-hidden
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-inverse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-italic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-magenta
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-red
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-reset
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-strikethrough
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-styles
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-underline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-white
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ansi-wrap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansi-yellow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansicolors
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansidiff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ansistyles
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-any-promise
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-append-field
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-append-transform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-aproba
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-archiver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-archiver-utils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-archy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-are-we-there-yet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-argparse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-argsparser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-arr-diff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-arr-exclude
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-arr-flatten
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-arr-union
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-buffer-from-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-differ
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-events
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-filter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-find
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-find-index
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-flatten
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-foreach
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-ify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-index
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-reduce
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-array-union
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-uniq
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-array-unique
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-arraybuffer-dot-slice
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-arraybuffer-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-arrify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-as-number
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-asap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ascii-tree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ascli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-asn1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-assert-plus
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-assertion-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-assume
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ast-traverse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ast-types
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-astral
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-astral-angular-annotate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-astral-pass
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-array-reduce
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-async-arrays
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-each
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-limiter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-queue
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-async-some
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-asynckit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-atob
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-auto-bind
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-autoresolve
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ava-init
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-aws-sign
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-aws-sign2
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-aws4
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-babel-code-frame
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-babel-messages
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-babel-runtime
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-backbone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-backoff
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-balanced-match
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base-option
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base-plugins
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base32-encode
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base64-arraybuffer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-base64-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-base64-url
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-base64id
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bash-match
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-basic-auth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-basic-auth-connect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-basic-auth-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-batch
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bcrypt
ExclusiveArch: %{nodejs_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- nodejs-bcryptjs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-beeper
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-benchmark
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-better-assert
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-better-than-before
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bignumber-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bind-obj-methods
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bindings
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bit-mask
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-blob
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-block-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bluebird
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-body-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-boolbase
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-boom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-brace-expansion
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-braces
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-breakable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-browser-request
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-browser-stdout
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bson
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buble
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buf-compare
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buffer-crc32
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buffer-equal
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-buffer-shims
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buffer-writer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-buffertools
ExclusiveArch: %{nodejs_arches}
- nodejs-bufferutil
ExclusiveArch: %{nodejs_arches}
- nodejs-builtin-modules
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-builtins
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bundle-dependencies
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bunker
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-bunyan
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-burrito
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-busboy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-byline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-bytes
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cache-base
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caching-transform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-call-delayed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-call-matcher
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-call-me-maybe
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-call-signature
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-callback-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caller-callsite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caller-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-callsite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-callsites
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-camel-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-camelcase
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-camelcase-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caniuse-db
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-capture-stack-trace
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-carrier
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-caseless
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-center-align
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-as-promised
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-cheerio
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-connect-middleware
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-json-schema
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-oauth2orize-grant
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-passport-strategy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chai-spies-next
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chainer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chainsaw
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chalk
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-change-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-char-spinner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-character-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-charenc
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-charm
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-check-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cheerio
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-child-process-close
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chmodr
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chownr
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chroma-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-chrono
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ci-info
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-circular-json
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cjson
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-clap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-class-utils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-clean-css
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-clean-yaml-object
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-clear-require
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cli-color
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cli-spinner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cli-table
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cliui
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-clone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-clone-deep
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-clone-stats
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-closure-compiler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cls
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cmd-shim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-co
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-co-mocha
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-co-with-promise
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-coa
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-code-point-at
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-codemirror
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-coffee-coverage
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-collection-visit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-collections
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-color-support
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-colour
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-columnify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-combined-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-commander
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-common-path-prefix
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-commondir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-commoner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-commonmark
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-compare-func
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-component-emitter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-component-indexof
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-component-inherit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-compress-commons
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-compressible
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-compression
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-concat-map
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-concat-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-config-chain
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-connect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-connect-livereload
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-connect-timeout
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-console-browserify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-console-dot-log
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-consolemd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-constant-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-constantinople
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-content-disposition
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-content-type
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-angular
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-atom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-codemirror
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-core
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-conventional-changelog-ember
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-eslint
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-express
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-jquery
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-jscs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-jshint
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-preset-loader
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-changelog-writer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-commits-filter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-commits-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-conventional-recommended-bump
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-convert-hex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-convert-source-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookie
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookie-jar
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cookie-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cookie-session
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookie-signature
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cookiejar
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cookies
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-copy-descriptor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-core-assert
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-core-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-core-util-is
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-couch-login
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-coveralls
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-crc
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-crc32-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-create-error-class
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-cross-spawn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cross-spawn-async
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-crypt
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cryptiles
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-csrf
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css-parse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css-select
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-css-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-css-tree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-css-what
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-csscomb-core
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csslint
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csso
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cssom
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csurf
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv-generate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv-parse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv-spectrum
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-csv-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ctype
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-currently-unhandled
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cycle
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-cyclist
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-d
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dargs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dashdash
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-data-uri-to-buffer
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-date-now
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dateformat
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-death
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-debug
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-debug-fabulous
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-debug-log
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-debuglog
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-decamelize
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-decamelize-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-decimal-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-decompress-response
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dedent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deep-eql
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deep-equal
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-deep-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deep-is
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-deeper
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-default-require-extensions
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-default-resolution
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-defaults
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-defence
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-defence-cli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-deferred
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-define-properties
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-define-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-defined
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-defs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-degenerator
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-del
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-delayed-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-delegates
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-delete
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dep-graph
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-depd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dependency-lister
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-deprecated
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-destroy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-detect-file
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-detect-indent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-detect-newline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-detect-node
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-detective
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dezalgo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dicer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-diff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-difflet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-difflib
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dirty-chai
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-docopt
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-doctrine
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dom-serializer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-domelementtype
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-domhandler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-domutils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dot-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dot-prop
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dotfile-regex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dreamopt
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-dryice
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-dtree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplexer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplexer2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-duplexer3
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duplexify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-duration
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-each
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-each-async
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ebnf-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-echomd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ecstatic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-editor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ee-first
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ejs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-emojione
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-empty-dir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-encodeurl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-encoding
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-end-of-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-engine-dot-io
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-engine-dot-io-client
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-engine-dot-io-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-entities
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-error-ex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-error-symbol
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-errorhandler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-errs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es-abstract
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es-to-primitive
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es5-ext
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es5-shim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-iterator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es6-promisify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-es6-set
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-shim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-symbol
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-es6-weak-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-escallmatch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-escape-html
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-escape-regexp-component
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-escape-string-regexp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-escodegen
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-escope
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-espower
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-espower-location-detector
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-esprima
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-esprima-fb
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-esprima-harmony-jscs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-espurify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-esrecurse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-estraverse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-estraverse-fb
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-esutils
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-etag
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-event-emitter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-event-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-eventemitter2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-eventemitter3
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-events
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-events-to-array
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-everything-dot-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-execa
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-exit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expand-brackets
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expand-range
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expand-tilde
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-expect-dot-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-express
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-express-session
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extend
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extend-shallow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extended-emitter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-extglob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-extsprintf
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-eyes
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fake
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fancy-log
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-far
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fast-levenshtein
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fastfall
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-faucet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-faye-websocket
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fd-slicer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fg-lodash
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-figures
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-file-entry-cache
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-file-sync-cmp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-file-uri-to-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-filed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-filelist
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-filename-regex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fileset
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fill-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fill-range
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-finalhandler
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-find-cache-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-find-up
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-findup-sync
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-first-chunk-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-flagged-respawn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-flat-cache
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-flot
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-flush-write-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fmix
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fn-dot-name
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fn-name
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-follow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-follow-redirects
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-for-in
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-for-own
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-foreach
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-foreground-child
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-forever-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-form-data
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-formatio
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-formidable
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-forwarded
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fragment-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-freetree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fresh
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-from
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-from2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-dot-notify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-exists-cached
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-exists-sync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-fs-ext
ExclusiveArch: %{nodejs_arches}
- nodejs-fs-extra
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-temp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-vacuum
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs-write-stream-atomic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fs2
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fstream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fstream-ignore
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-fstream-npm
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ftp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-function-bind
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-function-loop
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-gauge
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gaze
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gdal
ExclusiveArch: %{nodejs_arches}
- nodejs-generate-function
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generate-object-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-generic-pool
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-get-pkg-repo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-port
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-stdin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-get-uri
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-get-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-getobject
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gettext-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-dummy-commit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-raw-commits
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-remote-origin-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-semver-tags
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-git-tails
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gitconfiglocal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-github-url-from-git
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-github-url-from-username-repo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-glob
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-glob-base
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-glob-expand
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-glob-parent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-glob-to-regexp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-global-modules
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-global-prefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-globals
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-globby
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-globule
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-glogg
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gnode
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-gonzales-pe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-got
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-graceful-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-graceful-readlink
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grip
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-growl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-angular-templates
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-banner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-cli
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-compare-size
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-clean
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-concat
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-connect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-copy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-contrib-csslint
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-cssmin
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-htmlmin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-contrib-internal
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-less
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-nodeunit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-requirejs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-contrib-uglify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-contrib-watch
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-git-authors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-html-validation
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-init
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-known-options
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-legacy-log
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-legacy-log-utils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-legacy-util
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-lib-contrib
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-saucelabs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-sed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-simple-mocha
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-grunt-svgmin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-args
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-options
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-process
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-util-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-grunt-wrap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-gulp-mocha
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gulp-ng-classify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-gulp-util
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gulplog
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-gzip-size
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-handle-thing
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-handlebars
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-har-validator
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-ansi
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-binary
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-binary2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-color
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-has-cors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-flag
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-has-gulplog
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-has-unicode
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-values
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-has-yarn
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hash_file
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hawk
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-he
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-heap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-hex-to-array-buffer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-highlight-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-historic-readline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hock
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hoek
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-homedir-polyfill
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hook-std
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hooker
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-hosted-git-info
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-hsluv
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-html-minifier
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-htmlparser2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-deceiver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-errors
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-http-proxy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-http-server
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http-signature
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-http2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-https-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-humanize-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-i
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-i18n-transform
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-i2c
ExclusiveArch: %{nodejs_arches}
- nodejs-iconv
ExclusiveArch: %{nodejs_arches}
- nodejs-iconv-lite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-iferr
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ignore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-immutable
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-import-local
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-imul
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-imurmurhash
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-indent-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-indexof
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-infinity-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inflight
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-info-symbol
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inherit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-inherits
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inherits1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ini
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-init-package-json
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-inline-source-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-install
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-int64-buffer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-intercept-require
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-interpret
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-into-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-invert-kv
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ip
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ipaddr-dot-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-irc-colors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-irregular-plurals
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-absolute
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-accessor-descriptor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-arrayish
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-arrow-function
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-boolean-object
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-buffer
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-builtin-module
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-callable
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-data-descriptor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-date-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-descriptor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-dotfile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-equal-shallow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-extendable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-extglob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-finite
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-fullwidth-code-point
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-generator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-generator-fn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-generator-function
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-lower-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-my-json-valid
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-negated-glob
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-number
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-number-object
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-obj
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-observable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-odd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-path-cwd
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-path-in-cwd
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-path-inside
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-plain-obj
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-plain-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-primitive
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-property
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-redirect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-regexp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-registered
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-relative
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-retry-allowed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-subset
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-symbol
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-text-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-typedarray
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-unc-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-upper-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-url
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-utf8
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-valid-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-is-valid-instance
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-is-windows
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isarray
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-isexe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-iso8601
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isobject
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isodate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-isstream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul-lib-coverage
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul-lib-report
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul-lib-source-maps
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-istanbul-reports
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jade
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jasmine-growl-reporter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jasmine-reporters
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jest-mock
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jison
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jison-lex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jju
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-joose
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-joosex-namespace-depended
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-joosex-simplerequest
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-js-base64
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-js-string-escape
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-js-tokens
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-js-yaml
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jschardet
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jscoverage
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jshint
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-json-diff
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-json-localizer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-json-parse-better-errors
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-json-parse-helpfulerror
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-json-stable-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-json-stringify-safe
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-json3
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonfile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jsonify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jsonm
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonparse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonpointer
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonpointer-dot-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-jsonselect
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-jwt-simple
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-keep-alive-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-keygrip
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-keypress
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-kind-of
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-klaw
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-kuler2gpl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-langdetect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-latest-version
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lazy-cache
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lazystream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lcid
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lcov-parse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-leaflet
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-leaflet-formbuilder
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-leaflet-hash
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-leche
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-left-pad
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-less
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-levn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lex-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-libpq
ExclusiveArch: %{nodejs_arches}
- nodejs-libxmljs
ExclusiveArch: %{nodejs_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- nodejs-line-numbers
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-line-reader
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-linefix
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-linkify-it
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-load-grunt-tasks
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-load-json-file
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-locate-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lockfile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-log-driver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-log-ok
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-log-symbols
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-log-utils
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lolex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-longest
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-loophole
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-loud-rejection
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-lower-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lower-case-first
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lowercase-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lru-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-lru-queue
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ltx
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-magic-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-make-arrow-function
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-make-dir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-make-generator-function
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-make-node
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-makedir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-makeerror
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-map-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-map-obj
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-map-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-map-visit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mapnik
ExclusiveArch: %{nodejs_arches}
- nodejs-mapnik-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mapnik-vector-tile
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-markdown
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-markdown-it-testgen
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-marked
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-matched
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-max-timeout
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-maxmin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mbtiles
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-md5
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-md5-hex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-md5-o-matic
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mdn-data
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mdurl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-media-typer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-memoize-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-memoizee
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-memwatch-next
ExclusiveArch: %{nodejs_arches}
- nodejs-meow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-merge-descriptors
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-merge-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-metascript
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-method-override
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-methods
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-millstone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mime
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mime-db
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mime-types
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mimeparse
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mimic-response
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-minimalistic-assert
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-minimatch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-minimist
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-minimist-options
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-minipass
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-minstache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mixin-deep
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mixin-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mkdirp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mkfiletree
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mock-bin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mock-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mock-git
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-modify-values
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-module-not-found-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-moment
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-moment-timezone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mongodb
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mongodb-core
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-monocle
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-morgan
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-muffin
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-multiline
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-multimatch
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-multiparty
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-multipipe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-murmur-32
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mustache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mutate-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mute-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mv
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-mysql
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-mz
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nan
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nan0
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nan1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nano
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nanomatch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nanoseconds
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-native-or-bluebird
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ncp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-needle
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-negotiator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nested-error-stacks
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-net-browserify-alt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-netmask
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-next
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-next-tick
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ng-classify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-dot-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-expat
ExclusiveArch: %{nodejs_arches}
ExclusiveArch: %{ix86} x86_64 %{arm}
- nodejs-node-int64
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-markdown
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-print
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-static
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-status-codes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-node-stringprep
ExclusiveArch: %{nodejs_arches}
- nodejs-node-uuid
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-nomnom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-noncharacters
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nopt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nopt-usage
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-noptify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-normalize-git-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-normalize-package-data
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-normalize-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-cache-filename
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-install-checks
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-license
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-npm-package-arg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-registry-client
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-npm-run-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-stats
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npm-user-validate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-npmlog
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nsp-api
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nsp-audit-shrinkwrap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-nth-check
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-number-is-nan
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-numeral
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oauth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oauth-sign
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oauth2orize
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-assign
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-copy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-dot-entries
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-object-dot-omit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-object-dot-pick
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-object-inspect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-is
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-object-visit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-observable-to-promise
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-obuf
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-okay
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-on-finished
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-on-headers
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-once
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-onetime
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-only-shallow
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-oop
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-opal-runtime
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-open
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-opener
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-opn
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-option-cache
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-option-chain
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-optionator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-options
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-optjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-opts
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-orchestrator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ordered-read-streams
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-os-homedir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-os-locale
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-os-shim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-os-tmpdir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-osenv
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-output-file-sync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-own-or
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-own-or-env
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-finally
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-is-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-limit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-p-locate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pac-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pac-resolver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-package
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-package-info
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-package-json
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-package-license
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-packaging
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-packet-reader
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pad
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pad-left
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-paperboy
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-param-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-github-repo-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-parse-json
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parse-passwd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parsejson
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parseqs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parserlib
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-parseuri
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-parseurl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pascal-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pascalcase
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-http-bearer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth1
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-oauth2-client-password
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-passport-strategy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-array
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-path-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-dirname
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-exists
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-extra
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-is-absolute
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-is-inside
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-key
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-parse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path-to-regexp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-path-type
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-path2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pathval
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pause
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pause-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pbkdf2-password
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pedding
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pegjs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pem
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pff
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-connection-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-cursor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-escape
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-int8
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-native
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-pool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pg-types
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pgpass
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pinkie
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pinkie-promise
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pkg-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pkg-up
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pkginfo
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-platform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-plur
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-portfinder
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-portscanner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-posix-character-classes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-posix-getopt
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-array
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-bytea
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-date
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-postgres-interval
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-precond
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-prelude-ls
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-prepend-http
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-preserve
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pretty-bytes
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pretty-hrtime
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pretty-ms
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pretty-time
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-private
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-process-nextick-args
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-proclaim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-progress
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-progress-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-promise
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-promises-aplus-tests
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-prompt
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-promzard
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-propagate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-propget
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-proto-list
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-proxy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-proxy-addr
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-proxyquire
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pruddy-error
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pseudomap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pubcontrol
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-pump
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-pumpify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-q
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-q-io
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-qs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-qtdatastream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-queue-async
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-quick-lru
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-qunit-extras
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-qunitjs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rainbowsocks
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-random-bytes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-random-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-randomatic
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-range-parser
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-raw-body
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rc
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-re-emitter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-read-all-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-read-cmd-shim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-dir-files
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-file
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-installed
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-json-sync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-package-json
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-package-tree
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-read-pkg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-read-pkg-up
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-readable-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-readdir-enhanced
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-readdir-scoped-modules
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-readdirp
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-realize-package-specifier
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-recast
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-rechoir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-redent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-reduce-component
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-regenerator
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-regex-cache
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-regex-not
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-registry-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-relateurl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-remove-trailing-separator
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-repeat-element
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-repeat-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-repeating
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-repl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-replace
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-replace-ext
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-replace-require-self
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-request
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-requestretry
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-cs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-require-directory
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-inject
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-main-filename
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-uncached
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-require-yaml
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-requirejs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-requires-port
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve-cwd
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve-dir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-resolve-from
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-resolve-pkg
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-resolve-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-response-time
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-resumer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ret
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-retry
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-reusify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-revalidator
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-rewire
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rfile
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rhea
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-right-align
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rimraf
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-rndm
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-rollup
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ronn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-run-parallel-limit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-runforcover
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-safe-buffer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-safe-json-stringify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-safe-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-safecb
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-samsam
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sauce-tunnel
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-saucelabs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sax
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-scmp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-secure-random
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-seedrandom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-select-hose
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-semver
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-send
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sentence-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sentiment
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-seq
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sequencify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-serialize-error
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-serve-index
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-serve-static
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-server-destroy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-set-blocking
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-set-getter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-set-immediate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-set-immediate-shim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-set-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-setimmediate
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-setprototypeof
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sha
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-shallow-clone
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-shebang-command
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-shebang-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-shelljs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-shelljs-nodecli
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-should
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-should-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-should-format
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-should-http
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-should-type
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-showdown
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sift
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sigmund
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-signal-exit
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-silent-npm-registry-client
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-simple-assert
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-simple-asyncify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-simple-fmt
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-simple-is
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-simple-markdown
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-single-line-log
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sinon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sinon-chai
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sinon-restore
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-slash
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sliced
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-slide
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-smart-buffer
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-snake-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon-capture
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon-capture-set
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon-node
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snapdragon-util
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-snockets
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sntp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-socks-client
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-socks-proxy-agent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-sort-keys
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sorted-object
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-source-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-source-map-fixtures
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-source-map-resolve
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-source-map-support
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-source-map-url
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sparkles
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-spawn-sync
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spawn-wrap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-correct
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-exceptions
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-expression-parse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spdx-license-ids
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-spec
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-speedometer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-split
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-split-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-split2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sprintf
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sprintf-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-sqlite3
ExclusiveArch: %{nodejs_arches}
- nodejs-srs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ssri
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-st
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stack-trace
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stack-utils
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-static-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-static-favicon
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-statuses
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-std-mocks
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-combiner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-consume
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stream-counter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stream-each
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-equal
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-pair
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-reduce
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-replace
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stream-shift
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-spigot
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-to-array
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stream-transform
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-streamsearch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-streamsink
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-streamtest
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-string
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-string-dot-prototype-dot-repeat
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-string-dot-prototype-dot-trim
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-string-width
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-string_decoder
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringmap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringscanner
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringset
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-stringstream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-ansi
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strip-bom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-bom-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strip-bom-string
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-color
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-eof
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-indent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strip-json-comments
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strip-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-strong-log-transformer
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-strscanner
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-stylus
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-success-symbol
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-superagent
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-superagent-proxy
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-supertest
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-supervisor
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-supports-color
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-suspend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-svgmin
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-svgo
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-swap-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-symbol-observable
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tad
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tap-mocha-reporter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tap-out
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tap-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tap-spec
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tape
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tapes
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tar
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tar-pack
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tar-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-temp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-temp-dir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-temp-write
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tempfile
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-temporary
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tern
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tern-cordovajs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tern-liferay
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-terst
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-test
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-testdata-w3c-json-form
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-testjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-testswarm
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-testutil
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-text-extensions
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-text-table
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-thenify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-thenify-all
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-thread-sleep
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-through
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-through2
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-through2-filter
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-thunkify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tildify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tilejson
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tilelive
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tilelive-mapnik
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tiletype
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-time-diff
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-time-stamp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-timed-out
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-timekeeper
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-timers-ext
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tiny-lr-fork
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-title-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tlds
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tmatch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tmp
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tmpl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-to-absolute-glob
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-to-object-path
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-to-regex
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-to-regex-range
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-touch
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tough-cookie
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tracejs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-transformers
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-traverse
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-treeify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tressa
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-trim
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-trim-newlines
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-trim-off-newlines
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-trivial-deferred
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-try-open
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-try-thread-sleep
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tryor
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-tsame
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tsscmp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ttembed-js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tunnel-agent
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-tv4
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-type-check
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-type-detect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-type-is
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-type-name
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-typeahead.js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-typedarray
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-typescript
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uc-dot-micro
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-uglify-to-browserify
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-uid-number
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uid-safe
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-uid2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-ultron
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-umask
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unc-path-regex
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-underscore
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-underscore-dot-logger
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unicode-7.0.0
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unicode-length
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-union
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-union-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unique-filename
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unique-slug
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unique-stream
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-unique-temp-dir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unpipe
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-unset-value
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-upper-case
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-upper-case-first
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uri-path
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-urix
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-url-join
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-url-parse-lax
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-url2
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-use
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-user-home
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-utf8
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-utfx
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-util
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-util-deprecate
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-util-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-util-inspect
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-utile
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-utilities
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-utils-merge
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-uuid
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vali-date
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-validate-npm-package-license
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-validate-npm-package-name
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vary
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vasync
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-verror
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vhost
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vinyl
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vlq
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vow
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vow-fs
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-vow-queue
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-vows
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-w3cjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-walkdir
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-walker
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ware
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-warning-symbol
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-watchit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-watershed
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-wbuf
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-wcwidth
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-weak-map
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-websocket-driver
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-when
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-whet-dot-extend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-which
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-win-spawn
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-window-size
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-winston
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-with
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wolfy87-eventemitter
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-woothee
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wordwrap
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wrap-ansi
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-wrap-fn
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-wrappy
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-write
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-write-file-atomic
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-write-json-file
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-write-pkg
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-ws
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xdg-basedir
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xml2js
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xmlbuilder
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xmldom
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xmlhttprequest
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xmlhttprequest-ssl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-xregexp
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-xtend
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-y18n
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yallist
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-yapool
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yargs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodejs-yargs-parser
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yauzl
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-yeast
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zap
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zip-stream
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zipfile
ExclusiveArch: %{nodejs_arches}
- nodejs-zlib-browserify
ExclusiveArch: %{nodejs_arches} noarch
- nodejs-zlibjs
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- nodeunit
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- notify-sharp
ExclusiveArch: %{mono_arches}
- notify-sharp3
ExclusiveArch: %{mono_arches}
- nuget
ExclusiveArch: %{mono_arches}
- numatop
ExclusiveArch: %{ix86} x86_64
- nunit
ExclusiveArch: %{mono_arches}
- nunit2
ExclusiveArch: %{mono_arches}
- nvml
ExclusiveArch: x86_64
- nwchem
ExclusiveArch: x86_64 %{ix86}
- obfs4
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- oci-kvm-hook
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- oci-register-machine
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- oci-umount
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}
- ocitools
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- odcs
ExclusiveArch: %{ix86} x86_64
- olpc-kbdshim
ExclusiveArch: %{ix86} %{arm}
- olpc-netutils
ExclusiveArch: %{ix86} %{arm}
- olpc-powerd
ExclusiveArch: %{ix86} %{arm}
- olpc-utils
ExclusiveArch: %{ix86} %{arm}
- onedrive
ExclusiveArch: %{ldc_arches}
- opal-prd
ExclusiveArch: ppc64le
- open-vm-tools
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64
- openblas
ExclusiveArch: %{openblas_arches}
- openjfx
ExclusiveArch: %{ix86} x86_64
- openlibm
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64}
- openmx
ExclusiveArch: x86_64 %{ix86}
- openni
ExclusiveArch: %{ix86} x86_64 %{arm}
- openni-primesense
ExclusiveArch: %{ix86} x86_64 %{arm}
- openssl-ibmca
ExclusiveArch: s390 s390x
- openvswitch
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- origin
ExclusiveArch: %{go_arches}
ExclusiveArch: x86_64 aarch64 ppc64le s390x
- orion
ExclusiveArch: %{qt5_qtwebengine_arches}
- orocos-bfl
ExclusiveArch: %{ix86} x86_64
- orthorobot
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
- paflib
ExclusiveArch: ppc %{power64}
- pcc
ExclusiveArch: %{ix86} x86_64
- pcmciautils
ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm}
- pdfmod
ExclusiveArch: %mono_arches
- perl-Dumbbench
ExclusiveArch: %{ix86} x86_64 noarch
- perl-Parse-DMIDecode
ExclusiveArch: %{ix86} x86_64 ia64 aarch64
- pesign
ExclusiveArch: %{ix86} x86_64 ia64 aarch64 %{arm}
- pesign-test-app
ExclusiveArch: i686 x86_64 ia64 aarch64
- pinta
ExclusiveArch: %mono_arches
- pioneer
ExclusiveArch: %{ix86} x86_64
- playonlinux
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- plv8
ExclusiveArch: %v8_arches
- pocl
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- podman
ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64
- poppler-sharp
ExclusiveArch: %mono_arches
- popub
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- powerpc-utils
ExclusiveArch: ppc %{power64}
- ppc64-diag
ExclusiveArch: ppc %{power64}
- publican-jboss
ExclusiveArch: i686 x86_64
- pvs-sbcl
ExclusiveArch: %{ix86} x86_64 ppc sparcv9
- python-afl
ExclusiveArch: %{ix86} x86_64
- python-etcd
ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- python-healpy
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-openoffice
ExclusiveArch: noarch x86_64
- python-ovirt-register
ExclusiveArch: %{ix86} x86_64
- python-pymoc
ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x
- python-rpi-gpio
ExclusiveArch: %{arm} aarch64
- q4wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- qcint
ExclusiveArch: x86_64
- qclib
ExclusiveArch: s390 s390x
- qevercloud
ExclusiveArch: %{qt5_qtwebengine_arches}
- qt4pas
ExclusiveArch: %{fpc_arches}
- qt5-qtwebengine
ExclusiveArch: %{qt5_qtwebengine_arches}
- quantum-espresso
ExclusiveArch: x86_64 %{ix86}
ExclusiveArch: %{openblas_arches}
- quentier
ExclusiveArch: %{qt5_qtwebengine_arches}
- rclone
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- rear
ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64
- redhat-lsb
ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
- reg
ExclusiveArch: x86_64
- renderdoc
ExclusiveArch: %{ix86} x86_64
- reptyr
ExclusiveArch: %{ix86} x86_64 %{arm}
- rescene
ExclusiveArch: %{mono_arches}
- restsharp
ExclusiveArch: %{mono_arches}
- rhythmbox-alternative-toolbar
ExclusiveArch: %{ix86} %{arm} x86_64 ppc64 ppc64le
- rkt
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- rocm-runtime
ExclusiveArch: x86_64 aarch64
- rssguard
ExclusiveArch: %{qt5_qtwebengine_arches}
- runc
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x
- rust
ExclusiveArch: %{rust_arches}
- rust-addr2line
ExclusiveArch: %{rust_arches}
- rust-adler32
ExclusiveArch: %{rust_arches}
- rust-aho-corasick
ExclusiveArch: %{rust_arches}
- rust-ansi_term
ExclusiveArch: %{rust_arches}
- rust-arrayref
ExclusiveArch: %{rust_arches}
- rust-arrayvec
ExclusiveArch: %{rust_arches}
- rust-atk-sys
ExclusiveArch: %{rust_arches}
- rust-atty
ExclusiveArch: %{rust_arches}
- rust-backtrace
ExclusiveArch: %{rust_arches}
- rust-backtrace-sys
ExclusiveArch: %{rust_arches}
- rust-base100
ExclusiveArch: %{rust_arches}
- rust-base64
ExclusiveArch: %{rust_arches}
- rust-bencher
ExclusiveArch: %{rust_arches}
- rust-bincode
ExclusiveArch: %{rust_arches}
- rust-bincode0.8
ExclusiveArch: %{rust_arches}
- rust-bitflags
ExclusiveArch: %{rust_arches}
- rust-bitflags0.9
ExclusiveArch: %{rust_arches}
- rust-brev
ExclusiveArch: %{rust_arches}
- rust-build_const
ExclusiveArch: %{rust_arches}
- rust-bytecount
ExclusiveArch: %{rust_arches}
- rust-byteorder
ExclusiveArch: %{rust_arches}
- rust-bytes
ExclusiveArch: %{rust_arches}
- rust-bytes0.3
ExclusiveArch: %{rust_arches}
- rust-c_vec
ExclusiveArch: %{rust_arches}
- rust-cairo-rs
ExclusiveArch: %{rust_arches}
- rust-cairo-sys-rs
ExclusiveArch: %{rust_arches}
- rust-cbindgen
ExclusiveArch: %{rust_arches}
- rust-cc
ExclusiveArch: %{rust_arches}
- rust-cfg-if
ExclusiveArch: %{rust_arches}
- rust-chan
ExclusiveArch: %{rust_arches}
- rust-chrono
ExclusiveArch: %{rust_arches}
- rust-clap
ExclusiveArch: %{rust_arches}
- rust-cmake
ExclusiveArch: %{rust_arches}
- rust-coco
ExclusiveArch: %{rust_arches}
- rust-cpp_demangle
ExclusiveArch: %{rust_arches}
- rust-crc
ExclusiveArch: %{rust_arches}
- rust-crc-core
ExclusiveArch: %{rust_arches}
- rust-crossbeam
ExclusiveArch: %{rust_arches}
- rust-crossbeam-deque
ExclusiveArch: %{rust_arches}
- rust-crossbeam-epoch
ExclusiveArch: %{rust_arches}
- rust-crossbeam-utils
ExclusiveArch: %{rust_arches}
- rust-crypto-hash
ExclusiveArch: %{rust_arches}
- rust-cryptovec
ExclusiveArch: %{rust_arches}
- rust-cssparser
ExclusiveArch: %{rust_arches}
- rust-cssparser-macros
ExclusiveArch: %{rust_arches}
- rust-ctrlc
ExclusiveArch: %{rust_arches}
- rust-curl
ExclusiveArch: %{rust_arches}
- rust-curl-sys
ExclusiveArch: %{rust_arches}
- rust-custom_derive
ExclusiveArch: %{rust_arches}
- rust-data-encoding
ExclusiveArch: %{rust_arches}
- rust-datetime
ExclusiveArch: %{rust_arches}
- rust-dbus
ExclusiveArch: %{rust_arches}
- rust-deque
ExclusiveArch: %{rust_arches}
- rust-devicemapper
ExclusiveArch: %{rust_arches}
- rust-diff
ExclusiveArch: %{rust_arches}
- rust-difference
ExclusiveArch: %{rust_arches}
- rust-docopt
ExclusiveArch: %{rust_arches}
- rust-downcast-rs
ExclusiveArch: %{rust_arches}
- rust-dtoa
ExclusiveArch: %{rust_arches}
- rust-dtoa-short
ExclusiveArch: %{rust_arches}
- rust-edit-distance
ExclusiveArch: %{rust_arches}
- rust-either
ExclusiveArch: %{rust_arches}
- rust-encoding
ExclusiveArch: %{rust_arches}
- rust-encoding-index-japanese
ExclusiveArch: %{rust_arches}
- rust-encoding-index-korean
ExclusiveArch: %{rust_arches}
- rust-encoding-index-simpchinese
ExclusiveArch: %{rust_arches}
- rust-encoding-index-singlebyte
ExclusiveArch: %{rust_arches}
- rust-encoding-index-tradchinese
ExclusiveArch: %{rust_arches}
- rust-encoding_index_tests
ExclusiveArch: %{rust_arches}
- rust-encoding_rs
ExclusiveArch: %{rust_arches}
- rust-enum_primitive
ExclusiveArch: %{rust_arches}
- rust-env_logger
ExclusiveArch: %{rust_arches}
- rust-env_logger0.4
ExclusiveArch: %{rust_arches}
- rust-errln
ExclusiveArch: %{rust_arches}
- rust-errno
ExclusiveArch: %{rust_arches}
- rust-error-chain
ExclusiveArch: %{rust_arches}
- rust-exa
ExclusiveArch: %{rust_arches}
- rust-extprim
ExclusiveArch: %{rust_arches}
- rust-extprim_literals_macros
ExclusiveArch: %{rust_arches}
- rust-failure
ExclusiveArch: %{rust_arches}
- rust-failure_derive
ExclusiveArch: %{rust_arches}
- rust-fallible-iterator
ExclusiveArch: %{rust_arches}
- rust-fd-find
ExclusiveArch: %{rust_arches}
- rust-filetime
ExclusiveArch: %{rust_arches}
- rust-fixedbitset
ExclusiveArch: %{rust_arches}
- rust-flame
ExclusiveArch: %{rust_arches}
- rust-flate2
ExclusiveArch: %{rust_arches}
- rust-float-cmp
ExclusiveArch: %{rust_arches}
- rust-fnv
ExclusiveArch: %{rust_arches}
- rust-foreign-types
ExclusiveArch: %{rust_arches}
- rust-foreign-types-shared
ExclusiveArch: %{rust_arches}
- rust-fs2
ExclusiveArch: %{rust_arches}
- rust-futures
ExclusiveArch: %{rust_arches}
- rust-futures-cpupool
ExclusiveArch: %{rust_arches}
- rust-gdk
ExclusiveArch: %{rust_arches}
- rust-gdk-pixbuf
ExclusiveArch: %{rust_arches}
- rust-gdk-pixbuf-sys
ExclusiveArch: %{rust_arches}
- rust-gdk-sys
ExclusiveArch: %{rust_arches}
- rust-getopts
ExclusiveArch: %{rust_arches}
- rust-gimli
ExclusiveArch: %{rust_arches}
- rust-gio
ExclusiveArch: %{rust_arches}
- rust-gio-sys
ExclusiveArch: %{rust_arches}
- rust-git2
ExclusiveArch: %{rust_arches}
- rust-glib
ExclusiveArch: %{rust_arches}
- rust-glib-sys
ExclusiveArch: %{rust_arches}
- rust-glob
ExclusiveArch: %{rust_arches}
- rust-globset
ExclusiveArch: %{rust_arches}
- rust-gobject-sys
ExclusiveArch: %{rust_arches}
- rust-goblin
ExclusiveArch: %{rust_arches}
- rust-grep
ExclusiveArch: %{rust_arches}
- rust-gtk
ExclusiveArch: %{rust_arches}
- rust-gtk-rs-lgpl-docs
ExclusiveArch: %{rust_arches}
- rust-gtk-source-sys
ExclusiveArch: %{rust_arches}
- rust-gtk-sys
ExclusiveArch: %{rust_arches}
- rust-gzip-header
ExclusiveArch: %{rust_arches}
- rust-hamcrest
ExclusiveArch: %{rust_arches}
- rust-handlebars
ExclusiveArch: %{rust_arches}
- rust-heapsize
ExclusiveArch: %{rust_arches}
- rust-hex
ExclusiveArch: %{rust_arches}
- rust-home
ExclusiveArch: %{rust_arches}
- rust-horrorshow
ExclusiveArch: %{rust_arches}
- rust-http
ExclusiveArch: %{rust_arches}
- rust-httparse
ExclusiveArch: %{rust_arches}
- rust-humantime
ExclusiveArch: %{rust_arches}
- rust-hyper
ExclusiveArch: %{rust_arches}
- rust-idna
ExclusiveArch: %{rust_arches}
- rust-ignore
ExclusiveArch: %{rust_arches}
- rust-indexmap
ExclusiveArch: %{rust_arches}
- rust-intervaltree
ExclusiveArch: %{rust_arches}
- rust-iovec
ExclusiveArch: %{rust_arches}
- rust-iso8601
ExclusiveArch: %{rust_arches}
- rust-itertools
ExclusiveArch: %{rust_arches}
- rust-itoa
ExclusiveArch: %{rust_arches}
- rust-jobserver
ExclusiveArch: %{rust_arches}
- rust-language-tags
ExclusiveArch: %{rust_arches}
- rust-lazy-init
ExclusiveArch: %{rust_arches}
- rust-lazy_static
ExclusiveArch: %{rust_arches}
- rust-lazycell
ExclusiveArch: %{rust_arches}
- rust-libc
ExclusiveArch: %{rust_arches}
- rust-libdbus-sys
ExclusiveArch: %{rust_arches}
- rust-libgit2-sys
ExclusiveArch: %{rust_arches}
- rust-libloading
ExclusiveArch: %{rust_arches}
- rust-libssh2-sys
ExclusiveArch: %{rust_arches}
- rust-libudev
ExclusiveArch: %{rust_arches}
- rust-libudev-sys
ExclusiveArch: %{rust_arches}
- rust-libz-sys
ExclusiveArch: %{rust_arches}
- rust-linked-hash-map
ExclusiveArch: %{rust_arches}
- rust-lipsum
ExclusiveArch: %{rust_arches}
- rust-locale
ExclusiveArch: %{rust_arches}
- rust-log
ExclusiveArch: %{rust_arches}
- rust-log0.3
ExclusiveArch: %{rust_arches}
- rust-loopdev
ExclusiveArch: %{rust_arches}
- rust-lzma-sys
ExclusiveArch: %{rust_arches}
- rust-macro-attr
ExclusiveArch: %{rust_arches}
- rust-maplit
ExclusiveArch: %{rust_arches}
- rust-matches
ExclusiveArch: %{rust_arches}
- rust-md5
ExclusiveArch: %{rust_arches}
- rust-memchr
ExclusiveArch: %{rust_arches}
- rust-memmap
ExclusiveArch: %{rust_arches}
- rust-memoffset
ExclusiveArch: %{rust_arches}
- rust-metadeps
ExclusiveArch: %{rust_arches}
- rust-mime
ExclusiveArch: %{rust_arches}
- rust-miniz-sys
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide
ExclusiveArch: %{rust_arches}
- rust-miniz_oxide_c_api
ExclusiveArch: %{rust_arches}
- rust-mio
ExclusiveArch: %{rust_arches}
- rust-mio-uds
ExclusiveArch: %{rust_arches}
- rust-mnt
ExclusiveArch: %{rust_arches}
- rust-modifier
ExclusiveArch: %{rust_arches}
- rust-multimap
ExclusiveArch: %{rust_arches}
- rust-natord
ExclusiveArch: %{rust_arches}
- rust-net2
ExclusiveArch: %{rust_arches}
- rust-newtype_derive
ExclusiveArch: %{rust_arches}
- rust-nix
ExclusiveArch: %{rust_arches}
- rust-nodrop
ExclusiveArch: %{rust_arches}
- rust-nom
ExclusiveArch: %{rust_arches}
- rust-num
ExclusiveArch: %{rust_arches}
- rust-num-bigint
ExclusiveArch: %{rust_arches}
- rust-num-complex
ExclusiveArch: %{rust_arches}
- rust-num-integer
ExclusiveArch: %{rust_arches}
- rust-num-iter
ExclusiveArch: %{rust_arches}
- rust-num-rational
ExclusiveArch: %{rust_arches}
- rust-num-traits
ExclusiveArch: %{rust_arches}
- rust-num-traits0.1
ExclusiveArch: %{rust_arches}
- rust-num_cpus
ExclusiveArch: %{rust_arches}
- rust-number_prefix
ExclusiveArch: %{rust_arches}
- rust-object
ExclusiveArch: %{rust_arches}
- rust-openssl
ExclusiveArch: %{rust_arches}
- rust-openssl-probe
ExclusiveArch: %{rust_arches}
- rust-openssl-sys
ExclusiveArch: %{rust_arches}
- rust-ordermap
ExclusiveArch: %{rust_arches}
- rust-owning_ref
ExclusiveArch: %{rust_arches}
- rust-packaging
ExclusiveArch: %{rust_arches} noarch
- rust-pad
ExclusiveArch: %{rust_arches}
- rust-pager
ExclusiveArch: %{rust_arches}
- rust-pango
ExclusiveArch: %{rust_arches}
- rust-pango-sys
ExclusiveArch: %{rust_arches}
- rust-peeking_take_while
ExclusiveArch: %{rust_arches}
- rust-percent-encoding
ExclusiveArch: %{rust_arches}
- rust-permutate
ExclusiveArch: %{rust_arches}
- rust-permutohedron
ExclusiveArch: %{rust_arches}
- rust-pest
ExclusiveArch: %{rust_arches}
- rust-pest_derive
ExclusiveArch: %{rust_arches}
- rust-phf
ExclusiveArch: %{rust_arches}
- rust-phf_codegen
ExclusiveArch: %{rust_arches}
- rust-phf_generator
ExclusiveArch: %{rust_arches}
- rust-phf_shared
ExclusiveArch: %{rust_arches}
- rust-pkg-config
ExclusiveArch: %{rust_arches}
- rust-plain
ExclusiveArch: %{rust_arches}
- rust-pretty-git-prompt
ExclusiveArch: %{rust_arches}
- rust-pretty_env_logger
ExclusiveArch: %{rust_arches}
- rust-proc-macro2
ExclusiveArch: %{rust_arches}
- rust-procedural-masquerade
ExclusiveArch: %{rust_arches}
- rust-pulldown-cmark
ExclusiveArch: %{rust_arches}
- rust-quick-error
ExclusiveArch: %{rust_arches}
- rust-quickcheck
ExclusiveArch: %{rust_arches}
- rust-quickersort
ExclusiveArch: %{rust_arches}
- rust-quote
ExclusiveArch: %{rust_arches}
- rust-rand
ExclusiveArch: %{rust_arches}
- rust-rayon
ExclusiveArch: %{rust_arches}
- rust-rayon-core
ExclusiveArch: %{rust_arches}
- rust-regex
ExclusiveArch: %{rust_arches}
- rust-regex-syntax
ExclusiveArch: %{rust_arches}
- rust-relay
ExclusiveArch: %{rust_arches}
- rust-remove_dir_all
ExclusiveArch: %{rust_arches}
- rust-ripgrep
ExclusiveArch: %{rust_arches}
- rust-rustc-demangle
ExclusiveArch: %{rust_arches}
- rust-rustc-serialize
ExclusiveArch: %{rust_arches}
- rust-rustc-test
ExclusiveArch: %{rust_arches}
- rust-rustc_version
ExclusiveArch: %{rust_arches}
- rust-rustdoc-stripper
ExclusiveArch: %{rust_arches}
- rust-rustfilt
ExclusiveArch: %{rust_arches}
- rust-safemem
ExclusiveArch: %{rust_arches}
- rust-same-file
ExclusiveArch: %{rust_arches}
- rust-scoped-tls
ExclusiveArch: %{rust_arches}
- rust-scoped_threadpool
ExclusiveArch: %{rust_arches}
- rust-scopeguard
ExclusiveArch: %{rust_arches}
- rust-scroll
ExclusiveArch: %{rust_arches}
- rust-scroll_derive
ExclusiveArch: %{rust_arches}
- rust-seahash
ExclusiveArch: %{rust_arches}
- rust-semver
ExclusiveArch: %{rust_arches}
- rust-semver-parser
ExclusiveArch: %{rust_arches}
- rust-serde
ExclusiveArch: %{rust_arches}
- rust-serde0.8
ExclusiveArch: %{rust_arches}
- rust-serde_bytes
ExclusiveArch: %{rust_arches}
- rust-serde_cbor
ExclusiveArch: %{rust_arches}
- rust-serde_derive
ExclusiveArch: %{rust_arches}
- rust-serde_derive_internals
ExclusiveArch: %{rust_arches}
- rust-serde_ignored
ExclusiveArch: %{rust_arches}
- rust-serde_json
ExclusiveArch: %{rust_arches}
- rust-serde_json0.8
ExclusiveArch: %{rust_arches}
- rust-serde_test
ExclusiveArch: %{rust_arches}
- rust-serde_urlencoded
ExclusiveArch: %{rust_arches}
- rust-serde_yaml
ExclusiveArch: %{rust_arches}
- rust-sha1
ExclusiveArch: %{rust_arches}
- rust-shell-escape
ExclusiveArch: %{rust_arches}
- rust-shlex
ExclusiveArch: %{rust_arches}
- rust-siphasher
ExclusiveArch: %{rust_arches}
- rust-slab
ExclusiveArch: %{rust_arches}
- rust-slab0.3
ExclusiveArch: %{rust_arches}
- rust-smallvec
ExclusiveArch: %{rust_arches}
- rust-socket2
ExclusiveArch: %{rust_arches}
- rust-sourceview
ExclusiveArch: %{rust_arches}
- rust-spin
ExclusiveArch: %{rust_arches}
- rust-spmc
ExclusiveArch: %{rust_arches}
- rust-stable_deref_trait
ExclusiveArch: %{rust_arches}
- rust-streaming-stats
ExclusiveArch: %{rust_arches}
- rust-strings
ExclusiveArch: %{rust_arches}
- rust-strsim
ExclusiveArch: %{rust_arches}
- rust-structopt
ExclusiveArch: %{rust_arches}
- rust-structopt-derive
ExclusiveArch: %{rust_arches}
- rust-syn
ExclusiveArch: %{rust_arches}
- rust-synstructure
ExclusiveArch: %{rust_arches}
- rust-sys-info
ExclusiveArch: %{rust_arches}
- rust-tabwriter
ExclusiveArch: %{rust_arches}
- rust-take
ExclusiveArch: %{rust_arches}
- rust-tar
ExclusiveArch: %{rust_arches}
- rust-tempdir
ExclusiveArch: %{rust_arches}
- rust-tempfile
ExclusiveArch: %{rust_arches}
- rust-term
ExclusiveArch: %{rust_arches}
- rust-term_grid
ExclusiveArch: %{rust_arches}
- rust-term_size
ExclusiveArch: %{rust_arches}
- rust-termcolor
ExclusiveArch: %{rust_arches}
- rust-termion
ExclusiveArch: %{rust_arches}
- rust-test-assembler
ExclusiveArch: %{rust_arches}
- rust-textwrap
ExclusiveArch: %{rust_arches}
- rust-thread-id
ExclusiveArch: %{rust_arches}
- rust-thread_local
ExclusiveArch: %{rust_arches}
- rust-threadpool
ExclusiveArch: %{rust_arches}
- rust-time
ExclusiveArch: %{rust_arches}
- rust-tokei
ExclusiveArch: %{rust_arches}
- rust-tokio
ExclusiveArch: %{rust_arches}
- rust-tokio-core
ExclusiveArch: %{rust_arches}
- rust-tokio-executor
ExclusiveArch: %{rust_arches}
- rust-tokio-fs
ExclusiveArch: %{rust_arches}
- rust-tokio-io
ExclusiveArch: %{rust_arches}
- rust-tokio-process
ExclusiveArch: %{rust_arches}
- rust-tokio-proto
ExclusiveArch: %{rust_arches}
- rust-tokio-reactor
ExclusiveArch: %{rust_arches}
- rust-tokio-service
ExclusiveArch: %{rust_arches}
- rust-tokio-signal
ExclusiveArch: %{rust_arches}
- rust-tokio-tcp
ExclusiveArch: %{rust_arches}
- rust-tokio-threadpool
ExclusiveArch: %{rust_arches}
- rust-tokio-timer
ExclusiveArch: %{rust_arches}
- rust-tokio-udp
ExclusiveArch: %{rust_arches}
- rust-toml
ExclusiveArch: %{rust_arches}
- rust-traitobject
ExclusiveArch: %{rust_arches}
- rust-typed-arena
ExclusiveArch: %{rust_arches}
- rust-ucd-util
ExclusiveArch: %{rust_arches}
- rust-unicase
ExclusiveArch: %{rust_arches}
- rust-unicode-bidi
ExclusiveArch: %{rust_arches}
- rust-unicode-normalization
ExclusiveArch: %{rust_arches}
- rust-unicode-segmentation
ExclusiveArch: %{rust_arches}
- rust-unicode-width
ExclusiveArch: %{rust_arches}
- rust-unicode-xid
ExclusiveArch: %{rust_arches}
- rust-unindent
ExclusiveArch: %{rust_arches}
- rust-unreachable
ExclusiveArch: %{rust_arches}
- rust-unsafe-any
ExclusiveArch: %{rust_arches}
- rust-untrusted
ExclusiveArch: %{rust_arches}
- rust-url
ExclusiveArch: %{rust_arches}
- rust-users
ExclusiveArch: %{rust_arches}
- rust-utf8-ranges
ExclusiveArch: %{rust_arches}
- rust-uuid
ExclusiveArch: %{rust_arches}
- rust-vec_map
ExclusiveArch: %{rust_arches}
- rust-version-sync
ExclusiveArch: %{rust_arches}
- rust-version_check
ExclusiveArch: %{rust_arches}
- rust-void
ExclusiveArch: %{rust_arches}
- rust-wait-timeout
ExclusiveArch: %{rust_arches}
- rust-walkdir
ExclusiveArch: %{rust_arches}
- rust-which
ExclusiveArch: %{rust_arches}
- rust-xattr
ExclusiveArch: %{rust_arches}
- rust-xz2
ExclusiveArch: %{rust_arches}
- rust-yaml-rust
ExclusiveArch: %{rust_arches}
- rust-yaml-rust0.3
ExclusiveArch: %{rust_arches}
- rust-yubibomb
ExclusiveArch: %{rust_arches}
- rust-zoneinfo_compiled
ExclusiveArch: %{rust_arches}
- s390utils
ExclusiveArch: s390 s390x
- safetyblanket
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64
- sagemath
ExclusiveArch: aarch64 %{arm} %{ix86} x86_64 ppc sparcv9
- sbcl
ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64
- sbd
ExclusiveArch: i686 x86_64 s390x
- sbsigntools
ExclusiveArch: x86_64 aarch64 %{arm} %{ix86}
- seabios
ExclusiveArch: x86_64
- seamonkey
ExclusiveArch: %{ix86} x86_64
- servicelog
ExclusiveArch: ppc %{power64}
- sgabios
ExclusiveArch: %{ix86} x86_64
- sharpfont
ExclusiveArch: %mono_arches
- sharpziplib
ExclusiveArch: %{mono_arches}
- shim
ExclusiveArch: %{efi}
- shim-unsigned-aarch64
ExclusiveArch: aarch64
- shim-unsigned-x64
ExclusiveArch: x86_64
- sigul
ExclusiveArch: x86_64
- skychart
ExclusiveArch: %{fpc_arches}
- smuxi
ExclusiveArch: %{ix86} x86_64 %{arm} ppc64le
- snapd
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x
- source-to-image
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- sparkleshare
ExclusiveArch: %{mono_arches}
- spicctrl
ExclusiveArch: %{ix86} x86_64
- spice
ExclusiveArch: x86_64
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- spice-xpi
ExclusiveArch: i686 x86_64 armv6l armv7l armv7hl aarch64
- spring
ExclusiveArch: %{ix86} x86_64
- springlobby
ExclusiveArch: %{ix86} x86_64
- startdde
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
- statsd
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- stratis-cli
ExclusiveArch: %{rust_arches} noarch
- stratisd
ExclusiveArch: %{rust_arches}
- stripesnoop
ExclusiveArch: %{ix86} x86_64
- supermin
ExclusiveArch: x86_64
- syncthing
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
- sysbench
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64
- syslinux
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
ExclusiveArch: %{ix86} x86_64
- taglib-sharp
ExclusiveArch: %{mono_arches}
- tarantool
ExclusiveArch: %{ix86} x86_64 armv7hl armv7hnl aarch64
- tboot
ExclusiveArch: %{ix86} x86_64
- templates_parser
ExclusiveArch: %GPRbuild_arches
- ternimal
ExclusiveArch: %{rust_arches}
- themonospot-base
ExclusiveArch: %mono_arches
- themonospot-console
ExclusiveArch: %mono_arches
- themonospot-gui-gtk
ExclusiveArch: %mono_arches
- themonospot-plugin-avi
ExclusiveArch: %mono_arches
- themonospot-plugin-mkv
ExclusiveArch: %mono_arches
- thermald
ExclusiveArch: %{ix86} x86_64
- thunderbird-enigmail
ExclusiveArch: %{ix86} %{arm} ppc64 ppc64le s390x x86_64 noarch
- tilix
ExclusiveArch: %{ldc_arches}
- tmux-top
ExclusiveArch: %{go_arches}
- tomboy
ExclusiveArch: %{mono_arches}
- tuned-profiles-nfv-host-bin
ExclusiveArch: %{ix86} x86_64
- uClibc
ExclusiveArch: %{arm} %{ix86} x86_64 %{mips}
- ucx
ExclusiveArch: aarch64 ppc64le x86_64
- ugene
ExclusiveArch: %{ix86} x86_64
- uglify-js
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- uglify-js1
ExclusiveArch: %{nodejs_arches} noarch
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
- unetbootin
ExclusiveArch: %{ix86} x86_64
- v8
ExclusiveArch: %{ix86} x86_64 %{arm} ppc mipsel mips64el
- v8-314
ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64
- valgrind
ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
- vboot-utils
ExclusiveArch: %{arm} aarch64 %{ix86} x86_64
- vdsm
ExclusiveArch: x86_64 %{power64} aarch64
- vim-go
ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}}
- virtualbox-guest-additions
ExclusiveArch: i686 x86_64
- virtualplanet
ExclusiveArch: %{fpc_arches}
- vrq
ExclusiveArch: %{ix86} x86_64
- warsow
ExclusiveArch: %{ix86} x86_64 %{arm}
- warsow-data
ExclusiveArch: %{ix86} x86_64 %{arm} noarch
ExclusiveArch: %{ix86} x86_64 %{arm}
- webkit-sharp
ExclusiveArch: %mono_arches
- webkit2-sharp
ExclusiveArch: %mono_arches
- wine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
ExclusiveArch: %{ix86} %{arm}
- winetricks
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
- wiredtiger
ExclusiveArch: x86_64 aarch64 ppc64le
- wraplinux
ExclusiveArch: %{ix86} x86_64
- wxMaxima
ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9
- x2goclient
ExclusiveArch: x86_64
- x86info
ExclusiveArch: %{ix86} x86_64
- xen
ExclusiveArch: %{ix86} x86_64 armv7hl aarch64
- xorg-x11-drv-armsoc
ExclusiveArch: %{arm} aarch64
- xorg-x11-drv-geode
ExclusiveArch: %{ix86}
- xorg-x11-drv-intel
ExclusiveArch: %{ix86} x86_64 ia64
- xorg-x11-drv-omap
ExclusiveArch: %{arm}
- xorg-x11-drv-openchrome
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-opentegra
ExclusiveArch: %{arm}
- xorg-x11-drv-vesa
ExclusiveArch: %{ix86} x86_64
- xorg-x11-drv-vmware
ExclusiveArch: %{ix86} x86_64 ia64
- xsp
ExclusiveArch: %mono_arches
- xsupplicant
ExclusiveArch: %{ix86} x86_64 ppc %{power64}
- ycssmin
ExclusiveArch: %{nodejs_arches} noarch
- zeromq-ada
ExclusiveArch: %{GPRbuild_arches}
- zlib-ada
ExclusiveArch: %{GPRbuild_arches}
1
0
07 May '18
The package rpms/esc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/esc.git/commit/?id=7362a6f428f00376….
Change:
+ExcludeArch: aarch64 i686
Thanks.
Full change:
============
commit 7362a6f428f0037680ad88f4fdb7952225aa0e3c
Author: Jack Magne <jmagne(a)localhost.localdomain>
Date: Mon May 7 11:41:11 2018 -0700
Remove i686 temporarily because the internal xulrunner build is failing with a compiler error. This should be ok, since esc will be done very soon without the need for the internal xulrunner.
diff --git a/esc.spec b/esc.spec
index 1f12dfb..1dbd84d 100644
--- a/esc.spec
+++ b/esc.spec
@@ -80,8 +80,9 @@ Requires: opensc
# 390 does not have smartCards
ExcludeArch: s390 s390x
-#xulrunner doesn't seem to support this one
-ExcludeArch: aarch64
+#xulrunner doesn't seem to support these right now
+#Temporary anyway, since xulrunner is going away soon.
+ExcludeArch: aarch64 i686
# We can't allow the internal xulrunner to leak out
AutoReqProv: 0
1
0
07 May '18
The package rpms/phd2.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/phd2.git/commit/?id=195a9fea693b22b….
Change:
+%ifnarch %{ix86}
Thanks.
Full change:
============
commit 195a9fea693b22bf98b85797ee1d3920d0b2c53a
Author: Mattia Verga <mattia.verga(a)email.it>
Date: Mon May 7 19:34:42 2018 +0200
Specify libindi to be >= 1.5
Tests are still failing on i686, so exclude them again.
diff --git a/phd2.spec b/phd2.spec
index 7cd04a3..747f800 100644
--- a/phd2.spec
+++ b/phd2.spec
@@ -37,7 +37,7 @@ BuildRequires: wxGTK3-devel
BuildRequires: pkgconfig(cfitsio)
BuildRequires: pkgconfig(eigen3)
BuildRequires: pkgconfig(libcurl)
-BuildRequires: pkgconfig(libindi)
+BuildRequires: pkgconfig(libindi) >= 1.5
BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(zlib)
@@ -81,11 +81,11 @@ popd
%find_lang %{name}
%check
-# Tests are failing on x86 with GCC7
+# Tests are failing on x86 with GCC >= 7
# https://github.com/OpenPHDGuiding/phd2/issues/608
-#%%ifnarch %%{ix86}
+%ifnarch %{ix86}
env CTEST_OUTPUT_ON_FAILURE=1 make test -C %{_target_platform}
-#%%endif
+%endif
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml
@@ -106,6 +106,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.
- Upgrade to 2.6.5
- Remove obsolete scriptlets
- Use upstream patch to disable third party drivers
+- Specify libindi to be >= 1.5
* Fri Feb 23 2018 Christian Dersch <lupinix(a)mailbox.org> - 2.6.4-6
- rebuilt for cfitsio 3.420 (so version bump)
1
0
07 May '18
The package rpms/phd2.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/phd2.git/commit/?id=d05674d0db255df….
Change:
-%ifnarch %{ix86}
Thanks.
Full change:
============
commit d05674d0db255df967d12a18ee2f4ce84c3cfdcf
Author: Mattia Verga <mattia.verga(a)email.it>
Date: Mon May 7 19:11:05 2018 +0200
Update to 2.6.5
Remove obsolete scriptlets
Use upstream patch to disable third party camera drivers
diff --git a/.gitignore b/.gitignore
index 755ab01..bfedc60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/phd2-2.6.4-purged.tar.xz
+/phd2-2.6.5-purged.tar.xz
diff --git a/phd2.spec b/phd2.spec
index b7cdc4f..7cd04a3 100644
--- a/phd2.spec
+++ b/phd2.spec
@@ -1,6 +1,6 @@
Name: phd2
-Version: 2.6.4
-Release: 6%{?dist}
+Version: 2.6.5
+Release: 1%{?dist}
Summary: Telescope guiding software
# Main program files are BSD licensed
# Some components have different licenses:
@@ -16,16 +16,12 @@ Source0: %{name}-%{version}-purged.tar.xz
# Script to purge binaries and unneeded files from downloaded sources
Source1: generate-tarball.sh
-# Correct appdata files location
-# https://github.com/OpenPHDGuiding/phd2/pull/658
-Patch1: phd2_appdata_location_change.patch
-
# Use C++14 flag
Patch99: phd2_cflags.patch
-# We need to disable camera firmwares we removed from sources
-# This is Fedora specific and not reported upstream
-Patch100: phd2_disable_cams.patch
+# Backported patch from upstream to disable camera firmwares we removed from sources
+# https://github.com/OpenPHDGuiding/phd2/issues/690
+Patch100: phd2_2.6.5_disable_cams.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
@@ -70,7 +66,9 @@ pushd %{_target_platform}
%{cmake} -DUSE_SYSTEM_CFITSIO=ON \
-DUSE_SYSTEM_LIBUSB=ON \
-DUSE_SYSTEM_EIGEN3=ON \
- -DUSE_SYSTEM_GTEST=ON ..
+ -DUSE_SYSTEM_GTEST=ON \
+ -DUSE_SYSTEM_LIBINDI=ON \
+ -DOPENSOURCE_ONLY=ON ..
%make_build
@@ -85,25 +83,13 @@ popd
%check
# Tests are failing on x86 with GCC7
# https://github.com/OpenPHDGuiding/phd2/issues/608
-%ifnarch %{ix86}
+#%%ifnarch %%{ix86}
env CTEST_OUTPUT_ON_FAILURE=1 make test -C %{_target_platform}
-%endif
+#%%endif
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
%files -f %{name}.lang
%doc README.txt README-PHD2.txt PHD_2.0_Architecture.docx
@@ -116,6 +102,11 @@ fi
%changelog
+* Mon May 07 2018 Mattia Verga <mattia.verga(a)email.it> - 2.6.5-1
+- Upgrade to 2.6.5
+- Remove obsolete scriptlets
+- Use upstream patch to disable third party drivers
+
* Fri Feb 23 2018 Christian Dersch <lupinix(a)mailbox.org> - 2.6.4-6
- rebuilt for cfitsio 3.420 (so version bump)
diff --git a/phd2_2.6.5_disable_cams.patch b/phd2_2.6.5_disable_cams.patch
new file mode 100644
index 0000000..db633c2
--- /dev/null
+++ b/phd2_2.6.5_disable_cams.patch
@@ -0,0 +1,146 @@
+From 0d87a84540e90bb17e6d4183fd32d422c410861f Mon Sep 17 00:00:00 2001
+From: Andy Galasso <andy.galasso(a)gmail.com>
+Date: Mon, 7 May 2018 12:19:46 -0400
+Subject: [PATCH] Linux: add option to exclude binary drivers from build (ZWO
+ and QHY)
+
+---
+ cameras.h | 4 +-
+ thirdparty/thirdparty.cmake | 104 +++++++++++++++++++++++---------------------
+ 2 files changed, 58 insertions(+), 50 deletions(-)
+
+diff --git a/cameras.h b/cameras.h
+index 4d4ba67c..a7cdff02 100644
+--- a/cameras.h
++++ b/cameras.h
+@@ -109,7 +109,9 @@
+ # define QHY_CAMERA
+ # endif
+ # define INDI_CAMERA
+-# define ZWO_ASI
++# ifdef HAVE_ZWO_CAMERA
++# define ZWO_ASI
++# endif
+ # define SXV
+ # ifdef HAVE_SBIG_CAMERA
+ # define SBIG
+diff --git a/thirdparty/thirdparty.cmake b/thirdparty/thirdparty.cmake
+index 2bb1de8c..88157b2d 100644
+--- a/thirdparty/thirdparty.cmake
++++ b/thirdparty/thirdparty.cmake
+@@ -1207,60 +1207,66 @@ endif() # APPLE
+ #############################################
+ if(UNIX AND NOT APPLE)
+
+- if (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv6(.*)")
+- set(arch "armv6")
+- set(qhyarch "armv6")
+- elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv7(.*)|arm64|aarch64|^armv8(.*)")
+- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+- set(arch "armv8")
+- set(qhyarch "armv8")
+- else()
+- set(arch "armv7")
+- set(qhyarch "armv7")
+- endif()
+- elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "x86|X86|amd64|AMD64|i.86")
+- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+- set(arch "x64")
+- set(qhyarch "x86_64")
+- else()
+- set(arch "x86")
+- set(qhyarch "x86_32")
+- endif()
+- else()
+- message(FATAL_ERROR "unknown system architecture")
+- endif()
+-
+- find_path(ZWO_INCLUDE_DIR ASICamera2.h
+- NO_DEFAULT_PATHS
+- PATHS ${PHD_PROJECT_ROOT_DIR}/cameras
+- )
++ if (NOT OPENSOURCE_ONLY)
++
++ if (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv6(.*)")
++ set(zwoarch "armv6")
++ set(qhyarch "armv6")
++ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv7(.*)|arm64|aarch64|^armv8(.*)")
++ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
++ set(zwoarch "armv8")
++ set(qhyarch "armv8")
++ else()
++ set(zwoarch "armv7")
++ set(qhyarch "armv7")
++ endif()
++ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "x86|X86|amd64|AMD64|i.86")
++ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
++ set(zwoarch "x64")
++ set(qhyarch "x86_64")
++ else()
++ set(zwoarch "x86")
++ set(qhyarch "x86_32")
++ endif()
++ else()
++ message(FATAL_ERROR "unknown system architecture")
++ endif()
+
+- find_library(asiCamera2
+- NAMES ASICamera2
+- NO_DEFAULT_PATHS
+- PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${arch})
+- if(NOT asiCamera2)
+- message(FATAL_ERROR "Cannot find the asiCamera2 drivers")
+- endif()
+- message(STATUS "Found ASICamera2 lib ${asiCamera2}")
+- set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2})
++ find_path(ZWO_INCLUDE_DIR ASICamera2.h
++ NO_DEFAULT_PATHS
++ PATHS ${PHD_PROJECT_ROOT_DIR}/cameras
++ )
+
+- if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
+- add_definitions(-DHAVE_QHY_CAMERA=1)
++ find_library(asiCamera2
++ NAMES ASICamera2
++ NO_DEFAULT_PATHS
++ PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${zwoarch})
+
+- # be careful not to pick up any other qhy lib on the system
+- find_library( qhylib
+- NAMES qhy
+- NO_DEFAULT_PATH
+- PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
+- if(NOT qhylib)
+- message(FATAL_ERROR "Cannot find the qhy SDK libs")
++ if(NOT asiCamera2)
++ message(FATAL_ERROR "Cannot find the asiCamera2 drivers")
+ endif()
+- set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib})
+- endif()
++ message(STATUS "Found ASICamera2 lib ${asiCamera2}")
++ add_definitions(-DHAVE_ZWO_CAMERA=1)
++ set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2})
++
++ if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
++ add_definitions(-DHAVE_QHY_CAMERA=1)
++
++ # be careful not to pick up any other qhy lib on the system
++ find_library(qhylib
++ NAMES qhy
++ NO_DEFAULT_PATH
++ PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
++ if(NOT qhylib)
++ message(FATAL_ERROR "Cannot find the qhy SDK libs")
++ endif()
++ set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib})
++ endif()
++
++ # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty
++ remove_definitions(-DHAVE_QHY_CAMERA=1)
+
+- # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty
+- remove_definitions(-DHAVE_QHY_CAMERA=1)
++ endif() # OPENSOURCE_ONLY
+
+ # math library is needed, and should be one of the last things to link to here
+ find_library(mathlib NAMES m)
diff --git a/phd2_appdata_location_change.patch b/phd2_appdata_location_change.patch
deleted file mode 100644
index 8e5aace..0000000
--- a/phd2_appdata_location_change.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -U 3 -dHrN -- a/cmake_modules/PHD2Packaging.cmake b/cmake_modules/PHD2Packaging.cmake
---- a/cmake_modules/PHD2Packaging.cmake 2017-09-26 00:21:15.000000000 +0200
-+++ b/cmake_modules/PHD2Packaging.cmake 2017-11-02 18:18:54.455096341 +0100
-@@ -74,7 +74,7 @@
- install(FILES ${phd_src_dir}/phd2.desktop
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/ )
- install(FILES ${phd_src_dir}/phd2.appdata.xml
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata/ )
-+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo/ )
-
- # Make Debian package
- set(CPACK_GENERATOR "DEB")
diff --git a/phd2_disable_cams.patch b/phd2_disable_cams.patch
deleted file mode 100644
index 96ad505..0000000
--- a/phd2_disable_cams.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -U 3 -dHrN -- a/cameras.h b/cameras.h
---- a/cameras.h 2017-09-04 23:55:17.000000000 +0200
-+++ b/cameras.h 2017-09-06 20:25:22.743663856 +0200
-@@ -109,7 +109,7 @@
- # define QHY_CAMERA
- # endif
- # define INDI_CAMERA
--# define ZWO_ASI
-+//# define ZWO_ASI
- # define SXV
- # ifdef HAVE_SBIG_CAMERA
- # define SBIG
-diff -U 3 -dHrN -- a/thirdparty/thirdparty.cmake b/thirdparty/thirdparty.cmake
---- a/thirdparty/thirdparty.cmake 2017-09-26 00:21:15.000000000 +0200
-+++ b/thirdparty/thirdparty.cmake 2017-11-02 19:04:42.283172290 +0100
-@@ -1042,35 +1042,35 @@
- set(qhyarch "x86_32")
- endif()
- else()
-- message(FATAL_ERROR "unknown system architecture")
-+ message(WARNING "unknown system architecture")
- endif()
-
-- find_path(ZWO_INCLUDE_DIR ASICamera2.h
-- PATHS
-- ${PHD_PROJECT_ROOT_DIR}/cameras
-- )
--
-- find_library(asiCamera2
-- NAMES ASICamera2
-- PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${arch})
-- if(NOT asiCamera2)
-- message(FATAL_ERROR "Cannot find the asiCamera2 drivers")
-- endif()
-- set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2})
--
-- if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
-- add_definitions(-DHAVE_QHY_CAMERA=1)
-+# find_path(ZWO_INCLUDE_DIR ASICamera2.h
-+# PATHS
-+# ${PHD_PROJECT_ROOT_DIR}/cameras
-+# )
-+#
-+# find_library(asiCamera2
-+# NAMES ASICamera2
-+# PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${arch})
-+# if(NOT asiCamera2)
-+# message(FATAL_ERROR "Cannot find the asiCamera2 drivers")
-+# endif()
-+# set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2})
-+#
-+# if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
-+# add_definitions(-DHAVE_QHY_CAMERA=1)
-
- # be careful not to pick up any other qhy lib on the system
-- find_library( qhylib
-- NAMES qhy
-- NO_DEFAULT_PATH
-- PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
-- if(NOT qhylib)
-- message(FATAL_ERROR "Cannot find the qhy SDK libs")
-- endif()
-- set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib})
-- endif()
-+# find_library( qhylib
-+# NAMES qhy
-+# NO_DEFAULT_PATH
-+# PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch})
-+# if(NOT qhylib)
-+# message(FATAL_ERROR "Cannot find the qhy SDK libs")
-+# endif()
-+# set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib})
-+# endif()
-
- # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty
- remove_definitions(-DHAVE_QHY_CAMERA=1)
diff --git a/sources b/sources
index a106e1d..21f6d85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (phd2-2.6.4-purged.tar.xz) = 1dedb5174d9a393cbf804a4539a38afe9fd035374cd73465bc2474180d58fdbb8b9c677b00204746de72d7d374303a17e07f8537ed71a22cafea1e889f476c86
+SHA512 (phd2-2.6.5-purged.tar.xz) = 7ec3d92d5181dca6f735f923940a464d31b1138a143e3bf31d6a6e231b8b77a504c172f2b6f833f2cab43051f0397d1901f6bc8780b92e16dbd6d556d319e92f
1
0
07 May '18
The package rpms/libnice.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/libnice.git/commit/?id=cb05dbf2151a…
https://src.fedoraproject.org/cgit/rpms/libnice.git/commit/?id=368c412d96e9….
Change:
-%ifarch armv7hl
+%ifarch x86_64 %{ix86}
Thanks.
Full change:
============
commit a04a646f78d6c1834cc1a32d154a8a34c42f226a
Author: Kamil Dudka <kdudka(a)redhat.com>
Date: Mon May 7 17:37:42 2018 +0200
Resolves: #1541646 - component: accept TURN in nice_component_verify_remote_candidate()
diff --git a/libnice-0.1.14-turn-verify.patch b/libnice-0.1.14-turn-verify.patch
new file mode 100644
index 0000000..2ce2f86
--- /dev/null
+++ b/libnice-0.1.14-turn-verify.patch
@@ -0,0 +1,32 @@
+From e4d92bf96d0bb64df35790e5b49c58bfa6e9fbcc Mon Sep 17 00:00:00 2001
+From: Jakub Adam <jakub.adam(a)ktknet.cz>
+Date: Thu, 20 Apr 2017 06:47:00 +0200
+Subject: [PATCH] component: accept TURN in
+ nice_component_verify_remote_candidate()
+
+When TURN is in operation, agent_recv_message_unlocked() may receive from
+NiceSocket with type = NICE_SOCKET_TYPE_UDP_TURN. Such messages were always
+dropped due to failed nice_component_verify_remote_candidate().
+
+Bug: https://phabricator.freedesktop.org/D1727
+---
+ agent/component.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/agent/component.c b/agent/component.c
+index 6eee90e..3e8a7a6 100644
+--- a/agent/component.c
++++ b/agent/component.c
+@@ -1510,7 +1510,8 @@ nice_component_verify_remote_candidate (NiceComponent *component,
+ (cand->transport == NICE_CANDIDATE_TRANSPORT_TCP_ACTIVE ||
+ cand->transport == NICE_CANDIDATE_TRANSPORT_TCP_PASSIVE ||
+ cand->transport == NICE_CANDIDATE_TRANSPORT_TCP_SO)) ||
+- cand->transport == NICE_CANDIDATE_TRANSPORT_UDP) &&
++ cand->transport == NICE_CANDIDATE_TRANSPORT_UDP ||
++ nicesock->type == NICE_SOCKET_TYPE_UDP_TURN) &&
+ nice_address_equal (address, &cand->addr)) {
+ /* fast return if it's already the first */
+ if (item == component->valid_candidates)
+--
+2.14.3
+
diff --git a/libnice.spec b/libnice.spec
index 26f66dc..f27e02f 100644
--- a/libnice.spec
+++ b/libnice.spec
@@ -22,6 +22,9 @@ Patch2: libnice-0.1.14-tests-i686.patch
# make tests pass in Koji
Patch3: libnice-0.1.14-tests-koji.patch
+# component: accept TURN in nice_component_verify_remote_candidate() (#1541646)
+Patch4: libnice-0.1.14-turn-verify.patch
+
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: glib2-devel
@@ -82,6 +85,7 @@ developing applications that use %{name}.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
chmod 0755 scripts/valgrind-test-driver
# disable test-new-dribble, which sometimes hangs indefinitely, and
@@ -155,6 +159,7 @@ make check
%changelog
* Mon May 07 2018 Kamil Dudka <kdudka(a)redhat.com> - 0.1.14-7.20180504git34d6044
+- component: accept TURN in nice_component_verify_remote_candidate() (#1541646)
- update to 0.1.14-85-g34d6044 (#1541646)
* Mon Apr 16 2018 Kamil Dudka <kdudka(a)redhat.com> - 0.1.14-6.20171128gitfb2f1f7
commit 9cda08004416b0d369badbae81066eeb25e0039c
Author: Kamil Dudka <kdudka(a)redhat.com>
Date: Mon May 7 15:57:12 2018 +0200
Resolves: #1541646 - update to 0.1.14-85-g34d6044
diff --git a/libnice-0.1.14-70-gfb2f1f7.patch b/libnice-0.1.14-70-gfb2f1f7.patch
deleted file mode 100644
index db148cb..0000000
--- a/libnice-0.1.14-70-gfb2f1f7.patch
+++ /dev/null
@@ -1,10531 +0,0 @@
-From a4bacb2fe2ff06ccb1a2d7f7c0b62bd41674565b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Mon, 3 Apr 2017 14:30:10 -0400
-Subject: [PATCH 01/70] Version 0.1.14.1
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5fabdb4..b39bfe3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5,8 +5,8 @@ dnl Always compile with -Wall; if --enable-compile-warnings=error is passed,
- dnl also use -Werror. git and pre-releases default to -Werror
-
- dnl use a three digit version number for releases, and four for cvs/prerelease
--AC_INIT([libnice],[0.1.14])
--LIBNICE_RELEASE="yes"
-+AC_INIT([libnice],[0.1.14.1])
-+LIBNICE_RELEASE="no"
-
- AC_CANONICAL_TARGET
-
---
-2.13.6
-
-
-From 59ce41dfb837adf4222b25490cde2e394384ad15 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miguel=20Par=C3=ADs=20D=C3=ADaz?= <mparisdiaz(a)gmail.com>
-Date: Fri, 31 Mar 2017 20:20:38 -0400
-Subject: [PATCH 02/70] conncheck: consider answer received when remote
- credentials are set
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Consider that the answer is received when remote credentials
-are set instead of when a remote candidate is set,
-which could not happen or could cause more delay for the
-connection establishment.
-
-Ported to git master by Olivier Crête
-
-Differential Revision: https://phabricator.freedesktop.org/D1704
----
- agent/agent.c | 4 +-
- agent/conncheck.c | 225 +++++++++++++++++++++++++++---------------------------
- agent/conncheck.h | 2 +-
- 3 files changed, 117 insertions(+), 114 deletions(-)
-
-diff --git a/agent/agent.c b/agent/agent.c
-index 555fd16..4d9381c 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -3240,6 +3240,8 @@ nice_agent_set_remote_credentials (
- g_strlcpy (stream->remote_ufrag, ufrag, NICE_STREAM_MAX_UFRAG);
- g_strlcpy (stream->remote_password, pwd, NICE_STREAM_MAX_PWD);
-
-+ conn_check_remote_credentials_set(agent, stream);
-+
- ret = TRUE;
- goto done;
- }
-@@ -3342,8 +3344,6 @@ _set_remote_candidates_locked (NiceAgent *agent, NiceStream *stream,
- }
- }
-
-- conn_check_remote_candidates_set(agent, stream, component);
--
- if (added > 0) {
- conn_check_schedule_next (agent);
- }
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index dda2f2f..2abbc5e 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -1243,124 +1243,124 @@ static GSList *prune_cancelled_conn_check (GSList *conncheck_list)
-
- /*
- * Handle any processing steps for connectivity checks after
-- * remote candidates have been set. This function handles
-+ * remote credentials have been set. This function handles
- * the special case where answerer has sent us connectivity
-- * checks before the answer (containing candidate information),
-+ * checks before the answer (containing credentials information),
- * reaches us. The special case is documented in sect 7.2
- * if ICE spec (ID-19).
- */
--void conn_check_remote_candidates_set(NiceAgent *agent, NiceStream *stream, NiceComponent *component)
-+void conn_check_remote_credentials_set(NiceAgent *agent, NiceStream *stream)
- {
-- GSList *j, *k, *l, *m, *n;
-+ GSList *j, *k, *l, *m, *n, *o;
-
- for (j = stream->conncheck_list; j ; j = j->next) {
- CandidateCheckPair *pair = j->data;
-- if (pair->component_id == component->id) {
-- gboolean match = FALSE;
--
-- /* performn delayed processing of spec steps section 7.2.1.4,
-- and section 7.2.1.5 */
-- priv_preprocess_conn_check_pending_data (agent, stream, component, pair);
--
-- for (k = component->incoming_checks; k; k = k->next) {
-- IncomingCheck *icheck = k->data;
-- /* sect 7.2.1.3., "Learning Peer Reflexive Candidates", has to
-- * be handled separately */
-- for (l = component->remote_candidates; l; l = l->next) {
-- NiceCandidate *cand = l->data;
-- if (nice_address_equal (&icheck->from, &cand->addr)) {
-- match = TRUE;
-- break;
-- }
-- }
-- if (match != TRUE) {
-- /* note: we have gotten an incoming connectivity check from
-- * an address that is not a known remote candidate */
--
-- NiceCandidate *local_candidate = NULL;
-- NiceCandidate *remote_candidate = NULL;
--
-- if (agent->compatibility == NICE_COMPATIBILITY_GOOGLE ||
-- agent->compatibility == NICE_COMPATIBILITY_MSN ||
-- agent->compatibility == NICE_COMPATIBILITY_OC2007) {
-- /* We need to find which local candidate was used */
-- uint8_t uname[NICE_STREAM_MAX_UNAME];
-- guint uname_len;
--
-- nice_debug ("Agent %p: We have a peer-reflexive candidate in a "
-- "stored pending check", agent);
--
-- for (m = component->remote_candidates;
-- m != NULL && remote_candidate == NULL; m = m->next) {
-- for (n = component->local_candidates; n; n = n->next) {
-- NiceCandidate *rcand = m->data;
-- NiceCandidate *lcand = n->data;
--
-- uname_len = priv_create_username (agent, stream,
-- component->id, rcand, lcand,
-- uname, sizeof (uname), TRUE);
--
-- stun_debug ("pending check, comparing usernames of len %d and %d, equal=%d",
-- icheck->username_len, uname_len,
-- icheck->username && uname_len == icheck->username_len &&
-- memcmp (uname, icheck->username, icheck->username_len) == 0);
-- stun_debug_bytes (" first username: ",
-- icheck->username,
-- icheck->username? icheck->username_len : 0);
-- stun_debug_bytes (" second username: ", uname, uname_len);
--
-- if (icheck->username &&
-- uname_len == icheck->username_len &&
-- memcmp (uname, icheck->username, icheck->username_len) == 0) {
-- local_candidate = lcand;
-- remote_candidate = rcand;
-- break;
-- }
-- }
-- }
-- } else {
-- for (l = component->local_candidates; l; l = l->next) {
-- NiceCandidate *cand = l->data;
-- if (nice_address_equal (&cand->addr, &icheck->local_socket->addr)) {
-- local_candidate = cand;
-+ NiceComponent *component =
-+ nice_stream_find_component_by_id (stream, pair->component_id);
-+ gboolean match = FALSE;
-+
-+ /* performn delayed processing of spec steps section 7.2.1.4,
-+ and section 7.2.1.5 */
-+ priv_preprocess_conn_check_pending_data (agent, stream, component, pair);
-+
-+ for (k = component->incoming_checks; k; k = k->next) {
-+ IncomingCheck *icheck = k->data;
-+ /* sect 7.2.1.3., "Learning Peer Reflexive Candidates", has to
-+ * be handled separately */
-+ for (l = component->remote_candidates; l; l = l->next) {
-+ NiceCandidate *cand = l->data;
-+ if (nice_address_equal (&icheck->from, &cand->addr)) {
-+ match = TRUE;
-+ break;
-+ }
-+ }
-+ if (match != TRUE) {
-+ /* note: we have gotten an incoming connectivity check from
-+ * an address that is not a known remote candidate */
-+
-+ NiceCandidate *local_candidate = NULL;
-+ NiceCandidate *remote_candidate = NULL;
-+
-+ if (agent->compatibility == NICE_COMPATIBILITY_GOOGLE ||
-+ agent->compatibility == NICE_COMPATIBILITY_MSN ||
-+ agent->compatibility == NICE_COMPATIBILITY_OC2007) {
-+ /* We need to find which local candidate was used */
-+ uint8_t uname[NICE_STREAM_MAX_UNAME];
-+ guint uname_len;
-+
-+ nice_debug ("Agent %p: We have a peer-reflexive candidate in a "
-+ "stored pending check", agent);
-+
-+ for (m = component->remote_candidates;
-+ m != NULL && remote_candidate == NULL; m = m->next) {
-+ for (n = component->local_candidates; n; n = n->next) {
-+ NiceCandidate *rcand = m->data;
-+ NiceCandidate *lcand = n->data;
-+
-+ uname_len = priv_create_username (agent, stream,
-+ component->id, rcand, lcand,
-+ uname, sizeof (uname), TRUE);
-+
-+ stun_debug ("pending check, comparing usernames of len %d and %d, equal=%d",
-+ icheck->username_len, uname_len,
-+ icheck->username && uname_len == icheck->username_len &&
-+ memcmp (uname, icheck->username, icheck->username_len) == 0);
-+ stun_debug_bytes (" first username: ",
-+ icheck->username,
-+ icheck->username? icheck->username_len : 0);
-+ stun_debug_bytes (" second username: ", uname, uname_len);
-+
-+ if (icheck->username &&
-+ uname_len == icheck->username_len &&
-+ memcmp (uname, icheck->username, icheck->username_len) == 0) {
-+ local_candidate = lcand;
-+ remote_candidate = rcand;
- break;
- }
- }
- }
--
-- if (agent->compatibility == NICE_COMPATIBILITY_GOOGLE &&
-- local_candidate == NULL) {
-- /* if we couldn't match the username, then the matching remote
-- * candidate hasn't been received yet.. we must wait */
-- nice_debug ("Agent %p : Username check failed. pending check has "
-- "to wait to be processed", agent);
-- } else {
-- NiceCandidate *candidate;
--
-- nice_debug ("Agent %p : Discovered peer reflexive from early i-check",
-- agent);
-- candidate =
-- discovery_learn_remote_peer_reflexive_candidate (agent,
-- stream,
-- component,
-- icheck->priority,
-- &icheck->from,
-- icheck->local_socket,
-- local_candidate, remote_candidate);
-- if (candidate) {
-- if (local_candidate &&
-- local_candidate->transport == NICE_CANDIDATE_TRANSPORT_TCP_PASSIVE)
-- priv_conn_check_add_for_candidate_pair_matched (agent,
-- stream->id, component, local_candidate, candidate, NICE_CHECK_DISCOVERED);
-- else
-- conn_check_add_for_candidate (agent, stream->id, component, candidate);
--
-- if (icheck->use_candidate)
-- priv_mark_pair_nominated (agent, stream, component, local_candidate, candidate);
-- priv_schedule_triggered_check (agent, stream, component, icheck->local_socket, candidate, icheck->use_candidate);
-+ } else {
-+ for (l = component->local_candidates; l; l = l->next) {
-+ NiceCandidate *cand = l->data;
-+ if (nice_address_equal (&cand->addr, &icheck->local_socket->addr)) {
-+ local_candidate = cand;
-+ break;
- }
- }
- }
-+
-+ if (agent->compatibility == NICE_COMPATIBILITY_GOOGLE &&
-+ local_candidate == NULL) {
-+ /* if we couldn't match the username, then the matching remote
-+ * candidate hasn't been received yet.. we must wait */
-+ nice_debug ("Agent %p : Username check failed. pending check has "
-+ "to wait to be processed", agent);
-+ } else {
-+ NiceCandidate *candidate;
-+
-+ nice_debug ("Agent %p : Discovered peer reflexive from early i-check",
-+ agent);
-+ candidate =
-+ discovery_learn_remote_peer_reflexive_candidate (agent,
-+ stream,
-+ component,
-+ icheck->priority,
-+ &icheck->from,
-+ icheck->local_socket,
-+ local_candidate, remote_candidate);
-+ if (candidate) {
-+ if (local_candidate &&
-+ local_candidate->transport == NICE_CANDIDATE_TRANSPORT_TCP_PASSIVE)
-+ priv_conn_check_add_for_candidate_pair_matched (agent,
-+ stream->id, component, local_candidate, candidate, NICE_CHECK_DISCOVERED);
-+ else
-+ conn_check_add_for_candidate (agent, stream->id, component, candidate);
-+
-+ if (icheck->use_candidate)
-+ priv_mark_pair_nominated (agent, stream, component, local_candidate, candidate);
-+ priv_schedule_triggered_check (agent, stream, component, icheck->local_socket, candidate, icheck->use_candidate);
-+ }
-+ }
- }
- }
- }
-@@ -1368,9 +1368,12 @@ void conn_check_remote_candidates_set(NiceAgent *agent, NiceStream *stream, Nice
- /* Once we process the pending checks, we should free them to avoid
- * reprocessing them again if a dribble-mode set_remote_candidates
- * is called */
-- g_slist_free_full (component->incoming_checks,
-- (GDestroyNotify) incoming_check_free);
-- component->incoming_checks = NULL;
-+ for (o = stream->components; o; o = o->next) {
-+ NiceComponent *component = o->data;
-+ g_slist_free_full (component->incoming_checks,
-+ (GDestroyNotify) incoming_check_free);
-+ component->incoming_checks = NULL;
-+ }
-
- stream->conncheck_list =
- prune_cancelled_conn_check (stream->conncheck_list);
-@@ -3628,14 +3631,14 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *agent, NiceStream *stream,
- if (stream->initial_binding_request_received != TRUE)
- agent_signal_initial_binding_request_received (agent, stream);
-
-- if (component->remote_candidates && remote_candidate == NULL) {
-+ if (remote_candidate == NULL) {
- nice_debug ("Agent %p : No matching remote candidate for incoming check ->"
- "peer-reflexive candidate.", agent);
- remote_candidate = discovery_learn_remote_peer_reflexive_candidate (
- agent, stream, component, priority, from, nicesock,
- local_candidate,
- remote_candidate2 ? remote_candidate2 : remote_candidate);
-- if(remote_candidate) {
-+ if(remote_candidate && stream->remote_ufrag != NULL) {
- if (local_candidate &&
- local_candidate->transport == NICE_CANDIDATE_TRANSPORT_TCP_PASSIVE) {
- CandidateCheckPair *pair;
-@@ -3654,10 +3657,10 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *agent, NiceStream *stream,
- priv_reply_to_conn_check (agent, stream, component, local_candidate,
- remote_candidate, from, nicesock, rbuf_len, &msg, use_candidate);
-
-- if (component->remote_candidates == NULL) {
-+ if (stream->remote_ufrag == NULL) {
- /* case: We've got a valid binding request to a local candidate
-- * but we do not yet know remote credentials nor
-- * candidates. As per sect 7.2 of ICE (ID-19), we send a reply
-+ * but we do not yet know remote credentials.
-+ * As per sect 7.2 of ICE (ID-19), we send a reply
- * immediately but postpone all other processing until
- * we get information about the remote candidates */
-
-diff --git a/agent/conncheck.h b/agent/conncheck.h
-index 431c606..10319cc 100644
---- a/agent/conncheck.h
-+++ b/agent/conncheck.h
-@@ -105,7 +105,7 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair);
- void conn_check_prune_stream (NiceAgent *agent, NiceStream *stream);
- gboolean conn_check_handle_inbound_stun (NiceAgent *agent, NiceStream *stream, NiceComponent *component, NiceSocket *udp_socket, const NiceAddress *from, gchar *buf, guint len);
- gint conn_check_compare (const CandidateCheckPair *a, const CandidateCheckPair *b);
--void conn_check_remote_candidates_set(NiceAgent *agent, NiceStream *stream, NiceComponent *component);
-+void conn_check_remote_credentials_set(NiceAgent *agent, NiceStream *stream);
- NiceCandidateTransport conn_check_match_transport (NiceCandidateTransport transport);
- void
- conn_check_prune_socket (NiceAgent *agent, NiceStream *stream, NiceComponent *component,
---
-2.13.6
-
-
-From 0de1657e4d15d4f1911ab1fad84ea23e7013070f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Tue, 4 Apr 2017 12:25:50 -0400
-Subject: [PATCH 03/70] conncheck: Use the right test for empty remote_frag
-
-It's now an array, not a pointer, so needs to test to emptyness.
-
-It's a bugfix on the previous commit, 59ce41df
----
- agent/conncheck.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 2abbc5e..7096b42 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -3638,7 +3638,7 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *agent, NiceStream *stream,
- agent, stream, component, priority, from, nicesock,
- local_candidate,
- remote_candidate2 ? remote_candidate2 : remote_candidate);
-- if(remote_candidate && stream->remote_ufrag != NULL) {
-+ if(remote_candidate && stream->remote_ufrag[0]) {
- if (local_candidate &&
- local_candidate->transport == NICE_CANDIDATE_TRANSPORT_TCP_PASSIVE) {
- CandidateCheckPair *pair;
-@@ -3657,7 +3657,7 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *agent, NiceStream *stream,
- priv_reply_to_conn_check (agent, stream, component, local_candidate,
- remote_candidate, from, nicesock, rbuf_len, &msg, use_candidate);
-
-- if (stream->remote_ufrag == NULL) {
-+ if (stream->remote_ufrag[0] == 0) {
- /* case: We've got a valid binding request to a local candidate
- * but we do not yet know remote credentials.
- * As per sect 7.2 of ICE (ID-19), we send a reply
---
-2.13.6
-
-
-From 0672758b9621801c8f0d9e3c920370983b267a68 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Tue, 4 Apr 2017 12:29:29 -0400
-Subject: [PATCH 04/70] agent: Don't set variable that won't be used
-
-It exits the loop immediately, so no point to set the variable.
-And it makes the clang static analyzer happy.
----
- agent/agent.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/agent/agent.c b/agent/agent.c
-index 4d9381c..8ba99bc 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -4245,7 +4245,6 @@ nice_agent_recv_messages_blocking_or_nonblocking (NiceAgent *agent,
- "Component removed during call.");
-
- component = NULL;
-- error_reported = TRUE;
-
- goto recv_error;
- }
---
-2.13.6
-
-
-From db05e8b0fdc713df93cd6a4c3914e5aee38b2391 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Tue, 4 Apr 2017 12:30:27 -0400
-Subject: [PATCH 05/70] Make clang-analyzer happy
-
-Various little things, none of which should make a functional difference.
----
- agent/agent.c | 1 -
- agent/conncheck.c | 2 +-
- socket/udp-turn.c | 5 ++---
- stun/usages/bind.c | 4 +++-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/agent/agent.c b/agent/agent.c
-index 8ba99bc..28d7ccf 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -1552,7 +1552,6 @@ pseudo_tcp_socket_recv_messages (PseudoTcpSocket *self,
-
- if (len == 0) {
- /* Reached EOS. */
-- len = 0;
- goto done;
- } else if (len < 0 &&
- pseudo_tcp_socket_get_error (self) == EWOULDBLOCK) {
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 7096b42..1dc13dd 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -606,7 +606,7 @@ static gboolean priv_conn_check_tick_unlocked (NiceAgent *agent)
- /* step: when there's no pair in the Waiting state,
- * unfreeze a new pair and check it
- */
-- res = priv_conn_check_unfreeze_next (agent);
-+ priv_conn_check_unfreeze_next (agent);
-
- for (i = agent->streams; i ; i = i->next) {
- NiceStream *stream = i->data;
-diff --git a/socket/udp-turn.c b/socket/udp-turn.c
-index cc3409b..a9c57e5 100644
---- a/socket/udp-turn.c
-+++ b/socket/udp-turn.c
-@@ -406,9 +406,8 @@ socket_recv_messages (NiceSocket *sock,
-
- /* Split up the monolithic buffer again into the caller-provided buffers. */
- if (parsed_buffer_length > 0 && allocated_buffer) {
-- parsed_buffer_length =
-- memcpy_buffer_to_input_message (message, buffer,
-- parsed_buffer_length);
-+ memcpy_buffer_to_input_message (message, buffer,
-+ parsed_buffer_length);
- }
-
- if (allocated_buffer)
-diff --git a/stun/usages/bind.c b/stun/usages/bind.c
-index 8dd7afc..d56790f 100644
---- a/stun/usages/bind.c
-+++ b/stun/usages/bind.c
-@@ -479,7 +479,7 @@ StunUsageBindReturn stun_usage_bind_run (const struct sockaddr *srv,
- size_t len;
- StunUsageTransReturn ret;
- int val;
-- struct sockaddr_storage alternate_server;
-+ struct sockaddr_storage alternate_server = { AF_UNSPEC } ;
- socklen_t alternate_server_len = sizeof (alternate_server);
- StunUsageBindReturn bind_ret;
-
-@@ -548,6 +548,8 @@ StunUsageBindReturn stun_usage_bind_run (const struct sockaddr *srv,
- if (bind_ret == STUN_USAGE_BIND_RETURN_ALTERNATE_SERVER) {
- stun_trans_deinit (&trans);
-
-+ assert (alternate_server.ss_family != AF_UNSPEC);
-+
- ret = stun_trans_create (&trans, SOCK_DGRAM, 0,
- (struct sockaddr *) &alternate_server, alternate_server_len);
-
---
-2.13.6
-
-
-From cd255bddc7fa0ddae056b5358a22b380c4eefc42 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Tue, 4 Apr 2017 15:24:43 -0400
-Subject: [PATCH 06/70] udp-turn: Add some const to internal APIs
-
----
- agent/component.c | 2 +-
- socket/udp-turn.c | 10 +++++-----
- socket/udp-turn.h | 7 ++++---
- 3 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/agent/component.c b/agent/component.c
-index 32f7463..a679b30 100644
---- a/agent/component.c
-+++ b/agent/component.c
-@@ -380,7 +380,7 @@ nice_component_restart (NiceComponent *cmp)
- for (i = cmp->remote_candidates; i; i = i->next) {
- NiceCandidate *candidate = i->data;
-
-- /* note: do not remove the local candidate that is
-+ /* note: do not remove the remote candidate that is
- * currently part of the 'selected pair', see ICE
- * 9.1.1.1. "ICE Restarts" (ID-19) */
- if (candidate == cmp->selected_pair.remote) {
-diff --git a/socket/udp-turn.c b/socket/udp-turn.c
-index a9c57e5..190a9ea 100644
---- a/socket/udp-turn.c
-+++ b/socket/udp-turn.c
-@@ -174,8 +174,8 @@ priv_send_data_queue_destroy (gpointer user_data)
-
- NiceSocket *
- nice_udp_turn_socket_new (GMainContext *ctx, NiceAddress *addr,
-- NiceSocket *base_socket, NiceAddress *server_addr,
-- gchar *username, gchar *password,
-+ NiceSocket *base_socket, const NiceAddress *server_addr,
-+ const gchar *username, const gchar *password,
- NiceTurnSocketCompatibility compatibility)
- {
- UdpTurnPriv *priv;
-@@ -1184,7 +1184,7 @@ nice_udp_turn_socket_parse_recv_message (NiceSocket *sock, NiceSocket **from_soc
- gsize
- nice_udp_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
- NiceAddress *from, gsize len, guint8 *buf,
-- NiceAddress *recv_from, guint8 *_recv_buf, gsize recv_len)
-+ const NiceAddress *recv_from, const guint8 *_recv_buf, gsize recv_len)
- {
-
- UdpTurnPriv *priv = (UdpTurnPriv *) sock->priv;
-@@ -1194,8 +1194,8 @@ nice_udp_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
- ChannelBinding *binding = NULL;
-
- union {
-- guint8 *u8;
-- guint16 *u16;
-+ const guint8 *u8;
-+ const guint16 *u16;
- } recv_buf;
-
- /* In the case of a reliable UDP-TURN-OVER-TCP (which means MS-TURN)
-diff --git a/socket/udp-turn.h b/socket/udp-turn.h
-index b1eeeb4..df10a1c 100644
---- a/socket/udp-turn.h
-+++ b/socket/udp-turn.h
-@@ -59,15 +59,16 @@ nice_udp_turn_socket_parse_recv_message (NiceSocket *sock, NiceSocket **from_soc
- gsize
- nice_udp_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
- NiceAddress *from, gsize len, guint8 *buf,
-- NiceAddress *recv_from, guint8 *recv_buf, gsize recv_len);
-+ const NiceAddress *recv_from, const guint8 *recv_buf, gsize recv_len);
-
- gboolean
- nice_udp_turn_socket_set_peer (NiceSocket *sock, NiceAddress *peer);
-
- NiceSocket *
- nice_udp_turn_socket_new (GMainContext *ctx, NiceAddress *addr,
-- NiceSocket *base_socket, NiceAddress *server_addr,
-- gchar *username, gchar *password, NiceTurnSocketCompatibility compatibility);
-+ NiceSocket *base_socket, const NiceAddress *server_addr,
-+ const gchar *username, const gchar *password,
-+ NiceTurnSocketCompatibility compatibility);
-
- void
- nice_udp_turn_socket_set_ms_realm(NiceSocket *sock, StunMessage *msg);
---
-2.13.6
-
-
-From e56b910d2d8b70f5677bbd4be579d5b95aff33ad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Tue, 4 Apr 2017 16:16:05 -0400
-Subject: [PATCH 07/70] agent: Separate return from NiceSocket and internal
- enum
-
-The same variable was used for return values from NiceSocket and
-for the internal enum, but 0 and -1 have different meanings in both.
----
- agent/agent.c | 35 +++++++++++++++++++----------------
- 1 file changed, 19 insertions(+), 16 deletions(-)
-
-diff --git a/agent/agent.c b/agent/agent.c
-index 28d7ccf..7b8a9fc 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -3422,7 +3422,8 @@ agent_recv_message_unlocked (
- {
- NiceAddress from;
- GList *item;
-- gint retval;
-+ RecvStatus retval;
-+ gint sockret;
- gboolean is_turn = FALSE;
-
- /* We need an address for packet parsing, below. */
-@@ -3483,8 +3484,8 @@ agent_recv_message_unlocked (
- local_bufs[i + 1].buffer = message->buffers[i].buffer;
- local_bufs[i + 1].size = message->buffers[i].size;
- }
-- retval = nice_socket_recv_messages (nicesock, &local_message, 1);
-- if (retval == 1) {
-+ sockret = nice_socket_recv_messages (nicesock, &local_message, 1);
-+ if (sockret == 1) {
- message->length = ntohs (rfc4571_frame);
- }
- } else {
-@@ -3499,7 +3500,7 @@ agent_recv_message_unlocked (
- _priv_set_socket_tos (agent, new_socket, stream->tos);
- nice_component_attach_socket (component, new_socket);
- }
-- retval = 0;
-+ sockret = 0;
- } else {
- /* In the case of a real ICE-TCP connection, we can use the socket as a
- * bytestream and do the read here with caching of data being read
-@@ -3508,9 +3509,9 @@ agent_recv_message_unlocked (
-
- /* TODO: Support bytestream reads */
- message->length = 0;
-- retval = 0;
-+ sockret = 0;
- if (available <= 0) {
-- retval = available;
-+ sockret = available;
-
- /* If we don't call check_connect_result on an outbound connection,
- * then is_connected will always return FALSE. That's why we check
-@@ -3523,7 +3524,7 @@ agent_recv_message_unlocked (
- * not connected, it means that it failed to connect, so we must
- * return an error to make the socket fail/closed
- */
-- retval = -1;
-+ sockret = -1;
- } else {
- gint flags = G_SOCKET_MSG_PEEK;
-
-@@ -3536,7 +3537,7 @@ agent_recv_message_unlocked (
- */
- if (g_socket_receive_message (nicesock->fileno, NULL,
- NULL, 0, NULL, NULL, &flags, NULL, NULL) == 0)
-- retval = -1;
-+ sockret = -1;
- }
- } else if (agent->rfc4571_expecting_length == 0) {
- if ((gsize) available >= sizeof(guint16)) {
-@@ -3544,8 +3545,8 @@ agent_recv_message_unlocked (
- GInputVector local_buf = { &rfc4571_frame, sizeof(guint16)};
- NiceInputMessage local_message = { &local_buf, 1, message->from, 0};
-
-- retval = nice_socket_recv_messages (nicesock, &local_message, 1);
-- if (retval == 1) {
-+ sockret = nice_socket_recv_messages (nicesock, &local_message, 1);
-+ if (sockret == 1) {
- agent->rfc4571_expecting_length = ntohs (rfc4571_frame);
- available = g_socket_get_available_bytes (nicesock->fileno);
- }
-@@ -3589,8 +3590,8 @@ agent_recv_message_unlocked (
- off += local_bufs[i].size;
- }
- }
-- retval = nice_socket_recv_messages (nicesock, &local_message, 1);
-- if (retval == 1) {
-+ sockret = nice_socket_recv_messages (nicesock, &local_message, 1);
-+ if (sockret == 1) {
- message->length = local_message.length;
- agent->rfc4571_expecting_length -= local_message.length;
- }
-@@ -3598,20 +3599,22 @@ agent_recv_message_unlocked (
- }
- }
- } else {
-- retval = nice_socket_recv_messages (nicesock, message, 1);
-+ sockret = nice_socket_recv_messages (nicesock, message, 1);
- }
-
-- if (retval == 0) {
-+ if (sockret == 0) {
- retval = RECV_WOULD_BLOCK; /* EWOULDBLOCK */
- nice_debug_verbose ("%s: Agent %p: no message available on read attempt",
- G_STRFUNC, agent);
- goto done;
-- } else if (retval < 0) {
-+ } else if (sockret < 0) {
- nice_debug ("Agent %p: %s returned %d, errno (%d) : %s",
-- agent, G_STRFUNC, retval, errno, g_strerror (errno));
-+ agent, G_STRFUNC, sockret, errno, g_strerror (errno));
-
- retval = RECV_ERROR;
- goto done;
-+ } else {
-+ retval = sockret;
- }
-
- if (retval == RECV_OOB || message->length == 0) {
---
-2.13.6
-
-
-From 4e605885c9dcaeb3ee443ec902c9c9189b19043f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Tue, 4 Apr 2017 16:16:46 -0400
-Subject: [PATCH 08/70] agent: Remove impossible case
-
----
- agent/agent.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/agent/agent.c b/agent/agent.c
-index 7b8a9fc..77f27e3 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -3617,7 +3617,8 @@ agent_recv_message_unlocked (
- retval = sockret;
- }
-
-- if (retval == RECV_OOB || message->length == 0) {
-+ g_assert (retval != RECV_OOB);
-+ if (message->length == 0) {
- retval = RECV_OOB;
- nice_debug_verbose ("%s: Agent %p: message handled out-of-band", G_STRFUNC,
- agent);
---
-2.13.6
-
-
-From efc6a9be8cb34c899f0454c32e8a1e62b38df474 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Tue, 4 Apr 2017 18:42:57 -0400
-Subject: [PATCH 09/70] tests: Use automake test-driver for valgrind
-
-This fixes the valgrind integration with the new test drivers.
----
- common.mk | 4 +-
- scripts/valgrind-test-driver | 162 +++++++++++++++++++++++++++++++++++++++++++
- scripts/valgrind.sh | 28 --------
- 3 files changed, 165 insertions(+), 29 deletions(-)
- create mode 100755 scripts/valgrind-test-driver
- delete mode 100755 scripts/valgrind.sh
-
-diff --git a/common.mk b/common.mk
-index e2ca3f4..b16380d 100644
---- a/common.mk
-+++ b/common.mk
-@@ -4,6 +4,8 @@ pkgincludedir = $(includedir)/nice
-
-
- check-valgrind:
-- $(MAKE) TESTS_ENVIRONMENT="sh $$(cd "$(top_srcdir)" && pwd)/scripts/valgrind.sh" check
-+ $(MAKE) TESTS_ENVIRONMENT="USE_VALGRIND=1 " check
-+
-+LOG_DRIVER=$(top_srcdir)/scripts/valgrind-test-driver
-
- .PHONY: check-valgrind
-diff --git a/scripts/valgrind-test-driver b/scripts/valgrind-test-driver
-new file mode 100755
-index 0000000..5b660ee
---- /dev/null
-+++ b/scripts/valgrind-test-driver
-@@ -0,0 +1,162 @@
-+#! /bin/sh
-+# test-driver - basic testsuite driver script.
-+
-+scriptversion=2017-04-04.22; # UTC
-+
-+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program. If not, see <http://www.gnu.org/licenses/>.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake(a)gnu.org> or send patches to
-+# <automake-patches(a)gnu.org>.
-+
-+# Make unconditional expansion of undefined variables an error. This
-+# helps a lot in preventing typo-related bugs.
-+set -u
-+
-+usage_error ()
-+{
-+ echo "$0: $*" >&2
-+ print_usage >&2
-+ exit 2
-+}
-+
-+print_usage ()
-+{
-+ cat <<END
-+Usage:
-+ test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
-+ [--expect-failure={yes|no}] [--color-tests={yes|no}]
-+ [--enable-hard-errors={yes|no}] [--]
-+ TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
-+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
-+END
-+}
-+
-+test_name= # Used for reporting.
-+log_file= # Where to save the output of the test script.
-+trs_file= # Where to save the metadata of the test run.
-+expect_failure=no
-+color_tests=no
-+enable_hard_errors=yes
-+while test $# -gt 0; do
-+ case $1 in
-+ --help) print_usage; exit $?;;
-+ --version) echo "test-driver $scriptversion"; exit $?;;
-+ --test-name) test_name=$2; shift;;
-+ --log-file) log_file=$2; shift;;
-+ --trs-file) trs_file=$2; shift;;
-+ --color-tests) color_tests=$2; shift;;
-+ --expect-failure) expect_failure=$2; shift;;
-+ --enable-hard-errors) enable_hard_errors=$2; shift;;
-+ --) shift; break;;
-+ -*) usage_error "invalid option: '$1'";;
-+ *) break;;
-+ esac
-+ shift
-+done
-+
-+missing_opts=
-+test x"$test_name" = x && missing_opts="$missing_opts --test-name"
-+test x"$log_file" = x && missing_opts="$missing_opts --log-file"
-+test x"$trs_file" = x && missing_opts="$missing_opts --trs-file"
-+if test x"$missing_opts" != x; then
-+ usage_error "the following mandatory options are missing:$missing_opts"
-+fi
-+
-+if test $# -eq 0; then
-+ usage_error "missing argument"
-+fi
-+
-+if test $color_tests = yes; then
-+ # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
-+ red='[0;31m' # Red.
-+ grn='[0;32m' # Green.
-+ lgn='[1;32m' # Light green.
-+ blu='[1;34m' # Blue.
-+ mgn='[0;35m' # Magenta.
-+ std='[m' # No color.
-+else
-+ red= grn= lgn= blu= mgn= std=
-+fi
-+
-+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
-+trap "st=129; $do_exit" 1
-+trap "st=130; $do_exit" 2
-+trap "st=141; $do_exit" 13
-+trap "st=143; $do_exit" 15
-+
-+# Test script is run here.
-+top_srcdir="`dirname $0`/.."
-+tests_dir="${top_srcdir}/tests"
-+
-+USE_VALGRIND="`printenv USE_VALGRIND`"
-+
-+if test "x${USE_VALGRIND}" = "x1"; then
-+ ${top_srcdir}/libtool --mode=execute valgrind \
-+ --leak-check=full \
-+ --show-reachable=no \
-+ --error-exitcode=1 \
-+ --suppressions=$tests_dir/libnice.supp \
-+ --num-callers=30 "$@" >$log_file 2>&1
-+else
-+ "$@" >$log_file 2>&1
-+fi
-+estatus=$?
-+
-+if test $enable_hard_errors = no && test $estatus -eq 99; then
-+ tweaked_estatus=1
-+else
-+ tweaked_estatus=$estatus
-+fi
-+
-+case $tweaked_estatus:$expect_failure in
-+ 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
-+ 0:*) col=$grn res=PASS recheck=no gcopy=no;;
-+ 77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
-+ 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;;
-+ *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;;
-+ *:*) col=$red res=FAIL recheck=yes gcopy=yes;;
-+esac
-+
-+# Report the test outcome and exit status in the logs, so that one can
-+# know whether the test passed or failed simply by looking at the '.log'
-+# file, without the need of also peaking into the corresponding '.trs'
-+# file (automake bug#11814).
-+echo "$res $test_name (exit status: $estatus)" >>$log_file
-+
-+# Report outcome to console.
-+echo "${col}${res}${std}: $test_name"
-+
-+# Register the test result, and other relevant metadata.
-+echo ":test-result: $res" > $trs_file
-+echo ":global-test-result: $res" >> $trs_file
-+echo ":recheck: $recheck" >> $trs_file
-+echo ":copy-in-global-log: $gcopy" >> $trs_file
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
-+# End:
-diff --git a/scripts/valgrind.sh b/scripts/valgrind.sh
-deleted file mode 100755
-index 2864b6f..0000000
---- a/scripts/valgrind.sh
-+++ /dev/null
-@@ -1,28 +0,0 @@
--#!/bin/sh
--
--export G_SLICE=always-malloc
--export G_DEBUG=gc-friendly
--
--tests_dir="`dirname $0`/../tests"
--
--report=`libtool --mode=execute valgrind \
-- --leak-check=full \
-- --show-reachable=no \
-- --error-exitcode=1 \
-- --suppressions=$tests_dir/libnice.supp \
-- --num-callers=30 \
-- $1 2>&1`
--
--#if echo "$report" | grep -q ==; then
--if test $? != 0; then
-- echo "$report"
-- exit 1
--fi
--
--if echo "$report" | grep -q "definitely lost"; then
-- if ! echo "$report" | grep -q "definitely lost: 0 bytes"; then
-- echo "$report"
-- exit 1
-- fi
--fi
--
---
-2.13.6
-
-
-From ae6d939e48366b80570d713b83334191b0982e71 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Tue, 4 Apr 2017 20:34:05 -0400
-Subject: [PATCH 10/70] debug: Use libnice-verbose, not libnice-nice-verbose
-
----
- agent/debug.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/agent/debug.c b/agent/debug.c
-index e1a298c..84fee94 100644
---- a/agent/debug.c
-+++ b/agent/debug.c
-@@ -102,7 +102,7 @@ void nice_debug_init (void)
- flags |= g_parse_debug_string (gflags_string, gkeys, 4);
- if (gflags_string && strstr (gflags_string, "libnice-pseudotcp-verbose"))
- flags |= NICE_DEBUG_PSEUDOTCP_VERBOSE;
-- if (gflags_string && strstr (gflags_string, "libnice-nice-verbose")) {
-+ if (gflags_string && strstr (gflags_string, "libnice-verbose")) {
- flags |= NICE_DEBUG_NICE_VERBOSE;
- }
-
---
-2.13.6
-
-
-From 10c557f23f8337f1304fff27bd85d2eb713cb249 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Wed, 5 Apr 2017 17:01:35 -0400
-Subject: [PATCH 11/70] test-credentials: Fix leak
-
----
- tests/test-credentials.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/test-credentials.c b/tests/test-credentials.c
-index 1de4e49..f1ea89d 100644
---- a/tests/test-credentials.c
-+++ b/tests/test-credentials.c
-@@ -184,6 +184,8 @@ int main (void)
- nice_agent_get_local_credentials (lagent, 1, &ufrag, &password);
- g_assert (g_strcmp0("unicorns", ufrag) == 0);
- g_assert (g_strcmp0("awesome", password) == 0);
-+ g_free (ufrag);
-+ g_free (password);
-
- nice_agent_gather_candidates (lagent, 1);
- nice_agent_gather_candidates (ragent, 1);
---
-2.13.6
-
-
-From 1e9e28dbc98b4f6a7cf4bda0ca73b5abc2735ddc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Tue, 4 Apr 2017 14:41:51 -0400
-Subject: [PATCH 12/70] candidate: Add equality check function
-
-Add a function that can check if two candidates point to the same place.
-
-https://phabricator.freedesktop.org/T104
-
-Reviewed-by: Philip Withnall <philip.withnall(a)collabora.co.uk>
-Differential Revision: https://phabricator.freedesktop.org/D1715
----
- agent/candidate.c | 11 +++++++++++
- agent/candidate.h | 18 +++++++++++++++++-
- docs/reference/libnice/libnice-docs.xml | 4 ++++
- docs/reference/libnice/libnice-sections.txt | 1 +
- nice/libnice.sym | 1 +
- 5 files changed, 34 insertions(+), 1 deletion(-)
-
-diff --git a/agent/candidate.c b/agent/candidate.c
-index 27966ef..85f8f65 100644
---- a/agent/candidate.c
-+++ b/agent/candidate.c
-@@ -360,3 +360,14 @@ nice_candidate_copy (const NiceCandidate *candidate)
-
- return copy;
- }
-+
-+NICEAPI_EXPORT gboolean
-+nice_candidate_equal_target (const NiceCandidate *candidate1,
-+ const NiceCandidate *candidate2)
-+{
-+ g_return_val_if_fail (candidate1 != NULL, FALSE);
-+ g_return_val_if_fail (candidate2 != NULL, FALSE);
-+
-+ return (candidate1->transport == candidate2->transport &&
-+ nice_address_equal (&candidate1->addr, &candidate2->addr));
-+}
-diff --git a/agent/candidate.h b/agent/candidate.h
-index fadfce3..e556c16 100644
---- a/agent/candidate.h
-+++ b/agent/candidate.h
-@@ -230,7 +230,23 @@ nice_candidate_free (NiceCandidate *candidate);
- NiceCandidate *
- nice_candidate_copy (const NiceCandidate *candidate);
-
--GType nice_candidate_get_type (void);
-+/**
-+ * nice_candidate_equal_target:
-+ * @candidate1: A candidate
-+ * @candidate2: A candidate
-+ *
-+ * Verifies that the candidates point to the same place, meaning they have
-+ * the same transport and the same address. It ignores all other aspects.
-+ *
-+ * Returns: %TRUE if the candidates point to the same place
-+ *
-+ * Since: 0.1.15
-+ */
-+gboolean
-+nice_candidate_equal_target (const NiceCandidate *candidate1,
-+ const NiceCandidate *candidate2);
-+
-+ GType nice_candidate_get_type (void);
-
- /**
- * NICE_TYPE_CANDIDATE:
-diff --git a/docs/reference/libnice/libnice-docs.xml b/docs/reference/libnice/libnice-docs.xml
-index 53487bc..391be1a 100644
---- a/docs/reference/libnice/libnice-docs.xml
-+++ b/docs/reference/libnice/libnice-docs.xml
-@@ -105,6 +105,10 @@
- <title>Index of new symbols in 0.1.14</title>
- <xi:include href="xml/api-index-0.1.14.xml"><xi:fallback/></xi:include>
- </index>
-+ <index role="0.1.15">
-+ <title>Index of new symbols in 0.1.15</title>
-+ <xi:include href="xml/api-index-0.1.15.xml"><xi:fallback/></xi:include>
-+ </index>
- <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
- </part>
- </book>
-diff --git a/docs/reference/libnice/libnice-sections.txt b/docs/reference/libnice/libnice-sections.txt
-index d377257..88a6cd2 100644
---- a/docs/reference/libnice/libnice-sections.txt
-+++ b/docs/reference/libnice/libnice-sections.txt
-@@ -76,6 +76,7 @@ NICE_CANDIDATE_MAX_FOUNDATION
- nice_candidate_new
- nice_candidate_free
- nice_candidate_copy
-+nice_candidate_equal_target
- <SUBSECTION Standard>
- NICE_TYPE_CANDIDATE
- nice_candidate_get_type
-diff --git a/nice/libnice.sym b/nice/libnice.sym
-index b04bb95..1e522ad 100644
---- a/nice/libnice.sym
-+++ b/nice/libnice.sym
-@@ -58,6 +58,7 @@ nice_agent_set_software
- nice_agent_set_stream_name
- nice_agent_set_stream_tos
- nice_candidate_copy
-+nice_candidate_equal_target
- nice_candidate_free
- nice_candidate_new
- nice_component_state_to_string
---
-2.13.6
-
-
-From ffc7fddac42728bac6e4753a17bc52e5e610ae8b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Tue, 4 Apr 2017 21:27:39 -0400
-Subject: [PATCH 13/70] agent: Drop packets not from validated addresses
-
-This is required by the WebRTC spec.
-
-Remove test-mainloop as it doesnt even try to do
-a negotiation.
-
-https://phabricator.freedesktop.org/T104
-
-Differential Revision: https://phabricator.freedesktop.org/D1716
----
- agent/agent-priv.h | 2 +
- agent/agent.c | 20 +++++++++-
- agent/component.c | 90 +++++++++++++++++++++++++++++++++++++++++
- agent/component.h | 10 +++++
- agent/conncheck.c | 8 +++-
- tests/Makefile.am | 1 -
- tests/test-mainloop.c | 108 --------------------------------------------------
- 7 files changed, 127 insertions(+), 112 deletions(-)
- delete mode 100644 tests/test-mainloop.c
-
-diff --git a/agent/agent-priv.h b/agent/agent-priv.h
-index 4d8c9b8..ada3630 100644
---- a/agent/agent-priv.h
-+++ b/agent/agent-priv.h
-@@ -114,6 +114,8 @@ nice_input_message_iter_compare (const NiceInputMessageIter *a,
- * MTU and estimated typical sizes of ICE STUN packet */
- #define MAX_STUN_DATAGRAM_PAYLOAD 1300
-
-+#define NICE_COMPONENT_MAX_VALID_CANDIDATES 50 /* maximum number of validates remote candidates to keep, the number is arbitrary but hopefully large enough */
-+
- struct _NiceAgent
- {
- GObject parent; /* gobject pointer */
-diff --git a/agent/agent.c b/agent/agent.c
-index 77f27e3..eff62f0 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -3682,8 +3682,6 @@ agent_recv_message_unlocked (
- if (retval == RECV_OOB)
- goto done;
-
-- agent->media_after_tick = TRUE;
--
- /* If the message’s stated length is equal to its actual length, it’s probably
- * a STUN message; otherwise it’s probably data. */
- if (stun_message_validate_buffer_length_fast (
-@@ -3715,6 +3713,7 @@ agent_recv_message_unlocked (
- nice_debug ("%s: Valid STUN packet received.", G_STRFUNC);
- retval = RECV_OOB;
- g_free (big_buf);
-+ agent->media_after_tick = TRUE;
- goto done;
- }
- }
-@@ -3725,6 +3724,23 @@ agent_recv_message_unlocked (
- g_free (big_buf);
- }
-
-+ if (!nice_component_verify_remote_candidate (component,
-+ message->from, nicesock)) {
-+ if (nice_debug_is_verbose ()) {
-+ gchar str[INET6_ADDRSTRLEN];
-+
-+ nice_address_to_string (message->from, str);
-+ nice_debug_verbose ("Agent %p : %d:%d DROPPING packet from unknown source"
-+ " %s:%d sock-type: %d\n", agent, stream->id, component->id, str,
-+ nice_address_get_port (message->from), nicesock->type);
-+ }
-+
-+ retval = RECV_OOB;
-+ goto done;
-+ }
-+
-+ agent->media_after_tick = TRUE;
-+
- /* Unhandled STUN; try handling TCP data, then pass to the client. */
- if (message->length > 0 && agent->reliable) {
- if (!nice_socket_is_reliable (nicesock) &&
-diff --git a/agent/component.c b/agent/component.c
-index a679b30..ba28ffa 100644
---- a/agent/component.c
-+++ b/agent/component.c
-@@ -435,6 +435,8 @@ nice_component_update_selected_pair (NiceComponent *component, const CandidatePa
- component->selected_pair.remote = pair->remote;
- component->selected_pair.priority = pair->priority;
- component->selected_pair.prflx_priority = pair->prflx_priority;
-+
-+ nice_component_add_valid_candidate (component, pair->remote);
- }
-
- /*
-@@ -514,6 +516,11 @@ nice_component_set_selected_remote_candidate (NiceComponent *component,
- component->selected_pair.remote = remote;
- component->selected_pair.priority = priority;
-
-+ /* Get into fallback mode where packets from any source is accepted once
-+ * this has been called. This is the expected behavior of pre-ICE SIP.
-+ */
-+ component->fallback_mode = TRUE;
-+
- return local;
- }
-
-@@ -1107,6 +1114,9 @@ nice_component_finalize (GObject *obj)
- g_warn_if_fail (cmp->remote_candidates == NULL);
- g_warn_if_fail (cmp->incoming_checks == NULL);
-
-+ g_list_free_full (cmp->valid_candidates,
-+ (GDestroyNotify) nice_candidate_free);
-+
- g_clear_object (&cmp->tcp);
- g_clear_object (&cmp->stop_cancellable);
- g_clear_object (&cmp->iostream);
-@@ -1421,3 +1431,83 @@ turn_server_unref (TurnServer *turn)
- g_slice_free (TurnServer, turn);
- }
- }
-+
-+void
-+nice_component_add_valid_candidate (NiceComponent *component,
-+ const NiceCandidate *candidate)
-+{
-+ guint count = 0;
-+ GList *item, *last = NULL;
-+
-+ for (item = component->valid_candidates; item; item = item->next) {
-+ NiceCandidate *cand = item->data;
-+
-+ last = item;
-+ count++;
-+ if (nice_candidate_equal_target (cand, candidate))
-+ return;
-+ }
-+
-+ /* New candidate */
-+
-+ if (nice_debug_is_enabled ()) {
-+ char str[INET6_ADDRSTRLEN];
-+ nice_address_to_string (&candidate->addr, str);
-+ nice_debug ("Agent %p : %d:%d Adding valid source"
-+ " candidate: %s:%d trans: %d\n", component->agent,
-+ candidate->stream_id, candidate->component_id, str,
-+ nice_address_get_port (&candidate->addr), candidate->transport);
-+ }
-+
-+ component->valid_candidates = g_list_prepend (
-+ component->valid_candidates, nice_candidate_copy (candidate));
-+
-+ /* Delete the last one to make sure we don't have a list that is too long,
-+ * the candidates are not freed on ICE restart as this would be more complex,
-+ * we just keep the list not too long.
-+ */
-+ if (count > NICE_COMPONENT_MAX_VALID_CANDIDATES) {
-+ NiceCandidate *cand = last->data;
-+
-+ component->valid_candidates = g_list_delete_link (
-+ component->valid_candidates, last);
-+ nice_candidate_free (cand);
-+ }
-+}
-+
-+gboolean
-+nice_component_verify_remote_candidate (NiceComponent *component,
-+ const NiceAddress *address, NiceSocket *nicesock)
-+{
-+ GList *item;
-+
-+ if (component->fallback_mode)
-+ return TRUE;
-+
-+ for (item = component->valid_candidates; item; item = item->next) {
-+ NiceCandidate *cand = item->data;
-+
-+ if (((nicesock->type == NICE_SOCKET_TYPE_TCP_BSD &&
-+ (cand->transport == NICE_CANDIDATE_TRANSPORT_TCP_ACTIVE ||
-+ cand->transport == NICE_CANDIDATE_TRANSPORT_TCP_PASSIVE ||
-+ cand->transport == NICE_CANDIDATE_TRANSPORT_TCP_SO)) ||
-+ cand->transport == NICE_CANDIDATE_TRANSPORT_UDP) &&
-+ nice_address_equal (address, &cand->addr)) {
-+ /* fast return if it's already the first */
-+ if (item == component->valid_candidates)
-+ return TRUE;
-+
-+ /* Put the current candidate at the top so that in the normal use-case,
-+ * this function becomes O(1).
-+ */
-+ component->valid_candidates = g_list_remove_link (
-+ component->valid_candidates, item);
-+ component->valid_candidates = g_list_concat (item,
-+ component->valid_candidates);
-+
-+ return TRUE;
-+ }
-+ }
-+
-+ return FALSE;
-+}
-diff --git a/agent/component.h b/agent/component.h
-index 6712794..a8a1222 100644
---- a/agent/component.h
-+++ b/agent/component.h
-@@ -159,12 +159,14 @@ struct _NiceComponent {
- NiceComponentState state;
- GSList *local_candidates; /* list of NiceCandidate objs */
- GSList *remote_candidates; /* list of NiceCandidate objs */
-+ GList *valid_candidates; /* list of owned remote NiceCandidates that are part of valid pairs */
- GSList *socket_sources; /* list of SocketSource objs; must only grow monotonically */
- guint socket_sources_age; /* incremented when socket_sources changes */
- GSList *incoming_checks; /* list of IncomingCheck objs */
- GList *turn_servers; /* List of TurnServer objs */
- CandidatePair selected_pair; /* independent from checklists,
- see ICE 11.1. "Sending Media" (ID-19) */
-+ gboolean fallback_mode; /* in this case, accepts packets from all, ignore candidate validation */
- NiceCandidate *restart_candidate; /* for storing active remote candidate during a restart */
- NiceCandidate *turn_candidate; /* for storing active turn candidate if turn servers have been cleared */
- /* I/O handling. The main context must always be non-NULL, and is used for all
-@@ -301,6 +303,14 @@ turn_server_ref (TurnServer *turn);
- void
- turn_server_unref (TurnServer *turn);
-
-+void
-+nice_component_add_valid_candidate (NiceComponent *component,
-+ const NiceCandidate *candidate);
-+
-+gboolean
-+nice_component_verify_remote_candidate (NiceComponent *component,
-+ const NiceAddress *address, NiceSocket *nicesock);
-+
-
- G_END_DECLS
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 1dc13dd..7ffa3db 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -2627,6 +2627,7 @@ static CandidateCheckPair *priv_process_response_check_for_reflexive(NiceAgent *
- p->state = NICE_CHECK_SUCCEEDED;
- nice_debug ("Agent %p : conncheck %p SUCCEEDED.", agent, p);
- priv_conn_check_unfreeze_related (agent, stream, p);
-+ nice_component_add_valid_candidate (component, remote_candidate);
- }
- else {
- if (!local_cand) {
-@@ -2652,8 +2653,10 @@ static CandidateCheckPair *priv_process_response_check_for_reflexive(NiceAgent *
-
- /* note: this is same as "adding to VALID LIST" in the spec
- text */
-- if (new_pair)
-+ if (new_pair) {
- new_pair->valid = TRUE;
-+ nice_component_add_valid_candidate (component, remote_candidate);
-+ }
-
- return new_pair;
- }
-@@ -2739,6 +2742,7 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, NiceStre
- nice_debug ("Agent %p : Mapped address not found."
- " conncheck %p SUCCEEDED.", agent, p);
- priv_conn_check_unfreeze_related (agent, stream, p);
-+ nice_component_add_valid_candidate (component, p->remote);
- } else {
- ok_pair = priv_process_response_check_for_reflexive (agent,
- stream, component, p, sockptr, &sockaddr.addr,
-@@ -3654,6 +3658,8 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *agent, NiceStream *stream,
- }
- }
-
-+ nice_component_add_valid_candidate (component, remote_candidate);
-+
- priv_reply_to_conn_check (agent, stream, component, local_candidate,
- remote_candidate, from, nicesock, rbuf_len, &msg, use_candidate);
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 7bfe075..d24a2aa 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -45,7 +45,6 @@ check_PROGRAMS = \
- test-send-recv \
- test-socket-is-based-on \
- test-priority \
-- test-mainloop \
- test-fullmode \
- test-restart \
- test-fallback \
-diff --git a/tests/test-mainloop.c b/tests/test-mainloop.c
-deleted file mode 100644
-index 7c52daa..0000000
---- a/tests/test-mainloop.c
-+++ /dev/null
-@@ -1,108 +0,0 @@
--/*
-- * This file is part of the Nice GLib ICE library.
-- *
-- * (C) 2006, 2007 Collabora Ltd.
-- * Contact: Dafydd Harries
-- * (C) 2006, 2007 Nokia Corporation. All rights reserved.
-- * Contact: Kai Vehmanen
-- *
-- * The contents of this file are subject to the Mozilla Public License Version
-- * 1.1 (the "License"); you may not use this file except in compliance with
-- * the License. You may obtain a copy of the License at
-- * http://www.mozilla.org/MPL/
-- *
-- * Software distributed under the License is distributed on an "AS IS" basis,
-- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-- * for the specific language governing rights and limitations under the
-- * License.
-- *
-- * The Original Code is the Nice GLib ICE library.
-- *
-- * The Initial Developers of the Original Code are Collabora Ltd and Nokia
-- * Corporation. All Rights Reserved.
-- *
-- * Contributors:
-- * Dafydd Harries, Collabora Ltd.
-- * Kai Vehmanen, Nokia
-- *
-- * Alternatively, the contents of this file may be used under the terms of the
-- * the GNU Lesser General Public License Version 2.1 (the "LGPL"), in which
-- * case the provisions of LGPL are applicable instead of those above. If you
-- * wish to allow use of your version of this file only under the terms of the
-- * LGPL and not to allow others to use your version of this file under the
-- * MPL, indicate your decision by deleting the provisions above and replace
-- * them with the notice and other provisions required by the LGPL. If you do
-- * not delete the provisions above, a recipient may use your version of this
-- * file under either the MPL or the LGPL.
-- */
--#ifdef HAVE_CONFIG_H
--# include <config.h>
--#endif
--
--#include <string.h>
--
--#include <nice/nice.h>
--#include "socket/socket.h"
--
--static GMainLoop *loop = NULL;
--
--static void
--recv_cb (
-- NiceAgent *agent,
-- guint stream_id,
-- guint component_id,
-- guint len,
-- gchar *buf,
-- gpointer data)
--{
-- g_assert (agent != NULL);
-- g_assert (stream_id == 1);
-- g_assert (component_id == 1);
-- g_assert (len == 6);
-- g_assert (0 == strncmp (buf, "\x80hello", len));
-- g_assert (42 == GPOINTER_TO_UINT (data));
-- g_main_loop_quit (loop);
--}
--
--int
--main (void)
--{
-- NiceAgent *agent;
-- NiceAddress addr;
-- guint stream;
--
-- nice_address_init (&addr);
--
-- loop = g_main_loop_new (NULL, FALSE);
--
-- agent = nice_agent_new (g_main_loop_get_context (loop), NICE_COMPATIBILITY_RFC5245);
-- nice_address_set_ipv4 (&addr, 0x7f000001);
-- nice_agent_add_local_address (agent, &addr);
-- stream = nice_agent_add_stream (agent, 1);
-- nice_agent_gather_candidates (agent, stream);
--
-- // attach to default main context
-- nice_agent_attach_recv (agent, stream, NICE_COMPONENT_TYPE_RTP,
-- g_main_loop_get_context (loop), recv_cb, GUINT_TO_POINTER (42));
--
-- {
-- NiceCandidate *candidate;
-- GSList *candidates, *i;
--
-- candidates = nice_agent_get_local_candidates (agent, 1, 1);
-- candidate = candidates->data;
--
-- nice_socket_send (candidate->sockptr, &(candidate->addr), 6, "\x80hello");
-- for (i = candidates; i; i = i->next)
-- nice_candidate_free ((NiceCandidate *) i->data);
-- g_slist_free (candidates);
-- }
--
-- g_main_loop_run (loop);
--
-- nice_agent_remove_stream (agent, stream);
-- g_object_unref (agent);
--
-- return 0;
--}
--
---
-2.13.6
-
-
-From 8fc22b0034d04cbc222e0637152b1cee2879eef3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Wed, 5 Apr 2017 17:43:26 -0400
-Subject: [PATCH 14/70] tests_: Add test to verify that only packets from
- validated addresses pass
-
-https://phabricator.freedesktop.org/T104
-
-Reviewed-by: Philip Withnall <philip.withnall(a)collabora.co.uk>
-Differential Revision: https://phabricator.freedesktop.org/D1717
----
- tests/Makefile.am | 5 +-
- tests/test-drop-invalid.c | 517 ++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 521 insertions(+), 1 deletion(-)
- create mode 100644 tests/test-drop-invalid.c
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index d24a2aa..62d5d64 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -54,7 +54,8 @@ check_PROGRAMS = \
- test-tcp \
- test-icetcp \
- test-credentials \
-- test-turn
-+ test-turn \
-+ test-drop-invalid
-
- dist_check_SCRIPTS = \
- check-test-fullmode-with-stun.sh \
-@@ -128,6 +129,8 @@ test_credentials_LDADD = $(COMMON_LDADD)
-
- test_turn_LDADD = $(COMMON_LDADD)
-
-+test_drop_invalid_LDADD = $(COMMON_LDADD)
-+
- test_gstreamer_CFLAGS = $(AM_CFLAGS) $(GST_CHECK_CFLAGS)
- test_gstreamer_LDADD = -lnice -L$(top_builddir)/nice/.libs $(GLIB_LIBS) $(GUPNP_LIBS) $(GST_CHECK_LIBS) $(GST_LIBS)
-
-diff --git a/tests/test-drop-invalid.c b/tests/test-drop-invalid.c
-new file mode 100644
-index 0000000..97e3586
---- /dev/null
-+++ b/tests/test-drop-invalid.c
-@@ -0,0 +1,517 @@
-+/*
-+ * This file is part of the Nice GLib ICE library.
-+ *
-+ * Unit test for ICE full-mode related features.
-+ *
-+ * (C) 2007 Nokia Corporation. All rights reserved.
-+ * Contact: Kai Vehmanen
-+ * (C) 2017 Collabora Ltd
-+ * Contact: Olivier Crete <olivier.crete(a)collabora.com>
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is the Nice GLib ICE library.
-+ *
-+ * The Initial Developers of the Original Code are Collabora Ltd and Nokia
-+ * Corporation. All Rights Reserved.
-+ *
-+ * Contributors:
-+ * Kai Vehmanen, Nokia
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of the
-+ * the GNU Lesser General Public License Version 2.1 (the "LGPL"), in which
-+ * case the provisions of LGPL are applicable instead of those above. If you
-+ * wish to allow use of your version of this file only under the terms of the
-+ * LGPL and not to allow others to use your version of this file under the
-+ * MPL, indicate your decision by deleting the provisions above and replace
-+ * them with the notice and other provisions required by the LGPL. If you do
-+ * not delete the provisions above, a recipient may use your version of this
-+ * file under either the MPL or the LGPL.
-+ */
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "agent.h"
-+
-+#include "socket/socket.h"
-+
-+#include <stdlib.h>
-+#include <string.h>
-+
-+
-+
-+static NiceComponentState global_lagent_state[2] = { NICE_COMPONENT_STATE_LAST, NICE_COMPONENT_STATE_LAST };
-+static NiceComponentState global_ragent_state[2] = { NICE_COMPONENT_STATE_LAST, NICE_COMPONENT_STATE_LAST };
-+static guint global_components_ready = 0;
-+static guint global_components_ready_exit = 0;
-+static guint global_components_failed = 0;
-+static guint global_components_failed_exit = 0;
-+static GMainLoop *global_mainloop = NULL;
-+static gboolean global_lagent_gathering_done = FALSE;
-+static gboolean global_ragent_gathering_done = FALSE;
-+static gboolean global_lagent_ibr_received = FALSE;
-+static gboolean global_ragent_ibr_received = FALSE;
-+static int global_lagent_cands = 0;
-+static int global_ragent_cands = 0;
-+static gint global_ragent_read = 0;
-+static guint global_exit_when_ibr_received = 0;
-+
-+static void priv_print_global_status (void)
-+{
-+ g_debug ("\tgathering_done=%d", global_lagent_gathering_done && global_ragent_gathering_done);
-+ g_debug ("\tlstate[rtp]=%d [rtcp]=%d", global_lagent_state[0], global_lagent_state[1]);
-+ g_debug ("\trstate[rtp]=%d [rtcp]=%d", global_ragent_state[0], global_ragent_state[1]);
-+ g_debug ("\tL cands=%d R cands=%d", global_lagent_cands, global_ragent_cands);
-+}
-+
-+static gboolean timer_cb (gpointer pointer)
-+{
-+ g_debug ("test-drop-invalid:%s: %p", G_STRFUNC, pointer);
-+
-+ /* signal status via a global variable */
-+
-+ /* note: should not be reached, abort */
-+ g_error ("ERROR: test has got stuck, aborting...");
-+
-+ return FALSE;
-+}
-+
-+static void cb_nice_recv (NiceAgent *agent, guint stream_id, guint component_id, guint len, gchar *buf, gpointer user_data)
-+{
-+ g_debug ("test-drop-invalid:%s: %p", G_STRFUNC, user_data);
-+
-+ /* XXX: dear compiler, these are for you: */
-+ (void)agent; (void)stream_id; (void)component_id; (void)buf;
-+
-+ /* Core of the test
-+ * Assert on any unreleated packet received. This would include anything
-+ * send before the negotiation is over.
-+ */
-+ g_assert (len == 16);
-+ g_assert (strncmp ("1234567812345678", buf, 16) == 0);
-+
-+ if (component_id == 2)
-+ return;
-+
-+ if (GPOINTER_TO_UINT (user_data) == 2) {
-+ g_debug ("right agent received %d bytes, stopping mainloop", len);
-+ global_ragent_read = len;
-+ g_main_loop_quit (global_mainloop);
-+ }
-+}
-+
-+static void cb_candidate_gathering_done(NiceAgent *agent, guint stream_id, gpointer data)
-+{
-+ g_debug ("test-drop-invalid:%s: %p", G_STRFUNC, data);
-+
-+ if (GPOINTER_TO_UINT (data) == 1)
-+ global_lagent_gathering_done = TRUE;
-+ else if (GPOINTER_TO_UINT (data) == 2)
-+ global_ragent_gathering_done = TRUE;
-+
-+ if (global_lagent_gathering_done &&
-+ global_ragent_gathering_done)
-+ g_main_loop_quit (global_mainloop);
-+
-+ /* XXX: dear compiler, these are for you: */
-+ (void)agent;
-+}
-+
-+static void cb_component_state_changed (NiceAgent *agent, guint stream_id, guint component_id, guint state, gpointer data)
-+{
-+ gboolean ready_to_connected = FALSE;
-+ g_debug ("test-drop-invalid:%s: %p", G_STRFUNC, data);
-+
-+ if (GPOINTER_TO_UINT (data) == 1) {
-+ if (global_lagent_state[component_id - 1] == NICE_COMPONENT_STATE_READY &&
-+ state == NICE_COMPONENT_STATE_CONNECTED)
-+ ready_to_connected = TRUE;
-+ global_lagent_state[component_id - 1] = state;
-+ } else if (GPOINTER_TO_UINT (data) == 2) {
-+ if (global_ragent_state[component_id - 1] == NICE_COMPONENT_STATE_READY &&
-+ state == NICE_COMPONENT_STATE_CONNECTED)
-+ ready_to_connected = TRUE;
-+ global_ragent_state[component_id - 1] = state;
-+ }
-+
-+ if (state == NICE_COMPONENT_STATE_READY)
-+ global_components_ready++;
-+ else if (state == NICE_COMPONENT_STATE_CONNECTED && ready_to_connected)
-+ global_components_ready--;
-+ if (state == NICE_COMPONENT_STATE_FAILED)
-+ global_components_failed++;
-+
-+ g_debug ("test-drop-invalid: checks READY/EXIT-AT %u/%u.", global_components_ready, global_components_ready_exit);
-+ g_debug ("test-drop-invalid: checks FAILED/EXIT-AT %u/%u.", global_components_failed, global_components_failed_exit);
-+
-+ /* signal status via a global variable */
-+ if (global_components_ready == global_components_ready_exit &&
-+ global_components_failed == global_components_failed_exit) {
-+ g_debug ("Components ready/failed achieved. Stopping mailoop");
-+ g_main_loop_quit (global_mainloop);
-+ return;
-+ }
-+
-+ /* XXX: dear compiler, these are for you: */
-+ (void)agent; (void)stream_id; (void)data; (void)component_id;
-+}
-+
-+static void cb_new_selected_pair(NiceAgent *agent, guint stream_id, guint component_id,
-+ gchar *lfoundation, gchar* rfoundation, gpointer data)
-+{
-+ g_debug ("test-drop-invalid:%s: %p", G_STRFUNC, data);
-+
-+ if (GPOINTER_TO_UINT (data) == 1)
-+ ++global_lagent_cands;
-+ else if (GPOINTER_TO_UINT (data) == 2)
-+ ++global_ragent_cands;
-+
-+ /* XXX: dear compiler, these are for you: */
-+ (void)agent; (void)stream_id; (void)component_id; (void)lfoundation; (void)rfoundation;
-+}
-+
-+static void cb_new_candidate(NiceAgent *agent, guint stream_id, guint component_id,
-+ gchar *foundation, gpointer data)
-+{
-+ g_debug ("test-drop-invalid:%s: %p", G_STRFUNC, data);
-+
-+ /* XXX: dear compiler, these are for you: */
-+ (void)agent; (void)stream_id; (void)data; (void)component_id; (void)foundation;
-+}
-+
-+static void cb_initial_binding_request_received(NiceAgent *agent, guint stream_id, gpointer data)
-+{
-+ g_debug ("test-drop-invalid:%s: %p", G_STRFUNC, data);
-+
-+ if (GPOINTER_TO_UINT (data) == 1)
-+ global_lagent_ibr_received = TRUE;
-+ else if (GPOINTER_TO_UINT (data) == 2)
-+ global_ragent_ibr_received = TRUE;
-+
-+ if (global_exit_when_ibr_received) {
-+ g_debug ("Received initial binding request. Stopping mailoop");
-+ g_main_loop_quit (global_mainloop);
-+ }
-+
-+ /* XXX: dear compiler, these are for you: */
-+ (void)agent; (void)stream_id; (void)data;
-+}
-+
-+static void set_candidates (NiceAgent *from, guint from_stream,
-+ NiceAgent *to, guint to_stream, guint component)
-+{
-+ GSList *cands = NULL;
-+ GSList *peer_cands = NULL;
-+ GSList *item1, *item2;
-+
-+ cands = nice_agent_get_local_candidates (from, from_stream, component);
-+ peer_cands = nice_agent_get_local_candidates (to, to_stream, component);
-+
-+ /*
-+ * Core of the test:
-+ *
-+ * Send packets that shoudl be dropped.
-+ */
-+
-+ for (item1 = cands; item1; item1 = item1->next) {
-+ NiceCandidate *cand = item1->data;
-+ NiceSocket *nicesock = cand->sockptr;
-+
-+ g_assert (nicesock);
-+
-+ for (item2 = peer_cands; item2; item2 = item2->next) {
-+ NiceCandidate *target_cand = item2->data;
-+
-+ nice_socket_send (nicesock, &target_cand->addr, 12, "123456789AB");
-+ }
-+
-+ }
-+
-+ nice_agent_set_remote_candidates (to, to_stream, component, cands);
-+
-+ g_slist_free_full (cands, (GDestroyNotify) nice_candidate_free);
-+ g_slist_free_full (peer_cands, (GDestroyNotify) nice_candidate_free);
-+}
-+
-+static void set_credentials (NiceAgent *lagent, guint lstream,
-+ NiceAgent *ragent, guint rstream)
-+{
-+ gchar *ufrag = NULL, *password = NULL;
-+
-+ nice_agent_get_local_credentials(lagent, lstream, &ufrag, &password);
-+ nice_agent_set_remote_credentials (ragent, rstream, ufrag, password);
-+ g_free (ufrag);
-+ g_free (password);
-+ nice_agent_get_local_credentials(ragent, rstream, &ufrag, &password);
-+ nice_agent_set_remote_credentials (lagent, lstream, ufrag, password);
-+ g_free (ufrag);
-+ g_free (password);
-+}
-+
-+static int run_full_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress *baseaddr, guint ready, guint failed)
-+{
-+ guint ls_id, rs_id;
-+ gint ret;
-+
-+ /* XXX: dear compiler, this is for you */
-+ (void)baseaddr;
-+
-+ /* step: initialize variables modified by the callbacks */
-+ global_components_ready = 0;
-+ global_components_ready_exit = ready;
-+ global_components_failed = 0;
-+ global_components_failed_exit = failed;
-+ global_lagent_gathering_done = FALSE;
-+ global_ragent_gathering_done = FALSE;
-+ global_lagent_ibr_received =
-+ global_ragent_ibr_received = FALSE;
-+ global_lagent_cands =
-+ global_ragent_cands = 0;
-+
-+ g_object_set (G_OBJECT (lagent), "controlling-mode", TRUE, NULL);
-+ g_object_set (G_OBJECT (ragent), "controlling-mode", FALSE, NULL);
-+
-+ /* step: add one stream, with RTP+RTCP components, to each agent */
-+ ls_id = nice_agent_add_stream (lagent, 2);
-+
-+ rs_id = nice_agent_add_stream (ragent, 2);
-+ g_assert (ls_id > 0);
-+ g_assert (rs_id > 0);
-+
-+ /* Gather candidates and test nice_agent_set_port_range */
-+ nice_agent_set_port_range (lagent, ls_id, 1, 10000, 10000);
-+ nice_agent_set_port_range (lagent, ls_id, 2, 10001, 10001);
-+ nice_agent_set_port_range (ragent, rs_id, 1, 12345, 12345);
-+ nice_agent_set_port_range (ragent, rs_id, 2, 10000, 10001);
-+ g_assert (nice_agent_gather_candidates (lagent, ls_id) == TRUE);
-+ g_assert (nice_agent_gather_candidates (ragent, rs_id) == FALSE);
-+ g_assert (nice_agent_get_local_candidates (ragent, rs_id, 1) == NULL);
-+ g_assert (nice_agent_get_local_candidates (ragent, rs_id, 2) == NULL);
-+ nice_agent_set_port_range (ragent, rs_id, 2, 10000, 10002);
-+ g_assert (nice_agent_gather_candidates (ragent, rs_id) == TRUE);
-+
-+ {
-+ GSList *cands = NULL, *i;
-+ NiceCandidate *cand = NULL;
-+
-+ cands = nice_agent_get_local_candidates (lagent, ls_id, 1);
-+ g_assert (g_slist_length (cands) == 1);
-+ cand = cands->data;
-+ g_assert (cand->type == NICE_CANDIDATE_TYPE_HOST);
-+ g_assert (nice_address_get_port (&cand->addr) == 10000);
-+ for (i = cands; i; i = i->next)
-+ nice_candidate_free ((NiceCandidate *) i->data);
-+ g_slist_free (cands);
-+
-+ cands = nice_agent_get_local_candidates (lagent, ls_id, 2);
-+ g_assert (g_slist_length (cands) == 1);
-+ cand = cands->data;
-+ g_assert (cand->type == NICE_CANDIDATE_TYPE_HOST);
-+ g_assert (nice_address_get_port (&cand->addr) == 10001);
-+ for (i = cands; i; i = i->next)
-+ nice_candidate_free ((NiceCandidate *) i->data);
-+ g_slist_free (cands);
-+
-+ cands = nice_agent_get_local_candidates (ragent, rs_id, 1);
-+ g_assert (g_slist_length (cands) == 1);
-+ cand = cands->data;
-+ g_assert (cand->type == NICE_CANDIDATE_TYPE_HOST);
-+ g_assert (nice_address_get_port (&cand->addr) == 12345);
-+ for (i = cands; i; i = i->next)
-+ nice_candidate_free ((NiceCandidate *) i->data);
-+ g_slist_free (cands);
-+
-+ cands = nice_agent_get_local_candidates (ragent, rs_id, 2);
-+ g_assert (g_slist_length (cands) == 1);
-+ cand = cands->data;
-+ g_assert (cand->type == NICE_CANDIDATE_TYPE_HOST);
-+ g_assert (nice_address_get_port (&cand->addr) == 10002);
-+ for (i = cands; i; i = i->next)
-+ nice_candidate_free ((NiceCandidate *) i->data);
-+ g_slist_free (cands);
-+
-+ }
-+
-+ /* step: attach to mainloop (needed to register the fds) */
-+ nice_agent_attach_recv (lagent, ls_id, NICE_COMPONENT_TYPE_RTP,
-+ g_main_loop_get_context (global_mainloop), cb_nice_recv,
-+ GUINT_TO_POINTER (1));
-+ nice_agent_attach_recv (lagent, ls_id, NICE_COMPONENT_TYPE_RTCP,
-+ g_main_loop_get_context (global_mainloop), cb_nice_recv,
-+ GUINT_TO_POINTER (1));
-+ nice_agent_attach_recv (ragent, rs_id, NICE_COMPONENT_TYPE_RTP,
-+ g_main_loop_get_context (global_mainloop), cb_nice_recv,
-+ GUINT_TO_POINTER (2));
-+ nice_agent_attach_recv (ragent, rs_id, NICE_COMPONENT_TYPE_RTCP,
-+ g_main_loop_get_context (global_mainloop), cb_nice_recv,
-+ GUINT_TO_POINTER (2));
-+
-+ /* step: run mainloop until local candidates are ready
-+ * (see timer_cb() above) */
-+ if (global_lagent_gathering_done != TRUE ||
-+ global_ragent_gathering_done != TRUE) {
-+ g_debug ("test-drop-invalid: Added streams, running mainloop until 'candidate-gathering-done'...");
-+ g_main_loop_run (global_mainloop);
-+ g_assert (global_lagent_gathering_done == TRUE);
-+ g_assert (global_ragent_gathering_done == TRUE);
-+ }
-+
-+ set_credentials (lagent, ls_id, ragent, rs_id);
-+
-+ /* step: pass the remote candidates to agents */
-+ set_candidates (ragent, rs_id, lagent, ls_id, NICE_COMPONENT_TYPE_RTP);
-+ set_candidates (ragent, rs_id, lagent, ls_id, NICE_COMPONENT_TYPE_RTCP);
-+ set_candidates (lagent, ls_id, ragent, rs_id, NICE_COMPONENT_TYPE_RTP);
-+ set_candidates (lagent, ls_id, ragent, rs_id, NICE_COMPONENT_TYPE_RTCP);
-+
-+ g_debug ("test-drop-invalid: Set properties, next running mainloop until connectivity checks succeed...");
-+
-+ /* step: run the mainloop until connectivity checks succeed
-+ * (see timer_cb() above) */
-+ g_main_loop_run (global_mainloop);
-+
-+ /* note: verify that STUN binding requests were sent */
-+ g_assert (global_lagent_ibr_received == TRUE);
-+ g_assert (global_ragent_ibr_received == TRUE);
-+
-+ /* note: Send a packet from another address */
-+ /* These should also be ignored */
-+ {
-+ NiceCandidate *local_cand = NULL;
-+ NiceCandidate *remote_cand = NULL;
-+ NiceSocket *tmpsock;
-+
-+ g_assert (nice_agent_get_selected_pair (lagent, ls_id, 1, &local_cand,
-+ &remote_cand));
-+ g_assert (local_cand);
-+ g_assert (remote_cand);
-+
-+ tmpsock = nice_udp_bsd_socket_new (NULL);
-+ nice_socket_send (tmpsock, &remote_cand->addr, 4, "ABCD");
-+ nice_socket_send (tmpsock, &local_cand->addr, 5, "ABCDE");
-+ nice_socket_free (tmpsock);
-+ }
-+
-+ /* note: test payload send and receive */
-+ global_ragent_read = 0;
-+ ret = nice_agent_send (lagent, ls_id, 1, 16, "1234567812345678");
-+ g_assert (ret != -1);
-+ g_debug ("Sent %d bytes", ret);
-+ g_assert (ret == 16);
-+ while (global_ragent_read != 16)
-+ g_main_context_iteration (NULL, TRUE);
-+ g_assert (global_ragent_read == 16);
-+
-+ g_debug ("test-drop-invalid: Ran mainloop, removing streams...");
-+
-+ /* step: clean up resources and exit */
-+
-+ nice_agent_remove_stream (lagent, ls_id);
-+ nice_agent_remove_stream (ragent, rs_id);
-+
-+ return 0;
-+}
-+
-+int main (void)
-+{
-+ NiceAgent *lagent, *ragent; /* agent's L and R */
-+ NiceAddress baseaddr;
-+ int result;
-+ guint timer_id;
-+
-+#ifdef G_OS_WIN32
-+ WSADATA w;
-+
-+ WSAStartup(0x0202, &w);
-+#endif
-+
-+ global_mainloop = g_main_loop_new (NULL, FALSE);
-+
-+ /* step: create the agents L and R */
-+ lagent = nice_agent_new (g_main_loop_get_context (global_mainloop),
-+ NICE_COMPATIBILITY_RFC5245);
-+ ragent = nice_agent_new (g_main_loop_get_context (global_mainloop),
-+ NICE_COMPATIBILITY_RFC5245);
-+
-+ g_object_set (G_OBJECT (lagent), "ice-tcp", FALSE, NULL);
-+ g_object_set (G_OBJECT (ragent), "ice-tcp", FALSE, NULL);
-+
-+
-+ nice_agent_set_software (lagent, "test-drop-invalid, Left Agent");
-+ nice_agent_set_software (ragent, "test-drop-invalid, Right Agent");
-+
-+ /* step: add a timer to catch state changes triggered by signals */
-+ timer_id = g_timeout_add (30000, timer_cb, NULL);
-+
-+ /* step: specify which local interface to use */
-+ if (!nice_address_set_from_string (&baseaddr, "127.0.0.1"))
-+ g_assert_not_reached ();
-+ nice_agent_add_local_address (lagent, &baseaddr);
-+ nice_agent_add_local_address (ragent, &baseaddr);
-+
-+ g_signal_connect (G_OBJECT (lagent), "candidate-gathering-done",
-+ G_CALLBACK (cb_candidate_gathering_done), GUINT_TO_POINTER(1));
-+ g_signal_connect (G_OBJECT (ragent), "candidate-gathering-done",
-+ G_CALLBACK (cb_candidate_gathering_done), GUINT_TO_POINTER (2));
-+ g_signal_connect (G_OBJECT (lagent), "component-state-changed",
-+ G_CALLBACK (cb_component_state_changed), GUINT_TO_POINTER (1));
-+ g_signal_connect (G_OBJECT (ragent), "component-state-changed",
-+ G_CALLBACK (cb_component_state_changed), GUINT_TO_POINTER (2));
-+ g_signal_connect (G_OBJECT (lagent), "new-selected-pair",
-+ G_CALLBACK (cb_new_selected_pair), GUINT_TO_POINTER(1));
-+ g_signal_connect (G_OBJECT (ragent), "new-selected-pair",
-+ G_CALLBACK (cb_new_selected_pair), GUINT_TO_POINTER (2));
-+ g_signal_connect (G_OBJECT (lagent), "new-candidate",
-+ G_CALLBACK (cb_new_candidate), GUINT_TO_POINTER (1));
-+ g_signal_connect (G_OBJECT (ragent), "new-candidate",
-+ G_CALLBACK (cb_new_candidate), GUINT_TO_POINTER (2));
-+ g_signal_connect (G_OBJECT (lagent), "initial-binding-request-received",
-+ G_CALLBACK (cb_initial_binding_request_received),
-+ GUINT_TO_POINTER (1));
-+ g_signal_connect (G_OBJECT (ragent), "initial-binding-request-received",
-+ G_CALLBACK (cb_initial_binding_request_received),
-+ GUINT_TO_POINTER (2));
-+
-+ g_object_set (G_OBJECT (lagent), "upnp", FALSE, NULL);
-+ g_object_set (G_OBJECT (ragent), "upnp", FALSE, NULL);
-+
-+
-+ /* step: run test the first time */
-+ g_debug ("test-drop-invalid: TEST STARTS / running test for the 1st time");
-+ result = run_full_test (lagent, ragent, &baseaddr, 4 ,0);
-+ priv_print_global_status ();
-+ g_assert (result == 0);
-+ g_assert (global_lagent_state[0] == NICE_COMPONENT_STATE_READY);
-+ g_assert (global_lagent_state[1] == NICE_COMPONENT_STATE_READY);
-+ g_assert (global_ragent_state[0] == NICE_COMPONENT_STATE_READY);
-+ g_assert (global_ragent_state[1] == NICE_COMPONENT_STATE_READY);
-+ /* When using TURN, we get peer reflexive candidates for the host cands
-+ that we removed so we can get another new_selected_pair signal later
-+ depending on timing/racing, we could double (or not) the amount we expected
-+ */
-+
-+ /* note: verify that correct number of local candidates were reported */
-+ g_assert (global_lagent_cands == 2);
-+ g_assert (global_ragent_cands == 2);
-+
-+ g_object_unref (lagent);
-+ g_object_unref (ragent);
-+
-+ g_main_loop_unref (global_mainloop);
-+ global_mainloop = NULL;
-+
-+ g_source_remove (timer_id);
-+#ifdef G_OS_WIN32
-+ WSACleanup();
-+#endif
-+ return result;
-+}
---
-2.13.6
-
-
-From f49ab88f957a3a250ef2ada0c0fab4fbbd3e5da8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Tue, 11 Apr 2017 16:42:55 -0400
-Subject: [PATCH 15/70] conncheck: Check the controlling state when the req was
- sent
-
-It was checking when the pair was created, but the role may have
-already changed when the request is sent.
----
- agent/conncheck.c | 30 +++++++++++++++++++-----------
- agent/conncheck.h | 1 -
- 2 files changed, 19 insertions(+), 12 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 7ffa3db..5501c2b 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -1666,7 +1666,6 @@ static CandidateCheckPair *priv_add_new_check_pair (NiceAgent *agent,
- tmpbuf2, nice_address_get_port (&pair->remote->addr));
- }
- pair->nominated = use_candidate;
-- pair->controlling = agent->controlling_mode;
- pair->prflx_priority = ensure_unique_priority (component,
- peer_reflexive_candidate_priority (agent, local));
-
-@@ -2531,7 +2530,6 @@ static CandidateCheckPair *priv_add_peer_reflexive_pair (NiceAgent *agent, guint
- pair->priority = nice_candidate_pair_priority (pair->remote->priority,
- pair->local->priority);
- pair->nominated = FALSE;
-- pair->controlling = agent->controlling_mode;
- pair->prflx_priority = ensure_unique_priority (component,
- peer_reflexive_candidate_priority (agent, local_cand));
- nice_debug ("Agent %p : added a new peer-discovered pair with foundation of '%s'.", agent, pair->foundation);
-@@ -2777,16 +2775,26 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, NiceStre
- } else if (res == STUN_USAGE_ICE_RETURN_ROLE_CONFLICT) {
- /* case: role conflict error, need to restart with new role */
- nice_debug ("Agent %p : conncheck %p ROLE CONFLICT, restarting", agent, p);
-- /* note: our role might already have changed due to an
-- * incoming request, but if not, change role now;
-- * follows ICE 7.1.2.1 "Failure Cases" (ID-19) */
-- priv_check_for_role_conflict (agent, !p->controlling);
-
-- p->stun_message.buffer = NULL;
-- p->stun_message.buffer_len = 0;
-- p->state = NICE_CHECK_WAITING;
-- priv_add_pair_to_triggered_check_queue (agent, p);
-- nice_debug ("Agent %p : pair %p state WAITING", agent, p);
-+ if (p->stun_message.buffer != NULL) {
-+ guint64 tie;
-+ gboolean controlled_mode;
-+
-+ /* note: our role might already have changed due to an
-+ * incoming request, but if not, change role now;
-+ * follows ICE 7.1.2.1 "Failure Cases" (ID-19) */
-+ controlled_mode = (stun_message_find64 (&p->stun_message,
-+ STUN_ATTRIBUTE_ICE_CONTROLLED, &tie) ==
-+ STUN_MESSAGE_RETURN_SUCCESS);
-+
-+ priv_check_for_role_conflict (agent, controlled_mode);
-+
-+ p->stun_message.buffer = NULL;
-+ p->stun_message.buffer_len = 0;
-+ p->state = NICE_CHECK_WAITING;
-+ priv_add_pair_to_triggered_check_queue (agent, p);
-+ nice_debug ("Agent %p : pair %p state WAITING", agent, p);
-+ }
- trans_found = TRUE;
- } else {
- /* case: STUN error, the check STUN context was freed */
-diff --git a/agent/conncheck.h b/agent/conncheck.h
-index 10319cc..c204475 100644
---- a/agent/conncheck.h
-+++ b/agent/conncheck.h
-@@ -85,7 +85,6 @@ struct _CandidateCheckPair
- gchar foundation[NICE_CANDIDATE_PAIR_MAX_FOUNDATION];
- NiceCheckState state;
- gboolean nominated;
-- gboolean controlling;
- gboolean timer_restarted;
- gboolean valid;
- guint64 priority;
---
-2.13.6
-
-
-From b0538d8c51f65019867b56a45cf90a70bef38f01 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Tue, 11 Apr 2017 18:31:21 -0400
-Subject: [PATCH 16/70] agent: Ignore remote candidate of non-accepted types
-
-If we disable ice-tcp or ice-udp, ignore the remote
-candidates for those types.
----
- agent/agent.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/agent/agent.c b/agent/agent.c
-index eff62f0..77fb1eb 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -3112,6 +3112,13 @@ static gboolean priv_add_remote_candidate (
- NiceComponent *component;
- NiceCandidate *candidate;
-
-+ if (transport == NICE_CANDIDATE_TRANSPORT_UDP &&
-+ !agent->use_ice_udp)
-+ return FALSE;
-+ if (transport != NICE_CANDIDATE_TRANSPORT_UDP &&
-+ !agent->use_ice_tcp)
-+ return FALSE;
-+
- if (!agent_find_component (agent, stream_id, component_id, NULL, &component))
- return FALSE;
-
---
-2.13.6
-
-
-From f6f704c5e8d2193bc67ba2b697c77694e1698c43 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Thu, 9 Jun 2016 22:22:33 +0200
-Subject: [PATCH 17/70] stun timer: fix timeout of the last retransmission
-
-According to RFC 5389, section 7.2.1, a special timeout is applied to
-the last retransmission (Rm * RTO), with Rm default value of 16, instead
-of (64 * RTO), 2^6 when the number of transmissions Rc is set to 7.
-
-As spotted by Olivier Crete, stun_timer_* is a public API, that cannot
-be changed, and the initial delay (RTO) is not preserved in the
-stun_timer_s struct. So we use a hack that implicitely guess Rm from the
-number of transmissions Rc, by generalizing the default value of the
-spec for Rm and Rc to other values of Rc passed in stun_timer_start(
-
-According to the spec, with the default value of Rc=7, the last delay
-should be (64 * RTO), and it is instead (16 * RTO). So the last delay
-can be computed by dividing the penultimate delay by two, instead of
-multiplying it by two.
-
-Differential Revision: https://phabricator.freedesktop.org/D1108
----
- stun/usages/timer.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/stun/usages/timer.c b/stun/usages/timer.c
-index 2862ab8..5370cba 100644
---- a/stun/usages/timer.c
-+++ b/stun/usages/timer.c
-@@ -145,7 +145,11 @@ StunUsageTimerReturn stun_timer_refresh (StunTimer *timer)
- if (timer->retransmissions >= timer->max_retransmissions)
- return STUN_USAGE_TIMER_RETURN_TIMEOUT;
-
-- add_delay (&timer->deadline, timer->delay *= 2);
-+ if (timer->retransmissions == timer->max_retransmissions - 1)
-+ timer->delay = timer->delay / 2;
-+ else
-+ timer->delay = timer->delay * 2;
-+ add_delay (&timer->deadline, timer->delay);
- timer->retransmissions++;
- return STUN_USAGE_TIMER_RETURN_RETRANSMIT;
- }
---
-2.13.6
-
-
-From 0a2cb0a9b14a5a1a4b01ba68ab2e5a2aa965f342 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 5 Apr 2016 21:32:39 +0200
-Subject: [PATCH 18/70] agent: do not create a GSource for UDP TURN socket
-
-With this patch, we don't create a new GSource for udp-turn socket,
-because it would duplicate the packets already received on the base UDP
-socket, as the underlying GSocket is the same. This is a race condition,
-because an UDP packet arriving on the base socket, may randomly be
-handled by the GSource callback created for the base socket (udp-bsd) of
-the callback created for the udp-turn socket. Moreover this callback
-already knows how to parse UDP datagrams received from a known turn
-server.
-
-This patch also prevents a subtle bug, when a STUN request is received
-directly from a peer, is handled by the udp turn socket. If the agent
-already has a valid permission for this remote candidate, established
-for another pair, it will happily send the STUN reply through the turn
-relay. This generates a source address mismatch on the peer agent, when
-it'll receive the STUN response from the turn relay instead of the
-initial address the request has been sent to.
-
-Differential Revision: https://phabricator.freedesktop.org/D932
----
- agent/component.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/agent/component.c b/agent/component.c
-index ba28ffa..ab665b6 100644
---- a/agent/component.c
-+++ b/agent/component.c
-@@ -105,6 +105,13 @@ socket_source_attach (SocketSource *socket_source, GMainContext *context)
- if (socket_source->socket->fileno == NULL)
- return;
-
-+ /* Do not create a GSource for UDP turn socket, because it
-+ * would duplicate the packets already received on the base
-+ * UDP socket.
-+ */
-+ if (socket_source->socket->type == NICE_SOCKET_TYPE_UDP_TURN)
-+ return;
-+
- /* Create a source. */
- source = g_socket_create_source (socket_source->socket->fileno,
- G_IO_IN, NULL);
---
-2.13.6
-
-
-From d5446a72233eab8501be0b3fb9060c8be3ba034b Mon Sep 17 00:00:00 2001
-From: Philip Withnall <withnall(a)endlessm.com>
-Date: Mon, 1 May 2017 08:51:40 +0100
-Subject: [PATCH 19/70] examples: Stop installing the examples
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There’s no point in installing them; their benefit is in providing
-example code to developers.
-
-Debian doesn’t package them; Fedora packages them in a separate
-subpackage which will have to disappear.
-
-Signed-off-by: Philip Withnall <withnall(a)endlessm.com>
-Reviewed-by: Olivier Crête <olivier.crete(a)collabora.com>
-Differential Revision: https://phabricator.freedesktop.org/D1737
----
- examples/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index 1e7decf..9c80854 100644
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -18,7 +18,7 @@ AM_CFLAGS = \
- $(GLIB_CFLAGS) \
- $(GUPNP_CFLAGS)
-
--bin_PROGRAMS = simple-example threaded-example sdp-example
-+noinst_PROGRAMS = simple-example threaded-example sdp-example
-
- simple_example_SOURCES = simple-example.c
- simple_example_LDADD = $(top_builddir)/agent/libagent.la \
---
-2.13.6
-
-
-From b4abda09c79e4ce372a3771300abf568c85c7ff5 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Thu, 21 Apr 2016 18:18:59 +0200
-Subject: [PATCH 20/70] interfaces: ignore predefined network interfaces
-
-Some interfaces, like the one managed by libvirtd to provide a network
-bridge to locally hosted virtual machines, can be completely ignored
-when gathering ICE candidates. The motivation for adding this
-possibility is that, ignoring them doesn't remove capabilities, and
-improves the overall speed of the connection check method, by reducing
-the number of pairs to be tested. This patch adds the possibility to
-define such interfaces in the configuration script.
-
-Differential Revision: https://phabricator.freedesktop.org/D948
----
- agent/interfaces.c | 6 ++++++
- configure.ac | 14 ++++++++++++++
- 2 files changed, 20 insertions(+)
-
-diff --git a/agent/interfaces.c b/agent/interfaces.c
-index 0fa2fd7..a81888e 100644
---- a/agent/interfaces.c
-+++ b/agent/interfaces.c
-@@ -276,6 +276,12 @@ nice_interfaces_get_local_ips (gboolean include_loopback)
- nice_debug ("Ignoring loopback interface");
- g_free (addr_string);
- }
-+#ifdef IGNORED_IFACE_PREFIX
-+ } else if (g_str_has_prefix (ifa->ifa_name, IGNORED_IFACE_PREFIX)) {
-+ nice_debug ("Ignoring interface %s as it matches prefix %s",
-+ ifa->ifa_name, IGNORED_IFACE_PREFIX);
-+ g_free (addr_string);
-+#endif
- } else {
- if (nice_interfaces_is_private_ip (ifa->ifa_addr))
- ips = add_ip_to_list (ips, addr_string, TRUE);
-diff --git a/configure.ac b/configure.ac
-index b39bfe3..98bbc08 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -354,6 +354,20 @@ AM_CONDITIONAL([ENABLE_GTK_DOC], false)
- # GObject introspection
- GOBJECT_INTROSPECTION_CHECK([1.30.0])
-
-+dnl Ignore a specific network interface name prefix from the connection check
-+AC_MSG_CHECKING([whether to ignore a specific network interface name prefix])
-+AC_ARG_WITH([ignored-network-interface-prefix],
-+ [AS_HELP_STRING([--with-ignored-network-interface-prefix=string],
-+ [Ignore network interfaces whose name starts with "string" from the ICE connection
-+ check algorithm. For example, interfaces "virbr" in the case of the virtual bridge
-+ handled by libvirtd, do not help in finding connectivity.])],
-+ [interface_prefix="$withval"])
-+AS_IF([test -n "$interface_prefix"],
-+ [AC_DEFINE_UNQUOTED([IGNORED_IFACE_PREFIX],["$interface_prefix"],
-+ [Ignore this network interface prefix from the connection check])
-+ AC_MSG_RESULT([yes, $interface_prefix])],
-+ [AC_MSG_RESULT([no])])
-+
- AC_CONFIG_MACRO_DIR(m4)
-
- AC_OUTPUT
---
-2.13.6
-
-
-From 80c613699786567fd93db74377138600794a86e0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Thu, 8 Jun 2017 16:34:21 -0400
-Subject: [PATCH 21/70] agent: Use base_addr to generate rport in SDP
-
-Reported by Capricornus (zhushengliang)
-
-https://phabricator.freedesktop.org/T7763
----
- agent/agent.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/agent/agent.c b/agent/agent.c
-index 77fb1eb..1ff09af 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -5690,7 +5690,7 @@ _generate_candidate_sdp (NiceAgent *agent,
- g_string_append_printf (sdp, " typ %s", _cand_type_to_sdp (candidate->type));
- if (nice_address_is_valid (&candidate->base_addr) &&
- !nice_address_equal (&candidate->addr, &candidate->base_addr)) {
-- port = nice_address_get_port (&candidate->addr);
-+ port = nice_address_get_port (&candidate->base_addr);
- nice_address_to_string (&candidate->base_addr, ip4);
- g_string_append_printf (sdp, " raddr %s rport %d", ip4,
- port == 0 ? 9 : port);
---
-2.13.6
-
-
-From 8bb210c5af4bcaf342d7fa4fef6034269e976532 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Thu, 9 Jun 2016 23:28:43 +0200
-Subject: [PATCH 22/70] stun timer: make properties for stun timer tunables
-
-Three STUN binding request properties should be customisable. RFC 5245
-describes the retransmission timer of the STUN transaction 'RTO', and
-RFC 5389 describes the number of retransmissions to send until a
-response is received 'Rc'. The third property is the 'RTO' when
-a reliable connection is used.
-
-RFC 5389 introduces a supplementary property 'Rm' as a multiplier used
-to compute the final timeout RTO * Rm. However, this property is not
-added in libnice, because this would require breaking the public API for
-STUN. Currently, our STUN implementation hardcodes a division by two for
-this final timeout.
-
-Differential Revision: https://phabricator.freedesktop.org/D1109
----
- agent/agent-priv.h | 4 ++-
- agent/agent.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- agent/conncheck.c | 16 +++++----
- agent/discovery.c | 8 ++---
- stun/usages/timer.h | 6 +++-
- 5 files changed, 118 insertions(+), 13 deletions(-)
-
-diff --git a/agent/agent-priv.h b/agent/agent-priv.h
-index ada3630..162ea63 100644
---- a/agent/agent-priv.h
-+++ b/agent/agent-priv.h
-@@ -106,7 +106,6 @@ nice_input_message_iter_compare (const NiceInputMessageIter *a,
-
- #define NICE_AGENT_TIMER_TA_DEFAULT 20 /* timer Ta, msecs (impl. defined) */
- #define NICE_AGENT_TIMER_TR_DEFAULT 25000 /* timer Tr, msecs (impl. defined) */
--#define NICE_AGENT_TIMER_TR_MIN 15000 /* timer Tr, msecs (ICE ID-19) */
- #define NICE_AGENT_MAX_CONNECTIVITY_CHECKS_DEFAULT 100 /* see spec 5.7.3 (ID-19) */
-
-
-@@ -132,6 +131,9 @@ struct _NiceAgent
- guint timer_ta; /* property: timer Ta */
- guint max_conn_checks; /* property: max connectivity checks */
- gboolean force_relay; /* property: force relay */
-+ guint stun_max_retransmissions; /* property: stun max retransmissions, Rc */
-+ guint stun_initial_timeout; /* property: stun initial timeout, RTO */
-+ guint stun_reliable_timeout; /* property: stun reliable timeout */
-
- GSList *local_addresses; /* list of NiceAddresses for local
- interfaces */
-diff --git a/agent/agent.c b/agent/agent.c
-index 1ff09af..25d7886 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -113,6 +113,9 @@ enum
- PROP_BYTESTREAM_TCP,
- PROP_KEEPALIVE_CONNCHECK,
- PROP_FORCE_RELAY,
-+ PROP_STUN_MAX_RETRANSMISSIONS,
-+ PROP_STUN_INITIAL_TIMEOUT,
-+ PROP_STUN_RELIABLE_TIMEOUT,
- };
-
-
-@@ -708,6 +711,76 @@ nice_agent_class_init (NiceAgentClass *klass)
- FALSE,
- G_PARAM_READWRITE));
-
-+ /**
-+ * NiceAgent:stun-max-retransmissions
-+ *
-+ * The maximum number of retransmissions of the STUN binding requests
-+ * used in the gathering stage, to find our local candidates, and used
-+ * in the connection check stage, to test the validity of each
-+ * constructed pair. This property is described as 'Rc' in the RFC
-+ * 5389, with a default value of 7. The timeout of each STUN request
-+ * is doubled for each retransmission, so the choice of this value has
-+ * a direct impact on the time needed to move from the CONNECTED state
-+ * to the READY state, and on the time needed to complete the GATHERING
-+ * state.
-+ *
-+ * Since: UNRELEASED
-+ */
-+
-+ g_object_class_install_property (gobject_class, PROP_STUN_MAX_RETRANSMISSIONS,
-+ g_param_spec_uint (
-+ "stun-max-retransmissions",
-+ "STUN Max Retransmissions",
-+ "Maximum number of STUN binding requests retransmissions "
-+ "described as 'Rc' in the STUN specification.",
-+ 1, 99,
-+ STUN_TIMER_DEFAULT_MAX_RETRANSMISSIONS,
-+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-+
-+ /**
-+ * NiceAgent:stun-initial-timeout
-+ *
-+ * The initial timeout (msecs) of the STUN binding requests
-+ * used in the gathering stage, to find our local candidates.
-+ * This property is described as 'RTO' in the RFC 5389 and RFC 5245.
-+ * This timeout is doubled for each retransmission, until
-+ * #NiceAgent:stun-max-retransmissions have been done,
-+ * with an exception for the last restransmission, where the timeout is
-+ * divided by two instead (RFC 5389 indicates that a customisable
-+ * multiplier 'Rm' to 'RTO' should be used).
-+ *
-+ * Since: UNRELEASED
-+ */
-+
-+ g_object_class_install_property (gobject_class, PROP_STUN_INITIAL_TIMEOUT,
-+ g_param_spec_uint (
-+ "stun-initial-timeout",
-+ "STUN Initial Timeout",
-+ "STUN timeout in msecs of the initial binding requests used in the "
-+ "gathering state, described as 'RTO' in the ICE specification.",
-+ 20, 9999,
-+ STUN_TIMER_DEFAULT_TIMEOUT,
-+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-+
-+ /**
-+ * NiceAgent:stun-reliable-timeout
-+ *
-+ * The initial timeout of the STUN binding requests used
-+ * for a reliable timer.
-+ *
-+ * Since: UNRELEASED
-+ */
-+
-+ g_object_class_install_property (gobject_class, PROP_STUN_RELIABLE_TIMEOUT,
-+ g_param_spec_uint (
-+ "stun-reliable-timeout",
-+ "STUN Reliable Timeout",
-+ "STUN timeout in msecs of the initial binding requests used for "
-+ "a reliable timer.",
-+ 20, 99999,
-+ STUN_TIMER_DEFAULT_RELIABLE_TIMEOUT,
-+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-+
- /* install signals */
-
- /**
-@@ -1187,6 +1260,18 @@ nice_agent_get_property (
- g_value_set_boolean (value, agent->force_relay);
- break;
-
-+ case PROP_STUN_MAX_RETRANSMISSIONS:
-+ g_value_set_uint (value, agent->stun_max_retransmissions);
-+ break;
-+
-+ case PROP_STUN_INITIAL_TIMEOUT:
-+ g_value_set_uint (value, agent->stun_initial_timeout);
-+ break;
-+
-+ case PROP_STUN_RELIABLE_TIMEOUT:
-+ g_value_set_uint (value, agent->stun_reliable_timeout);
-+ break;
-+
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
- }
-@@ -1374,6 +1459,18 @@ nice_agent_set_property (
- agent->force_relay = g_value_get_boolean (value);
- break;
-
-+ case PROP_STUN_MAX_RETRANSMISSIONS:
-+ agent->stun_max_retransmissions = g_value_get_uint (value);
-+ break;
-+
-+ case PROP_STUN_INITIAL_TIMEOUT:
-+ agent->stun_initial_timeout = g_value_get_uint (value);
-+ break;
-+
-+ case PROP_STUN_RELIABLE_TIMEOUT:
-+ agent->stun_reliable_timeout = g_value_get_uint (value);
-+ break;
-+
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
- }
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 5501c2b..14fdcd9 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -888,8 +888,9 @@ static gboolean priv_conn_keepalive_tick_unlocked (NiceAgent *agent)
- agent, buf_len, p->keepalive.stun_message.buffer);
-
- if (buf_len > 0) {
-- stun_timer_start (&p->keepalive.timer, STUN_TIMER_DEFAULT_TIMEOUT,
-- STUN_TIMER_DEFAULT_MAX_RETRANSMISSIONS);
-+ stun_timer_start (&p->keepalive.timer,
-+ agent->stun_initial_timeout,
-+ agent->stun_max_retransmissions);
-
- agent->media_after_tick = FALSE;
-
-@@ -1116,8 +1117,9 @@ static void priv_turn_allocate_refresh_tick_unlocked (CandidateRefresh *cand)
- }
-
- if (buffer_len > 0) {
-- stun_timer_start (&cand->timer, STUN_TIMER_DEFAULT_TIMEOUT,
-- STUN_TIMER_DEFAULT_MAX_RETRANSMISSIONS);
-+ stun_timer_start (&cand->timer,
-+ cand->agent->stun_initial_timeout,
-+ cand->agent->stun_max_retransmissions);
-
- /* send the refresh */
- agent_socket_send (cand->nicesock, &cand->server,
-@@ -2171,11 +2173,11 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair)
-
- if (buffer_len > 0) {
- if (nice_socket_is_reliable(pair->sockptr)) {
-- stun_timer_start_reliable(&pair->timer, STUN_TIMER_DEFAULT_RELIABLE_TIMEOUT);
-+ stun_timer_start_reliable(&pair->timer, agent->stun_reliable_timeout);
- } else {
- stun_timer_start (&pair->timer,
- priv_compute_conncheck_timer (agent),
-- STUN_TIMER_DEFAULT_MAX_RETRANSMISSIONS);
-+ agent->stun_max_retransmissions);
- }
-
- /* TCP-ACTIVE candidate must create a new socket before sending
-@@ -2340,7 +2342,7 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
- if (!nice_socket_is_reliable (p->sockptr) && !p->timer_restarted) {
- stun_timer_start (&p->timer,
- priv_compute_conncheck_timer (agent),
-- STUN_TIMER_DEFAULT_MAX_RETRANSMISSIONS);
-+ agent->stun_max_retransmissions);
- p->timer_restarted = TRUE;
- }
- }
-diff --git a/agent/discovery.c b/agent/discovery.c
-index 7a890a0..4cc99c2 100644
---- a/agent/discovery.c
-+++ b/agent/discovery.c
-@@ -1072,11 +1072,11 @@ static gboolean priv_discovery_tick_unlocked (gpointer pointer)
-
- if (buffer_len > 0) {
- if (nice_socket_is_reliable (cand->nicesock)) {
-- stun_timer_start_reliable (&cand->timer,
-- STUN_TIMER_DEFAULT_RELIABLE_TIMEOUT);
-+ stun_timer_start_reliable (&cand->timer, agent->stun_reliable_timeout);
- } else {
-- stun_timer_start (&cand->timer, 200,
-- STUN_TIMER_DEFAULT_MAX_RETRANSMISSIONS);
-+ stun_timer_start (&cand->timer,
-+ agent->stun_initial_timeout,
-+ agent->stun_max_retransmissions);
- }
-
- /* send the conncheck */
-diff --git a/stun/usages/timer.h b/stun/usages/timer.h
-index e74353b..097e75b 100644
---- a/stun/usages/timer.h
-+++ b/stun/usages/timer.h
-@@ -132,7 +132,11 @@ struct stun_timer_s {
- * The default intial timeout to use for the timer
- * RFC recommendds 500, but it's ridiculous, 50ms is known to work in most
- * cases as it is also what is used by SIP style VoIP when sending A-Law and
-- * mu-Law audio, so 200ms should be hyper safe.
-+ * mu-Law audio, so 200ms should be hyper safe. With an initial timeout
-+ * of 200ms, a default of 7 transmissions, the last timeout will be
-+ * 16 * 200ms, and we expect to receive a response from the stun server
-+ * before (1 + 2 + 4 + 8 + 16 + 32 + 16) * 200ms = 15200 ms after the initial
-+ * stun request has been sent.
- */
- #define STUN_TIMER_DEFAULT_TIMEOUT 200
-
---
-2.13.6
-
-
-From 7a2c1edf502849a868b6f1026e8e2c343dee4ded Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Mon, 6 Jun 2016 22:24:50 +0200
-Subject: [PATCH 23/70] conncheck: update selected pair when nominated flag is
- set
-
-This modifies commit 8f1f615. It is better focused to update the
-selected pair just after its nominated flag has been set. We also keep
-the code homogeneous with other places, where the call to
-priv_update_selected_pair() immediately follows the setting of
-pair->nominated. Moreover in priv_update_check_list_state_for_ready(),
-we would call priv_update_selected_pair() more times that necessary when
-iterating on all nominated pairs.
-
-Differential Revision: https://phabricator.freedesktop.org/D1125
----
- agent/conncheck.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 14fdcd9..8c55269 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -76,6 +76,8 @@ static void conn_check_free_item (gpointer data);
- static CandidateCheckPair *priv_conn_check_add_for_candidate_pair_matched (
- NiceAgent *agent, guint stream_id, NiceComponent *component,
- NiceCandidate *local, NiceCandidate *remote, NiceCheckState initial_state);
-+static gboolean priv_update_selected_pair (NiceAgent *agent,
-+ NiceComponent *component, CandidateCheckPair *pair);
-
- static int priv_timer_expired (GTimeVal *timer, GTimeVal *now)
- {
-@@ -515,6 +517,7 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
- p->state == NICE_CHECK_DISCOVERED)) {
- nice_debug ("Agent %p : restarting check %p as the nominated pair.", agent, p);
- p->nominated = TRUE;
-+ priv_update_selected_pair (agent, component, p);
- priv_add_pair_to_triggered_check_queue (agent, p);
- break; /* move to the next component */
- }
-@@ -1530,7 +1533,6 @@ static void priv_update_check_list_state_for_ready (NiceAgent *agent, NiceStream
- ++valid;
- if (p->nominated == TRUE) {
- ++nominated;
-- priv_update_selected_pair (agent, component, p);
- }
- }
- }
---
-2.13.6
-
-
-From 3a58ba6120b188d78c5709e0349c0346bfa21c1a Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Mon, 1 Feb 2016 11:10:21 +0100
-Subject: [PATCH 24/70] conncheck: peer reflexive candidates are not paired
-
-This patch makes the code compliant with ICE RFC, 7.2.1.3 "Learning
-Peer Reflexive Candidates" and 7.1.3.2.1 "Discovering Peer Reflexive
-Candidates", where discovered candidates do not cause the creation
-of new pairs to be checked.
-
-Differential Revision: https://phabricator.freedesktop.org/D805
----
- agent/conncheck.c | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 8c55269..cdf1025 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -1787,6 +1787,15 @@ int conn_check_add_for_candidate (NiceAgent *agent, guint stream_id, NiceCompone
-
- g_assert (remote != NULL);
-
-+ /* note: according to 7.2.1.3, "Learning Peer Reflexive Candidates",
-+ * the agent does not pair this candidate with any local candidates.
-+ */
-+ if (agent->compatibility == NICE_COMPATIBILITY_RFC5245 &&
-+ remote->type == NICE_CANDIDATE_TYPE_PEER_REFLEXIVE)
-+ {
-+ return added;
-+ }
-+
- for (i = component->local_candidates; i ; i = i->next) {
- NiceCandidate *local = i->data;
-
-@@ -1821,6 +1830,18 @@ int conn_check_add_for_local_candidate (NiceAgent *agent, guint stream_id, NiceC
-
- g_assert (local != NULL);
-
-+ /*
-+ * note: according to 7.1.3.2.1 "Discovering Peer Reflexive
-+ * Candidates", the peer reflexive candidate is not paired
-+ * with other remote candidates
-+ */
-+
-+ if (agent->compatibility == NICE_COMPATIBILITY_RFC5245 &&
-+ local->type == NICE_CANDIDATE_TYPE_PEER_REFLEXIVE)
-+ {
-+ return added;
-+ }
-+
- for (i = component->remote_candidates; i ; i = i->next) {
-
- NiceCandidate *remote = i->data;
---
-2.13.6
-
-
-From a602ff57aae6a6afdeab843954c48e6fb5d82d31 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 12 Apr 2016 13:02:45 +0200
-Subject: [PATCH 25/70] conncheck: fix pair state transition when successful
- response is received
-
-According the ICE RFC 5245, 7.1.3.2.3, the pair that *generated* a
-successful check should go to state succeeded, not only the valid
-pair built in section 7.1.3.2.2.
-
-Differential Revision: https://phabricator.freedesktop.org/D810
----
- agent/conncheck.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index cdf1025..7fc2a1d 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -2654,7 +2654,10 @@ static CandidateCheckPair *priv_process_response_check_for_reflexive(NiceAgent *
- }
- else {
- if (!local_cand) {
-- if (!agent->force_relay)
-+ if (!agent->force_relay) {
-+ /* step: find a new local candidate, see RFC 5245 7.1.3.2.1.
-+ * "Discovering Peer Reflexive Candidates"
-+ */
- local_cand = discovery_add_peer_reflexive_candidate (agent,
- stream->id,
- component->id,
-@@ -2662,8 +2665,9 @@ static CandidateCheckPair *priv_process_response_check_for_reflexive(NiceAgent *
- sockptr,
- local_candidate,
- remote_candidate);
-- p->state = NICE_CHECK_FAILED;
-- nice_debug ("Agent %p : pair %p state FAILED", agent, p);
-+ nice_debug ("Agent %p : added a new peer-reflexive local candidate %p",
-+ agent, local_cand);
-+ }
- }
-
- /* step: add a new discovered pair (see RFC 5245 7.1.3.2.2
-@@ -2671,7 +2675,12 @@ static CandidateCheckPair *priv_process_response_check_for_reflexive(NiceAgent *
- if (local_cand)
- new_pair = priv_add_peer_reflexive_pair (agent, stream->id, component,
- local_cand, p);
-- nice_debug ("Agent %p : conncheck %p FAILED, %p DISCOVERED.", agent, p, new_pair);
-+ /* step: The agent sets the state of the pair that *generated* the check to
-+ * Succeeded, RFC 5245, 7.1.3.2.3, "Updating Pair States"
-+ */
-+ p->state = NICE_CHECK_SUCCEEDED;
-+ nice_debug ("Agent %p : conncheck %p SUCCEEDED, %p DISCOVERED.",
-+ agent, p, new_pair);
- }
-
- /* note: this is same as "adding to VALID LIST" in the spec
---
-2.13.6
-
-
-From 0636f9addc041cf93c4ff4eaa351b1768d48a32e Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 19 Apr 2016 13:12:48 +0200
-Subject: [PATCH 26/70] conncheck: implement ice regular nomination method
-
-This patch implements Regular Nomation as described in RFC5245
-8.1.1.1. The controlling agent lets valid pairs accumulate, and
-decides which pair to recheck with the use-candidate attribute set.
-priv_mark_pair_nominated() follows 7.2.1.5, to update the nominated
-pair when acting as a STUN server, and
-priv_map_reply_to_conn_check_request() implements 7.1.3.2.4 to
-update the nominated pair when acting as a STUN client. A new
-property is also added to the agent to control the nomination
-mode, which can be regular of aggressive, with default value
-set to aggressive.
-
-Two new flags are introduced in the CandidateCheckPair structure:
-
-- use_candidate_on_next_check indicates the STUN client to add the
- use-candidate attribute when the pair will be checked. At this
- time, the nominated flag has not been set on this pair yet.
-
-- mark_nominated_on_response_arrival indicates the STUN server
- to nominate the pair when its succesfull response to a
- previous triggered check will arrive (7.2.1.5, item #2)
-
-Differential Revision: https://phabricator.freedesktop.org/D811
----
- agent/Makefile.am | 23 ++++
- agent/agent-priv.h | 8 ++
- agent/agent.c | 59 +++++++++
- agent/agent.h | 43 ++++++-
- agent/conncheck.c | 178 +++++++++++++++++++++++++++-
- agent/conncheck.h | 2 +
- configure.ac | 1 +
- docs/reference/libnice/libnice-sections.txt | 2 +
- 8 files changed, 309 insertions(+), 7 deletions(-)
-
-diff --git a/agent/Makefile.am b/agent/Makefile.am
-index b585393..915f312 100644
---- a/agent/Makefile.am
-+++ b/agent/Makefile.am
-@@ -22,6 +22,12 @@ if WINDOWS
- AM_CFLAGS += -DWINVER=0x0501 # _WIN32_WINNT_WINXP
- endif
-
-+BUILT_SOURCES = \
-+ agent-enum-types.h \
-+ agent-enum-types.c
-+
-+CLEANFILES += $(BUILT_SOURCES)
-+
- noinst_LTLIBRARIES = libagent.la
-
- libagent_la_SOURCES = \
-@@ -54,6 +60,23 @@ libagent_la_SOURCES = \
- outputstream.c \
- $(BUILT_SOURCES)
-
-+agent-enum-types.h: agent.h Makefile
-+ $(AM_V_GEN)$(GLIB_MKENUMS) \
-+ --fhead "#ifndef __AGENT_ENUM_TYPES_H__\n#define __AGENT_ENUM_TYPES_H__ 1\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-+ --fprod "/* enumerations from \"@filename@\" */\n" \
-+ --vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define NICE_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
-+ --ftail "G_END_DECLS\n\n#endif /* !AGENT_ENUM_TYPES_H */" \
-+ $(addprefix $(srcdir)/,agent.h) > $@
-+
-+agent-enum-types.c: agent.h Makefile agent-enum-types.h
-+ $(AM_V_GEN)$(GLIB_MKENUMS) \
-+ --fhead "#include <config.h>\n#include <glib-object.h>\n#include \"agent.h\"\n#include \"agent-enum-types.h\"" \
-+ --fprod "\n/* enumerations from \"@filename@\" */" \
-+ --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType type = 0;\n if (!type) {\n static const G@Type@Value values[] = {" \
-+ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-+ --vtail " { 0, NULL, NULL }\n };\n type = g_@type@_register_static (\"@EnumName@\", values);\n }\n return type;\n}\n\n" \
-+ $(addprefix $(srcdir)/,agent.h) > $@
-+
- libagent_la_LIBADD = \
- $(top_builddir)/random/libnice-random.la \
- $(top_builddir)/socket/libsocket.la \
-diff --git a/agent/agent-priv.h b/agent/agent-priv.h
-index 162ea63..3384180 100644
---- a/agent/agent-priv.h
-+++ b/agent/agent-priv.h
-@@ -115,6 +115,13 @@ nice_input_message_iter_compare (const NiceInputMessageIter *a,
-
- #define NICE_COMPONENT_MAX_VALID_CANDIDATES 50 /* maximum number of validates remote candidates to keep, the number is arbitrary but hopefully large enough */
-
-+/* A convenient macro to test if the agent is compatible with RFC5245
-+ * or OC2007R2. Specifically these two modes share the support
-+ * of the regular or aggressive nomination mode */
-+#define NICE_AGENT_IS_COMPATIBLE_WITH_RFC5245_OR_OC2007R2(obj) \
-+ ((obj)->compatibility == NICE_COMPATIBILITY_RFC5245 || \
-+ (obj)->compatibility == NICE_COMPATIBILITY_OC2007R2)
-+
- struct _NiceAgent
- {
- GObject parent; /* gobject pointer */
-@@ -134,6 +141,7 @@ struct _NiceAgent
- guint stun_max_retransmissions; /* property: stun max retransmissions, Rc */
- guint stun_initial_timeout; /* property: stun initial timeout, RTO */
- guint stun_reliable_timeout; /* property: stun reliable timeout */
-+ NiceNominationMode nomination_mode; /* property: Nomination mode */
-
- GSList *local_addresses; /* list of NiceAddresses for local
- interfaces */
-diff --git a/agent/agent.c b/agent/agent.c
-index 25d7886..577a7e0 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -73,6 +73,7 @@
- #include "interfaces.h"
-
- #include "pseudotcp.h"
-+#include "agent-enum-types.h"
-
- /* Maximum size of a UDP packet’s payload, as the packet’s length field is 16b
- * wide. */
-@@ -116,6 +117,7 @@ enum
- PROP_STUN_MAX_RETRANSMISSIONS,
- PROP_STUN_INITIAL_TIMEOUT,
- PROP_STUN_RELIABLE_TIMEOUT,
-+ PROP_NOMINATION_MODE,
- };
-
-
-@@ -440,6 +442,24 @@ nice_agent_class_init (NiceAgentClass *klass)
- G_PARAM_READWRITE));
-
- /**
-+ * NiceAgent:nomination-mode:
-+ *
-+ * The nomination mode used in the ICE specification for describing
-+ * the selection of valid pairs to be used upstream.
-+ * <para> See also: #NiceNominationMode </para>
-+ *
-+ * Since: UNRELEASED
-+ */
-+ g_object_class_install_property (gobject_class, PROP_NOMINATION_MODE,
-+ g_param_spec_enum (
-+ "nomination-mode",
-+ "ICE nomination mode",
-+ "Nomination mode used in the ICE specification for describing "
-+ "the selection of valid pairs to be used upstream",
-+ NICE_TYPE_NOMINATION_MODE, NICE_NOMINATION_MODE_AGGRESSIVE,
-+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-+
-+ /**
- * NiceAgent:proxy-ip:
- *
- * The proxy server IP used to bypass a proxy firewall
-@@ -1096,6 +1116,7 @@ nice_agent_init (NiceAgent *agent)
- agent->stun_server_port = DEFAULT_STUN_PORT;
- agent->controlling_mode = TRUE;
- agent->max_conn_checks = NICE_AGENT_MAX_CONNECTIVITY_CHECKS_DEFAULT;
-+ agent->nomination_mode = NICE_NOMINATION_MODE_AGGRESSIVE;
-
- agent->discovery_list = NULL;
- agent->discovery_unsched_items = 0;
-@@ -1144,6 +1165,23 @@ nice_agent_new_reliable (GMainContext *ctx, NiceCompatibility compat)
- }
-
-
-+NICEAPI_EXPORT NiceAgent *
-+nice_agent_new_full (GMainContext *ctx,
-+ NiceCompatibility compat,
-+ gboolean reliable,
-+ NiceNominationMode nomination)
-+{
-+ NiceAgent *agent = g_object_new (NICE_TYPE_AGENT,
-+ "compatibility", compat,
-+ "main-context", ctx,
-+ "reliable", reliable,
-+ "nomination-mode", nomination,
-+ NULL);
-+
-+ return agent;
-+}
-+
-+
- static void
- nice_agent_get_property (
- GObject *object,
-@@ -1190,6 +1228,10 @@ nice_agent_get_property (
- /* XXX: should we prune the list of already existing checks? */
- break;
-
-+ case PROP_NOMINATION_MODE:
-+ g_value_set_enum (value, agent->nomination_mode);
-+ break;
-+
- case PROP_PROXY_IP:
- g_value_set_string (value, agent->proxy_ip);
- break;
-@@ -1394,6 +1436,10 @@ nice_agent_set_property (
- agent->max_conn_checks = g_value_get_uint (value);
- break;
-
-+ case PROP_NOMINATION_MODE:
-+ agent->nomination_mode = g_value_get_enum (value);
-+ break;
-+
- case PROP_PROXY_IP:
- g_free (agent->proxy_ip);
- agent->proxy_ip = g_value_dup_string (value);
-@@ -3298,6 +3344,19 @@ static gboolean priv_add_remote_candidate (
- username, password, priority);
- }
-
-+ if (NICE_AGENT_IS_COMPATIBLE_WITH_RFC5245_OR_OC2007R2 (agent)) {
-+ /* note: If there are TCP candidates for a media stream,
-+ * a controlling agent MUST use the regular selection algorithm,
-+ * RFC 6544, sect 8, "Concluding ICE Processing"
-+ */
-+ if (agent->nomination_mode == NICE_NOMINATION_MODE_AGGRESSIVE &&
-+ transport != NICE_CANDIDATE_TRANSPORT_UDP) {
-+ nice_debug ("Agent %p : we have TCP candidates, switching back "
-+ "to regular nomination mode", agent);
-+ agent->nomination_mode = NICE_NOMINATION_MODE_REGULAR;
-+ }
-+ }
-+
- if (base_addr)
- candidate->base_addr = *base_addr;
-
-diff --git a/agent/agent.h b/agent/agent.h
-index 47c4d5a..6e233c6 100644
---- a/agent/agent.h
-+++ b/agent/agent.h
-@@ -377,6 +377,26 @@ typedef enum
- NICE_PROXY_TYPE_LAST = NICE_PROXY_TYPE_HTTP,
- } NiceProxyType;
-
-+/**
-+ * NiceNominationMode:
-+ * @NICE_NOMINATION_MODE_AGGRESSIVE: Aggressive nomination mode
-+ * @NICE_NOMINATION_MODE_REGULAR: Regular nomination mode
-+ *
-+ * An enum to specity the kind of nomination mode to use by
-+ * the agent, as described in RFC 5245. Two modes exists,
-+ * regular and aggressive. They differ by the way the controlling
-+ * agent chooses to put the USE-CANDIDATE attribute in its STUN
-+ * messages. The aggressive mode is supposed to nominate a pair
-+ * faster, than the regular mode, potentially causing the nominated
-+ * pair to change until the connection check completes.
-+ *
-+ * Since: UNRELEASED
-+ */
-+typedef enum
-+{
-+ NICE_NOMINATION_MODE_REGULAR = 0,
-+ NICE_NOMINATION_MODE_AGGRESSIVE,
-+} NiceNominationMode;
-
- /**
- * NiceAgentRecvFunc:
-@@ -429,6 +449,28 @@ NiceAgent *
- nice_agent_new_reliable (GMainContext *ctx, NiceCompatibility compat);
-
- /**
-+ * nice_agent_new_full:
-+ * @ctx: The Glib Mainloop Context to use for timers
-+ * @compat: The compatibility mode of the agent
-+ * @reliable: The reliability mode of the agent
-+ * @nomination: The nomination mode of the agent
-+ *
-+ * Create a new #NiceAgent with parameters that must be be defined at
-+ * construction time.
-+ * The returned object must be freed with g_object_unref()
-+ * <para> See also: #NiceNominationMode </para>
-+ *
-+ * Since: UNRELEASED
-+ *
-+ * Returns: The new agent GObject
-+ */
-+NiceAgent *
-+nice_agent_new_full (GMainContext *ctx,
-+ NiceCompatibility compat,
-+ gboolean reliable,
-+ NiceNominationMode nomination);
-+
-+/**
- * nice_agent_add_local_address:
- * @agent: The #NiceAgent Object
- * @addr: The address to listen to
-@@ -447,7 +489,6 @@ nice_agent_new_reliable (GMainContext *ctx, NiceCompatibility compat);
- gboolean
- nice_agent_add_local_address (NiceAgent *agent, NiceAddress *addr);
-
--
- /**
- * nice_agent_add_stream:
- * @agent: The #NiceAgent Object
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 7fc2a1d..6827e6e 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -502,7 +502,62 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
- if (s_nominated < stream->n_components &&
- s_waiting_for_nomination) {
- keep_timer_going = TRUE;
-- if (agent->controlling_mode) {
-+ if (NICE_AGENT_IS_COMPATIBLE_WITH_RFC5245_OR_OC2007R2 (agent)) {
-+ if (agent->nomination_mode == NICE_NOMINATION_MODE_REGULAR &&
-+ agent->controlling_mode &&
-+ ((waiting == 0 && s_inprogress == 0) ||
-+ (s_succeeded + s_discovered) >= 5 * stream->n_components)){
-+ /* ICE 8.1.1.1 Regular nomination
-+ * we choose to nominate the valid pair if
-+ * there is no pair left waiting or in-progress or
-+ * if there are at least 5 valid pairs per stream on average.
-+ *
-+ * This is the "stopping criterion" described in 8.1.1.1, and is
-+ * a "local optimization" between accumulating more valid pairs,
-+ * and limiting the time spent waiting for in-progress connections
-+ * checks until they finally fail.
-+ */
-+ GSList *component_item;
-+
-+ for (component_item = stream->components; component_item;
-+ component_item = component_item->next) {
-+ NiceComponent *component = component_item->data;
-+ gboolean already_done = FALSE;
-+
-+ /* verify that the choice of the pair to be nominated
-+ * has not already been done
-+ */
-+ for (k = stream->conncheck_list; k ; k = k->next) {
-+ CandidateCheckPair *p = k->data;
-+ if (p->component_id == component->id &&
-+ p->use_candidate_on_next_check) {
-+ already_done = TRUE;
-+ break;
-+ }
-+ }
-+
-+ /* choose a pair to be nominated in the list of valid
-+ * pairs, and add it to the triggered checks list
-+ */
-+ if (!already_done) {
-+ for (k = stream->conncheck_list; k ; k = k->next) {
-+ CandidateCheckPair *p = k->data;
-+ /* note: highest priority item selected (list always sorted) */
-+ if (p->component_id == component->id &&
-+ !p->nominated &&
-+ !p->use_candidate_on_next_check &&
-+ p->valid) {
-+ nice_debug ("Agent %p : restarting check %p with "
-+ "USE-CANDIDATE attrib (regular nomination)", agent, p);
-+ p->use_candidate_on_next_check = TRUE;
-+ priv_add_pair_to_triggered_check_queue (agent, p);
-+ break; /* move to the next component */
-+ }
-+ }
-+ }
-+ }
-+ }
-+ } else if (agent->controlling_mode) {
- GSList *component_item;
-
- for (component_item = stream->components; component_item;
-@@ -1571,10 +1626,40 @@ static void priv_mark_pair_nominated (NiceAgent *agent, NiceStream *stream, Nice
-
- g_assert (component);
-
-+ if (NICE_AGENT_IS_COMPATIBLE_WITH_RFC5245_OR_OC2007R2 (agent) &&
-+ agent->controlling_mode)
-+ return;
-+
- /* step: search for at least one nominated pair */
- for (i = stream->conncheck_list; i; i = i->next) {
- CandidateCheckPair *pair = i->data;
-- if (pair->local == localcand && pair->remote == remotecand) {
-+ if (pair->local == localcand && pair->remote == remotecand &&
-+ NICE_AGENT_IS_COMPATIBLE_WITH_RFC5245_OR_OC2007R2 (agent)) {
-+ /* ICE, 7.2.1.5. Updating the Nominated Flag */
-+ /* note: TCP candidates typically produce peer reflexive
-+ * candidate, generating a "discovered" pair that can be
-+ * nominated.
-+ */
-+ if (pair->valid) {
-+ nice_debug ("Agent %p : marking pair %p (%s) as nominated",
-+ agent, pair, pair->foundation);
-+ pair->nominated = TRUE;
-+ priv_update_selected_pair (agent, component, pair);
-+ /* Do not step down to CONNECTED if we're already at state READY*/
-+ if (component->state != NICE_COMPONENT_STATE_READY) {
-+ /* step: notify the client of a new component state (must be done
-+ * before the possible check list state update step */
-+ agent_signal_component_state_change (agent,
-+ stream->id, component->id, NICE_COMPONENT_STATE_CONNECTED);
-+ }
-+ priv_update_check_list_state_for_ready (agent, stream, component);
-+ } else if (pair->state == NICE_CHECK_IN_PROGRESS) {
-+ pair->mark_nominated_on_response_arrival = TRUE;
-+ nice_debug ("Agent %p : pair %p (%s) is in-progress, "
-+ "will be nominated on response receipt.",
-+ agent, pair, pair->foundation);
-+ }
-+ } else if (pair->local == localcand && pair->remote == remotecand) {
- nice_debug ("Agent %p : marking pair %p (%s) as nominated", agent, pair, pair->foundation);
- pair->nominated = TRUE;
- if (pair->valid) {
-@@ -2174,7 +2259,35 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair)
- pair->prflx_priority, controlling);
- }
-
-- if (cand_use)
-+ if (NICE_AGENT_IS_COMPATIBLE_WITH_RFC5245_OR_OC2007R2 (agent)) {
-+ switch (agent->nomination_mode) {
-+ case NICE_NOMINATION_MODE_REGULAR:
-+ {
-+ /* We are doing regular nomination, so we set the use-candidate
-+ * attrib, when the controlling agent decided which valid pair to
-+ * resend with this flag in priv_conn_check_tick_stream()
-+ */
-+ cand_use = pair->use_candidate_on_next_check;
-+ nice_debug ("Agent %p : %s: set cand_use=%d "
-+ "(regular nomination).", agent, G_STRFUNC, cand_use);
-+ break;
-+ }
-+ case NICE_NOMINATION_MODE_AGGRESSIVE:
-+ {
-+ /* We are doing aggressive nomination, we set the use-candidate
-+ * attrib in every check we send, when we are the controlling
-+ * agent, RFC 5245, 8.1.1.2
-+ */
-+ cand_use = controlling;
-+ nice_debug ("Agent %p : %s: set cand_use=%d "
-+ "(aggressive nomination).", agent, G_STRFUNC, cand_use);
-+ break;
-+ }
-+ default:
-+ /* Nothing to do. */
-+ break;
-+ }
-+ } else if (cand_use)
- pair->nominated = controlling;
-
- if (uname_len > 0) {
-@@ -2781,12 +2894,66 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, NiceStre
- local_candidate, remote_candidate);
- }
-
--
-+ /* Note: this assignment helps to reduce the numbers of cases
-+ * to be tested. If ok_pair and p refer to distinct pairs, it
-+ * means that ok_pair is a discovered peer reflexive one,
-+ * caused by the check made on pair p. In that case, the
-+ * flags to be tested are on p, but the nominated flag will be
-+ * set on ok_pair. When there's no discovered pair, p and
-+ * ok_pair refer to the same pair.
-+ * To summarize : p is a SUCCEEDED pair, ok_pair is a
-+ * DISCOVERED, VALID, and eventually NOMINATED pair.
-+ */
- if (!ok_pair)
- ok_pair = p;
-
- /* step: updating nominated flag (ICE 7.1.2.2.4 "Updating the
- Nominated Flag" (ID-19) */
-+ if (NICE_AGENT_IS_COMPATIBLE_WITH_RFC5245_OR_OC2007R2 (agent)) {
-+ nice_debug ("Agent %p : Updating nominated flag (%s): "
-+ "ok_pair=%p (%d/%d) p=%p (%d/%d) (ucnc/mnora)",
-+ agent, p->local->transport == NICE_CANDIDATE_TRANSPORT_UDP ?
-+ "UDP" : "TCP",
-+ ok_pair, ok_pair->use_candidate_on_next_check,
-+ ok_pair->mark_nominated_on_response_arrival,
-+ p, p->use_candidate_on_next_check,
-+ p->mark_nominated_on_response_arrival);
-+
-+ if (agent->controlling_mode) {
-+ switch (agent->nomination_mode) {
-+ case NICE_NOMINATION_MODE_REGULAR:
-+ if (p->use_candidate_on_next_check) {
-+ nice_debug ("Agent %p : marking pair %p (%s) as nominated "
-+ "(regular nomination, control=1, "
-+ "use_cand_on_next_check=1).",
-+ agent, ok_pair, ok_pair->foundation);
-+ ok_pair->nominated = TRUE;
-+ }
-+ break;
-+ case NICE_NOMINATION_MODE_AGGRESSIVE:
-+ if (!p->nominated) {
-+ nice_debug ("Agent %p : marking pair %p (%s) as nominated "
-+ "(aggressive nomination, control=1).",
-+ agent, ok_pair, ok_pair->foundation);
-+ ok_pair->nominated = TRUE;
-+ }
-+ break;
-+ default:
-+ /* Nothing to do */
-+ break;
-+ }
-+ } else {
-+ if (p->mark_nominated_on_response_arrival) {
-+ nice_debug ("Agent %p : marking pair %p (%s) as nominated "
-+ "(%s nomination, control=0, mark_on_response=1).",
-+ agent, ok_pair, ok_pair->foundation,
-+ agent->nomination_mode == NICE_NOMINATION_MODE_AGGRESSIVE ?
-+ "aggressive" : "regular");
-+ ok_pair->nominated = TRUE;
-+ }
-+ }
-+ }
-+
- if (ok_pair->nominated == TRUE) {
- priv_update_selected_pair (agent, component, ok_pair);
- priv_print_conn_check_lists (agent, G_STRFUNC,
-@@ -3668,8 +3835,7 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *agent, NiceStream *stream,
- stun_usage_ice_conncheck_use_candidate (&req);
- uint32_t priority = stun_usage_ice_conncheck_priority (&req);
-
-- if (agent->controlling_mode ||
-- agent->compatibility == NICE_COMPATIBILITY_GOOGLE ||
-+ if (agent->compatibility == NICE_COMPATIBILITY_GOOGLE ||
- agent->compatibility == NICE_COMPATIBILITY_MSN ||
- agent->compatibility == NICE_COMPATIBILITY_OC2007)
- use_candidate = TRUE;
-diff --git a/agent/conncheck.h b/agent/conncheck.h
-index c204475..0f988de 100644
---- a/agent/conncheck.h
-+++ b/agent/conncheck.h
-@@ -87,6 +87,8 @@ struct _CandidateCheckPair
- gboolean nominated;
- gboolean timer_restarted;
- gboolean valid;
-+ gboolean use_candidate_on_next_check;
-+ gboolean mark_nominated_on_response_arrival;
- guint64 priority;
- guint32 prflx_priority;
- GTimeVal next_tick; /* next tick timestamp */
-diff --git a/configure.ac b/configure.ac
-index 98bbc08..6c106ff 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -57,6 +57,7 @@ AC_PROG_CC
- AM_PROG_AR
- LT_PREREQ([2.2.6])
- LT_INIT([dlopen win32-dll disable-static])
-+AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
-
- # Check Operating System
- AC_MSG_CHECKING([operating system])
-diff --git a/docs/reference/libnice/libnice-sections.txt b/docs/reference/libnice/libnice-sections.txt
-index 88a6cd2..a481106 100644
---- a/docs/reference/libnice/libnice-sections.txt
-+++ b/docs/reference/libnice/libnice-sections.txt
-@@ -5,6 +5,7 @@ NiceAgent
- NiceComponentState
- NiceComponentType
- NiceProxyType
-+NiceNominationMode
- NiceCompatibility
- NiceAgentRecvFunc
- NiceInputMessage
-@@ -12,6 +13,7 @@ NiceOutputMessage
- NICE_AGENT_MAX_REMOTE_CANDIDATES
- nice_agent_new
- nice_agent_new_reliable
-+nice_agent_new_full
- nice_agent_add_local_address
- nice_agent_set_port_range
- nice_agent_add_stream
---
-2.13.6
-
-
-From 4497d9b7afaaea7124db4a2cd13546d9366b5986 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Wed, 22 Jun 2016 15:44:39 +0200
-Subject: [PATCH 27/70] test-nomination: added a new test for the nomination
- mode
-
-Differential Revision: https://phabricator.freedesktop.org/D1107
----
- tests/Makefile.am | 5 +-
- tests/test-nomination.c | 263 ++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 267 insertions(+), 1 deletion(-)
- create mode 100644 tests/test-nomination.c
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 62d5d64..b623764 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -55,7 +55,8 @@ check_PROGRAMS = \
- test-icetcp \
- test-credentials \
- test-turn \
-- test-drop-invalid
-+ test-drop-invalid \
-+ test-nomination
-
- dist_check_SCRIPTS = \
- check-test-fullmode-with-stun.sh \
-@@ -131,6 +132,8 @@ test_turn_LDADD = $(COMMON_LDADD)
-
- test_drop_invalid_LDADD = $(COMMON_LDADD)
-
-+test_nomination_LDADD = $(COMMON_LDADD)
-+
- test_gstreamer_CFLAGS = $(AM_CFLAGS) $(GST_CHECK_CFLAGS)
- test_gstreamer_LDADD = -lnice -L$(top_builddir)/nice/.libs $(GLIB_LIBS) $(GUPNP_LIBS) $(GST_CHECK_LIBS) $(GST_LIBS)
-
-diff --git a/tests/test-nomination.c b/tests/test-nomination.c
-new file mode 100644
-index 0000000..b5a5e5f
---- /dev/null
-+++ b/tests/test-nomination.c
-@@ -0,0 +1,263 @@
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+
-+#include <gio/gio.h>
-+#include <agent.h>
-+
-+static NiceComponentState global_lagent_state[2] = { NICE_COMPONENT_STATE_LAST, NICE_COMPONENT_STATE_LAST };
-+static NiceComponentState global_ragent_state[2] = { NICE_COMPONENT_STATE_LAST, NICE_COMPONENT_STATE_LAST };
-+static guint global_components_ready = 0;
-+static gboolean global_lagent_gathering_done = FALSE;
-+static gboolean global_ragent_gathering_done = FALSE;
-+static int global_lagent_cands = 0;
-+static int global_ragent_cands = 0;
-+
-+static gboolean timer_cb (gpointer pointer)
-+{
-+ g_debug ("test-nomination:%s: %p", G_STRFUNC, pointer);
-+
-+ /* signal status via a global variable */
-+
-+ /* note: should not be reached, abort */
-+ g_error ("ERROR: test has got stuck, aborting...");
-+
-+ return FALSE;
-+}
-+
-+static void cb_nice_recv (NiceAgent *agent, guint stream_id, guint component_id, guint len, gchar *buf, gpointer user_data)
-+{
-+ g_debug ("test-nomination:%s: %p", G_STRFUNC, user_data);
-+
-+ /* XXX: dear compiler, these are for you: */
-+ (void)agent; (void)stream_id; (void)component_id; (void)buf;
-+
-+ /*
-+ * Lets ignore stun packets that got through
-+ */
-+ if (len < 8)
-+ return;
-+ if (strncmp ("12345678", buf, 8))
-+ return;
-+
-+ if (component_id != 1)
-+ return;
-+}
-+
-+static void cb_candidate_gathering_done(NiceAgent *agent, guint stream_id, gpointer data)
-+{
-+ g_debug ("test-nomination:%s: %p", G_STRFUNC, data);
-+
-+ if (GPOINTER_TO_UINT (data) == 1)
-+ global_lagent_gathering_done = TRUE;
-+ else if (GPOINTER_TO_UINT (data) == 2)
-+ global_ragent_gathering_done = TRUE;
-+}
-+
-+
-+static void cb_component_state_changed (NiceAgent *agent, guint stream_id, guint component_id, guint state, gpointer data)
-+{
-+ gboolean ready_to_connected = FALSE;
-+ g_debug ("test-nomination:%s: %p", G_STRFUNC, data);
-+
-+ if (GPOINTER_TO_UINT (data) == 1) {
-+ if (global_lagent_state[component_id - 1] == NICE_COMPONENT_STATE_READY &&
-+ state == NICE_COMPONENT_STATE_CONNECTED)
-+ ready_to_connected = TRUE;
-+ global_lagent_state[component_id - 1] = state;
-+ } else if (GPOINTER_TO_UINT (data) == 2) {
-+ if (global_ragent_state[component_id - 1] == NICE_COMPONENT_STATE_READY &&
-+ state == NICE_COMPONENT_STATE_CONNECTED)
-+ ready_to_connected = TRUE;
-+ global_ragent_state[component_id - 1] = state;
-+ }
-+
-+ if (state == NICE_COMPONENT_STATE_READY)
-+ global_components_ready++;
-+ else if (state == NICE_COMPONENT_STATE_CONNECTED && ready_to_connected)
-+ global_components_ready--;
-+ g_assert (state != NICE_COMPONENT_STATE_FAILED);
-+
-+ g_debug ("test-nomination: checks READY %u.", global_components_ready);
-+}
-+
-+static void cb_new_selected_pair(NiceAgent *agent, guint stream_id,
-+ guint component_id, gchar *lfoundation, gchar* rfoundation, gpointer data)
-+{
-+ g_debug ("test-nomination:%s: %p", G_STRFUNC, data);
-+
-+ if (GPOINTER_TO_UINT (data) == 1)
-+ ++global_lagent_cands;
-+ else if (GPOINTER_TO_UINT (data) == 2)
-+ ++global_ragent_cands;
-+}
-+
-+static void set_candidates (NiceAgent *from, guint from_stream,
-+ NiceAgent *to, guint to_stream, guint component)
-+{
-+ GSList *cands = NULL, *i;
-+
-+ cands = nice_agent_get_local_candidates (from, from_stream, component);
-+ nice_agent_set_remote_candidates (to, to_stream, component, cands);
-+
-+ for (i = cands; i; i = i->next)
-+ nice_candidate_free ((NiceCandidate *) i->data);
-+ g_slist_free (cands);
-+}
-+
-+static void set_credentials (NiceAgent *lagent, guint lstream,
-+ NiceAgent *ragent, guint rstream)
-+{
-+ gchar *ufrag = NULL, *password = NULL;
-+
-+ nice_agent_get_local_credentials(lagent, lstream, &ufrag, &password);
-+ nice_agent_set_remote_credentials (ragent, rstream, ufrag, password);
-+ g_free (ufrag);
-+ g_free (password);
-+ nice_agent_get_local_credentials(ragent, rstream, &ufrag, &password);
-+ nice_agent_set_remote_credentials (lagent, lstream, ufrag, password);
-+ g_free (ufrag);
-+ g_free (password);
-+}
-+
-+static void
-+run_test(NiceNominationMode l_nomination_mode,
-+ NiceNominationMode r_nomination_mode)
-+{
-+ NiceAgent *lagent, *ragent; /* agent's L and R */
-+ const gchar *localhost;
-+ NiceAddress localaddr;
-+ guint ls_id, rs_id;
-+ gulong timer_id;
-+
-+ localhost = "127.0.0.1";
-+
-+ /* step: initialize variables modified by the callbacks */
-+ global_components_ready = 0;
-+ global_lagent_gathering_done = FALSE;
-+ global_ragent_gathering_done = FALSE;
-+ global_lagent_cands = global_ragent_cands = 0;
-+
-+ lagent = nice_agent_new_full (NULL,
-+ NICE_COMPATIBILITY_RFC5245,
-+ FALSE, /* reliable */
-+ l_nomination_mode);
-+
-+ ragent = nice_agent_new_full (NULL,
-+ NICE_COMPATIBILITY_RFC5245,
-+ FALSE, /* reliable */
-+ r_nomination_mode);
-+
-+ g_object_set (G_OBJECT (lagent), "ice-tcp", FALSE, NULL);
-+ g_object_set (G_OBJECT (ragent), "ice-tcp", FALSE, NULL);
-+
-+ g_object_set (G_OBJECT (lagent), "upnp", FALSE, NULL);
-+ g_object_set (G_OBJECT (ragent), "upnp", FALSE, NULL);
-+ nice_agent_set_software (lagent, "Test-nomination, Left Agent");
-+ nice_agent_set_software (ragent, "Test-nomination, Right Agent");
-+
-+ timer_id = g_timeout_add (30000, timer_cb, NULL);
-+
-+ if (!nice_address_set_from_string (&localaddr, localhost))
-+ g_assert_not_reached ();
-+ nice_agent_add_local_address (lagent, &localaddr);
-+ nice_agent_add_local_address (ragent, &localaddr);
-+
-+ g_signal_connect (G_OBJECT (lagent), "candidate-gathering-done",
-+ G_CALLBACK (cb_candidate_gathering_done), GUINT_TO_POINTER(1));
-+ g_signal_connect (G_OBJECT (ragent), "candidate-gathering-done",
-+ G_CALLBACK (cb_candidate_gathering_done), GUINT_TO_POINTER (2));
-+ g_signal_connect (G_OBJECT (lagent), "component-state-changed",
-+ G_CALLBACK (cb_component_state_changed), GUINT_TO_POINTER (1));
-+ g_signal_connect (G_OBJECT (ragent), "component-state-changed",
-+ G_CALLBACK (cb_component_state_changed), GUINT_TO_POINTER (2));
-+ g_signal_connect (G_OBJECT (lagent), "new-selected-pair",
-+ G_CALLBACK (cb_new_selected_pair), GUINT_TO_POINTER(1));
-+ g_signal_connect (G_OBJECT (ragent), "new-selected-pair",
-+ G_CALLBACK (cb_new_selected_pair), GUINT_TO_POINTER (2));
-+
-+ g_object_set (G_OBJECT (lagent), "controlling-mode", TRUE, NULL);
-+ g_object_set (G_OBJECT (ragent), "controlling-mode", FALSE, NULL);
-+
-+ ls_id = nice_agent_add_stream (lagent, 1);
-+ rs_id = nice_agent_add_stream (ragent, 1);
-+ g_assert (ls_id > 0);
-+ g_assert (rs_id > 0);
-+
-+ /* Gather candidates and test nice_agent_set_port_range */
-+ g_assert (nice_agent_gather_candidates (lagent, ls_id) == TRUE);
-+ g_assert (nice_agent_gather_candidates (ragent, rs_id) == TRUE);
-+
-+ nice_agent_attach_recv (lagent, ls_id, NICE_COMPONENT_TYPE_RTP,
-+ g_main_context_default (), cb_nice_recv, GUINT_TO_POINTER (1));
-+ nice_agent_attach_recv (ragent, rs_id, NICE_COMPONENT_TYPE_RTP,
-+ g_main_context_default (), cb_nice_recv, GUINT_TO_POINTER (2));
-+
-+ g_debug ("test-nomination: Added streams, running context until 'candidate-gathering-done'...");
-+ while (!global_lagent_gathering_done)
-+ g_main_context_iteration (NULL, TRUE);
-+ g_assert (global_lagent_gathering_done == TRUE);
-+ while (!global_ragent_gathering_done)
-+ g_main_context_iteration (NULL, TRUE);
-+ g_assert (global_ragent_gathering_done == TRUE);
-+
-+ set_credentials (lagent, ls_id, ragent, rs_id);
-+
-+ set_candidates (ragent, rs_id, lagent, ls_id, NICE_COMPONENT_TYPE_RTP);
-+ set_candidates (lagent, ls_id, ragent, rs_id, NICE_COMPONENT_TYPE_RTP);
-+
-+ while (global_lagent_state[0] != NICE_COMPONENT_STATE_READY ||
-+ global_ragent_state[0] != NICE_COMPONENT_STATE_READY)
-+ g_main_context_iteration (NULL, TRUE);
-+ g_assert (global_lagent_state[0] == NICE_COMPONENT_STATE_READY);
-+ g_assert (global_ragent_state[0] == NICE_COMPONENT_STATE_READY);
-+
-+ nice_agent_remove_stream (lagent, ls_id);
-+ nice_agent_remove_stream (ragent, rs_id);
-+
-+ g_source_remove (timer_id);
-+
-+ g_clear_object(&lagent);
-+ g_clear_object(&ragent);
-+}
-+
-+static void
-+regular (void)
-+{
-+ run_test(NICE_NOMINATION_MODE_REGULAR, NICE_NOMINATION_MODE_REGULAR);
-+}
-+
-+static void
-+aggressive (void)
-+{
-+ run_test(NICE_NOMINATION_MODE_AGGRESSIVE, NICE_NOMINATION_MODE_AGGRESSIVE);
-+}
-+
-+static void
-+mixed_ra (void)
-+{
-+ run_test(NICE_NOMINATION_MODE_REGULAR, NICE_NOMINATION_MODE_AGGRESSIVE);
-+}
-+
-+static void
-+mixed_ar (void)
-+{
-+ run_test(NICE_NOMINATION_MODE_AGGRESSIVE, NICE_NOMINATION_MODE_REGULAR);
-+}
-+
-+int
-+main (int argc, char **argv)
-+{
-+ int ret;
-+
-+ g_test_init (&argc, &argv, NULL);
-+
-+ g_test_add_func ("/nice/nomination/regular", regular);
-+ g_test_add_func ("/nice/nomination/aggressive", aggressive);
-+ g_test_add_func ("/nice/nomination/mixed_ra", mixed_ra);
-+ g_test_add_func ("/nice/nomination/mixed_ar", mixed_ar);
-+
-+ ret = g_test_run ();
-+
-+ return ret;
-+}
---
-2.13.6
-
-
-From 58d061df8f5425dc1add9c6030a2f891ebda4616 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Mon, 7 Mar 2016 16:35:09 +0100
-Subject: [PATCH 28/70] conncheck: update pair valid property selectively
-
-With this patch, we fix a corner case when the succeeded pair is a
-peer-reflexive candidate pair, that already has been discovered
-previously, In this case, the current pair -p- should not be marked
-valid, because the valid flag is already set on the discovered pair.
-
-Differential Revision: https://phabricator.freedesktop.org/D1124
----
- agent/conncheck.c | 18 +++++++++++++-----
- 1 file changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 6827e6e..ef8df68 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -2760,6 +2760,13 @@ static CandidateCheckPair *priv_process_response_check_for_reflexive(NiceAgent *
- }
-
- if (new_pair) {
-+ /* note: when new_pair is distinct from p, it means new_pair is a
-+ * previously discovered peer-reflexive candidate pair, so we don't
-+ * set the valid flag on p in this case, because the valid flag is
-+ * already set on the discovered pair.
-+ */
-+ if (new_pair == p)
-+ p->valid = TRUE;
- p->state = NICE_CHECK_SUCCEEDED;
- nice_debug ("Agent %p : conncheck %p SUCCEEDED.", agent, p);
- priv_conn_check_unfreeze_related (agent, stream, p);
-@@ -2788,6 +2795,10 @@ static CandidateCheckPair *priv_process_response_check_for_reflexive(NiceAgent *
- if (local_cand)
- new_pair = priv_add_peer_reflexive_pair (agent, stream->id, component,
- local_cand, p);
-+ /* note: this is same as "adding to VALID LIST" in the spec
-+ text */
-+ if (new_pair)
-+ new_pair->valid = TRUE;
- /* step: The agent sets the state of the pair that *generated* the check to
- * Succeeded, RFC 5245, 7.1.3.2.3, "Updating Pair States"
- */
-@@ -2796,12 +2807,9 @@ static CandidateCheckPair *priv_process_response_check_for_reflexive(NiceAgent *
- agent, p, new_pair);
- }
-
-- /* note: this is same as "adding to VALID LIST" in the spec
-- text */
-- if (new_pair) {
-- new_pair->valid = TRUE;
-+ if (new_pair && new_pair->valid)
- nice_component_add_valid_candidate (component, remote_candidate);
-- }
-+
-
- return new_pair;
- }
---
-2.13.6
-
-
-From 15c0546f624113b8c0546a1f883a48bff7020f1b Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 19 Apr 2016 17:06:32 +0200
-Subject: [PATCH 29/70] conncheck: improve the selection of the pairs to be
- checked
-
-This patch aims to implement more closely the algorithm described
-in RFC 5245 indicating how pairs are transitionned from state Frozen
-to Waiting. This is described in 7.1.3.2 when a check succeeded, and
-correspond to modifications in function priv_conn_check_unfreeze_related().
-This is also described in 5.7.4 when defining the initial state of the
-pairs in a conncheck, and correspond to modifications in function
-priv_conn_check_unfreeze_next().
-
-This patch introduces the notion of active and frozen check list. It
-allows us to define the timer restranmission delay as described in 16.1.
-
-Another modification in priv_conn_check_tick_unlocked() is that every
-stream in handled consecutively, and in an independant way. The pacing
-was previously of a single STUN request emitted per callback, it is now
-of a triggered check per callback OR a single STUN per callback AND per
-stream per callback.
-
-The description of ordinary checks per stream in 5.8 is detailled in
-function priv_conn_check_tick_stream(), and a remaining of the code
-used to nominate a pair by the controlling agent is put in a dedicated
-function priv_conn_check_tick_stream_nominate()
-
-Differential Revision: https://phabricator.freedesktop.org/D813
----
- agent/conncheck.c | 535 ++++++++++++++++++++++++++++++++++++++----------------
- agent/stream.c | 21 ---
- agent/stream.h | 3 -
- 3 files changed, 381 insertions(+), 178 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index ef8df68..6b1b7e3 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -212,6 +212,89 @@ priv_get_pair_from_triggered_check_queue (NiceAgent *agent)
- }
-
- /*
-+ * Check if the conncheck list if Active according to
-+ * ICE spec, 5.7.4 (Computing States)
-+ *
-+ * note: the ICE spec in unclear about that, but the check list should
-+ * be considered active when there is at least a pair in Waiting state
-+ * OR a pair in In-Progress state.
-+ */
-+static gboolean
-+priv_is_checklist_active (NiceStream *stream)
-+{
-+ GSList *i;
-+
-+ for (i = stream->conncheck_list; i ; i = i->next) {
-+ CandidateCheckPair *p = i->data;
-+ if (p->state == NICE_CHECK_WAITING || p->state == NICE_CHECK_IN_PROGRESS)
-+ return TRUE;
-+ }
-+ return FALSE;
-+}
-+
-+/*
-+ * Check if the conncheck list if Frozen according to
-+ * ICE spec, 5.7.4 (Computing States)
-+ */
-+static gboolean
-+priv_is_checklist_frozen (NiceStream *stream)
-+{
-+ GSList *i;
-+
-+ if (stream->conncheck_list == NULL)
-+ return FALSE;
-+
-+ for (i = stream->conncheck_list; i ; i = i->next) {
-+ CandidateCheckPair *p = i->data;
-+ if (p->state != NICE_CHECK_FROZEN)
-+ return FALSE;
-+ }
-+ return TRUE;
-+}
-+
-+/*
-+ * Check if all components of the stream have
-+ * a valid pair (used for ICE spec, 7.1.3.2.3, point 2.)
-+ */
-+static gboolean
-+priv_all_components_have_valid_pair (NiceStream *stream)
-+{
-+ guint i;
-+ GSList *j;
-+
-+ for (i = 1; i <= stream->n_components; i++) {
-+ for (j = stream->conncheck_list; j ; j = j->next) {
-+ CandidateCheckPair *p = j->data;
-+ if (p->component_id == i && p->valid)
-+ break;
-+ }
-+ if (j == NULL)
-+ return FALSE;
-+ }
-+ return TRUE;
-+}
-+
-+/*
-+ * Check if the foundation in parameter matches the foundation
-+ * of a valid pair in the conncheck list [of stream] (used for ICE spec,
-+ * 7.1.3.2.3, point 2.)
-+ */
-+static gboolean
-+priv_foundation_matches_a_valid_pair (const gchar *foundation, NiceStream *stream)
-+{
-+ GSList *i;
-+
-+ for (i = stream->conncheck_list; i ; i = i->next) {
-+ CandidateCheckPair *p = i->data;
-+ if (p->valid &&
-+ strncmp (p->foundation, foundation,
-+ NICE_CANDIDATE_PAIR_MAX_FOUNDATION) == 0)
-+ return TRUE;
-+ }
-+ return FALSE;
-+}
-+
-+/*
- * Finds the next connectivity check in WAITING state.
- */
- static CandidateCheckPair *priv_conn_check_find_next_waiting (GSList *conn_check_list)
-@@ -220,7 +303,6 @@ static CandidateCheckPair *priv_conn_check_find_next_waiting (GSList *conn_check
-
- /* note: list is sorted in priority order to first waiting check has
- * the highest priority */
--
- for (i = conn_check_list; i ; i = i->next) {
- CandidateCheckPair *p = i->data;
- if (p->state == NICE_CHECK_WAITING)
-@@ -231,6 +313,74 @@ static CandidateCheckPair *priv_conn_check_find_next_waiting (GSList *conn_check
- }
-
- /*
-+ * Finds the next connectivity check in FROZEN state.
-+ */
-+static CandidateCheckPair *
-+priv_conn_check_find_next_frozen (GSList *conn_check_list)
-+{
-+ GSList *i;
-+
-+ /* note: list is sorted in priority order to first frozen check has
-+ * the highest priority */
-+ for (i = conn_check_list; i ; i = i->next) {
-+ CandidateCheckPair *p = i->data;
-+ if (p->state == NICE_CHECK_FROZEN)
-+ return p;
-+ }
-+
-+ return NULL;
-+}
-+
-+/*
-+ * Returns the number of check lists of the agent
-+ */
-+static guint
-+priv_number_of_check_lists (NiceAgent *agent)
-+{
-+ guint n = 0;
-+ GSList *i;
-+
-+ for (i = agent->streams; i ; i = i->next) {
-+ NiceStream *stream = i->data;
-+ if (stream->conncheck_list != NULL)
-+ n++;
-+ }
-+ return n;
-+}
-+
-+/*
-+ * Returns the number of active check lists of the agent
-+ */
-+static guint
-+priv_number_of_active_check_lists (NiceAgent *agent)
-+{
-+ guint n = 0;
-+ GSList *i;
-+
-+ for (i = agent->streams; i ; i = i->next)
-+ if (priv_is_checklist_active (i->data))
-+ n++;
-+ return n;
-+}
-+
-+/*
-+ * Returns the first stream of the agent having a Frozen
-+ * connection check list
-+ */
-+static NiceStream *
-+priv_find_first_frozen_check_list (NiceAgent *agent)
-+{
-+ GSList *i;
-+
-+ for (i = agent->streams; i ; i = i->next) {
-+ NiceStream *stream = i->data;
-+ if (priv_is_checklist_frozen (stream))
-+ return stream;
-+ }
-+ return NULL;
-+}
-+
-+/*
- * Initiates a new connectivity check for a ICE candidate pair.
- *
- * @return TRUE on success, FALSE on error
-@@ -248,58 +398,55 @@ static gboolean priv_conn_check_initiate (NiceAgent *agent, CandidateCheckPair *
- /*
- * Unfreezes the next connectivity check in the list. Follows the
- * algorithm (2.) defined in 5.7.4 (Computing States) of the ICE spec
-- * (ID-19), with some exceptions (see comments in code).
-+ * (RFC5245)
- *
- * See also sect 7.1.2.2.3 (Updating Pair States), and
- * priv_conn_check_unfreeze_related().
- *
- * @return TRUE on success, and FALSE if no frozen candidates were found.
- */
--static gboolean priv_conn_check_unfreeze_next (NiceAgent *agent)
-+static gboolean priv_conn_check_unfreeze_next (NiceAgent *agent, NiceStream *stream)
- {
-- CandidateCheckPair *pair = NULL;
- GSList *i, *j;
--
-- /* XXX: the unfreezing is implemented a bit differently than in the
-- * current ICE spec, but should still be interoperate:
-- * - checks are not grouped by foundation
-- * - one frozen check is unfrozen (lowest component-id, highest
-- * priority)
-- */
-+ GSList *found_list = NULL;
-+ gboolean result = FALSE;
-
- priv_print_conn_check_lists (agent, G_STRFUNC, NULL);
-
-- for (i = agent->streams; i; i = i->next) {
-- NiceStream *stream = i->data;
-- guint64 max_frozen_priority = 0;
-+ for (i = stream->conncheck_list; i ; i = i->next) {
-+ CandidateCheckPair *p1 = i->data;
-+ CandidateCheckPair *pair = NULL;
-+ guint lowest_component_id = stream->n_components + 1;
-+ guint64 highest_priority = 0;
-
-+ if (g_slist_find_custom (found_list, p1->foundation, (GCompareFunc)strcmp))
-+ continue;
-+ found_list = g_slist_prepend (found_list, p1->foundation);
-
- for (j = stream->conncheck_list; j ; j = j->next) {
-- CandidateCheckPair *p = j->data;
--
-- /* XXX: the prio check could be removed as the pairs are sorted
-- * already */
--
-- if (p->state == NICE_CHECK_FROZEN) {
-- if (p->priority > max_frozen_priority) {
-- max_frozen_priority = p->priority;
-- pair = p;
-- }
-+ CandidateCheckPair *p2 = i->data;
-+ if (strncmp (p2->foundation, p1->foundation,
-+ NICE_CANDIDATE_PAIR_MAX_FOUNDATION) == 0) {
-+ if (p2->component_id < lowest_component_id ||
-+ (p2->component_id == lowest_component_id &&
-+ p2->priority > highest_priority)) {
-+ pair = p2;
-+ lowest_component_id = p2->component_id;
-+ highest_priority = p2->priority;
-+ }
- }
- }
-
-- if (pair)
-- break;
-- }
--
-- if (pair) {
-- nice_debug ("Agent %p : Pair %p with s/c-id %u/%u (%s) unfrozen.", agent, pair, pair->stream_id, pair->component_id, pair->foundation);
-- pair->state = NICE_CHECK_WAITING;
-- nice_debug ("Agent %p : pair %p state WAITING", agent, pair);
-- return TRUE;
-+ if (pair) {
-+ nice_debug ("Agent %p : Pair %p with s/c-id %u/%u (%s) unfrozen.",
-+ agent, pair, pair->stream_id, pair->component_id, pair->foundation);
-+ pair->state = NICE_CHECK_WAITING;
-+ nice_debug ("Agent %p : pair %p state WAITING", agent, pair);
-+ result = TRUE;
-+ }
- }
--
-- return FALSE;
-+ g_slist_free (found_list);
-+ return result;
- }
-
- /*
-@@ -316,7 +463,6 @@ static gboolean priv_conn_check_unfreeze_next (NiceAgent *agent)
- static void priv_conn_check_unfreeze_related (NiceAgent *agent, NiceStream *stream, CandidateCheckPair *ok_check)
- {
- GSList *i, *j;
-- guint unfrozen = 0;
-
- g_assert (ok_check);
- g_assert (ok_check->state == NICE_CHECK_SUCCEEDED);
-@@ -336,40 +482,59 @@ static void priv_conn_check_unfreeze_related (NiceAgent *agent, NiceStream *stre
- nice_debug ("Agent %p : Unfreezing check %p (after successful check %p).", agent, p, ok_check);
- p->state = NICE_CHECK_WAITING;
- nice_debug ("Agent %p : pair %p state WAITING", agent, p);
-- ++unfrozen;
- }
- }
- }
-
- /* step: perform the step (2) of 'Updating Pair States' */
- stream = agent_find_stream (agent, ok_check->stream_id);
-- if (nice_stream_all_components_ready (stream)) {
-- /* step: unfreeze checks from other streams */
-+ if (priv_all_components_have_valid_pair (stream)) {
- for (i = agent->streams; i ; i = i->next) {
-+ /* the agent examines the check list for each other
-+ * media stream in turn
-+ */
- NiceStream *s = i->data;
-- for (j = stream->conncheck_list; j ; j = j->next) {
-- CandidateCheckPair *p = j->data;
--
-- if (p->stream_id == s->id &&
-- p->stream_id != ok_check->stream_id) {
-- if (p->state == NICE_CHECK_FROZEN &&
-- strcmp (p->foundation, ok_check->foundation) == 0) {
-+ if (s->id == ok_check->stream_id)
-+ continue;
-+ if (priv_is_checklist_active (s)) {
-+ /* checklist is Active
-+ */
-+ for (j = s->conncheck_list; j ; j = j->next) {
-+ CandidateCheckPair *p = j->data;
-+ if (p->state == NICE_CHECK_FROZEN &&
-+ priv_foundation_matches_a_valid_pair (p->foundation, stream)) {
- nice_debug ("Agent %p : Unfreezing check %p from stream %u (after successful check %p).", agent, p, s->id, ok_check);
- p->state = NICE_CHECK_WAITING;
- nice_debug ("Agent %p : pair %p state WAITING", agent, p);
-- ++unfrozen;
--
-- }
-- }
-+ }
-+ }
-+ } else if (priv_is_checklist_frozen (s)) {
-+ /* checklist is Frozen
-+ */
-+ gboolean match_found = FALSE;
-+ /* check if there is one pair in the check list whose
-+ * foundation matches a pair in the valid list under
-+ * consideration
-+ */
-+ for (j = s->conncheck_list; j ; j = j->next) {
-+ CandidateCheckPair *p = j->data;
-+ if (priv_foundation_matches_a_valid_pair (p->foundation, stream)) {
-+ match_found = TRUE;
-+ nice_debug ("Agent %p : Unfreezing check %p from stream %u (after successful check %p).", agent, p, s->id, ok_check);
-+ p->state = NICE_CHECK_WAITING;
-+ nice_debug ("Agent %p : pair %p state WAITING", agent, p);
-+ }
-+ }
-+
-+ if (!match_found) {
-+ /* set the pair with the lowest component ID
-+ * and highest priority to Waiting
-+ */
-+ priv_conn_check_unfreeze_next (agent, s);
-+ }
- }
-- /* note: only unfreeze check from one stream at a time */
-- if (unfrozen)
-- break;
- }
- }
--
-- if (unfrozen == 0)
-- priv_conn_check_unfreeze_next (agent);
- }
-
- static void
-@@ -400,14 +565,13 @@ candidate_check_pair_fail (NiceStream *stream, NiceAgent *agent, CandidateCheckP
- *
- * @return will return FALSE when no more pending timers.
- */
--static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agent, GTimeVal *now, gboolean *stun_transmitted)
-+static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agent, GTimeVal *now)
- {
- gboolean keep_timer_going = FALSE;
-- guint s_inprogress = 0, s_succeeded = 0, s_discovered = 0,
-- s_nominated = 0, s_waiting_for_nomination = 0, s_valid = 0;
-- guint frozen = 0, waiting = 0;
-- GSList *i, *k;
-+ GSList *i;
-+ CandidateCheckPair *pair;
-
-+ /* step: process ongoing STUN transactions */
- for (i = stream->conncheck_list; i ; i = i->next) {
- CandidateCheckPair *p = i->data;
-
-@@ -451,7 +615,6 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
- p->next_tick = *now;
- g_time_val_add (&p->next_tick, timeout * 1000);
-
-- *stun_transmitted = TRUE;
- return TRUE;
- }
- case STUN_USAGE_TIMER_RETURN_SUCCESS:
-@@ -471,7 +634,57 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
- }
- }
- }
-+ }
-
-+ /* step: perform an ordinary check, ICE spec, 5.8 "Scheduling Checks"
-+ * note: This code is executed when the triggered checks list is
-+ * empty, and when no STUN message has been sent (pacing constraint)
-+ */
-+ pair = priv_conn_check_find_next_waiting (stream->conncheck_list);
-+ if (pair) {
-+ priv_conn_check_initiate (agent, pair);
-+ return TRUE;
-+ }
-+
-+ /* note: this is unclear in the ICE spec, but a check list in Frozen
-+ * state (where all pairs are in Frozen state) is not supposed to
-+ * change its state by an ordinary check, but only by the success of
-+ * checks in other check lists, in priv_conn_check_unfreeze_related().
-+ * The underlying idea is to concentrate the checks on a single check
-+ * list initially.
-+ */
-+ if (priv_is_checklist_frozen (stream))
-+ return keep_timer_going;
-+
-+ /* step: ordinary check continued, if there's no pair in the waiting
-+ * state, pick a pair in the frozen state
-+ */
-+ pair = priv_conn_check_find_next_frozen (stream->conncheck_list);
-+ if (pair) {
-+ pair->state = NICE_CHECK_WAITING;
-+ nice_debug ("Agent %p : pair %p state WAITING", agent, pair);
-+ priv_conn_check_initiate (agent, pair);
-+ return TRUE;
-+ }
-+ return keep_timer_going;
-+}
-+
-+static gboolean
-+priv_conn_check_tick_stream_nominate (NiceStream *stream, NiceAgent *agent)
-+{
-+ gboolean keep_timer_going = FALSE;
-+ guint s_inprogress = 0;
-+ guint s_succeeded = 0;
-+ guint s_discovered = 0;
-+ guint s_nominated = 0;
-+ guint s_waiting_for_nomination = 0;
-+ guint s_valid = 0;
-+ guint frozen = 0;
-+ guint waiting = 0;
-+ GSList *i, *k;
-+
-+ for (i = stream->conncheck_list; i ; i = i->next) {
-+ CandidateCheckPair *p = i->data;
- if (p->state == NICE_CHECK_FROZEN)
- ++frozen;
- else if (p->state == NICE_CHECK_IN_PROGRESS)
-@@ -504,13 +717,13 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
- keep_timer_going = TRUE;
- if (NICE_AGENT_IS_COMPATIBLE_WITH_RFC5245_OR_OC2007R2 (agent)) {
- if (agent->nomination_mode == NICE_NOMINATION_MODE_REGULAR &&
-- agent->controlling_mode &&
-- ((waiting == 0 && s_inprogress == 0) ||
-- (s_succeeded + s_discovered) >= 5 * stream->n_components)){
-+ agent->controlling_mode) {
-+#define NICE_MIN_NUMBER_OF_VALID_PAIRS 2
- /* ICE 8.1.1.1 Regular nomination
-- * we choose to nominate the valid pair if
-- * there is no pair left waiting or in-progress or
-- * if there are at least 5 valid pairs per stream on average.
-+ * we choose to nominate the valid pair of a component if
-+ * - there is no pair left frozen, waiting or in-progress, or
-+ * - if there are at least two valid pairs, or
-+ * - if there is at least one valid pair of type HOST-HOST
- *
- * This is the "stopping criterion" described in 8.1.1.1, and is
- * a "local optimization" between accumulating more valid pairs,
-@@ -523,36 +736,63 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
- component_item = component_item->next) {
- NiceComponent *component = component_item->data;
- gboolean already_done = FALSE;
-+ gboolean stopping_criterion = FALSE;
-+ guint p_valid = 0;
-+ guint p_frozen = 0;
-+ guint p_waiting = 0;
-+ guint p_inprogress = 0;
-+ guint p_host_host_valid = 0;
-
- /* verify that the choice of the pair to be nominated
- * has not already been done
- */
- for (k = stream->conncheck_list; k ; k = k->next) {
- CandidateCheckPair *p = k->data;
-- if (p->component_id == component->id &&
-- p->use_candidate_on_next_check) {
-- already_done = TRUE;
-- break;
-+ if (p->component_id == component->id) {
-+ if (p->use_candidate_on_next_check)
-+ already_done = TRUE;
-+ if (p->state == NICE_CHECK_FROZEN)
-+ p_frozen++;
-+ else if (p->state == NICE_CHECK_WAITING)
-+ p_waiting++;
-+ else if (p->state == NICE_CHECK_IN_PROGRESS)
-+ p_inprogress++;
-+ if (p->valid)
-+ p_valid++;
-+ if (p->valid &&
-+ p->local->type == NICE_CANDIDATE_TYPE_HOST &&
-+ p->remote->type == NICE_CANDIDATE_TYPE_HOST)
-+ p_host_host_valid++;
- }
- }
-
-- /* choose a pair to be nominated in the list of valid
-- * pairs, and add it to the triggered checks list
-+ if (already_done)
-+ continue;
-+
-+ stopping_criterion =
-+ (p_host_host_valid > 0 ||
-+ p_valid >= NICE_MIN_NUMBER_OF_VALID_PAIRS ||
-+ (p_waiting == 0 && p_inprogress == 0 && p_frozen == 0));
-+
-+ if (!stopping_criterion)
-+ continue;
-+
-+ /* when the stopping criterion is satisfied, we choose
-+ * a pair to be nominated in the list of valid pairs,
-+ * and add it to the triggered checks list
- */
-- if (!already_done) {
-- for (k = stream->conncheck_list; k ; k = k->next) {
-- CandidateCheckPair *p = k->data;
-- /* note: highest priority item selected (list always sorted) */
-- if (p->component_id == component->id &&
-- !p->nominated &&
-- !p->use_candidate_on_next_check &&
-- p->valid) {
-- nice_debug ("Agent %p : restarting check %p with "
-- "USE-CANDIDATE attrib (regular nomination)", agent, p);
-- p->use_candidate_on_next_check = TRUE;
-- priv_add_pair_to_triggered_check_queue (agent, p);
-- break; /* move to the next component */
-- }
-+ for (k = stream->conncheck_list; k ; k = k->next) {
-+ CandidateCheckPair *p = k->data;
-+ /* note: highest priority item selected (list always sorted) */
-+ if (p->component_id == component->id &&
-+ !p->nominated &&
-+ !p->use_candidate_on_next_check &&
-+ p->valid) {
-+ nice_debug ("Agent %p : restarting check %p with "
-+ "USE-CANDIDATE attrib (regular nomination)", agent, p);
-+ p->use_candidate_on_next_check = TRUE;
-+ priv_add_pair_to_triggered_check_queue (agent, p);
-+ break; /* move to the next component */
- }
- }
- }
-@@ -615,70 +855,55 @@ static gboolean priv_conn_check_tick_unlocked (NiceAgent *agent)
- {
- CandidateCheckPair *pair = NULL;
- gboolean keep_timer_going = FALSE;
-- gboolean res;
-- /* note: we try to only generate a single stun transaction per timer
-- * callback, to respect some pacing of STUN transaction, as per
-- * appendix B.1 of ICE spec.
-- */
-- gboolean stun_transmitted = FALSE;
- GSList *i, *j;
- GTimeVal now;
-
-- /* step: process ongoing STUN transactions */
- g_get_current_time (&now);
-
-- for (j = agent->streams; j; j = j->next) {
-- NiceStream *stream = j->data;
-- res = priv_conn_check_tick_stream (stream, agent, &now, &stun_transmitted);
-- if (res)
-- keep_timer_going = res;
-- if (stun_transmitted)
-- return TRUE;
-- }
--
-- /* step: first initiate a conncheck with a pair from the triggered list */
-- pair = priv_get_pair_from_triggered_check_queue (agent);
--
-- if (pair) {
-- priv_print_conn_check_lists (agent, G_STRFUNC,
-- ", got a pair from triggered check list");
-- priv_conn_check_initiate (agent, pair);
-+ /* the conncheck really starts when we have built
-+ * a connection check list for each stream
-+ */
-+ if (priv_number_of_check_lists (agent) < g_slist_length (agent->streams))
- return TRUE;
-- }
-
-- /* step: when the triggered list is empty,
-- * find the highest priority waiting check and send it */
-- for (i = agent->streams; i ; i = i->next) {
-- NiceStream *stream = i->data;
--
-- pair = priv_conn_check_find_next_waiting (stream->conncheck_list);
-- if (pair)
-- break;
-+ /* configure the initial state of the check lists of the agent
-+ * as described in ICE spec, 5.7.4
-+ *
-+ * if all pairs in all check lists are in frozen state, then
-+ * we are in the initial state (5.7.4, point 1.)
-+ */
-+ if (priv_number_of_active_check_lists (agent) == 0) {
-+ /* set some pairs of the first stream in the waiting state
-+ * ICE spec, 5.7.4, point 2.
-+ *
-+ * note: we adapt the ICE spec here, by selecting the first
-+ * frozen check list, which is not necessarily the check
-+ * list of the first stream (the first stream may be completed)
-+ */
-+ NiceStream *stream = priv_find_first_frozen_check_list (agent);
-+ if (stream)
-+ priv_conn_check_unfreeze_next (agent, stream);
- }
-
-+ /* step: perform a test from the triggered checks list,
-+ * ICE spec, 5.8 "Scheduling Checks"
-+ */
-+ pair = priv_get_pair_from_triggered_check_queue (agent);
-+
- if (pair) {
- priv_conn_check_initiate (agent, pair);
- return TRUE;
- }
-
-- /* step: when there's no pair in the Waiting state,
-- * unfreeze a new pair and check it
-+ /* step: process ongoing STUN transactions and
-+ * perform an ordinary check, ICE spec, 5.8, "Scheduling Checks"
- */
-- priv_conn_check_unfreeze_next (agent);
--
- for (i = agent->streams; i ; i = i->next) {
- NiceStream *stream = i->data;
--
-- pair = priv_conn_check_find_next_waiting (stream->conncheck_list);
-- if (pair)
-- break;
-- }
--
-- if (pair) {
-- priv_print_conn_check_lists (agent, G_STRFUNC,
-- ", got a pair in Waiting state");
-- priv_conn_check_initiate (agent, pair);
-- return TRUE;
-+ if (priv_conn_check_tick_stream (stream, agent, &now))
-+ keep_timer_going = TRUE;
-+ if (priv_conn_check_tick_stream_nominate (stream, agent))
-+ keep_timer_going = TRUE;
- }
-
- /* step: stop timer if no work left */
-@@ -2169,30 +2394,28 @@ size_t priv_get_password (NiceAgent *agent, NiceStream *stream,
-
- /* Implement the computation specific in RFC 5245 section 16 */
-
--static unsigned int priv_compute_conncheck_timer (NiceAgent *agent)
-+static unsigned int priv_compute_conncheck_timer (NiceAgent *agent, NiceStream *stream)
- {
-- GSList *item1, *item2;
-+ GSList *i;
- guint waiting_and_in_progress = 0;
-+ guint n = 0;
- unsigned int rto = 0;
-
--
-- for (item1 = agent->streams; item1; item1 = item1->next) {
-- NiceStream *stream = item1->data;;
-- for (item2 = stream->conncheck_list; item2; item2 = item2->next) {
-- CandidateCheckPair *pair = item2->data;
--
-- if (pair->state == NICE_CHECK_IN_PROGRESS ||
-- pair->state == NICE_CHECK_WAITING)
-- waiting_and_in_progress++;
-- }
-+ for (i = stream->conncheck_list; i ; i = i->next) {
-+ CandidateCheckPair *p = i->data;
-+ if (p->state == NICE_CHECK_IN_PROGRESS ||
-+ p->state == NICE_CHECK_WAITING)
-+ waiting_and_in_progress++;
- }
-
-- rto = agent->timer_ta * waiting_and_in_progress;
-+ n = priv_number_of_active_check_lists (agent);
-+ rto = agent->timer_ta * n * waiting_and_in_progress;
-
- /* We assume non-reliable streams are RTP, so we use 100 as the max */
-- nice_debug ("Agent %p : timer set to %dms (waiting+in_progress=%d)",
-+ nice_debug ("Agent %p : timer set to %dms, "
-+ "waiting+in_progress=%d, nb_active=%d",
- agent, agent->reliable ? MAX (rto, 500) : MAX (rto, 100),
-- waiting_and_in_progress);
-+ waiting_and_in_progress, n);
- if (agent->reliable)
- return MAX (rto, 500);
- else
-@@ -2312,7 +2535,7 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair)
- stun_timer_start_reliable(&pair->timer, agent->stun_reliable_timeout);
- } else {
- stun_timer_start (&pair->timer,
-- priv_compute_conncheck_timer (agent),
-+ priv_compute_conncheck_timer (agent, stream),
- agent->stun_max_retransmissions);
- }
-
-@@ -2477,7 +2700,7 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
- p->timer_restarted ? "no" : "yes");
- if (!nice_socket_is_reliable (p->sockptr) && !p->timer_restarted) {
- stun_timer_start (&p->timer,
-- priv_compute_conncheck_timer (agent),
-+ priv_compute_conncheck_timer (agent, stream),
- agent->stun_max_retransmissions);
- p->timer_restarted = TRUE;
- }
-@@ -2769,7 +2992,6 @@ static CandidateCheckPair *priv_process_response_check_for_reflexive(NiceAgent *
- p->valid = TRUE;
- p->state = NICE_CHECK_SUCCEEDED;
- nice_debug ("Agent %p : conncheck %p SUCCEEDED.", agent, p);
-- priv_conn_check_unfreeze_related (agent, stream, p);
- nice_component_add_valid_candidate (component, remote_candidate);
- }
- else {
-@@ -2894,7 +3116,6 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, NiceStre
- g_assert_not_reached ();
- nice_debug ("Agent %p : Mapped address not found."
- " conncheck %p SUCCEEDED.", agent, p);
-- priv_conn_check_unfreeze_related (agent, stream, p);
- nice_component_add_valid_candidate (component, p->remote);
- } else {
- ok_pair = priv_process_response_check_for_reflexive (agent,
-@@ -2902,6 +3123,12 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, NiceStre
- local_candidate, remote_candidate);
- }
-
-+ /* note: The success of this check might also
-+ * cause the state of other checks to change as well, ICE
-+ * spec 7.1.3.2.3
-+ */
-+ priv_conn_check_unfreeze_related (agent, stream, p);
-+
- /* Note: this assignment helps to reduce the numbers of cases
- * to be tested. If ok_pair and p refer to distinct pairs, it
- * means that ok_pair is a discovered peer reflexive one,
-diff --git a/agent/stream.c b/agent/stream.c
-index 8121e12..533ff15 100644
---- a/agent/stream.c
-+++ b/agent/stream.c
-@@ -104,27 +104,6 @@ nice_stream_find_component_by_id (NiceStream *stream, guint id)
- }
-
- /*
-- * Returns true if all components of the stream are either
-- * 'CONNECTED' or 'READY' (connected plus nominated).
-- */
--gboolean
--nice_stream_all_components_ready (NiceStream *stream)
--{
-- GSList *i;
--
-- for (i = stream->components; i; i = i->next) {
-- NiceComponent *component = i->data;
-- if (component &&
-- !(component->state == NICE_COMPONENT_STATE_CONNECTED ||
-- component->state == NICE_COMPONENT_STATE_READY))
-- return FALSE;
-- }
--
-- return TRUE;
--}
--
--
--/*
- * Initialized the local crendentials for the stream.
- */
- void
-diff --git a/agent/stream.h b/agent/stream.h
-index f9188cb..954ba66 100644
---- a/agent/stream.h
-+++ b/agent/stream.h
-@@ -103,9 +103,6 @@ nice_stream_new (guint n_components, NiceAgent *agent);
- void
- nice_stream_close (NiceStream *stream);
-
--gboolean
--nice_stream_all_components_ready (NiceStream *stream);
--
- NiceComponent *
- nice_stream_find_component_by_id (NiceStream *stream, guint id);
-
---
-2.13.6
-
-
-From ead3453d04fc70865d176ab073636f8b9078cbbc Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 12 Apr 2016 13:20:38 +0200
-Subject: [PATCH 30/70] conncheck: invoke the debug dump in more places
-
-Differential Revision: https://phabricator.freedesktop.org/D1123
----
- agent/conncheck.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 6b1b7e3..2d2224d 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -642,6 +642,8 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
- */
- pair = priv_conn_check_find_next_waiting (stream->conncheck_list);
- if (pair) {
-+ priv_print_conn_check_lists (agent, G_STRFUNC,
-+ ", got a pair in Waiting state");
- priv_conn_check_initiate (agent, pair);
- return TRUE;
- }
-@@ -661,6 +663,8 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
- */
- pair = priv_conn_check_find_next_frozen (stream->conncheck_list);
- if (pair) {
-+ priv_print_conn_check_lists (agent, G_STRFUNC,
-+ ", got a pair in Frozen state");
- pair->state = NICE_CHECK_WAITING;
- nice_debug ("Agent %p : pair %p state WAITING", agent, pair);
- priv_conn_check_initiate (agent, pair);
-@@ -891,6 +895,8 @@ static gboolean priv_conn_check_tick_unlocked (NiceAgent *agent)
- pair = priv_get_pair_from_triggered_check_queue (agent);
-
- if (pair) {
-+ priv_print_conn_check_lists (agent, G_STRFUNC,
-+ ", got a pair from triggered check list");
- priv_conn_check_initiate (agent, pair);
- return TRUE;
- }
---
-2.13.6
-
-
-From 2fd7808419f459d5f6e97701ca6a350ddee6b7f2 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 19 Apr 2016 17:59:27 +0200
-Subject: [PATCH 31/70] conncheck: improve triggered check of in-progress pairs
-
-This patch update the way triggered checks of in-progress pairs are
-handled, according to ICE spec, section 7.2.1.4. Previously the same
-connection check was retransmitted with an updated timeout. This causes
-problems when a controlling role switch occurs in this time frame.
-This is the reason why a new connection check must be generated
-reflecting the updated role. We introduce a new flag "recheck_on_timeout"
-in the pair indicating that the pair must be rechecked at the next timer
-expiration.
-
-Differential Revision: https://phabricator.freedesktop.org/D875
----
- agent/conncheck.c | 88 +++++++++++++++++++++++++++++++++++++++++++++----------
- agent/conncheck.h | 2 +-
- 2 files changed, 74 insertions(+), 16 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 2d2224d..3a489fe 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -558,6 +558,37 @@ candidate_check_pair_fail (NiceStream *stream, NiceAgent *agent, CandidateCheckP
- }
-
- /*
-+ * Function that resubmits a new connection check, after a previous
-+ * check in in-progress state got cancelled due to an incoming stun
-+ * request matching this same pair
-+ *
-+ * @return will return TRUE if the pair is scheduled for recheck
-+ */
-+static gboolean
-+priv_conn_recheck_on_timeout (NiceAgent *agent, CandidateCheckPair *p)
-+{
-+ if (p->recheck_on_timeout) {
-+ g_assert (p->state == NICE_CHECK_IN_PROGRESS);
-+ /* this cancelled pair may have the flag 'mark nominated
-+ * on response arrival' set, we want to keep it, because
-+ * this is needed to nominate this pair in aggressive
-+ * nomination, when the agent is in controlled mode.
-+ *
-+ * this cancelled pair may also have the flag 'use candidate
-+ * on next check' set, that we want to preserve too.
-+ */
-+ nice_debug ("Agent %p : pair %p was cancelled, "
-+ "triggering a new connection check", agent, p);
-+ p->recheck_on_timeout = FALSE;
-+ p->state = NICE_CHECK_WAITING;
-+ nice_debug ("Agent %p : pair %p state WAITING", agent, p);
-+ priv_add_pair_to_triggered_check_queue (agent, p);
-+ return TRUE;
-+ }
-+ return FALSE;
-+}
-+
-+/*
- * Helper function for connectivity check timer callback that
- * runs through the stream specific part of the state machine.
- *
-@@ -584,8 +615,17 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
- switch (stun_timer_refresh (&p->timer)) {
- case STUN_USAGE_TIMER_RETURN_TIMEOUT:
- {
-- /* case: error, abort processing */
- gchar tmpbuf1[INET6_ADDRSTRLEN], tmpbuf2[INET6_ADDRSTRLEN];
-+
-+ /* case: conncheck cancelled due to in-progress incoming
-+ * check, requeing the pair, ICE spec, sect 7.2.1.4
-+ * "Triggered Checks", "If the state of that pair is
-+ * In-Progress..."
-+ */
-+ if (priv_conn_recheck_on_timeout (agent, p))
-+ break;
-+
-+ /* case: error, abort processing */
- nice_address_to_string (&p->local->addr, tmpbuf1);
- nice_address_to_string (&p->remote->addr, tmpbuf2);
- nice_debug ("Agent %p : Retransmissions failed, giving up on connectivity check %p", agent, p);
-@@ -600,8 +640,17 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
- }
- case STUN_USAGE_TIMER_RETURN_RETRANSMIT:
- {
-- /* case: not ready, so schedule a new timeout */
- unsigned int timeout = stun_timer_remainder (&p->timer);
-+
-+ /* case: conncheck cancelled due to in-progress incoming
-+ * check, requeing the pair, ICE spec, sect 7.2.1.4
-+ * "Triggered Checks", "If the state of that pair is
-+ * In-Progress..."
-+ */
-+ if (priv_conn_recheck_on_timeout (agent, p))
-+ break;
-+
-+ /* case: not ready, so schedule a new timeout */
- nice_debug ("Agent %p :STUN transaction retransmitted on pair %p "
- "(timeout %dms, delay=%dms, retrans=%d).",
- agent, p, timeout, p->timer.delay, p->timer.retransmissions);
-@@ -642,6 +691,12 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
- */
- pair = priv_conn_check_find_next_waiting (stream->conncheck_list);
- if (pair) {
-+ /* remove the pair from the triggered check list if needed. This
-+ * may happen with the cancelled pair, that's just been added
-+ * in state waiting to the triggered check list above in the
-+ * same function.
-+ */
-+ priv_remove_pair_from_triggered_check_queue (agent, pair);
- priv_print_conn_check_lists (agent, G_STRFUNC,
- ", got a pair in Waiting state");
- priv_conn_check_initiate (agent, pair);
-@@ -794,6 +849,7 @@ priv_conn_check_tick_stream_nominate (NiceStream *stream, NiceAgent *agent)
- p->valid) {
- nice_debug ("Agent %p : restarting check %p with "
- "USE-CANDIDATE attrib (regular nomination)", agent, p);
-+ p->recheck_on_timeout = FALSE;
- p->use_candidate_on_next_check = TRUE;
- priv_add_pair_to_triggered_check_queue (agent, p);
- break; /* move to the next component */
-@@ -816,6 +872,7 @@ priv_conn_check_tick_stream_nominate (NiceStream *stream, NiceAgent *agent)
- p->state == NICE_CHECK_DISCOVERED)) {
- nice_debug ("Agent %p : restarting check %p as the nominated pair.", agent, p);
- p->nominated = TRUE;
-+ p->recheck_on_timeout = FALSE;
- priv_update_selected_pair (agent, component, p);
- priv_add_pair_to_triggered_check_queue (agent, p);
- break; /* move to the next component */
-@@ -2697,19 +2754,20 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
- p->state == NICE_CHECK_FROZEN)
- priv_add_pair_to_triggered_check_queue (agent, p);
- else if (p->state == NICE_CHECK_IN_PROGRESS) {
-- /* XXX: according to ICE 7.2.1.4 "Triggered Checks" (ID-19),
-- * we should cancel the existing one, instead we reset our timer, so
-- * we'll resend the exiting transactions faster if needed...? :P
-- */
-- nice_debug ("Agent %p : check already in progress, "
-- "restarting the timer again?: %s ..", agent,
-- p->timer_restarted ? "no" : "yes");
-- if (!nice_socket_is_reliable (p->sockptr) && !p->timer_restarted) {
-- stun_timer_start (&p->timer,
-- priv_compute_conncheck_timer (agent, stream),
-- agent->stun_max_retransmissions);
-- p->timer_restarted = TRUE;
-- }
-+ /* note: according to ICE SPEC sect 7.2.1.4 "Triggered Checks"
-+ * we cancel the in-progress transaction, and after the
-+ * retransmission timeout, we create a new connectivity check
-+ * for that pair. The controlling role of this new check may
-+ * be different from the role of this cancelled check.
-+ */
-+ if (!nice_socket_is_reliable (p->sockptr)) {
-+ nice_debug ("Agent %p : check already in progress, "
-+ "cancelling this check..", agent);
-+ /* this flag will determine the action at the retransmission
-+ * timeout of the stun timer
-+ */
-+ p->recheck_on_timeout = TRUE;
-+ }
- }
- else if (p->state == NICE_CHECK_SUCCEEDED ||
- p->state == NICE_CHECK_DISCOVERED) {
-diff --git a/agent/conncheck.h b/agent/conncheck.h
-index 0f988de..785a6cd 100644
---- a/agent/conncheck.h
-+++ b/agent/conncheck.h
-@@ -85,10 +85,10 @@ struct _CandidateCheckPair
- gchar foundation[NICE_CANDIDATE_PAIR_MAX_FOUNDATION];
- NiceCheckState state;
- gboolean nominated;
-- gboolean timer_restarted;
- gboolean valid;
- gboolean use_candidate_on_next_check;
- gboolean mark_nominated_on_response_arrival;
-+ gboolean recheck_on_timeout;
- guint64 priority;
- guint32 prflx_priority;
- GTimeVal next_tick; /* next tick timestamp */
---
-2.13.6
-
-
-From 72ee528f7fdf82fb1a44958c18a0d4d5055d2d1a Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 12 Apr 2016 13:25:16 +0200
-Subject: [PATCH 32/70] conncheck: link succeeded and discovered pairs
-
-When the agent has the role of the stun server, is in controlled mode,
-and receives a pair with the "use-candidate" attribute set, it must find
-a matching succeded or discovered pair in its conncheck list. This is
-described in ICE spec 7.2.1.5, "Updating the Nominated Flag", item #1.
-When a matching pair is in succeeded state, the agent must nominate the
-valid pair (a discovered pair) constructed from section 7.1.3.2.2,
-that's been created from this succeeded one. To make this lookup, we
-introduce a new "discovered_pair" member of the CandidateCheckPair
-struct, that links the succeeded pair, and its discovered pair
-if any.
-
-Differential Revision: https://phabricator.freedesktop.org/D878
----
- agent/conncheck.c | 7 +++++++
- agent/conncheck.h | 1 +
- 2 files changed, 8 insertions(+)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 3a489fe..99cb6d2 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -1928,6 +1928,12 @@ static void priv_mark_pair_nominated (NiceAgent *agent, NiceStream *stream, Nice
- * candidate, generating a "discovered" pair that can be
- * nominated.
- */
-+ if (pair->state == NICE_CHECK_SUCCEEDED &&
-+ pair->discovered_pair != NULL) {
-+ pair = pair->discovered_pair;
-+ g_assert (pair->state == NICE_CHECK_DISCOVERED);
-+ }
-+
- if (pair->valid) {
- nice_debug ("Agent %p : marking pair %p (%s) as nominated",
- agent, pair, pair->foundation);
-@@ -2936,6 +2942,7 @@ static CandidateCheckPair *priv_add_peer_reflexive_pair (NiceAgent *agent, guint
- pair->remote = parent_pair->remote;
- pair->sockptr = local_cand->sockptr;
- pair->state = NICE_CHECK_DISCOVERED;
-+ parent_pair->discovered_pair = pair;
- nice_debug ("Agent %p : new pair %p state DISCOVERED", agent, pair);
- {
- gchar tmpbuf1[INET6_ADDRSTRLEN];
-diff --git a/agent/conncheck.h b/agent/conncheck.h
-index 785a6cd..dd47ebe 100644
---- a/agent/conncheck.h
-+++ b/agent/conncheck.h
-@@ -89,6 +89,7 @@ struct _CandidateCheckPair
- gboolean use_candidate_on_next_check;
- gboolean mark_nominated_on_response_arrival;
- gboolean recheck_on_timeout;
-+ struct _CandidateCheckPair *discovered_pair;
- guint64 priority;
- guint32 prflx_priority;
- GTimeVal next_tick; /* next tick timestamp */
---
-2.13.6
-
-
-From 9103a5f2e184211fc160d1d3070ce4d043c71ff0 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 19 Apr 2016 18:16:26 +0200
-Subject: [PATCH 33/70] conncheck: use the right pair when retriggering a check
-
-This patch completes the previous patch by adding a link back from the
-discovered pair, to the parent pair that generated this check. This link
-is needed by the ICE spec, to comply with section 8.1.1.1, "Regular
-nomination", where the check to be retriggered is the initial check that
-caused the discovery of the valid pair. When the valid pair is a
-peer-reflexive pair, the retriggered check must target the succeeded
-pair, and not the valid discovered pair.
-
-Differential Revision: https://phabricator.freedesktop.org/D879
----
- agent/conncheck.c | 21 ++++++++++++++++++---
- agent/conncheck.h | 1 +
- 2 files changed, 19 insertions(+), 3 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 99cb6d2..79685df 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -847,6 +847,16 @@ priv_conn_check_tick_stream_nominate (NiceStream *stream, NiceAgent *agent)
- !p->nominated &&
- !p->use_candidate_on_next_check &&
- p->valid) {
-+ /* According a ICE spec, sect 8.1.1.1. "Regular
-+ * Nomination", we enqueue the check that produced this
-+ * valid pair. When this pair has been discovered, we want
-+ * to test its parent pair instead.
-+ */
-+ if (p->succeeded_pair != NULL) {
-+ g_assert (p->state == NICE_CHECK_DISCOVERED);
-+ p = p->succeeded_pair;
-+ }
-+ g_assert (p->state == NICE_CHECK_SUCCEEDED);
- nice_debug ("Agent %p : restarting check %p with "
- "USE-CANDIDATE attrib (regular nomination)", agent, p);
- p->recheck_on_timeout = FALSE;
-@@ -2754,6 +2764,11 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
- * tcp-active we don't want to retrigger a check on a pair that
- * was FAILED when a peer-reflexive pair was created */
-
-+ if (p->succeeded_pair != NULL) {
-+ g_assert (p->state == NICE_CHECK_DISCOVERED);
-+ p = p->succeeded_pair;
-+ }
-+
- nice_debug ("Agent %p : Found a matching pair %p for triggered check.", agent, p);
-
- if (p->state == NICE_CHECK_WAITING ||
-@@ -2775,8 +2790,7 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
- p->recheck_on_timeout = TRUE;
- }
- }
-- else if (p->state == NICE_CHECK_SUCCEEDED ||
-- p->state == NICE_CHECK_DISCOVERED) {
-+ else if (p->state == NICE_CHECK_SUCCEEDED) {
- nice_debug ("Agent %p : Skipping triggered check, already completed..", agent);
- /* note: this is a bit unsure corner-case -- let's do the
- same state update as for processing responses to our own checks */
-@@ -2943,6 +2957,7 @@ static CandidateCheckPair *priv_add_peer_reflexive_pair (NiceAgent *agent, guint
- pair->sockptr = local_cand->sockptr;
- pair->state = NICE_CHECK_DISCOVERED;
- parent_pair->discovered_pair = pair;
-+ pair->succeeded_pair = parent_pair;
- nice_debug ("Agent %p : new pair %p state DISCOVERED", agent, pair);
- {
- gchar tmpbuf1[INET6_ADDRSTRLEN];
-@@ -4163,7 +4178,7 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *agent, NiceStream *stream,
-
- pair = priv_conn_check_add_for_candidate_pair_matched (agent,
- stream->id, component, local_candidate, remote_candidate,
-- NICE_CHECK_DISCOVERED);
-+ NICE_CHECK_SUCCEEDED);
- if (pair) {
- pair->valid = TRUE;
- }
-diff --git a/agent/conncheck.h b/agent/conncheck.h
-index dd47ebe..c07fb22 100644
---- a/agent/conncheck.h
-+++ b/agent/conncheck.h
-@@ -90,6 +90,7 @@ struct _CandidateCheckPair
- gboolean mark_nominated_on_response_arrival;
- gboolean recheck_on_timeout;
- struct _CandidateCheckPair *discovered_pair;
-+ struct _CandidateCheckPair *succeeded_pair;
- guint64 priority;
- guint32 prflx_priority;
- GTimeVal next_tick; /* next tick timestamp */
---
-2.13.6
-
-
-From 3916b8bcbf7e78e1dcb6b77882075c2c22719b4e Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 12 Apr 2016 13:30:04 +0200
-Subject: [PATCH 34/70] conncheck: fix a nomination corner case
-
-This patch add two supplementary cases, not covered by the ICE spec,
-sect 7.2.1.5 "Updating the Nominated Flag" when a controlled agent
-receives a STUN request with the USE-CANDIDATE flag, for a pair that is
-in the waiting state. We consider that this case is similar to the
-in-progress state, and should be handled in the same way. We also accept
-when the pair is in frozen state. This latter case happens in the
-new-dribble test, when an agent replays incoming early connchecks.
-
-Differential Revision: https://phabricator.freedesktop.org/D880
----
- agent/conncheck.c | 35 +++++++++++++++++++++++++++++++++--
- 1 file changed, 33 insertions(+), 2 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 79685df..4f4af40 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -1963,6 +1963,29 @@ static void priv_mark_pair_nominated (NiceAgent *agent, NiceStream *stream, Nice
- "will be nominated on response receipt.",
- agent, pair, pair->foundation);
- }
-+ /* note: this case is not covered by the ICE spec, 7.2.1.5,
-+ * "Updating the Nominated Flag", but a pair in waiting state
-+ * deserves the same treatment than a pair in-progress.
-+ */
-+ if (pair->state == NICE_CHECK_WAITING) {
-+ pair->mark_nominated_on_response_arrival = TRUE;
-+ nice_debug ("Agent %p : pair %p (%s) is waiting, "
-+ "will be nominated on response receipt.",
-+ agent, pair, pair->foundation);
-+ }
-+ /* note: this case is not covered by the ICE spec, 7.2.1.5,
-+ * "Updating the Nominated Flag" either, but a pair in frozen
-+ * state, and in the triggered check list should also be
-+ * considered like a pair in-progress. This case happens with
-+ * the new-dribble test, when an agent replays incoming early
-+ * connchecks.
-+ */
-+ if (pair->state == NICE_CHECK_FROZEN) {
-+ pair->mark_nominated_on_response_arrival = TRUE;
-+ nice_debug ("Agent %p : pair %p (%s) is frozen, "
-+ "will be nominated on response receipt.",
-+ agent, pair, pair->foundation);
-+ }
- } else if (pair->local == localcand && pair->remote == remotecand) {
- nice_debug ("Agent %p : marking pair %p (%s) as nominated", agent, pair, pair->foundation);
- pair->nominated = TRUE;
-@@ -2703,17 +2726,25 @@ static guint priv_prune_pending_checks (NiceStream *stream, guint component_id)
- "is %" G_GUINT64_FORMAT, highest_nominated_priority);
-
- /* step: cancel all FROZEN and WAITING pairs for the component */
-+ /* note: this case is not covered by the ICE spec, 8.1.2
-+ * "Updating States", but a pair in waiting state which will be
-+ * nominated on response receipt should be treated the same way
-+ * that an in-progress pair.
-+ */
- for (i = stream->conncheck_list; i; i = i->next) {
- CandidateCheckPair *p = i->data;
- if (p->component_id == component_id) {
- if (p->state == NICE_CHECK_FROZEN ||
-- p->state == NICE_CHECK_WAITING) {
-+ (p->state == NICE_CHECK_WAITING &&
-+ !p->mark_nominated_on_response_arrival)) {
- p->state = NICE_CHECK_CANCELLED;
- nice_debug ("Agent XXX : pair %p state CANCELED", p);
- }
-
- /* note: a SHOULD level req. in ICE 8.1.2. "Updating States" (ID-19) */
-- if (p->state == NICE_CHECK_IN_PROGRESS) {
-+ if (p->state == NICE_CHECK_IN_PROGRESS ||
-+ (p->state == NICE_CHECK_WAITING &&
-+ p->mark_nominated_on_response_arrival)) {
- if (highest_nominated_priority != 0 &&
- p->priority < highest_nominated_priority) {
- p->stun_message.buffer = NULL;
---
-2.13.6
-
-
-From afd8d41bb34afb3864e838ef79026ae4ef15c0d4 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 12 Apr 2016 13:32:49 +0200
-Subject: [PATCH 35/70] conncheck: new pairs never have the nominated flag
- preset
-
-This patch disables the possibility to set the nominated flag of a
-candidate pair at creation time. This possibility was used when a new
-pair is created from a new peer reflexive remote candidate, when the
-agent is in controlled mode, and an stun request with USE-CANDIDATE is
-received. In this case, since previous commit "conncheck: fix a
-nomination corner case", we set the nominated flag when the stun
-response of this new pair will arrive, and not before. Consequently,
-this flag is no longer required when the pair is created.
-
-Differential Revision: https://phabricator.freedesktop.org/D881
----
- agent/conncheck.c | 21 +++++++++++----------
- 1 file changed, 11 insertions(+), 10 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 4f4af40..3cd0424 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -65,7 +65,7 @@
- static void priv_update_check_list_failed_components (NiceAgent *agent, NiceStream *stream);
- static void priv_update_check_list_state_for_ready (NiceAgent *agent, NiceStream *stream, NiceComponent *component);
- static guint priv_prune_pending_checks (NiceStream *stream, guint component_id);
--static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *stream, NiceComponent *component, NiceSocket *local_socket, NiceCandidate *remote_cand, gboolean use_candidate);
-+static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *stream, NiceComponent *component, NiceSocket *local_socket, NiceCandidate *remote_cand);
- static void priv_mark_pair_nominated (NiceAgent *agent, NiceStream *stream, NiceComponent *component, NiceCandidate *localcand, NiceCandidate *remotecand);
- static size_t priv_create_username (NiceAgent *agent, NiceStream *stream,
- guint component_id, NiceCandidate *remote, NiceCandidate *local,
-@@ -1573,7 +1573,8 @@ static void priv_preprocess_conn_check_pending_data (NiceAgent *agent, NiceStrea
- nice_debug ("Agent %p : Updating check %p with stored early-icheck %p, %p/%u/%u (agent/stream/component).", agent, pair, icheck, agent, stream->id, component->id);
- if (icheck->use_candidate)
- priv_mark_pair_nominated (agent, stream, component, pair->local, pair->remote);
-- priv_schedule_triggered_check (agent, stream, component, icheck->local_socket, pair->remote, icheck->use_candidate);
-+ priv_schedule_triggered_check (agent, stream, component,
-+ icheck->local_socket, pair->remote);
- }
- }
- }
-@@ -1716,7 +1717,8 @@ void conn_check_remote_credentials_set(NiceAgent *agent, NiceStream *stream)
-
- if (icheck->use_candidate)
- priv_mark_pair_nominated (agent, stream, component, local_candidate, candidate);
-- priv_schedule_triggered_check (agent, stream, component, icheck->local_socket, candidate, icheck->use_candidate);
-+ priv_schedule_triggered_check (agent, stream, component,
-+ icheck->local_socket, candidate);
- }
- }
- }
-@@ -2043,7 +2045,7 @@ ensure_unique_priority (NiceComponent *component, guint32 priority)
- */
- static CandidateCheckPair *priv_add_new_check_pair (NiceAgent *agent,
- guint stream_id, NiceComponent *component, NiceCandidate *local,
-- NiceCandidate *remote, NiceCheckState initial_state, gboolean use_candidate)
-+ NiceCandidate *remote, NiceCheckState initial_state)
- {
- NiceStream *stream;
- CandidateCheckPair *pair;
-@@ -2081,7 +2083,6 @@ static CandidateCheckPair *priv_add_new_check_pair (NiceAgent *agent,
- tmpbuf1, nice_address_get_port (&pair->local->addr),
- tmpbuf2, nice_address_get_port (&pair->remote->addr));
- }
-- pair->nominated = use_candidate;
- pair->prflx_priority = ensure_unique_priority (component,
- peer_reflexive_candidate_priority (agent, local));
-
-@@ -2127,7 +2128,7 @@ static CandidateCheckPair *priv_conn_check_add_for_candidate_pair_matched (
- agent, local->foundation, remote->foundation,
- stream_id, component->id);
- pair = priv_add_new_check_pair (agent, stream_id, component, local, remote,
-- initial_state, FALSE);
-+ initial_state);
- if (component->state == NICE_COMPONENT_STATE_CONNECTED ||
- component->state == NICE_COMPONENT_STATE_READY) {
- agent_signal_component_state_change (agent,
-@@ -2774,9 +2775,8 @@ static guint priv_prune_pending_checks (NiceStream *stream, guint component_id)
- * @param component the check is related to
- * @param local_socket socket from which the inbound check was received
- * @param remote_cand remote candidate from which the inbound check was sent
-- * @param use_candidate whether the original check had USE-CANDIDATE attribute set
- */
--static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *stream, NiceComponent *component, NiceSocket *local_socket, NiceCandidate *remote_cand, gboolean use_candidate)
-+static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *stream, NiceComponent *component, NiceSocket *local_socket, NiceCandidate *remote_cand)
- {
- GSList *i;
- NiceCandidate *local = NULL;
-@@ -2872,7 +2872,8 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
-
- if (i) {
- nice_debug ("Agent %p : Adding a triggered check to conn.check list (local=%p).", agent, local);
-- priv_add_new_check_pair (agent, stream->id, component, local, remote_cand, NICE_CHECK_WAITING, use_candidate);
-+ priv_add_new_check_pair (agent, stream->id, component,
-+ local, remote_cand, NICE_CHECK_WAITING);
- return TRUE;
- }
- else {
-@@ -2926,7 +2927,7 @@ static void priv_reply_to_conn_check (NiceAgent *agent, NiceStream *stream,
-
- if (rcand) {
- /* note: upon successful check, make the reserve check immediately */
-- priv_schedule_triggered_check (agent, stream, component, sockptr, rcand, use_candidate);
-+ priv_schedule_triggered_check (agent, stream, component, sockptr, rcand);
-
- if (use_candidate)
- priv_mark_pair_nominated (agent, stream, component, lcand, rcand);
---
-2.13.6
-
-
-From 25b3eeec70b4e8e3b2154a18cdc8c5604f572012 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 12 Apr 2016 12:56:28 +0200
-Subject: [PATCH 36/70] conncheck: update the pair state in triggered check
- list
-
-With this patch, we update the state of the pair to waiting when
-it is put in the triggered check queue. We also take care to call
-priv_schedule_triggered_check() before priv_mark_pair_nominated()
-so a pair to be rechecked and put on the triggered check queue
-will have a unique state to be tested in the following call to
-priv_mark_pair_nominated() when evaluating its nomination attributes.
-
-Differential Revision: https://phabricator.freedesktop.org/D883
----
- agent/conncheck.c | 33 +++++++++------------------------
- 1 file changed, 9 insertions(+), 24 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 3cd0424..9950970 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -183,6 +183,8 @@ priv_add_pair_to_triggered_check_queue (NiceAgent *agent, CandidateCheckPair *pa
- {
- g_assert (pair);
-
-+ pair->state = NICE_CHECK_WAITING;
-+ nice_debug ("Agent %p : pair %p state WAITING", agent, pair);
- if (agent->triggered_check_queue == NULL ||
- g_slist_find (agent->triggered_check_queue, pair) == NULL)
- agent->triggered_check_queue = g_slist_append (agent->triggered_check_queue, pair);
-@@ -580,8 +582,6 @@ priv_conn_recheck_on_timeout (NiceAgent *agent, CandidateCheckPair *p)
- nice_debug ("Agent %p : pair %p was cancelled, "
- "triggering a new connection check", agent, p);
- p->recheck_on_timeout = FALSE;
-- p->state = NICE_CHECK_WAITING;
-- nice_debug ("Agent %p : pair %p state WAITING", agent, p);
- priv_add_pair_to_triggered_check_queue (agent, p);
- return TRUE;
- }
-@@ -1571,10 +1571,10 @@ static void priv_preprocess_conn_check_pending_data (NiceAgent *agent, NiceStrea
- if (nice_address_equal (&icheck->from, &pair->remote->addr) &&
- icheck->local_socket == pair->sockptr) {
- nice_debug ("Agent %p : Updating check %p with stored early-icheck %p, %p/%u/%u (agent/stream/component).", agent, pair, icheck, agent, stream->id, component->id);
-- if (icheck->use_candidate)
-- priv_mark_pair_nominated (agent, stream, component, pair->local, pair->remote);
- priv_schedule_triggered_check (agent, stream, component,
- icheck->local_socket, pair->remote);
-+ if (icheck->use_candidate)
-+ priv_mark_pair_nominated (agent, stream, component, pair->local, pair->remote);
- }
- }
- }
-@@ -1715,10 +1715,10 @@ void conn_check_remote_credentials_set(NiceAgent *agent, NiceStream *stream)
- else
- conn_check_add_for_candidate (agent, stream->id, component, candidate);
-
-- if (icheck->use_candidate)
-- priv_mark_pair_nominated (agent, stream, component, local_candidate, candidate);
- priv_schedule_triggered_check (agent, stream, component,
- icheck->local_socket, candidate);
-+ if (icheck->use_candidate)
-+ priv_mark_pair_nominated (agent, stream, component, local_candidate, candidate);
- }
- }
- }
-@@ -1967,7 +1967,9 @@ static void priv_mark_pair_nominated (NiceAgent *agent, NiceStream *stream, Nice
- }
- /* note: this case is not covered by the ICE spec, 7.2.1.5,
- * "Updating the Nominated Flag", but a pair in waiting state
-- * deserves the same treatment than a pair in-progress.
-+ * deserves the same treatment than a pair in-progress. A pair
-+ * can be in waiting state as the result of being enqueued in
-+ * the triggered check list for example.
- */
- if (pair->state == NICE_CHECK_WAITING) {
- pair->mark_nominated_on_response_arrival = TRUE;
-@@ -1975,19 +1977,6 @@ static void priv_mark_pair_nominated (NiceAgent *agent, NiceStream *stream, Nice
- "will be nominated on response receipt.",
- agent, pair, pair->foundation);
- }
-- /* note: this case is not covered by the ICE spec, 7.2.1.5,
-- * "Updating the Nominated Flag" either, but a pair in frozen
-- * state, and in the triggered check list should also be
-- * considered like a pair in-progress. This case happens with
-- * the new-dribble test, when an agent replays incoming early
-- * connchecks.
-- */
-- if (pair->state == NICE_CHECK_FROZEN) {
-- pair->mark_nominated_on_response_arrival = TRUE;
-- nice_debug ("Agent %p : pair %p (%s) is frozen, "
-- "will be nominated on response receipt.",
-- agent, pair, pair->foundation);
-- }
- } else if (pair->local == localcand && pair->remote == remotecand) {
- nice_debug ("Agent %p : marking pair %p (%s) as nominated", agent, pair, pair->foundation);
- pair->nominated = TRUE;
-@@ -2926,9 +2915,7 @@ static void priv_reply_to_conn_check (NiceAgent *agent, NiceStream *stream,
- }
-
- if (rcand) {
-- /* note: upon successful check, make the reserve check immediately */
- priv_schedule_triggered_check (agent, stream, component, sockptr, rcand);
--
- if (use_candidate)
- priv_mark_pair_nominated (agent, stream, component, lcand, rcand);
- }
-@@ -3345,9 +3332,7 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, NiceStre
-
- p->stun_message.buffer = NULL;
- p->stun_message.buffer_len = 0;
-- p->state = NICE_CHECK_WAITING;
- priv_add_pair_to_triggered_check_queue (agent, p);
-- nice_debug ("Agent %p : pair %p state WAITING", agent, p);
- }
- trans_found = TRUE;
- } else {
---
-2.13.6
-
-
-From 11d4e37a030eb144a355dc26c705ef5aa5a975a7 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Fri, 1 Apr 2016 17:31:44 +0200
-Subject: [PATCH 37/70] conncheck: remove a useless pair recheck
-
-This exception to the ICE spec is no longer needed: when a pair is in
-the succeeded state, there is no needed to recheck it again upon
-reception of an incoming stun request on it.
-
-Differential Revision: https://phabricator.freedesktop.org/D884
----
- agent/conncheck.c | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 9950970..95e2556 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -2820,23 +2820,6 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
- * that causes the ready -> connected transition.
- */
- priv_update_check_list_state_for_ready (agent, stream, component);
--
-- /* note: this new check is required by the new-dribble test,
-- * when early icheck on the peer controlled agent causes an
-- * incoming stun request to an already succeeded (and
-- * nominated) pair on the controlling agent. If the
-- * controlling agent doesn't retrigger a check with
-- * USE-CANDIDATE=1, the peer agent has no way to nominate it.
-- *
-- * This behavior differs from ICE spec 7.2.1.4
-- */
-- if ((agent->compatibility == NICE_COMPATIBILITY_RFC5245 ||
-- agent->compatibility == NICE_COMPATIBILITY_WLM2009 ||
-- agent->compatibility == NICE_COMPATIBILITY_OC2007R2) &&
-- agent->controlling_mode) {
-- priv_add_pair_to_triggered_check_queue (agent, p);
-- conn_check_schedule_next(agent);
-- }
- } else if (p->state == NICE_CHECK_FAILED) {
- /* 7.2.1.4 Triggered Checks
- * If the state of the pair is Failed, it is changed to Waiting
---
-2.13.6
-
-
-From 8fa648a15a6700d08165fe97a09f5c068abae1e6 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Mon, 11 Apr 2016 13:13:51 +0200
-Subject: [PATCH 38/70] conncheck: dont cancel a pair for triggered check
-
-This patch adds another supplementary "corner" case, not covered by the
-ICE spec, sect 8.1.2, "Updating States". A pair in waiting state and in
-the triggered check list should be considered like an in-progress pair,
-and cancelled only if its priority is lower than the priority of the
-nominated pair. This is required in some aggressive nomination
-situations for both peers to select the same pair, having the highest
-priority.
-
-Differential Revision: https://phabricator.freedesktop.org/D933
----
- agent/conncheck.c | 48 ++++++++++++++++++++++++++++++++----------------
- 1 file changed, 32 insertions(+), 16 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 95e2556..79f678a 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -64,7 +64,7 @@
-
- static void priv_update_check_list_failed_components (NiceAgent *agent, NiceStream *stream);
- static void priv_update_check_list_state_for_ready (NiceAgent *agent, NiceStream *stream, NiceComponent *component);
--static guint priv_prune_pending_checks (NiceStream *stream, guint component_id);
-+static guint priv_prune_pending_checks (NiceAgent *agent, NiceStream *stream, guint component_id);
- static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *stream, NiceComponent *component, NiceSocket *local_socket, NiceCandidate *remote_cand);
- static void priv_mark_pair_nominated (NiceAgent *agent, NiceStream *stream, NiceComponent *component, NiceCandidate *localcand, NiceCandidate *remotecand);
- static size_t priv_create_username (NiceAgent *agent, NiceStream *stream,
-@@ -176,6 +176,16 @@ priv_print_conn_check_lists (NiceAgent *agent, const gchar *where, const gchar *
- }
- }
-
-+/* Verify if the pair is in the triggered checks list
-+ */
-+
-+static gboolean
-+priv_is_pair_in_triggered_check_queue (NiceAgent *agent, CandidateCheckPair *pair)
-+{
-+ g_assert (pair);
-+ return (g_slist_find (agent->triggered_check_queue, pair) != NULL);
-+}
-+
- /* Add the pair to the triggered checks list, if not already present
- */
- static void
-@@ -1897,7 +1907,7 @@ static void priv_update_check_list_state_for_ready (NiceAgent *agent, NiceStream
- /* Only go to READY if no checks are left in progress. If there are
- * any that are kept, then this function will be called again when the
- * conncheck tick timer finishes them all */
-- if (priv_prune_pending_checks (stream, component->id) == 0) {
-+ if (priv_prune_pending_checks (agent, stream, component->id) == 0) {
- /* Continue through the states to give client code a nice
- * logical progression. See http://phabricator.freedesktop.org/D218 for
- * discussion. */
-@@ -2693,14 +2703,14 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair)
- *
- * @see priv_update_check_list_state_failed_components()
- */
--static guint priv_prune_pending_checks (NiceStream *stream, guint component_id)
-+static guint priv_prune_pending_checks (NiceAgent *agent, NiceStream *stream, guint component_id)
- {
- GSList *i;
- guint64 highest_nominated_priority = 0;
- guint in_progress = 0;
-
-- nice_debug ("Agent XXX: Finding highest priority for component %d",
-- component_id);
-+ nice_debug ("Agent %p: Finding highest priority for component %d",
-+ agent, component_id);
-
- for (i = stream->conncheck_list; i; i = i->next) {
- CandidateCheckPair *p = i->data;
-@@ -2712,41 +2722,47 @@ static guint priv_prune_pending_checks (NiceStream *stream, guint component_id)
- }
- }
-
-- nice_debug ("Agent XXX: Pruning pending checks. Highest nominated priority "
-- "is %" G_GUINT64_FORMAT, highest_nominated_priority);
-+ nice_debug ("Agent %p: Pruning pending checks. Highest nominated priority "
-+ "is %" G_GUINT64_FORMAT, agent, highest_nominated_priority);
-
- /* step: cancel all FROZEN and WAITING pairs for the component */
- /* note: this case is not covered by the ICE spec, 8.1.2
- * "Updating States", but a pair in waiting state which will be
- * nominated on response receipt should be treated the same way
-- * that an in-progress pair.
-+ * that an in-progress pair. A pair in waiting state and in
-+ * the triggered check list should also be treated like an in-progress
-+ * pair.
- */
- for (i = stream->conncheck_list; i; i = i->next) {
- CandidateCheckPair *p = i->data;
-+
- if (p->component_id == component_id) {
-+ gboolean like_in_progress =
-+ p->mark_nominated_on_response_arrival ||
-+ priv_is_pair_in_triggered_check_queue (agent, p);
-+
- if (p->state == NICE_CHECK_FROZEN ||
-- (p->state == NICE_CHECK_WAITING &&
-- !p->mark_nominated_on_response_arrival)) {
-+ (p->state == NICE_CHECK_WAITING && !like_in_progress)) {
- p->state = NICE_CHECK_CANCELLED;
-- nice_debug ("Agent XXX : pair %p state CANCELED", p);
-+ nice_debug ("Agent %p : pair %p state CANCELED", agent, p);
- }
-
- /* note: a SHOULD level req. in ICE 8.1.2. "Updating States" (ID-19) */
- if (p->state == NICE_CHECK_IN_PROGRESS ||
-- (p->state == NICE_CHECK_WAITING &&
-- p->mark_nominated_on_response_arrival)) {
-+ (p->state == NICE_CHECK_WAITING && like_in_progress)) {
- if (highest_nominated_priority != 0 &&
- p->priority < highest_nominated_priority) {
- p->stun_message.buffer = NULL;
- p->stun_message.buffer_len = 0;
- p->state = NICE_CHECK_CANCELLED;
-- nice_debug ("Agent XXX : pair %p state CANCELED", p);
-+ nice_debug ("Agent %p : pair %p state CANCELED", agent, p);
- } else {
- /* We must keep the higher priority pairs running because if a udp
- * packet was lost, we might end up using a bad candidate */
-- nice_debug ("Agent XXX : pair %p kept IN_PROGRESS because priority %"
-+ nice_debug ("Agent %p : pair %p kept IN_PROGRESS because priority %"
- G_GUINT64_FORMAT " is higher than currently nominated pair %"
-- G_GUINT64_FORMAT, p, p->priority, highest_nominated_priority);
-+ G_GUINT64_FORMAT, agent,
-+ p, p->priority, highest_nominated_priority);
- in_progress++;
- }
- }
---
-2.13.6
-
-
-From 6a512b6eca9603ce8bf3ed0814fd314684c66ea7 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 14 Jun 2016 21:04:49 +0200
-Subject: [PATCH 39/70] conncheck: try to change earlier to state ready
-
-We check if we can move from state connected to ready just
-after a pair expired its retransmission count. This pair
-will be marked failed, and will no longer be in-progress.
-The number of in-progress dropping down to zero is one
-of the conditions needed to make the transition to ready,
-per component (and not globally as it's the case in other
-locations where this check function is called).
-
-Differential Revision: https://phabricator.freedesktop.org/D1117
----
- agent/conncheck.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 79f678a..d31b77f 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -626,6 +626,7 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
- case STUN_USAGE_TIMER_RETURN_TIMEOUT:
- {
- gchar tmpbuf1[INET6_ADDRSTRLEN], tmpbuf2[INET6_ADDRSTRLEN];
-+ NiceComponent *component;
-
- /* case: conncheck cancelled due to in-progress incoming
- * check, requeing the pair, ICE spec, sect 7.2.1.4
-@@ -646,6 +647,16 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
- priv_print_conn_check_lists (agent, G_STRFUNC,
- ", retransmission failed");
-
-+ /* perform a check if a transition state from connected to
-+ * ready can be performed. This may happen here, when the last
-+ * in-progress pair has expired its retransmission count
-+ * in priv_conn_check_tick_stream(), which is a condition to
-+ * make the transition connected to ready.
-+ */
-+ if (agent_find_component (agent, p->stream_id, p->component_id,
-+ NULL, &component))
-+ priv_update_check_list_state_for_ready (agent, stream,
-+ component);
- break;
- }
- case STUN_USAGE_TIMER_RETURN_RETRANSMIT:
---
-2.13.6
-
-
-From 59fe48517c0b7db77b99183d31fdd84b55adb5d4 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 14 Jun 2016 21:12:16 +0200
-Subject: [PATCH 40/70] conncheck: fix a state transition case
-
-When a new stun request hits a valid pair, of a failed component, we may
-have a transition from state failed to connected. In this situation, we
-do a logical progression failed -> connecting -> connected, like we do
-in function priv_update_check_list_state_for_ready()
-
-Similarily, when a new stun request hits a failed pair, of a failed
-component, triggering a new conncheck for this pair may also cause the
-component state to move back from failed to connecting state.
-
-Differential Revision: https://phabricator.freedesktop.org/D1118
----
- agent/conncheck.c | 21 ++++++++++++++++-----
- 1 file changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index d31b77f..e1a5cf1 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -1973,12 +1973,14 @@ static void priv_mark_pair_nominated (NiceAgent *agent, NiceStream *stream, Nice
- pair->nominated = TRUE;
- priv_update_selected_pair (agent, component, pair);
- /* Do not step down to CONNECTED if we're already at state READY*/
-- if (component->state != NICE_COMPONENT_STATE_READY) {
-+ if (component->state == NICE_COMPONENT_STATE_FAILED)
-+ agent_signal_component_state_change (agent,
-+ stream->id, component->id, NICE_COMPONENT_STATE_CONNECTING);
-+ if (component->state == NICE_COMPONENT_STATE_CONNECTING)
- /* step: notify the client of a new component state (must be done
- * before the possible check list state update step */
- agent_signal_component_state_change (agent,
- stream->id, component->id, NICE_COMPONENT_STATE_CONNECTED);
-- }
- priv_update_check_list_state_for_ready (agent, stream, component);
- } else if (pair->state == NICE_CHECK_IN_PROGRESS) {
- pair->mark_nominated_on_response_arrival = TRUE;
-@@ -2004,13 +2006,14 @@ static void priv_mark_pair_nominated (NiceAgent *agent, NiceStream *stream, Nice
- if (pair->valid) {
- priv_update_selected_pair (agent, component, pair);
- /* Do not step down to CONNECTED if we're already at state READY*/
-- if (component->state != NICE_COMPONENT_STATE_READY) {
-+ if (component->state == NICE_COMPONENT_STATE_FAILED)
-+ agent_signal_component_state_change (agent,
-+ stream->id, component->id, NICE_COMPONENT_STATE_CONNECTING);
-+ if (component->state == NICE_COMPONENT_STATE_CONNECTING)
- /* step: notify the client of a new component state (must be done
- * before the possible check list state update step */
- agent_signal_component_state_change (agent,
- stream->id, component->id, NICE_COMPONENT_STATE_CONNECTED);
-- }
--
- }
- priv_update_check_list_state_for_ready (agent, stream, component);
- }
-@@ -2854,6 +2857,14 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
- pair (representing a new STUN Binding request transaction), by
- enqueueing the pair in the triggered check queue. */
- priv_add_pair_to_triggered_check_queue (agent, p);
-+ /* If the component for this pair is in failed state, move it
-+ * back to connecting, and reinitiate the timers
-+ */
-+ if (component->state == NICE_COMPONENT_STATE_FAILED) {
-+ agent_signal_component_state_change (agent, stream->id,
-+ component->id, NICE_COMPONENT_STATE_CONNECTING);
-+ conn_check_schedule_next (agent);
-+ }
- }
-
- /* note: the spec says the we SHOULD retransmit in-progress
---
-2.13.6
-
-
-From f19d209decac432a1597d84c3d5809d2208f7457 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 14 Jun 2016 21:20:49 +0200
-Subject: [PATCH 41/70] conncheck: do not recheck a just succeeded pair
-
-We cancel the potential in-progress transaction cancellation, caused by
-sect 7.2.1.4 "Triggered Checks", when we receive a valid reply before
-transmission timeout, or just after timeout, when the pair is
-temporarily put on the triggered check list on the way to be
-rechecked. This situation is not covered by the RFC 5245.
-
-Differential Revision: https://phabricator.freedesktop.org/D1119
----
- agent/conncheck.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index e1a5cf1..4b785b5 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -3117,6 +3117,16 @@ static CandidateCheckPair *priv_process_response_check_for_reflexive(NiceAgent *
- if (new_pair == p)
- p->valid = TRUE;
- p->state = NICE_CHECK_SUCCEEDED;
-+ /* note: we cancel the potential in-progress transaction
-+ * cancellation, caused by sect 7.2.1.4 "Triggered Checks", if
-+ * we receive a valid reply before transmission timeout...
-+ */
-+ p->recheck_on_timeout = FALSE;
-+ /* ... or just after the transmission timeout, while the pair is
-+ * temporarily put on the triggered check list on the way to be
-+ * be rechecked: we remove it from the list too.
-+ */
-+ priv_remove_pair_from_triggered_check_queue (agent, p);
- nice_debug ("Agent %p : conncheck %p SUCCEEDED.", agent, p);
- nice_component_add_valid_candidate (component, remote_candidate);
- }
-@@ -3151,6 +3161,8 @@ static CandidateCheckPair *priv_process_response_check_for_reflexive(NiceAgent *
- * Succeeded, RFC 5245, 7.1.3.2.3, "Updating Pair States"
- */
- p->state = NICE_CHECK_SUCCEEDED;
-+ p->recheck_on_timeout = FALSE;
-+ priv_remove_pair_from_triggered_check_queue (agent, p);
- nice_debug ("Agent %p : conncheck %p SUCCEEDED, %p DISCOVERED.",
- agent, p, new_pair);
- }
---
-2.13.6
-
-
-From d516fca1b0e0a6606afec797bdc0690104e779a9 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 14 Jun 2016 21:32:26 +0200
-Subject: [PATCH 42/70] conncheck: adjust recheck on timeout strategy
-
-The pair recheck on timeout can easily cause repetitive rechecks in
-a ping-pong effect, if both peers with the same behaviour try to
-check the same pair almost simultaneously, and if the network rtt
-is greater than the initial timer rto. The reply to the initial
-stun request may arrive after the in-progress conncheck
-cancellation (described in RFC 5245, sect 7.2.1.4). Cancellation
-creates a new stun request, and forgets the initial one.
-The conncheck timer is restarted with the same initial value,
-so the same situation happens again later.
-
-We choose to avoid resetting the timer in such situation. After enough
-retransmissions, the timeout delay, that doubles after each timeout,
-becomes longer than the rtt, and the stun reply can be handled.
-
-Differential Revision: https://phabricator.freedesktop.org/D1115
----
- agent/conncheck.c | 30 ++++++++++++++++++++++++++----
- 1 file changed, 26 insertions(+), 4 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 4b785b5..88d2534 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -591,7 +591,6 @@ priv_conn_recheck_on_timeout (NiceAgent *agent, CandidateCheckPair *p)
- */
- nice_debug ("Agent %p : pair %p was cancelled, "
- "triggering a new connection check", agent, p);
-- p->recheck_on_timeout = FALSE;
- priv_add_pair_to_triggered_check_queue (agent, p);
- return TRUE;
- }
-@@ -2650,9 +2649,32 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair)
- if (nice_socket_is_reliable(pair->sockptr)) {
- stun_timer_start_reliable(&pair->timer, agent->stun_reliable_timeout);
- } else {
-- stun_timer_start (&pair->timer,
-- priv_compute_conncheck_timer (agent, stream),
-- agent->stun_max_retransmissions);
-+ StunTimer *timer = &pair->timer;
-+
-+ if (pair->recheck_on_timeout)
-+ /* The pair recheck on timeout can easily cause repetitive rechecks in
-+ * a ping-pong effect, if both peers with the same behaviour try to
-+ * check the same pair almost simultaneously, and if the network rtt
-+ * is greater than the initial timer rto. The reply to the initial
-+ * stun request may arrive after the in-progress conncheck
-+ * cancellation (described in RFC 5245, sect 7.2.1.4). Cancellation
-+ * creates a new stun request, and forgets the initial one.
-+ * The conncheck timer is restarted with the same initial value,
-+ * so the same situation happens again later.
-+ *
-+ * We choose to avoid resetting the timer in such situation.
-+ * After enough retransmissions, the timeout delay becomes
-+ * longer than the rtt, and the stun reply can be handled.
-+ */
-+ nice_debug("Agent %p : reusing timer of pair %p: %d/%d %d/%dms",
-+ agent, pair,
-+ timer->retransmissions, timer->max_retransmissions,
-+ timer->delay - stun_timer_remainder (timer), timer->delay);
-+ else
-+ stun_timer_start (timer,
-+ priv_compute_conncheck_timer (agent, stream),
-+ agent->stun_max_retransmissions);
-+ pair->recheck_on_timeout = FALSE;
- }
-
- /* TCP-ACTIVE candidate must create a new socket before sending
---
-2.13.6
-
-
-From 95f8805eb7b77755337e28daf1f134587d42b35f Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Thu, 16 Jun 2016 17:32:39 +0200
-Subject: [PATCH 43/70] conncheck: remove cancelled pair state
-
-Pairs with the state NICE_CHECK_CANCELLED are the pairs targeted for
-removal after the nomination of a pair with an higher priority,
-described in Section 8.1.2 "Updating States", item 2 of RFC 5245. They
-include also pairs that overflow the conncheck list size, but this is a
-somewhat more marginal situation. So we are mainly interested in the
-first use case of this state.
-
-This state mixes two different situations, that deserve a distinct
-handling : on one side, there are waiting or frozen pairs that must be
-removed, this is an immediate action that doesn't need a dedicated state
-for that. And on the other side, there are in-progress pairs that
-should no longer be retransmitted, because another pair with a higher
-priority has already been nominated.
-
-This patch removes the cancelled state, and adds a flag
-retransmit_on_timeout to deal with this last situation. Note that this
-case should not generate a triggered check, as per described in section
-7.2.1.4, when the state of the pair is In-Progress or Failed, since this
-pair of lower priority has no hope to replace the nominated one.
-
-Differential Revision: https://phabricator.freedesktop.org/D1114
----
- agent/conncheck.c | 142 +++++++++++++++++++++++++++++-------------------------
- agent/conncheck.h | 3 +-
- 2 files changed, 77 insertions(+), 68 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 88d2534..b0e2222 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -100,8 +100,6 @@ priv_state_to_gchar (NiceCheckState state)
- return 'F';
- case NICE_CHECK_FROZEN:
- return 'Z';
-- case NICE_CHECK_CANCELLED:
-- return 'C';
- case NICE_CHECK_DISCOVERED:
- return 'D';
- default:
-@@ -627,6 +625,7 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
- gchar tmpbuf1[INET6_ADDRSTRLEN], tmpbuf2[INET6_ADDRSTRLEN];
- NiceComponent *component;
-
-+timer_timeout:
- /* case: conncheck cancelled due to in-progress incoming
- * check, requeing the pair, ICE spec, sect 7.2.1.4
- * "Triggered Checks", "If the state of that pair is
-@@ -662,6 +661,13 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
- {
- unsigned int timeout = stun_timer_remainder (&p->timer);
-
-+ /* case: retransmission stopped, due to the nomination of
-+ * a pair with a higher priority than this in-progress pair,
-+ * ICE spec, sect 8.1.2 "Updating States", item 2.2
-+ */
-+ if (!p->retransmit_on_timeout)
-+ goto timer_timeout;
-+
- /* case: conncheck cancelled due to in-progress incoming
- * check, requeing the pair, ICE spec, sect 7.2.1.4
- * "Triggered Checks", "If the state of that pair is
-@@ -1600,26 +1606,6 @@ static void priv_preprocess_conn_check_pending_data (NiceAgent *agent, NiceStrea
- }
-
-
--static GSList *prune_cancelled_conn_check (GSList *conncheck_list)
--{
-- GSList *item = conncheck_list;
--
-- while (item) {
-- CandidateCheckPair *pair = item->data;
-- GSList *next = item->next;
--
-- if (pair->state == NICE_CHECK_CANCELLED) {
-- conn_check_free_item (pair);
-- conncheck_list = g_slist_delete_link (conncheck_list, item);
-- }
--
-- item = next;
-- }
--
-- return conncheck_list;
--}
--
--
- /*
- * Handle any processing steps for connectivity checks after
- * remote credentials have been set. This function handles
-@@ -1754,9 +1740,6 @@ void conn_check_remote_credentials_set(NiceAgent *agent, NiceStream *stream)
- (GDestroyNotify) incoming_check_free);
- component->incoming_checks = NULL;
- }
--
-- stream->conncheck_list =
-- prune_cancelled_conn_check (stream->conncheck_list);
- }
-
- /*
-@@ -1764,7 +1747,7 @@ void conn_check_remote_credentials_set(NiceAgent *agent, NiceStream *stream)
- * in ICE spec section 5.7.3 (ID-19). See also
- * conn_check_add_for_candidate().
- */
--static void priv_limit_conn_check_list_size (GSList *conncheck_list, guint upper_limit)
-+static GSList *priv_limit_conn_check_list_size (GSList *conncheck_list, guint upper_limit)
- {
- guint valid = 0;
- guint cancelled = 0;
-@@ -1772,22 +1755,22 @@ static void priv_limit_conn_check_list_size (GSList *conncheck_list, guint upper
-
- while (item) {
- CandidateCheckPair *pair = item->data;
-+ GSList *next = item->next;
-
-- if (pair->state != NICE_CHECK_CANCELLED) {
-- valid++;
-- if (valid > upper_limit) {
-- pair->state = NICE_CHECK_CANCELLED;
-+ valid++;
-+ if (valid > upper_limit) {
-+ conn_check_free_item (pair);
-+ conncheck_list = g_slist_delete_link (conncheck_list, item);
- cancelled++;
-- }
- }
--
-- item = item->next;
-+ item = next;
- }
-
- if (cancelled > 0)
- nice_debug ("Agent : Pruned %d candidates. Conncheck list has %d elements"
- " left. Maximum connchecks allowed : %d", cancelled, valid,
- upper_limit);
-+ return conncheck_list;
- }
-
- /*
-@@ -2097,6 +2080,7 @@ static CandidateCheckPair *priv_add_new_check_pair (NiceAgent *agent,
- }
- pair->prflx_priority = ensure_unique_priority (component,
- peer_reflexive_candidate_priority (agent, local));
-+ pair->retransmit_on_timeout = TRUE;
-
- stream->conncheck_list = g_slist_insert_sorted (stream->conncheck_list, pair,
- (GCompareFunc)conn_check_compare);
-@@ -2106,7 +2090,8 @@ static CandidateCheckPair *priv_add_new_check_pair (NiceAgent *agent,
- /* implement the hard upper limit for number of
- checks (see sect 5.7.3 ICE ID-19): */
- if (agent->compatibility == NICE_COMPATIBILITY_RFC5245) {
-- priv_limit_conn_check_list_size (stream->conncheck_list, agent->max_conn_checks);
-+ stream->conncheck_list = priv_limit_conn_check_list_size (
-+ stream->conncheck_list, agent->max_conn_checks);
- }
-
- return pair;
-@@ -2769,8 +2754,10 @@ static guint priv_prune_pending_checks (NiceAgent *agent, NiceStream *stream, gu
- * the triggered check list should also be treated like an in-progress
- * pair.
- */
-- for (i = stream->conncheck_list; i; i = i->next) {
-+ i = stream->conncheck_list;
-+ while (i) {
- CandidateCheckPair *p = i->data;
-+ GSList *next = i->next;
-
- if (p->component_id == component_id) {
- gboolean like_in_progress =
-@@ -2779,19 +2766,20 @@ static guint priv_prune_pending_checks (NiceAgent *agent, NiceStream *stream, gu
-
- if (p->state == NICE_CHECK_FROZEN ||
- (p->state == NICE_CHECK_WAITING && !like_in_progress)) {
-- p->state = NICE_CHECK_CANCELLED;
-- nice_debug ("Agent %p : pair %p state CANCELED", agent, p);
-+ nice_debug ("Agent %p : pair %p removed.", agent, p);
-+ conn_check_free_item (p);
-+ stream->conncheck_list = g_slist_delete_link(stream->conncheck_list, i);
- }
-
- /* note: a SHOULD level req. in ICE 8.1.2. "Updating States" (ID-19) */
-- if (p->state == NICE_CHECK_IN_PROGRESS ||
-+ else if (p->state == NICE_CHECK_IN_PROGRESS ||
- (p->state == NICE_CHECK_WAITING && like_in_progress)) {
- if (highest_nominated_priority != 0 &&
- p->priority < highest_nominated_priority) {
-- p->stun_message.buffer = NULL;
-- p->stun_message.buffer_len = 0;
-- p->state = NICE_CHECK_CANCELLED;
-- nice_debug ("Agent %p : pair %p state CANCELED", agent, p);
-+ p->retransmit_on_timeout = FALSE;
-+ p->recheck_on_timeout = FALSE;
-+ nice_debug ("Agent %p : pair %p will not be retransmitted.",
-+ agent, p);
- } else {
- /* We must keep the higher priority pairs running because if a udp
- * packet was lost, we might end up using a bad candidate */
-@@ -2803,6 +2791,7 @@ static guint priv_prune_pending_checks (NiceAgent *agent, NiceStream *stream, gu
- }
- }
- }
-+ i = next;
- }
-
- return in_progress;
-@@ -2841,29 +2830,42 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
- p = p->succeeded_pair;
- }
-
-- nice_debug ("Agent %p : Found a matching pair %p for triggered check.", agent, p);
-+ nice_debug ("Agent %p : Found a matching pair %p (%s) (state=%c) ...",
-+ agent, p, p->foundation, priv_state_to_gchar (p->state));
-
- if (p->state == NICE_CHECK_WAITING ||
-- p->state == NICE_CHECK_FROZEN)
-+ p->state == NICE_CHECK_FROZEN) {
-+ nice_debug ("Agent %p : pair %p added for a triggered check.",
-+ agent, p);
- priv_add_pair_to_triggered_check_queue (agent, p);
-+ }
- else if (p->state == NICE_CHECK_IN_PROGRESS) {
- /* note: according to ICE SPEC sect 7.2.1.4 "Triggered Checks"
- * we cancel the in-progress transaction, and after the
- * retransmission timeout, we create a new connectivity check
- * for that pair. The controlling role of this new check may
- * be different from the role of this cancelled check.
-+ *
-+ * note: the flag retransmit_on_timeout unset means that
-+ * another pair, with a higher priority is already nominated,
-+ * so there's no reason to recheck this pair, since it can in
-+ * no way replace the nominated one.
- */
- if (!nice_socket_is_reliable (p->sockptr)) {
-- nice_debug ("Agent %p : check already in progress, "
-- "cancelling this check..", agent);
-- /* this flag will determine the action at the retransmission
-- * timeout of the stun timer
-- */
-- p->recheck_on_timeout = TRUE;
-+ if (p->retransmit_on_timeout) {
-+ nice_debug ("Agent %p : pair %p will be rechecked "
-+ "on stun timer timeout.", agent, p);
-+ /* this flag will determine the action at the retransmission
-+ * timeout of the stun timer
-+ */
-+ p->recheck_on_timeout = TRUE;
-+ } else
-+ nice_debug ("Agent %p : pair %p won't be retransmitted.",
-+ agent, p);
- }
- }
- else if (p->state == NICE_CHECK_SUCCEEDED) {
-- nice_debug ("Agent %p : Skipping triggered check, already completed..", agent);
-+ nice_debug ("Agent %p : nothing to do for pair %p.", agent, p);
- /* note: this is a bit unsure corner-case -- let's do the
- same state update as for processing responses to our own checks */
- /* note: this update is required by the dribble test, to
-@@ -2875,18 +2877,30 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
- } else if (p->state == NICE_CHECK_FAILED) {
- /* 7.2.1.4 Triggered Checks
- * If the state of the pair is Failed, it is changed to Waiting
-- and the agent MUST create a new connectivity check for that
-- pair (representing a new STUN Binding request transaction), by
-- enqueueing the pair in the triggered check queue. */
-- priv_add_pair_to_triggered_check_queue (agent, p);
-- /* If the component for this pair is in failed state, move it
-- * back to connecting, and reinitiate the timers
-+ * and the agent MUST create a new connectivity check for that
-+ * pair (representing a new STUN Binding request transaction), by
-+ * enqueueing the pair in the triggered check queue.
-+ *
-+ * note: the flag retransmit_on_timeout unset means that
-+ * another pair, with a higher priority is already nominated,
-+ * we apply the same strategy than with an in-progress pair
-+ * above.
- */
-- if (component->state == NICE_COMPONENT_STATE_FAILED) {
-- agent_signal_component_state_change (agent, stream->id,
-- component->id, NICE_COMPONENT_STATE_CONNECTING);
-- conn_check_schedule_next (agent);
-- }
-+ if (p->retransmit_on_timeout) {
-+ nice_debug ("Agent %p : pair %p added for a triggered check.",
-+ agent, p);
-+ priv_add_pair_to_triggered_check_queue (agent, p);
-+ /* If the component for this pair is in failed state, move it
-+ * back to connecting, and reinitiate the timers
-+ */
-+ if (component->state == NICE_COMPONENT_STATE_FAILED) {
-+ agent_signal_component_state_change (agent, stream->id,
-+ component->id, NICE_COMPONENT_STATE_CONNECTING);
-+ conn_check_schedule_next (agent);
-+ }
-+ } else
-+ nice_debug ("Agent %p : pair %p won't be retransmitted.",
-+ agent, p);
- }
-
- /* note: the spec says the we SHOULD retransmit in-progress
-@@ -3401,10 +3415,6 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, NiceStre
- }
- }
-
--
-- stream->conncheck_list =
-- prune_cancelled_conn_check (stream->conncheck_list);
--
- return trans_found;
- }
-
-diff --git a/agent/conncheck.h b/agent/conncheck.h
-index c07fb22..909d469 100644
---- a/agent/conncheck.h
-+++ b/agent/conncheck.h
-@@ -56,7 +56,6 @@
- * @NICE_CHECK_SUCCEEDED: Connection successfully checked.
- * @NICE_CHECK_FAILED: No connectivity; retransmissions ceased.
- * @NICE_CHECK_FROZEN: Waiting to be scheduled to %NICE_CHECK_WAITING.
-- * @NICE_CHECK_CANCELLED: Check cancelled.
- * @NICE_CHECK_DISCOVERED: A valid candidate pair not on the check list.
- *
- * States for checking a candidate pair.
-@@ -68,7 +67,6 @@ typedef enum
- NICE_CHECK_SUCCEEDED,
- NICE_CHECK_FAILED,
- NICE_CHECK_FROZEN,
-- NICE_CHECK_CANCELLED,
- NICE_CHECK_DISCOVERED,
- } NiceCheckState;
-
-@@ -89,6 +87,7 @@ struct _CandidateCheckPair
- gboolean use_candidate_on_next_check;
- gboolean mark_nominated_on_response_arrival;
- gboolean recheck_on_timeout;
-+ gboolean retransmit_on_timeout;
- struct _CandidateCheckPair *discovered_pair;
- struct _CandidateCheckPair *succeeded_pair;
- guint64 priority;
---
-2.13.6
-
-
-From 07366a5bca7e4818b8df29d9c7c220da8f752547 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 21 Jun 2016 21:47:42 +0200
-Subject: [PATCH 44/70] conncheck: fix the component failed transition
-
-This patch fixes the transition of a component from connecting to
-failed, that previously occured due to the propagation of the
-keep_timer_going variable, and to the final call to function
-priv_update_check_list_failed_components(), after the global agent
-timer was stopped.
-
-Previously, the code almost never entered to failed state, because the
-timer was going one, as long as the number of nominated pair was not
-enough, and as long as there were valid pairs not yet nominated. Even
-if all pair timers were over.
-
-The definition of the Failed state of a conncheck list is somewhat
-contradictory in the spec, depending on weather you read :
-
- * sect 5.7.4. "Computing States",
- "Failed: In this state, the ICE checks have not completed successfully
- for this media stream."
-
- or
-
- * sect 7.1.3.3. "Check List and Timer State Updates",
- "If all of the pairs in the check list are now either in the Failed or
- Succeeded state: If there is not a pair in the valid list for each
- component of the media stream, the state of the check list is set to
- Failed."
-
-Our understanding of the ICE spec is that, the proper way to enter failed
-state instead in when all connchecks have no longer in-progress pairs.
-All pairs are either in state succeeded, discovered, or failed. No timer
-is still running, and we have no hope that the conncheck list changes
-again, except if an unexpected STUN packet arrives later. All pairs in
-frozen state is a special case, that is handled separately (sect
-7.1.3.3).
-
-A special grace delay is added before declaring a component in state
-Failed. This delay is not part of the RFC, and it is aimed to limit the
-cases when a conncheck list is reactivated just after it's been declared
-failed, causing a user visible transition from connecting to failed, and
-back from failed to connecting again. This is also required by the test
-suite, that counts exactly the number of time each state is entered, and
-doesn't expect these transcient failed states to happen (frequent due to
-the nature of the testsuite, less frequent in real life).
-
-Differential Revision: https://phabricator.freedesktop.org/D1111
----
- agent/agent-priv.h | 14 +++++++++++
- agent/conncheck.c | 71 +++++++++++++++++++++++++++++++++++++++++++-----------
- 2 files changed, 71 insertions(+), 14 deletions(-)
-
-diff --git a/agent/agent-priv.h b/agent/agent-priv.h
-index 3384180..714ecff 100644
---- a/agent/agent-priv.h
-+++ b/agent/agent-priv.h
-@@ -122,6 +122,18 @@ nice_input_message_iter_compare (const NiceInputMessageIter *a,
- ((obj)->compatibility == NICE_COMPATIBILITY_RFC5245 || \
- (obj)->compatibility == NICE_COMPATIBILITY_OC2007R2)
-
-+/* A grace period before declaring a component as failed, in msecs. This
-+ * delay is added to reduce the chance to see the agent receiving new
-+ * stun activity just after the conncheck list has been declared failed,
-+ * reactiviting conncheck activity, and causing a (valid) state
-+ * transitions like that: connecting -> failed -> connecting ->
-+ * connected -> ready.
-+ * Such transitions are not buggy per-se, but may break the
-+ * test-suite, that counts precisely the number of time each state
-+ * has been set, and doesnt expect these transcient failed states.
-+ */
-+#define NICE_AGENT_MAX_TIMER_GRACE_PERIOD 1000
-+
- struct _NiceAgent
- {
- GObject parent; /* gobject pointer */
-@@ -176,6 +188,8 @@ struct _NiceAgent
- guint16 rfc4571_expecting_length;
- gboolean use_ice_udp;
- gboolean use_ice_tcp;
-+
-+ guint conncheck_timer_grace_period; /* ongoing delay before timer stop */
- /* XXX: add pointer to internal data struct for ABI-safe extensions */
- };
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index b0e2222..63db471 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -709,7 +709,7 @@ timer_timeout:
- }
- }
- }
-- }
-+ }
-
- /* step: perform an ordinary check, ICE spec, 5.8 "Scheduling Checks"
- * note: This code is executed when the triggered checks list is
-@@ -795,11 +795,8 @@ priv_conn_check_tick_stream_nominate (NiceStream *stream, NiceAgent *agent)
- if (s_inprogress)
- keep_timer_going = TRUE;
-
-- /* note: if some components have established connectivity,
-- * but yet no nominated pair, keep timer going */
- if (s_nominated < stream->n_components &&
- s_waiting_for_nomination) {
-- keep_timer_going = TRUE;
- if (NICE_AGENT_IS_COMPATIBLE_WITH_RFC5245_OR_OC2007R2 (agent)) {
- if (agent->nomination_mode == NICE_NOMINATION_MODE_REGULAR &&
- agent->controlling_mode) {
-@@ -888,6 +885,7 @@ priv_conn_check_tick_stream_nominate (NiceStream *stream, NiceAgent *agent)
- p->recheck_on_timeout = FALSE;
- p->use_candidate_on_next_check = TRUE;
- priv_add_pair_to_triggered_check_queue (agent, p);
-+ keep_timer_going = TRUE;
- break; /* move to the next component */
- }
- }
-@@ -911,6 +909,7 @@ priv_conn_check_tick_stream_nominate (NiceStream *stream, NiceAgent *agent)
- p->recheck_on_timeout = FALSE;
- priv_update_selected_pair (agent, component, p);
- priv_add_pair_to_triggered_check_queue (agent, p);
-+ keep_timer_going = TRUE;
- break; /* move to the next component */
- }
- }
-@@ -937,6 +936,7 @@ conn_check_stop (NiceAgent *agent)
- g_source_destroy (agent->conncheck_timer_source);
- g_source_unref (agent->conncheck_timer_source);
- agent->conncheck_timer_source = NULL;
-+ agent->conncheck_timer_grace_period = 0;
- }
-
-
-@@ -1005,9 +1005,39 @@ static gboolean priv_conn_check_tick_unlocked (NiceAgent *agent)
- keep_timer_going = TRUE;
- }
-
-+ /* step: if no work left and a conncheck list of a stream is still
-+ * frozen, set the pairs to waiting, according to ICE SPEC, sect
-+ * 7.1.3.3. "Check List and Timer State Updates"
-+ */
-+ if (!keep_timer_going) {
-+ for (i = agent->streams; i ; i = i->next) {
-+ NiceStream *stream = i->data;
-+ if (priv_is_checklist_frozen (stream)) {
-+ nice_debug ("Agent %p : stream %d conncheck list is still "
-+ "frozen, while other lists are completed. Unfreeze it.",
-+ agent, stream->id);
-+ keep_timer_going = priv_conn_check_unfreeze_next (agent, stream);
-+ }
-+ }
-+ }
-+
-+ /* note: we provide a grace period before declaring a component as
-+ * failed. Components marked connected, and then ready follow another
-+ * code path, and are not concerned by this grace period.
-+ */
-+ if (!keep_timer_going && agent->conncheck_timer_grace_period == 0)
-+ nice_debug ("Agent %p : waiting %d msecs before checking "
-+ "for failed components.", agent, NICE_AGENT_MAX_TIMER_GRACE_PERIOD);
-+
-+ if (keep_timer_going)
-+ agent->conncheck_timer_grace_period = 0;
-+ else
-+ agent->conncheck_timer_grace_period += agent->timer_ta;
-+
- /* step: stop timer if no work left */
-- if (keep_timer_going != TRUE) {
-- nice_debug ("Agent %p : %s: stopping conncheck timer", agent, G_STRFUNC);
-+ if (!keep_timer_going &&
-+ agent->conncheck_timer_grace_period >= NICE_AGENT_MAX_TIMER_GRACE_PERIOD) {
-+ nice_debug ("Agent %p : checking for failed components now.", agent);
- for (i = agent->streams; i; i = i->next) {
- NiceStream *stream = i->data;
- priv_update_check_list_failed_components (agent, stream);
-@@ -1017,6 +1047,7 @@ static gboolean priv_conn_check_tick_unlocked (NiceAgent *agent)
- }
- }
-
-+ nice_debug ("Agent %p : %s: stopping conncheck timer", agent, G_STRFUNC);
- priv_print_conn_check_lists (agent, G_STRFUNC,
- ", conncheck timer stopped");
-
-@@ -1027,9 +1058,10 @@ static gboolean priv_conn_check_tick_unlocked (NiceAgent *agent)
-
- /* XXX: what to signal, is all processing now really done? */
- nice_debug ("Agent %p : changing conncheck state to COMPLETED.", agent);
-+ return FALSE;
- }
-
-- return keep_timer_going;
-+ return TRUE;
- }
-
- static gboolean priv_conn_check_tick (gpointer pointer)
-@@ -1810,15 +1842,18 @@ static gboolean priv_update_selected_pair (NiceAgent *agent, NiceComponent *comp
- * Updates the check list state.
- *
- * Implements parts of the algorithm described in
-- * ICE sect 8.1.2. "Updating States" (ID-19): if for any
-+ * ICE sect 8.1.2. "Updating States" (RFC 5245): if for any
- * component, all checks have been completed and have
-- * failed, mark that component's state to NICE_CHECK_FAILED.
-+ * failed to produce a nominated pair, mark that component's
-+ * state to NICE_CHECK_FAILED.
- *
- * Sends a component state changesignal via 'agent'.
- */
- static void priv_update_check_list_failed_components (NiceAgent *agent, NiceStream *stream)
- {
- GSList *i;
-+ gboolean completed;
-+ guint nominated;
- /* note: emitting a signal might cause the client
- * to remove the stream, thus the component count
- * must be fetched before entering the loop*/
-@@ -1842,6 +1877,8 @@ static void priv_update_check_list_failed_components (NiceAgent *agent, NiceStre
- if (!agent_find_component (agent, stream->id, c+1, NULL, &comp))
- continue;
-
-+ nominated = 0;
-+ completed = TRUE;
- for (i = stream->conncheck_list; i; i = i->next) {
- CandidateCheckPair *p = i->data;
-
-@@ -1849,16 +1886,22 @@ static void priv_update_check_list_failed_components (NiceAgent *agent, NiceStre
- g_assert (p->stream_id == stream->id);
-
- if (p->component_id == (c + 1)) {
-- if (p->state != NICE_CHECK_FAILED)
-- break;
-+ if (p->nominated)
-+ ++nominated;
-+ if (p->state != NICE_CHECK_FAILED &&
-+ p->state != NICE_CHECK_SUCCEEDED &&
-+ p->state != NICE_CHECK_DISCOVERED)
-+ completed = FALSE;
- }
- }
-
-- /* note: all checks have failed
-+ /* note: all pairs are either failed or succeeded, and the component
-+ * has not produced a nominated pair.
- * Set the component to FAILED only if it actually had remote candidates
- * that failed.. */
-- if (i == NULL && comp != NULL && comp->remote_candidates != NULL)
-- agent_signal_component_state_change (agent,
-+ if (completed && nominated == 0 &&
-+ comp != NULL && comp->remote_candidates != NULL)
-+ agent_signal_component_state_change (agent,
- stream->id,
- (c + 1), /* component-id */
- NICE_COMPONENT_STATE_FAILED);
---
-2.13.6
-
-
-From 195db6b344fc4f9fadc39419dfeec2fc14b23fac Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Fri, 15 Jul 2016 23:31:42 +0200
-Subject: [PATCH 45/70] agent: add new pairs only for gathering streams
-
-At the end of the local candidate gathering process, we only create new
-pairs for streams that are in gathering state.
-
-Other stream that may be in ready state for example, due to a
-previously succeeded conncheck process, may have accumulated some
-couples (local,remote) candidates that have not resulted in the creation
-a new pair during this previous conncheck process, and we don't want
-these new pairs to be added now, because it would generate unneeded
-transition changes for a stream unconcerned by this gathering.
-
-Differential Revision: https://phabricator.freedesktop.org/D1755
----
- agent/agent.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/agent/agent.c b/agent/agent.c
-index 577a7e0..e3705ed 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -2032,6 +2032,17 @@ void agent_gathering_done (NiceAgent *agent)
-
- for (i = agent->streams; i; i = i->next) {
- NiceStream *stream = i->data;
-+
-+ /* We ignore streams not in gathering state, typically already in
-+ * ready state. Such streams may have couples (local,remote)
-+ * candidates that have not resulted in the creation a new pair
-+ * during a previous conncheck session, and we don't want these new
-+ * pairs to be added now, because it would generate unneeded
-+ * transition changes for a stream unconcerned by this gathering.
-+ */
-+ if (!stream->gathering)
-+ continue;
-+
- for (j = stream->components; j; j = j->next) {
- NiceComponent *component = j->data;
-
---
-2.13.6
-
-
-From b4b8d6628c8c5d4f10af0101f846db4938a3f6c4 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Sun, 28 May 2017 22:20:36 +0200
-Subject: [PATCH 46/70] stun: fix gcc7 implicit fallthrough warning
-
-Differential Revision: https://phabricator.freedesktop.org/D1754
----
- stun/stunmessage.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/stun/stunmessage.c b/stun/stunmessage.c
-index e8184c4..4cc3392 100644
---- a/stun/stunmessage.c
-+++ b/stun/stunmessage.c
-@@ -120,6 +120,7 @@ stun_message_find (const StunMessage *msg, StunAttribute type,
- /* Only fingerprint may come after M-I */
- if (type == STUN_ATTRIBUTE_FINGERPRINT)
- break;
-+ return NULL;
-
- case STUN_ATTRIBUTE_FINGERPRINT:
- /* Nothing may come after FPR */
---
-2.13.6
-
-
-From c7a5a92b66f9b83baf2aa446966bdfb2cf39ecd1 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Sun, 18 Jun 2017 10:12:58 +0200
-Subject: [PATCH 47/70] agent: remove spurious newlines
-
-Differential Revision: https://phabricator.freedesktop.org/D1756
----
- agent/agent.c | 2 +-
- agent/component.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/agent/agent.c b/agent/agent.c
-index e3705ed..27e6193 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -3905,7 +3905,7 @@ agent_recv_message_unlocked (
-
- nice_address_to_string (message->from, str);
- nice_debug_verbose ("Agent %p : %d:%d DROPPING packet from unknown source"
-- " %s:%d sock-type: %d\n", agent, stream->id, component->id, str,
-+ " %s:%d sock-type: %d", agent, stream->id, component->id, str,
- nice_address_get_port (message->from), nicesock->type);
- }
-
-diff --git a/agent/component.c b/agent/component.c
-index ab665b6..6e207d3 100644
---- a/agent/component.c
-+++ b/agent/component.c
-@@ -1461,7 +1461,7 @@ nice_component_add_valid_candidate (NiceComponent *component,
- char str[INET6_ADDRSTRLEN];
- nice_address_to_string (&candidate->addr, str);
- nice_debug ("Agent %p : %d:%d Adding valid source"
-- " candidate: %s:%d trans: %d\n", component->agent,
-+ " candidate: %s:%d trans: %d", component->agent,
- candidate->stream_id, candidate->component_id, str,
- nice_address_get_port (&candidate->addr), candidate->transport);
- }
---
-2.13.6
-
-
-From e3ddaa285e389baf3f26cfb6964919718a8f6a00 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Wed, 21 Jun 2017 16:55:32 -0400
-Subject: [PATCH 48/70] agent: Adjust the nice_agent_new_full() to use flags
-
-This makes it easier to read and more extensible.
----
- agent/agent.c | 9 +++++----
- agent/agent.h | 27 ++++++++++++++++++++++-----
- tests/test-nomination.c | 8 ++++----
- 3 files changed, 31 insertions(+), 13 deletions(-)
-
-diff --git a/agent/agent.c b/agent/agent.c
-index 27e6193..8fd8ead 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -1168,14 +1168,15 @@ nice_agent_new_reliable (GMainContext *ctx, NiceCompatibility compat)
- NICEAPI_EXPORT NiceAgent *
- nice_agent_new_full (GMainContext *ctx,
- NiceCompatibility compat,
-- gboolean reliable,
-- NiceNominationMode nomination)
-+ NiceAgentOption flags)
- {
- NiceAgent *agent = g_object_new (NICE_TYPE_AGENT,
- "compatibility", compat,
- "main-context", ctx,
-- "reliable", reliable,
-- "nomination-mode", nomination,
-+ "reliable", (flags & NICE_AGENT_OPTION_RELIABLE) ? TRUE : FALSE,
-+ "nomination-mode", (flags & NICE_AGENT_OPTION_REGULAR_NOMINATION) ?
-+ NICE_NOMINATION_MODE_REGULAR : NICE_NOMINATION_MODE_AGGRESSIVE,
-+ "full-mode", (flags & NICE_AGENT_OPTION_LITE_MODE) ? FALSE : TRUE,
- NULL);
-
- return agent;
-diff --git a/agent/agent.h b/agent/agent.h
-index 6e233c6..ed6f6e4 100644
---- a/agent/agent.h
-+++ b/agent/agent.h
-@@ -399,6 +399,25 @@ typedef enum
- } NiceNominationMode;
-
- /**
-+ * NiceAgentOption:
-+ * @NICE_AGENT_OPTION_REGULAR_NOMINATION: Enables regular nomination, default
-+ * is aggrssive mode (see #NiceNominationMode).
-+ * @NICE_AGENT_OPTION_RELIABLE: Enables reliable mode, possibly using PseudoTCP, * see nice_agent_new_reliable().
-+ * @NICE_AGENT_OPTION_LITE_MODE: Enable lite mode
-+ *
-+ * These are options that can be passed to nice_agent_new_full(). They set
-+ * various properties on the agent. Not including them sets the property to
-+ * the other value.
-+ *
-+ * Since: UNRELEASED
-+ */
-+typedef enum {
-+ NICE_AGENT_OPTION_REGULAR_NOMINATION = 1 << 0,
-+ NICE_AGENT_OPTION_RELIABLE = 1 << 1,
-+ NICE_AGENT_OPTION_LITE_MODE = 1 << 2,
-+} NiceAgentOption;
-+
-+/**
- * NiceAgentRecvFunc:
- * @agent: The #NiceAgent Object
- * @stream_id: The id of the stream
-@@ -452,13 +471,12 @@ nice_agent_new_reliable (GMainContext *ctx, NiceCompatibility compat);
- * nice_agent_new_full:
- * @ctx: The Glib Mainloop Context to use for timers
- * @compat: The compatibility mode of the agent
-- * @reliable: The reliability mode of the agent
-- * @nomination: The nomination mode of the agent
-+ * @flags: Flags to set the properties
- *
- * Create a new #NiceAgent with parameters that must be be defined at
- * construction time.
- * The returned object must be freed with g_object_unref()
-- * <para> See also: #NiceNominationMode </para>
-+ * <para> See also: #NiceNominationMode and #NiceAgentOption</para>
- *
- * Since: UNRELEASED
- *
-@@ -467,8 +485,7 @@ nice_agent_new_reliable (GMainContext *ctx, NiceCompatibility compat);
- NiceAgent *
- nice_agent_new_full (GMainContext *ctx,
- NiceCompatibility compat,
-- gboolean reliable,
-- NiceNominationMode nomination);
-+ NiceAgentOption flags);
-
- /**
- * nice_agent_add_local_address:
-diff --git a/tests/test-nomination.c b/tests/test-nomination.c
-index b5a5e5f..bf21557 100644
---- a/tests/test-nomination.c
-+++ b/tests/test-nomination.c
-@@ -140,13 +140,13 @@ run_test(NiceNominationMode l_nomination_mode,
-
- lagent = nice_agent_new_full (NULL,
- NICE_COMPATIBILITY_RFC5245,
-- FALSE, /* reliable */
-- l_nomination_mode);
-+ l_nomination_mode == NICE_NOMINATION_MODE_REGULAR ?
-+ NICE_AGENT_OPTION_REGULAR_NOMINATION : 0);
-
- ragent = nice_agent_new_full (NULL,
- NICE_COMPATIBILITY_RFC5245,
-- FALSE, /* reliable */
-- r_nomination_mode);
-+ r_nomination_mode == NICE_NOMINATION_MODE_REGULAR ?
-+ NICE_AGENT_OPTION_REGULAR_NOMINATION : 0);
-
- g_object_set (G_OBJECT (lagent), "ice-tcp", FALSE, NULL);
- g_object_set (G_OBJECT (ragent), "ice-tcp", FALSE, NULL);
---
-2.13.6
-
-
-From dcb0d647174416a292492f8deca86f83a2ef124c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Wed, 21 Jun 2017 17:07:17 -0400
-Subject: [PATCH 49/70] Repleace UNRELEASED with 0.1.15
-
----
- agent/agent.c | 8 ++++----
- agent/agent.h | 6 +++---
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/agent/agent.c b/agent/agent.c
-index 8fd8ead..15af9ed 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -448,7 +448,7 @@ nice_agent_class_init (NiceAgentClass *klass)
- * the selection of valid pairs to be used upstream.
- * <para> See also: #NiceNominationMode </para>
- *
-- * Since: UNRELEASED
-+ * Since: 0.1.15
- */
- g_object_class_install_property (gobject_class, PROP_NOMINATION_MODE,
- g_param_spec_enum (
-@@ -744,7 +744,7 @@ nice_agent_class_init (NiceAgentClass *klass)
- * to the READY state, and on the time needed to complete the GATHERING
- * state.
- *
-- * Since: UNRELEASED
-+ * Since: 0.1.15
- */
-
- g_object_class_install_property (gobject_class, PROP_STUN_MAX_RETRANSMISSIONS,
-@@ -769,7 +769,7 @@ nice_agent_class_init (NiceAgentClass *klass)
- * divided by two instead (RFC 5389 indicates that a customisable
- * multiplier 'Rm' to 'RTO' should be used).
- *
-- * Since: UNRELEASED
-+ * Since: 0.1.15
- */
-
- g_object_class_install_property (gobject_class, PROP_STUN_INITIAL_TIMEOUT,
-@@ -788,7 +788,7 @@ nice_agent_class_init (NiceAgentClass *klass)
- * The initial timeout of the STUN binding requests used
- * for a reliable timer.
- *
-- * Since: UNRELEASED
-+ * Since: 0.1.15
- */
-
- g_object_class_install_property (gobject_class, PROP_STUN_RELIABLE_TIMEOUT,
-diff --git a/agent/agent.h b/agent/agent.h
-index ed6f6e4..520c4c5 100644
---- a/agent/agent.h
-+++ b/agent/agent.h
-@@ -390,7 +390,7 @@ typedef enum
- * faster, than the regular mode, potentially causing the nominated
- * pair to change until the connection check completes.
- *
-- * Since: UNRELEASED
-+ * Since: 0.1.15
- */
- typedef enum
- {
-@@ -409,7 +409,7 @@ typedef enum
- * various properties on the agent. Not including them sets the property to
- * the other value.
- *
-- * Since: UNRELEASED
-+ * Since: 0.1.15
- */
- typedef enum {
- NICE_AGENT_OPTION_REGULAR_NOMINATION = 1 << 0,
-@@ -478,7 +478,7 @@ nice_agent_new_reliable (GMainContext *ctx, NiceCompatibility compat);
- * The returned object must be freed with g_object_unref()
- * <para> See also: #NiceNominationMode and #NiceAgentOption</para>
- *
-- * Since: UNRELEASED
-+ * Since: 0.1.15
- *
- * Returns: The new agent GObject
- */
---
-2.13.6
-
-
-From 2c50d73b82f2ec2422a8e0ea393194486c193c64 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Wed, 10 Feb 2016 23:20:39 -0500
-Subject: [PATCH 50/70] agent: Don't crash if recv cancelled without a GError
-
----
- agent/agent.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/agent/agent.c b/agent/agent.c
-index 15af9ed..e48d7f3 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -4279,7 +4279,10 @@ static gboolean
- nice_agent_recv_cancelled_cb (GCancellable *cancellable, gpointer user_data)
- {
- GError **error = user_data;
-- return !g_cancellable_set_error_if_cancelled (cancellable, error);
-+
-+ if (error && *error)
-+ g_cancellable_set_error_if_cancelled (cancellable, error);
-+ return G_SOURCE_REMOVE;
- }
-
- static gint
---
-2.13.6
-
-
-From 63d273cea42def3567701ad9feab91f63cf9345f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Thu, 11 Feb 2016 22:16:48 -0500
-Subject: [PATCH 51/70] component: Use non-GClosure dummy callbacks
-
-GClosures are not that cheap to setup
----
- agent/component.c | 18 +++++++++++++++---
- 1 file changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/agent/component.c b/agent/component.c
-index 6e207d3..6eee90e 100644
---- a/agent/component.c
-+++ b/agent/component.c
-@@ -1005,6 +1005,18 @@ nice_component_class_init (NiceComponentClass *klass)
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
- }
-
-+static gboolean
-+dummy_callback (gpointer data)
-+{
-+ return G_SOURCE_CONTINUE;
-+}
-+
-+static void
-+source_set_dummy_callback (GSource *source)
-+{
-+ g_source_set_callback (source, dummy_callback, NULL, NULL);
-+}
-+
- static void
- nice_component_init (NiceComponent *component)
- {
-@@ -1027,7 +1039,7 @@ nice_component_init (NiceComponent *component)
- component->stop_cancellable = g_cancellable_new ();
- component->stop_cancellable_source =
- g_cancellable_source_new (component->stop_cancellable);
-- g_source_set_dummy_callback (component->stop_cancellable_source);
-+ source_set_dummy_callback (component->stop_cancellable_source);
- g_source_attach (component->stop_cancellable_source, component->own_ctx);
- component->ctx = g_main_context_ref (component->own_ctx);
-
-@@ -1242,7 +1254,7 @@ component_source_prepare (GSource *source, gint *timeout_)
- child_socket_source->source =
- g_socket_create_source (child_socket_source->socket->fileno, G_IO_IN,
- NULL);
-- g_source_set_dummy_callback (child_socket_source->source);
-+ source_set_dummy_callback (child_socket_source->source);
- g_source_add_child_source (source, child_socket_source->source);
- g_source_unref (child_socket_source->source);
- component_source->socket_sources =
-@@ -1387,7 +1399,7 @@ nice_component_input_source_new (NiceAgent *agent, guint stream_id,
- GSource *cancellable_source;
-
- cancellable_source = g_cancellable_source_new (cancellable);
-- g_source_set_dummy_callback (cancellable_source);
-+ source_set_dummy_callback (cancellable_source);
- g_source_add_child_source ((GSource *) component_source,
- cancellable_source);
- g_source_unref (cancellable_source);
---
-2.13.6
-
-
-From 9f800d3597767855accccc592c34bc4e945f5bd5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Wed, 21 Jun 2017 20:42:57 -0400
-Subject: [PATCH 52/70] configure: Remove -Wswitch-enum
-
-Creates useless warnings when other libraries change.
-
-https://phabricator.freedesktop.org/T7770
----
- configure.ac | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6c106ff..16988ad 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -154,7 +154,6 @@ AS_IF([test "$enable_compile_warnings" = "yes" -o \
- ])
- AS_IF([test "$enable_compile_warnings" = "maximum" -o \
- "$enable_compile_warnings" = "error"],[
-- NICE_ADD_FLAG([-Wswitch-enum])
- NICE_ADD_FLAG([-Wswitch-default])
- NICE_ADD_FLAG([-Waggregate-return])
- ])
---
-2.13.6
-
-
-From dbaf8f5ccd76089e340883887c7e08e6c04de80a Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 12 Apr 2016 13:22:21 +0200
-Subject: [PATCH 53/70] conncheck: improve role conflict debug
-
-This patch displays explicitely the controlling or controlled
-role of the agent.
-
-Differential Revision: https://phabricator.freedesktop.org/D874
----
- agent/conncheck.c | 24 +++++++++++++++++++-----
- 1 file changed, 19 insertions(+), 5 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 63db471..8945e0f 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -3134,14 +3134,16 @@ static void priv_check_for_role_conflict (NiceAgent *agent, gboolean control)
- {
- /* role conflict, change mode; wait for a new conn. check */
- if (control != agent->controlling_mode) {
-- nice_debug ("Agent %p : Role conflict, changing agent role to %d.", agent, control);
-+ nice_debug ("Agent %p : Role conflict, changing agent role to \"%s\".",
-+ agent, control ? "controlling" : "controlled");
- agent->controlling_mode = control;
- /* the pair priorities depend on the roles, so recalculation
- * is needed */
- priv_recalculate_pair_priorities (agent);
- }
- else
-- nice_debug ("Agent %p : Role conflict, agent role already changed to %d.", agent, control);
-+ nice_debug ("Agent %p : Role conflict, staying with role \"%s\".",
-+ agent, control ? "controlling" : "controlled");
- }
-
- /*
-@@ -3429,13 +3431,25 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, NiceStre
- /* case: role conflict error, need to restart with new role */
- nice_debug ("Agent %p : conncheck %p ROLE CONFLICT, restarting", agent, p);
-
-+ /* note: this res value indicates that the role of the peer
-+ * agent has not changed after the tie-breaker comparison, so
-+ * this is our role that must change. see ICE sect. 7.1.3.1
-+ * "Failure Cases". Our role might already have changed due to
-+ * an earlier incoming request, but if not, change role now.
-+ *
-+ * Sect. 7.1.3.1 is not clear on this point, but we choose to
-+ * put the candidate pair in the triggered check list even
-+ * when the agent did not switch its role. The reason for this
-+ * interpretation is that the reception of the stun reply, even
-+ * an error reply, is a good sign that this pair will be
-+ * valid, if we retry the check after the role of both peers
-+ * has been fixed.
-+ */
-+
- if (p->stun_message.buffer != NULL) {
- guint64 tie;
- gboolean controlled_mode;
-
-- /* note: our role might already have changed due to an
-- * incoming request, but if not, change role now;
-- * follows ICE 7.1.2.1 "Failure Cases" (ID-19) */
- controlled_mode = (stun_message_find64 (&p->stun_message,
- STUN_ATTRIBUTE_ICE_CONTROLLED, &tie) ==
- STUN_MESSAGE_RETURN_SUCCESS);
---
-2.13.6
-
-
-From 5a42089aeb2dbbb52d820cd1b6efdfcfbe9b055e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
-Date: Tue, 5 Sep 2017 14:50:29 -0400
-Subject: [PATCH 54/70] agent: Set error if it isn't set
-
----
- agent/agent.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/agent/agent.c b/agent/agent.c
-index e48d7f3..a4dcc0c 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -4280,7 +4280,7 @@ nice_agent_recv_cancelled_cb (GCancellable *cancellable, gpointer user_data)
- {
- GError **error = user_data;
-
-- if (error && *error)
-+ if (error && !*error)
- g_cancellable_set_error_if_cancelled (cancellable, error);
- return G_SOURCE_REMOVE;
- }
---
-2.13.6
-
-
-From 25be00271a4c8c684a2d435d29ae0811dbf5e21c Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Mon, 26 Jun 2017 20:36:35 +0200
-Subject: [PATCH 55/70] conncheck: reorder some chunks of code
-
-With this patch we simplify the levels of code indentation.
-
-Differential Revision: https://phabricator.freedesktop.org/D1758
----
- agent/conncheck.c | 858 +++++++++++++++++++++++++++---------------------------
- 1 file changed, 422 insertions(+), 436 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 8945e0f..874f7b1 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -608,106 +608,106 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
- gboolean keep_timer_going = FALSE;
- GSList *i;
- CandidateCheckPair *pair;
-+ unsigned int timeout;
-
- /* step: process ongoing STUN transactions */
- for (i = stream->conncheck_list; i ; i = i->next) {
- CandidateCheckPair *p = i->data;
-+ gchar tmpbuf1[INET6_ADDRSTRLEN], tmpbuf2[INET6_ADDRSTRLEN];
-+ NiceComponent *component;
-+
-+ if (!agent_find_component (agent, p->stream_id, p->component_id,
-+ NULL, &component))
-+ continue;
-+
-+ if (p->state != NICE_CHECK_IN_PROGRESS)
-+ continue;
-
-- if (p->state == NICE_CHECK_IN_PROGRESS) {
-- if (p->stun_message.buffer == NULL) {
-- nice_debug ("Agent %p : STUN connectivity check was cancelled, marking as done.", agent);
-- p->state = NICE_CHECK_FAILED;
-- nice_debug ("Agent %p : pair %p state FAILED", agent, p);
-- } else if (priv_timer_expired (&p->next_tick, now)) {
-- switch (stun_timer_refresh (&p->timer)) {
-- case STUN_USAGE_TIMER_RETURN_TIMEOUT:
-- {
-- gchar tmpbuf1[INET6_ADDRSTRLEN], tmpbuf2[INET6_ADDRSTRLEN];
-- NiceComponent *component;
-+ if (p->stun_message.buffer == NULL) {
-+ nice_debug ("Agent %p : STUN connectivity check was cancelled, marking as done.", agent);
-+ p->state = NICE_CHECK_FAILED;
-+ nice_debug ("Agent %p : pair %p state FAILED", agent, p);
-+ continue;
-+ }
-
-+ if (!priv_timer_expired (&p->next_tick, now))
-+ continue;
-+
-+ switch (stun_timer_refresh (&p->timer)) {
-+ case STUN_USAGE_TIMER_RETURN_TIMEOUT:
- timer_timeout:
-- /* case: conncheck cancelled due to in-progress incoming
-- * check, requeing the pair, ICE spec, sect 7.2.1.4
-- * "Triggered Checks", "If the state of that pair is
-- * In-Progress..."
-- */
-- if (priv_conn_recheck_on_timeout (agent, p))
-- break;
-+ /* case: conncheck cancelled due to in-progress incoming
-+ * check, requeing the pair, ICE spec, sect 7.2.1.4
-+ * "Triggered Checks", "If the state of that pair is
-+ * In-Progress..."
-+ */
-+ if (priv_conn_recheck_on_timeout (agent, p))
-+ break;
-
-- /* case: error, abort processing */
-- nice_address_to_string (&p->local->addr, tmpbuf1);
-- nice_address_to_string (&p->remote->addr, tmpbuf2);
-- nice_debug ("Agent %p : Retransmissions failed, giving up on connectivity check %p", agent, p);
-- nice_debug ("Agent %p : Failed pair is [%s]:%u --> [%s]:%u", agent,
-- tmpbuf1, nice_address_get_port (&p->local->addr),
-- tmpbuf2, nice_address_get_port (&p->remote->addr));
-- candidate_check_pair_fail (stream, agent, p);
-- priv_print_conn_check_lists (agent, G_STRFUNC,
-- ", retransmission failed");
--
-- /* perform a check if a transition state from connected to
-- * ready can be performed. This may happen here, when the last
-- * in-progress pair has expired its retransmission count
-- * in priv_conn_check_tick_stream(), which is a condition to
-- * make the transition connected to ready.
-- */
-- if (agent_find_component (agent, p->stream_id, p->component_id,
-- NULL, &component))
-- priv_update_check_list_state_for_ready (agent, stream,
-- component);
-- break;
-- }
-- case STUN_USAGE_TIMER_RETURN_RETRANSMIT:
-- {
-- unsigned int timeout = stun_timer_remainder (&p->timer);
-+ /* case: error, abort processing */
-+ nice_address_to_string (&p->local->addr, tmpbuf1);
-+ nice_address_to_string (&p->remote->addr, tmpbuf2);
-+ nice_debug ("Agent %p : Retransmissions failed, giving up on connectivity check %p", agent, p);
-+ nice_debug ("Agent %p : Failed pair is [%s]:%u --> [%s]:%u", agent,
-+ tmpbuf1, nice_address_get_port (&p->local->addr),
-+ tmpbuf2, nice_address_get_port (&p->remote->addr));
-+ candidate_check_pair_fail (stream, agent, p);
-+ priv_print_conn_check_lists (agent, G_STRFUNC,
-+ ", retransmission failed");
-+
-+ /* perform a check if a transition state from connected to
-+ * ready can be performed. This may happen here, when the last
-+ * in-progress pair has expired its retransmission count
-+ * in priv_conn_check_tick_stream(), which is a condition to
-+ * make the transition connected to ready.
-+ */
-+ priv_update_check_list_state_for_ready (agent, stream, component);
-+ break;
-+ case STUN_USAGE_TIMER_RETURN_RETRANSMIT:
-+ timeout = stun_timer_remainder (&p->timer);
-
-- /* case: retransmission stopped, due to the nomination of
-- * a pair with a higher priority than this in-progress pair,
-- * ICE spec, sect 8.1.2 "Updating States", item 2.2
-- */
-- if (!p->retransmit_on_timeout)
-- goto timer_timeout;
-+ /* case: retransmission stopped, due to the nomination of
-+ * a pair with a higher priority than this in-progress pair,
-+ * ICE spec, sect 8.1.2 "Updating States", item 2.2
-+ */
-+ if (!p->retransmit_on_timeout)
-+ goto timer_timeout;
-
-- /* case: conncheck cancelled due to in-progress incoming
-- * check, requeing the pair, ICE spec, sect 7.2.1.4
-- * "Triggered Checks", "If the state of that pair is
-- * In-Progress..."
-- */
-- if (priv_conn_recheck_on_timeout (agent, p))
-- break;
-+ /* case: conncheck cancelled due to in-progress incoming
-+ * check, requeing the pair, ICE spec, sect 7.2.1.4
-+ * "Triggered Checks", "If the state of that pair is
-+ * In-Progress..."
-+ */
-+ if (priv_conn_recheck_on_timeout (agent, p))
-+ break;
-
-- /* case: not ready, so schedule a new timeout */
-- nice_debug ("Agent %p :STUN transaction retransmitted on pair %p "
-- "(timeout %dms, delay=%dms, retrans=%d).",
-- agent, p, timeout, p->timer.delay, p->timer.retransmissions);
-+ /* case: not ready, so schedule a new timeout */
-+ nice_debug ("Agent %p :STUN transaction retransmitted on pair %p "
-+ "(timeout %dms, delay=%dms, retrans=%d).",
-+ agent, p, timeout, p->timer.delay, p->timer.retransmissions);
-
-- agent_socket_send (p->sockptr, &p->remote->addr,
-- stun_message_length (&p->stun_message),
-- (gchar *)p->stun_buffer);
-+ agent_socket_send (p->sockptr, &p->remote->addr,
-+ stun_message_length (&p->stun_message),
-+ (gchar *)p->stun_buffer);
-
-
-- /* note: convert from milli to microseconds for g_time_val_add() */
-- p->next_tick = *now;
-- g_time_val_add (&p->next_tick, timeout * 1000);
-+ /* note: convert from milli to microseconds for g_time_val_add() */
-+ p->next_tick = *now;
-+ g_time_val_add (&p->next_tick, timeout * 1000);
-
-- return TRUE;
-- }
-- case STUN_USAGE_TIMER_RETURN_SUCCESS:
-- {
-- unsigned int timeout = stun_timer_remainder (&p->timer);
-+ return TRUE;
-+ case STUN_USAGE_TIMER_RETURN_SUCCESS:
-+ timeout = stun_timer_remainder (&p->timer);
-
-- /* note: convert from milli to microseconds for g_time_val_add() */
-- p->next_tick = *now;
-- g_time_val_add (&p->next_tick, timeout * 1000);
-+ /* note: convert from milli to microseconds for g_time_val_add() */
-+ p->next_tick = *now;
-+ g_time_val_add (&p->next_tick, timeout * 1000);
-
-- keep_timer_going = TRUE;
-- break;
-- }
-- default:
-- /* Nothing to do. */
-- break;
-- }
-- }
-+ keep_timer_going = TRUE;
-+ break;
-+ default:
-+ /* Nothing to do. */
-+ break;
- }
- }
-
-@@ -2628,27 +2628,23 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair)
- if (NICE_AGENT_IS_COMPATIBLE_WITH_RFC5245_OR_OC2007R2 (agent)) {
- switch (agent->nomination_mode) {
- case NICE_NOMINATION_MODE_REGULAR:
-- {
-- /* We are doing regular nomination, so we set the use-candidate
-- * attrib, when the controlling agent decided which valid pair to
-- * resend with this flag in priv_conn_check_tick_stream()
-- */
-- cand_use = pair->use_candidate_on_next_check;
-- nice_debug ("Agent %p : %s: set cand_use=%d "
-- "(regular nomination).", agent, G_STRFUNC, cand_use);
-- break;
-- }
-+ /* We are doing regular nomination, so we set the use-candidate
-+ * attrib, when the controlling agent decided which valid pair to
-+ * resend with this flag in priv_conn_check_tick_stream()
-+ */
-+ cand_use = pair->use_candidate_on_next_check;
-+ nice_debug ("Agent %p : %s: set cand_use=%d "
-+ "(regular nomination).", agent, G_STRFUNC, cand_use);
-+ break;
- case NICE_NOMINATION_MODE_AGGRESSIVE:
-- {
-- /* We are doing aggressive nomination, we set the use-candidate
-- * attrib in every check we send, when we are the controlling
-- * agent, RFC 5245, 8.1.1.2
-- */
-- cand_use = controlling;
-- nice_debug ("Agent %p : %s: set cand_use=%d "
-- "(aggressive nomination).", agent, G_STRFUNC, cand_use);
-- break;
-- }
-+ /* We are doing aggressive nomination, we set the use-candidate
-+ * attrib in every check we send, when we are the controlling
-+ * agent, RFC 5245, 8.1.1.2
-+ */
-+ cand_use = controlling;
-+ nice_debug ("Agent %p : %s: set cand_use=%d "
-+ "(aggressive nomination).", agent, G_STRFUNC, cand_use);
-+ break;
- default:
- /* Nothing to do. */
- break;
-@@ -2656,107 +2652,105 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair)
- } else if (cand_use)
- pair->nominated = controlling;
-
-- if (uname_len > 0) {
-- buffer_len = stun_usage_ice_conncheck_create (&component->stun_agent,
-- &pair->stun_message, pair->stun_buffer, sizeof(pair->stun_buffer),
-- uname, uname_len, password, password_len,
-- cand_use, controlling, pair->prflx_priority,
-- agent->tie_breaker,
-- pair->local->foundation,
-- agent_to_ice_compatibility (agent));
-+ if (uname_len == 0) {
-+ nice_debug ("Agent %p: no credentials found, cancelling conncheck", agent);
-+ pair->stun_message.buffer = NULL;
-+ pair->stun_message.buffer_len = 0;
-+ return -1;
-+ }
-
-- nice_debug ("Agent %p: conncheck created %zd - %p", agent, buffer_len,
-- pair->stun_message.buffer);
-+ buffer_len = stun_usage_ice_conncheck_create (&component->stun_agent,
-+ &pair->stun_message, pair->stun_buffer, sizeof(pair->stun_buffer),
-+ uname, uname_len, password, password_len,
-+ cand_use, controlling, pair->prflx_priority,
-+ agent->tie_breaker,
-+ pair->local->foundation,
-+ agent_to_ice_compatibility (agent));
-
-- if (agent->compatibility == NICE_COMPATIBILITY_MSN ||
-- agent->compatibility == NICE_COMPATIBILITY_OC2007) {
-- g_free (password);
-- }
-+ nice_debug ("Agent %p: conncheck created %zd - %p", agent, buffer_len,
-+ pair->stun_message.buffer);
-
-- if (buffer_len > 0) {
-- if (nice_socket_is_reliable(pair->sockptr)) {
-- stun_timer_start_reliable(&pair->timer, agent->stun_reliable_timeout);
-- } else {
-- StunTimer *timer = &pair->timer;
--
-- if (pair->recheck_on_timeout)
-- /* The pair recheck on timeout can easily cause repetitive rechecks in
-- * a ping-pong effect, if both peers with the same behaviour try to
-- * check the same pair almost simultaneously, and if the network rtt
-- * is greater than the initial timer rto. The reply to the initial
-- * stun request may arrive after the in-progress conncheck
-- * cancellation (described in RFC 5245, sect 7.2.1.4). Cancellation
-- * creates a new stun request, and forgets the initial one.
-- * The conncheck timer is restarted with the same initial value,
-- * so the same situation happens again later.
-- *
-- * We choose to avoid resetting the timer in such situation.
-- * After enough retransmissions, the timeout delay becomes
-- * longer than the rtt, and the stun reply can be handled.
-- */
-- nice_debug("Agent %p : reusing timer of pair %p: %d/%d %d/%dms",
-- agent, pair,
-- timer->retransmissions, timer->max_retransmissions,
-- timer->delay - stun_timer_remainder (timer), timer->delay);
-- else
-- stun_timer_start (timer,
-- priv_compute_conncheck_timer (agent, stream),
-- agent->stun_max_retransmissions);
-- pair->recheck_on_timeout = FALSE;
-- }
-+ if (agent->compatibility == NICE_COMPATIBILITY_MSN ||
-+ agent->compatibility == NICE_COMPATIBILITY_OC2007) {
-+ g_free (password);
-+ }
-
-- /* TCP-ACTIVE candidate must create a new socket before sending
-- * by connecting to the peer. The new socket is stored in the candidate
-- * check pair, until we discover a new local peer reflexive */
-- if (pair->sockptr->fileno == NULL &&
-- pair->sockptr->type != NICE_SOCKET_TYPE_UDP_TURN &&
-- pair->local->transport == NICE_CANDIDATE_TRANSPORT_TCP_ACTIVE) {
-- NiceStream *stream2 = NULL;
-- NiceComponent *component2 = NULL;
-- NiceSocket *new_socket;
--
-- if (agent_find_component (agent, pair->stream_id, pair->component_id,
-- &stream2, &component2)) {
-- new_socket = nice_tcp_active_socket_connect (pair->sockptr,
-- &pair->remote->addr);
-- if (new_socket) {
-- pair->sockptr = new_socket;
-- _priv_set_socket_tos (agent, pair->sockptr, stream2->tos);
--
-- if (agent->reliable) {
-- nice_socket_set_writable_callback (pair->sockptr,
-- _tcp_sock_is_writable, component2);
-- }
-+ if (buffer_len == 0) {
-+ nice_debug ("Agent %p: buffer is empty, cancelling conncheck", agent);
-+ pair->stun_message.buffer = NULL;
-+ pair->stun_message.buffer_len = 0;
-+ return -1;
-+ }
-
-- nice_component_attach_socket (component2, new_socket);
-- }
-- }
-- }
-- /* send the conncheck */
-- agent_socket_send (pair->sockptr, &pair->remote->addr,
-- buffer_len, (gchar *)pair->stun_buffer);
-+ if (nice_socket_is_reliable(pair->sockptr))
-+ stun_timer_start_reliable(&pair->timer, agent->stun_reliable_timeout);
-+ else {
-+ StunTimer *timer = &pair->timer;
-+
-+ if (pair->recheck_on_timeout)
-+ /* The pair recheck on timeout can easily cause repetitive rechecks in
-+ * a ping-pong effect, if both peers with the same behaviour try to
-+ * check the same pair almost simultaneously, and if the network rtt
-+ * is greater than the initial timer rto. The reply to the initial
-+ * stun request may arrive after the in-progress conncheck
-+ * cancellation (described in RFC 5245, sect 7.2.1.4). Cancellation
-+ * creates a new stun request, and forgets the initial one.
-+ * The conncheck timer is restarted with the same initial value,
-+ * so the same situation happens again later.
-+ *
-+ * We choose to avoid resetting the timer in such situation.
-+ * After enough retransmissions, the timeout delay becomes
-+ * longer than the rtt, and the stun reply can be handled.
-+ */
-+ nice_debug("Agent %p : reusing timer of pair %p: %d/%d %d/%dms",
-+ agent, pair,
-+ timer->retransmissions, timer->max_retransmissions,
-+ timer->delay - stun_timer_remainder (timer), timer->delay);
-+ else
-+ stun_timer_start (timer,
-+ priv_compute_conncheck_timer (agent, stream),
-+ agent->stun_max_retransmissions);
-+ pair->recheck_on_timeout = FALSE;
-+ }
-
-- if (agent->compatibility == NICE_COMPATIBILITY_OC2007R2) {
-- ms_ice2_legacy_conncheck_send (&pair->stun_message, pair->sockptr,
-- &pair->remote->addr);
-+ /* TCP-ACTIVE candidate must create a new socket before sending
-+ * by connecting to the peer. The new socket is stored in the candidate
-+ * check pair, until we discover a new local peer reflexive */
-+ if (pair->sockptr->fileno == NULL &&
-+ pair->sockptr->type != NICE_SOCKET_TYPE_UDP_TURN &&
-+ pair->local->transport == NICE_CANDIDATE_TRANSPORT_TCP_ACTIVE) {
-+ NiceStream *stream2 = NULL;
-+ NiceComponent *component2 = NULL;
-+ NiceSocket *new_socket;
-+
-+ if (agent_find_component (agent, pair->stream_id, pair->component_id,
-+ &stream2, &component2)) {
-+ new_socket = nice_tcp_active_socket_connect (pair->sockptr,
-+ &pair->remote->addr);
-+ if (new_socket) {
-+ pair->sockptr = new_socket;
-+ _priv_set_socket_tos (agent, pair->sockptr, stream2->tos);
-+
-+ if (agent->reliable)
-+ nice_socket_set_writable_callback (pair->sockptr,
-+ _tcp_sock_is_writable, component2);
-+
-+ nice_component_attach_socket (component2, new_socket);
- }
--
-- timeout = stun_timer_remainder (&pair->timer);
-- /* note: convert from milli to microseconds for g_time_val_add() */
-- g_get_current_time (&pair->next_tick);
-- g_time_val_add (&pair->next_tick, timeout * 1000);
-- } else {
-- nice_debug ("Agent %p: buffer is empty, cancelling conncheck", agent);
-- pair->stun_message.buffer = NULL;
-- pair->stun_message.buffer_len = 0;
-- return -1;
- }
-- } else {
-- nice_debug ("Agent %p: no credentials found, cancelling conncheck", agent);
-- pair->stun_message.buffer = NULL;
-- pair->stun_message.buffer_len = 0;
-- return -1;
- }
-+ /* send the conncheck */
-+ agent_socket_send (pair->sockptr, &pair->remote->addr,
-+ buffer_len, (gchar *)pair->stun_buffer);
-+
-+ if (agent->compatibility == NICE_COMPATIBILITY_OC2007R2)
-+ ms_ice2_legacy_conncheck_send (&pair->stun_message, pair->sockptr,
-+ &pair->remote->addr);
-+
-+ timeout = stun_timer_remainder (&pair->timer);
-+ /* note: convert from milli to microseconds for g_time_val_add() */
-+ g_get_current_time (&pair->next_tick);
-+ g_time_val_add (&pair->next_tick, timeout * 1000);
-
- return 0;
- }
-@@ -2876,74 +2870,74 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
- nice_debug ("Agent %p : Found a matching pair %p (%s) (state=%c) ...",
- agent, p, p->foundation, priv_state_to_gchar (p->state));
-
-- if (p->state == NICE_CHECK_WAITING ||
-- p->state == NICE_CHECK_FROZEN) {
-- nice_debug ("Agent %p : pair %p added for a triggered check.",
-- agent, p);
-- priv_add_pair_to_triggered_check_queue (agent, p);
-- }
-- else if (p->state == NICE_CHECK_IN_PROGRESS) {
-- /* note: according to ICE SPEC sect 7.2.1.4 "Triggered Checks"
-- * we cancel the in-progress transaction, and after the
-- * retransmission timeout, we create a new connectivity check
-- * for that pair. The controlling role of this new check may
-- * be different from the role of this cancelled check.
-- *
-- * note: the flag retransmit_on_timeout unset means that
-- * another pair, with a higher priority is already nominated,
-- * so there's no reason to recheck this pair, since it can in
-- * no way replace the nominated one.
-- */
-- if (!nice_socket_is_reliable (p->sockptr)) {
-- if (p->retransmit_on_timeout) {
-- nice_debug ("Agent %p : pair %p will be rechecked "
-- "on stun timer timeout.", agent, p);
-- /* this flag will determine the action at the retransmission
-- * timeout of the stun timer
-- */
-- p->recheck_on_timeout = TRUE;
-- } else
-- nice_debug ("Agent %p : pair %p won't be retransmitted.",
-- agent, p);
-- }
-- }
-- else if (p->state == NICE_CHECK_SUCCEEDED) {
-- nice_debug ("Agent %p : nothing to do for pair %p.", agent, p);
-- /* note: this is a bit unsure corner-case -- let's do the
-- same state update as for processing responses to our own checks */
-- /* note: this update is required by the dribble test, to
-- * ensure the transition ready -> connected -> ready, because
-- * an incoming stun request generates a discovered peer reflexive,
-- * that causes the ready -> connected transition.
-- */
-- priv_update_check_list_state_for_ready (agent, stream, component);
-- } else if (p->state == NICE_CHECK_FAILED) {
-- /* 7.2.1.4 Triggered Checks
-- * If the state of the pair is Failed, it is changed to Waiting
-- * and the agent MUST create a new connectivity check for that
-- * pair (representing a new STUN Binding request transaction), by
-- * enqueueing the pair in the triggered check queue.
-- *
-- * note: the flag retransmit_on_timeout unset means that
-- * another pair, with a higher priority is already nominated,
-- * we apply the same strategy than with an in-progress pair
-- * above.
-- */
-- if (p->retransmit_on_timeout) {
-- nice_debug ("Agent %p : pair %p added for a triggered check.",
-+ switch (p->state) {
-+ case NICE_CHECK_WAITING:
-+ case NICE_CHECK_FROZEN:
-+ nice_debug ("Agent %p : pair %p added for a triggered check.",
- agent, p);
- priv_add_pair_to_triggered_check_queue (agent, p);
-- /* If the component for this pair is in failed state, move it
-- * back to connecting, and reinitiate the timers
-+ break;
-+ case NICE_CHECK_IN_PROGRESS:
-+ /* note: according to ICE SPEC sect 7.2.1.4 "Triggered Checks"
-+ * we cancel the in-progress transaction, and after the
-+ * retransmission timeout, we create a new connectivity check
-+ * for that pair. The controlling role of this new check may
-+ * be different from the role of this cancelled check.
-+ *
-+ * note: the flag retransmit_on_timeout unset means that
-+ * another pair, with a higher priority is already nominated,
-+ * so there's no reason to recheck this pair, since it can in
-+ * no way replace the nominated one.
- */
-- if (component->state == NICE_COMPONENT_STATE_FAILED) {
-- agent_signal_component_state_change (agent, stream->id,
-- component->id, NICE_COMPONENT_STATE_CONNECTING);
-- conn_check_schedule_next (agent);
-+ if (!nice_socket_is_reliable (p->sockptr) &&
-+ p->retransmit_on_timeout) {
-+ nice_debug ("Agent %p : pair %p will be rechecked "
-+ "on stun timer timeout.", agent, p);
-+ /* this flag will determine the action at the retransmission
-+ * timeout of the stun timer
-+ */
-+ p->recheck_on_timeout = TRUE;
- }
-- } else
-- nice_debug ("Agent %p : pair %p won't be retransmitted.",
-- agent, p);
-+ break;
-+ case NICE_CHECK_SUCCEEDED:
-+ nice_debug ("Agent %p : nothing to do for pair %p.", agent, p);
-+ /* note: this is a bit unsure corner-case -- let's do the
-+ same state update as for processing responses to our own checks */
-+ /* note: this update is required by the dribble test, to
-+ * ensure the transition ready -> connected -> ready, because
-+ * an incoming stun request generates a discovered peer reflexive,
-+ * that causes the ready -> connected transition.
-+ */
-+ priv_update_check_list_state_for_ready (agent, stream, component);
-+ break;
-+ case NICE_CHECK_FAILED:
-+ /* 7.2.1.4 Triggered Checks
-+ * If the state of the pair is Failed, it is changed to Waiting
-+ * and the agent MUST create a new connectivity check for that
-+ * pair (representing a new STUN Binding request transaction), by
-+ * enqueueing the pair in the triggered check queue.
-+ *
-+ * note: the flag retransmit_on_timeout unset means that
-+ * another pair, with a higher priority is already nominated,
-+ * we apply the same strategy than with an in-progress pair
-+ * above.
-+ */
-+ if (p->retransmit_on_timeout) {
-+ nice_debug ("Agent %p : pair %p added for a triggered check.",
-+ agent, p);
-+ priv_add_pair_to_triggered_check_queue (agent, p);
-+ /* If the component for this pair is in failed state, move it
-+ * back to connecting, and reinitiate the timers
-+ */
-+ if (component->state == NICE_COMPONENT_STATE_FAILED) {
-+ agent_signal_component_state_change (agent, stream->id,
-+ component->id, NICE_COMPONENT_STATE_CONNECTING);
-+ conn_check_schedule_next (agent);
-+ }
-+ }
-+ break;
-+ default:
-+ break;
- }
-
- /* note: the spec says the we SHOULD retransmit in-progress
-@@ -3271,208 +3265,200 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, NiceStre
- socklen_t socklen = sizeof (sockaddr);
- GSList *i;
- StunUsageIceReturn res;
-- gboolean trans_found = FALSE;
- StunTransactionId discovery_id;
- StunTransactionId response_id;
- stun_message_id (resp, response_id);
-
-- for (i = stream->conncheck_list; i && trans_found != TRUE; i = i->next) {
-+ for (i = stream->conncheck_list; i; i = i->next) {
- CandidateCheckPair *p = i->data;
-
-- if (p->stun_message.buffer) {
-- stun_message_id (&p->stun_message, discovery_id);
-+ if (p->stun_message.buffer == NULL)
-+ continue;
-
-- if (memcmp (discovery_id, response_id, sizeof(StunTransactionId)) == 0) {
-- res = stun_usage_ice_conncheck_process (resp,
-- &sockaddr.storage, &socklen,
-- agent_to_ice_compatibility (agent));
-- nice_debug ("Agent %p : stun_bind_process/conncheck for %p res %d "
-- "(controlling=%d).", agent, p, (int)res, agent->controlling_mode);
--
-- if (res == STUN_USAGE_ICE_RETURN_SUCCESS ||
-- res == STUN_USAGE_ICE_RETURN_NO_MAPPED_ADDRESS) {
-- /* case: found a matching connectivity check request */
--
-- CandidateCheckPair *ok_pair = NULL;
--
-- nice_debug ("Agent %p : conncheck %p MATCHED.", agent, p);
-- p->stun_message.buffer = NULL;
-- p->stun_message.buffer_len = 0;
--
-- /* step: verify that response came from the same IP address we
-- * sent the original request to (see 7.1.2.1. "Failure
-- * Cases") */
-- if (nice_address_equal (from, &p->remote->addr) != TRUE) {
--
-- p->state = NICE_CHECK_FAILED;
-- if (nice_debug_is_enabled ()) {
-- gchar tmpbuf[INET6_ADDRSTRLEN];
-- gchar tmpbuf2[INET6_ADDRSTRLEN];
-- nice_debug ("Agent %p : conncheck %p FAILED"
-- " (mismatch of source address).", agent, p);
-- nice_address_to_string (&p->remote->addr, tmpbuf);
-- nice_address_to_string (from, tmpbuf2);
-- nice_debug ("Agent %p : '%s:%u' != '%s:%u'", agent,
-- tmpbuf, nice_address_get_port (&p->remote->addr),
-- tmpbuf2, nice_address_get_port (from));
-- }
-- trans_found = TRUE;
-- break;
-- }
-+ stun_message_id (&p->stun_message, discovery_id);
-
-- /* note: CONNECTED but not yet READY, see docs */
--
-- /* step: handle the possible case of a peer-reflexive
-- * candidate where the mapped-address in response does
-- * not match any local candidate, see 7.1.2.2.1
-- * "Discovering Peer Reflexive Candidates" ICE ID-19) */
--
-- if (res == STUN_USAGE_ICE_RETURN_NO_MAPPED_ADDRESS) {
-- /* note: this is same as "adding to VALID LIST" in the spec
-- text */
-- p->state = NICE_CHECK_SUCCEEDED;
-- p->valid = TRUE;
-- g_assert_not_reached ();
-- nice_debug ("Agent %p : Mapped address not found."
-- " conncheck %p SUCCEEDED.", agent, p);
-- nice_component_add_valid_candidate (component, p->remote);
-- } else {
-- ok_pair = priv_process_response_check_for_reflexive (agent,
-- stream, component, p, sockptr, &sockaddr.addr,
-- local_candidate, remote_candidate);
-- }
-+ if (memcmp (discovery_id, response_id, sizeof(StunTransactionId)))
-+ continue;
-
-- /* note: The success of this check might also
-- * cause the state of other checks to change as well, ICE
-- * spec 7.1.3.2.3
-- */
-- priv_conn_check_unfreeze_related (agent, stream, p);
--
-- /* Note: this assignment helps to reduce the numbers of cases
-- * to be tested. If ok_pair and p refer to distinct pairs, it
-- * means that ok_pair is a discovered peer reflexive one,
-- * caused by the check made on pair p. In that case, the
-- * flags to be tested are on p, but the nominated flag will be
-- * set on ok_pair. When there's no discovered pair, p and
-- * ok_pair refer to the same pair.
-- * To summarize : p is a SUCCEEDED pair, ok_pair is a
-- * DISCOVERED, VALID, and eventually NOMINATED pair.
-- */
-- if (!ok_pair)
-- ok_pair = p;
--
-- /* step: updating nominated flag (ICE 7.1.2.2.4 "Updating the
-- Nominated Flag" (ID-19) */
-- if (NICE_AGENT_IS_COMPATIBLE_WITH_RFC5245_OR_OC2007R2 (agent)) {
-- nice_debug ("Agent %p : Updating nominated flag (%s): "
-- "ok_pair=%p (%d/%d) p=%p (%d/%d) (ucnc/mnora)",
-- agent, p->local->transport == NICE_CANDIDATE_TRANSPORT_UDP ?
-- "UDP" : "TCP",
-- ok_pair, ok_pair->use_candidate_on_next_check,
-- ok_pair->mark_nominated_on_response_arrival,
-- p, p->use_candidate_on_next_check,
-- p->mark_nominated_on_response_arrival);
--
-- if (agent->controlling_mode) {
-- switch (agent->nomination_mode) {
-- case NICE_NOMINATION_MODE_REGULAR:
-- if (p->use_candidate_on_next_check) {
-- nice_debug ("Agent %p : marking pair %p (%s) as nominated "
-- "(regular nomination, control=1, "
-- "use_cand_on_next_check=1).",
-- agent, ok_pair, ok_pair->foundation);
-- ok_pair->nominated = TRUE;
-- }
-- break;
-- case NICE_NOMINATION_MODE_AGGRESSIVE:
-- if (!p->nominated) {
-- nice_debug ("Agent %p : marking pair %p (%s) as nominated "
-- "(aggressive nomination, control=1).",
-- agent, ok_pair, ok_pair->foundation);
-- ok_pair->nominated = TRUE;
-- }
-- break;
-- default:
-- /* Nothing to do */
-- break;
-+ res = stun_usage_ice_conncheck_process (resp,
-+ &sockaddr.storage, &socklen,
-+ agent_to_ice_compatibility (agent));
-+ nice_debug ("Agent %p : stun_bind_process/conncheck for %p res %d "
-+ "(controlling=%d).", agent, p, (int)res, agent->controlling_mode);
-+
-+ if (res == STUN_USAGE_ICE_RETURN_SUCCESS ||
-+ res == STUN_USAGE_ICE_RETURN_NO_MAPPED_ADDRESS) {
-+ /* case: found a matching connectivity check request */
-+
-+ CandidateCheckPair *ok_pair = NULL;
-+
-+ nice_debug ("Agent %p : conncheck %p MATCHED.", agent, p);
-+ p->stun_message.buffer = NULL;
-+ p->stun_message.buffer_len = 0;
-+
-+ /* step: verify that response came from the same IP address we
-+ * sent the original request to (see 7.1.2.1. "Failure
-+ * Cases") */
-+ if (nice_address_equal (from, &p->remote->addr) == FALSE) {
-+
-+ p->state = NICE_CHECK_FAILED;
-+ if (nice_debug_is_enabled ()) {
-+ gchar tmpbuf[INET6_ADDRSTRLEN];
-+ gchar tmpbuf2[INET6_ADDRSTRLEN];
-+ nice_debug ("Agent %p : conncheck %p FAILED"
-+ " (mismatch of source address).", agent, p);
-+ nice_address_to_string (&p->remote->addr, tmpbuf);
-+ nice_address_to_string (from, tmpbuf2);
-+ nice_debug ("Agent %p : '%s:%u' != '%s:%u'", agent,
-+ tmpbuf, nice_address_get_port (&p->remote->addr),
-+ tmpbuf2, nice_address_get_port (from));
-+ }
-+ return TRUE;
-+ }
-+
-+ /* note: CONNECTED but not yet READY, see docs */
-+
-+ /* step: handle the possible case of a peer-reflexive
-+ * candidate where the mapped-address in response does
-+ * not match any local candidate, see 7.1.2.2.1
-+ * "Discovering Peer Reflexive Candidates" ICE ID-19) */
-+
-+ if (res == STUN_USAGE_ICE_RETURN_NO_MAPPED_ADDRESS) {
-+ p->state = NICE_CHECK_SUCCEEDED;
-+ p->valid = TRUE;
-+ nice_debug ("Agent %p : Mapped address not found."
-+ " conncheck %p SUCCEEDED.", agent, p);
-+ nice_component_add_valid_candidate (component, p->remote);
-+ } else
-+ ok_pair = priv_process_response_check_for_reflexive (agent,
-+ stream, component, p, sockptr, &sockaddr.addr,
-+ local_candidate, remote_candidate);
-+
-+ /* note: The success of this check might also
-+ * cause the state of other checks to change as well, ICE
-+ * spec 7.1.3.2.3
-+ */
-+ priv_conn_check_unfreeze_related (agent, stream, p);
-+
-+ /* Note: this assignment helps to reduce the numbers of cases
-+ * to be tested. If ok_pair and p refer to distinct pairs, it
-+ * means that ok_pair is a discovered peer reflexive one,
-+ * caused by the check made on pair p. In that case, the
-+ * flags to be tested are on p, but the nominated flag will be
-+ * set on ok_pair. When there's no discovered pair, p and
-+ * ok_pair refer to the same pair.
-+ * To summarize : p is a SUCCEEDED pair, ok_pair is a
-+ * DISCOVERED, VALID, and eventually NOMINATED pair.
-+ */
-+ if (!ok_pair)
-+ ok_pair = p;
-+
-+ /* step: updating nominated flag (ICE 7.1.2.2.4 "Updating the
-+ Nominated Flag" (ID-19) */
-+ if (NICE_AGENT_IS_COMPATIBLE_WITH_RFC5245_OR_OC2007R2 (agent)) {
-+ nice_debug ("Agent %p : Updating nominated flag (%s): "
-+ "ok_pair=%p (%d/%d) p=%p (%d/%d) (ucnc/mnora)",
-+ agent, p->local->transport == NICE_CANDIDATE_TRANSPORT_UDP ?
-+ "UDP" : "TCP",
-+ ok_pair, ok_pair->use_candidate_on_next_check,
-+ ok_pair->mark_nominated_on_response_arrival,
-+ p, p->use_candidate_on_next_check,
-+ p->mark_nominated_on_response_arrival);
-+
-+ if (agent->controlling_mode) {
-+ switch (agent->nomination_mode) {
-+ case NICE_NOMINATION_MODE_REGULAR:
-+ if (p->use_candidate_on_next_check) {
-+ nice_debug ("Agent %p : marking pair %p (%s) as nominated "
-+ "(regular nomination, control=1, "
-+ "use_cand_on_next_check=1).",
-+ agent, ok_pair, ok_pair->foundation);
-+ ok_pair->nominated = TRUE;
- }
-- } else {
-- if (p->mark_nominated_on_response_arrival) {
-+ break;
-+ case NICE_NOMINATION_MODE_AGGRESSIVE:
-+ if (!p->nominated) {
- nice_debug ("Agent %p : marking pair %p (%s) as nominated "
-- "(%s nomination, control=0, mark_on_response=1).",
-- agent, ok_pair, ok_pair->foundation,
-- agent->nomination_mode == NICE_NOMINATION_MODE_AGGRESSIVE ?
-- "aggressive" : "regular");
-+ "(aggressive nomination, control=1).",
-+ agent, ok_pair, ok_pair->foundation);
- ok_pair->nominated = TRUE;
- }
-- }
-+ break;
-+ default:
-+ /* Nothing to do */
-+ break;
- }
--
-- if (ok_pair->nominated == TRUE) {
-- priv_update_selected_pair (agent, component, ok_pair);
-- priv_print_conn_check_lists (agent, G_STRFUNC,
-- ", got a nominated pair");
--
-- /* Do not step down to CONNECTED if we're already at state READY*/
-- if (component->state != NICE_COMPONENT_STATE_READY) {
-- /* step: notify the client of a new component state (must be done
-- * before the possible check list state update step */
-- agent_signal_component_state_change (agent,
-- stream->id, component->id, NICE_COMPONENT_STATE_CONNECTED);
-- }
-+ } else {
-+ if (p->mark_nominated_on_response_arrival) {
-+ nice_debug ("Agent %p : marking pair %p (%s) as nominated "
-+ "(%s nomination, control=0, mark_on_response=1).",
-+ agent, ok_pair, ok_pair->foundation,
-+ agent->nomination_mode == NICE_NOMINATION_MODE_AGGRESSIVE ?
-+ "aggressive" : "regular");
-+ ok_pair->nominated = TRUE;
- }
-+ }
-+ }
-
-- /* step: update pair states (ICE 7.1.2.2.3 "Updating pair
-- states" and 8.1.2 "Updating States", ID-19) */
-- priv_update_check_list_state_for_ready (agent, stream, component);
-+ if (ok_pair->nominated == TRUE) {
-+ priv_update_selected_pair (agent, component, ok_pair);
-+ priv_print_conn_check_lists (agent, G_STRFUNC,
-+ ", got a nominated pair");
-
-- trans_found = TRUE;
-- } else if (res == STUN_USAGE_ICE_RETURN_ROLE_CONFLICT) {
-- /* case: role conflict error, need to restart with new role */
-- nice_debug ("Agent %p : conncheck %p ROLE CONFLICT, restarting", agent, p);
--
-- /* note: this res value indicates that the role of the peer
-- * agent has not changed after the tie-breaker comparison, so
-- * this is our role that must change. see ICE sect. 7.1.3.1
-- * "Failure Cases". Our role might already have changed due to
-- * an earlier incoming request, but if not, change role now.
-- *
-- * Sect. 7.1.3.1 is not clear on this point, but we choose to
-- * put the candidate pair in the triggered check list even
-- * when the agent did not switch its role. The reason for this
-- * interpretation is that the reception of the stun reply, even
-- * an error reply, is a good sign that this pair will be
-- * valid, if we retry the check after the role of both peers
-- * has been fixed.
-- */
-+ /* Do not step down to CONNECTED if we're already at state READY*/
-+ if (component->state != NICE_COMPONENT_STATE_READY)
-+ /* step: notify the client of a new component state (must be done
-+ * before the possible check list state update step */
-+ agent_signal_component_state_change (agent,
-+ stream->id, component->id, NICE_COMPONENT_STATE_CONNECTED);
-+ }
-
-- if (p->stun_message.buffer != NULL) {
-- guint64 tie;
-- gboolean controlled_mode;
-+ /* step: update pair states (ICE 7.1.2.2.3 "Updating pair
-+ states" and 8.1.2 "Updating States", ID-19) */
-+ priv_update_check_list_state_for_ready (agent, stream, component);
-+ } else if (res == STUN_USAGE_ICE_RETURN_ROLE_CONFLICT) {
-+ /* case: role conflict error, need to restart with new role */
-+ nice_debug ("Agent %p : conncheck %p ROLE CONFLICT, restarting", agent, p);
-+
-+ /* note: this res value indicates that the role of the peer
-+ * agent has not changed after the tie-breaker comparison, so
-+ * this is our role that must change. see ICE sect. 7.1.3.1
-+ * "Failure Cases". Our role might already have changed due to
-+ * an earlier incoming request, but if not, change role now.
-+ *
-+ * Sect. 7.1.3.1 is not clear on this point, but we choose to
-+ * put the candidate pair in the triggered check list even
-+ * when the agent did not switch its role. The reason for this
-+ * interpretation is that the reception of the stun reply, even
-+ * an error reply, is a good sign that this pair will be
-+ * valid, if we retry the check after the role of both peers
-+ * has been fixed.
-+ */
-
-- controlled_mode = (stun_message_find64 (&p->stun_message,
-- STUN_ATTRIBUTE_ICE_CONTROLLED, &tie) ==
-- STUN_MESSAGE_RETURN_SUCCESS);
-+ if (p->stun_message.buffer != NULL) {
-+ guint64 tie;
-+ gboolean controlled_mode;
-
-- priv_check_for_role_conflict (agent, controlled_mode);
-+ controlled_mode = (stun_message_find64 (&p->stun_message,
-+ STUN_ATTRIBUTE_ICE_CONTROLLED, &tie) ==
-+ STUN_MESSAGE_RETURN_SUCCESS);
-
-- p->stun_message.buffer = NULL;
-- p->stun_message.buffer_len = 0;
-- priv_add_pair_to_triggered_check_queue (agent, p);
-- }
-- trans_found = TRUE;
-- } else {
-- /* case: STUN error, the check STUN context was freed */
-- nice_debug ("Agent %p : conncheck %p FAILED.", agent, p);
-- p->stun_message.buffer = NULL;
-- p->stun_message.buffer_len = 0;
-- trans_found = TRUE;
-- }
-+ priv_check_for_role_conflict (agent, controlled_mode);
-+
-+ p->stun_message.buffer = NULL;
-+ p->stun_message.buffer_len = 0;
-+ priv_add_pair_to_triggered_check_queue (agent, p);
- }
-+ } else {
-+ /* case: STUN error, the check STUN context was freed */
-+ nice_debug ("Agent %p : conncheck %p FAILED.", agent, p);
-+ p->stun_message.buffer = NULL;
-+ p->stun_message.buffer_len = 0;
- }
-+ return TRUE;
- }
-
-- return trans_found;
-+ return FALSE;
- }
-
- /*
---
-2.13.6
-
-
-From ce33747e6fc9ca59ea22d54e3b5a9a67b69d8141 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Mon, 26 Jun 2017 20:41:49 +0200
-Subject: [PATCH 56/70] conncheck: make debug sentences more accurate
-
-We add a helper function to print the pair state in-extenso.
-
-Differential Revision: https://phabricator.freedesktop.org/D1759
----
- agent/conncheck.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 61 insertions(+), 9 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 874f7b1..9517ee1 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -108,6 +108,54 @@ priv_state_to_gchar (NiceCheckState state)
- }
-
- static const gchar *
-+priv_state_to_string (NiceCheckState state)
-+{
-+ switch (state) {
-+ case NICE_CHECK_WAITING:
-+ return "waiting";
-+ case NICE_CHECK_IN_PROGRESS:
-+ return "in progress";
-+ case NICE_CHECK_SUCCEEDED:
-+ return "succeeded";
-+ case NICE_CHECK_FAILED:
-+ return "failed";
-+ case NICE_CHECK_FROZEN:
-+ return "frozen";
-+ case NICE_CHECK_DISCOVERED:
-+ return "discovered";
-+ default:
-+ g_assert_not_reached ();
-+ }
-+}
-+
-+static const gchar *
-+priv_ice_return_to_string (StunUsageIceReturn ice_return)
-+{
-+ switch (ice_return) {
-+ case STUN_USAGE_ICE_RETURN_SUCCESS:
-+ return "success";
-+ case STUN_USAGE_ICE_RETURN_ERROR:
-+ return "error";
-+ case STUN_USAGE_ICE_RETURN_INVALID:
-+ return "invalid";
-+ case STUN_USAGE_ICE_RETURN_ROLE_CONFLICT:
-+ return "role conflict";
-+ case STUN_USAGE_ICE_RETURN_INVALID_REQUEST:
-+ return "invalid request";
-+ case STUN_USAGE_ICE_RETURN_INVALID_METHOD:
-+ return "invalid method";
-+ case STUN_USAGE_ICE_RETURN_MEMORY_ERROR:
-+ return "memory error";
-+ case STUN_USAGE_ICE_RETURN_INVALID_ADDRESS:
-+ return "invalid address";
-+ case STUN_USAGE_ICE_RETURN_NO_MAPPED_ADDRESS:
-+ return "no mapped address";
-+ default:
-+ g_assert_not_reached ();
-+ }
-+}
-+
-+static const gchar *
- priv_candidate_type_to_string (NiceCandidateType type)
- {
- switch (type) {
-@@ -2614,7 +2662,7 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair)
- nice_address_to_string (&pair->remote->addr, tmpbuf2);
- nice_debug ("Agent %p : STUN-CC REQ [%s]:%u --> [%s]:%u, socket=%u, "
- "pair=%s (c-id:%u), tie=%llu, username='%.*s' (%" G_GSIZE_FORMAT "), "
-- "password='%.*s' (%" G_GSIZE_FORMAT "), prio=%u, cont=%d.", agent,
-+ "password='%.*s' (%" G_GSIZE_FORMAT "), prio=%u, %s.", agent,
- tmpbuf1, nice_address_get_port (&pair->local->addr),
- tmpbuf2, nice_address_get_port (&pair->remote->addr),
- pair->sockptr->fileno ? g_socket_get_fd(pair->sockptr->fileno) : -1,
-@@ -2622,7 +2670,8 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair)
- (unsigned long long)agent->tie_breaker,
- (int) uname_len, uname, uname_len,
- (int) password_len, password, password_len,
-- pair->prflx_priority, controlling);
-+ pair->prflx_priority,
-+ controlling ? "controlling" : "controlled");
- }
-
- if (NICE_AGENT_IS_COMPATIBLE_WITH_RFC5245_OR_OC2007R2 (agent)) {
-@@ -2867,8 +2916,8 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
- p = p->succeeded_pair;
- }
-
-- nice_debug ("Agent %p : Found a matching pair %p (%s) (state=%c) ...",
-- agent, p, p->foundation, priv_state_to_gchar (p->state));
-+ nice_debug ("Agent %p : Found a matching pair %p (%s) (%s) ...",
-+ agent, p, p->foundation, priv_state_to_string (p->state));
-
- switch (p->state) {
- case NICE_CHECK_WAITING:
-@@ -3283,8 +3332,11 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, NiceStre
- res = stun_usage_ice_conncheck_process (resp,
- &sockaddr.storage, &socklen,
- agent_to_ice_compatibility (agent));
-- nice_debug ("Agent %p : stun_bind_process/conncheck for %p res %d "
-- "(controlling=%d).", agent, p, (int)res, agent->controlling_mode);
-+ nice_debug ("Agent %p : stun_bind_process/conncheck for %p: "
-+ "%s,res=%s.",
-+ agent, p,
-+ agent->controlling_mode ? "controlling" : "controlled",
-+ priv_ice_return_to_string (res));
-
- if (res == STUN_USAGE_ICE_RETURN_SUCCESS ||
- res == STUN_USAGE_ICE_RETURN_NO_MAPPED_ADDRESS) {
-@@ -3370,7 +3422,7 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, NiceStre
- case NICE_NOMINATION_MODE_REGULAR:
- if (p->use_candidate_on_next_check) {
- nice_debug ("Agent %p : marking pair %p (%s) as nominated "
-- "(regular nomination, control=1, "
-+ "(regular nomination, controlling, "
- "use_cand_on_next_check=1).",
- agent, ok_pair, ok_pair->foundation);
- ok_pair->nominated = TRUE;
-@@ -3379,7 +3431,7 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, NiceStre
- case NICE_NOMINATION_MODE_AGGRESSIVE:
- if (!p->nominated) {
- nice_debug ("Agent %p : marking pair %p (%s) as nominated "
-- "(aggressive nomination, control=1).",
-+ "(aggressive nomination, controlling).",
- agent, ok_pair, ok_pair->foundation);
- ok_pair->nominated = TRUE;
- }
-@@ -3391,7 +3443,7 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, NiceStre
- } else {
- if (p->mark_nominated_on_response_arrival) {
- nice_debug ("Agent %p : marking pair %p (%s) as nominated "
-- "(%s nomination, control=0, mark_on_response=1).",
-+ "(%s nomination, controlled, mark_on_response=1).",
- agent, ok_pair, ok_pair->foundation,
- agent->nomination_mode == NICE_NOMINATION_MODE_AGGRESSIVE ?
- "aggressive" : "regular");
---
-2.13.6
-
-
-From e860948b5fe3a791119957f26045b8f5159baeff Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Mon, 26 Jun 2017 21:06:36 +0200
-Subject: [PATCH 57/70] conncheck: use stun_timer_remainder less frequently
-
-We try to use stun_timer_remainder() less frequently, particularily
-in the debug messages, and favour of the next_tick value associated
-to the pair.
-
-Differential Revision: https://phabricator.freedesktop.org/D1760
----
- agent/conncheck.c | 77 ++++++++++++++++++++++++++++++++++---------------------
- 1 file changed, 48 insertions(+), 29 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 9517ee1..8075d4f 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -86,6 +86,17 @@ static int priv_timer_expired (GTimeVal *timer, GTimeVal *now)
- now->tv_sec >= timer->tv_sec;
- }
-
-+static unsigned int priv_timer_remainder (GTimeVal *timer, GTimeVal *now)
-+{
-+ unsigned int delay;
-+ if (now->tv_sec > timer->tv_sec ||
-+ (now->tv_sec == timer->tv_sec && now->tv_usec > timer->tv_usec))
-+ return 0;
-+ delay = (timer->tv_sec - now->tv_sec) * 1000;
-+ delay += ((signed long)(timer->tv_usec - now->tv_usec)) / 1000;
-+ return delay;
-+}
-+
- static gchar
- priv_state_to_gchar (NiceCheckState state)
- {
-@@ -180,10 +191,13 @@ priv_print_conn_check_lists (NiceAgent *agent, const gchar *where, const gchar *
- {
- GSList *i, *k;
- guint j;
-+ GTimeVal now;
-
- if (!nice_debug_is_verbose ())
- return;
-
-+ g_get_current_time (&now);
-+
- #define PRIORITY_LEN 32
-
- nice_debug ("Agent %p : *** conncheck list DUMP (called from %s%s)",
-@@ -209,7 +223,8 @@ priv_print_conn_check_lists (NiceAgent *agent, const gchar *where, const gchar *
- priv_candidate_type_to_string (pair->local->type),
- priv_candidate_type_to_string (pair->remote->type),
- timer->retransmissions, timer->max_retransmissions,
-- timer->delay - stun_timer_remainder (timer), timer->delay,
-+ timer->delay - priv_timer_remainder (&pair->next_tick, &now),
-+ timer->delay,
- local_addr, nice_address_get_port (&pair->local->addr),
- remote_addr, nice_address_get_port (&pair->remote->addr),
- priv_state_to_gchar (pair->state),
-@@ -445,8 +460,6 @@ priv_find_first_frozen_check_list (NiceAgent *agent)
- */
- static gboolean priv_conn_check_initiate (NiceAgent *agent, CandidateCheckPair *pair)
- {
-- g_get_current_time (&pair->next_tick);
-- g_time_val_add (&pair->next_tick, agent->timer_ta * 1000);
- pair->state = NICE_CHECK_IN_PROGRESS;
- nice_debug ("Agent %p : pair %p state IN_PROGRESS", agent, pair);
- conn_check_send (agent, pair);
-@@ -651,12 +664,15 @@ priv_conn_recheck_on_timeout (NiceAgent *agent, CandidateCheckPair *p)
- *
- * @return will return FALSE when no more pending timers.
- */
--static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agent, GTimeVal *now)
-+static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agent)
- {
- gboolean keep_timer_going = FALSE;
- GSList *i;
- CandidateCheckPair *pair;
- unsigned int timeout;
-+ GTimeVal now;
-+
-+ g_get_current_time (&now);
-
- /* step: process ongoing STUN transactions */
- for (i = stream->conncheck_list; i ; i = i->next) {
-@@ -678,7 +694,7 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
- continue;
- }
-
-- if (!priv_timer_expired (&p->next_tick, now))
-+ if (!priv_timer_expired (&p->next_tick, &now))
- continue;
-
- switch (stun_timer_refresh (&p->timer)) {
-@@ -712,8 +728,6 @@ timer_timeout:
- priv_update_check_list_state_for_ready (agent, stream, component);
- break;
- case STUN_USAGE_TIMER_RETURN_RETRANSMIT:
-- timeout = stun_timer_remainder (&p->timer);
--
- /* case: retransmission stopped, due to the nomination of
- * a pair with a higher priority than this in-progress pair,
- * ICE spec, sect 8.1.2 "Updating States", item 2.2
-@@ -730,9 +744,13 @@ timer_timeout:
- break;
-
- /* case: not ready, so schedule a new timeout */
-+ timeout = stun_timer_remainder (&p->timer);
-+
- nice_debug ("Agent %p :STUN transaction retransmitted on pair %p "
-- "(timeout %dms, delay=%dms, retrans=%d).",
-- agent, p, timeout, p->timer.delay, p->timer.retransmissions);
-+ "(timer=%d/%d %d/%dms).",
-+ agent, p,
-+ p->timer.retransmissions, p->timer.max_retransmissions,
-+ p->timer.delay - timeout, p->timer.delay);
-
- agent_socket_send (p->sockptr, &p->remote->addr,
- stun_message_length (&p->stun_message),
-@@ -740,7 +758,7 @@ timer_timeout:
-
-
- /* note: convert from milli to microseconds for g_time_val_add() */
-- p->next_tick = *now;
-+ p->next_tick = now;
- g_time_val_add (&p->next_tick, timeout * 1000);
-
- return TRUE;
-@@ -748,7 +766,7 @@ timer_timeout:
- timeout = stun_timer_remainder (&p->timer);
-
- /* note: convert from milli to microseconds for g_time_val_add() */
-- p->next_tick = *now;
-+ p->next_tick = now;
- g_time_val_add (&p->next_tick, timeout * 1000);
-
- keep_timer_going = TRUE;
-@@ -1001,9 +1019,6 @@ static gboolean priv_conn_check_tick_unlocked (NiceAgent *agent)
- CandidateCheckPair *pair = NULL;
- gboolean keep_timer_going = FALSE;
- GSList *i, *j;
-- GTimeVal now;
--
-- g_get_current_time (&now);
-
- /* the conncheck really starts when we have built
- * a connection check list for each stream
-@@ -1047,7 +1062,7 @@ static gboolean priv_conn_check_tick_unlocked (NiceAgent *agent)
- */
- for (i = agent->streams; i ; i = i->next) {
- NiceStream *stream = i->data;
-- if (priv_conn_check_tick_stream (stream, agent, &now))
-+ if (priv_conn_check_tick_stream (stream, agent))
- keep_timer_going = TRUE;
- if (priv_conn_check_tick_stream_nominate (stream, agent))
- keep_timer_going = TRUE;
-@@ -2731,12 +2746,14 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair)
- return -1;
- }
-
-- if (nice_socket_is_reliable(pair->sockptr))
-- stun_timer_start_reliable(&pair->timer, agent->stun_reliable_timeout);
-- else {
-+ if (nice_socket_is_reliable(pair->sockptr)) {
-+ timeout = agent->stun_reliable_timeout;
-+ stun_timer_start_reliable(&pair->timer, timeout);
-+ } else {
- StunTimer *timer = &pair->timer;
-
-- if (pair->recheck_on_timeout)
-+ if (pair->recheck_on_timeout) {
-+ GTimeVal now;
- /* The pair recheck on timeout can easily cause repetitive rechecks in
- * a ping-pong effect, if both peers with the same behaviour try to
- * check the same pair almost simultaneously, and if the network rtt
-@@ -2751,17 +2768,24 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair)
- * After enough retransmissions, the timeout delay becomes
- * longer than the rtt, and the stun reply can be handled.
- */
-+
-+ g_get_current_time (&now);
-+ timeout = priv_timer_remainder (&pair->next_tick, &now);
- nice_debug("Agent %p : reusing timer of pair %p: %d/%d %d/%dms",
- agent, pair,
- timer->retransmissions, timer->max_retransmissions,
-- timer->delay - stun_timer_remainder (timer), timer->delay);
-- else
-- stun_timer_start (timer,
-- priv_compute_conncheck_timer (agent, stream),
-- agent->stun_max_retransmissions);
-+ timer->delay - timeout,
-+ timer->delay);
-+ } else {
-+ timeout = priv_compute_conncheck_timer (agent, stream);
-+ stun_timer_start (timer, timeout, agent->stun_max_retransmissions);
-+ }
- pair->recheck_on_timeout = FALSE;
- }
-
-+ g_get_current_time (&pair->next_tick);
-+ g_time_val_add (&pair->next_tick, timeout * 1000);
-+
- /* TCP-ACTIVE candidate must create a new socket before sending
- * by connecting to the peer. The new socket is stored in the candidate
- * check pair, until we discover a new local peer reflexive */
-@@ -2796,11 +2820,6 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair)
- ms_ice2_legacy_conncheck_send (&pair->stun_message, pair->sockptr,
- &pair->remote->addr);
-
-- timeout = stun_timer_remainder (&pair->timer);
-- /* note: convert from milli to microseconds for g_time_val_add() */
-- g_get_current_time (&pair->next_tick);
-- g_time_val_add (&pair->next_tick, timeout * 1000);
--
- return 0;
- }
-
---
-2.13.6
-
-
-From 36f306f4a95f1c2b3e9c584b5a645a78e231c020 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Mon, 26 Jun 2017 21:41:44 +0200
-Subject: [PATCH 58/70] conncheck: support several stun requests per pair
-
-This patch should improve the reliabily of the connection check by
-keeping the record of several simultaneous ongoing stun requests per
-pair. A new stun request on an in-progress pair typically is caused by
-in inbound stun request from the peer on this same pair. This is named
-"Triggered Checks" in the spec. When this situation arises, it is fair
-to handle these two stun requests simultaneously, the triggered check,
-and the initial ordinary check, since both can potentially succeed.
-
-Differential Revision: https://phabricator.freedesktop.org/D1761
----
- agent/conncheck.c | 701 +++++++++++++++++++++++++++---------------------------
- agent/conncheck.h | 21 +-
- 2 files changed, 361 insertions(+), 361 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 8075d4f..2a85738 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -189,8 +189,8 @@ priv_candidate_type_to_string (NiceCandidateType type)
- static void
- priv_print_conn_check_lists (NiceAgent *agent, const gchar *where, const gchar *detail)
- {
-- GSList *i, *k;
-- guint j;
-+ GSList *i, *k, *l;
-+ guint j, m;
- GTimeVal now;
-
- if (!nice_debug_is_verbose ())
-@@ -210,27 +210,34 @@ priv_print_conn_check_lists (NiceAgent *agent, const gchar *where, const gchar *
- if (pair->component_id == j) {
- gchar local_addr[INET6_ADDRSTRLEN];
- gchar remote_addr[INET6_ADDRSTRLEN];
-- StunTimer *timer = &pair->timer;
-
- nice_address_to_string (&pair->local->addr, local_addr);
- nice_address_to_string (&pair->remote->addr, remote_addr);
-
- nice_debug ("Agent %p : *** sc=%d/%d : pair %p : "
-- "f=%s t=%s:%s timer=%d/%d %d/%dms "
-- "[%s]:%u > [%s]:%u state=%c%s%s%s",
-+ "f=%s t=%s:%s [%s]:%u > [%s]:%u state=%c%s%s%s",
- agent, pair->stream_id, pair->component_id, pair,
- pair->foundation,
- priv_candidate_type_to_string (pair->local->type),
- priv_candidate_type_to_string (pair->remote->type),
-- timer->retransmissions, timer->max_retransmissions,
-- timer->delay - priv_timer_remainder (&pair->next_tick, &now),
-- timer->delay,
- local_addr, nice_address_get_port (&pair->local->addr),
- remote_addr, nice_address_get_port (&pair->remote->addr),
- priv_state_to_gchar (pair->state),
- pair->valid ? "V" : "",
- pair->nominated ? "N" : "",
- g_slist_find (agent->triggered_check_queue, pair) ? "T" : "");
-+
-+ for (l = pair->stun_transactions, m = 0; l; l = l->next, m++) {
-+ StunTransaction *stun = l->data;
-+ nice_debug ("Agent %p : *** sc=%d/%d : pair %p : "
-+ "stun#=%d timer=%d/%d %d/%dms buf=%p %s",
-+ agent, pair->stream_id, pair->component_id, pair, m,
-+ stun->timer.retransmissions, stun->timer.max_retransmissions,
-+ stun->timer.delay - priv_timer_remainder (&stun->next_tick, &now),
-+ stun->timer.delay,
-+ stun->message.buffer,
-+ (m == 0 && pair->retransmit) ? "(R)" : "");
-+ }
- }
- }
- }
-@@ -608,52 +615,92 @@ static void priv_conn_check_unfreeze_related (NiceAgent *agent, NiceStream *stre
- }
- }
-
-+/*
-+ * Create a new STUN transaction and add it to the list
-+ * of ongoing stun transactions of a pair.
-+ *
-+ * @pair the pair the new stun transaction should be added to.
-+ * @return the created stun transaction.
-+ */
-+static StunTransaction *
-+priv_add_stun_transaction (CandidateCheckPair *pair)
-+{
-+ StunTransaction *stun = g_slice_new0 (StunTransaction);
-+ pair->stun_transactions = g_slist_prepend (pair->stun_transactions, stun);
-+ pair->retransmit = TRUE;
-+ return stun;
-+}
-+
-+/*
-+ * Forget a STUN transaction.
-+ *
-+ * @data the stun transaction to be forgotten.
-+ * @user_data the component contained the concerned stun agent.
-+ */
- static void
--candidate_check_pair_fail (NiceStream *stream, NiceAgent *agent, CandidateCheckPair *p)
-+priv_forget_stun_transaction (gpointer data, gpointer user_data)
- {
-+ StunTransaction *stun = data;
-+ NiceComponent *component = user_data;
- StunTransactionId id;
-- NiceComponent *component;
--
-- component = nice_stream_find_component_by_id (stream, p->component_id);
--
-- p->state = NICE_CHECK_FAILED;
-- nice_debug ("Agent %p : pair %p state FAILED", agent, p);
-
-- if (p->stun_message.buffer != NULL) {
-- stun_message_id (&p->stun_message, id);
-+ if (stun->message.buffer != NULL) {
-+ stun_message_id (&stun->message, id);
- stun_agent_forget_transaction (&component->stun_agent, id);
- }
-+}
-
-- p->stun_message.buffer = NULL;
-- p->stun_message.buffer_len = 0;
-+static void
-+priv_free_stun_transaction (gpointer data)
-+{
-+ g_slice_free (StunTransaction, data);
- }
-
- /*
-- * Function that resubmits a new connection check, after a previous
-- * check in in-progress state got cancelled due to an incoming stun
-- * request matching this same pair
-+ * Remove a STUN transaction from a pair, and forget it
-+ * from the related component stun agent.
- *
-- * @return will return TRUE if the pair is scheduled for recheck
-+ * @pair the pair the stun transaction should be removed from.
-+ * @stun the stun transaction to be removed.
-+ * @component the component containing the stun agent used to
-+ * forget the stun transaction.
- */
--static gboolean
--priv_conn_recheck_on_timeout (NiceAgent *agent, CandidateCheckPair *p)
-+static void
-+priv_remove_stun_transaction (CandidateCheckPair *pair,
-+ StunTransaction *stun, NiceComponent *component)
- {
-- if (p->recheck_on_timeout) {
-- g_assert (p->state == NICE_CHECK_IN_PROGRESS);
-- /* this cancelled pair may have the flag 'mark nominated
-- * on response arrival' set, we want to keep it, because
-- * this is needed to nominate this pair in aggressive
-- * nomination, when the agent is in controlled mode.
-- *
-- * this cancelled pair may also have the flag 'use candidate
-- * on next check' set, that we want to preserve too.
-- */
-- nice_debug ("Agent %p : pair %p was cancelled, "
-- "triggering a new connection check", agent, p);
-- priv_add_pair_to_triggered_check_queue (agent, p);
-- return TRUE;
-- }
-- return FALSE;
-+ priv_forget_stun_transaction (stun, component);
-+ pair->stun_transactions = g_slist_remove (pair->stun_transactions, stun);
-+ priv_free_stun_transaction (stun);
-+}
-+
-+/*
-+ * Remove all STUN transactions from a pair, and forget them
-+ * from the related component stun agent.
-+ *
-+ * @pair the pair the stun list should be cleared.
-+ * @component the component containing the stun agent used to
-+ * forget the stun transactions.
-+ */
-+static void
-+priv_free_all_stun_transactions (CandidateCheckPair *pair,
-+ NiceComponent *component)
-+{
-+ if (component)
-+ g_slist_foreach (pair->stun_transactions, priv_forget_stun_transaction, component);
-+ g_slist_free_full (pair->stun_transactions, priv_free_stun_transaction);
-+ pair->stun_transactions = NULL;
-+}
-+
-+static void
-+candidate_check_pair_fail (NiceStream *stream, NiceAgent *agent, CandidateCheckPair *p)
-+{
-+ NiceComponent *component;
-+
-+ component = nice_stream_find_component_by_id (stream, p->component_id);
-+ p->state = NICE_CHECK_FAILED;
-+ nice_debug ("Agent %p : pair %p state FAILED", agent, p);
-+ priv_free_all_stun_transactions (p, component);
- }
-
- /*
-@@ -667,7 +714,7 @@ priv_conn_recheck_on_timeout (NiceAgent *agent, CandidateCheckPair *p)
- static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agent)
- {
- gboolean keep_timer_going = FALSE;
-- GSList *i;
-+ GSList *i, *j;
- CandidateCheckPair *pair;
- unsigned int timeout;
- GTimeVal now;
-@@ -679,39 +726,59 @@ static gboolean priv_conn_check_tick_stream (NiceStream *stream, NiceAgent *agen
- CandidateCheckPair *p = i->data;
- gchar tmpbuf1[INET6_ADDRSTRLEN], tmpbuf2[INET6_ADDRSTRLEN];
- NiceComponent *component;
-+ StunTransaction *stun;
-+
-+ if (p->stun_transactions == NULL)
-+ continue;
-
- if (!agent_find_component (agent, p->stream_id, p->component_id,
- NULL, &component))
- continue;
-
-- if (p->state != NICE_CHECK_IN_PROGRESS)
-- continue;
-+ /* The first stun transaction of the list may eventually be
-+ * retransmitted, other stun transactions just have their
-+ * timer updated.
-+ */
-
-- if (p->stun_message.buffer == NULL) {
-- nice_debug ("Agent %p : STUN connectivity check was cancelled, marking as done.", agent);
-- p->state = NICE_CHECK_FAILED;
-- nice_debug ("Agent %p : pair %p state FAILED", agent, p);
-- continue;
-+ j = p->stun_transactions->next;
-+
-+ /* process all stun transactions except the first one */
-+ while (j) {
-+ StunTransaction *s = j->data;
-+ GSList *next = j->next;
-+
-+ if (priv_timer_expired (&s->next_tick, &now))
-+ switch (stun_timer_refresh (&s->timer)) {
-+ case STUN_USAGE_TIMER_RETURN_TIMEOUT:
-+ priv_remove_stun_transaction (p, s, component);
-+ break;
-+ case STUN_USAGE_TIMER_RETURN_RETRANSMIT:
-+ timeout = stun_timer_remainder (&s->timer);
-+ s->next_tick = now;
-+ g_time_val_add (&s->next_tick, timeout * 1000);
-+ break;
-+ default:
-+ break;
-+ }
-+ j = next;
- }
-
-- if (!priv_timer_expired (&p->next_tick, &now))
-+ if (p->state != NICE_CHECK_IN_PROGRESS)
- continue;
-
-- switch (stun_timer_refresh (&p->timer)) {
-- case STUN_USAGE_TIMER_RETURN_TIMEOUT:
--timer_timeout:
-- /* case: conncheck cancelled due to in-progress incoming
-- * check, requeing the pair, ICE spec, sect 7.2.1.4
-- * "Triggered Checks", "If the state of that pair is
-- * In-Progress..."
-- */
-- if (priv_conn_recheck_on_timeout (agent, p))
-- break;
-+ /* process the first stun transaction of the list */
-+ stun = p->stun_transactions->data;
-+ if (!priv_timer_expired (&stun->next_tick, &now))
-+ continue;
-
-+ switch (stun_timer_refresh (&stun->timer)) {
-+ case STUN_USAGE_TIMER_RETURN_TIMEOUT:
-+timer_return_timeout:
- /* case: error, abort processing */
- nice_address_to_string (&p->local->addr, tmpbuf1);
- nice_address_to_string (&p->remote->addr, tmpbuf2);
-- nice_debug ("Agent %p : Retransmissions failed, giving up on connectivity check %p", agent, p);
-+ nice_debug ("Agent %p : Retransmissions failed, giving up on "
-+ "connectivity check %p", agent, p);
- nice_debug ("Agent %p : Failed pair is [%s]:%u --> [%s]:%u", agent,
- tmpbuf1, nice_address_get_port (&p->local->addr),
- tmpbuf2, nice_address_get_port (&p->remote->addr));
-@@ -732,42 +799,33 @@ timer_timeout:
- * a pair with a higher priority than this in-progress pair,
- * ICE spec, sect 8.1.2 "Updating States", item 2.2
- */
-- if (!p->retransmit_on_timeout)
-- goto timer_timeout;
--
-- /* case: conncheck cancelled due to in-progress incoming
-- * check, requeing the pair, ICE spec, sect 7.2.1.4
-- * "Triggered Checks", "If the state of that pair is
-- * In-Progress..."
-- */
-- if (priv_conn_recheck_on_timeout (agent, p))
-- break;
-+ if (!p->retransmit)
-+ goto timer_return_timeout;
-
- /* case: not ready, so schedule a new timeout */
-- timeout = stun_timer_remainder (&p->timer);
-+ timeout = stun_timer_remainder (&stun->timer);
-
- nice_debug ("Agent %p :STUN transaction retransmitted on pair %p "
- "(timer=%d/%d %d/%dms).",
- agent, p,
-- p->timer.retransmissions, p->timer.max_retransmissions,
-- p->timer.delay - timeout, p->timer.delay);
-+ stun->timer.retransmissions, stun->timer.max_retransmissions,
-+ stun->timer.delay - timeout, stun->timer.delay);
-
- agent_socket_send (p->sockptr, &p->remote->addr,
-- stun_message_length (&p->stun_message),
-- (gchar *)p->stun_buffer);
--
-+ stun_message_length (&stun->message),
-+ (gchar *)stun->buffer);
-
- /* note: convert from milli to microseconds for g_time_val_add() */
-- p->next_tick = now;
-- g_time_val_add (&p->next_tick, timeout * 1000);
-+ stun->next_tick = now;
-+ g_time_val_add (&stun->next_tick, timeout * 1000);
-
- return TRUE;
- case STUN_USAGE_TIMER_RETURN_SUCCESS:
-- timeout = stun_timer_remainder (&p->timer);
-+ timeout = stun_timer_remainder (&stun->timer);
-
- /* note: convert from milli to microseconds for g_time_val_add() */
-- p->next_tick = now;
-- g_time_val_add (&p->next_tick, timeout * 1000);
-+ stun->next_tick = now;
-+ g_time_val_add (&stun->next_tick, timeout * 1000);
-
- keep_timer_going = TRUE;
- break;
-@@ -948,7 +1006,6 @@ priv_conn_check_tick_stream_nominate (NiceStream *stream, NiceAgent *agent)
- g_assert (p->state == NICE_CHECK_SUCCEEDED);
- nice_debug ("Agent %p : restarting check %p with "
- "USE-CANDIDATE attrib (regular nomination)", agent, p);
-- p->recheck_on_timeout = FALSE;
- p->use_candidate_on_next_check = TRUE;
- priv_add_pair_to_triggered_check_queue (agent, p);
- keep_timer_going = TRUE;
-@@ -972,7 +1029,6 @@ priv_conn_check_tick_stream_nominate (NiceStream *stream, NiceAgent *agent)
- p->state == NICE_CHECK_DISCOVERED)) {
- nice_debug ("Agent %p : restarting check %p as the nominated pair.", agent, p);
- p->nominated = TRUE;
-- p->recheck_on_timeout = FALSE;
- priv_update_selected_pair (agent, component, p);
- priv_add_pair_to_triggered_check_queue (agent, p);
- keep_timer_going = TRUE;
-@@ -2186,7 +2242,6 @@ static CandidateCheckPair *priv_add_new_check_pair (NiceAgent *agent,
- }
- pair->prflx_priority = ensure_unique_priority (component,
- peer_reflexive_candidate_priority (agent, local));
-- pair->retransmit_on_timeout = TRUE;
-
- stream->conncheck_list = g_slist_insert_sorted (stream->conncheck_list, pair,
- (GCompareFunc)conn_check_compare);
-@@ -2381,8 +2436,7 @@ static void conn_check_free_item (gpointer data)
-
- if (pair->agent)
- priv_remove_pair_from_triggered_check_queue (pair->agent, pair);
-- pair->stun_message.buffer = NULL;
-- pair->stun_message.buffer_len = 0;
-+ priv_free_all_stun_transactions (pair, NULL);
- g_slice_free (CandidateCheckPair, pair);
- }
-
-@@ -2655,6 +2709,7 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair)
- bool cand_use = controlling;
- size_t buffer_len;
- unsigned int timeout;
-+ StunTransaction *stun;
-
- if (!agent_find_component (agent, pair->stream_id, pair->component_id,
- &stream, &component))
-@@ -2718,13 +2773,13 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair)
-
- if (uname_len == 0) {
- nice_debug ("Agent %p: no credentials found, cancelling conncheck", agent);
-- pair->stun_message.buffer = NULL;
-- pair->stun_message.buffer_len = 0;
- return -1;
- }
-
-+ stun = priv_add_stun_transaction (pair);
-+
- buffer_len = stun_usage_ice_conncheck_create (&component->stun_agent,
-- &pair->stun_message, pair->stun_buffer, sizeof(pair->stun_buffer),
-+ &stun->message, stun->buffer, sizeof(stun->buffer),
- uname, uname_len, password, password_len,
- cand_use, controlling, pair->prflx_priority,
- agent->tie_breaker,
-@@ -2732,7 +2787,7 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair)
- agent_to_ice_compatibility (agent));
-
- nice_debug ("Agent %p: conncheck created %zd - %p", agent, buffer_len,
-- pair->stun_message.buffer);
-+ stun->message.buffer);
-
- if (agent->compatibility == NICE_COMPATIBILITY_MSN ||
- agent->compatibility == NICE_COMPATIBILITY_OC2007) {
-@@ -2741,50 +2796,20 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair)
-
- if (buffer_len == 0) {
- nice_debug ("Agent %p: buffer is empty, cancelling conncheck", agent);
-- pair->stun_message.buffer = NULL;
-- pair->stun_message.buffer_len = 0;
-+ priv_remove_stun_transaction (pair, stun, component);
- return -1;
- }
-
- if (nice_socket_is_reliable(pair->sockptr)) {
- timeout = agent->stun_reliable_timeout;
-- stun_timer_start_reliable(&pair->timer, timeout);
-+ stun_timer_start_reliable(&stun->timer, timeout);
- } else {
-- StunTimer *timer = &pair->timer;
--
-- if (pair->recheck_on_timeout) {
-- GTimeVal now;
-- /* The pair recheck on timeout can easily cause repetitive rechecks in
-- * a ping-pong effect, if both peers with the same behaviour try to
-- * check the same pair almost simultaneously, and if the network rtt
-- * is greater than the initial timer rto. The reply to the initial
-- * stun request may arrive after the in-progress conncheck
-- * cancellation (described in RFC 5245, sect 7.2.1.4). Cancellation
-- * creates a new stun request, and forgets the initial one.
-- * The conncheck timer is restarted with the same initial value,
-- * so the same situation happens again later.
-- *
-- * We choose to avoid resetting the timer in such situation.
-- * After enough retransmissions, the timeout delay becomes
-- * longer than the rtt, and the stun reply can be handled.
-- */
--
-- g_get_current_time (&now);
-- timeout = priv_timer_remainder (&pair->next_tick, &now);
-- nice_debug("Agent %p : reusing timer of pair %p: %d/%d %d/%dms",
-- agent, pair,
-- timer->retransmissions, timer->max_retransmissions,
-- timer->delay - timeout,
-- timer->delay);
-- } else {
-- timeout = priv_compute_conncheck_timer (agent, stream);
-- stun_timer_start (timer, timeout, agent->stun_max_retransmissions);
-- }
-- pair->recheck_on_timeout = FALSE;
-+ timeout = priv_compute_conncheck_timer (agent, stream);
-+ stun_timer_start (&stun->timer, timeout, agent->stun_max_retransmissions);
- }
-
-- g_get_current_time (&pair->next_tick);
-- g_time_val_add (&pair->next_tick, timeout * 1000);
-+ g_get_current_time (&stun->next_tick);
-+ g_time_val_add (&stun->next_tick, timeout * 1000);
-
- /* TCP-ACTIVE candidate must create a new socket before sending
- * by connecting to the peer. The new socket is stored in the candidate
-@@ -2814,10 +2839,10 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair)
- }
- /* send the conncheck */
- agent_socket_send (pair->sockptr, &pair->remote->addr,
-- buffer_len, (gchar *)pair->stun_buffer);
-+ buffer_len, (gchar *)stun->buffer);
-
- if (agent->compatibility == NICE_COMPATIBILITY_OC2007R2)
-- ms_ice2_legacy_conncheck_send (&pair->stun_message, pair->sockptr,
-+ ms_ice2_legacy_conncheck_send (&stun->message, pair->sockptr,
- &pair->remote->addr);
-
- return 0;
-@@ -2881,8 +2906,7 @@ static guint priv_prune_pending_checks (NiceAgent *agent, NiceStream *stream, gu
- (p->state == NICE_CHECK_WAITING && like_in_progress)) {
- if (highest_nominated_priority != 0 &&
- p->priority < highest_nominated_priority) {
-- p->retransmit_on_timeout = FALSE;
-- p->recheck_on_timeout = FALSE;
-+ p->retransmit = FALSE;
- nice_debug ("Agent %p : pair %p will not be retransmitted.",
- agent, p);
- } else {
-@@ -2938,9 +2962,9 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
- nice_debug ("Agent %p : Found a matching pair %p (%s) (%s) ...",
- agent, p, p->foundation, priv_state_to_string (p->state));
-
-- switch (p->state) {
-- case NICE_CHECK_WAITING:
-- case NICE_CHECK_FROZEN:
-+ switch (p->state) {
-+ case NICE_CHECK_WAITING:
-+ case NICE_CHECK_FROZEN:
- nice_debug ("Agent %p : pair %p added for a triggered check.",
- agent, p);
- priv_add_pair_to_triggered_check_queue (agent, p);
-@@ -2952,19 +2976,30 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
- * for that pair. The controlling role of this new check may
- * be different from the role of this cancelled check.
- *
-- * note: the flag retransmit_on_timeout unset means that
-+ * note: the flag retransmit unset means that
- * another pair, with a higher priority is already nominated,
- * so there's no reason to recheck this pair, since it can in
- * no way replace the nominated one.
- */
-- if (!nice_socket_is_reliable (p->sockptr) &&
-- p->retransmit_on_timeout) {
-- nice_debug ("Agent %p : pair %p will be rechecked "
-- "on stun timer timeout.", agent, p);
-- /* this flag will determine the action at the retransmission
-- * timeout of the stun timer
-+ if (!nice_socket_is_reliable (p->sockptr) && p->retransmit) {
-+ nice_debug ("Agent %p : pair %p added for a triggered check.",
-+ agent, p);
-+ priv_add_pair_to_triggered_check_queue (agent, p);
-+ }
-+ break;
-+ case NICE_CHECK_FAILED:
-+ if (p->retransmit) {
-+ nice_debug ("Agent %p : pair %p added for a triggered check.",
-+ agent, p);
-+ priv_add_pair_to_triggered_check_queue (agent, p);
-+ /* If the component for this pair is in failed state, move it
-+ * back to connecting, and reinitiate the timers
- */
-- p->recheck_on_timeout = TRUE;
-+ if (component->state == NICE_COMPONENT_STATE_FAILED) {
-+ agent_signal_component_state_change (agent, stream->id,
-+ component->id, NICE_COMPONENT_STATE_CONNECTING);
-+ conn_check_schedule_next (agent);
-+ }
- }
- break;
- case NICE_CHECK_SUCCEEDED:
-@@ -2978,32 +3013,6 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
- */
- priv_update_check_list_state_for_ready (agent, stream, component);
- break;
-- case NICE_CHECK_FAILED:
-- /* 7.2.1.4 Triggered Checks
-- * If the state of the pair is Failed, it is changed to Waiting
-- * and the agent MUST create a new connectivity check for that
-- * pair (representing a new STUN Binding request transaction), by
-- * enqueueing the pair in the triggered check queue.
-- *
-- * note: the flag retransmit_on_timeout unset means that
-- * another pair, with a higher priority is already nominated,
-- * we apply the same strategy than with an in-progress pair
-- * above.
-- */
-- if (p->retransmit_on_timeout) {
-- nice_debug ("Agent %p : pair %p added for a triggered check.",
-- agent, p);
-- priv_add_pair_to_triggered_check_queue (agent, p);
-- /* If the component for this pair is in failed state, move it
-- * back to connecting, and reinitiate the timers
-- */
-- if (component->state == NICE_COMPONENT_STATE_FAILED) {
-- agent_signal_component_state_change (agent, stream->id,
-- component->id, NICE_COMPONENT_STATE_CONNECTING);
-- conn_check_schedule_next (agent);
-- }
-- }
-- break;
- default:
- break;
- }
-@@ -3260,16 +3269,8 @@ static CandidateCheckPair *priv_process_response_check_for_reflexive(NiceAgent *
- if (new_pair == p)
- p->valid = TRUE;
- p->state = NICE_CHECK_SUCCEEDED;
-- /* note: we cancel the potential in-progress transaction
-- * cancellation, caused by sect 7.2.1.4 "Triggered Checks", if
-- * we receive a valid reply before transmission timeout...
-- */
-- p->recheck_on_timeout = FALSE;
-- /* ... or just after the transmission timeout, while the pair is
-- * temporarily put on the triggered check list on the way to be
-- * be rechecked: we remove it from the list too.
-- */
- priv_remove_pair_from_triggered_check_queue (agent, p);
-+ priv_free_all_stun_transactions (p, component);
- nice_debug ("Agent %p : conncheck %p SUCCEEDED.", agent, p);
- nice_component_add_valid_candidate (component, remote_candidate);
- }
-@@ -3304,8 +3305,8 @@ static CandidateCheckPair *priv_process_response_check_for_reflexive(NiceAgent *
- * Succeeded, RFC 5245, 7.1.3.2.3, "Updating Pair States"
- */
- p->state = NICE_CHECK_SUCCEEDED;
-- p->recheck_on_timeout = FALSE;
- priv_remove_pair_from_triggered_check_queue (agent, p);
-+ priv_free_all_stun_transactions (p, component);
- nice_debug ("Agent %p : conncheck %p SUCCEEDED, %p DISCOVERED.",
- agent, p, new_pair);
- }
-@@ -3331,7 +3332,8 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, NiceStre
- struct sockaddr addr;
- } sockaddr;
- socklen_t socklen = sizeof (sockaddr);
-- GSList *i;
-+ GSList *i, *j;
-+ guint k;
- StunUsageIceReturn res;
- StunTransactionId discovery_id;
- StunTransactionId response_id;
-@@ -3340,193 +3342,186 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, NiceStre
- for (i = stream->conncheck_list; i; i = i->next) {
- CandidateCheckPair *p = i->data;
-
-- if (p->stun_message.buffer == NULL)
-- continue;
--
-- stun_message_id (&p->stun_message, discovery_id);
--
-- if (memcmp (discovery_id, response_id, sizeof(StunTransactionId)))
-- continue;
--
-- res = stun_usage_ice_conncheck_process (resp,
-- &sockaddr.storage, &socklen,
-- agent_to_ice_compatibility (agent));
-- nice_debug ("Agent %p : stun_bind_process/conncheck for %p: "
-- "%s,res=%s.",
-- agent, p,
-- agent->controlling_mode ? "controlling" : "controlled",
-- priv_ice_return_to_string (res));
--
-- if (res == STUN_USAGE_ICE_RETURN_SUCCESS ||
-- res == STUN_USAGE_ICE_RETURN_NO_MAPPED_ADDRESS) {
-- /* case: found a matching connectivity check request */
--
-- CandidateCheckPair *ok_pair = NULL;
--
-- nice_debug ("Agent %p : conncheck %p MATCHED.", agent, p);
-- p->stun_message.buffer = NULL;
-- p->stun_message.buffer_len = 0;
--
-- /* step: verify that response came from the same IP address we
-- * sent the original request to (see 7.1.2.1. "Failure
-- * Cases") */
-- if (nice_address_equal (from, &p->remote->addr) == FALSE) {
--
-- p->state = NICE_CHECK_FAILED;
-- if (nice_debug_is_enabled ()) {
-- gchar tmpbuf[INET6_ADDRSTRLEN];
-- gchar tmpbuf2[INET6_ADDRSTRLEN];
-- nice_debug ("Agent %p : conncheck %p FAILED"
-- " (mismatch of source address).", agent, p);
-- nice_address_to_string (&p->remote->addr, tmpbuf);
-- nice_address_to_string (from, tmpbuf2);
-- nice_debug ("Agent %p : '%s:%u' != '%s:%u'", agent,
-- tmpbuf, nice_address_get_port (&p->remote->addr),
-- tmpbuf2, nice_address_get_port (from));
-- }
-- return TRUE;
-- }
--
-- /* note: CONNECTED but not yet READY, see docs */
--
-- /* step: handle the possible case of a peer-reflexive
-- * candidate where the mapped-address in response does
-- * not match any local candidate, see 7.1.2.2.1
-- * "Discovering Peer Reflexive Candidates" ICE ID-19) */
--
-- if (res == STUN_USAGE_ICE_RETURN_NO_MAPPED_ADDRESS) {
-- p->state = NICE_CHECK_SUCCEEDED;
-- p->valid = TRUE;
-- nice_debug ("Agent %p : Mapped address not found."
-- " conncheck %p SUCCEEDED.", agent, p);
-- nice_component_add_valid_candidate (component, p->remote);
-- } else
-- ok_pair = priv_process_response_check_for_reflexive (agent,
-- stream, component, p, sockptr, &sockaddr.addr,
-- local_candidate, remote_candidate);
--
-- /* note: The success of this check might also
-- * cause the state of other checks to change as well, ICE
-- * spec 7.1.3.2.3
-- */
-- priv_conn_check_unfreeze_related (agent, stream, p);
--
-- /* Note: this assignment helps to reduce the numbers of cases
-- * to be tested. If ok_pair and p refer to distinct pairs, it
-- * means that ok_pair is a discovered peer reflexive one,
-- * caused by the check made on pair p. In that case, the
-- * flags to be tested are on p, but the nominated flag will be
-- * set on ok_pair. When there's no discovered pair, p and
-- * ok_pair refer to the same pair.
-- * To summarize : p is a SUCCEEDED pair, ok_pair is a
-- * DISCOVERED, VALID, and eventually NOMINATED pair.
-- */
-- if (!ok_pair)
-- ok_pair = p;
--
-- /* step: updating nominated flag (ICE 7.1.2.2.4 "Updating the
-- Nominated Flag" (ID-19) */
-- if (NICE_AGENT_IS_COMPATIBLE_WITH_RFC5245_OR_OC2007R2 (agent)) {
-- nice_debug ("Agent %p : Updating nominated flag (%s): "
-- "ok_pair=%p (%d/%d) p=%p (%d/%d) (ucnc/mnora)",
-- agent, p->local->transport == NICE_CANDIDATE_TRANSPORT_UDP ?
-- "UDP" : "TCP",
-- ok_pair, ok_pair->use_candidate_on_next_check,
-- ok_pair->mark_nominated_on_response_arrival,
-- p, p->use_candidate_on_next_check,
-- p->mark_nominated_on_response_arrival);
--
-- if (agent->controlling_mode) {
-- switch (agent->nomination_mode) {
-- case NICE_NOMINATION_MODE_REGULAR:
-- if (p->use_candidate_on_next_check) {
-- nice_debug ("Agent %p : marking pair %p (%s) as nominated "
-- "(regular nomination, controlling, "
-- "use_cand_on_next_check=1).",
-- agent, ok_pair, ok_pair->foundation);
-- ok_pair->nominated = TRUE;
-- }
-- break;
-- case NICE_NOMINATION_MODE_AGGRESSIVE:
-- if (!p->nominated) {
-- nice_debug ("Agent %p : marking pair %p (%s) as nominated "
-- "(aggressive nomination, controlling).",
-- agent, ok_pair, ok_pair->foundation);
-- ok_pair->nominated = TRUE;
-- }
-- break;
-- default:
-- /* Nothing to do */
-- break;
-- }
-- } else {
-- if (p->mark_nominated_on_response_arrival) {
-- nice_debug ("Agent %p : marking pair %p (%s) as nominated "
-- "(%s nomination, controlled, mark_on_response=1).",
-- agent, ok_pair, ok_pair->foundation,
-- agent->nomination_mode == NICE_NOMINATION_MODE_AGGRESSIVE ?
-- "aggressive" : "regular");
-- ok_pair->nominated = TRUE;
-- }
-- }
-- }
--
-- if (ok_pair->nominated == TRUE) {
-- priv_update_selected_pair (agent, component, ok_pair);
-- priv_print_conn_check_lists (agent, G_STRFUNC,
-- ", got a nominated pair");
-+ for (j = p->stun_transactions, k = 0; j; j = j->next, k++) {
-+ StunTransaction *stun = j->data;
-+
-+ stun_message_id (&stun->message, discovery_id);
-+
-+ if (memcmp (discovery_id, response_id, sizeof(StunTransactionId)))
-+ continue;
-+
-+ res = stun_usage_ice_conncheck_process (resp,
-+ &sockaddr.storage, &socklen,
-+ agent_to_ice_compatibility (agent));
-+ nice_debug ("Agent %p : stun_bind_process/conncheck for %p: "
-+ "%s,res=%s,stun#=%d.",
-+ agent, p,
-+ agent->controlling_mode ? "controlling" : "controlled",
-+ priv_ice_return_to_string (res), k);
-+
-+ if (res == STUN_USAGE_ICE_RETURN_SUCCESS ||
-+ res == STUN_USAGE_ICE_RETURN_NO_MAPPED_ADDRESS) {
-+ /* case: found a matching connectivity check request */
-+
-+ CandidateCheckPair *ok_pair = NULL;
-+
-+ nice_debug ("Agent %p : conncheck %p MATCHED.", agent, p);
-+ priv_remove_stun_transaction (p, stun, component);
-+
-+ /* step: verify that response came from the same IP address we
-+ * sent the original request to (see 7.1.2.1. "Failure
-+ * Cases") */
-+ if (nice_address_equal (from, &p->remote->addr) == FALSE) {
-+ candidate_check_pair_fail (stream, agent, p);
-+ if (nice_debug_is_enabled ()) {
-+ gchar tmpbuf[INET6_ADDRSTRLEN];
-+ gchar tmpbuf2[INET6_ADDRSTRLEN];
-+ nice_debug ("Agent %p : conncheck %p FAILED"
-+ " (mismatch of source address).", agent, p);
-+ nice_address_to_string (&p->remote->addr, tmpbuf);
-+ nice_address_to_string (from, tmpbuf2);
-+ nice_debug ("Agent %p : '%s:%u' != '%s:%u'", agent,
-+ tmpbuf, nice_address_get_port (&p->remote->addr),
-+ tmpbuf2, nice_address_get_port (from));
-+ }
-+ return TRUE;
-+ }
-
-- /* Do not step down to CONNECTED if we're already at state READY*/
-- if (component->state != NICE_COMPONENT_STATE_READY)
-- /* step: notify the client of a new component state (must be done
-- * before the possible check list state update step */
-- agent_signal_component_state_change (agent,
-- stream->id, component->id, NICE_COMPONENT_STATE_CONNECTED);
-- }
-+ /* note: CONNECTED but not yet READY, see docs */
-+
-+ /* step: handle the possible case of a peer-reflexive
-+ * candidate where the mapped-address in response does
-+ * not match any local candidate, see 7.1.2.2.1
-+ * "Discovering Peer Reflexive Candidates" ICE ID-19) */
-+
-+ if (res == STUN_USAGE_ICE_RETURN_NO_MAPPED_ADDRESS) {
-+ p->state = NICE_CHECK_SUCCEEDED;
-+ p->valid = TRUE;
-+ nice_debug ("Agent %p : Mapped address not found."
-+ " conncheck %p SUCCEEDED.", agent, p);
-+ nice_component_add_valid_candidate (component, p->remote);
-+ } else
-+ ok_pair = priv_process_response_check_for_reflexive (agent,
-+ stream, component, p, sockptr, &sockaddr.addr,
-+ local_candidate, remote_candidate);
-+
-+ /* note: The success of this check might also
-+ * cause the state of other checks to change as well, ICE
-+ * spec 7.1.3.2.3
-+ */
-+ priv_conn_check_unfreeze_related (agent, stream, p);
-+
-+ /* Note: this assignment helps to reduce the numbers of cases
-+ * to be tested. If ok_pair and p refer to distinct pairs, it
-+ * means that ok_pair is a discovered peer reflexive one,
-+ * caused by the check made on pair p. In that case, the
-+ * flags to be tested are on p, but the nominated flag will be
-+ * set on ok_pair. When there's no discovered pair, p and
-+ * ok_pair refer to the same pair.
-+ * To summarize : p is a SUCCEEDED pair, ok_pair is a
-+ * DISCOVERED, VALID, and eventually NOMINATED pair.
-+ */
-+ if (!ok_pair)
-+ ok_pair = p;
-+
-+ /* step: updating nominated flag (ICE 7.1.2.2.4 "Updating the
-+ Nominated Flag" (ID-19) */
-+ if (NICE_AGENT_IS_COMPATIBLE_WITH_RFC5245_OR_OC2007R2 (agent)) {
-+ nice_debug ("Agent %p : Updating nominated flag (%s): "
-+ "ok_pair=%p (%d/%d) p=%p (%d/%d) (ucnc/mnora)",
-+ agent, p->local->transport == NICE_CANDIDATE_TRANSPORT_UDP ?
-+ "UDP" : "TCP",
-+ ok_pair, ok_pair->use_candidate_on_next_check,
-+ ok_pair->mark_nominated_on_response_arrival,
-+ p, p->use_candidate_on_next_check,
-+ p->mark_nominated_on_response_arrival);
-+
-+ if (agent->controlling_mode) {
-+ switch (agent->nomination_mode) {
-+ case NICE_NOMINATION_MODE_REGULAR:
-+ if (p->use_candidate_on_next_check) {
-+ nice_debug ("Agent %p : marking pair %p (%s) as nominated "
-+ "(regular nomination, controlling, "
-+ "use_cand_on_next_check=1).",
-+ agent, ok_pair, ok_pair->foundation);
-+ ok_pair->nominated = TRUE;
-+ }
-+ break;
-+ case NICE_NOMINATION_MODE_AGGRESSIVE:
-+ if (!p->nominated) {
-+ nice_debug ("Agent %p : marking pair %p (%s) as nominated "
-+ "(aggressive nomination, controlling).",
-+ agent, ok_pair, ok_pair->foundation);
-+ ok_pair->nominated = TRUE;
-+ }
-+ break;
-+ default:
-+ /* Nothing to do */
-+ break;
-+ }
-+ } else {
-+ if (p->mark_nominated_on_response_arrival) {
-+ nice_debug ("Agent %p : marking pair %p (%s) as nominated "
-+ "(%s nomination, controlled, mark_on_response=1).",
-+ agent, ok_pair, ok_pair->foundation,
-+ agent->nomination_mode == NICE_NOMINATION_MODE_AGGRESSIVE ?
-+ "aggressive" : "regular");
-+ ok_pair->nominated = TRUE;
-+ }
-+ }
-+ }
-
-- /* step: update pair states (ICE 7.1.2.2.3 "Updating pair
-- states" and 8.1.2 "Updating States", ID-19) */
-- priv_update_check_list_state_for_ready (agent, stream, component);
-- } else if (res == STUN_USAGE_ICE_RETURN_ROLE_CONFLICT) {
-- /* case: role conflict error, need to restart with new role */
-- nice_debug ("Agent %p : conncheck %p ROLE CONFLICT, restarting", agent, p);
--
-- /* note: this res value indicates that the role of the peer
-- * agent has not changed after the tie-breaker comparison, so
-- * this is our role that must change. see ICE sect. 7.1.3.1
-- * "Failure Cases". Our role might already have changed due to
-- * an earlier incoming request, but if not, change role now.
-- *
-- * Sect. 7.1.3.1 is not clear on this point, but we choose to
-- * put the candidate pair in the triggered check list even
-- * when the agent did not switch its role. The reason for this
-- * interpretation is that the reception of the stun reply, even
-- * an error reply, is a good sign that this pair will be
-- * valid, if we retry the check after the role of both peers
-- * has been fixed.
-- */
-+ if (ok_pair->nominated == TRUE) {
-+ priv_update_selected_pair (agent, component, ok_pair);
-+ priv_print_conn_check_lists (agent, G_STRFUNC,
-+ ", got a nominated pair");
-+
-+ /* Do not step down to CONNECTED if we're already at state READY*/
-+ if (component->state != NICE_COMPONENT_STATE_READY)
-+ /* step: notify the client of a new component state (must be done
-+ * before the possible check list state update step */
-+ agent_signal_component_state_change (agent,
-+ stream->id, component->id, NICE_COMPONENT_STATE_CONNECTED);
-+ }
-
-- if (p->stun_message.buffer != NULL) {
-+ /* step: update pair states (ICE 7.1.2.2.3 "Updating pair
-+ states" and 8.1.2 "Updating States", ID-19) */
-+ priv_update_check_list_state_for_ready (agent, stream, component);
-+ } else if (res == STUN_USAGE_ICE_RETURN_ROLE_CONFLICT) {
- guint64 tie;
- gboolean controlled_mode;
-
-- controlled_mode = (stun_message_find64 (&p->stun_message,
-+ /* case: role conflict error, need to restart with new role */
-+ nice_debug ("Agent %p : conncheck %p ROLE CONFLICT, restarting", agent, p);
-+
-+ /* note: this res value indicates that the role of the peer
-+ * agent has not changed after the tie-breaker comparison, so
-+ * this is our role that must change. see ICE sect. 7.1.3.1
-+ * "Failure Cases". Our role might already have changed due to
-+ * an earlier incoming request, but if not, change role now.
-+ *
-+ * Sect. 7.1.3.1 is not clear on this point, but we choose to
-+ * put the candidate pair in the triggered check list even
-+ * when the agent did not switch its role. The reason for this
-+ * interpretation is that the reception of the stun reply, even
-+ * an error reply, is a good sign that this pair will be
-+ * valid, if we retry the check after the role of both peers
-+ * has been fixed.
-+ */
-+ controlled_mode = (stun_message_find64 (&stun->message,
- STUN_ATTRIBUTE_ICE_CONTROLLED, &tie) ==
- STUN_MESSAGE_RETURN_SUCCESS);
-
- priv_check_for_role_conflict (agent, controlled_mode);
--
-- p->stun_message.buffer = NULL;
-- p->stun_message.buffer_len = 0;
-+ priv_remove_stun_transaction (p, stun, component);
- priv_add_pair_to_triggered_check_queue (agent, p);
-+ } else {
-+ /* case: STUN error, the check STUN context was freed */
-+ nice_debug ("Agent %p : conncheck %p FAILED.", agent, p);
-+ candidate_check_pair_fail (stream, agent, p);
- }
-- } else {
-- /* case: STUN error, the check STUN context was freed */
-- nice_debug ("Agent %p : conncheck %p FAILED.", agent, p);
-- p->stun_message.buffer = NULL;
-- p->stun_message.buffer_len = 0;
-+ return TRUE;
- }
-- return TRUE;
- }
-
- return FALSE;
-diff --git a/agent/conncheck.h b/agent/conncheck.h
-index 909d469..e16dc67 100644
---- a/agent/conncheck.h
-+++ b/agent/conncheck.h
-@@ -71,6 +71,15 @@ typedef enum
- } NiceCheckState;
-
- typedef struct _CandidateCheckPair CandidateCheckPair;
-+typedef struct _StunTransaction StunTransaction;
-+
-+struct _StunTransaction
-+{
-+ GTimeVal next_tick; /* next tick timestamp */
-+ StunTimer timer;
-+ uint8_t buffer[STUN_MAX_MESSAGE_SIZE_IPV6];
-+ StunMessage message;
-+};
-
- struct _CandidateCheckPair
- {
-@@ -86,16 +95,12 @@ struct _CandidateCheckPair
- gboolean valid;
- gboolean use_candidate_on_next_check;
- gboolean mark_nominated_on_response_arrival;
-- gboolean recheck_on_timeout;
-- gboolean retransmit_on_timeout;
-- struct _CandidateCheckPair *discovered_pair;
-- struct _CandidateCheckPair *succeeded_pair;
-+ gboolean retransmit; /* if the first stun request must be retransmitted */
-+ CandidateCheckPair *discovered_pair;
-+ CandidateCheckPair *succeeded_pair;
- guint64 priority;
- guint32 prflx_priority;
-- GTimeVal next_tick; /* next tick timestamp */
-- StunTimer timer;
-- uint8_t stun_buffer[STUN_MAX_MESSAGE_SIZE_IPV6];
-- StunMessage stun_message;
-+ GSList *stun_transactions; /* a list of ongoing stun requests */
- };
-
- int conn_check_add_for_candidate (NiceAgent *agent, guint stream_id, NiceComponent *component, NiceCandidate *remote);
---
-2.13.6
-
-
-From 6fe64fdbc53ab87dffd79972f492665cff14c0a0 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 27 Jun 2017 11:01:14 +0200
-Subject: [PATCH 59/70] conncheck: update the state of triggered checks pairs
-
-With this patch, we fix an ambiguity of some parts of the spec, when
-the document refers to in-progress pairs, that also concern pairs in
-the triggered checks list.
-
-The first cast is in section 7.1.2.5, "Updating the Nominated Flag",
-when the in-progress pair will be nominated on response arrival. This is
-handled in function priv_mark_pair_nominated(), when a pair is put to
-the triggered check list in reaction to a matching inbound stun request.
-Such a pair in priv_mark_pair_nominated() will _always_ be in the
-triggered check list, from the previously called function
-priv_schedule_triggered_check().
-
-The second case is in section 8.1.2, "Updating State" when an in-progress
-pair stops its retransmission when another pair of higher priority is
-already nominated. This is handled by function priv_prune_pending_checks().
-
-Until now, pairs enqueued in the triggered check list move transiently
-to state waiting, according to 7.2.1.4. But this state causes wrong
-decisions in the two previous cases, because such pairs should in fact
-rather be considered "like in-progress", to avoid discarding them
-inadvertantly.
-
-This patch update the state of the triggered check list
-pairs to in-progress. It allows to remove exception handling cited
-above: the code is a bit more simple, and allows some refactoring
-in priv_mark_pair_nominated() between RFC and compatibility modes.
-
-Differential Revision: https://phabricator.freedesktop.org/D1762
----
- agent/conncheck.c | 96 +++++++++++++++----------------------------------------
- 1 file changed, 25 insertions(+), 71 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 2a85738..628c708 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -244,16 +244,6 @@ priv_print_conn_check_lists (NiceAgent *agent, const gchar *where, const gchar *
- }
- }
-
--/* Verify if the pair is in the triggered checks list
-- */
--
--static gboolean
--priv_is_pair_in_triggered_check_queue (NiceAgent *agent, CandidateCheckPair *pair)
--{
-- g_assert (pair);
-- return (g_slist_find (agent->triggered_check_queue, pair) != NULL);
--}
--
- /* Add the pair to the triggered checks list, if not already present
- */
- static void
-@@ -261,8 +251,8 @@ priv_add_pair_to_triggered_check_queue (NiceAgent *agent, CandidateCheckPair *pa
- {
- g_assert (pair);
-
-- pair->state = NICE_CHECK_WAITING;
-- nice_debug ("Agent %p : pair %p state WAITING", agent, pair);
-+ pair->state = NICE_CHECK_IN_PROGRESS;
-+ nice_debug ("Agent %p : pair %p state IN_PROGRESS", agent, pair);
- if (agent->triggered_check_queue == NULL ||
- g_slist_find (agent->triggered_check_queue, pair) == NULL)
- agent->triggered_check_queue = g_slist_append (agent->triggered_check_queue, pair);
-@@ -841,12 +831,6 @@ timer_return_timeout:
- */
- pair = priv_conn_check_find_next_waiting (stream->conncheck_list);
- if (pair) {
-- /* remove the pair from the triggered check list if needed. This
-- * may happen with the cancelled pair, that's just been added
-- * in state waiting to the triggered check list above in the
-- * same function.
-- */
-- priv_remove_pair_from_triggered_check_queue (agent, pair);
- priv_print_conn_check_lists (agent, G_STRFUNC,
- ", got a pair in Waiting state");
- priv_conn_check_initiate (agent, pair);
-@@ -1109,7 +1093,7 @@ static gboolean priv_conn_check_tick_unlocked (NiceAgent *agent)
- if (pair) {
- priv_print_conn_check_lists (agent, G_STRFUNC,
- ", got a pair from triggered check list");
-- priv_conn_check_initiate (agent, pair);
-+ conn_check_send (agent, pair);
- return TRUE;
- }
-
-@@ -2098,8 +2082,7 @@ static void priv_mark_pair_nominated (NiceAgent *agent, NiceStream *stream, Nice
- /* step: search for at least one nominated pair */
- for (i = stream->conncheck_list; i; i = i->next) {
- CandidateCheckPair *pair = i->data;
-- if (pair->local == localcand && pair->remote == remotecand &&
-- NICE_AGENT_IS_COMPATIBLE_WITH_RFC5245_OR_OC2007R2 (agent)) {
-+ if (pair->local == localcand && pair->remote == remotecand) {
- /* ICE, 7.2.1.5. Updating the Nominated Flag */
- /* note: TCP candidates typically produce peer reflexive
- * candidate, generating a "discovered" pair that can be
-@@ -2111,44 +2094,27 @@ static void priv_mark_pair_nominated (NiceAgent *agent, NiceStream *stream, Nice
- g_assert (pair->state == NICE_CHECK_DISCOVERED);
- }
-
-- if (pair->valid) {
-- nice_debug ("Agent %p : marking pair %p (%s) as nominated",
-- agent, pair, pair->foundation);
-- pair->nominated = TRUE;
-- priv_update_selected_pair (agent, component, pair);
-- /* Do not step down to CONNECTED if we're already at state READY*/
-- if (component->state == NICE_COMPONENT_STATE_FAILED)
-- agent_signal_component_state_change (agent,
-- stream->id, component->id, NICE_COMPONENT_STATE_CONNECTING);
-- if (component->state == NICE_COMPONENT_STATE_CONNECTING)
-- /* step: notify the client of a new component state (must be done
-- * before the possible check list state update step */
-- agent_signal_component_state_change (agent,
-- stream->id, component->id, NICE_COMPONENT_STATE_CONNECTED);
-- priv_update_check_list_state_for_ready (agent, stream, component);
-- } else if (pair->state == NICE_CHECK_IN_PROGRESS) {
-+ /* If the state of this pair is In-Progress, [...] the resulting
-+ * valid pair has its nominated flag set when the response
-+ * arrives.
-+ */
-+ if (NICE_AGENT_IS_COMPATIBLE_WITH_RFC5245_OR_OC2007R2 (agent) &&
-+ pair->state == NICE_CHECK_IN_PROGRESS) {
- pair->mark_nominated_on_response_arrival = TRUE;
- nice_debug ("Agent %p : pair %p (%s) is in-progress, "
- "will be nominated on response receipt.",
- agent, pair, pair->foundation);
- }
-- /* note: this case is not covered by the ICE spec, 7.2.1.5,
-- * "Updating the Nominated Flag", but a pair in waiting state
-- * deserves the same treatment than a pair in-progress. A pair
-- * can be in waiting state as the result of being enqueued in
-- * the triggered check list for example.
-- */
-- if (pair->state == NICE_CHECK_WAITING) {
-- pair->mark_nominated_on_response_arrival = TRUE;
-- nice_debug ("Agent %p : pair %p (%s) is waiting, "
-- "will be nominated on response receipt.",
-+
-+ if (pair->valid ||
-+ !NICE_AGENT_IS_COMPATIBLE_WITH_RFC5245_OR_OC2007R2 (agent)) {
-+ nice_debug ("Agent %p : marking pair %p (%s) as nominated",
- agent, pair, pair->foundation);
-+ pair->nominated = TRUE;
- }
-- } else if (pair->local == localcand && pair->remote == remotecand) {
-- nice_debug ("Agent %p : marking pair %p (%s) as nominated", agent, pair, pair->foundation);
-- pair->nominated = TRUE;
-+
- if (pair->valid) {
-- priv_update_selected_pair (agent, component, pair);
-+ priv_update_selected_pair (agent, component, pair);
- /* Do not step down to CONNECTED if we're already at state READY*/
- if (component->state == NICE_COMPONENT_STATE_FAILED)
- agent_signal_component_state_change (agent,
-@@ -2159,7 +2125,9 @@ static void priv_mark_pair_nominated (NiceAgent *agent, NiceStream *stream, Nice
- agent_signal_component_state_change (agent,
- stream->id, component->id, NICE_COMPONENT_STATE_CONNECTED);
- }
-- priv_update_check_list_state_for_ready (agent, stream, component);
-+
-+ if (pair->nominated)
-+ priv_update_check_list_state_for_ready (agent, stream, component);
- }
- }
- }
-@@ -2731,12 +2699,12 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair)
- nice_address_to_string (&pair->local->addr, tmpbuf1);
- nice_address_to_string (&pair->remote->addr, tmpbuf2);
- nice_debug ("Agent %p : STUN-CC REQ [%s]:%u --> [%s]:%u, socket=%u, "
-- "pair=%s (c-id:%u), tie=%llu, username='%.*s' (%" G_GSIZE_FORMAT "), "
-+ "pair=%p (c-id:%u), tie=%llu, username='%.*s' (%" G_GSIZE_FORMAT "), "
- "password='%.*s' (%" G_GSIZE_FORMAT "), prio=%u, %s.", agent,
- tmpbuf1, nice_address_get_port (&pair->local->addr),
- tmpbuf2, nice_address_get_port (&pair->remote->addr),
- pair->sockptr->fileno ? g_socket_get_fd(pair->sockptr->fileno) : -1,
-- pair->foundation, pair->component_id,
-+ pair, pair->component_id,
- (unsigned long long)agent->tie_breaker,
- (int) uname_len, uname, uname_len,
- (int) password_len, password, password_len,
-@@ -2877,35 +2845,21 @@ static guint priv_prune_pending_checks (NiceAgent *agent, NiceStream *stream, gu
- "is %" G_GUINT64_FORMAT, agent, highest_nominated_priority);
-
- /* step: cancel all FROZEN and WAITING pairs for the component */
-- /* note: this case is not covered by the ICE spec, 8.1.2
-- * "Updating States", but a pair in waiting state which will be
-- * nominated on response receipt should be treated the same way
-- * that an in-progress pair. A pair in waiting state and in
-- * the triggered check list should also be treated like an in-progress
-- * pair.
-- */
- i = stream->conncheck_list;
- while (i) {
- CandidateCheckPair *p = i->data;
- GSList *next = i->next;
-
- if (p->component_id == component_id) {
-- gboolean like_in_progress =
-- p->mark_nominated_on_response_arrival ||
-- priv_is_pair_in_triggered_check_queue (agent, p);
--
-- if (p->state == NICE_CHECK_FROZEN ||
-- (p->state == NICE_CHECK_WAITING && !like_in_progress)) {
-+ if (p->state == NICE_CHECK_FROZEN || p->state == NICE_CHECK_WAITING) {
- nice_debug ("Agent %p : pair %p removed.", agent, p);
- conn_check_free_item (p);
- stream->conncheck_list = g_slist_delete_link(stream->conncheck_list, i);
- }
-
- /* note: a SHOULD level req. in ICE 8.1.2. "Updating States" (ID-19) */
-- else if (p->state == NICE_CHECK_IN_PROGRESS ||
-- (p->state == NICE_CHECK_WAITING && like_in_progress)) {
-- if (highest_nominated_priority != 0 &&
-- p->priority < highest_nominated_priority) {
-+ else if (p->state == NICE_CHECK_IN_PROGRESS) {
-+ if (p->priority < highest_nominated_priority) {
- p->retransmit = FALSE;
- nice_debug ("Agent %p : pair %p will not be retransmitted.",
- agent, p);
---
-2.13.6
-
-
-From 72dd26a3368d3506fe8faca7067a02784fb5f0fd Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Wed, 28 Jun 2017 12:06:48 +0200
-Subject: [PATCH 60/70] conncheck: forgot to put a pair in triggered check list
-
-When a new pair is created from an unknown remote candidate, it
-should be enqueue for a triggered check, to allow it to be marked
-as nominated on response arrival in priv_mark_pair_nominated().
-Creating it in waiting state is not sufficient since the update
-in priv_mark_pair_nominated() from previous commits.
-
-Differential Revision: https://phabricator.freedesktop.org/D1763
----
- agent/conncheck.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 628c708..0e3ce88 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -2893,11 +2893,12 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
- {
- GSList *i;
- NiceCandidate *local = NULL;
-+ CandidateCheckPair *p;
-
- g_assert (remote_cand != NULL);
-
- for (i = stream->conncheck_list; i ; i = i->next) {
-- CandidateCheckPair *p = i->data;
-+ p = i->data;
- if (p->component_id == component->id &&
- p->remote == remote_cand &&
- ((p->local->transport == NICE_CANDIDATE_TRANSPORT_TCP_PASSIVE &&
-@@ -2986,8 +2987,9 @@ static gboolean priv_schedule_triggered_check (NiceAgent *agent, NiceStream *str
-
- if (i) {
- nice_debug ("Agent %p : Adding a triggered check to conn.check list (local=%p).", agent, local);
-- priv_add_new_check_pair (agent, stream->id, component,
-+ p = priv_add_new_check_pair (agent, stream->id, component,
- local, remote_cand, NICE_CHECK_WAITING);
-+ priv_add_pair_to_triggered_check_queue (agent, p);
- return TRUE;
- }
- else {
---
-2.13.6
-
-
-From 14102d44449d2eb4148588ce54fa897fa13b87ad Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Sun, 2 Jul 2017 16:02:09 +0200
-Subject: [PATCH 61/70] conncheck: change state before updating nominated pairs
-
-When a pair is nominated while in state failed, we first move
-back to state connecting, then we update the selected pair, and
-finally we move to state connected.
----
- agent/conncheck.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 0e3ce88..e584c0e 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -2114,11 +2114,11 @@ static void priv_mark_pair_nominated (NiceAgent *agent, NiceStream *stream, Nice
- }
-
- if (pair->valid) {
-- priv_update_selected_pair (agent, component, pair);
- /* Do not step down to CONNECTED if we're already at state READY*/
- if (component->state == NICE_COMPONENT_STATE_FAILED)
- agent_signal_component_state_change (agent,
- stream->id, component->id, NICE_COMPONENT_STATE_CONNECTING);
-+ priv_update_selected_pair (agent, component, pair);
- if (component->state == NICE_COMPONENT_STATE_CONNECTING)
- /* step: notify the client of a new component state (must be done
- * before the possible check list state update step */
---
-2.13.6
-
-
-From 1a1803a45778000720c93d91060cedeb19124a27 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <withnall(a)endlessm.com>
-Date: Tue, 12 Sep 2017 13:23:31 +0100
-Subject: [PATCH 62/70] tests: Fix copyright dates in test-gstreamer.c
-
-This code is not 1000 years old.
-
-Signed-off-by: Philip Withnall <withnall(a)endlessm.com>
----
- tests/test-gstreamer.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test-gstreamer.c b/tests/test-gstreamer.c
-index 74d7133..a0be68e 100644
---- a/tests/test-gstreamer.c
-+++ b/tests/test-gstreamer.c
-@@ -1,7 +1,7 @@
- /*
- * This file is part of the Nice GLib ICE library.
- *
-- * (C) 1015 Kurento.
-+ * (C) 2015 Kurento.
- * Contact: Jose Antonio Santos Cadenas
- *
- * The contents of this file are subject to the Mozilla Public License Version
---
-2.13.6
-
-
-From 4c4834ab634f735145c8f758a22cbdd9cab79bac Mon Sep 17 00:00:00 2001
-From: Philip Withnall <withnall(a)endlessm.com>
-Date: Tue, 12 Sep 2017 13:23:53 +0100
-Subject: [PATCH 63/70] tests: Fix agent.h header inclusion in test-gstreamer.c
-
-Spotted by Lukas Gradl on the mailing list.
-
-Signed-off-by: Philip Withnall <withnall(a)endlessm.com>
----
- tests/test-gstreamer.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test-gstreamer.c b/tests/test-gstreamer.c
-index a0be68e..f060efc 100644
---- a/tests/test-gstreamer.c
-+++ b/tests/test-gstreamer.c
-@@ -34,7 +34,7 @@
- */
-
- #include <gst/check/gstcheck.h>
--#include <nice/agent.h>
-+#include "agent.h"
-
- #define RTP_HEADER_SIZE 12
- #define RTP_PAYLOAD_SIZE 1024
---
-2.13.6
-
-
-From fbdccf0c2787ebdc65fe13ac64bd25c829ea7972 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <withnall(a)endlessm.com>
-Date: Thu, 3 Aug 2017 12:20:32 +0100
-Subject: [PATCH 64/70] stun: Fix FD leak in test/utility code
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://phabricator.freedesktop.org/T7798
-
-Signed-off-by: Philip Withnall <withnall(a)endlessm.com>
-Reviewed-by: Olivier Crête <olivier.crete(a)collabora.com>
-Differential Revision: https://phabricator.freedesktop.org/D1819
----
- stun/usages/bind.c | 29 ++++++++++++++++++++++-------
- 1 file changed, 22 insertions(+), 7 deletions(-)
-
-diff --git a/stun/usages/bind.c b/stun/usages/bind.c
-index d56790f..ee600a0 100644
---- a/stun/usages/bind.c
-+++ b/stun/usages/bind.c
-@@ -491,13 +491,15 @@ StunUsageBindReturn stun_usage_bind_run (const struct sockaddr *srv,
- ret = stun_trans_create (&trans, SOCK_DGRAM, 0, srv, srvlen);
- if (ret != STUN_USAGE_TRANS_RETURN_SUCCESS) {
- stun_debug ("STUN transaction failed: couldn't create transport.");
-- return STUN_USAGE_BIND_RETURN_ERROR;
-+ bind_ret = STUN_USAGE_BIND_RETURN_ERROR;
-+ goto done;
- }
-
- val = stun_trans_send (&trans, req_buf, len);
- if (val < -1) {
- stun_debug ("STUN transaction failed: couldn't send request.");
-- return STUN_USAGE_BIND_RETURN_ERROR;
-+ bind_ret = STUN_USAGE_BIND_RETURN_ERROR;
-+ goto done;
- }
-
- stun_timer_start (&timer, STUN_TIMER_DEFAULT_TIMEOUT,
-@@ -514,14 +516,16 @@ StunUsageBindReturn stun_usage_bind_run (const struct sockaddr *srv,
- switch (stun_timer_refresh (&timer)) {
- case STUN_USAGE_TIMER_RETURN_TIMEOUT:
- stun_debug ("STUN transaction failed: time out.");
-- return STUN_USAGE_BIND_RETURN_TIMEOUT; // fatal error!
-+ bind_ret = STUN_USAGE_BIND_RETURN_TIMEOUT; // fatal error!
-+ goto done;
- case STUN_USAGE_TIMER_RETURN_RETRANSMIT:
- stun_debug ("STUN transaction retransmitted (timeout %dms).",
- stun_timer_remainder (&timer));
- val = stun_trans_send (&trans, req_buf, len);
- if (val < -1) {
- stun_debug ("STUN transaction failed: couldn't resend request.");
-- return STUN_USAGE_BIND_RETURN_ERROR;
-+ bind_ret = STUN_USAGE_BIND_RETURN_ERROR;
-+ goto done;
- }
- continue;
- case STUN_USAGE_TIMER_RETURN_SUCCESS:
-@@ -538,7 +542,10 @@ StunUsageBindReturn stun_usage_bind_run (const struct sockaddr *srv,
-
- valid = stun_agent_validate (&agent, &msg, buf, val, NULL, NULL);
- if (valid == STUN_VALIDATION_UNKNOWN_ATTRIBUTE)
-- return STUN_USAGE_BIND_RETURN_ERROR;
-+ {
-+ bind_ret = STUN_USAGE_BIND_RETURN_ERROR;
-+ goto done;
-+ }
-
- if (valid != STUN_VALIDATION_SUCCESS) {
- ret = STUN_USAGE_TRANS_RETURN_RETRY;
-@@ -554,12 +561,16 @@ StunUsageBindReturn stun_usage_bind_run (const struct sockaddr *srv,
- (struct sockaddr *) &alternate_server, alternate_server_len);
-
- if (ret != STUN_USAGE_TRANS_RETURN_SUCCESS) {
-- return STUN_USAGE_BIND_RETURN_ERROR;
-+ bind_ret = STUN_USAGE_BIND_RETURN_ERROR;
-+ goto done;
- }
-
- val = stun_trans_send (&trans, req_buf, len);
- if (val < -1)
-- return STUN_USAGE_BIND_RETURN_ERROR;
-+ {
-+ bind_ret = STUN_USAGE_BIND_RETURN_ERROR;
-+ goto done;
-+ }
-
- stun_timer_start (&timer, STUN_TIMER_DEFAULT_TIMEOUT,
- STUN_TIMER_DEFAULT_MAX_RETRANSMISSIONS);
-@@ -573,5 +584,9 @@ StunUsageBindReturn stun_usage_bind_run (const struct sockaddr *srv,
- }
- while (ret == STUN_USAGE_TRANS_RETURN_RETRY);
-
-+done:
-+ if (trans.fd != -1)
-+ stun_trans_deinit (&trans);
-+
- return bind_ret;
- }
---
-2.13.6
-
-
-From 02216a6766caccb652387d5ee19686149eedbc93 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Tue, 21 Nov 2017 15:12:45 +0100
-Subject: [PATCH 65/70] agent: prevent external role change while conncheck is
- running
-
-With this patch, we stash the controlling mode property change, and
-apply it safely, when it won't interfere with an ongoing conncheck
-running. According to RFC5245, sect 5.2. "Determining Role", the role
-is determined for a session, and persists unless an ICE is restarted.
-
-Differential Revision: https://phabricator.freedesktop.org/D1887
----
- agent/agent-priv.h | 4 +++-
- agent/agent.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++--
- tests/test-restart.c | 15 ++++++++++++++
- 3 files changed, 74 insertions(+), 3 deletions(-)
-
-diff --git a/agent/agent-priv.h b/agent/agent-priv.h
-index 714ecff..7269be0 100644
---- a/agent/agent-priv.h
-+++ b/agent/agent-priv.h
-@@ -146,7 +146,7 @@ struct _NiceAgent
- NiceProxyType proxy_type; /* property: Proxy type */
- gchar *proxy_username; /* property: Proxy username */
- gchar *proxy_password; /* property: Proxy password */
-- gboolean controlling_mode; /* property: controlling-mode */
-+ gboolean saved_controlling_mode;/* property: controlling-mode */
- guint timer_ta; /* property: timer Ta */
- guint max_conn_checks; /* property: max connectivity checks */
- gboolean force_relay; /* property: force relay */
-@@ -190,6 +190,8 @@ struct _NiceAgent
- gboolean use_ice_tcp;
-
- guint conncheck_timer_grace_period; /* ongoing delay before timer stop */
-+ gboolean controlling_mode; /* controlling mode used by the
-+ conncheck */
- /* XXX: add pointer to internal data struct for ABI-safe extensions */
- };
-
-diff --git a/agent/agent.c b/agent/agent.c
-index a4dcc0c..0773c53 100644
---- a/agent/agent.c
-+++ b/agent/agent.c
-@@ -405,6 +405,13 @@ nice_agent_class_init (NiceAgentClass *klass)
- 1, /* not a construct property, ignored */
- G_PARAM_READWRITE));
-
-+ /**
-+ * NiceAgent:controlling-mode:
-+ *
-+ * Whether the agent has the controlling role. This property should
-+ * be modified before gathering candidates, any modification occuring
-+ * later will be hold until ICE is restarted.
-+ */
- g_object_class_install_property (gobject_class, PROP_CONTROLLING_MODE,
- g_param_spec_boolean (
- "controlling-mode",
-@@ -1107,6 +1114,47 @@ static void priv_generate_tie_breaker (NiceAgent *agent)
- }
-
- static void
-+priv_update_controlling_mode (NiceAgent *agent, gboolean value)
-+{
-+ gboolean update_controlling_mode;
-+ GSList *i, *j;
-+
-+ agent->saved_controlling_mode = value;
-+ /* It is safe to update the agent controlling mode when all
-+ * components are still in state disconnected. When we leave
-+ * this state, the role must stay under the control of the
-+ * conncheck algorithm exclusively, until the conncheck is
-+ * eventually restarted. See RFC5245, sect 5.2. Determining Role
-+ */
-+ if (agent->controlling_mode != agent->saved_controlling_mode) {
-+ update_controlling_mode = TRUE;
-+ for (i = agent->streams;
-+ i && update_controlling_mode; i = i->next) {
-+ NiceStream *stream = i->data;
-+ for (j = stream->components;
-+ j && update_controlling_mode; j = j->next) {
-+ NiceComponent *component = j->data;
-+ if (component->state > NICE_COMPONENT_STATE_DISCONNECTED)
-+ update_controlling_mode = FALSE;
-+ }
-+ }
-+ if (update_controlling_mode) {
-+ agent->controlling_mode = agent->saved_controlling_mode;
-+ nice_debug ("Agent %p : Property set, changing role to \"%s\".",
-+ agent, agent->controlling_mode ? "controlling" : "controlled");
-+ } else {
-+ nice_debug ("Agent %p : Property set, role switch requested "
-+ "but conncheck already started.", agent);
-+ nice_debug ("Agent %p : Property set, staying with role \"%s\" "
-+ "until restart.", agent,
-+ agent->controlling_mode ? "controlling" : "controlled");
-+ }
-+ } else
-+ nice_debug ("Agent %p : Property set, role is already \"%s\".", agent,
-+ agent->controlling_mode ? "controlling" : "controlled");
-+}
-+
-+static void
- nice_agent_init (NiceAgent *agent)
- {
- agent->next_candidate_id = 1;
-@@ -1115,6 +1163,7 @@ nice_agent_init (NiceAgent *agent)
- /* set defaults; not construct params, so set here */
- agent->stun_server_port = DEFAULT_STUN_PORT;
- agent->controlling_mode = TRUE;
-+ agent->saved_controlling_mode = TRUE;
- agent->max_conn_checks = NICE_AGENT_MAX_CONNECTIVITY_CHECKS_DEFAULT;
- agent->nomination_mode = NICE_NOMINATION_MODE_AGGRESSIVE;
-
-@@ -1213,7 +1262,7 @@ nice_agent_get_property (
- break;
-
- case PROP_CONTROLLING_MODE:
-- g_value_set_boolean (value, agent->controlling_mode);
-+ g_value_set_boolean (value, agent->saved_controlling_mode);
- break;
-
- case PROP_FULL_MODE:
-@@ -1422,7 +1471,7 @@ nice_agent_set_property (
- break;
-
- case PROP_CONTROLLING_MODE:
-- agent->controlling_mode = g_value_get_boolean (value);
-+ priv_update_controlling_mode (agent, g_value_get_boolean (value));
- break;
-
- case PROP_FULL_MODE:
-@@ -4930,6 +4979,11 @@ nice_agent_restart (
- /* step: regenerate tie-breaker value */
- priv_generate_tie_breaker (agent);
-
-+ /* step: reset controlling mode from the property value */
-+ agent->controlling_mode = agent->saved_controlling_mode;
-+ nice_debug ("Agent %p : ICE restart, reset role to \"%s\".",
-+ agent, agent->controlling_mode ? "controlling" : "controlled");
-+
- for (i = agent->streams; i; i = i->next) {
- NiceStream *stream = i->data;
-
-diff --git a/tests/test-restart.c b/tests/test-restart.c
-index c2cbe9a..afc51b6 100644
---- a/tests/test-restart.c
-+++ b/tests/test-restart.c
-@@ -301,6 +301,11 @@ static int run_restart_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress *
- nice_agent_set_remote_candidates (lagent, ls_id, NICE_COMPONENT_TYPE_RTCP, cands);
- cdes.addr = laddr_rtcp;
- nice_agent_set_remote_candidates (ragent, rs_id, NICE_COMPONENT_TYPE_RTCP, cands);
-+ /* This role switch request will be effective after restart. We test
-+ * here that the role cannot be externally modified after conncheck
-+ * has started. */
-+ g_object_set (G_OBJECT (ragent), "controlling-mode", TRUE, NULL);
-+ g_assert (ragent->controlling_mode == FALSE);
-
- g_debug ("test-restart: Set properties, next running mainloop until connectivity checks succeed...");
-
-@@ -329,10 +334,18 @@ static int run_restart_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress *
- global_ragent_read = 0;
- g_assert (nice_agent_send (lagent, ls_id, 1, 16, "1234567812345678") == 16);
-
-+ /* Both agent have a distinct role at the end of the conncheck */
-+ g_assert (lagent->controlling_mode == TRUE);
-+ g_assert (ragent->controlling_mode == FALSE);
- /* step: restart agents, exchange updated credentials */
- tie_breaker = ragent->tie_breaker;
- nice_agent_restart (ragent);
- g_assert (tie_breaker != ragent->tie_breaker);
-+ /* This role switch of ragent should be done now, and both agents
-+ * have now the same role, which should generate a role conflict
-+ * resolution situation */
-+ g_assert (lagent->controlling_mode == TRUE);
-+ g_assert (ragent->controlling_mode == TRUE);
- nice_agent_restart (lagent);
- {
- gchar *ufrag = NULL, *password = NULL;
-@@ -375,6 +388,8 @@ static int run_restart_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress *
- /* note: verify binding requests were resent after restart */
- g_assert (global_lagent_ibr_received == TRUE);
- g_assert (global_ragent_ibr_received == TRUE);
-+ /* note: verify that a role switch occured for one of the agents */
-+ g_assert (ragent->controlling_mode != lagent->controlling_mode);
-
- g_debug ("test-restart: Ran mainloop, removing streams...");
-
---
-2.13.6
-
-
-From c63349894b3fe974494453a883dfb5ad05df5a46 Mon Sep 17 00:00:00 2001
-From: Fabrice Bellet <fabrice(a)bellet.info>
-Date: Thu, 23 Nov 2017 18:31:31 +0100
-Subject: [PATCH 66/70] Makefile: really enable debug for tests
-
-Differential Revision: https://phabricator.freedesktop.org/D1888
----
- tests/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index b623764..e94822d 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -24,7 +24,7 @@ AM_CPPFLAGS = -DG_LOG_DOMAIN=\"libnice-tests\"
-
- AM_TESTS_ENVIRONMENT = \
- G_MESSAGES_DEBUG=all \
-- NICE_DEBUG=all;
-+ NICE_DEBUG=all
-
- COMMON_LDADD = $(top_builddir)/agent/libagent.la $(top_builddir)/socket/libsocket.la $(GLIB_LIBS) $(GUPNP_LIBS)
-
---
-2.13.6
-
-
-From 17f30e4465efe9533799b02d6f95feeaf0f2748c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miguel=20Par=C3=ADs?= <mparisdiaz(a)gmail.com>
-Date: Wed, 8 Nov 2017 16:26:47 +0000
-Subject: [PATCH 67/70] conncheck: do not require that all streams have a
- connection check list
-
-One or more streams might not have any connection check list if the
-number of streams differs from the peer agent.
-Differential Revision: https://phabricator.freedesktop.org/D1880
----
- agent/conncheck.c | 23 ----
- tests/Makefile.am | 3 +
- tests/test-different-number-streams.c | 208 ++++++++++++++++++++++++++++++++++
- 3 files changed, 211 insertions(+), 23 deletions(-)
- create mode 100644 tests/test-different-number-streams.c
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index e584c0e..beb43c3 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -402,23 +402,6 @@ priv_conn_check_find_next_frozen (GSList *conn_check_list)
- }
-
- /*
-- * Returns the number of check lists of the agent
-- */
--static guint
--priv_number_of_check_lists (NiceAgent *agent)
--{
-- guint n = 0;
-- GSList *i;
--
-- for (i = agent->streams; i ; i = i->next) {
-- NiceStream *stream = i->data;
-- if (stream->conncheck_list != NULL)
-- n++;
-- }
-- return n;
--}
--
--/*
- * Returns the number of active check lists of the agent
- */
- static guint
-@@ -1060,12 +1043,6 @@ static gboolean priv_conn_check_tick_unlocked (NiceAgent *agent)
- gboolean keep_timer_going = FALSE;
- GSList *i, *j;
-
-- /* the conncheck really starts when we have built
-- * a connection check list for each stream
-- */
-- if (priv_number_of_check_lists (agent) < g_slist_length (agent->streams))
-- return TRUE;
--
- /* configure the initial state of the check lists of the agent
- * as described in ICE spec, 5.7.4
- *
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index e94822d..30d6f8e 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -46,6 +46,7 @@ check_PROGRAMS = \
- test-socket-is-based-on \
- test-priority \
- test-fullmode \
-+ test-different-number-streams \
- test-restart \
- test-fallback \
- test-thread \
-@@ -114,6 +115,8 @@ test_mainloop_LDADD = $(COMMON_LDADD)
-
- test_fullmode_LDADD = $(COMMON_LDADD)
-
-+test_different_number_streams_LDADD = $(COMMON_LDADD)
-+
- test_restart_LDADD = $(COMMON_LDADD)
-
- test_fallback_LDADD = $(COMMON_LDADD)
-diff --git a/tests/test-different-number-streams.c b/tests/test-different-number-streams.c
-new file mode 100644
-index 0000000..7fd4763
---- /dev/null
-+++ b/tests/test-different-number-streams.c
-@@ -0,0 +1,208 @@
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
-+#include "agent.h"
-+
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#define ADD_2_STREAMS TRUE
-+#define USE_SECOND_STREAM TRUE
-+
-+static GMainLoop *global_mainloop = NULL;
-+
-+static guint global_components_ready = 0;
-+static guint global_components_ready_exit = 0;
-+
-+static gboolean timer_cb (gpointer pointer)
-+{
-+ g_debug ("test-different-number-streams:%s: %p", G_STRFUNC, pointer);
-+
-+ /* signal status via a global variable */
-+
-+ /* note: should not be reached, abort */
-+ g_error ("ERROR: test has got stuck, aborting...");
-+
-+ return FALSE;
-+}
-+
-+static void cb_candidate_gathering_done(NiceAgent *agent, guint stream_id, gpointer data)
-+{
-+ g_debug ("%p: gathering done (stream_id: %u)", agent, stream_id);
-+}
-+
-+static void cb_component_state_changed (NiceAgent *agent, guint stream_id, guint component_id, guint state, gpointer data)
-+{
-+ g_debug ("%p: component state changed (stream_id: %u, component_id: %u, state: %s)",
-+ agent, stream_id, component_id, nice_component_state_to_string (state));
-+
-+ if (state == NICE_COMPONENT_STATE_READY) {
-+ global_components_ready++;
-+ }
-+
-+ /* signal status via a global variable */
-+ if (global_components_ready == global_components_ready_exit) {
-+ g_debug ("Components ready/failed achieved. Stopping mailoop");
-+ g_main_loop_quit (global_mainloop);
-+ }
-+}
-+
-+static void set_candidates (NiceAgent *from, guint from_stream,
-+ NiceAgent *to, guint to_stream, guint component)
-+{
-+ GSList *cands = NULL, *i;
-+
-+ cands = nice_agent_get_local_candidates (from, from_stream, component);
-+ nice_agent_set_remote_candidates (to, to_stream, component, cands);
-+
-+ for (i = cands; i; i = i->next)
-+ nice_candidate_free ((NiceCandidate *) i->data);
-+ g_slist_free (cands);
-+}
-+
-+static void cb_nice_recv (NiceAgent *agent, guint stream_id, guint component_id, guint len, gchar *buf, gpointer user_data)
-+{
-+ g_debug ("%p: recv (stream_id: %u, component_id: %u)", agent, stream_id, component_id);
-+}
-+
-+int main (void)
-+{
-+ NiceAgent *lagent, *ragent;
-+ guint timer_id;
-+ guint ls_id, rs_id_1, rs_id_2;
-+ gchar *lufrag = NULL, *lpassword = NULL;
-+ gchar *rufrag1 = NULL, *rpassword1 = NULL, *rufrag2 = NULL, *rpassword2 = NULL;
-+
-+#ifdef G_OS_WIN32
-+ WSADATA w;
-+
-+ WSAStartup(0x0202, &w);
-+#endif
-+
-+ global_mainloop = g_main_loop_new (NULL, FALSE);
-+
-+ /* step: create the agents L and R */
-+ lagent = nice_agent_new (g_main_loop_get_context (global_mainloop),
-+ NICE_COMPATIBILITY_GOOGLE);
-+ g_debug ("lagent: %p", lagent);
-+ nice_agent_set_software (lagent, "test-different-number-streams, Left Agent");
-+ g_object_set (G_OBJECT (lagent), "ice-tcp", FALSE, NULL);
-+ g_object_set (G_OBJECT (lagent), "controlling-mode", TRUE, NULL);
-+ g_object_set (G_OBJECT (lagent), "upnp", FALSE, NULL);
-+ g_signal_connect (G_OBJECT (lagent), "candidate-gathering-done",
-+ G_CALLBACK (cb_candidate_gathering_done), NULL);
-+ g_signal_connect (G_OBJECT (lagent), "component-state-changed",
-+ G_CALLBACK (cb_component_state_changed), NULL);
-+
-+ ragent = nice_agent_new (g_main_loop_get_context (global_mainloop),
-+ NICE_COMPATIBILITY_GOOGLE);
-+ g_debug ("ragent: %p", ragent);
-+ nice_agent_set_software (ragent, "test-different-number-streams, Right Agent");
-+ g_object_set (G_OBJECT (ragent), "ice-tcp", FALSE, NULL);
-+ g_object_set (G_OBJECT (ragent), "controlling-mode", FALSE, NULL);
-+ g_object_set (G_OBJECT (ragent), "upnp", FALSE, NULL);
-+ g_signal_connect (G_OBJECT (ragent), "candidate-gathering-done",
-+ G_CALLBACK (cb_candidate_gathering_done), NULL);
-+ g_signal_connect (G_OBJECT (ragent), "component-state-changed",
-+ G_CALLBACK (cb_component_state_changed), NULL);
-+
-+ /* step: add a timer to catch state changes triggered by signals */
-+ timer_id = g_timeout_add (30000, timer_cb, NULL);
-+
-+ ls_id = nice_agent_add_stream (lagent, 2);
-+ g_assert (ls_id > 0);
-+ nice_agent_get_local_credentials(lagent, ls_id, &lufrag, &lpassword);
-+
-+ /* step: attach to mainloop (needed to register the fds) */
-+ nice_agent_attach_recv (lagent, ls_id, NICE_COMPONENT_TYPE_RTP,
-+ g_main_loop_get_context (global_mainloop), cb_nice_recv, NULL);
-+ nice_agent_attach_recv (lagent, ls_id, NICE_COMPONENT_TYPE_RTCP,
-+ g_main_loop_get_context (global_mainloop), cb_nice_recv, NULL);
-+
-+ global_components_ready_exit = 4;
-+
-+ if (ADD_2_STREAMS) {
-+ rs_id_1 = nice_agent_add_stream (ragent, 2);
-+ g_assert (rs_id_1 > 0);
-+ nice_agent_get_local_credentials(ragent, rs_id_1, &rufrag1, &rpassword1);
-+
-+ rs_id_2 = nice_agent_add_stream (ragent, 2);
-+ g_assert (rs_id_2 > 0);
-+ nice_agent_get_local_credentials(ragent, rs_id_2, &rufrag2, &rpassword2);
-+
-+ nice_agent_set_remote_credentials (ragent, rs_id_2, lufrag, lpassword);
-+ nice_agent_set_remote_credentials (lagent, ls_id, rufrag2, rpassword2);
-+
-+ g_assert (nice_agent_gather_candidates (lagent, ls_id) == TRUE);
-+ g_assert (nice_agent_gather_candidates (ragent, rs_id_2) == TRUE);
-+ g_assert (nice_agent_gather_candidates (ragent, rs_id_1) == TRUE);
-+
-+ if (USE_SECOND_STREAM) {
-+ set_candidates (ragent, rs_id_2, lagent, ls_id, NICE_COMPONENT_TYPE_RTP);
-+ set_candidates (ragent, rs_id_2, lagent, ls_id, NICE_COMPONENT_TYPE_RTCP);
-+ set_candidates (lagent, ls_id, ragent, rs_id_2, NICE_COMPONENT_TYPE_RTP);
-+ set_candidates (lagent, ls_id, ragent, rs_id_2, NICE_COMPONENT_TYPE_RTCP);
-+ } else {
-+ set_candidates (ragent, rs_id_1, lagent, ls_id, NICE_COMPONENT_TYPE_RTP);
-+ set_candidates (ragent, rs_id_1, lagent, ls_id, NICE_COMPONENT_TYPE_RTCP);
-+ set_candidates (lagent, ls_id, ragent, rs_id_1, NICE_COMPONENT_TYPE_RTP);
-+ set_candidates (lagent, ls_id, ragent, rs_id_1, NICE_COMPONENT_TYPE_RTCP);
-+ }
-+
-+ /* step: attach to mainloop (needed to register the fds) */
-+ nice_agent_attach_recv (ragent, rs_id_1, NICE_COMPONENT_TYPE_RTP,
-+ g_main_loop_get_context (global_mainloop), cb_nice_recv, NULL);
-+ nice_agent_attach_recv (ragent, rs_id_1, NICE_COMPONENT_TYPE_RTCP,
-+ g_main_loop_get_context (global_mainloop), cb_nice_recv, NULL);
-+ nice_agent_attach_recv (ragent, rs_id_2, NICE_COMPONENT_TYPE_RTP,
-+ g_main_loop_get_context (global_mainloop), cb_nice_recv, NULL);
-+ nice_agent_attach_recv (ragent, rs_id_2, NICE_COMPONENT_TYPE_RTCP,
-+ g_main_loop_get_context (global_mainloop), cb_nice_recv, NULL);
-+ } else {
-+ rs_id_1 = nice_agent_add_stream (ragent, 2);
-+ g_assert (rs_id_1 > 0);
-+ nice_agent_get_local_credentials(ragent, rs_id_1, &rufrag1, &rpassword1);
-+
-+ nice_agent_set_remote_credentials (ragent, rs_id_1, lufrag, lpassword);
-+ nice_agent_set_remote_credentials (lagent, ls_id, rufrag1, rpassword1);
-+
-+ g_assert (nice_agent_gather_candidates (lagent, ls_id) == TRUE);
-+ g_assert (nice_agent_gather_candidates (ragent, rs_id_1) == TRUE);
-+
-+ /* step: attach to mainloop (needed to register the fds) */
-+ nice_agent_attach_recv (ragent, rs_id_1, NICE_COMPONENT_TYPE_RTP,
-+ g_main_loop_get_context (global_mainloop), cb_nice_recv, NULL);
-+ nice_agent_attach_recv (ragent, rs_id_1, NICE_COMPONENT_TYPE_RTCP,
-+ g_main_loop_get_context (global_mainloop), cb_nice_recv, NULL);
-+
-+ set_candidates (ragent, rs_id_1, lagent, ls_id, NICE_COMPONENT_TYPE_RTP);
-+ set_candidates (ragent, rs_id_1, lagent, ls_id, NICE_COMPONENT_TYPE_RTCP);
-+ set_candidates (lagent, ls_id, ragent, rs_id_1, NICE_COMPONENT_TYPE_RTP);
-+ set_candidates (lagent, ls_id, ragent, rs_id_1, NICE_COMPONENT_TYPE_RTCP);
-+ }
-+
-+ /* step: run the mainloop until connectivity checks succeed
-+ * (see timer_cb() above) */
-+ g_main_loop_run (global_mainloop);
-+
-+ g_free (lufrag);
-+ g_free (lpassword);
-+ g_free (rufrag1);
-+ g_free (rpassword1);
-+ g_free (rufrag2);
-+ g_free (rpassword2);
-+ g_object_unref (lagent);
-+ g_object_unref (ragent);
-+
-+ g_main_loop_unref (global_mainloop);
-+ global_mainloop = NULL;
-+
-+ g_source_remove (timer_id);
-+
-+#ifdef G_OS_WIN32
-+ WSACleanup();
-+#endif
-+
-+ return 0;
-+}
---
-2.13.6
-
-
-From 59fcf95d505c3995f858b826d10cd48321ed383e Mon Sep 17 00:00:00 2001
-From: Youness Alaoui <kakaroto(a)kakaroto.homelinux.net>
-Date: Mon, 27 Nov 2017 17:07:02 -0500
-Subject: [PATCH 68/70] turn: Add support for ALTERNATE_SERVER in OC2007
- Compatibility
-
-The MS Office TURN servers will always return the MS_ALTERNATE_SERVER in
-allocation responses, and if they are not handled, we end up using the
-main turn server to send allocation requests that then get sent to the
-alternate server which will return the XOR_MAPPED_ADDRESS containing
-the IP address of the turn server that proxied the message instead of
-our own actual external IP.
----
- agent/conncheck.c | 14 ++++++++++++++
- stun/usages/turn.c | 11 +++++++++++
- stun/usages/turn.h | 4 ++++
- 3 files changed, 29 insertions(+)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index beb43c3..229c8b1 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -3764,6 +3764,20 @@ static gboolean priv_map_reply_to_relay_request (NiceAgent *agent, StunMessage *
- recv_realm = (uint8_t *) stun_message_find (resp,
- STUN_ATTRIBUTE_REALM, &recv_realm_len);
-
-+ if ((agent->compatibility == NICE_COMPATIBILITY_OC2007 ||
-+ agent->compatibility == NICE_COMPATIBILITY_OC2007R2) &&
-+ alternatelen != sizeof(alternate)) {
-+ NiceAddress alternate_addr;
-+
-+ nice_address_set_from_sockaddr (&alternate_addr, &alternate.addr);
-+
-+ if (!nice_address_equal (&alternate_addr, &d->server)) {
-+ nice_address_set_from_sockaddr (&d->server, &alternate.addr);
-+ nice_address_set_from_sockaddr (&d->turn->server, &alternate.addr);
-+
-+ d->pending = FALSE;
-+ }
-+ }
- /* check for unauthorized error response */
- if ((agent->compatibility == NICE_COMPATIBILITY_RFC5245 ||
- agent->compatibility == NICE_COMPATIBILITY_OC2007 ||
-diff --git a/stun/usages/turn.c b/stun/usages/turn.c
-index 3b94959..ec12642 100644
---- a/stun/usages/turn.c
-+++ b/stun/usages/turn.c
-@@ -300,6 +300,17 @@ StunUsageTurnReturn stun_usage_turn_process (StunMessage *msg,
- stun_debug (" STUN error message received (code: %d)", code);
-
- /* ALTERNATE-SERVER mechanism */
-+ if (compatibility == STUN_USAGE_TURN_COMPATIBILITY_OC2007 &&
-+ alternate_server && alternate_server_len &&
-+ stun_message_find_addr (msg, STUN_ATTRIBUTE_MS_ALTERNATE_SERVER,
-+ alternate_server,
-+ alternate_server_len) == STUN_MESSAGE_RETURN_SUCCESS) {
-+ stun_debug ("Found alternate server");
-+ /* The ALTERNATE_SERVER will always be returned by the MS turn server.
-+ * We need to check if the ALTERNATE_SERVER is the same as the current
-+ * server to decide whether we need to switch servers or not.
-+ */
-+ }
- if ((code / 100) == 3) {
- if (alternate_server && alternate_server_len) {
- if (stun_message_find_addr (msg, STUN_ATTRIBUTE_ALTERNATE_SERVER,
-diff --git a/stun/usages/turn.h b/stun/usages/turn.h
-index 7a2d4e6..83fa00a 100644
---- a/stun/usages/turn.h
-+++ b/stun/usages/turn.h
-@@ -256,6 +256,10 @@ size_t stun_usage_turn_create_permission (StunAgent *agent, StunMessage *msg,
- * Allocate request, in case the currently used TURN server is requesting the use
- * of an alternate server. This argument will only be filled if the return value
- * of the function is #STUN_USAGE_TURN_RETURN_ALTERNATE_SERVER
-+ * In the case of @STUN_USAGE_TURN_COMPATIBILITY_OC2007 compatibility, the
-+ * @alternate_server could be filled at any time, and should only be considered
-+ * if the request was sent to a different server than the address returned
-+ * in the @alternate_server field
- * @alternate_server_len: The length of @alternate_server
- * @bandwidth: A pointer to fill with the bandwidth the TURN server allocated us
- * @lifetime: A pointer to fill with the lifetime of the allocation
---
-2.13.6
-
-
-From 4172d48852ecd1c86cc7bd4665b23697603d1eed Mon Sep 17 00:00:00 2001
-From: Youness Alaoui <kakaroto(a)kakaroto.homelinux.net>
-Date: Tue, 28 Nov 2017 15:14:11 -0500
-Subject: [PATCH 69/70] discovery: Increase discovery_unsched_items whenever we
- restart a check
-
-The discovery_unsched_items is decremented every time a DiscoveryCandidate
-goes from non-pending to pending. So if we restart a check by setting
-pending to FALSE, we should re-increase the discovery_unsched_items.
----
- agent/conncheck.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 229c8b1..5b08311 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -3507,6 +3507,7 @@ static gboolean priv_map_reply_to_discovery_request (NiceAgent *agent, StunMessa
- d->server = niceaddr;
-
- d->pending = FALSE;
-+ agent->discovery_unsched_items++;
- } else if (res == STUN_USAGE_BIND_RETURN_SUCCESS) {
- /* case: successful binding discovery, create a new local candidate */
-
-@@ -3648,6 +3649,7 @@ static gboolean priv_map_reply_to_relay_request (NiceAgent *agent, StunMessage *
- nice_address_set_from_sockaddr (&d->turn->server, &alternate.addr);
-
- d->pending = FALSE;
-+ agent->discovery_unsched_items++;
- } else if (res == STUN_USAGE_TURN_RETURN_RELAY_SUCCESS ||
- res == STUN_USAGE_TURN_RETURN_MAPPED_SUCCESS) {
- /* case: successful allocate, create a new local candidate */
-@@ -3776,6 +3778,7 @@ static gboolean priv_map_reply_to_relay_request (NiceAgent *agent, StunMessage *
- nice_address_set_from_sockaddr (&d->turn->server, &alternate.addr);
-
- d->pending = FALSE;
-+ agent->discovery_unsched_items++;
- }
- }
- /* check for unauthorized error response */
-@@ -3798,6 +3801,7 @@ static gboolean priv_map_reply_to_relay_request (NiceAgent *agent, StunMessage *
- d->stun_resp_msg.buffer = d->stun_resp_buffer;
- d->stun_resp_msg.buffer_len = sizeof(d->stun_resp_buffer);
- d->pending = FALSE;
-+ agent->discovery_unsched_items++;
- } else {
- /* case: a real unauthorized error */
- d->stun_message.buffer = NULL;
---
-2.13.6
-
-
-From fb2f1f77a31baa91968fc81c205f980b6913f403 Mon Sep 17 00:00:00 2001
-From: Youness Alaoui <kakaroto(a)kakaroto.homelinux.net>
-Date: Tue, 28 Nov 2017 16:05:18 -0500
-Subject: [PATCH 70/70] conncheck: handle alternate-server for turn relays
- differently
-
-If a relay gives us an alternate-server, we need to cancel and reset
-every candidate discovery attempt that uses the same server, to avoid
-ending up with one component on one server and the other component on
-another server (causing relay candidates with mismatched foundations).
----
- agent/conncheck.c | 56 ++++++++++++++++++++++++++++++++++++++++++-------------
- 1 file changed, 43 insertions(+), 13 deletions(-)
-
-diff --git a/agent/conncheck.c b/agent/conncheck.c
-index 5b08311..c8a4edf 100644
---- a/agent/conncheck.c
-+++ b/agent/conncheck.c
-@@ -3592,6 +3592,41 @@ priv_add_new_turn_refresh (CandidateDiscovery *cdisco, NiceCandidate *relay_cand
- return cand;
- }
-
-+static void priv_handle_turn_alternate_server (NiceAgent *agent,
-+ CandidateDiscovery *disco, NiceAddress server, NiceAddress alternate)
-+{
-+ /* We need to cancel and reset all candidate discovery turn for the same
-+ stream and type if there is an alternate server. Otherwise, we might end up
-+ with two relay components on different servers, creating candidates with
-+ unique foundations that only contain one component.
-+ */
-+ GSList *i;
-+
-+ for (i = agent->discovery_list; i; i = i->next) {
-+ CandidateDiscovery *d = i->data;
-+
-+ if (!d->done &&
-+ d->type == disco->type &&
-+ d->stream == disco->stream &&
-+ d->turn->type == disco->turn->type &&
-+ nice_address_equal (&d->server, &server)) {
-+ gchar ip[INET6_ADDRSTRLEN];
-+ // Cancel the pending request to avoid a race condition with another
-+ // component responding with another altenrate-server
-+ d->stun_message.buffer = NULL;
-+ d->stun_message.buffer_len = 0;
-+
-+ nice_address_to_string (&server, ip);
-+ nice_debug ("Agent %p : Cancelling and setting alternate server %s for "
-+ "CandidateDiscovery %p", agent, ip, d);
-+ d->server = alternate;
-+ d->turn->server = alternate;
-+ d->pending = FALSE;
-+ agent->discovery_unsched_items++;
-+ }
-+ }
-+}
-+
- /*
- * Tries to match STUN reply in 'buf' to an existing STUN discovery
- * transaction. If found, a reply is sent.
-@@ -3644,12 +3679,11 @@ static gboolean priv_map_reply_to_relay_request (NiceAgent *agent, StunMessage *
- agent, d, (int)res);
-
- if (res == STUN_USAGE_TURN_RETURN_ALTERNATE_SERVER) {
-- /* handle alternate server */
-- nice_address_set_from_sockaddr (&d->server, &alternate.addr);
-- nice_address_set_from_sockaddr (&d->turn->server, &alternate.addr);
-+ NiceAddress addr;
-
-- d->pending = FALSE;
-- agent->discovery_unsched_items++;
-+ /* handle alternate server */
-+ nice_address_set_from_sockaddr (&addr, &alternate.addr);
-+ priv_handle_turn_alternate_server (agent, d, d->server, addr);
- } else if (res == STUN_USAGE_TURN_RETURN_RELAY_SUCCESS ||
- res == STUN_USAGE_TURN_RETURN_MAPPED_SUCCESS) {
- /* case: successful allocate, create a new local candidate */
-@@ -3769,16 +3803,12 @@ static gboolean priv_map_reply_to_relay_request (NiceAgent *agent, StunMessage *
- if ((agent->compatibility == NICE_COMPATIBILITY_OC2007 ||
- agent->compatibility == NICE_COMPATIBILITY_OC2007R2) &&
- alternatelen != sizeof(alternate)) {
-- NiceAddress alternate_addr;
--
-- nice_address_set_from_sockaddr (&alternate_addr, &alternate.addr);
-+ NiceAddress addr;
-
-- if (!nice_address_equal (&alternate_addr, &d->server)) {
-- nice_address_set_from_sockaddr (&d->server, &alternate.addr);
-- nice_address_set_from_sockaddr (&d->turn->server, &alternate.addr);
-+ nice_address_set_from_sockaddr (&addr, &alternate.addr);
-
-- d->pending = FALSE;
-- agent->discovery_unsched_items++;
-+ if (!nice_address_equal (&addr, &d->server)) {
-+ priv_handle_turn_alternate_server (agent, d, d->server, addr);
- }
- }
- /* check for unauthorized error response */
---
-2.13.6
-
diff --git a/libnice-0.1.14-85-g34d6044.patch b/libnice-0.1.14-85-g34d6044.patch
new file mode 100644
index 0000000..541d010
--- /dev/null
+++ b/libnice-0.1.14-85-g34d6044.patch
@@ -0,0 +1,11963 @@
+From a4bacb2fe2ff06ccb1a2d7f7c0b62bd41674565b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
+Date: Mon, 3 Apr 2017 14:30:10 -0400
+Subject: [PATCH 01/70] Version 0.1.14.1
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5fabdb4..b39bfe3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,8 +5,8 @@ dnl Always compile with -Wall; if --enable-compile-warnings=error is passed,
+ dnl also use -Werror. git and pre-releases default to -Werror
+
+ dnl use a three digit version number for releases, and four for cvs/prerelease
+-AC_INIT([libnice],[0.1.14])
+-LIBNICE_RELEASE="yes"
++AC_INIT([libnice],[0.1.14.1])
++LIBNICE_RELEASE="no"
+
+ AC_CANONICAL_TARGET
+
+--
+2.13.6
+
+
+From 59ce41dfb837adf4222b25490cde2e394384ad15 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miguel=20Par=C3=ADs=20D=C3=ADaz?= <mparisdiaz(a)gmail.com>
+Date: Fri, 31 Mar 2017 20:20:38 -0400
+Subject: [PATCH 02/70] conncheck: consider answer received when remote
+ credentials are set
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Consider that the answer is received when remote credentials
+are set instead of when a remote candidate is set,
+which could not happen or could cause more delay for the
+connection establishment.
+
+Ported to git master by Olivier Crête
+
+Differential Revision: https://phabricator.freedesktop.org/D1704
+---
+ agent/agent.c | 4 +-
+ agent/conncheck.c | 225 +++++++++++++++++++++++++++---------------------------
+ agent/conncheck.h | 2 +-
+ 3 files changed, 117 insertions(+), 114 deletions(-)
+
+diff --git a/agent/agent.c b/agent/agent.c
+index 555fd16..4d9381c 100644
+--- a/agent/agent.c
++++ b/agent/agent.c
+@@ -3240,6 +3240,8 @@ nice_agent_set_remote_credentials (
+ g_strlcpy (stream->remote_ufrag, ufrag, NICE_STREAM_MAX_UFRAG);
+ g_strlcpy (stream->remote_password, pwd, NICE_STREAM_MAX_PWD);
+
++ conn_check_remote_credentials_set(agent, stream);
++
+ ret = TRUE;
+ goto done;
+ }
+@@ -3342,8 +3344,6 @@ _set_remote_candidates_locked (NiceAgent *agent, NiceStream *stream,
+ }
+ }
+
+- conn_check_remote_candidates_set(agent, stream, component);
+-
+ if (added > 0) {
+ conn_check_schedule_next (agent);
+ }
+diff --git a/agent/conncheck.c b/agent/conncheck.c
+index dda2f2f..2abbc5e 100644
+--- a/agent/conncheck.c
++++ b/agent/conncheck.c
+@@ -1243,124 +1243,124 @@ static GSList *prune_cancelled_conn_check (GSList *conncheck_list)
+
+ /*
+ * Handle any processing steps for connectivity checks after
+- * remote candidates have been set. This function handles
++ * remote credentials have been set. This function handles
+ * the special case where answerer has sent us connectivity
+- * checks before the answer (containing candidate information),
++ * checks before the answer (containing credentials information),
+ * reaches us. The special case is documented in sect 7.2
+ * if ICE spec (ID-19).
+ */
+-void conn_check_remote_candidates_set(NiceAgent *agent, NiceStream *stream, NiceComponent *component)
++void conn_check_remote_credentials_set(NiceAgent *agent, NiceStream *stream)
+ {
+- GSList *j, *k, *l, *m, *n;
++ GSList *j, *k, *l, *m, *n, *o;
+
+ for (j = stream->conncheck_list; j ; j = j->next) {
+ CandidateCheckPair *pair = j->data;
+- if (pair->component_id == component->id) {
+- gboolean match = FALSE;
+-
+- /* performn delayed processing of spec steps section 7.2.1.4,
+- and section 7.2.1.5 */
+- priv_preprocess_conn_check_pending_data (agent, stream, component, pair);
+-
+- for (k = component->incoming_checks; k; k = k->next) {
+- IncomingCheck *icheck = k->data;
+- /* sect 7.2.1.3., "Learning Peer Reflexive Candidates", has to
+- * be handled separately */
+- for (l = component->remote_candidates; l; l = l->next) {
+- NiceCandidate *cand = l->data;
+- if (nice_address_equal (&icheck->from, &cand->addr)) {
+- match = TRUE;
+- break;
+- }
+- }
+- if (match != TRUE) {
+- /* note: we have gotten an incoming connectivity check from
+- * an address that is not a known remote candidate */
+-
+- NiceCandidate *local_candidate = NULL;
+- NiceCandidate *remote_candidate = NULL;
+-
+- if (agent->compatibility == NICE_COMPATIBILITY_GOOGLE ||
+- agent->compatibility == NICE_COMPATIBILITY_MSN ||
+- agent->compatibility == NICE_COMPATIBILITY_OC2007) {
+- /* We need to find which local candidate was used */
+- uint8_t uname[NICE_STREAM_MAX_UNAME];
+- guint uname_len;
+-
+- nice_debug ("Agent %p: We have a peer-reflexive candidate in a "
+- "stored pending check", agent);
+-
+- for (m = component->remote_candidates;
+- m != NULL && remote_candidate == NULL; m = m->next) {
+- for (n = component->local_candidates; n; n = n->next) {
+- NiceCandidate *rcand = m->data;
+- NiceCandidate *lcand = n->data;
+-
+- uname_len = priv_create_username (agent, stream,
+- component->id, rcand, lcand,
+- uname, sizeof (uname), TRUE);
+-
+- stun_debug ("pending check, comparing usernames of len %d and %d, equal=%d",
+- icheck->username_len, uname_len,
+- icheck->username && uname_len == icheck->username_len &&
+- memcmp (uname, icheck->username, icheck->username_len) == 0);
+- stun_debug_bytes (" first username: ",
+- icheck->username,
+- icheck->username? icheck->username_len : 0);
+- stun_debug_bytes (" second username: ", uname, uname_len);
+-
+- if (icheck->username &&
+- uname_len == icheck->username_len &&
+- memcmp (uname, icheck->username, icheck->username_len) == 0) {
+- local_candidate = lcand;
+- remote_candidate = rcand;
+- break;
+- }
+- }
+- }
+- } else {
+- for (l = component->local_candidates; l; l = l->next) {
+- NiceCandidate *cand = l->data;
+- if (nice_address_equal (&cand->addr, &icheck->local_socket->addr)) {
+- local_candidate = cand;
++ NiceComponent *component =
++ nice_stream_find_component_by_id (stream, pair->component_id);
++ gboolean match = FALSE;
++
++ /* performn delayed processing of spec steps section 7.2.1.4,
++ and section 7.2.1.5 */
++ priv_preprocess_conn_check_pending_data (agent, stream, component, pair);
++
++ for (k = component->incoming_checks; k; k = k->next) {
++ IncomingCheck *icheck = k->data;
++ /* sect 7.2.1.3., "Learning Peer Reflexive Candidates", has to
++ * be handled separately */
++ for (l = component->remote_candidates; l; l = l->next) {
++ NiceCandidate *cand = l->data;
++ if (nice_address_equal (&icheck->from, &cand->addr)) {
++ match = TRUE;
++ break;
++ }
++ }
++ if (match != TRUE) {
++ /* note: we have gotten an incoming connectivity check from
++ * an address that is not a known remote candidate */
++
++ NiceCandidate *local_candidate = NULL;
++ NiceCandidate *remote_candidate = NULL;
++
++ if (agent->compatibility == NICE_COMPATIBILITY_GOOGLE ||
++ agent->compatibility == NICE_COMPATIBILITY_MSN ||
++ agent->compatibility == NICE_COMPATIBILITY_OC2007) {
++ /* We need to find which local candidate was used */
++ uint8_t uname[NICE_STREAM_MAX_UNAME];
++ guint uname_len;
++
++ nice_debug ("Agent %p: We have a peer-reflexive candidate in a "
++ "stored pending check", agent);
++
++ for (m = component->remote_candidates;
++ m != NULL && remote_candidate == NULL; m = m->next) {
++ for (n = component->local_candidates; n; n = n->next) {
++ NiceCandidate *rcand = m->data;
++ NiceCandidate *lcand = n->data;
++
++ uname_len = priv_create_username (agent, stream,
++ component->id, rcand, lcand,
++ uname, sizeof (uname), TRUE);
++
++ stun_debug ("pending check, comparing usernames of len %d and %d, equal=%d",
++ icheck->username_len, uname_len,
++ icheck->username && uname_len == icheck->username_len &&
++ memcmp (uname, icheck->username, icheck->username_len) == 0);
++ stun_debug_bytes (" first username: ",
++ icheck->username,
++ icheck->username? icheck->username_len : 0);
++ stun_debug_bytes (" second username: ", uname, uname_len);
++
++ if (icheck->username &&
++ uname_len == icheck->username_len &&
++ memcmp (uname, icheck->username, icheck->username_len) == 0) {
++ local_candidate = lcand;
++ remote_candidate = rcand;
+ break;
+ }
+ }
+ }
+-
+- if (agent->compatibility == NICE_COMPATIBILITY_GOOGLE &&
+- local_candidate == NULL) {
+- /* if we couldn't match the username, then the matching remote
+- * candidate hasn't been received yet.. we must wait */
+- nice_debug ("Agent %p : Username check failed. pending check has "
+- "to wait to be processed", agent);
+- } else {
+- NiceCandidate *candidate;
+-
+- nice_debug ("Agent %p : Discovered peer reflexive from early i-check",
+- agent);
+- candidate =
+- discovery_learn_remote_peer_reflexive_candidate (agent,
+- stream,
+- component,
+- icheck->priority,
+- &icheck->from,
+- icheck->local_socket,
+- local_candidate, remote_candidate);
+- if (candidate) {
+- if (local_candidate &&
+- local_candidate->transport == NICE_CANDIDATE_TRANSPORT_TCP_PASSIVE)
+- priv_conn_check_add_for_candidate_pair_matched (agent,
+- stream->id, component, local_candidate, candidate, NICE_CHECK_DISCOVERED);
+- else
+- conn_check_add_for_candidate (agent, stream->id, component, candidate);
+-
+- if (icheck->use_candidate)
+- priv_mark_pair_nominated (agent, stream, component, local_candidate, candidate);
+- priv_schedule_triggered_check (agent, stream, component, icheck->local_socket, candidate, icheck->use_candidate);
++ } else {
++ for (l = component->local_candidates; l; l = l->next) {
++ NiceCandidate *cand = l->data;
++ if (nice_address_equal (&cand->addr, &icheck->local_socket->addr)) {
++ local_candidate = cand;
++ break;
+ }
+ }
+ }
++
++ if (agent->compatibility == NICE_COMPATIBILITY_GOOGLE &&
++ local_candidate == NULL) {
++ /* if we couldn't match the username, then the matching remote
++ * candidate hasn't been received yet.. we must wait */
++ nice_debug ("Agent %p : Username check failed. pending check has "
++ "to wait to be processed", agent);
++ } else {
++ NiceCandidate *candidate;
++
++ nice_debug ("Agent %p : Discovered peer reflexive from early i-check",
++ agent);
++ candidate =
++ discovery_learn_remote_peer_reflexive_candidate (agent,
++ stream,
++ component,
++ icheck->priority,
++ &icheck->from,
++ icheck->local_socket,
++ local_candidate, remote_candidate);
++ if (candidate) {
++ if (local_candidate &&
++ local_candidate->transport == NICE_CANDIDATE_TRANSPORT_TCP_PASSIVE)
++ priv_conn_check_add_for_candidate_pair_matched (agent,
++ stream->id, component, local_candidate, candidate, NICE_CHECK_DISCOVERED);
++ else
++ conn_check_add_for_candidate (agent, stream->id, component, candidate);
++
++ if (icheck->use_candidate)
++ priv_mark_pair_nominated (agent, stream, component, local_candidate, candidate);
++ priv_schedule_triggered_check (agent, stream, component, icheck->local_socket, candidate, icheck->use_candidate);
++ }
++ }
+ }
+ }
+ }
+@@ -1368,9 +1368,12 @@ void conn_check_remote_candidates_set(NiceAgent *agent, NiceStream *stream, Nice
+ /* Once we process the pending checks, we should free them to avoid
+ * reprocessing them again if a dribble-mode set_remote_candidates
+ * is called */
+- g_slist_free_full (component->incoming_checks,
+- (GDestroyNotify) incoming_check_free);
+- component->incoming_checks = NULL;
++ for (o = stream->components; o; o = o->next) {
++ NiceComponent *component = o->data;
++ g_slist_free_full (component->incoming_checks,
++ (GDestroyNotify) incoming_check_free);
++ component->incoming_checks = NULL;
++ }
+
+ stream->conncheck_list =
+ prune_cancelled_conn_check (stream->conncheck_list);
+@@ -3628,14 +3631,14 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *agent, NiceStream *stream,
+ if (stream->initial_binding_request_received != TRUE)
+ agent_signal_initial_binding_request_received (agent, stream);
+
+- if (component->remote_candidates && remote_candidate == NULL) {
++ if (remote_candidate == NULL) {
+ nice_debug ("Agent %p : No matching remote candidate for incoming check ->"
+ "peer-reflexive candidate.", agent);
+ remote_candidate = discovery_learn_remote_peer_reflexive_candidate (
+ agent, stream, component, priority, from, nicesock,
+ local_candidate,
+ remote_candidate2 ? remote_candidate2 : remote_candidate);
+- if(remote_candidate) {
++ if(remote_candidate && stream->remote_ufrag != NULL) {
+ if (local_candidate &&
+ local_candidate->transport == NICE_CANDIDATE_TRANSPORT_TCP_PASSIVE) {
+ CandidateCheckPair *pair;
+@@ -3654,10 +3657,10 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *agent, NiceStream *stream,
+ priv_reply_to_conn_check (agent, stream, component, local_candidate,
+ remote_candidate, from, nicesock, rbuf_len, &msg, use_candidate);
+
+- if (component->remote_candidates == NULL) {
++ if (stream->remote_ufrag == NULL) {
+ /* case: We've got a valid binding request to a local candidate
+- * but we do not yet know remote credentials nor
+- * candidates. As per sect 7.2 of ICE (ID-19), we send a reply
++ * but we do not yet know remote credentials.
++ * As per sect 7.2 of ICE (ID-19), we send a reply
+ * immediately but postpone all other processing until
+ * we get information about the remote candidates */
+
+diff --git a/agent/conncheck.h b/agent/conncheck.h
+index 431c606..10319cc 100644
+--- a/agent/conncheck.h
++++ b/agent/conncheck.h
+@@ -105,7 +105,7 @@ int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair);
+ void conn_check_prune_stream (NiceAgent *agent, NiceStream *stream);
+ gboolean conn_check_handle_inbound_stun (NiceAgent *agent, NiceStream *stream, NiceComponent *component, NiceSocket *udp_socket, const NiceAddress *from, gchar *buf, guint len);
+ gint conn_check_compare (const CandidateCheckPair *a, const CandidateCheckPair *b);
+-void conn_check_remote_candidates_set(NiceAgent *agent, NiceStream *stream, NiceComponent *component);
++void conn_check_remote_credentials_set(NiceAgent *agent, NiceStream *stream);
+ NiceCandidateTransport conn_check_match_transport (NiceCandidateTransport transport);
+ void
+ conn_check_prune_socket (NiceAgent *agent, NiceStream *stream, NiceComponent *component,
+--
+2.13.6
+
+
+From 0de1657e4d15d4f1911ab1fad84ea23e7013070f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
+Date: Tue, 4 Apr 2017 12:25:50 -0400
+Subject: [PATCH 03/70] conncheck: Use the right test for empty remote_frag
+
+It's now an array, not a pointer, so needs to test to emptyness.
+
+It's a bugfix on the previous commit, 59ce41df
+---
+ agent/conncheck.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/agent/conncheck.c b/agent/conncheck.c
+index 2abbc5e..7096b42 100644
+--- a/agent/conncheck.c
++++ b/agent/conncheck.c
+@@ -3638,7 +3638,7 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *agent, NiceStream *stream,
+ agent, stream, component, priority, from, nicesock,
+ local_candidate,
+ remote_candidate2 ? remote_candidate2 : remote_candidate);
+- if(remote_candidate && stream->remote_ufrag != NULL) {
++ if(remote_candidate && stream->remote_ufrag[0]) {
+ if (local_candidate &&
+ local_candidate->transport == NICE_CANDIDATE_TRANSPORT_TCP_PASSIVE) {
+ CandidateCheckPair *pair;
+@@ -3657,7 +3657,7 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *agent, NiceStream *stream,
+ priv_reply_to_conn_check (agent, stream, component, local_candidate,
+ remote_candidate, from, nicesock, rbuf_len, &msg, use_candidate);
+
+- if (stream->remote_ufrag == NULL) {
++ if (stream->remote_ufrag[0] == 0) {
+ /* case: We've got a valid binding request to a local candidate
+ * but we do not yet know remote credentials.
+ * As per sect 7.2 of ICE (ID-19), we send a reply
+--
+2.13.6
+
+
+From 0672758b9621801c8f0d9e3c920370983b267a68 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
+Date: Tue, 4 Apr 2017 12:29:29 -0400
+Subject: [PATCH 04/70] agent: Don't set variable that won't be used
+
+It exits the loop immediately, so no point to set the variable.
+And it makes the clang static analyzer happy.
+---
+ agent/agent.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/agent/agent.c b/agent/agent.c
+index 4d9381c..8ba99bc 100644
+--- a/agent/agent.c
++++ b/agent/agent.c
+@@ -4245,7 +4245,6 @@ nice_agent_recv_messages_blocking_or_nonblocking (NiceAgent *agent,
+ "Component removed during call.");
+
+ component = NULL;
+- error_reported = TRUE;
+
+ goto recv_error;
+ }
+--
+2.13.6
+
+
+From db05e8b0fdc713df93cd6a4c3914e5aee38b2391 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
+Date: Tue, 4 Apr 2017 12:30:27 -0400
+Subject: [PATCH 05/70] Make clang-analyzer happy
+
+Various little things, none of which should make a functional difference.
+---
+ agent/agent.c | 1 -
+ agent/conncheck.c | 2 +-
+ socket/udp-turn.c | 5 ++---
+ stun/usages/bind.c | 4 +++-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/agent/agent.c b/agent/agent.c
+index 8ba99bc..28d7ccf 100644
+--- a/agent/agent.c
++++ b/agent/agent.c
+@@ -1552,7 +1552,6 @@ pseudo_tcp_socket_recv_messages (PseudoTcpSocket *self,
+
+ if (len == 0) {
+ /* Reached EOS. */
+- len = 0;
+ goto done;
+ } else if (len < 0 &&
+ pseudo_tcp_socket_get_error (self) == EWOULDBLOCK) {
+diff --git a/agent/conncheck.c b/agent/conncheck.c
+index 7096b42..1dc13dd 100644
+--- a/agent/conncheck.c
++++ b/agent/conncheck.c
+@@ -606,7 +606,7 @@ static gboolean priv_conn_check_tick_unlocked (NiceAgent *agent)
+ /* step: when there's no pair in the Waiting state,
+ * unfreeze a new pair and check it
+ */
+- res = priv_conn_check_unfreeze_next (agent);
++ priv_conn_check_unfreeze_next (agent);
+
+ for (i = agent->streams; i ; i = i->next) {
+ NiceStream *stream = i->data;
+diff --git a/socket/udp-turn.c b/socket/udp-turn.c
+index cc3409b..a9c57e5 100644
+--- a/socket/udp-turn.c
++++ b/socket/udp-turn.c
+@@ -406,9 +406,8 @@ socket_recv_messages (NiceSocket *sock,
+
+ /* Split up the monolithic buffer again into the caller-provided buffers. */
+ if (parsed_buffer_length > 0 && allocated_buffer) {
+- parsed_buffer_length =
+- memcpy_buffer_to_input_message (message, buffer,
+- parsed_buffer_length);
++ memcpy_buffer_to_input_message (message, buffer,
++ parsed_buffer_length);
+ }
+
+ if (allocated_buffer)
+diff --git a/stun/usages/bind.c b/stun/usages/bind.c
+index 8dd7afc..d56790f 100644
+--- a/stun/usages/bind.c
++++ b/stun/usages/bind.c
+@@ -479,7 +479,7 @@ StunUsageBindReturn stun_usage_bind_run (const struct sockaddr *srv,
+ size_t len;
+ StunUsageTransReturn ret;
+ int val;
+- struct sockaddr_storage alternate_server;
++ struct sockaddr_storage alternate_server = { AF_UNSPEC } ;
+ socklen_t alternate_server_len = sizeof (alternate_server);
+ StunUsageBindReturn bind_ret;
+
+@@ -548,6 +548,8 @@ StunUsageBindReturn stun_usage_bind_run (const struct sockaddr *srv,
+ if (bind_ret == STUN_USAGE_BIND_RETURN_ALTERNATE_SERVER) {
+ stun_trans_deinit (&trans);
+
++ assert (alternate_server.ss_family != AF_UNSPEC);
++
+ ret = stun_trans_create (&trans, SOCK_DGRAM, 0,
+ (struct sockaddr *) &alternate_server, alternate_server_len);
+
+--
+2.13.6
+
+
+From cd255bddc7fa0ddae056b5358a22b380c4eefc42 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
+Date: Tue, 4 Apr 2017 15:24:43 -0400
+Subject: [PATCH 06/70] udp-turn: Add some const to internal APIs
+
+---
+ agent/component.c | 2 +-
+ socket/udp-turn.c | 10 +++++-----
+ socket/udp-turn.h | 7 ++++---
+ 3 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/agent/component.c b/agent/component.c
+index 32f7463..a679b30 100644
+--- a/agent/component.c
++++ b/agent/component.c
+@@ -380,7 +380,7 @@ nice_component_restart (NiceComponent *cmp)
+ for (i = cmp->remote_candidates; i; i = i->next) {
+ NiceCandidate *candidate = i->data;
+
+- /* note: do not remove the local candidate that is
++ /* note: do not remove the remote candidate that is
+ * currently part of the 'selected pair', see ICE
+ * 9.1.1.1. "ICE Restarts" (ID-19) */
+ if (candidate == cmp->selected_pair.remote) {
+diff --git a/socket/udp-turn.c b/socket/udp-turn.c
+index a9c57e5..190a9ea 100644
+--- a/socket/udp-turn.c
++++ b/socket/udp-turn.c
+@@ -174,8 +174,8 @@ priv_send_data_queue_destroy (gpointer user_data)
+
+ NiceSocket *
+ nice_udp_turn_socket_new (GMainContext *ctx, NiceAddress *addr,
+- NiceSocket *base_socket, NiceAddress *server_addr,
+- gchar *username, gchar *password,
++ NiceSocket *base_socket, const NiceAddress *server_addr,
++ const gchar *username, const gchar *password,
+ NiceTurnSocketCompatibility compatibility)
+ {
+ UdpTurnPriv *priv;
+@@ -1184,7 +1184,7 @@ nice_udp_turn_socket_parse_recv_message (NiceSocket *sock, NiceSocket **from_soc
+ gsize
+ nice_udp_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
+ NiceAddress *from, gsize len, guint8 *buf,
+- NiceAddress *recv_from, guint8 *_recv_buf, gsize recv_len)
++ const NiceAddress *recv_from, const guint8 *_recv_buf, gsize recv_len)
+ {
+
+ UdpTurnPriv *priv = (UdpTurnPriv *) sock->priv;
+@@ -1194,8 +1194,8 @@ nice_udp_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
+ ChannelBinding *binding = NULL;
+
+ union {
+- guint8 *u8;
+- guint16 *u16;
++ const guint8 *u8;
++ const guint16 *u16;
+ } recv_buf;
+
+ /* In the case of a reliable UDP-TURN-OVER-TCP (which means MS-TURN)
+diff --git a/socket/udp-turn.h b/socket/udp-turn.h
+index b1eeeb4..df10a1c 100644
+--- a/socket/udp-turn.h
++++ b/socket/udp-turn.h
+@@ -59,15 +59,16 @@ nice_udp_turn_socket_parse_recv_message (NiceSocket *sock, NiceSocket **from_soc
+ gsize
+ nice_udp_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
+ NiceAddress *from, gsize len, guint8 *buf,
+- NiceAddress *recv_from, guint8 *recv_buf, gsize recv_len);
++ const NiceAddress *recv_from, const guint8 *recv_buf, gsize recv_len);
+
+ gboolean
+ nice_udp_turn_socket_set_peer (NiceSocket *sock, NiceAddress *peer);
+
+ NiceSocket *
+ nice_udp_turn_socket_new (GMainContext *ctx, NiceAddress *addr,
+- NiceSocket *base_socket, NiceAddress *server_addr,
+- gchar *username, gchar *password, NiceTurnSocketCompatibility compatibility);
++ NiceSocket *base_socket, const NiceAddress *server_addr,
++ const gchar *username, const gchar *password,
++ NiceTurnSocketCompatibility compatibility);
+
+ void
+ nice_udp_turn_socket_set_ms_realm(NiceSocket *sock, StunMessage *msg);
+--
+2.13.6
+
+
+From e56b910d2d8b70f5677bbd4be579d5b95aff33ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
+Date: Tue, 4 Apr 2017 16:16:05 -0400
+Subject: [PATCH 07/70] agent: Separate return from NiceSocket and internal
+ enum
+
+The same variable was used for return values from NiceSocket and
+for the internal enum, but 0 and -1 have different meanings in both.
+---
+ agent/agent.c | 35 +++++++++++++++++++----------------
+ 1 file changed, 19 insertions(+), 16 deletions(-)
+
+diff --git a/agent/agent.c b/agent/agent.c
+index 28d7ccf..7b8a9fc 100644
+--- a/agent/agent.c
++++ b/agent/agent.c
+@@ -3422,7 +3422,8 @@ agent_recv_message_unlocked (
+ {
+ NiceAddress from;
+ GList *item;
+- gint retval;
++ RecvStatus retval;
++ gint sockret;
+ gboolean is_turn = FALSE;
+
+ /* We need an address for packet parsing, below. */
+@@ -3483,8 +3484,8 @@ agent_recv_message_unlocked (
+ local_bufs[i + 1].buffer = message->buffers[i].buffer;
+ local_bufs[i + 1].size = message->buffers[i].size;
+ }
+- retval = nice_socket_recv_messages (nicesock, &local_message, 1);
+- if (retval == 1) {
++ sockret = nice_socket_recv_messages (nicesock, &local_message, 1);
++ if (sockret == 1) {
+ message->length = ntohs (rfc4571_frame);
+ }
+ } else {
+@@ -3499,7 +3500,7 @@ agent_recv_message_unlocked (
+ _priv_set_socket_tos (agent, new_socket, stream->tos);
+ nice_component_attach_socket (component, new_socket);
+ }
+- retval = 0;
++ sockret = 0;
+ } else {
+ /* In the case of a real ICE-TCP connection, we can use the socket as a
+ * bytestream and do the read here with caching of data being read
+@@ -3508,9 +3509,9 @@ agent_recv_message_unlocked (
+
+ /* TODO: Support bytestream reads */
+ message->length = 0;
+- retval = 0;
++ sockret = 0;
+ if (available <= 0) {
+- retval = available;
++ sockret = available;
+
+ /* If we don't call check_connect_result on an outbound connection,
+ * then is_connected will always return FALSE. That's why we check
+@@ -3523,7 +3524,7 @@ agent_recv_message_unlocked (
+ * not connected, it means that it failed to connect, so we must
+ * return an error to make the socket fail/closed
+ */
+- retval = -1;
++ sockret = -1;
+ } else {
+ gint flags = G_SOCKET_MSG_PEEK;
+
+@@ -3536,7 +3537,7 @@ agent_recv_message_unlocked (
+ */
+ if (g_socket_receive_message (nicesock->fileno, NULL,
+ NULL, 0, NULL, NULL, &flags, NULL, NULL) == 0)
+- retval = -1;
++ sockret = -1;
+ }
+ } else if (agent->rfc4571_expecting_length == 0) {
+ if ((gsize) available >= sizeof(guint16)) {
+@@ -3544,8 +3545,8 @@ agent_recv_message_unlocked (
+ GInputVector local_buf = { &rfc4571_frame, sizeof(guint16)};
+ NiceInputMessage local_message = { &local_buf, 1, message->from, 0};
+
+- retval = nice_socket_recv_messages (nicesock, &local_message, 1);
+- if (retval == 1) {
++ sockret = nice_socket_recv_messages (nicesock, &local_message, 1);
++ if (sockret == 1) {
+ agent->rfc4571_expecting_length = ntohs (rfc4571_frame);
+ available = g_socket_get_available_bytes (nicesock->fileno);
+ }
+@@ -3589,8 +3590,8 @@ agent_recv_message_unlocked (
+ off += local_bufs[i].size;
+ }
+ }
+- retval = nice_socket_recv_messages (nicesock, &local_message, 1);
+- if (retval == 1) {
++ sockret = nice_socket_recv_messages (nicesock, &local_message, 1);
++ if (sockret == 1) {
+ message->length = local_message.length;
+ agent->rfc4571_expecting_length -= local_message.length;
+ }
+@@ -3598,20 +3599,22 @@ agent_recv_message_unlocked (
+ }
+ }
+ } else {
+- retval = nice_socket_recv_messages (nicesock, message, 1);
++ sockret = nice_socket_recv_messages (nicesock, message, 1);
+ }
+
+- if (retval == 0) {
++ if (sockret == 0) {
+ retval = RECV_WOULD_BLOCK; /* EWOULDBLOCK */
+ nice_debug_verbose ("%s: Agent %p: no message available on read attempt",
+ G_STRFUNC, agent);
+ goto done;
+- } else if (retval < 0) {
++ } else if (sockret < 0) {
+ nice_debug ("Agent %p: %s returned %d, errno (%d) : %s",
+- agent, G_STRFUNC, retval, errno, g_strerror (errno));
++ agent, G_STRFUNC, sockret, errno, g_strerror (errno));
+
+ retval = RECV_ERROR;
+ goto done;
++ } else {
++ retval = sockret;
+ }
+
+ if (retval == RECV_OOB || message->length == 0) {
+--
+2.13.6
+
+
+From 4e605885c9dcaeb3ee443ec902c9c9189b19043f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
+Date: Tue, 4 Apr 2017 16:16:46 -0400
+Subject: [PATCH 08/70] agent: Remove impossible case
+
+---
+ agent/agent.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/agent/agent.c b/agent/agent.c
+index 7b8a9fc..77f27e3 100644
+--- a/agent/agent.c
++++ b/agent/agent.c
+@@ -3617,7 +3617,8 @@ agent_recv_message_unlocked (
+ retval = sockret;
+ }
+
+- if (retval == RECV_OOB || message->length == 0) {
++ g_assert (retval != RECV_OOB);
++ if (message->length == 0) {
+ retval = RECV_OOB;
+ nice_debug_verbose ("%s: Agent %p: message handled out-of-band", G_STRFUNC,
+ agent);
+--
+2.13.6
+
+
+From efc6a9be8cb34c899f0454c32e8a1e62b38df474 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
+Date: Tue, 4 Apr 2017 18:42:57 -0400
+Subject: [PATCH 09/70] tests: Use automake test-driver for valgrind
+
+This fixes the valgrind integration with the new test drivers.
+---
+ common.mk | 4 +-
+ scripts/valgrind-test-driver | 162 +++++++++++++++++++++++++++++++++++++++++++
+ scripts/valgrind.sh | 28 --------
+ 3 files changed, 165 insertions(+), 29 deletions(-)
+ create mode 100755 scripts/valgrind-test-driver
+ delete mode 100755 scripts/valgrind.sh
+
+diff --git a/common.mk b/common.mk
+index e2ca3f4..b16380d 100644
+--- a/common.mk
++++ b/common.mk
+@@ -4,6 +4,8 @@ pkgincludedir = $(includedir)/nice
+
+
+ check-valgrind:
+- $(MAKE) TESTS_ENVIRONMENT="sh $$(cd "$(top_srcdir)" && pwd)/scripts/valgrind.sh" check
++ $(MAKE) TESTS_ENVIRONMENT="USE_VALGRIND=1 " check
++
++LOG_DRIVER=$(top_srcdir)/scripts/valgrind-test-driver
+
+ .PHONY: check-valgrind
+diff --git a/scripts/valgrind-test-driver b/scripts/valgrind-test-driver
+new file mode 100755
+index 0000000..5b660ee
+--- /dev/null
++++ b/scripts/valgrind-test-driver
+@@ -0,0 +1,162 @@
++#! /bin/sh
++# test-driver - basic testsuite driver script.
++
++scriptversion=2017-04-04.22; # UTC
++
++# Copyright (C) 2011-2014 Free Software Foundation, Inc.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program. If not, see <http://www.gnu.org/licenses/>.
++
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# This file is maintained in Automake, please report
++# bugs to <bug-automake(a)gnu.org> or send patches to
++# <automake-patches(a)gnu.org>.
++
++# Make unconditional expansion of undefined variables an error. This
++# helps a lot in preventing typo-related bugs.
++set -u
++
++usage_error ()
++{
++ echo "$0: $*" >&2
++ print_usage >&2
++ exit 2
++}
++
++print_usage ()
++{
++ cat <<END
++Usage:
++ test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
++ [--expect-failure={yes|no}] [--color-tests={yes|no}]
++ [--enable-hard-errors={yes|no}] [--]
++ TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
++The '--test-name', '--log-file' and '--trs-file' options are mandatory.
++END
++}
++
++test_name= # Used for reporting.
++log_file= # Where to save the output of the test script.
++trs_file= # Where to save the metadata of the test run.
++expect_failure=no
++color_tests=no
++enable_hard_errors=yes
++while test $# -gt 0; do
++ case $1 in
++ --help) print_usage; exit $?;;
++ --version) echo "test-driver $scriptversion"; exit $?;;
++ --test-name) test_name=$2; shift;;
++ --log-file) log_file=$2; shift;;
++ --trs-file) trs_file=$2; shift;;
++ --color-tests) color_tests=$2; shift;;
++ --expect-failure) expect_failure=$2; shift;;
++ --enable-hard-errors) enable_hard_errors=$2; shift;;
++ --) shift; break;;
++ -*) usage_error "invalid option: '$1'";;
++ *) break;;
++ esac
++ shift
++done
++
++missing_opts=
++test x"$test_name" = x && missing_opts="$missing_opts --test-name"
++test x"$log_file" = x && missing_opts="$missing_opts --log-file"
++test x"$trs_file" = x && missing_opts="$missing_opts --trs-file"
++if test x"$missing_opts" != x; then
++ usage_error "the following mandatory options are missing:$missing_opts"
++fi
++
++if test $# -eq 0; then
++ usage_error "missing argument"
++fi
++
++if test $color_tests = yes; then
++ # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
++ red='[0;31m' # Red.
++ grn='[0;32m' # Green.
++ lgn='[1;32m' # Light green.
++ blu='[1;34m' # Blue.
++ mgn='[0;35m' # Magenta.
++ std='[m' # No color.
++else
++ red= grn= lgn= blu= mgn= std=
++fi
++
++do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
++trap "st=129; $do_exit" 1
++trap "st=130; $do_exit" 2
++trap "st=141; $do_exit" 13
++trap "st=143; $do_exit" 15
++
++# Test script is run here.
++top_srcdir="`dirname $0`/.."
++tests_dir="${top_srcdir}/tests"
++
++USE_VALGRIND="`printenv USE_VALGRIND`"
++
++if test "x${USE_VALGRIND}" = "x1"; then
++ ${top_srcdir}/libtool --mode=execute valgrind \
++ --leak-check=full \
++ --show-reachable=no \
++ --error-exitcode=1 \
++ --suppressions=$tests_dir/libnice.supp \
++ --num-callers=30 "$@" >$log_file 2>&1
++else
++ "$@" >$log_file 2>&1
++fi
++estatus=$?
++
++if test $enable_hard_errors = no && test $estatus -eq 99; then
++ tweaked_estatus=1
++else
++ tweaked_estatus=$estatus
++fi
++
++case $tweaked_estatus:$expect_failure in
++ 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
++ 0:*) col=$grn res=PASS recheck=no gcopy=no;;
++ 77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
++ 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;;
++ *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;;
++ *:*) col=$red res=FAIL recheck=yes gcopy=yes;;
++esac
++
++# Report the test outcome and exit status in the logs, so that one can
++# know whether the test passed or failed simply by looking at the '.log'
++# file, without the need of also peaking into the corresponding '.trs'
++# file (automake bug#11814).
++echo "$res $test_name (exit status: $estatus)" >>$log_file
++
++# Report outcome to console.
++echo "${col}${res}${std}: $test_name"
++
++# Register the test result, and other relevant metadata.
++echo ":test-result: $res" > $trs_file
++echo ":global-test-result: $res" >> $trs_file
++echo ":recheck: $recheck" >> $trs_file
++echo ":copy-in-global-log: $gcopy" >> $trs_file
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-time-zone: "UTC"
++# time-stamp-end: "; # UTC"
++# End:
+diff --git a/scripts/valgrind.sh b/scripts/valgrind.sh
+deleted file mode 100755
+index 2864b6f..0000000
+--- a/scripts/valgrind.sh
++++ /dev/null
+@@ -1,28 +0,0 @@
+-#!/bin/sh
+-
+-export G_SLICE=always-malloc
+-export G_DEBUG=gc-friendly
+-
+-tests_dir="`dirname $0`/../tests"
+-
+-report=`libtool --mode=execute valgrind \
+- --leak-check=full \
+- --show-reachable=no \
+- --error-exitcode=1 \
+- --suppressions=$tests_dir/libnice.supp \
+- --num-callers=30 \
+- $1 2>&1`
+-
+-#if echo "$report" | grep -q ==; then
+-if test $? != 0; then
+- echo "$report"
+- exit 1
+-fi
+-
+-if echo "$report" | grep -q "definitely lost"; then
+- if ! echo "$report" | grep -q "definitely lost: 0 bytes"; then
+- echo "$report"
+- exit 1
+- fi
+-fi
+-
+--
+2.13.6
+
+
+From ae6d939e48366b80570d713b83334191b0982e71 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
+Date: Tue, 4 Apr 2017 20:34:05 -0400
+Subject: [PATCH 10/70] debug: Use libnice-verbose, not libnice-nice-verbose
+
+---
+ agent/debug.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/agent/debug.c b/agent/debug.c
+index e1a298c..84fee94 100644
+--- a/agent/debug.c
++++ b/agent/debug.c
+@@ -102,7 +102,7 @@ void nice_debug_init (void)
+ flags |= g_parse_debug_string (gflags_string, gkeys, 4);
+ if (gflags_string && strstr (gflags_string, "libnice-pseudotcp-verbose"))
+ flags |= NICE_DEBUG_PSEUDOTCP_VERBOSE;
+- if (gflags_string && strstr (gflags_string, "libnice-nice-verbose")) {
++ if (gflags_string && strstr (gflags_string, "libnice-verbose")) {
+ flags |= NICE_DEBUG_NICE_VERBOSE;
+ }
+
+--
+2.13.6
+
+
+From 10c557f23f8337f1304fff27bd85d2eb713cb249 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
+Date: Wed, 5 Apr 2017 17:01:35 -0400
+Subject: [PATCH 11/70] test-credentials: Fix leak
+
+---
+ tests/test-credentials.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/test-credentials.c b/tests/test-credentials.c
+index 1de4e49..f1ea89d 100644
+--- a/tests/test-credentials.c
++++ b/tests/test-credentials.c
+@@ -184,6 +184,8 @@ int main (void)
+ nice_agent_get_local_credentials (lagent, 1, &ufrag, &password);
+ g_assert (g_strcmp0("unicorns", ufrag) == 0);
+ g_assert (g_strcmp0("awesome", password) == 0);
++ g_free (ufrag);
++ g_free (password);
+
+ nice_agent_gather_candidates (lagent, 1);
+ nice_agent_gather_candidates (ragent, 1);
+--
+2.13.6
+
+
+From 1e9e28dbc98b4f6a7cf4bda0ca73b5abc2735ddc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
+Date: Tue, 4 Apr 2017 14:41:51 -0400
+Subject: [PATCH 12/70] candidate: Add equality check function
+
+Add a function that can check if two candidates point to the same place.
+
+https://phabricator.freedesktop.org/T104
+
+Reviewed-by: Philip Withnall <philip.withnall(a)collabora.co.uk>
+Differential Revision: https://phabricator.freedesktop.org/D1715
+---
+ agent/candidate.c | 11 +++++++++++
+ agent/candidate.h | 18 +++++++++++++++++-
+ docs/reference/libnice/libnice-docs.xml | 4 ++++
+ docs/reference/libnice/libnice-sections.txt | 1 +
+ nice/libnice.sym | 1 +
+ 5 files changed, 34 insertions(+), 1 deletion(-)
+
+diff --git a/agent/candidate.c b/agent/candidate.c
+index 27966ef..85f8f65 100644
+--- a/agent/candidate.c
++++ b/agent/candidate.c
+@@ -360,3 +360,14 @@ nice_candidate_copy (const NiceCandidate *candidate)
+
+ return copy;
+ }
++
++NICEAPI_EXPORT gboolean
++nice_candidate_equal_target (const NiceCandidate *candidate1,
++ const NiceCandidate *candidate2)
++{
++ g_return_val_if_fail (candidate1 != NULL, FALSE);
++ g_return_val_if_fail (candidate2 != NULL, FALSE);
++
++ return (candidate1->transport == candidate2->transport &&
++ nice_address_equal (&candidate1->addr, &candidate2->addr));
++}
+diff --git a/agent/candidate.h b/agent/candidate.h
+index fadfce3..e556c16 100644
+--- a/agent/candidate.h
++++ b/agent/candidate.h
+@@ -230,7 +230,23 @@ nice_candidate_free (NiceCandidate *candidate);
+ NiceCandidate *
+ nice_candidate_copy (const NiceCandidate *candidate);
+
+-GType nice_candidate_get_type (void);
++/**
++ * nice_candidate_equal_target:
++ * @candidate1: A candidate
++ * @candidate2: A candidate
++ *
++ * Verifies that the candidates point to the same place, meaning they have
++ * the same transport and the same address. It ignores all other aspects.
++ *
++ * Returns: %TRUE if the candidates point to the same place
++ *
++ * Since: 0.1.15
++ */
++gboolean
++nice_candidate_equal_target (const NiceCandidate *candidate1,
++ const NiceCandidate *candidate2);
++
++ GType nice_candidate_get_type (void);
+
+ /**
+ * NICE_TYPE_CANDIDATE:
+diff --git a/docs/reference/libnice/libnice-docs.xml b/docs/reference/libnice/libnice-docs.xml
+index 53487bc..391be1a 100644
+--- a/docs/reference/libnice/libnice-docs.xml
++++ b/docs/reference/libnice/libnice-docs.xml
+@@ -105,6 +105,10 @@
+ <title>Index of new symbols in 0.1.14</title>
+ <xi:include href="xml/api-index-0.1.14.xml"><xi:fallback/></xi:include>
+ </index>
++ <index role="0.1.15">
++ <title>Index of new symbols in 0.1.15</title>
++ <xi:include href="xml/api-index-0.1.15.xml"><xi:fallback/></xi:include>
++ </index>
+ <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+ </part>
+ </book>
+diff --git a/docs/reference/libnice/libnice-sections.txt b/docs/reference/libnice/libnice-sections.txt
+index d377257..88a6cd2 100644
+--- a/docs/reference/libnice/libnice-sections.txt
++++ b/docs/reference/libnice/libnice-sections.txt
+@@ -76,6 +76,7 @@ NICE_CANDIDATE_MAX_FOUNDATION
+ nice_candidate_new
+ nice_candidate_free
+ nice_candidate_copy
++nice_candidate_equal_target
+ <SUBSECTION Standard>
+ NICE_TYPE_CANDIDATE
+ nice_candidate_get_type
+diff --git a/nice/libnice.sym b/nice/libnice.sym
+index b04bb95..1e522ad 100644
+--- a/nice/libnice.sym
++++ b/nice/libnice.sym
+@@ -58,6 +58,7 @@ nice_agent_set_software
+ nice_agent_set_stream_name
+ nice_agent_set_stream_tos
+ nice_candidate_copy
++nice_candidate_equal_target
+ nice_candidate_free
+ nice_candidate_new
+ nice_component_state_to_string
+--
+2.13.6
+
+
+From ffc7fddac42728bac6e4753a17bc52e5e610ae8b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
+Date: Tue, 4 Apr 2017 21:27:39 -0400
+Subject: [PATCH 13/70] agent: Drop packets not from validated addresses
+
+This is required by the WebRTC spec.
+
+Remove test-mainloop as it doesnt even try to do
+a negotiation.
+
+https://phabricator.freedesktop.org/T104
+
+Differential Revision: https://phabricator.freedesktop.org/D1716
+---
+ agent/agent-priv.h | 2 +
+ agent/agent.c | 20 +++++++++-
+ agent/component.c | 90 +++++++++++++++++++++++++++++++++++++++++
+ agent/component.h | 10 +++++
+ agent/conncheck.c | 8 +++-
+ tests/Makefile.am | 1 -
+ tests/test-mainloop.c | 108 --------------------------------------------------
+ 7 files changed, 127 insertions(+), 112 deletions(-)
+ delete mode 100644 tests/test-mainloop.c
+
+diff --git a/agent/agent-priv.h b/agent/agent-priv.h
+index 4d8c9b8..ada3630 100644
+--- a/agent/agent-priv.h
++++ b/agent/agent-priv.h
+@@ -114,6 +114,8 @@ nice_input_message_iter_compare (const NiceInputMessageIter *a,
+ * MTU and estimated typical sizes of ICE STUN packet */
+ #define MAX_STUN_DATAGRAM_PAYLOAD 1300
+
++#define NICE_COMPONENT_MAX_VALID_CANDIDATES 50 /* maximum number of validates remote candidates to keep, the number is arbitrary but hopefully large enough */
++
+ struct _NiceAgent
+ {
+ GObject parent; /* gobject pointer */
+diff --git a/agent/agent.c b/agent/agent.c
+index 77f27e3..eff62f0 100644
+--- a/agent/agent.c
++++ b/agent/agent.c
+@@ -3682,8 +3682,6 @@ agent_recv_message_unlocked (
+ if (retval == RECV_OOB)
+ goto done;
+
+- agent->media_after_tick = TRUE;
+-
+ /* If the message’s stated length is equal to its actual length, it’s probably
+ * a STUN message; otherwise it’s probably data. */
+ if (stun_message_validate_buffer_length_fast (
+@@ -3715,6 +3713,7 @@ agent_recv_message_unlocked (
+ nice_debug ("%s: Valid STUN packet received.", G_STRFUNC);
+ retval = RECV_OOB;
+ g_free (big_buf);
++ agent->media_after_tick = TRUE;
+ goto done;
+ }
+ }
+@@ -3725,6 +3724,23 @@ agent_recv_message_unlocked (
+ g_free (big_buf);
+ }
+
++ if (!nice_component_verify_remote_candidate (component,
++ message->from, nicesock)) {
++ if (nice_debug_is_verbose ()) {
++ gchar str[INET6_ADDRSTRLEN];
++
++ nice_address_to_string (message->from, str);
++ nice_debug_verbose ("Agent %p : %d:%d DROPPING packet from unknown source"
++ " %s:%d sock-type: %d\n", agent, stream->id, component->id, str,
++ nice_address_get_port (message->from), nicesock->type);
++ }
++
++ retval = RECV_OOB;
++ goto done;
++ }
++
++ agent->media_after_tick = TRUE;
++
+ /* Unhandled STUN; try handling TCP data, then pass to the client. */
+ if (message->length > 0 && agent->reliable) {
+ if (!nice_socket_is_reliable (nicesock) &&
+diff --git a/agent/component.c b/agent/component.c
+index a679b30..ba28ffa 100644
+--- a/agent/component.c
++++ b/agent/component.c
+@@ -435,6 +435,8 @@ nice_component_update_selected_pair (NiceComponent *component, const CandidatePa
+ component->selected_pair.remote = pair->remote;
+ component->selected_pair.priority = pair->priority;
+ component->selected_pair.prflx_priority = pair->prflx_priority;
++
++ nice_component_add_valid_candidate (component, pair->remote);
+ }
+
+ /*
+@@ -514,6 +516,11 @@ nice_component_set_selected_remote_candidate (NiceComponent *component,
+ component->selected_pair.remote = remote;
+ component->selected_pair.priority = priority;
+
++ /* Get into fallback mode where packets from any source is accepted once
++ * this has been called. This is the expected behavior of pre-ICE SIP.
++ */
++ component->fallback_mode = TRUE;
++
+ return local;
+ }
+
+@@ -1107,6 +1114,9 @@ nice_component_finalize (GObject *obj)
+ g_warn_if_fail (cmp->remote_candidates == NULL);
+ g_warn_if_fail (cmp->incoming_checks == NULL);
+
++ g_list_free_full (cmp->valid_candidates,
++ (GDestroyNotify) nice_candidate_free);
++
+ g_clear_object (&cmp->tcp);
+ g_clear_object (&cmp->stop_cancellable);
+ g_clear_object (&cmp->iostream);
+@@ -1421,3 +1431,83 @@ turn_server_unref (TurnServer *turn)
+ g_slice_free (TurnServer, turn);
+ }
+ }
++
++void
++nice_component_add_valid_candidate (NiceComponent *component,
++ const NiceCandidate *candidate)
++{
++ guint count = 0;
++ GList *item, *last = NULL;
++
++ for (item = component->valid_candidates; item; item = item->next) {
++ NiceCandidate *cand = item->data;
++
++ last = item;
++ count++;
++ if (nice_candidate_equal_target (cand, candidate))
++ return;
++ }
++
++ /* New candidate */
++
++ if (nice_debug_is_enabled ()) {
++ char str[INET6_ADDRSTRLEN];
++ nice_address_to_string (&candidate->addr, str);
++ nice_debug ("Agent %p : %d:%d Adding valid source"
++ " candidate: %s:%d trans: %d\n", component->agent,
++ candidate->stream_id, candidate->component_id, str,
++ nice_address_get_port (&candidate->addr), candidate->transport);
++ }
++
++ component->valid_candidates = g_list_prepend (
++ component->valid_candidates, nice_candidate_copy (candidate));
++
++ /* Delete the last one to make sure we don't have a list that is too long,
++ * the candidates are not freed on ICE restart as this would be more complex,
++ * we just keep the list not too long.
++ */
++ if (count > NICE_COMPONENT_MAX_VALID_CANDIDATES) {
++ NiceCandidate *cand = last->data;
++
++ component->valid_candidates = g_list_delete_link (
++ component->valid_candidates, last);
++ nice_candidate_free (cand);
++ }
++}
++
++gboolean
++nice_component_verify_remote_candidate (NiceComponent *component,
++ const NiceAddress *address, NiceSocket *nicesock)
++{
++ GList *item;
++
++ if (component->fallback_mode)
++ return TRUE;
++
++ for (item = component->valid_candidates; item; item = item->next) {
++ NiceCandidate *cand = item->data;
++
++ if (((nicesock->type == NICE_SOCKET_TYPE_TCP_BSD &&
++ (cand->transport == NICE_CANDIDATE_TRANSPORT_TCP_ACTIVE ||
++ cand->transport == NICE_CANDIDATE_TRANSPORT_TCP_PASSIVE ||
++ cand->transport == NICE_CANDIDATE_TRANSPORT_TCP_SO)) ||
++ cand->transport == NICE_CANDIDATE_TRANSPORT_UDP) &&
++ nice_address_equal (address, &cand->addr)) {
++ /* fast return if it's already the first */
++ if (item == component->valid_candidates)
++ return TRUE;
++
++ /* Put the current candidate at the top so that in the normal use-case,
++ * this function becomes O(1).
++ */
++ component->valid_candidates = g_list_remove_link (
++ component->valid_candidates, item);
++ component->valid_candidates = g_list_concat (item,
++ component->valid_candidates);
++
++ return TRUE;
++ }
++ }
++
++ return FALSE;
++}
+diff --git a/agent/component.h b/agent/component.h
+index 6712794..a8a1222 100644
+--- a/agent/component.h
++++ b/agent/component.h
+@@ -159,12 +159,14 @@ struct _NiceComponent {
+ NiceComponentState state;
+ GSList *local_candidates; /* list of NiceCandidate objs */
+ GSList *remote_candidates; /* list of NiceCandidate objs */
++ GList *valid_candidates; /* list of owned remote NiceCandidates that are part of valid pairs */
+ GSList *socket_sources; /* list of SocketSource objs; must only grow monotonically */
+ guint socket_sources_age; /* incremented when socket_sources changes */
+ GSList *incoming_checks; /* list of IncomingCheck objs */
+ GList *turn_servers; /* List of TurnServer objs */
+ CandidatePair selected_pair; /* independent from checklists,
+ see ICE 11.1. "Sending Media" (ID-19) */
++ gboolean fallback_mode; /* in this case, accepts packets from all, ignore candidate validation */
+ NiceCandidate *restart_candidate; /* for storing active remote candidate during a restart */
+ NiceCandidate *turn_candidate; /* for storing active turn candidate if turn servers have been cleared */
+ /* I/O handling. The main context must always be non-NULL, and is used for all
+@@ -301,6 +303,14 @@ turn_server_ref (TurnServer *turn);
+ void
+ turn_server_unref (TurnServer *turn);
+
++void
++nice_component_add_valid_candidate (NiceComponent *component,
++ const NiceCandidate *candidate);
++
++gboolean
++nice_component_verify_remote_candidate (NiceComponent *component,
++ const NiceAddress *address, NiceSocket *nicesock);
++
+
+ G_END_DECLS
+
+diff --git a/agent/conncheck.c b/agent/conncheck.c
+index 1dc13dd..7ffa3db 100644
+--- a/agent/conncheck.c
++++ b/agent/conncheck.c
+@@ -2627,6 +2627,7 @@ static CandidateCheckPair *priv_process_response_check_for_reflexive(NiceAgent *
+ p->state = NICE_CHECK_SUCCEEDED;
+ nice_debug ("Agent %p : conncheck %p SUCCEEDED.", agent, p);
+ priv_conn_check_unfreeze_related (agent, stream, p);
++ nice_component_add_valid_candidate (component, remote_candidate);
+ }
+ else {
+ if (!local_cand) {
+@@ -2652,8 +2653,10 @@ static CandidateCheckPair *priv_process_response_check_for_reflexive(NiceAgent *
+
+ /* note: this is same as "adding to VALID LIST" in the spec
+ text */
+- if (new_pair)
++ if (new_pair) {
+ new_pair->valid = TRUE;
++ nice_component_add_valid_candidate (component, remote_candidate);
++ }
+
+ return new_pair;
+ }
+@@ -2739,6 +2742,7 @@ static gboolean priv_map_reply_to_conn_check_request (NiceAgent *agent, NiceStre
+ nice_debug ("Agent %p : Mapped address not found."
+ " conncheck %p SUCCEEDED.", agent, p);
+ priv_conn_check_unfreeze_related (agent, stream, p);
++ nice_component_add_valid_candidate (component, p->remote);
+ } else {
+ ok_pair = priv_process_response_check_for_reflexive (agent,
+ stream, component, p, sockptr, &sockaddr.addr,
+@@ -3654,6 +3658,8 @@ gboolean conn_check_handle_inbound_stun (NiceAgent *agent, NiceStream *stream,
+ }
+ }
+
++ nice_component_add_valid_candidate (component, remote_candidate);
++
+ priv_reply_to_conn_check (agent, stream, component, local_candidate,
+ remote_candidate, from, nicesock, rbuf_len, &msg, use_candidate);
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 7bfe075..d24a2aa 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -45,7 +45,6 @@ check_PROGRAMS = \
+ test-send-recv \
+ test-socket-is-based-on \
+ test-priority \
+- test-mainloop \
+ test-fullmode \
+ test-restart \
+ test-fallback \
+diff --git a/tests/test-mainloop.c b/tests/test-mainloop.c
+deleted file mode 100644
+index 7c52daa..0000000
+--- a/tests/test-mainloop.c
++++ /dev/null
+@@ -1,108 +0,0 @@
+-/*
+- * This file is part of the Nice GLib ICE library.
+- *
+- * (C) 2006, 2007 Collabora Ltd.
+- * Contact: Dafydd Harries
+- * (C) 2006, 2007 Nokia Corporation. All rights reserved.
+- * Contact: Kai Vehmanen
+- *
+- * The contents of this file are subject to the Mozilla Public License Version
+- * 1.1 (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- * http://www.mozilla.org/MPL/
+- *
+- * Software distributed under the License is distributed on an "AS IS" basis,
+- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+- * for the specific language governing rights and limitations under the
+- * License.
+- *
+- * The Original Code is the Nice GLib ICE library.
+- *
+- * The Initial Developers of the Original Code are Collabora Ltd and Nokia
+- * Corporation. All Rights Reserved.
+- *
+- * Contributors:
+- * Dafydd Harries, Collabora Ltd.
+- * Kai Vehmanen, Nokia
+- *
+- * Alternatively, the contents of this file may be used under the terms of the
+- * the GNU Lesser General Public License Version 2.1 (the "LGPL"), in which
+- * case the provisions of LGPL are applicable instead of those above. If you
+- * wish to allow use of your version of this file only under the terms of the
+- * LGPL and not to allow others to use your version of this file under the
+- * MPL, indicate your decision by deleting the provisions above and replace
+- * them with the notice and other provisions required by the LGPL. If you do
+- * not delete the provisions above, a recipient may use your version of this
+- * file under either the MPL or the LGPL.
+- */
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
+-
+-#include <string.h>
+-
+-#include <nice/nice.h>
+-#include "socket/socket.h"
+-
+-static GMainLoop *loop = NULL;
+-
+-static void
+-recv_cb (
+- NiceAgent *agent,
+- guint stream_id,
+- guint component_id,
+- guint len,
+- gchar *buf,
+- gpointer data)
+-{
+- g_assert (agent != NULL);
+- g_assert (stream_id == 1);
+- g_assert (component_id == 1);
+- g_assert (len == 6);
+- g_assert (0 == strncmp (buf, "\x80hello", len));
+- g_assert (42 == GPOINTER_TO_UINT (data));
+- g_main_loop_quit (loop);
+-}
+-
+-int
+-main (void)
+-{
+- NiceAgent *agent;
+- NiceAddress addr;
+- guint stream;
+-
+- nice_address_init (&addr);
+-
+- loop = g_main_loop_new (NULL, FALSE);
+-
+- agent = nice_agent_new (g_main_loop_get_context (loop), NICE_COMPATIBILITY_RFC5245);
+- nice_address_set_ipv4 (&addr, 0x7f000001);
+- nice_agent_add_local_address (agent, &addr);
+- stream = nice_agent_add_stream (agent, 1);
+- nice_agent_gather_candidates (agent, stream);
+-
+- // attach to default main context
+- nice_agent_attach_recv (agent, stream, NICE_COMPONENT_TYPE_RTP,
+- g_main_loop_get_context (loop), recv_cb, GUINT_TO_POINTER (42));
+-
+- {
+- NiceCandidate *candidate;
+- GSList *candidates, *i;
+-
+- candidates = nice_agent_get_local_candidates (agent, 1, 1);
+- candidate = candidates->data;
+-
+- nice_socket_send (candidate->sockptr, &(candidate->addr), 6, "\x80hello");
+- for (i = candidates; i; i = i->next)
+- nice_candidate_free ((NiceCandidate *) i->data);
+- g_slist_free (candidates);
+- }
+-
+- g_main_loop_run (loop);
+-
+- nice_agent_remove_stream (agent, stream);
+- g_object_unref (agent);
+-
+- return 0;
+-}
+-
+--
+2.13.6
+
+
+From 8fc22b0034d04cbc222e0637152b1cee2879eef3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete(a)collabora.com>
+Date: Wed, 5 Apr 2017 17:43:26 -0400
+Subject: [PATCH 14/70] tests_: Add test to verify that only packets from
+ validated addresses pass
+
+https://phabricator.freedesktop.org/T104
+
+Reviewed-by: Philip Withnall <philip.withnall(a)collabora.co.uk>
+Differential Revision: https://phabricator.freedesktop.org/D1717
+---
+ tests/Makefile.am | 5 +-
+ tests/test-drop-invalid.c | 517 ++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 521 insertions(+), 1 deletion(-)
+ create mode 100644 tests/test-drop-invalid.c
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index d24a2aa..62d5d64 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -54,7 +54,8 @@ check_PROGRAMS = \
+ test-tcp \
+ test-icetcp \
+ test-credentials \
+- test-turn
++ test-turn \
++ test-drop-invalid
+
+ dist_check_SCRIPTS = \
+ check-test-fullmode-with-stun.sh \
+@@ -128,6 +129,8 @@ test_credentials_LDADD = $(COMMON_LDADD)
+
+ test_turn_LDADD = $(COMMON_LDADD)
+
++test_drop_invalid_LDADD = $(COMMON_LDADD)
++
+ test_gstreamer_CFLAGS = $(AM_CFLAGS) $(GST_CHECK_CFLAGS)
+ test_gstreamer_LDADD = -lnice -L$(top_builddir)/nice/.libs $(GLIB_LIBS) $(GUPNP_LIBS) $(GST_CHECK_LIBS) $(GST_LIBS)
+
+diff --git a/tests/test-drop-invalid.c b/tests/test-drop-invalid.c
+new file mode 100644
+index 0000000..97e3586
+--- /dev/null
++++ b/tests/test-drop-invalid.c
+@@ -0,0 +1,517 @@
++/*
++ * This file is part of the Nice GLib ICE library.
++ *
++ * Unit test for ICE full-mode related features.
++ *
++ * (C) 2007 Nokia Corporation. All rights reserved.
++ * Contact: Kai Vehmanen
++ * (C) 2017 Collabora Ltd
++ * Contact: Olivier Crete <olivier.crete(a)collabora.com>
++ *
++ * The contents of this file are subject to the Mozilla Public License Version
++ * 1.1 (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ * http://www.mozilla.org/MPL/
++ *
++ * Software distributed under the License is distributed on an "AS IS" basis,
++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++ * for the specific language governing rights and limitations under the
++ * License.
++ *
++ * The Original Code is the Nice GLib ICE library.
++ *
++ * The Initial Developers of the Original Code are Collabora Ltd and Nokia
++ * Corporation. All Rights Reserved.
++ *
++ * Contributors:
++ * Kai Vehmanen, Nokia
++ *
++ * Alternatively, the contents of this file may be used under the terms of the
++ * the GNU Lesser General Public License Version 2.1 (the "LGPL"), in which
++ * case the provisions of LGPL are applicable instead of those above. If you
++ * wish to allow use of your version of this file only under the terms of the
++ * LGPL and not to allow others to use your version of this file under the
++ * MPL, indicate your decision by deleting the provisions above and replace
++ * them with the notice and other provisions required by the LGPL. If you do
++ * not delete the provisions above, a recipient may use your version of this
++ * file under either the MPL or the LGPL.
++ */
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
++#include "agent.h"
++
++#include "socket/socket.h"
++
++#include <stdlib.h>
++#include <string.h>
++
++
++
++static NiceComponentState global_lagent_state[2] = { NICE_COMPONENT_STATE_LAST, NICE_COMPONENT_STATE_LAST };
++static NiceComponentState global_ragent_state[2] = { NICE_COMPONENT_STATE_LAST, NICE_COMPONENT_STATE_LAST };
++static guint global_components_ready = 0;
++static guint global_components_ready_exit = 0;
++static guint global_components_failed = 0;
++static guint global_components_failed_exit = 0;
++static GMainLoop *global_mainloop = NULL;
++static gboolean global_lagent_gathering_done = FALSE;
++static gboolean global_ragent_gathering_done = FALSE;
++static gboolean global_lagent_ibr_received = FALSE;
++static gboolean global_ragent_ibr_received = FALSE;
++static int global_lagent_cands = 0;
++static int global_ragent_cands = 0;
++static gint global_ragent_read = 0;
++static guint global_exit_when_ibr_received = 0;
++
++static void priv_print_global_status (void)
++{
++ g_debug ("\tgathering_done=%d", global_lagent_gathering_done && global_ragent_gathering_done);
++ g_debug ("\tlstate[rtp]=%d [rtcp]=%d", global_lagent_state[0], global_lagent_state[1]);
++ g_debug ("\trstate[rtp]=%d [rtcp]=%d", global_ragent_state[0], global_ragent_state[1]);
++ g_debug ("\tL cands=%d R cands=%d", global_lagent_cands, global_ragent_cands);
++}
++
++static gboolean timer_cb (gpointer pointer)
++{
++ g_debug ("test-drop-invalid:%s: %p", G_STRFUNC, pointer);
++
++ /* signal status via a global variable */
++
++ /* note: should not be reached, abort */
++ g_error ("ERROR: test has got stuck, aborting...");
++
++ return FALSE;
++}
++
++static void cb_nice_recv (NiceAgent *agent, guint stream_id, guint component_id, guint len, gchar *buf, gpointer user_data)
++{
++ g_debug ("test-drop-invalid:%s: %p", G_STRFUNC, user_data);
++
++ /* XXX: dear compiler, these are for you: */
++ (void)agent; (void)stream_id; (void)component_id; (void)buf;
++
++ /* Core of the test
++ * Assert on any unreleated packet received. This would include anything
++ * send before the negotiation is over.
++ */
++ g_assert (len == 16);
++ g_assert (strncmp ("1234567812345678", buf, 16) == 0);
++
++ if (component_id == 2)
++ return;
++
++ if (GPOINTER_TO_UINT (user_data) == 2) {
++ g_debug ("right agent received %d bytes, stopping mainloop", len);
++ global_ragent_read = len;
++ g_main_loop_quit (global_mainloop);
++ }
++}
++
++static void cb_candidate_gathering_done(NiceAgent *agent, guint stream_id, gpointer data)
++{
++ g_debug ("test-drop-invalid:%s: %p", G_STRFUNC, data);
++
++ if (GPOINTER_TO_UINT (data) == 1)
++ global_lagent_gathering_done = TRUE;
++ else if (GPOINTER_TO_UINT (data) == 2)
++ global_ragent_gathering_done = TRUE;
++
++ if (global_lagent_gathering_done &&
++ global_ragent_gathering_done)
++ g_main_loop_quit (global_mainloop);
++
++ /* XXX: dear compiler, these are for you: */
++ (void)agent;
++}
++
++static void cb_component_state_changed (NiceAgent *agent, guint stream_id, guint component_id, guint state, gpointer data)
++{
++ gboolean ready_to_connected = FALSE;
++ g_debug ("test-drop-invalid:%s: %p", G_STRFUNC, data);
++
++ if (GPOINTER_TO_UINT (data) == 1) {
++ if (global_lagent_state[component_id - 1] == NICE_COMPONENT_STATE_READY &&
++ state == NICE_COMPONENT_STATE_CONNECTED)
++ ready_to_connected = TRUE;
++ global_lagent_state[component_id - 1] = state;
++ } else if (GPOINTER_TO_UINT (data) == 2) {
++ if (global_ragent_state[component_id - 1] == NICE_COMPONENT_STATE_READY &&
++ state == NICE_COMPONENT_STATE_CONNECTED)
++ ready_to_connected = TRUE;
++ global_ragent_state[component_id - 1] = state;
++ }
++
++ if (state == NICE_COMPONENT_STATE_READY)
++ global_components_ready++;
++ else if (state == NICE_COMPONENT_STATE_CONNECTED && ready_to_connected)
++ global_components_ready--;
++ if (state == NICE_COMPONENT_STATE_FAILED)
++ global_components_failed++;
++
++ g_debug ("test-drop-invalid: checks READY/EXIT-AT %u/%u.", global_components_ready, global_components_ready_exit);
++ g_debug ("test-drop-invalid: checks FAILED/EXIT-AT %u/%u.", global_components_failed, global_components_failed_exit);
++
++ /* signal status via a global variable */
++ if (global_components_ready == global_components_ready_exit &&
++ global_components_failed == global_components_failed_exit) {
++ g_debug ("Components ready/failed achieved. Stopping mailoop");
++ g_main_loop_quit (global_mainloop);
++ return;
++ }
++
++ /* XXX: dear compiler, these are for you: */
++ (void)agent; (void)stream_id; (void)data; (void)component_id;
++}
++
++static void cb_new_selected_pair(NiceAgent *agent, guint stream_id, guint component_id,
++ gchar *lfoundation, gchar* rfoundation, gpointer data)
++{
++ g_debug ("test-drop-invalid:%s: %p", G_STRFUNC, data);
++
++ if (GPOINTER_TO_UINT (data) == 1)
++ ++global_lagent_cands;
++ else if (GPOINTER_TO_UINT (data) == 2)
++ ++global_ragent_cands;
++
++ /* XXX: dear compiler, these are for you: */
++ (void)agent; (void)stream_id; (void)component_id; (void)lfoundation; (void)rfoundation;
++}
++
++static void cb_new_candidate(NiceAgent *agent, guint stream_id, guint component_id,
++ gchar *foundation, gpointer data)
++{
++ g_debug ("test-drop-invalid:%s: %p", G_STRFUNC, data);
++
++ /* XXX: dear compiler, these are for you: */
++ (void)agent; (void)stream_id; (void)data; (void)component_id; (void)foundation;
++}
++
++static void cb_initial_binding_request_received(NiceAgent *agent, guint stream_id, gpointer data)
++{
++ g_debug ("test-drop-invalid:%s: %p", G_STRFUNC, data);
++
++ if (GPOINTER_TO_UINT (data) == 1)
++ global_lagent_ibr_received = TRUE;
++ else if (GPOINTER_TO_UINT (data) == 2)
++ global_ragent_ibr_received = TRUE;
++
++ if (global_exit_when_ibr_received) {
++ g_debug ("Received initial binding request. Stopping mailoop");
++ g_main_loop_quit (global_mainloop);
++ }
++
++ /* XXX: dear compiler, these are for you: */
++ (void)agent; (void)stream_id; (void)data;
++}
++
++static void set_candidates (NiceAgent *from, guint from_stream,
++ NiceAgent *to, guint to_stream, guint component)
++{
++ GSList *cands = NULL;
++ GSList *peer_cands = NULL;
++ GSList *item1, *item2;
++
++ cands = nice_agent_get_local_candidates (from, from_stream, component);
++ peer_cands = nice_agent_get_local_candidates (to, to_stream, component);
++
++ /*
++ * Core of the test:
++ *
++ * Send packets that shoudl be dropped.
++ */
++
++ for (item1 = cands; item1; item1 = item1->next) {
++ NiceCandidate *cand = item1->data;
++ NiceSocket *nicesock = cand->sockptr;
++
++ g_assert (nicesock);
++
++ for (item2 = peer_cands; item2; item2 = item2->next) {
++ NiceCandidate *target_cand = item2->data;
++
++ nice_socket_send (nicesock, &target_cand->addr, 12, "123456789AB");
++ }
++
++ }
++
++ nice_agent_set_remote_candidates (to, to_stream, component, cands);
++
++ g_slist_free_full (cands, (GDestroyNotify) nice_candidate_free);
++ g_slist_free_full (peer_cands, (GDestroyNotify) nice_candidate_free);
++}
++
++static void set_credentials (NiceAgent *lagent, guint lstream,
++ NiceAgent *ragent, guint rstream)
++{
++ gchar *ufrag = NULL, *password = NULL;
++
++ nice_agent_get_local_credentials(lagent, lstream, &ufrag, &password);
++ nice_agent_set_remote_credentials (ragent, rstream, ufrag, password);
++ g_free (ufrag);
++ g_free (password);
++ nice_agent_get_local_credentials(ragent, rstream, &ufrag, &password);
++ nice_agent_set_remote_credentials (lagent, lstream, ufrag, password);
++ g_free (ufrag);
++ g_free (password);
++}
++
++static int run_full_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress *baseaddr, guint ready, guint failed)
++{
++ guint ls_id, rs_id;
++ gint ret;
++
++ /* XXX: dear compiler, this is for you */
++ (void)baseaddr;
++
++ /* step: initialize variables modified by the callbacks */
++ global_components_ready = 0;
++ global_components_ready_exit = ready;
++ global_components_failed = 0;
++ global_components_failed_exit = failed;
++ global_lagent_gathering_done = FALSE;
++ global_ragent_gathering_done = FALSE;
++ global_lagent_ibr_received =
++ global_ragent_ibr_received = FALSE;
++ global_lagent_cands =
++ global_ragent_cands = 0;
++
++ g_object_set (G_OBJECT (lagent), "controlling-mode", TRUE, NULL);
++ g_object_set (G_OBJECT (ragent), "controlling-mode", FALSE, NULL);
++
++ /* step: add one stream, with RTP+RTCP components, to each agent */
++ ls_id = nice_agent_add_stream (lagent, 2);
++
++ rs_id = nice_agent_add_stream (ragent, 2);
++ g_assert (ls_id > 0);
++ g_assert (rs_id > 0);
++
++ /* Gather candidates and test nice_agent_set_port_range */
++ nice_agent_set_port_range (lagent, ls_id, 1, 10000, 10000);
++ nice_agent_set_port_range (lagent, ls_id, 2, 10001, 10001);
++ nice_agent_set_port_range (ragent, rs_id, 1, 12345, 12345);
++ nice_agent_set_port_range (ragent, rs_id, 2, 10000, 10001);
++ g_assert (nice_agent_gather_candidates (lagent, ls_id) == TRUE);
++ g_assert (nice_agent_gather_candidates (ragent, rs_id) == FALSE);
++ g_assert (nice_agent_get_local_candidates (ragent, rs_id, 1) == NULL);
++ g_assert (nice_agent_get_local_candidates (ragent, rs_id, 2) == NULL);
++ nice_agent_set_port_range (ragent, rs_id, 2, 10000, 10002);
++ g_assert (nice_agent_gather_candidates (ragent, rs_id) == TRUE);
++
++ {
++ GSList *cands = NULL, *i;
++ NiceCandidate *cand = NULL;
++
++ cands = nice_agent_get_local_candidates (lagent, ls_id, 1);
++ g_assert (g_slist_length (cands) == 1);
++ cand = cands->data;
++ g_assert (cand->type == NICE_CANDIDATE_TYPE_HOST);
++ g_assert (nice_address_get_port (&cand->addr) == 10000);
++ for (i = cands; i; i = i->next)
++ nice_candidate_free ((NiceCandidate *) i->data);
++ g_slist_free (cands);
++
++ cands = nice_agent_get_local_candidates (lagent, ls_id, 2);
++ g_assert (g_slist_length (cands) == 1);
++ cand = cands->data;
++ g_assert (cand->type == NICE_CANDIDATE_TYPE_HOST);
++ g_assert (nice_address_get_port (&cand->addr) == 10001);
++ for (i = cands; i; i = i->next)
++ nice_candidate_free ((NiceCandidate *) i->data);
++ g_slist_free (cands);
++
++ cands = nice_agent_get_local_candidates (ragent, rs_id, 1);
++ g_assert (g_slist_length (cands) == 1);
++ cand = cands->data;
++ g_assert (cand->type == NICE_CANDIDATE_TYPE_HOST);
++ g_assert (nice_address_get_port (&cand->addr) == 12345);
++ for (i = cands; i; i = i->next)
++ nice_candidate_free ((NiceCandidate *) i->data);
++ g_slist_free (cands);
++
++ cands = nice_agent_get_local_candidates (ragent, rs_id, 2);
++ g_assert (g_slist_length (cands) == 1);
++ cand = cands->data;
++ g_assert (cand->type == NICE_CANDIDATE_TYPE_HOST);
++ g_assert (nice_address_get_port (&cand->addr) == 10002);
++ for (i = cands; i; i = i->next)
++ nice_candidate_free ((NiceCandidate *) i->data);
++ g_slist_free (cands);
++
++ }
++
++ /* step: attach to mainloop (needed to register the fds) */
++ nice_agent_attach_recv (lagent, ls_id, NICE_COMPONENT_TYPE_RTP,
++ g_main_loop_get_context (global_mainloop), cb_nice_recv,
++ GUINT_TO_POINTER (1));
++ nice_agent_attach_recv (lagent, ls_id, NICE_COMPONENT_TYPE_RTCP,
++ g_main_loop_get_context (global_mainloop), cb_nice_recv,
++ GUINT_TO_POINTER (1));
++ nice_agent_attach_recv (ragent, rs_id, NICE_COMPONENT_TYPE_RTP,
++ g_main_loop_get_context (global_mainloop), cb_nice_recv,
++ GUINT_TO_POINTER (2));
++ nice_agent_attach_recv (ragent, rs_id, NICE_COMPONENT_TYPE_RTCP,
++ g_main_loop_get_context (global_mainloop), cb_nice_recv,
++ GUINT_TO_POINTER (2));
++
++ /* step: run mainloop until local candidates are ready
++ * (see timer_cb() above) */
++ if (global_lagent_gathering_done != TRUE ||
++ global_ragent_gathering_done != TRUE) {
++ g_debug ("test-drop-invalid: Added streams, running mainloop until 'candidate-gathering-done'...");
++ g_main_loop_run (global_mainloop);
++ g_assert (global_lagent_gathering_done == TRUE);
++ g_assert (global_ragent_gathering_done == TRUE);
++ }
++
++ set_credentials (lagent, ls_id, ragent, rs_id);
++
++ /* step: pass the remote candidates to agents */
++ set_candidates (ragent, rs_id, lagent, ls_id, NICE_COMPONENT_TYPE_RTP);
++ set_candidates (ragent, rs_id, lagent, ls_id, NICE_COMPONENT_TYPE_RTCP);
++ set_candidates (lagent, ls_id, ragent, rs_id, NICE_COMPONENT_TYPE_RTP);
++ set_candidates (lagent, ls_id, ragent, rs_id, NICE_COMPONENT_TYPE_RTCP);
++
++ g_debug ("test-drop-invalid: Set properties, next running mainloop until connectivity checks succeed...");
++
++ /* step: run the mainloop until connectivity checks succeed
++ * (see timer_cb() above) */
++ g_main_lo