This repository has been archived by the owner on Aug 5, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 48
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #353 from dawagner/dont-leak-asio-headers
Make network dependency optional - Add cmake option NETWORKING to stub ASIO - If networking is requested (tunning allowed), the PF will fail to start - Require cmake 3.0.0 for asio stub INTERFACE lib. - If networking is off, remove the asio dependency. Internal: Don't leak asio headers from libremote-processor.
- Loading branch information
Showing
17 changed files
with
386 additions
and
98 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| # Copyright (c) 2016, Intel Corporation | ||
| # All rights reserved. | ||
| # | ||
| # Redistribution and use in source and binary forms, with or without modification, | ||
| # are permitted provided that the following conditions are met: | ||
| # | ||
| # 1. Redistributions of source code must retain the above copyright notice, this | ||
| # list of conditions and the following disclaimer. | ||
| # | ||
| # 2. Redistributions in binary form must reproduce the above copyright notice, | ||
| # this list of conditions and the following disclaimer in the documentation and/or | ||
| # other materials provided with the distribution. | ||
| # | ||
| # 3. Neither the name of the copyright holder nor the names of its contributors | ||
| # may be used to endorse or promote products derived from this software without | ||
| # specific prior written permission. | ||
| # | ||
| # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | ||
| # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR | ||
| # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
| # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| # ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
| add_library(asio INTERFACE) | ||
|
|
||
| if (NETWORKING) | ||
| # Find ASIO (the standalone version, not Boost) If asio isn't installed in | ||
| # a standard directory, add the correct directory to CMAKE_PREFIX_PATH (see | ||
| # the main README for more information). | ||
| find_path(ASIO_DIR NAMES asio.hpp) | ||
| # Hide this variable from CMake GUIs and `cmake -L` | ||
| set_property(CACHE ASIO_DIR PROPERTY ADVANCED TRUE) | ||
| if (NOT ASIO_DIR) | ||
| message(SEND_ERROR | ||
| " ASIO header (asio.hpp) could not be found. | ||
| ASIO is used for networking. On Linux, you should install it using your | ||
| package manager. On Windows, please refer to the main README.") | ||
| endif() | ||
|
|
||
| # Ubuntu 14.04 packages asio 1.10.1 and clang 3.4.1. | ||
| # In this environment, asio stand alone (set ASIO_STANDALONE) | ||
| # does not correcly detect that the stl has CHRONO support (c++11). | ||
| # Force the use of std::chrono by setting ASIO_HAS_STD_CHRONO | ||
| target_include_directories(asio SYSTEM INTERFACE "${ASIO_DIR}") | ||
| target_link_libraries(asio INTERFACE "${CMAKE_THREAD_LIBS_INIT}") | ||
| target_compile_definitions(asio | ||
| INTERFACE ASIO_STANDALONE | ||
| INTERFACE ASIO_HAS_STD_CHRONO) | ||
| else() | ||
| # Stubbed version | ||
| target_include_directories(asio INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/stub") | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| /* | ||
| * Copyright (c) 2016, Intel Corporation | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without modification, | ||
| * are permitted provided that the following conditions are met: | ||
| * | ||
| * 1. Redistributions of source code must retain the above copyright notice, this | ||
| * list of conditions and the following disclaimer. | ||
| * | ||
| * 2. Redistributions in binary form must reproduce the above copyright notice, | ||
| * this list of conditions and the following disclaimer in the documentation and/or | ||
| * other materials provided with the distribution. | ||
| * | ||
| * 3. Neither the name of the copyright holder nor the names of its contributors | ||
| * may be used to endorse or promote products derived from this software without | ||
| * specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | ||
| * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR | ||
| * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
| * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
| * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
| #pragma once | ||
|
|
||
| /** @file | ||
| * | ||
| * Stubs ASIO interfaces called by libremote-processor. This is used when | ||
| * the user asks for networking support to be compiled out. | ||
| */ | ||
|
|
||
| #include <system_error> | ||
|
|
||
| namespace asio | ||
| { | ||
| struct dummy_base | ||
| { | ||
| template <class... Args> | ||
| dummy_base(Args &&...) | ||
| { | ||
| } | ||
| void set_option(const dummy_base &) const {}; | ||
| }; | ||
| inline bool write(const dummy_base &, const dummy_base &, const dummy_base &) | ||
| { | ||
| return true; | ||
| } | ||
| inline bool read(const dummy_base &, const dummy_base &, const dummy_base &) | ||
| { | ||
| return true; | ||
| } | ||
| using buffer = dummy_base; | ||
| struct io_service : dummy_base | ||
| { | ||
| template <class... Args> | ||
| io_service(Args &&...) | ||
| { | ||
| throw std::runtime_error("Stub constructor called. Did you forget to set the " | ||
| "'TuningAllowed' attribute to 'false' in the Parameter " | ||
| "Framework's toplevel configuration file?"); | ||
| } | ||
|
|
||
| void run(const dummy_base &) const {}; | ||
| void stop() const {}; | ||
| }; | ||
| struct socket_base : dummy_base | ||
| { | ||
| using dummy_base::dummy_base; | ||
|
|
||
| using linger = dummy_base; | ||
| using enable_connection_aborted = dummy_base; | ||
| void close() const {}; | ||
| }; | ||
|
|
||
| bool write(const dummy_base &, const dummy_base &, const dummy_base &); | ||
| bool read(const dummy_base &, const dummy_base &, const dummy_base &); | ||
|
|
||
| struct error_code : dummy_base, std::error_code | ||
| { | ||
| }; | ||
| namespace error | ||
| { | ||
| static const error_code eof{}; | ||
| } | ||
|
|
||
| namespace ip | ||
| { | ||
| namespace tcp | ||
| { | ||
| using v6 = dummy_base; | ||
| using no_delay = dummy_base; | ||
| using socket = socket_base; | ||
| struct endpoint : dummy_base | ||
| { | ||
| using dummy_base::dummy_base; | ||
|
|
||
| dummy_base protocol() const { return {}; }; | ||
| }; | ||
| struct acceptor : dummy_base | ||
| { | ||
| using dummy_base::dummy_base; | ||
|
|
||
| using reuse_address = dummy_base; | ||
| void open(const dummy_base &) const {}; | ||
| void bind(const dummy_base &) const {}; | ||
| void listen() const {}; | ||
| void async_accept(const dummy_base &, const dummy_base &) const {}; | ||
| }; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.