|
[-]
[+]
|
Changed |
openvswitch-dpdk.spec
|
|
|
|
[-]
[+]
|
Changed |
openvswitch.spec
^
|
|
|
|
[-]
[+]
|
Added |
0001-dhparams-Add-pregenerated-.c-file-to-the-repository.patch
^
|
| @@ -0,0 +1,295 @@
+From 1d6245ace4ebb341ab0fb0730d8b773fade792f5 Mon Sep 17 00:00:00 2001
+From: Eneas U de Queiroz <cote2004-github@yahoo.com>
+Date: Tue, 5 Jun 2018 15:25:42 -0700
+Subject: [PATCH] dhparams: Add pregenerated .c file to the repository.
+
+The version of dhparams.c generated by any given version of OpenSSL or
+LibreSSL might work only with that version of the library. This can be
+inconvenient for cross-compiling if the "openssl" program on the build
+machine has a different version from the library on the host where OVS will
+run, since it could generate code that won't compile.
+
+This commit fixes the problem by generating dhparams.c that works on the
+currently important versions of OpenSSL and LibreSSL.
+
+Submitted-at: https://github.com/openvswitch/ovs/pull/235
+Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
+Signed-off-by: Ben Pfaff <blp@ovn.org>
+---
+ build-aux/generate-dhparams-c | 32 ++++++
+ lib/automake.mk | 17 +--
+ lib/dhparams.c | 192 ++++++++++++++++++++++++++++++++++
+ 4 files changed, 233 insertions(+), 9 deletions(-)
+ create mode 100755 build-aux/generate-dhparams-c
+ create mode 100644 lib/dhparams.c
+
+diff --git a/build-aux/generate-dhparams-c b/build-aux/generate-dhparams-c
+new file mode 100755
+index 000000000..5d5bba213
+--- /dev/null
++++ b/build-aux/generate-dhparams-c
+@@ -0,0 +1,33 @@
++#! /bin/sh -e
++
++cat <<'EOF'
++/* Generated automatically; do not modify! -*- buffer-read-only: t -*-
++ *
++ * If you do need to regenerate this file, run "make generate-dhparams-c". */
++
++#include <config.h>
++#include "lib/dhparams.h"
++#include "openvswitch/util.h"
++#include "lib/util.h"
++
++static int
++my_DH_set0_pqg(DH *dh, BIGNUM *p, const BIGNUM **q OVS_UNUSED, BIGNUM *g)
++{
++ ovs_assert(q == NULL);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
++ dh->p = p;
++ dh->g = g;
++ return 1;
++#else
++ return DH_set0_pqg(dh, p, NULL, g);
++#endif
++}
++EOF
++(openssl dhparam -C -in lib/dh1024.pem -noout &&
++openssl dhparam -C -in lib/dh2048.pem -noout &&
++openssl dhparam -C -in lib/dh4096.pem -noout) | sed '
++ s/\(get_dh[0-9]*\)()/\1(void)/
++ s/\(DH_set0_pqg\)/my_\1/
++ s/[ ]*$//
++ s/ / /g
++'
+diff --git a/lib/automake.mk b/lib/automake.mk
+index 338d2db68..7fb198370 100644
+--- a/lib/automake.mk
++++ b/lib/automake.mk
+@@ -399,15 +399,16 @@ lib_libopenvswitch_la_SOURCES += \
+ lib/route-table-bsd.c
+ endif
+
++.PHONY: generate-dhparams-c
+ if HAVE_OPENSSL
+-lib_libopenvswitch_la_SOURCES += lib/stream-ssl.c
+-nodist_lib_libopenvswitch_la_SOURCES += lib/dhparams.c
+-lib/dhparams.c: lib/dh1024.pem lib/dh2048.pem lib/dh4096.pem
+- $(AM_V_GEN)(echo '#include "lib/dhparams.h"' && \
+- openssl dhparam -C -in $(srcdir)/lib/dh1024.pem -noout && \
+- openssl dhparam -C -in $(srcdir)/lib/dh2048.pem -noout && \
+- openssl dhparam -C -in $(srcdir)/lib/dh4096.pem -noout) \
+- | sed 's/\(get_dh[0-9]*\)()/\1(void)/' > lib/dhparams.c.tmp && \
++lib_libopenvswitch_la_SOURCES += lib/stream-ssl.c lib/dhparams.c
++
++# Manually regenerates lib/dhparams.c. Not normally necessary since
++# lib/dhparams.c is part of the repository and doesn't normally need
++# updates.
++generate-dhparams-c:
++ $(AM_V_GEN)cd $(srcdir) && \
++ build-aux/generate-dhparams-c > lib/dhparams.c.tmp && \
+ mv lib/dhparams.c.tmp lib/dhparams.c
+ else
+ lib_libopenvswitch_la_SOURCES += lib/stream-nossl.c
+diff --git a/lib/dhparams.c b/lib/dhparams.c
+new file mode 100644
+index 000000000..903bf1f35
+--- /dev/null
++++ b/lib/dhparams.c
+@@ -0,0 +1,193 @@
++/* Generated automatically; do not modify! -*- buffer-read-only: t -*-
++ *
++ * If you do need to regenerate this file, run "make generate-dhparams-c". */
++
++#include <config.h>
++#include "lib/dhparams.h"
++#include "openvswitch/util.h"
++#include "lib/util.h"
++
++static int
++my_DH_set0_pqg(DH *dh, BIGNUM *p, const BIGNUM **q OVS_UNUSED, BIGNUM *g)
++{
++ ovs_assert(q == NULL);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
++ dh->p = p;
++ dh->g = g;
++ return 1;
++#else
++ return DH_set0_pqg(dh, p, NULL, g);
++#endif
++}
++#ifndef HEADER_DH_H
++# include <openssl/dh.h>
++#endif
++
++DH *get_dh1024(void)
++{
++ static unsigned char dhp_1024[] = {
++ 0xF4, 0x88, 0xFD, 0x58, 0x4E, 0x49, 0xDB, 0xCD, 0x20, 0xB4,
++ 0x9D, 0xE4, 0x91, 0x07, 0x36, 0x6B, 0x33, 0x6C, 0x38, 0x0D,
++ 0x45, 0x1D, 0x0F, 0x7C, 0x88, 0xB3, 0x1C, 0x7C, 0x5B, 0x2D,
++ 0x8E, 0xF6, 0xF3, 0xC9, 0x23, 0xC0, 0x43, 0xF0, 0xA5, 0x5B,
++ 0x18, 0x8D, 0x8E, 0xBB, 0x55, 0x8C, 0xB8, 0x5D, 0x38, 0xD3,
++ 0x34, 0xFD, 0x7C, 0x17, 0x57, 0x43, 0xA3, 0x1D, 0x18, 0x6C,
++ 0xDE, 0x33, 0x21, 0x2C, 0xB5, 0x2A, 0xFF, 0x3C, 0xE1, 0xB1,
++ 0x29, 0x40, 0x18, 0x11, 0x8D, 0x7C, 0x84, 0xA7, 0x0A, 0x72,
++ 0xD6, 0x86, 0xC4, 0x03, 0x19, 0xC8, 0x07, 0x29, 0x7A, 0xCA,
++ 0x95, 0x0C, 0xD9, 0x96, 0x9F, 0xAB, 0xD0, 0x0A, 0x50, 0x9B,
++ 0x02, 0x46, 0xD3, 0x08, 0x3D, 0x66, 0xA4, 0x5D, 0x41, 0x9F,
++ 0x9C, 0x7C, 0xBD, 0x89, 0x4B, 0x22, 0x19, 0x26, 0xBA, 0xAB,
++ 0xA2, 0x5E, 0xC3, 0x55, 0xE9, 0x2F, 0x78, 0xC7
++ };
++ static unsigned char dhg_1024[] = {
++ 0x02
++ };
++ DH *dh = DH_new();
++ BIGNUM *dhp_bn, *dhg_bn;
++
++ if (dh == NULL)
++ return NULL;
++ dhp_bn = BN_bin2bn(dhp_1024, sizeof (dhp_1024), NULL);
++ dhg_bn = BN_bin2bn(dhg_1024, sizeof (dhg_1024), NULL);
++ if (dhp_bn == NULL || dhg_bn == NULL
++ || !my_DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) {
++ DH_free(dh);
++ BN_free(dhp_bn);
++ BN_free(dhg_bn);
++ return NULL;
++ }
++ return dh;
++}
++#ifndef HEADER_DH_H
++# include <openssl/dh.h>
++#endif
++
++DH *get_dh2048(void)
++{
++ static unsigned char dhp_2048[] = {
++ 0xF6, 0x42, 0x57, 0xB7, 0x08, 0x7F, 0x08, 0x17, 0x72, 0xA2,
++ 0xBA, 0xD6, 0xA9, 0x42, 0xF3, 0x05, 0xE8, 0xF9, 0x53, 0x11,
++ 0x39, 0x4F, 0xB6, 0xF1, 0x6E, 0xB9, 0x4B, 0x38, 0x20, 0xDA,
++ 0x01, 0xA7, 0x56, 0xA3, 0x14, 0xE9, 0x8F, 0x40, 0x55, 0xF3,
++ 0xD0, 0x07, 0xC6, 0xCB, 0x43, 0xA9, 0x94, 0xAD, 0xF7, 0x4C,
++ 0x64, 0x86, 0x49, 0xF8, 0x0C, 0x83, 0xBD, 0x65, 0xE9, 0x17,
++ 0xD4, 0xA1, 0xD3, 0x50, 0xF8, 0xF5, 0x59, 0x5F, 0xDC, 0x76,
++ 0x52, 0x4F, 0x3D, 0x3D, 0x8D, 0xDB, 0xCE, 0x99, 0xE1, 0x57,
++ 0x92, 0x59, 0xCD, 0xFD, 0xB8, 0xAE, 0x74, 0x4F, 0xC5, 0xFC,
++ 0x76, 0xBC, 0x83, 0xC5, 0x47, 0x30, 0x61, 0xCE, 0x7C, 0xC9,
++ 0x66, 0xFF, 0x15, 0xF9, 0xBB, 0xFD, 0x91, 0x5E, 0xC7, 0x01,
++ 0xAA, 0xD3, 0x5B, 0x9E, 0x8D, 0xA0, 0xA5, 0x72, 0x3A, 0xD4,
++ 0x1A, 0xF0, 0xBF, 0x46, 0x00, 0x58, 0x2B, 0xE5, 0xF4, 0x88,
++ 0xFD, 0x58, 0x4E, 0x49, 0xDB, 0xCD, 0x20, 0xB4, 0x9D, 0xE4,
++ 0x91, 0x07, 0x36, 0x6B, 0x33, 0x6C, 0x38, 0x0D, 0x45, 0x1D,
++ 0x0F, 0x7C, 0x88, 0xB3, 0x1C, 0x7C, 0x5B, 0x2D, 0x8E, 0xF6,
++ 0xF3, 0xC9, 0x23, 0xC0, 0x43, 0xF0, 0xA5, 0x5B, 0x18, 0x8D,
++ 0x8E, 0xBB, 0x55, 0x8C, 0xB8, 0x5D, 0x38, 0xD3, 0x34, 0xFD,
++ 0x7C, 0x17, 0x57, 0x43, 0xA3, 0x1D, 0x18, 0x6C, 0xDE, 0x33,
++ 0x21, 0x2C, 0xB5, 0x2A, 0xFF, 0x3C, 0xE1, 0xB1, 0x29, 0x40,
++ 0x18, 0x11, 0x8D, 0x7C, 0x84, 0xA7, 0x0A, 0x72, 0xD6, 0x86,
++ 0xC4, 0x03, 0x19, 0xC8, 0x07, 0x29, 0x7A, 0xCA, 0x95, 0x0C,
++ 0xD9, 0x96, 0x9F, 0xAB, 0xD0, 0x0A, 0x50, 0x9B, 0x02, 0x46,
++ 0xD3, 0x08, 0x3D, 0x66, 0xA4, 0x5D, 0x41, 0x9F, 0x9C, 0x7C,
++ 0xBD, 0x89, 0x4B, 0x22, 0x19, 0x26, 0xBA, 0xAB, 0xA2, 0x5E,
++ 0xC3, 0x55, 0xE9, 0x32, 0x0B, 0x3B
++ };
++ static unsigned char dhg_2048[] = {
++ 0x02
++ };
++ DH *dh = DH_new();
++ BIGNUM *dhp_bn, *dhg_bn;
|
|
[-]
[+]
|
Added |
openvswitch-2.5.12.tar.gz/.ci
^
|
| +(directory)
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/.ci/build.sh
^
|
| (renamed from .travis/build.sh)
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/.ci/prepare.sh
^
|
| (renamed from .travis/prepare.sh)
|
|
[-]
[+]
|
Added |
openvswitch-2.5.12.tar.gz/.github
^
|
| +(directory)
|
|
[-]
[+]
|
Added |
openvswitch-2.5.12.tar.gz/.github/workflows
^
|
| +(directory)
|
|
[-]
[+]
|
Added |
openvswitch-2.5.12.tar.gz/.github/workflows/build-and-test.yml
^
|
| @@ -0,0 +1,105 @@
+name: Build and Test
+
+on: [push, pull_request]
+
+jobs:
+ build-linux:
+ env:
+ dependencies: |
+ automake libtool gcc bc \
+ libssl-dev llvm-dev gcc-multilib
+ CC: ${{ matrix.compiler }}
+ DPDK: ${{ matrix.dpdk }}
+ KERNEL: ${{ matrix.kernel }}
+ LIBS: ${{ matrix.libs }}
+ BUILD_ENV: ${{ matrix.build_env }}
+ OPTS: ${{ matrix.opts }}
+ TESTSUITE: ${{ matrix.testsuite }}
+
+ name: linux ${{ join(matrix.*, ' ') }}
+ runs-on: ubuntu-16.04
+ timeout-minutes: 30
+
+ strategy:
+ fail-fast: false
+ matrix:
+ compiler: [gcc, clang]
+ kernel: ['4.3.5', '4.1.17', '3.18.26', '3.14.60',
+ '3.12.53', '3.10.96', '3.4.110', '3.2.76']
+ opts: ['']
+ testsuite: ['']
+ dpdk: ['']
+ build_env: ['']
+ include:
+ - compiler: gcc
+ opts: --disable-ssl
+ - compiler: clang
+ opts: --disable-ssl
+
+ - compiler: gcc
+ testsuite: test
+ kernel: 3.18.1
+ - compiler: clang
+ testsuite: test
+ kernel: 3.18.1
+
+ - compiler: gcc
+ testsuite: test
+ opts: --enable-shared
+ - compiler: clang
+ testsuite: test
+ opts: --enable-shared
+
+ - compiler: gcc
+ dpdk: dpdk
+ kernel: 3.17.7
+ - compiler: clang
+ dpdk: dpdk
+ kernel: 3.17.7
+
+ - compiler: gcc
+ dpdk: dpdk
+ kernel: 3.17.7
+ opts: --enable-shared
+ - compiler: clang
+ dpdk: dpdk
+ kernel: 3.17.7
+ opts: --enable-shared
+
+ - compiler: gcc
+ build_env: -m32
+ opts: --disable-ssl
+
+ steps:
+ - name: checkout
+ uses: actions/checkout@v2
+
+ - name: update APT cache
+ run: sudo apt update || true
+ - name: install common dependencies
+ run: sudo apt install -y ${{ env.dependencies }}
+
+ - name: prepare
+ run: ./.ci/prepare.sh
+
+ - name: build
+ run: PATH="$PATH:$HOME/bin" ./.ci/build.sh ${{ env.OPTS }}
+
+ - name: copy logs on failure
+ if: failure() || cancelled()
+ run: |
+ # upload-artifact@v2 throws exceptions if it tries to upload socket
+ # files and we could have some socket files in testsuite.dir.
+ # Also, upload-artifact@v2 doesn't work well enough with wildcards.
+ # So, we're just archiving everything here to avoid any issues.
+ mkdir logs
+ cp config.log ./logs/
+ cp -r ./*/_build/sub/tests/testsuite.* ./logs/ || true
+ tar -czvf logs.tgz logs/
+
+ - name: upload logs on failure
+ if: failure() || cancelled()
+ uses: actions/upload-artifact@v2
+ with:
+ name: logs-linux-${{ join(matrix.*, '-') }}
+ path: logs.tgz
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/AUTHORS
^
|
| @@ -339,6 +339,7 @@
Kris zhang zhang.kris@gmail.com
Krishna Miriyala krishna@nicira.com
Len Gao leng@vmware.com
+Linhaifeng haifeng.lin@huawei.com
Logan Rosen logatronico@gmail.com
Luca Falavigna dktrkranz@debian.org
Luiz Henrique Ozaki luiz.ozaki@gmail.com
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/CONTRIBUTING.md
^
|
| @@ -47,11 +47,9 @@
- A patch that modifies xenserver code should be tested on
XenServer before submission.
-If you are using GitHub, then you may utilize the travis-ci.org CI build
-system by linking your GitHub repository to it. This will run some of
-the above tests automatically when you push changes to your repository.
-See the "Continuous Integration with Travis-CI" in the [INSTALL.md] file
-for details on how to set it up.
+If you are using GitHub, then you may utilize the GitHub Actions CI build
+system. It will run some of the above tests automatically when you push
+changes to your repository.
Email Subject
-------------
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/INSTALL.md
^
|
| @@ -646,48 +646,17 @@
./boot.sh
vagrant provision --provision-with configure_ovs,test_ovs_kmod,test_ovs_system_userspace
-Continuous Integration with Travis-CI
--------------------------------------
+Continuous Integration with GitHub Actions
+------------------------------------------
-A .travis.yml file is provided to automatically build Open vSwitch with
-various build configurations and run the testsuite using travis-ci.
-Builds will be performed with gcc, sparse and clang with the -Werror
-compiler flag included, therefore the build will fail if a new warning
+A '.github/workflows/*.yml' files provided to automatically build
+Open vSwitch with various build configurations and run the testsuite using
+GitHub Actions. Builds will be performed with gcc, sparse and clang with the
+-Werror compiler flag included, therefore the build will fail if a new warning
has been introduced.
-The CI build is triggered via git push (regardless of the specific
-branch) or pull request against any Open vSwitch GitHub repository that
-is linked to travis-ci.
-
-Instructions to setup travis-ci for your GitHub repository:
-
-1. Go to http://travis-ci.org/ and sign in using your GitHub ID.
-2. Go to the "Repositories" tab and enable the ovs repository. You
- may disable builds for pushes or pull requests.
-3. In order to avoid forks sending build failures to the upstream
- mailing list, the notification email recipient is encrypted. If you
- want to receive email notification for build failures, replace the
- the encrypted string:
- 3.1) Install the travis-ci CLI (Requires ruby >=2.0):
- gem install travis
- 3.2) In your Open vSwitch repository:
- travis encrypt mylist@mydomain.org
- 3.3) Add/replace the notifications section in .travis.yml and fill
- in the secure string as returned by travis encrypt:
-
- notifications:
- email:
- recipients:
- - secure: "....."
-
- (You may remove/omit the notifications section to fall back to
- default notification behaviour which is to send an email directly
- to the author and committer of the failing commit. Note that the
- email is only sent if the author/committer have commit rights for
- the particular GitHub repository).
-
-4. Pushing a commit to the repository which breaks the build or the
- testsuite will now trigger a email sent to mylist@mydomain.org
+The CI build is triggered via git push (regardless of the specific branch) or
+pull request against any Open vSwitch GitHub repository.
Bug Reporting
=============
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/Makefile.am
^
|
| @@ -97,9 +97,9 @@
EXTRA_DIST = \
$(docs) \
NOTICE \
- .travis.yml \
- .travis/build.sh \
- .travis/prepare.sh \
+ .ci/build.sh \
+ .ci/prepare.sh \
+ .github/workflows/build-and-test.yml \
appveyor.yml \
boot.sh \
build-aux/cccl \
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/Makefile.in
^
|
| @@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -340,6 +340,22 @@
ofproto/libofproto.pc ovsdb/libovsdb.pc \
include/openvswitch/version.h
CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \
+ "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+ "$(DESTDIR)$(completiondir)" "$(DESTDIR)$(pkgdatadir)" \
+ "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(scriptsdir)" \
+ "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(scriptsdir)" \
+ "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
+ "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" \
+ "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(scriptsdir)" \
+ "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgconfigdir)" \
+ "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(scriptsdir)" \
+ "$(DESTDIR)$(openflowincludedir)" \
+ "$(DESTDIR)$(openvswitchincludedir)"
+@LINUX_TRUE@am__EXEEXT_1 = utilities/nlmon$(EXEEXT)
+@DPDK_NETDEV_TRUE@am__EXEEXT_2 = tests/test-dpdkr$(EXEEXT)
+@LINUX_TRUE@am__EXEEXT_3 = utilities/ovs-vlan-bug-workaround$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -367,18 +383,6 @@
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
- "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \
- "$(DESTDIR)$(completiondir)" "$(DESTDIR)$(pkgdatadir)" \
- "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(scriptsdir)" \
- "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(scriptsdir)" \
- "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
- "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" \
- "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(scriptsdir)" \
- "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgconfigdir)" \
- "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(scriptsdir)" \
- "$(DESTDIR)$(openflowincludedir)" \
- "$(DESTDIR)$(openvswitchincludedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
@WIN32_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
@@ -554,10 +558,10 @@
$(AM_CFLAGS) $(CFLAGS) $(lib_libopenvswitch_la_LDFLAGS) \
$(LDFLAGS) -o $@
lib_libsflow_la_LIBADD =
-am_lib_libsflow_la_OBJECTS = lib/lib_libsflow_la-sflow_agent.lo \
- lib/lib_libsflow_la-sflow_sampler.lo \
- lib/lib_libsflow_la-sflow_poller.lo \
- lib/lib_libsflow_la-sflow_receiver.lo
+am_lib_libsflow_la_OBJECTS = lib/libsflow_la-sflow_agent.lo \
+ lib/libsflow_la-sflow_sampler.lo \
+ lib/libsflow_la-sflow_poller.lo \
+ lib/libsflow_la-sflow_receiver.lo
lib_libsflow_la_OBJECTS = $(am_lib_libsflow_la_OBJECTS)
lib_libsflow_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -565,27 +569,26 @@
$(LDFLAGS) -o $@
ofproto_libofproto_la_DEPENDENCIES = lib/libsflow.la \
$(am__DEPENDENCIES_2)
-am_ofproto_libofproto_la_OBJECTS = \
- ofproto/ofproto_libofproto_la-bond.lo \
- ofproto/ofproto_libofproto_la-collectors.lo \
- ofproto/ofproto_libofproto_la-connmgr.lo \
- ofproto/ofproto_libofproto_la-fail-open.lo \
- ofproto/ofproto_libofproto_la-in-band.lo \
- ofproto/ofproto_libofproto_la-names.lo \
- ofproto/ofproto_libofproto_la-netflow.lo \
- ofproto/ofproto_libofproto_la-ofproto.lo \
- ofproto/ofproto_libofproto_la-ofproto-dpif.lo \
- ofproto/ofproto_libofproto_la-ofproto-dpif-ipfix.lo \
- ofproto/ofproto_libofproto_la-ofproto-dpif-mirror.lo \
- ofproto/ofproto_libofproto_la-ofproto-dpif-monitor.lo \
- ofproto/ofproto_libofproto_la-ofproto-dpif-rid.lo \
- ofproto/ofproto_libofproto_la-ofproto-dpif-sflow.lo \
- ofproto/ofproto_libofproto_la-ofproto-dpif-upcall.lo \
- ofproto/ofproto_libofproto_la-ofproto-dpif-xlate.lo \
- ofproto/ofproto_libofproto_la-pktbuf.lo \
- ofproto/ofproto_libofproto_la-pinsched.lo \
- ofproto/ofproto_libofproto_la-tunnel.lo \
- ofproto/ofproto_libofproto_la-bundles.lo
+am_ofproto_libofproto_la_OBJECTS = ofproto/libofproto_la-bond.lo \
+ ofproto/libofproto_la-collectors.lo \
+ ofproto/libofproto_la-connmgr.lo \
+ ofproto/libofproto_la-fail-open.lo \
+ ofproto/libofproto_la-in-band.lo \
+ ofproto/libofproto_la-names.lo \
+ ofproto/libofproto_la-netflow.lo \
+ ofproto/libofproto_la-ofproto.lo \
+ ofproto/libofproto_la-ofproto-dpif.lo \
+ ofproto/libofproto_la-ofproto-dpif-ipfix.lo \
+ ofproto/libofproto_la-ofproto-dpif-mirror.lo \
+ ofproto/libofproto_la-ofproto-dpif-monitor.lo \
+ ofproto/libofproto_la-ofproto-dpif-rid.lo \
+ ofproto/libofproto_la-ofproto-dpif-sflow.lo \
+ ofproto/libofproto_la-ofproto-dpif-upcall.lo \
+ ofproto/libofproto_la-ofproto-dpif-xlate.lo \
+ ofproto/libofproto_la-pktbuf.lo \
+ ofproto/libofproto_la-pinsched.lo \
+ ofproto/libofproto_la-tunnel.lo \
+ ofproto/libofproto_la-bundles.lo
ofproto_libofproto_la_OBJECTS = $(am_ofproto_libofproto_la_OBJECTS)
ofproto_libofproto_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -603,21 +606,14 @@
$(AM_CFLAGS) $(CFLAGS) $(ovn_lib_libovn_la_LDFLAGS) $(LDFLAGS) \
-o $@
ovsdb_libovsdb_la_LIBADD =
-am_ovsdb_libovsdb_la_OBJECTS = ovsdb/ovsdb_libovsdb_la-column.lo \
- ovsdb/ovsdb_libovsdb_la-condition.lo \
- ovsdb/ovsdb_libovsdb_la-execution.lo \
- ovsdb/ovsdb_libovsdb_la-file.lo \
- ovsdb/ovsdb_libovsdb_la-jsonrpc-server.lo \
- ovsdb/ovsdb_libovsdb_la-log.lo \
- ovsdb/ovsdb_libovsdb_la-mutation.lo \
- ovsdb/ovsdb_libovsdb_la-ovsdb.lo \
- ovsdb/ovsdb_libovsdb_la-monitor.lo \
- ovsdb/ovsdb_libovsdb_la-query.lo \
- ovsdb/ovsdb_libovsdb_la-row.lo \
- ovsdb/ovsdb_libovsdb_la-server.lo \
- ovsdb/ovsdb_libovsdb_la-table.lo \
- ovsdb/ovsdb_libovsdb_la-trigger.lo \
- ovsdb/ovsdb_libovsdb_la-transaction.lo
+am_ovsdb_libovsdb_la_OBJECTS = ovsdb/libovsdb_la-column.lo \
+ ovsdb/libovsdb_la-condition.lo ovsdb/libovsdb_la-execution.lo \
+ ovsdb/libovsdb_la-file.lo ovsdb/libovsdb_la-jsonrpc-server.lo \
+ ovsdb/libovsdb_la-log.lo ovsdb/libovsdb_la-mutation.lo \
+ ovsdb/libovsdb_la-ovsdb.lo ovsdb/libovsdb_la-monitor.lo \
+ ovsdb/libovsdb_la-query.lo ovsdb/libovsdb_la-row.lo \
+ ovsdb/libovsdb_la-server.lo ovsdb/libovsdb_la-table.lo \
+ ovsdb/libovsdb_la-trigger.lo ovsdb/libovsdb_la-transaction.lo
ovsdb_libovsdb_la_OBJECTS = $(am_ovsdb_libovsdb_la_OBJECTS)
ovsdb_libovsdb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -630,10 +626,6 @@
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(vtep_libvtep_la_LDFLAGS) $(LDFLAGS) \
-o $@
-@LINUX_TRUE@am__EXEEXT_1 = utilities/nlmon$(EXEEXT)
-@DPDK_NETDEV_TRUE@am__EXEEXT_2 = tests/test-dpdkr$(EXEEXT)
-@LINUX_TRUE@am__EXEEXT_3 = utilities/ovs-vlan-bug-workaround$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS)
am_ovn_controller_vtep_ovn_controller_vtep_OBJECTS = \
ovn/controller-vtep/binding.$(OBJEXT) \
ovn/controller-vtep/gateway.$(OBJEXT) \
@@ -809,7 +801,188 @@
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = lib/$(DEPDIR)/aes128.Plo \
+ lib/$(DEPDIR)/async-append-aio.Plo \
+ lib/$(DEPDIR)/async-append-null.Plo \
+ lib/$(DEPDIR)/backtrace.Plo lib/$(DEPDIR)/bfd.Plo \
+ lib/$(DEPDIR)/bundle.Plo lib/$(DEPDIR)/byteq.Plo \
+ lib/$(DEPDIR)/cfm.Plo lib/$(DEPDIR)/classifier.Plo \
+ lib/$(DEPDIR)/cmap.Plo lib/$(DEPDIR)/command-line.Plo \
+ lib/$(DEPDIR)/connectivity.Plo lib/$(DEPDIR)/coverage.Plo \
+ lib/$(DEPDIR)/crc32c.Plo lib/$(DEPDIR)/csum.Plo \
+ lib/$(DEPDIR)/ct-dpif.Plo lib/$(DEPDIR)/daemon-unix.Plo \
+ lib/$(DEPDIR)/daemon-windows.Plo lib/$(DEPDIR)/daemon.Plo \
+ lib/$(DEPDIR)/db-ctl-base.Plo lib/$(DEPDIR)/dhparams.Plo \
+ lib/$(DEPDIR)/dirs.Plo lib/$(DEPDIR)/dp-packet.Plo \
+ lib/$(DEPDIR)/dpctl.Plo lib/$(DEPDIR)/dpif-netdev.Plo \
+ lib/$(DEPDIR)/dpif-netlink.Plo lib/$(DEPDIR)/dpif.Plo \
+ lib/$(DEPDIR)/dummy.Plo lib/$(DEPDIR)/dynamic-string.Plo \
+ lib/$(DEPDIR)/entropy.Plo lib/$(DEPDIR)/fat-rwlock.Plo \
+ lib/$(DEPDIR)/fatal-signal.Plo lib/$(DEPDIR)/flow.Plo \
+ lib/$(DEPDIR)/getopt_long.Plo \
+ lib/$(DEPDIR)/getrusage-windows.Plo \
+ lib/$(DEPDIR)/guarded-list.Plo lib/$(DEPDIR)/hash.Plo \
+ lib/$(DEPDIR)/heap.Plo lib/$(DEPDIR)/hindex.Plo \
+ lib/$(DEPDIR)/hmap.Plo lib/$(DEPDIR)/hmapx.Plo \
+ lib/$(DEPDIR)/id-pool.Plo lib/$(DEPDIR)/if-notifier-bsd.Plo \
+ lib/$(DEPDIR)/if-notifier-stub.Plo \
+ lib/$(DEPDIR)/if-notifier.Plo lib/$(DEPDIR)/jhash.Plo \
+ lib/$(DEPDIR)/json.Plo lib/$(DEPDIR)/jsonrpc.Plo \
+ lib/$(DEPDIR)/lacp.Plo lib/$(DEPDIR)/latch-unix.Plo \
+ lib/$(DEPDIR)/latch-windows.Plo lib/$(DEPDIR)/learn.Plo \
+ lib/$(DEPDIR)/learning-switch.Plo \
+ lib/$(DEPDIR)/libsflow_la-sflow_agent.Plo \
+ lib/$(DEPDIR)/libsflow_la-sflow_poller.Plo \
+ lib/$(DEPDIR)/libsflow_la-sflow_receiver.Plo \
+ lib/$(DEPDIR)/libsflow_la-sflow_sampler.Plo \
+ lib/$(DEPDIR)/lockfile.Plo lib/$(DEPDIR)/mac-learning.Plo \
+ lib/$(DEPDIR)/match.Plo lib/$(DEPDIR)/mcast-snooping.Plo \
+ lib/$(DEPDIR)/memory.Plo lib/$(DEPDIR)/meta-flow.Plo \
+ lib/$(DEPDIR)/multipath.Plo lib/$(DEPDIR)/netdev-bsd.Plo \
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/NEWS
^
|
| @@ -1,3 +1,21 @@
+v2.5.12 - 10 Feb 2021
+---------------------
+ - Bug fixes
+ - Security:
+ * Fixed packet parsing vulnerability CVE-2020-35498.
+
+v2.5.11 - 13 Jan 2021
+---------------------
+ - Bug fixes
+ - LLDP:
+ * Security fixes for CVE-2015-8011 and CVE-2020-27827.
+ - OVSDB:
+ * Fixed SHA-1 hash computation for databases larger than 512 MB.
+
+v2.5.10 - 30 Jul 2020
+---------------------
+ - Bug fixes
+
v2.5.9 - 06 Sep 2019
--------------------
- Bug fixes
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/README.md
^
|
| @@ -4,7 +4,7 @@
Build Status:
-------------
-[](https://travis-ci.org/openvswitch/ovs)
+
What is Open vSwitch?
---------------------
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/aclocal.m4
^
|
| @@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.15.1], [],
+m4_if([$1], [1.16.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2017 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -332,13 +332,12 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -346,49 +345,41 @@
# Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
- case $CONFIG_FILES in
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
+ # TODO: see whether this extra hack can be removed once we start
+ # requiring Autoconf 2.70 or later.
+ AS_CASE([$CONFIG_FILES],
+ [*\'*], [eval set x "$CONFIG_FILES"],
+ [*], [set x $CONFIG_FILES])
shift
- for mf
+ # Used to flag and report bootstrapping failures.
+ am_rc=0
+ for am_mf
do
# Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named 'Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
+ am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile which includes
+ # dependency-tracking related rules and includes.
+ # Grep'ing the whole file directly is not great: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running 'make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "$am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
+ sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+ || continue
+ am_dirpart=`AS_DIRNAME(["$am_mf"])`
+ am_filepart=`AS_BASENAME(["$am_mf"])`
+ AM_RUN_LOG([cd "$am_dirpart" \
+ && sed -e '/# am--include-marker/d' "$am_filepart" \
+ | $MAKE -f - am--depfiles]) || am_rc=$?
done
+ if test $am_rc -ne 0; then
+ AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+ for automatic dependency tracking. Try re-running configure with the
+ '--disable-dependency-tracking' option to at least be able to build
+ the package (albeit without support for automatic dependency tracking).])
+ fi
+ AS_UNSET([am_dirpart])
+ AS_UNSET([am_filepart])
+ AS_UNSET([am_mf])
+ AS_UNSET([am_rc])
+ rm -f conftest-deps.mk
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -397,18 +388,17 @@
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+ [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -495,8 +485,8 @@
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target (and possibly the TAP driver). The
# system "awk" is bad on some platforms.
@@ -563,7 +553,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/build-aux/compile
^
|
| @@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# 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/>.
+# along with this program. If not, see <https://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
@@ -255,7 +255,8 @@
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -339,9 +340,9 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/build-aux/config.guess
^
|
| @@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2018-02-24'
+timestamp='2018-03-08'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -1046,11 +1046,7 @@
echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
exit ;;
x86_64:Linux:*:*)
- if objdump -f /bin/sh | grep -q elf32-x86-64; then
- echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
- else
- echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
- fi
+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
exit ;;
xtensa*:Linux:*:*)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -1473,7 +1469,7 @@
exit 1
# Local variables:
-# eval: (add-hook 'write-file-functions 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/build-aux/config.sub
^
|
| @@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2018 Free Software Foundation, Inc.
-timestamp='2018-02-22'
+timestamp='2018-05-05'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -110,28 +110,48 @@
exit 1;;
esac
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
- kopensolaris*-gnu* | cloudabi*-eabi* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- ;;
- android-linux)
- os=-linux-android
- basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
- ;;
- *)
- basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
- if [ "$basic_machine" != "$1" ]
- then os=`echo "$1" | sed 's/.*-/-/'`
- else os=; fi
- ;;
+# Spilt fields of configuration type
+IFS="-" read -r field1 field2 field3 field4 <<EOF
+$1
+EOF
+
+# Separate into logical components for further validation
+case $1 in
+ *-*-*-*)
+ basic_machine=$field1-$field2
+ os=-$field3-$field4
+ ;;
+ *-*-*)
+ # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+ # parts
+ maybe_os=$field2-$field3
+ case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
+ | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
+ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+ | storm-chaos* | os2-emx* | rtmk-nova*)
+ basic_machine=$field1
+ os=-$maybe_os
+ ;;
+ android-linux)
+ basic_machine=$field1-unknown
+ os=-linux-android
+ ;;
+ *)
+ basic_machine=$field1-$field2
+ os=-$field3
+ ;;
+ esac
+ ;;
+ *-*)
+ basic_machine=$field1
+ os=-$field2
+ ;;
+ *)
+ basic_machine=$1
+ os=
+ ;;
esac
### Let's recognize common machines as not being operating systems so
@@ -249,12 +269,12 @@
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arceb \
- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv6m | armv[78][arm] \
| avr | avr32 \
| ba \
| be32 | be64 \
| bfin \
- | c4x | c8051 | clipper \
+ | c4x | c8051 | clipper | csky \
| d10v | d30v | dlx | dsp16xx \
| e2k | epiphany \
| fido | fr30 | frv | ft32 \
@@ -293,6 +313,7 @@
| mt \
| msp430 \
| nds32 | nds32le | nds32be \
+ | nfp \
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
| open8 | or1k | or1knd | or32 \
@@ -335,6 +356,10 @@
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
;;
+ m9s12z | m68hcs12z | hcs12z | s12z)
+ basic_machine=s12z-unknown
+ os=-none
+ ;;
ms1)
basic_machine=mt-unknown
;;
@@ -378,7 +403,7 @@
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
- | c8051-* | clipper-* | craynv-* | cydra-* \
+ | c8051-* | clipper-* | craynv-* | csky-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| e2k-* | elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -419,6 +444,7 @@
| mt-* \
| msp430-* \
| nds32-* | nds32le-* | nds32be-* \
+ | nfp-* \
| nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
@@ -1334,7 +1360,7 @@
# Decode manufacturer-specific aliases for certain operating systems.
-if [ x"$os" != x"" ]
+if [ x$os != x ]
then
case $os in
# First match some system type aliases that might get confused
@@ -1376,7 +1402,7 @@
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \
| -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
@@ -1524,6 +1550,12 @@
;;
-none)
;;
+ -*-eabi)
+ case $basic_machine in
+ arm*)
+ ;;
+ esac
+ ;;
*)
# Get rid of the `-' at the beginning of $os.
os=`echo $os | sed 's/[^-]*-//'`
@@ -1794,7 +1826,7 @@
exit
# Local variables:
-# eval: (add-hook 'write-file-functions 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/build-aux/depcomp
^
|
| @@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 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
@@ -16,7 +16,7 @@
# 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/>.
+# along with this program. If not, see <https://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
@@ -783,7 +783,7 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC0"
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/build-aux/install-sh
^
|
| @@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2014-09-12.12; # UTC
+scriptversion=2018-03-11.20; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -271,15 +271,18 @@
fi
dst=$dst_arg
- # If destination is a directory, append the input filename; won't work
- # if double slashes aren't ignored.
+ # If destination is a directory, append the input filename.
if test -d "$dst"; then
if test "$is_target_a_directory" = never; then
echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
- dst=$dstdir/`basename "$src"`
+ dstbase=`basename "$src"`
+ case $dst in
+ */) dst=$dst$dstbase;;
+ *) dst=$dst/$dstbase;;
+ esac
dstdir_status=0
else
dstdir=`dirname "$dst"`
@@ -288,6 +291,11 @@
fi
fi
+ case $dstdir in
+ */) dstdirslash=$dstdir;;
+ *) dstdirslash=$dstdir/;;
+ esac
+
obsolete_mkdir_used=false
if test $dstdir_status != 0; then
@@ -324,14 +332,16 @@
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
- # $RANDOM is not portable (e.g. dash); use it when possible to
- # lower collision chance
+ # Note that $RANDOM variable is not portable (e.g. dash); Use it
+ # here however when possible just to lower collision chance.
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+
trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
- # As "mkdir -p" follows symlinks and we work in /tmp possibly; so
- # create the $tmpdir first (and fail if unsuccessful) to make sure
- # that nobody tries to guess the $tmpdir name.
+ # Because "mkdir -p" follows existing symlinks and we likely work
+ # directly in world-writeable /tmp, make sure that the '$tmpdir'
+ # directory is successfully created first before we actually test
+ # 'mkdir -p' feature.
if (umask $mkdir_umask &&
$mkdirprog $mkdir_mode "$tmpdir" &&
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
@@ -434,8 +444,8 @@
else
# Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
- rmtmp=$dstdir/_rm.$$_
+ dsttmp=${dstdirslash}_inst.$$_
+ rmtmp=${dstdirslash}_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
@@ -500,9 +510,9 @@
done
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/build-aux/ltmain.sh
^
|
| @@ -31,7 +31,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.6-2"
+VERSION=2.4.6
package_revision=2.4.6
@@ -2068,12 +2068,12 @@
compiler: $LTCC
compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld)
- version: $progname $scriptversion Debian-2.4.6-2
+ version: $progname (GNU libtool) 2.4.6
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
Report bugs to <bug-libtool@gnu.org>.
-GNU libtool home page: <http://www.gnu.org/s/libtool/>.
+GNU libtool home page: <http://www.gnu.org/software/libtool/>.
General help using GNU software: <http://www.gnu.org/gethelp/>."
exit 0
}
@@ -7274,11 +7274,10 @@
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
# -specs=* GCC specs files
# -stdlib=* select c++ std lib with clang
- # -fsanitize=* Clang/GCC memory and address sanitizer
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
- -specs=*|-fsanitize=*)
+ -specs=*)
func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result
func_append compile_command " $arg"
@@ -7571,10 +7570,7 @@
case $pass in
dlopen) libs=$dlfiles ;;
dlpreopen) libs=$dlprefiles ;;
- link)
- libs="$deplibs %DEPLIBS%"
- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
- ;;
+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
if test lib,dlpreopen = "$linkmode,$pass"; then
@@ -7893,19 +7889,19 @@
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps; then
- case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- esac
- fi
- func_append tmp_libs " $deplib"
- done
elif test prog != "$linkmode" && test lib != "$linkmode"; then
func_fatal_error "'$lib' is not a convenience library"
fi
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_preserve_dup_deps; then
+ case "$tmp_libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+ fi
+ func_append tmp_libs " $deplib"
+ done
continue
fi # $pass = conv
@@ -8829,9 +8825,6 @@
revision=$number_minor
lt_irix_increment=no
;;
- *)
- func_fatal_configuration "$modename: unknown library version type '$version_type'"
- ;;
esac
;;
no)
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/build-aux/missing
^
|
| @@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# 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/>.
+# along with this program. If not, see <https://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
@@ -101,9 +101,9 @@
exit $st
fi
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
program_details ()
{
@@ -207,9 +207,9 @@
exit $st
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/configure
^
|
| @@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for openvswitch 2.5.9.
+# Generated by GNU Autoconf 2.69 for openvswitch 2.5.12.
#
# Report bugs to <bugs@openvswitch.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='openvswitch'
PACKAGE_TARNAME='openvswitch'
-PACKAGE_VERSION='2.5.9'
-PACKAGE_STRING='openvswitch 2.5.9'
+PACKAGE_VERSION='2.5.12'
+PACKAGE_STRING='openvswitch 2.5.12'
PACKAGE_BUGREPORT='bugs@openvswitch.org'
PACKAGE_URL=''
@@ -756,7 +756,6 @@
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
-am__quote
am__include
DEPDIR
OBJEXT
@@ -812,7 +811,6 @@
docdir
oldincludedir
includedir
-runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -832,7 +830,8 @@
PACKAGE_NAME
PATH_SEPARATOR
SHELL
-SPARSE_EXTRA_INCLUDES'
+SPARSE_EXTRA_INCLUDES
+am__quote'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -916,7 +915,6 @@
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1169,15 +1167,6 @@
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
- -runstatedir | --runstatedir | --runstatedi | --runstated \
- | --runstate | --runstat | --runsta | --runst | --runs \
- | --run | --ru | --r)
- ac_prev=runstatedir ;;
- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
- | --run=* | --ru=* | --r=*)
- runstatedir=$ac_optarg ;;
-
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1315,7 +1304,7 @@
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir runstatedir
+ libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1428,7 +1417,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures openvswitch 2.5.9 to adapt to many kinds of systems.
+\`configure' configures openvswitch 2.5.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1468,7 +1457,6 @@
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1499,7 +1487,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of openvswitch 2.5.9:";;
+ short | recursive ) echo "Configuration of openvswitch 2.5.12:";;
esac
cat <<\_ACEOF
@@ -1637,7 +1625,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-openvswitch configure 2.5.9
+openvswitch configure 2.5.12
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2292,7 +2280,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by openvswitch $as_me 2.5.9, which was
+It was created by openvswitch $as_me 2.5.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2677,7 +2665,7 @@
ac_config_commands="$ac_config_commands tests/atconfig"
-am__api_version='1.15'
+am__api_version='1.16'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -3163,7 +3151,7 @@
# Define the identity of the package.
PACKAGE='openvswitch'
- VERSION='2.5.9'
+ VERSION='2.5.12'
cat >>confdefs.h <<_ACEOF
@@ -3193,8 +3181,8 @@
# For better backward compatibility. To be removed once Automake 1.9.x
# dies out for good. For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
# We need awk for the "check" target (and possibly the TAP driver). The
@@ -3330,7 +3318,7 @@
Aborting the configuration process, to ensure you take notice of the issue.
You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -3346,45 +3334,45 @@
ac_config_commands="$ac_config_commands depfiles"
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
am__doit:
- @echo this is the am__doit target
+ @echo this is the am__doit target >confinc.out
.PHONY: am__doit
END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
- am__include=include
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
+# BSD make does it like this.
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/configure.ac
^
|
| @@ -13,7 +13,7 @@
# limitations under the License.
AC_PREREQ(2.63)
-AC_INIT(openvswitch, 2.5.9, bugs@openvswitch.org)
+AC_INIT(openvswitch, 2.5.12, bugs@openvswitch.org)
AC_CONFIG_SRCDIR([datapath/datapath.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
@@ -157,6 +157,7 @@
OVS_ENABLE_OPTION([-Wthread-safety])
OVS_ENABLE_OPTION([-fno-strict-aliasing])
OVS_ENABLE_OPTION([-Qunused-arguments])
+OVS_ENABLE_OPTION([-Wno-null-pointer-arithmetic])
OVS_CONDITIONAL_CC_OPTION([-Wno-unused], [HAVE_WNO_UNUSED])
OVS_CONDITIONAL_CC_OPTION([-Wno-unused-parameter], [HAVE_WNO_UNUSED_PARAMETER])
OVS_ENABLE_WERROR
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/datapath/Makefile.in
^
|
| @@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -139,7 +139,7 @@
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- distdir
+ distdir distdir-am
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
@@ -339,7 +339,6 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -515,8 +514,8 @@
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(srcdir)/Modules.mk $(srcdir)/linux/Modules.mk $(am__empty):
@@ -634,7 +633,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/debian/changelog
^
|
| @@ -1,3 +1,21 @@
+openvswitch (2.5.12-1) unstable; urgency=low
+ [ Open vSwitch team ]
+ * New upstream version
+
+ -- Open vSwitch team <dev@openvswitch.org> Wed, 10 Feb 2021 16:06:12 +0100
+
+openvswitch (2.5.11-1) unstable; urgency=low
+ [ Open vSwitch team ]
+ * New upstream version
+
+ -- Open vSwitch team <dev@openvswitch.org> Wed, 13 Jan 2021 11:26:30 -0500
+
+openvswitch (2.5.10-1) unstable; urgency=low
+ [ Open vSwitch team ]
+ * New upstream version
+
+ -- Open vSwitch team <dev@openvswitch.org> Thu, 30 Jul 2020 00:25:09 +0200
+
openvswitch (2.5.9-1) unstable; urgency=low
[ Open vSwitch team ]
* New upstream version
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/include/openvswitch/version.h
^
|
| @@ -18,8 +18,8 @@
#ifndef OPENVSWITCH_VERSION_H
#define OPENVSWITCH_VERSION_H 1
-#define OVS_PACKAGE_STRING "openvswitch 2.5.9"
-#define OVS_PACKAGE_VERSION "2.5.9"
+#define OVS_PACKAGE_STRING "openvswitch 2.5.12"
+#define OVS_PACKAGE_VERSION "2.5.12"
#define OVS_LIB_VERSION 1
#define OVS_LIB_REVISION 0
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/lib/automake.mk
^
|
| @@ -414,8 +414,8 @@
endif
pkgconfig_DATA += \
- $(srcdir)/lib/libopenvswitch.pc \
- $(srcdir)/lib/libsflow.pc
+ lib/libopenvswitch.pc \
+ lib/libsflow.pc
EXTRA_DIST += \
lib/dh1024.pem \
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/lib/classifier.c
^
|
| @@ -396,7 +396,9 @@
bitmap_set1(fields.bm, trie_fields[i]);
new_fields[n_tries] = NULL;
- if (n_tries >= cls->n_tries || field != cls->tries[n_tries].field) {
+ const struct mf_field *cls_field
+ = ovsrcu_get(struct mf_field *, &cls->tries[n_tries].field);
+ if (n_tries >= cls->n_tries || field != cls_field) {
new_fields[n_tries] = field;
changed = true;
}
@@ -457,7 +459,7 @@
} else {
ovsrcu_set_hidden(&trie->root, NULL);
}
- trie->field = field;
+ ovsrcu_set_hidden(&trie->field, CONST_CAST(struct mf_field *, field));
/* Add existing rules to the new trie. */
CMAP_FOR_EACH (subtable, cmap_node, &cls->subtables_map) {
@@ -856,7 +858,6 @@
struct trie_ctx {
const struct cls_trie *trie;
bool lookup_done; /* Status of the lookup. */
- uint8_t be32ofs; /* U32 offset of the field in question. */
unsigned int maskbits; /* Prefix length needed to avoid false matches. */
union trie_prefix match_plens; /* Bitmask of prefix lengths with possible
* matches. */
@@ -866,7 +867,6 @@
trie_ctx_init(struct trie_ctx *ctx, const struct cls_trie *trie)
{
ctx->trie = trie;
- ctx->be32ofs = trie->field->flow_be32ofs;
ctx->lookup_done = false;
}
@@ -1511,8 +1511,10 @@
*CONST_CAST(uint8_t *, &subtable->n_indices) = index;
for (i = 0; i < cls->n_tries; i++) {
- subtable->trie_plen[i] = minimask_get_prefix_len(mask,
- cls->tries[i].field);
+ const struct mf_field *field
+ = ovsrcu_get(struct mf_field *, &cls->tries[i].field);
+ subtable->trie_plen[i]
+ = field ? minimask_get_prefix_len(mask, field) : 0;
}
/* Ports trie. */
@@ -1566,11 +1568,17 @@
* fields using the prefix tries. The trie checks are done only as
* needed to avoid folding in additional bits to the wildcards mask. */
for (j = 0; j < n_tries; j++) {
- /* Is the trie field relevant for this subtable, and
- is the trie field within the current range of fields? */
- if (field_plen[j] &&
- flowmap_is_set(&range_map, trie_ctx[j].be32ofs / 2)) {
+ /* Is the trie field relevant for this subtable? */
+ if (field_plen[j]) {
struct trie_ctx *ctx = &trie_ctx[j];
+ const struct mf_field *ctx_field
+ = ovsrcu_get(struct mf_field *, &ctx->trie->field);
+
+ /* Is the trie field within the current range of fields? */
+ if (!ctx_field
+ || !flowmap_is_set(&range_map, ctx_field->flow_be32ofs / 2)) {
+ continue;
+ }
/* On-demand trie lookup. */
if (!ctx->lookup_done) {
@@ -1592,14 +1600,16 @@
* than this subtable would otherwise. */
if (ctx->maskbits <= field_plen[j]) {
/* Unwildcard the bits and skip the rest. */
- mask_set_prefix_bits(wc, ctx->be32ofs, ctx->maskbits);
+ mask_set_prefix_bits(wc, ctx_field->flow_be32ofs,
+ ctx->maskbits);
/* Note: Prerequisite already unwildcarded, as the only
* prerequisite of the supported trie lookup fields is
* the ethertype, which is always unwildcarded. */
return true;
}
/* Can skip if the field is already unwildcarded. */
- if (mask_prefix_bits_set(wc, ctx->be32ofs, ctx->maskbits)) {
+ if (mask_prefix_bits_set(wc, ctx_field->flow_be32ofs,
+ ctx->maskbits)) {
return true;
}
}
@@ -2065,12 +2075,12 @@
trie_lookup(const struct cls_trie *trie, const struct flow *flow,
union trie_prefix *plens)
{
- const struct mf_field *mf = trie->field;
+ const struct mf_field *mf = ovsrcu_get(struct mf_field *, &trie->field);
/* Check that current flow matches the prerequisites for the trie
* field. Some match fields are used for multiple purposes, so we
* must check that the trie is relevant for this flow. */
- if (mf_are_prereqs_ok(mf, flow)) {
+ if (mf && mf_are_prereqs_ok(mf, flow)) {
return trie_lookup_value(&trie->root,
&((ovs_be32 *)flow)[mf->flow_be32ofs],
&plens->be32, mf->n_bits);
@@ -2117,8 +2127,9 @@
* happened to be zeros.
*/
static const ovs_be32 *
-minimatch_get_prefix(const struct minimatch *match, const struct mf_field *mf)
+minimatch_get_prefix(const struct minimatch *match, rcu_field_ptr *field)
{
+ struct mf_field *mf = ovsrcu_get_protected(struct mf_field *, field);
size_t u64_ofs = mf->flow_be32ofs / 2;
return (OVS_FORCE const ovs_be32 *)miniflow_get__(match->flow, u64_ofs)
@@ -2132,7 +2143,7 @@
trie_insert(struct cls_trie *trie, const struct cls_rule *rule, int mlen)
{
trie_insert_prefix(&trie->root,
- minimatch_get_prefix(&rule->match, trie->field), mlen);
+ minimatch_get_prefix(&rule->match, &trie->field), mlen);
}
static void
@@ -2187,7 +2198,7 @@
trie_remove(struct cls_trie *trie, const struct cls_rule *rule, int mlen)
{
trie_remove_prefix(&trie->root,
- minimatch_get_prefix(&rule->match, trie->field), mlen);
+ minimatch_get_prefix(&rule->match, &trie->field), mlen);
}
/* 'mlen' must be the (non-zero) CIDR prefix length of the 'trie->field' mask
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/lib/classifier.h
^
|
| @@ -313,13 +313,15 @@
struct cls_subtable;
struct cls_match;
+struct mf_field;
+typedef OVSRCU_TYPE(struct mf_field *) rcu_field_ptr;
struct trie_node;
typedef OVSRCU_TYPE(struct trie_node *) rcu_trie_ptr;
/* Prefix trie for a 'field' */
struct cls_trie {
- const struct mf_field *field; /* Trie field, or NULL. */
- rcu_trie_ptr root; /* NULL if none. */
+ rcu_field_ptr field; /* Trie field, or NULL. */
+ rcu_trie_ptr root; /* NULL if none. */
};
typedef uint64_t cls_version_t;
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/lib/dp-packet.h
^
|
| @@ -51,7 +51,7 @@
bool rss_hash_valid; /* Is the 'rss_hash' valid? */
#endif
enum dp_packet_source source; /* Source of memory allocated as 'base'. */
- uint8_t l2_pad_size; /* Detected l2 padding size.
+ uint16_t l2_pad_size; /* Detected l2 padding size.
* Padding is non-pullable. */
uint16_t l2_5_ofs; /* MPLS label stack offset, or UINT16_MAX */
uint16_t l3_ofs; /* Network-level header offset,
@@ -76,8 +76,8 @@
void *dp_packet_resize_l2_5(struct dp_packet *, int increment);
static inline void *dp_packet_l2(const struct dp_packet *);
static inline void dp_packet_reset_offsets(struct dp_packet *);
-static inline uint8_t dp_packet_l2_pad_size(const struct dp_packet *);
-static inline void dp_packet_set_l2_pad_size(struct dp_packet *, uint8_t);
+static inline uint16_t dp_packet_l2_pad_size(const struct dp_packet *);
+static inline void dp_packet_set_l2_pad_size(struct dp_packet *, uint16_t);
static inline void *dp_packet_l2_5(const struct dp_packet *);
static inline void dp_packet_set_l2_5(struct dp_packet *, void *);
static inline void *dp_packet_l3(const struct dp_packet *);
@@ -270,14 +270,14 @@
b->l4_ofs = UINT16_MAX;
}
-static inline uint8_t
+static inline uint16_t
dp_packet_l2_pad_size(const struct dp_packet *b)
{
return b->l2_pad_size;
}
static inline void
-dp_packet_set_l2_pad_size(struct dp_packet *b, uint8_t pad_size)
+dp_packet_set_l2_pad_size(struct dp_packet *b, uint16_t pad_size)
{
ovs_assert(pad_size <= dp_packet_size(b));
b->l2_pad_size = pad_size;
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/lib/dpif-netdev.c
^
|
| @@ -3280,7 +3280,6 @@
recirc_depth = *recirc_depth_get_unsafe();
if (OVS_UNLIKELY(recirc_depth)) {
hash = hash_finish(hash, recirc_depth);
- dp_packet_set_rss_hash(packet, hash);
}
return hash;
}
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/lib/flow.c
^
|
| @@ -547,7 +547,7 @@
if (OVS_UNLIKELY(tot_len > size || ip_len > tot_len)) {
goto out;
}
- if (OVS_UNLIKELY(size - tot_len > UINT8_MAX)) {
+ if (OVS_UNLIKELY(size - tot_len > UINT16_MAX)) {
goto out;
}
dp_packet_set_l2_pad_size(packet, size - tot_len);
@@ -582,8 +582,7 @@
if (OVS_UNLIKELY(plen > size)) {
goto out;
}
- /* Jumbo Payload option not supported yet. */
- if (OVS_UNLIKELY(size - plen > UINT8_MAX)) {
+ if (OVS_UNLIKELY(size - plen > UINT16_MAX)) {
goto out;
}
dp_packet_set_l2_pad_size(packet, size - plen);
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/lib/lldp/lldp.c
^
|
| @@ -59,7 +59,7 @@
} while (0)
#define PEEK_DISCARD_UINT8 PEEK_DISCARD(1)
#define PEEK_DISCARD_UINT16 PEEK_DISCARD(2)
-#define PEEK_DISCARD_UINT32 PEEK_DISCARD(3)
+#define PEEK_DISCARD_UINT32 PEEK_DISCARD(4)
#define PEEK_CMP(value, bytes) \
(length -= (bytes), \
pos += (bytes), \
@@ -341,6 +341,12 @@
return dp_packet_size(p);
}
+#define CHECK_TLV_MAX_SIZE(x, name) \
+ do { if (tlv_size > (x)) { \
+ VLOG_WARN(name " TLV too large received on %s", \
+ hardware->h_ifname); \
+ goto malformed; \
+ } } while (0)
int
lldp_decode(struct lldpd *cfg OVS_UNUSED, char *frame, int s,
@@ -359,7 +365,7 @@
int length, af;
bool gotend = false;
bool ttl_received = false;
- int tlv_size, tlv_type, tlv_subtype;
+ int tlv_size, tlv_type, tlv_subtype, tlv_count = 0;
u_int8_t *pos, *tlv;
void *b;
struct lldpd_aa_isid_vlan_maps_tlv *isid_vlan_map = NULL;
@@ -411,6 +417,31 @@
hardware->h_ifname);
goto malformed;
}
+ /* Check order for mandatory TLVs */
+ tlv_count++;
+ switch (tlv_type) {
+ case LLDP_TLV_CHASSIS_ID:
+ if (tlv_count != 1) {
+ VLOG_WARN("first TLV should be a chassis ID on %s, not %d",
+ hardware->h_ifname, tlv_type);
+ goto malformed;
+ }
+ break;
+ case LLDP_TLV_PORT_ID:
+ if (tlv_count != 2) {
+ VLOG_WARN("second TLV should be a port ID on %s, not %d",
+ hardware->h_ifname, tlv_type);
+ goto malformed;
+ }
+ break;
+ case LLDP_TLV_TTL:
+ if (tlv_count != 3) {
+ VLOG_WARN("third TLV should be a TTL on %s, not %d",
+ hardware->h_ifname, tlv_type);
+ goto malformed;
+ }
+ break;
+ }
switch (tlv_type) {
case LLDP_TLV_END:
@@ -428,7 +459,8 @@
case LLDP_TLV_CHASSIS_ID:
case LLDP_TLV_PORT_ID:
- CHECK_TLV_SIZE(2, "Port Id");
+ CHECK_TLV_SIZE(2, "Port/Chassis Id");
+ CHECK_TLV_MAX_SIZE(256, "Port/Chassis Id");
tlv_subtype = PEEK_UINT8;
if (tlv_subtype == 0 || tlv_subtype > 7) {
VLOG_WARN("unknown subtype for tlv id received on %s",
@@ -438,10 +470,22 @@
b = xzalloc(tlv_size - 1);
PEEK_BYTES(b, tlv_size - 1);
if (tlv_type == LLDP_TLV_PORT_ID) {
+ if (port->p_id != NULL) {
+ VLOG_WARN("Port ID TLV received twice on %s",
+ hardware->h_ifname);
+ free(b);
+ goto malformed;
+ }
port->p_id_subtype = tlv_subtype;
port->p_id = b;
port->p_id_len = tlv_size - 1;
} else {
+ if (chassis->c_id != NULL) {
+ VLOG_WARN("Chassis ID TLV received twice on %s",
+ hardware->h_ifname);
+ free(b);
+ goto malformed;
+ }
chassis->c_id_subtype = tlv_subtype;
chassis->c_id = b;
chassis->c_id_len = tlv_size - 1;
@@ -449,6 +493,11 @@
break;
case LLDP_TLV_TTL:
+ if (ttl_received) {
+ VLOG_WARN("TTL TLV received twice on %s",
+ hardware->h_ifname);
+ goto malformed;
+ }
CHECK_TLV_SIZE(2, "TTL");
chassis->c_ttl = PEEK_UINT16;
ttl_received = true;
@@ -464,10 +513,13 @@
b = xzalloc(tlv_size + 1);
PEEK_BYTES(b, tlv_size);
if (tlv_type == LLDP_TLV_PORT_DESCR) {
+ free(port->p_descr);
port->p_descr = b;
} else if (tlv_type == LLDP_TLV_SYSTEM_NAME) {
+ free(chassis->c_name);
chassis->c_name = b;
} else {
+ free(chassis->c_descr);
chassis->c_descr = b;
}
break;
@@ -481,6 +533,11 @@
case LLDP_TLV_MGMT_ADDR:
CHECK_TLV_SIZE(1, "Management address");
addr_str_length = PEEK_UINT8;
+ if (addr_str_length > sizeof(addr_str_buffer)) {
+ VLOG_WARN("too large management address on %s",
+ hardware->h_ifname);
+ goto malformed;
+ }
CHECK_TLV_SIZE(1 + addr_str_length, "Management address");
PEEK_BYTES(addr_str_buffer, addr_str_length);
addr_length = addr_str_length - 1;
@@ -505,7 +562,7 @@
break;
case LLDP_TLV_ORG:
- CHECK_TLV_SIZE(4, "Organisational");
+ CHECK_TLV_SIZE(1 + sizeof orgid, "Organisational");
PEEK_BYTES(orgid, sizeof orgid);
tlv_subtype = PEEK_UINT8;
if (memcmp(dot1, orgid, sizeof orgid) == 0) {
@@ -625,6 +682,7 @@
VLOG_WARN("unknown tlv (%d) received on %s",
tlv_type,
hardware->h_ifname);
+ hardware->h_rx_unrecognized_cnt++;
goto malformed;
}
if (pos > tlv + tlv_size) {
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/lib/lldp/lldpd.c
^
|
| @@ -242,6 +242,7 @@
if (s < sizeof(struct eth_header) + 4) {
/* Too short, just discard it */
+ hw->h_rx_discarded_cnt++;
return;
}
@@ -282,6 +283,7 @@
VLOG_DBG("function for %s protocol did not "
"decode this frame",
cfg->g_protocols[i].name);
+ hw->h_rx_discarded_cnt++;
return;
}
chassis->c_protocol = port->p_protocol = cfg->g_protocols[i].mode;
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/lib/netlink.c
^
|
| @@ -463,6 +463,7 @@
nl_msg_end_nested(struct ofpbuf *msg, size_t offset)
{
struct nlattr *attr = ofpbuf_at_assert(msg, offset, sizeof *attr);
+ ovs_assert(!nl_attr_oversized(msg->size - offset - NLA_HDRLEN));
attr->nla_len = msg->size - offset;
}
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/lib/odp-util.c
^
|
| @@ -3550,13 +3550,16 @@
do { \
len = 0;
-#define SCAN_END_NESTED() \
- SCAN_FINISH(); \
- nl_msg_end_nested(key, key_offset); \
- if (mask) { \
- nl_msg_end_nested(mask, mask_offset); \
- } \
- return s - start; \
+#define SCAN_END_NESTED() \
+ SCAN_FINISH(); \
+ if (nl_attr_oversized(key->size - key_offset - NLA_HDRLEN)) { \
+ return -E2BIG; \
+ } \
+ nl_msg_end_nested(key, key_offset); \
+ if (mask) { \
+ nl_msg_end_nested(mask, mask_offset); \
+ } \
+ return s - start; \
}
#define SCAN_FIELD_NESTED__(NAME, TYPE, SCAN_AS, ATTR, FUNC) \
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/lib/ovs-rcu.c
^
|
| @@ -28,6 +28,8 @@
VLOG_DEFINE_THIS_MODULE(ovs_rcu);
+#define MIN_CBS 16
+
struct ovsrcu_cb {
void (*function)(void *aux);
void *aux;
@@ -35,7 +37,8 @@
struct ovsrcu_cbset {
struct ovs_list list_node;
- struct ovsrcu_cb cbs[16];
+ struct ovsrcu_cb *cbs;
+ size_t n_allocated;
int n_cbs;
};
@@ -261,16 +264,19 @@
cbset = perthread->cbset;
if (!cbset) {
cbset = perthread->cbset = xmalloc(sizeof *perthread->cbset);
+ cbset->cbs = xmalloc(MIN_CBS * sizeof *cbset->cbs);
+ cbset->n_allocated = MIN_CBS;
cbset->n_cbs = 0;
}
+ if (cbset->n_cbs == cbset->n_allocated) {
+ cbset->cbs = x2nrealloc(cbset->cbs, &cbset->n_allocated,
+ sizeof *cbset->cbs);
+ }
+
cb = &cbset->cbs[cbset->n_cbs++];
cb->function = function;
cb->aux = aux;
-
- if (cbset->n_cbs >= ARRAY_SIZE(cbset->cbs)) {
- ovsrcu_flush_cbset(perthread);
- }
}
static bool
@@ -292,6 +298,7 @@
for (cb = cbset->cbs; cb < &cbset->cbs[cbset->n_cbs]; cb++) {
cb->function(cb->aux);
}
+ free(cbset->cbs);
free(cbset);
}
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/lib/pvector.c
^
|
| @@ -29,7 +29,7 @@
struct pvector_impl *impl;
impl = xmalloc(sizeof *impl + size * sizeof impl->vector[0]);
- impl->size = 0;
+ atomic_init(&impl->size, 0);
impl->allocated = size;
return impl;
@@ -117,18 +117,22 @@
{
struct pvector_impl *temp = pvec->temp;
struct pvector_impl *old = pvector_impl_get(pvec);
+ size_t size;
ovs_assert(ptr != NULL);
+ /* There is no possible concurrent writer. Insertions must be protected
+ * by mutex or be always excuted from the same thread. */
+ atomic_read_relaxed(&old->size, &size);
+
/* Check if can add to the end without reallocation. */
- if (!temp && old->allocated > old->size &&
- (!old->size || priority <= old->vector[old->size - 1].priority)) {
- old->vector[old->size].ptr = ptr;
- old->vector[old->size].priority = priority;
+ if (!temp && old->allocated > size &&
+ (!size || priority <= old->vector[size - 1].priority)) {
+ old->vector[size].ptr = ptr;
+ old->vector[size].priority = priority;
/* Size increment must not be visible to the readers before the new
* entry is stored. */
- atomic_thread_fence(memory_order_release);
- ++old->size;
+ atomic_store_explicit(&old->size, size + 1, memory_order_release);
} else {
if (!temp) {
temp = pvector_impl_dup(old);
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/lib/pvector.h
^
|
| @@ -68,8 +68,8 @@
enum { PVECTOR_EXTRA_ALLOC = 4 };
struct pvector_impl {
- size_t size; /* Number of entries in the vector. */
- size_t allocated; /* Number of allocated entries. */
+ atomic_size_t size; /* Number of entries in the vector. */
+ size_t allocated; /* Number of allocated entries. */
struct pvector_entry vector[];
};
@@ -180,12 +180,17 @@
{
const struct pvector_impl *impl;
struct pvector_cursor cursor;
+ size_t size;
impl = ovsrcu_get(struct pvector_impl *, &pvec->impl);
- ovs_prefetch_range(impl->vector, impl->size * sizeof impl->vector[0]);
+ /* Use memory_order_acquire to ensure entry access can not be
+ * reordered to happen before size read. */
+ atomic_read_explicit(&CONST_CAST(struct pvector_impl *, impl)->size,
+ &size, memory_order_acquire);
+ ovs_prefetch_range(impl->vector, size * sizeof impl->vector[0]);
- cursor.size = impl->size;
+ cursor.size = size;
cursor.vector = impl->vector;
cursor.entry_idx = -1;
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/lib/sha1.c
^
|
| @@ -197,7 +197,7 @@
* inputLen: The length of the input buffer.
*/
void
-sha1_update(struct sha1_ctx *ctx, const void *buffer_, size_t count)
+sha1_update(struct sha1_ctx *ctx, const void *buffer_, uint32_t count)
{
const uint8_t *buffer = buffer_;
unsigned int i;
@@ -274,7 +274,7 @@
/* Computes the hash of 'n' bytes in 'data' into 'digest'. */
void
-sha1_bytes(const void *data, size_t n, uint8_t digest[SHA1_DIGEST_SIZE])
+sha1_bytes(const void *data, uint32_t n, uint8_t digest[SHA1_DIGEST_SIZE])
{
struct sha1_ctx ctx;
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/lib/sha1.h
^
|
| @@ -45,9 +45,9 @@
};
void sha1_init(struct sha1_ctx *);
-void sha1_update(struct sha1_ctx *, const void *, size_t);
+void sha1_update(struct sha1_ctx *, const void *, uint32_t size);
void sha1_final(struct sha1_ctx *, uint8_t digest[SHA1_DIGEST_SIZE]);
-void sha1_bytes(const void *, size_t, uint8_t digest[SHA1_DIGEST_SIZE]);
+void sha1_bytes(const void *, uint32_t size, uint8_t digest[SHA1_DIGEST_SIZE]);
#define SHA1_FMT \
"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x" \
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/m4/libtool.m4
^
|
| @@ -728,6 +728,7 @@
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
@@ -2866,6 +2867,9 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command
@@ -2874,7 +2878,7 @@
# appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2886,18 +2890,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3557,7 +3549,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4435,7 +4427,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4947,9 +4939,6 @@
;;
esac
;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -5012,9 +5001,6 @@
openbsd* | bitrig*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -5269,7 +5255,7 @@
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5790,7 +5776,6 @@
if test yes = "$lt_cv_irix_exported_symbol"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
- _LT_TAGVAR(link_all_deplibs, $1)=no
else
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
@@ -5812,7 +5797,7 @@
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/ofproto/automake.mk
^
|
| @@ -60,7 +60,7 @@
endif
pkgconfig_DATA += \
- $(srcdir)/ofproto/libofproto.pc
+ ofproto/libofproto.pc
# Distribute this generated file in order not to require Python at
# build time if ofproto/ipfix.xml is not modified.
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/ofproto/ofproto-dpif-sflow.c
^
|
| @@ -1001,7 +1001,7 @@
sflow_actions->tunnel.ip_tos = key->ipv4_tos;
}
if (key->ipv4_ttl) {
- sflow_actions->tunnel.ip_tos = key->ipv4_ttl;
+ sflow_actions->tunnel.ip_ttl = key->ipv4_ttl;
}
}
break;
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/ofproto/ofproto-dpif-xlate.c
^
|
| @@ -2476,6 +2476,7 @@
xlate_report(ctx, "MLD query, flooding");
xlate_normal_flood(ctx, in_xbundle, vlan);
}
+ return;
} else {
if (is_ip_local_multicast(flow, wc)) {
/* RFC4541: section 2.1.2, item 2: Packets with a dst IP
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/ovsdb/automake.mk
^
|
| @@ -38,7 +38,7 @@
ovsdb_libovsdb_la_CPPFLAGS = $(AM_CPPFLAGS)
pkgconfig_DATA += \
- $(srcdir)/ovsdb/libovsdb.pc
+ ovsdb/libovsdb.pc
MAN_FRAGMENTS += \
ovsdb/remote-active.man \
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/ovsdb/execution.c
^
|
| @@ -615,7 +615,7 @@
long long int timeout_msec = 0;
size_t i;
- timeout = ovsdb_parser_member(parser, "timeout", OP_NUMBER | OP_OPTIONAL);
+ timeout = ovsdb_parser_member(parser, "timeout", OP_INTEGER | OP_OPTIONAL);
where = ovsdb_parser_member(parser, "where", OP_ARRAY);
columns_json = ovsdb_parser_member(parser, "columns",
OP_ARRAY | OP_OPTIONAL);
@@ -633,7 +633,7 @@
}
if (!error) {
if (timeout) {
- timeout_msec = MIN(LLONG_MAX, json_real(timeout));
+ timeout_msec = json_integer(timeout);
if (timeout_msec < 0) {
error = ovsdb_syntax_error(timeout, NULL,
"timeout must be nonnegative");
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/ovsdb/ovsdb-tool.c
^
|
| @@ -458,6 +458,7 @@
ds_init(&s);
ovsdb_datum_to_string(&datum, type, &s);
value_string = ds_steal_cstr(&s);
+ ovsdb_datum_destroy(&datum, type);
} else {
ovsdb_error_destroy(error);
}
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/package.m4
^
|
| @@ -1,6 +1,6 @@
# Signature of the current package.
m4_define([AT_PACKAGE_NAME], [openvswitch])
m4_define([AT_PACKAGE_TARNAME], [openvswitch])
-m4_define([AT_PACKAGE_VERSION], [2.5.9])
-m4_define([AT_PACKAGE_STRING], [openvswitch 2.5.9])
+m4_define([AT_PACKAGE_VERSION], [2.5.12])
+m4_define([AT_PACKAGE_STRING], [openvswitch 2.5.12])
m4_define([AT_PACKAGE_BUGREPORT], [bugs@openvswitch.org])
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/python/ovs/version.py
^
|
| @@ -1,2 +1,2 @@
# Generated automatically -- do not modify! -*- buffer-read-only: t -*-
-VERSION = "2.5.9"
+VERSION = "2.5.12"
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/rhel/openvswitch-dkms.spec
^
|
| @@ -11,7 +11,7 @@
%define oname openvswitch
Name: %{oname}-dkms
-Version: 2.5.9
+Version: 2.5.12
Release: 1%{?dist}
Summary: Open vSwitch kernel module
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/rhel/openvswitch-fedora.spec
^
|
| @@ -33,7 +33,7 @@
Summary: Open vSwitch
Group: System Environment/Daemons
URL: http://www.openvswitch.org/
-Version: 2.5.9
+Version: 2.5.12
# Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the
# lib/sflow*.[ch] files are SISSL
@@ -257,7 +257,7 @@
%else
# Package install, not upgrade
if [ $1 -eq 1 ]; then
- /bin/systemctl daemon-reload >dev/null || :
+ /bin/systemctl daemon-reload >/dev/null || :
fi
%endif
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/rhel/openvswitch-fedora.spec.in
^
|
| @@ -256,7 +256,7 @@
%else
# Package install, not upgrade
if [ $1 -eq 1 ]; then
- /bin/systemctl daemon-reload >dev/null || :
+ /bin/systemctl daemon-reload >/dev/null || :
fi
%endif
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/rhel/openvswitch-kmod-fedora.spec
^
|
| @@ -17,7 +17,7 @@
Group: System Environment/Daemons
URL: http://www.openvswitch.org/
Vendor: OpenSource Security Ralf Spenneberg <ralf@os-s.net>
-Version: 2.5.9
+Version: 2.5.12
# The entire source code is ASL 2.0 except datapath/ which is GPLv2
License: GPLv2
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/rhel/openvswitch-kmod-rhel6.spec
^
|
| @@ -12,7 +12,7 @@
%define oname openvswitch
Name: %{oname}-kmod
-Version: 2.5.9
+Version: 2.5.12
Release: 1%{?dist}
Summary: Open vSwitch kernel module
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/rhel/openvswitch.spec
^
|
| @@ -17,7 +17,7 @@
Group: System Environment/Daemons
URL: http://www.openvswitch.org/
Vendor: Nicira, Inc.
-Version: 2.5.9
+Version: 2.5.12
License: ASL 2.0
Release: 1
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/tests/classifier.at
^
|
| @@ -306,3 +306,39 @@
])
OVS_VSWITCHD_STOP
AT_CLEANUP
+
+# Flow classifier a packet with excess of padding.
+AT_SETUP([flow classifier - packet with extra padding])
+OVS_VSWITCHD_START
+ADD_OF_PORTS([br0], 1, 2)
+AT_DATA([flows.txt], [dnl
+priority=5,ip,ip_dst=1.1.1.1,actions=1
+priority=5,ip,ip_dst=1.1.1.2,actions=2
+priority=0,actions=drop
+])
+AT_CHECK([ovs-ofctl add-flows br0 flows.txt])
+packet=00020202020000010101010008004500001c00010000401176cc01010101010101020d6a00350008ee3a
+AT_CHECK([ovs-appctl ofproto/trace br0 in_port=1 $packet] , [0], [stdout])
+AT_CHECK([tail -2 stdout], [0],
+ [Megaflow: recirc_id=0,ip,in_port=1,nw_dst=1.1.1.2,nw_frag=no
+Datapath actions: 2
+])
+# normal packet plus 255 bytes of padding (8bit padding).
+# 255 * 2 = 510
+padding=$(printf '%*s' 510 | tr ' ' '0')
+AT_CHECK([ovs-appctl ofproto/trace br0 in_port=1 ${packet}${padding}] , [0], [stdout])
+AT_CHECK([tail -2 stdout], [0],
+ [Megaflow: recirc_id=0,ip,in_port=1,nw_dst=1.1.1.2,nw_frag=no
+Datapath actions: 2
+])
+# normal packet plus padding up to 65535 bytes of length (16bit limit).
+# 65535 - 43 = 65492
+# 65492 * 2 = 130984
+padding=$(printf '%*s' 130984 | tr ' ' '0')
+AT_CHECK([ovs-appctl ofproto/trace br0 in_port=1 ${packet}${padding}], [0], [stdout])
+AT_CHECK([tail -2 stdout], [0],
+ [Megaflow: recirc_id=0,ip,in_port=1,nw_dst=1.1.1.2,nw_frag=no
+Datapath actions: 2
+])
+OVS_VSWITCHD_STOP
+AT_CLEANUP
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/tests/library.at
^
|
| @@ -47,7 +47,8 @@
AT_CLEANUP
AT_SETUP([test SHA-1])
-AT_CHECK([ovstest test-sha1], [0], [.........
+AT_KEYWORDS([sha1])
+AT_CHECK([ovstest test-sha1], [0], [..........
])
AT_CLEANUP
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/tests/system-kmod-testsuite
^
|
| @@ -952,7 +952,7 @@
# List of tests.
if $at_list_p; then
cat <<_ATEOF || at_write_fail=1
-openvswitch 2.5.9 test suite test groups:
+openvswitch 2.5.12 test suite test groups:
NUM: FILE-NAME:LINE TEST-GROUP-NAME
KEYWORDS
@@ -993,7 +993,7 @@
exit $at_write_fail
fi
if $at_version_p; then
- $as_echo "$as_me (openvswitch 2.5.9)" &&
+ $as_echo "$as_me (openvswitch 2.5.12)" &&
cat <<\_ATEOF || at_write_fail=1
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1186,13 +1186,13 @@
exec 5>>"$at_suite_log"
# Banners and logs.
-$as_echo "## ----------------------------- ##
-## openvswitch 2.5.9 test suite. ##
-## ----------------------------- ##"
+$as_echo "## ------------------------------ ##
+## openvswitch 2.5.12 test suite. ##
+## ------------------------------ ##"
{
- $as_echo "## ----------------------------- ##
-## openvswitch 2.5.9 test suite. ##
-## ----------------------------- ##"
+ $as_echo "## ------------------------------ ##
+## openvswitch 2.5.12 test suite. ##
+## ------------------------------ ##"
echo
$as_echo "$as_me: command line was:"
@@ -2381,7 +2381,7 @@
$as_echo "Please send $at_msg and all information you think might help:
To: <bugs@openvswitch.org>
- Subject: [openvswitch 2.5.9] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+ Subject: [openvswitch 2.5.12] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
You may investigate any problem if you feel able to do so, in which
case the test suite provides a good starting point. Its output may
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/tests/system-userspace-testsuite
^
|
| @@ -952,7 +952,7 @@
# List of tests.
if $at_list_p; then
cat <<_ATEOF || at_write_fail=1
-openvswitch 2.5.9 test suite test groups:
+openvswitch 2.5.12 test suite test groups:
NUM: FILE-NAME:LINE TEST-GROUP-NAME
KEYWORDS
@@ -993,7 +993,7 @@
exit $at_write_fail
fi
if $at_version_p; then
- $as_echo "$as_me (openvswitch 2.5.9)" &&
+ $as_echo "$as_me (openvswitch 2.5.12)" &&
cat <<\_ATEOF || at_write_fail=1
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1186,13 +1186,13 @@
exec 5>>"$at_suite_log"
# Banners and logs.
-$as_echo "## ----------------------------- ##
-## openvswitch 2.5.9 test suite. ##
-## ----------------------------- ##"
+$as_echo "## ------------------------------ ##
+## openvswitch 2.5.12 test suite. ##
+## ------------------------------ ##"
{
- $as_echo "## ----------------------------- ##
-## openvswitch 2.5.9 test suite. ##
-## ----------------------------- ##"
+ $as_echo "## ------------------------------ ##
+## openvswitch 2.5.12 test suite. ##
+## ------------------------------ ##"
echo
$as_echo "$as_me: command line was:"
@@ -2381,7 +2381,7 @@
$as_echo "Please send $at_msg and all information you think might help:
To: <bugs@openvswitch.org>
- Subject: [openvswitch 2.5.9] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+ Subject: [openvswitch 2.5.12] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
You may investigate any problem if you feel able to do so, in which
case the test suite provides a good starting point. Its output may
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/tests/test-classifier.c
^
|
| @@ -512,8 +512,9 @@
int i;
for (i = 0; i < cls->n_tries; i++) {
- n_rules += trie_verify(&cls->tries[i].root, 0,
- cls->tries[i].field->n_bits);
+ const struct mf_field * cls_field
+ = ovsrcu_get(struct mf_field *, &cls->tries[i].field);
+ n_rules += trie_verify(&cls->tries[i].root, 0, cls_field->n_bits);
}
assert(n_rules <= cls->n_rules);
}
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/tests/test-sha1.c
^
|
| @@ -138,6 +138,42 @@
}
static void
+test_huge_vector(void)
+{
+ enum { SIZE = 1000000000 };
+ struct test_vector vec = {
+ NULL, SIZE,
+ /* Computed by the sha1sum utility for a file with 10^9 symbols 'a'. */
+ { 0xD0, 0xF3, 0xE4, 0xF2, 0xF3, 0x1C, 0x66, 0x5A, 0xBB, 0xD8,
+ 0xF5, 0x18, 0xE8, 0x48, 0xD5, 0xCB, 0x80, 0xCA, 0x78, 0xF7 }
+ };
+ int chunk = random_range(SIZE / 10000);
+ uint8_t md[SHA1_DIGEST_SIZE];
+ struct sha1_ctx sha1;
+ size_t i, sz;
+
+ /* It's not user-friendly to allocate 1GB of memory for a unit test,
+ * so we're allocating only a small chunk and re-using it. */
+ vec.data = xmalloc(chunk);
+ for (i = 0; i < chunk; i++) {
+ vec.data[i] = 'a';
+ }
+
+ sha1_init(&sha1);
+ for (sz = 0; sz < SIZE; sz += chunk) {
+ int n = sz + chunk < SIZE ? chunk : SIZE - sz;
+
+ sha1_update(&sha1, vec.data, n);
+ }
+ sha1_final(&sha1, md);
+ ovs_assert(!memcmp(md, vec.output, SHA1_DIGEST_SIZE));
+
+ free(vec.data);
+ putchar('.');
+ fflush(stdout);
+}
+
+static void
test_shar1_main(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
{
int i;
@@ -147,6 +183,7 @@
}
test_big_vector();
+ test_huge_vector();
putchar('\n');
}
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/tests/testsuite
^
|
| @@ -646,32 +646,32 @@
38;library.at:36;test atomic operations;;
39;library.at:40;test linked lists;;
40;library.at:45;test packet library;;
-41;library.at:49;test SHA-1;;
-42;library.at:54;test type properties;;
-43;library.at:58;test strtok_r bug fix;;
-44;library.at:63;test byte order conversion;byte order;
-45;library.at:68;test random number generator;;
-46;library.at:120;ctz() function;ctz;
-47;library.at:120;clz() function;clz;
-48;library.at:120;round_up_pow2() function;round_up_pow2;
-49;library.at:120;round_down_pow2() function;round_down_pow2;
-50;library.at:120;count_1bits() function;count_1bits;
-51;library.at:120;log_2_floor() function;log_2_floor;
-52;library.at:120;bitwise_copy() function;bitwise_copy;
-53;library.at:120;bitwise_zero() function;bitwise_zero;
-54;library.at:120;bitwise_one() function;bitwise_one;
-55;library.at:120;bitwise_is_all_zeros() function;bitwise_is_all_zeros;
-56;library.at:120;ovs_scan() function;ovs_scan;
-57;library.at:138;test unix socket, short pathname - C;;
-58;library.at:148;test unix socket, long pathname - C;;
-59;library.at:157;test unix socket, short pathname - Python;;
-60;library.at:167;test unix socket, long pathname - Python;;
-61;library.at:176;ovs_assert;;
-62;library.at:199;snprintf;;
-63;library.at:203;test bitmap functions;;
-64;library.at:208;use of public headers;;
-65;library.at:212;test ofpbuf module;;
-66;library.at:216;test rcu;;
+41;library.at:49;test SHA-1;sha1;
+42;library.at:55;test type properties;;
+43;library.at:59;test strtok_r bug fix;;
+44;library.at:64;test byte order conversion;byte order;
+45;library.at:69;test random number generator;;
+46;library.at:121;ctz() function;ctz;
+47;library.at:121;clz() function;clz;
+48;library.at:121;round_up_pow2() function;round_up_pow2;
+49;library.at:121;round_down_pow2() function;round_down_pow2;
+50;library.at:121;count_1bits() function;count_1bits;
+51;library.at:121;log_2_floor() function;log_2_floor;
+52;library.at:121;bitwise_copy() function;bitwise_copy;
+53;library.at:121;bitwise_zero() function;bitwise_zero;
+54;library.at:121;bitwise_one() function;bitwise_one;
+55;library.at:121;bitwise_is_all_zeros() function;bitwise_is_all_zeros;
+56;library.at:121;ovs_scan() function;ovs_scan;
+57;library.at:139;test unix socket, short pathname - C;;
+58;library.at:149;test unix socket, long pathname - C;;
+59;library.at:158;test unix socket, short pathname - Python;;
+60;library.at:168;test unix socket, long pathname - Python;;
+61;library.at:177;ovs_assert;;
+62;library.at:200;snprintf;;
+63;library.at:204;test bitmap functions;;
+64;library.at:209;use of public headers;;
+65;library.at:213;test ofpbuf module;;
+66;library.at:217;test rcu;;
67;heap.at:8;heap library -- insert delete same order;;
68;heap.at:9;heap library -- insert delete reverse order;;
69;heap.at:10;heap library -- insert delete every order;;
@@ -708,1660 +708,1662 @@
100;classifier.at:171;multiple conjunctive match;;
101;classifier.at:247;conjunctive match priority fallback;;
102;classifier.at:293;conjunctive match and other actions;;
-103;check-structs.at:11;check struct tail padding;check-structs;
-104;check-structs.at:21;check struct internal alignment;check-structs;
-105;check-structs.at:32;check struct declared size;check-structs;
-106;check-structs.at:44;check wrong struct's declared size;check-structs;
-107;daemon.at:3;daemon;;
-108;daemon.at:22;daemon --monitor;;
-109;daemon.at:71;daemon --detach;;
-110;daemon.at:94;daemon --detach --monitor;;
-111;daemon.at:144;daemon --detach startup errors;;
-112;daemon.at:153;daemon --detach --monitor startup errors;;
-113;daemon.at:163;daemon --service;windows-service;
-114;daemon-py.at:3;daemon - Python;;
-115;daemon-py.at:21;daemon --monitor - Python;;
-116;daemon-py.at:64;daemon --monitor restart exit code - Python;;
-117;daemon-py.at:107;daemon --detach - Python;;
-118;daemon-py.at:123;daemon --detach --monitor - Python;;
-119;daemon-py.at:172;daemon --detach startup errors - Python;;
-120;daemon-py.at:181;daemon --detach --monitor startup errors - Python;;
-121;daemon-py.at:190;daemon --detach closes standard fds - Python;;
-122;daemon-py.at:210;daemon --detach --monitor closes standard fds;;
-123;ofp-actions.at:3;OpenFlow 1.0 action translation;ofp-actions of1.0;
-124;ofp-actions.at:202;OpenFlow 1.0 \"instruction\" translations;ofp-actions of1.0 instruction;
-125;ofp-actions.at:232;OpenFlow 1.1 action translation;ofp-actions of1.1;
-126;ofp-actions.at:369;OpenFlow 1.1 instruction translation;of1.1 instruction ofp-actions;
-127;ofp-actions.at:580;OpenFlow 1.2 action translation;ofp-actions of1.2;
-128;ofp-actions.at:606;OpenFlow 1.3 action translation;ofp-actions of1.3;
-129;ofp-actions.at:634;OpenFlow 1.5 action translation;ofp-actions of1.5;
-130;ofp-actions.at:658;ofp-actions - inconsistent MPLS actions;;
-131;ofp-actions.at:670;reg_load <-> set_field translation corner case;ofp-actions;
-132;ofp-print.at:3;empty;ofp-print;
-133;ofp-print.at:9;too short;ofp-print;
-134;ofp-print.at:17;wrong OpenFlow version;ofp-print;
-135;ofp-print.at:27;truncated message;ofp-print;
-136;ofp-print.at:35;message only uses part of buffer;ofp-print;
-137;ofp-print.at:44;OFPT_HELLO - ordinary;ofp-print;
-138;ofp-print.at:52;OFPT_HELLO with extra data;ofp-print;
-139;ofp-print.at:64;OFPT_HELLO with version bitmap;ofp-print;
-140;ofp-print.at:73;OFPT_HELLO with version bitmap and extra data;ofp-print;
-141;ofp-print.at:87;OFPT_HELLO with higher than supported version;ofp-print;
-142;ofp-print.at:106;OFPT_HELLO with contradictory version bitmaps;ofp-print;
-143;ofp-print.at:148;OFPT_ECHO_REQUEST, empty payload;ofp-print;
-144;ofp-print.at:155;OFPT_ECHO_REQUEST, 5-byte payload;ofp-print;
-145;ofp-print.at:163;OFPT_ECHO_REPLY, empty payload;ofp-print;
-146;ofp-print.at:170;OFPT_ECHO_REPLY, 5-byte payload;ofp-print;
-147;ofp-print.at:178;OFPT_FEATURES_REQUEST;ofp-print;
-148;ofp-print.at:185;OFPT_FEATURES_REPLY - OF1.0;ofp-print;
-149;ofp-print.at:235;OFPT_FEATURES_REPLY cut off mid-port - OF1.0;ofp-print;
-150;ofp-print.at:274;OFPT_FEATURES_REPLY - OF1.1;ofp-print;
-151;ofp-print.at:305;OFPT_FEATURES_REPLY cut off mid-port - OF1.1;ofp-print;
-152;ofp-print.at:334;OFPT_FEATURES_REPLY - OF1.2;ofp-print;
-153;ofp-print.at:365;OFPT_FEATURES_REPLY cut off mid-port - OF1.2;ofp-print;
-154;ofp-print.at:394;OFPT_FEATURES_REPLY - OF1.3;ofp-print;
-155;ofp-print.at:406;OFPT_FEATURES_REPLY - OF1.4;ofp-print;
-156;ofp-print.at:418;OFPT_FEATURES_REPLY - OF1.5;ofp-print;
-157;ofp-print.at:430;OFPT_FEATURES_REPLY - with auxiliary_id - OF1.3;ofp-print;
-158;ofp-print.at:442;OFPT_GET_CONFIG_REQUEST;ofp-print;
-159;ofp-print.at:449;OFPT_GET_CONFIG_REPLY, most common form;ofp-print;
-160;ofp-print.at:457;OFPT_GET_CONFIG_REPLY, frags and miss_send_len;ofp-print;
-161;ofp-print.at:464;OFPT_PACKET_IN - OF1.0;ofp-print;
-162;ofp-print.at:478;OFPT_PACKET_IN - OF1.0, with hex output of packet data;ofp-print;
-163;ofp-print.at:496;OFPT_PACKET_IN - OF1.1;ofp-print;
-164;ofp-print.at:511;OFPT_PACKET_IN - OF1.2;ofp-print;
-165;ofp-print.at:525;OFPT_PACKET_IN - OF1.2, with hex output of packet data;ofp-print;
-166;ofp-print.at:542;OFPT_PACKET_IN - OF1.3;ofp-print;
-167;ofp-print.at:557;OFPT_PACKET_IN - OF1.4;ofp-print;
-168;ofp-print.at:572;OFPT_PACKET_IN - OF1.5;ofp-print;
-169;ofp-print.at:587;OFPT_PACKET_IN - OF1.3, with hex output of packet data;ofp-print;
-170;ofp-print.at:605;OFPT_FLOW_REMOVED - OF1.0;ofp-print;
-171;ofp-print.at:619;OFPT_FLOW_REMOVED - OF1.2;ofp-print;
-172;ofp-print.at:630;OFPT_FLOW_REMOVED - OF1.3;ofp-print;
-173;ofp-print.at:641;OFPT_PORT_STATUS - OF1.0;ofp-print;
-174;ofp-print.at:659;OFPT_PORT_STATUS - OF1.1;ofp-print;
-175;ofp-print.at:678;OFPT_PORT_STATUS - OF1.4;ofp-print;
-176;ofp-print.at:698;OFPT_PACKET_OUT - OF1.0;ofp-print;
-177;ofp-print.at:712;OFPT_PACKET_OUT - OF1.0, with packet;ofp-print;
-178;ofp-print.at:727;OFPT_PACKET_OUT - OF1.0, with hex output of packet data;ofp-print;
-179;ofp-print.at:746;OFPT_PACKET_OUT - OF1.1;ofp-print;
-180;ofp-print.at:757;OFPT_PACKET_OUT - OF1.1, with packet;ofp-print;
-181;ofp-print.at:774;OFPT_FLOW_MOD - OF1.0 - low verbosity;ofp-print;
-182;ofp-print.at:792;OFPT_FLOW_MOD - OF1.1 - low verbosity;ofp-print;
-183;ofp-print.at:812;OFPT_FLOW_MOD - OF1.2 - low verbosity;ofp-print;
-184;ofp-print.at:832;OFPT_FLOW_MOD - OF1.0 - high verbosity;ofp-print;
-185;ofp-print.at:850;OFPT_FLOW_MOD - OF1.2 - low verbosity;ofp-print;
-186;ofp-print.at:869;OFPT_FLOW_MOD - OF1.3 - flags - low verbosity;ofp-print;
-187;ofp-print.at:887;OFPT_FLOW_MOD - OF1.2 - set-field ip_src;ofp-print;
-188;ofp-print.at:902;OFPT_FLOW_MOD - OF1.2 - set-field ip_dst;ofp-print;
-189;ofp-print.at:917;OFPT_FLOW_MOD - OF1.2 - set-field sctp_src;ofp-print;
-190;ofp-print.at:932;OFPT_FLOW_MOD - OF1.2 - set-field sctp_dst;ofp-print;
-191;ofp-print.at:947;OFPT_FLOW_MOD - OF1.2 - experimenter OXM;ofp-print;
-192;ofp-print.at:961;OFPT_FLOW_MOD - OF1.2 - set-field nd_target, nd_sll;ofp-print;
-193;ofp-print.at:979;OFPT_FLOW_MOD - OF1.3 - meter;ofp-print;
-194;ofp-print.at:990;OFPT_FLOW reply - OF1.2 - set-field ip_src;ofp-print;
-195;ofp-print.at:1007;OFPT_FLOW reply - OF1.2 - set-field ip_dst;ofp-print;
-196;ofp-print.at:1024;OFPT_FLOW reply - OF1.2 - set-field sctp_src;ofp-print;
-197;ofp-print.at:1041;OFPT_FLOW reply - OF1.2 - set-field sctp_dst;ofp-print;
-198;ofp-print.at:1058;OFPT_PORT_MOD - OF1.0;ofp-print;
-199;ofp-print.at:1071;OFPT_PORT_MOD - OF1.1;ofp-print;
-200;ofp-print.at:1085;OFPT_PORT_MOD - OF1.2;ofp-print;
-201;ofp-print.at:1099;OFPT_PORT_MOD - OF1.3;ofp-print;
-202;ofp-print.at:1113;OFPT_PORT_MOD - OF1.4;ofp-print;
-203;ofp-print.at:1127;OFPT_TABLE_MOD - OF1.1;ofp-print;
-204;ofp-print.at:1136;OFPT_TABLE_MOD - OF1.2;ofp-print;
-205;ofp-print.at:1145;OFPT_TABLE_MOD - OF1.3;ofp-print;
-206;ofp-print.at:1154;OFPT_TABLE_MOD - OF1.4;ofp-print;
-207;ofp-print.at:1163;OFPST_DESC request;ofp-print ofpt_stats_request;
-208;ofp-print.at:1170;OFPST_DESC reply;ofp-print ofpt_stats_reply;
-209;ofp-print.at:1250;OFPST_FLOW request - OF1.0;ofp-print ofpt_stats_request;
-210;ofp-print.at:1262;OFPST_FLOW request - OF1.2;ofp-print ofpt_stats_request;
-211;ofp-print.at:1274;OFPST_FLOW request - OF1.3;ofp-print ofpt_stats_request;
-212;ofp-print.at:1286;OFPST_FLOW reply - OF1.0;ofp-print ofpt_stats_reply;
-213;ofp-print.at:1330;OFPST_FLOW reply - OF1.2;ofp-print ofpt_stats_reply;
-214;ofp-print.at:1365;OFPST_AGGREGATE request - OF1.0;ofp-print ofpt_stats_request;
-215;ofp-print.at:1377;OFPST_AGGREGATE request - OF1.2;ofp-print ofpt_stats_request;
-216;ofp-print.at:1389;OFPST_AGGREGATE request - OF1.3;ofp-print ofpt_stats_request;
-217;ofp-print.at:1401;OFPST_AGGREGATE reply - OF1.0;ofp-print ofpt_stats_reply;
-218;ofp-print.at:1412;OFPST_AGGREGATE reply - OF1.2;ofp-print ofpt_stats_reply;
-219;ofp-print.at:1423;OFPST_AGGREGATE reply - OF1.3;ofp-print ofpt_stats_reply;
-220;ofp-print.at:1434;OFPST_TABLE request - OF1.0;ofp-print ofpt_stats_request;
-221;ofp-print.at:1441;OFPST_TABLE request - OF1.1;ofp-print ofpt_stats_request;
-222;ofp-print.at:1448;OFPST_TABLE request - OF1.2;ofp-print ofpt_stats_request;
-223;ofp-print.at:1455;OFPST_TABLE request - OF1.3;ofp-print ofpt_stats_request;
-224;ofp-print.at:1462;OFPST_TABLE reply - OF1.0;ofp-print ofpt_stats_reply;
-225;ofp-print.at:1491;OFPST_TABLE reply - OF1.2;ofp-print ofpt_stats_reply;
-226;ofp-print.at:1582;OFPST_TABLE reply - OF1.3;ofp-print ofpt_stats_reply;
-227;ofp-print.at:1599;OFPST_PORT request - 1.0;ofp-print ofpt_stats_request;
-228;ofp-print.at:1609;OFPST_PORT request - 1.1;ofp-print ofpt_stats_request;
-229;ofp-print.at:1619;OFPST_PORT request - 1.2;ofp-print ofpt_stats_request;
-230;ofp-print.at:1629;OFPST_PORT request - 1.3;ofp-print ofpt_stats_request;
-231;ofp-print.at:1639;OFPST_PORT reply - OF1.0;ofp-print ofpt_stats_reply;
-232;ofp-print.at:1682;OFPST_PORT reply - OF1.2;ofp-print ofpt_stats_reply;
-233;ofp-print.at:1717;OFPST_PORT reply - OF1.3;ofp-print ofpt_stats_reply;
-234;ofp-print.at:1756;OFPST_PORT reply - OF1.4;ofp-print ofpt_stats_reply;
-235;ofp-print.at:1776;OFPST_QUEUE request - OF1.0;ofp-print ofpt_stats_request;
-236;ofp-print.at:1786;OFPST_QUEUE request - OF1.1;ofp-print ofpt_stats_request;
-237;ofp-print.at:1796;OFPST_QUEUE request - OF1.2;ofp-print ofpt_stats_request;
-238;ofp-print.at:1806;OFPST_QUEUE request - OF1.3;ofp-print ofpt_stats_request;
-239;ofp-print.at:1816;OFPST_QUEUE reply - OF1.0;ofp-print ofpt_stats_reply;
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/tests/tunnel.at
^
|
| @@ -109,6 +109,35 @@
OVS_VSWITCHD_STOP(["/dropping tunnel packet marked ECN CE but is not ECN capable/d"])
AT_CLEANUP
+AT_SETUP([tunnel - too long nested attributes])
+OVS_VSWITCHD_START([add-port br0 p1 \
+ -- set Interface p1 type=gre options:remote_ip=1.1.1.1 ofport_request=1 \
+ -- add-port br0 p2 -- set Interface p2 type=dummy ofport_request=2])
+
+AT_CHECK([ovs-appctl dpif/show | tail -n +3], [0], [dnl
+ br0 65534/100: (dummy)
+ p1 1/1: (gre: remote_ip=1.1.1.1)
+ p2 2/2: (dummy)
+])
+
+dst_single="dst=1.1.1.1"
+dst_rep=${dst_single}
+dnl Size of one OVS_TUNNEL_KEY_ATTR_IPV4_DST is 4 bytes + NLA_HDRLEN (4 bytes).
+dnl One nested message has room for UINT16_MAX - NLA_HDRLEN (4) bytes, i.e.
+dnl (UINT16_MAX - NLA_HDRLEN) / (4 + NLA_HDRLEN) = 8191.375 of dst addresses.
+for i in `seq 1 8192` ; do
+ dst_rep="${dst_rep},${dst_single}"
+done
+
+AT_CHECK([ovs-appctl dpctl/add-flow "tunnel(${dst_rep})" "2"],
+ [2], [ignore], [dnl
+ovs-vswitchd: parsing flow key (Argument list too long)
+ovs-appctl: ovs-vswitchd: server returned an error
+])
+
+OVS_VSWITCHD_STOP
+AT_CLEANUP
+
AT_SETUP([tunnel - output])
OVS_VSWITCHD_START([add-port br0 p1 -- set Interface p1 type=gre \
options:remote_ip=1.1.1.1 options:local_ip=2.2.2.2 \
|
|
[-]
[+]
|
Changed |
openvswitch-2.5.12.tar.gz/xenserver/openvswitch-xen.spec
^
|
| @@ -32,7 +32,7 @@
# rpmbuild -bb --without check xenserver/openvswitch-xen.spec
%if %{?openvswitch_version:0}%{!?openvswitch_version:1}
-%define openvswitch_version 2.5.9
+%define openvswitch_version 2.5.12
%endif
%if %{?kernel_uname:1}%{!?kernel_uname:0}
|
|
[-]
[+]
|
Deleted |
openvswitch-2.5.9.tar.gz/.travis
^
|
| -(directory)
|
|
[-]
[+]
|
Deleted |
openvswitch-2.5.9.tar.gz/.travis.yml
^
|
| @@ -1,40 +0,0 @@
-language: c
-compiler:
- - gcc
- - clang
-
-addons:
- apt:
- packages:
- - bc
- - gcc-multilib
- - libssl-dev
- - llvm-dev
-
-before_install: ./.travis/prepare.sh
-
-before_script: export PATH=$PATH:$HOME/bin
-
-env:
- - OPTS="--disable-ssl"
- - TESTSUITE=1 KERNEL=3.18.1
- - TESTSUITE=1 OPTS="--enable-shared"
- - BUILD_ENV="-m32" OPTS="--disable-ssl"
- - KERNEL=3.17.7 DPDK=1
- - KERNEL=3.17.7 DPDK=1 OPTS="--enable-shared"
- - KERNEL=4.3.5
- - KERNEL=4.1.17
- - KERNEL=3.18.26
- - KERNEL=3.14.60
- - KERNEL=3.12.53
- - KERNEL=3.10.96
- - KERNEL=3.4.110
- - KERNEL=3.2.76
- - KERNEL=2.6.32.70
-
-script: ./.travis/build.sh $OPTS
-
-notifications:
- email:
- recipients:
- - ovs-build@openvswitch.org
|
