Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use version independent TLS method because TLSv1_2_method is deprecated #19

Closed
wants to merge 3 commits into from
Closed

use version independent TLS method because TLSv1_2_method is deprecated #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea29f5a
use version independent TLS method because TLSv1_2_method is deprecated
Jun 20, 2017
c980695
add version suffix to shared library
Jun 21, 2017
6b5c718
move header files into include sub-directory "awsiotsdk" for cleaner …
Jun 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ endif()
set(SDK_TARGET_NAME aws-iot-sdk-cpp)
if (BUILD_SHARED_LIBRARY)
add_library(${SDK_TARGET_NAME} SHARED "")
set_target_properties(${SDK_TARGET_NAME} PROPERTIES SUFFIX ".so")
set_target_properties(${SDK_TARGET_NAME} PROPERTIES VERSION 1.1.0)
else()
add_library(${SDK_TARGET_NAME} "")
endif()
Expand Down Expand Up @@ -93,13 +93,13 @@ endif()
################################################
# TODO : Figure out a better way of handling Visual Studio solutions
if(MSVC)
file(GLOB SDK_COMMON_HEADERS "${PROJECT_SOURCE_DIR}/include/*.hpp")
file(GLOB SDK_UTIL_COMMON_HEADERS "${PROJECT_SOURCE_DIR}/include/util/*.hpp")
file(GLOB SDK_UTIL_LOGGING_HEADERS "${PROJECT_SOURCE_DIR}/include/util/logging/*.hpp")
file(GLOB SDK_UTIL_MEMORY_STL_HEADERS "${PROJECT_SOURCE_DIR}/include/util/memory/stl/*.hpp")
file(GLOB SDK_UTIL_THREADING_HEADERS "${PROJECT_SOURCE_DIR}/include/util/threading/*.hpp")
file(GLOB SDK_MQTT_HEADERS "${PROJECT_SOURCE_DIR}/include/mqtt/*.hpp")
file(GLOB SDK_SHADOW_HEADERS "${PROJECT_SOURCE_DIR}/include/shadow/*.hpp")
file(GLOB SDK_COMMON_HEADERS "${PROJECT_SOURCE_DIR}/include/awsiotsdk/*.hpp")
file(GLOB SDK_UTIL_COMMON_HEADERS "${PROJECT_SOURCE_DIR}/include/awsiotsdk/util/*.hpp")
file(GLOB SDK_UTIL_LOGGING_HEADERS "${PROJECT_SOURCE_DIR}/include/awsiotsdk/util/logging/*.hpp")
file(GLOB SDK_UTIL_MEMORY_STL_HEADERS "${PROJECT_SOURCE_DIR}/include/awsiotsdk/util/memory/stl/*.hpp")
file(GLOB SDK_UTIL_THREADING_HEADERS "${PROJECT_SOURCE_DIR}/include/awsiotsdk/util/threading/*.hpp")
file(GLOB SDK_MQTT_HEADERS "${PROJECT_SOURCE_DIR}/include/awsiotsdk/mqtt/*.hpp")
file(GLOB SDK_SHADOW_HEADERS "${PROJECT_SOURCE_DIR}/include/awsiotsdk/shadow/*.hpp")

file(GLOB SDK_COMMON_SOURCES "${PROJECT_SOURCE_DIR}/src/*.cpp")
file(GLOB SDK_UTIL_COMMON_SOURCES "${PROJECT_SOURCE_DIR}/src/util/*.cpp")
Expand All @@ -109,7 +109,7 @@ if(MSVC)
file(GLOB SDK_SHADOW_SOURCES "${PROJECT_SOURCE_DIR}/src/shadow/*.cpp")

# Required to make Header files visible in Visual Studio
file(GLOB_RECURSE SDKHeaders FOLLOW_SYMLINKS ${PROJECT_SOURCE_DIR}/include/*.hpp)
file(GLOB_RECURSE SDKHeaders FOLLOW_SYMLINKS ${PROJECT_SOURCE_DIR}/include/awsiotsdk/*.hpp)
target_sources(${SDK_TARGET_NAME} PUBLIC ${SDKHeaders})

source_group("Header Files\\aws-iot" FILES ${SDK_COMMON_HEADERS})
Expand Down
4 changes: 2 additions & 2 deletions cli/cli.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
#include "OpenSSLConnection.hpp"
#endif

#include "util/logging/LogMacros.hpp"
#include "util/JsonParser.hpp"
#include "awsiotsdk/util/logging/LogMacros.hpp"
#include "awsiotsdk/util/JsonParser.hpp"
#include "cli.hpp"
#include "ConfigCommon.hpp"

Expand Down
12 changes: 6 additions & 6 deletions cli/cli.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
#define MAX_PATH_LENGTH_ PATH_MAX
#endif

#include "NetworkConnection.hpp"
#include "awsiotsdk/NetworkConnection.hpp"

#include "ResponseCode.hpp"
#include "ClientCore.hpp"
#include "mqtt/Client.hpp"
#include "util/memory/stl/Vector.hpp"
#include "util/Utf8String.hpp"
#include "awsiotsdk/ResponseCode.hpp"
#include "awsiotsdk/ClientCore.hpp"
#include "awsiotsdk/mqtt/Client.hpp"
#include "awsiotsdk/util/memory/stl/Vector.hpp"
#include "awsiotsdk/util/Utf8String.hpp"

using namespace awsiotsdk;

Expand Down
2 changes: 1 addition & 1 deletion common/ConfigCommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define MAX_PATH_LENGTH_ PATH_MAX
#endif

#include "util/logging/LogMacros.hpp"
#include "awsiotsdk/util/logging/LogMacros.hpp"
#include "ConfigCommon.hpp"

#define LOG_TAG_SAMPLE_CONFIG_COMMON "[Sample Config]"
Expand Down
4 changes: 2 additions & 2 deletions common/ConfigCommon.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

#include <chrono>

#include "util/memory/stl/String.hpp"
#include "util/JsonParser.hpp"
#include "awsiotsdk/util/memory/stl/String.hpp"
#include "awsiotsdk/util/JsonParser.hpp"

namespace awsiotsdk {
class ConfigCommon {
Expand Down
0 include/Action.hpp → include/awsiotsdk/Action.hpp
View file
Open in desktop
File renamed without changes.
0 include/ClientCore.hpp → include/awsiotsdk/ClientCore.hpp
View file
Open in desktop
File renamed without changes.
0 include/ClientCoreState.hpp → include/awsiotsdk/ClientCoreState.hpp
View file
Open in desktop
File renamed without changes.
0 include/NetworkConnection.hpp → include/awsiotsdk/NetworkConnection.hpp
View file
Open in desktop
File renamed without changes.
0 include/ResponseCode.hpp → include/awsiotsdk/ResponseCode.hpp
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions include/discovery/Discovery.hpp → include/awsiotsdk/discovery/Discovery.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@

#include <chrono>

#include "util/JsonParser.hpp"
#include "awsiotsdk/util/JsonParser.hpp"

#include "mqtt/Packet.hpp"
#include "mqtt/ClientState.hpp"
#include "discovery/DiscoveryResponse.hpp"
#include "awsiotsdk/mqtt/Packet.hpp"
#include "awsiotsdk/mqtt/ClientState.hpp"
#include "awsiotsdk/discovery/DiscoveryResponse.hpp"

namespace awsiotsdk {
namespace discovery {
Expand Down
8 changes: 4 additions & 4 deletions include/discovery/DiscoveryResponse.hpp → ...awsiotsdk/discovery/DiscoveryResponse.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@

#include <rapidjson/document.h>

#include "util/memory/stl/String.hpp"
#include "util/memory/stl/Vector.hpp"
#include "util/memory/stl/Map.hpp"
#include "awsiotsdk/util/memory/stl/String.hpp"
#include "awsiotsdk/util/memory/stl/Vector.hpp"
#include "awsiotsdk/util/memory/stl/Map.hpp"

#include "util/JsonParser.hpp"
#include "awsiotsdk/util/JsonParser.hpp"

namespace awsiotsdk {

Expand Down
12 changes: 6 additions & 6 deletions include/mqtt/Client.hpp → include/awsiotsdk/mqtt/Client.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@

#pragma once

#include "util/Utf8String.hpp"
#include "awsiotsdk/util/Utf8String.hpp"

#include "ClientCore.hpp"
#include "awsiotsdk/ClientCore.hpp"

#include "mqtt/Connect.hpp"
#include "mqtt/Publish.hpp"
#include "mqtt/Subscribe.hpp"
#include "mqtt/ClientState.hpp"
#include "awsiotsdk/mqtt/Connect.hpp"
#include "awsiotsdk/mqtt/Publish.hpp"
#include "awsiotsdk/mqtt/Subscribe.hpp"
#include "awsiotsdk/mqtt/ClientState.hpp"

namespace awsiotsdk {

Expand Down
10 changes: 5 additions & 5 deletions include/mqtt/ClientState.hpp → include/awsiotsdk/mqtt/ClientState.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@

#include <atomic>

#include "util/Utf8String.hpp"
#include "util/memory/stl/Map.hpp"
#include "awsiotsdk/util/Utf8String.hpp"
#include "awsiotsdk/util/memory/stl/Map.hpp"

#include "Action.hpp"
#include "ClientCore.hpp"
#include "awsiotsdk/Action.hpp"
#include "awsiotsdk/ClientCore.hpp"

#include "mqtt/Common.hpp"
#include "awsiotsdk/mqtt/Common.hpp"

namespace awsiotsdk {
namespace mqtt {
Expand Down
4 changes: 2 additions & 2 deletions include/mqtt/Common.hpp → include/awsiotsdk/mqtt/Common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

#pragma once

#include "util/Utf8String.hpp"
#include "ResponseCode.hpp"
#include "awsiotsdk/util/Utf8String.hpp"
#include "awsiotsdk/ResponseCode.hpp"

#define MAX_TOPICS_IN_ONE_SUBSCRIBE_PACKET 8

Expand Down
4 changes: 2 additions & 2 deletions include/mqtt/Connect.hpp → include/awsiotsdk/mqtt/Connect.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

#pragma once

#include "mqtt/ClientState.hpp"
#include "mqtt/Packet.hpp"
#include "awsiotsdk/mqtt/ClientState.hpp"
#include "awsiotsdk/mqtt/Packet.hpp"

namespace awsiotsdk {
namespace mqtt {
Expand Down
18 changes: 9 additions & 9 deletions include/mqtt/GreengrassMqttClient.hpp → ...e/awsiotsdk/mqtt/GreengrassMqttClient.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@

#pragma once

#include "util/Utf8String.hpp"
#include "util/JsonParser.hpp"
#include "awsiotsdk/util/Utf8String.hpp"
#include "awsiotsdk/util/JsonParser.hpp"

#include "ClientCore.hpp"
#include "awsiotsdk/ClientCore.hpp"

#include "mqtt/Connect.hpp"
#include "mqtt/Publish.hpp"
#include "mqtt/Subscribe.hpp"
#include "mqtt/ClientState.hpp"
#include "awsiotsdk/mqtt/Connect.hpp"
#include "awsiotsdk/mqtt/Publish.hpp"
#include "awsiotsdk/mqtt/Subscribe.hpp"
#include "awsiotsdk/mqtt/ClientState.hpp"

#include "discovery/DiscoveryResponse.hpp"
#include "mqtt/Client.hpp"
#include "awsiotsdk/discovery/DiscoveryResponse.hpp"
#include "awsiotsdk/mqtt/Client.hpp"

namespace awsiotsdk {

Expand Down
6 changes: 3 additions & 3 deletions include/mqtt/NetworkRead.hpp → include/awsiotsdk/mqtt/NetworkRead.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@

#pragma once

#include "util/memory/stl/Map.hpp"
#include "awsiotsdk/util/memory/stl/Map.hpp"

#include "ResponseCode.hpp"
#include "Action.hpp"
#include "awsiotsdk/ResponseCode.hpp"
#include "awsiotsdk/Action.hpp"
#include "Connect.hpp"
#include "Publish.hpp"
#include "Subscribe.hpp"
Expand Down
10 changes: 5 additions & 5 deletions include/mqtt/Packet.hpp → include/awsiotsdk/mqtt/Packet.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
#include <iostream>
#include <memory>

#include "util/Utf8String.hpp"
#include "awsiotsdk/util/Utf8String.hpp"

#include "Action.hpp"
#include "ResponseCode.hpp"
#include "NetworkConnection.hpp"
#include "awsiotsdk/Action.hpp"
#include "awsiotsdk/ResponseCode.hpp"
#include "awsiotsdk/NetworkConnection.hpp"

#include "mqtt/Common.hpp"
#include "awsiotsdk/mqtt/Common.hpp"

namespace awsiotsdk {
namespace mqtt {
Expand Down
4 changes: 2 additions & 2 deletions include/mqtt/Publish.hpp → include/awsiotsdk/mqtt/Publish.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

#pragma once

#include "mqtt/ClientState.hpp"
#include "mqtt/Packet.hpp"
#include "awsiotsdk/mqtt/ClientState.hpp"
#include "awsiotsdk/mqtt/Packet.hpp"

namespace awsiotsdk {
namespace mqtt {
Expand Down
10 changes: 5 additions & 5 deletions include/mqtt/Subscribe.hpp → include/awsiotsdk/mqtt/Subscribe.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@

#pragma once

#include "util/Utf8String.hpp"
#include "util/memory/stl/Map.hpp"
#include "util/memory/stl/Vector.hpp"
#include "mqtt/Packet.hpp"
#include "mqtt/Publish.hpp"
#include "awsiotsdk/util/Utf8String.hpp"
#include "awsiotsdk/util/memory/stl/Map.hpp"
#include "awsiotsdk/util/memory/stl/Vector.hpp"
#include "awsiotsdk/mqtt/Packet.hpp"
#include "awsiotsdk/mqtt/Publish.hpp"

namespace awsiotsdk {
namespace mqtt {
Expand Down
8 changes: 4 additions & 4 deletions include/shadow/Shadow.hpp → include/awsiotsdk/shadow/Shadow.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
#include <mutex>
#include <atomic>

#include "util/memory/stl/String.hpp"
#include "util/memory/stl/Vector.hpp"
#include "util/JsonParser.hpp"
#include "awsiotsdk/util/memory/stl/String.hpp"
#include "awsiotsdk/util/memory/stl/Vector.hpp"
#include "awsiotsdk/util/JsonParser.hpp"

#include "mqtt/Client.hpp"
#include "awsiotsdk/mqtt/Client.hpp"

namespace awsiotsdk {
/**
Expand Down
0 include/util/Core_EXPORTS.hpp → include/awsiotsdk/util/Core_EXPORTS.hpp
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions include/util/JsonParser.hpp → include/awsiotsdk/util/JsonParser.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include <cstdint>
#include <rapidjson/document.h>

#include "util/memory/stl/String.hpp"
#include "ResponseCode.hpp"
#include "awsiotsdk/util/memory/stl/String.hpp"
#include "awsiotsdk/ResponseCode.hpp"

#define MAX_CONFIG_FILE_SIZE_BYTES 4096 //Increase if adding more configuration options

Expand Down
2 changes: 1 addition & 1 deletion include/util/Utf8String.hpp → include/awsiotsdk/util/Utf8String.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#pragma once

#include <memory>
#include "util/memory/stl/String.hpp"
#include "awsiotsdk/util/memory/stl/String.hpp"

namespace awsiotsdk {
class Utf8String {
Expand Down
4 changes: 2 additions & 2 deletions include/util/logging/ConsoleLogSystem.hpp → ...siotsdk/util/logging/ConsoleLogSystem.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

#pragma once

#include "util/logging/FormattedLogSystem.hpp"
#include "util/Core_EXPORTS.hpp"
#include "awsiotsdk/util/logging/FormattedLogSystem.hpp"
#include "awsiotsdk/util/Core_EXPORTS.hpp"

namespace awsiotsdk {
namespace util {
Expand Down
6 changes: 3 additions & 3 deletions include/util/logging/FormattedLogSystem.hpp → ...otsdk/util/logging/FormattedLogSystem.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

#pragma once

#include "util/Core_EXPORTS.hpp"
#include "util/logging/LogSystemInterface.hpp"
#include "util/logging/LogLevel.hpp"
#include "awsiotsdk/util/Core_EXPORTS.hpp"
#include "awsiotsdk/util/logging/LogSystemInterface.hpp"
#include "awsiotsdk/util/logging/LogLevel.hpp"

#include <atomic>

Expand Down
4 changes: 2 additions & 2 deletions include/util/logging/LogLevel.hpp → include/awsiotsdk/util/logging/LogLevel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

#pragma once

#include "util/Core_EXPORTS.hpp"
#include "util/memory/stl/String.hpp"
#include "awsiotsdk/util/Core_EXPORTS.hpp"
#include "awsiotsdk/util/memory/stl/String.hpp"

namespace awsiotsdk {
namespace util {
Expand Down
10 changes: 5 additions & 5 deletions include/util/logging/LogMacros.hpp → include/awsiotsdk/util/logging/LogMacros.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@

#pragma once

#include "util/Core_EXPORTS.hpp"
#include "awsiotsdk/util/Core_EXPORTS.hpp"

#include "util/logging/LogLevel.hpp"
#include "util/logging/Logging.hpp"
#include "util/logging/LogSystemInterface.hpp"
#include "util/memory/stl/StringStream.hpp"
#include "awsiotsdk/util/logging/LogLevel.hpp"
#include "awsiotsdk/util/logging/Logging.hpp"
#include "awsiotsdk/util/logging/LogSystemInterface.hpp"
#include "awsiotsdk/util/memory/stl/StringStream.hpp"

// While macros are usually grotty, using them here lets us have a simple function call interface for logging that
//
Expand Down
6 changes: 3 additions & 3 deletions include/util/logging/LogSystemInterface.hpp → ...otsdk/util/logging/LogSystemInterface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

#pragma once

#include "util/Core_EXPORTS.hpp"
#include "util/memory/stl/String.hpp"
#include "util/memory/stl/StringStream.hpp"
#include "awsiotsdk/util/Core_EXPORTS.hpp"
#include "awsiotsdk/util/memory/stl/String.hpp"
#include "awsiotsdk/util/memory/stl/StringStream.hpp"

namespace awsiotsdk {
namespace util {
Expand Down
2 changes: 1 addition & 1 deletion include/util/logging/Logging.hpp → include/awsiotsdk/util/logging/Logging.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#pragma once

#include <memory>
#include "util/Core_EXPORTS.hpp"
#include "awsiotsdk/util/Core_EXPORTS.hpp"

namespace awsiotsdk {
namespace util {
Expand Down
0 include/util/memory/stl/Map.hpp → include/awsiotsdk/util/memory/stl/Map.hpp
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion include/util/memory/stl/Queue.hpp → include/awsiotsdk/util/memory/stl/Queue.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#pragma once

#include "util/Core_EXPORTS.hpp"
#include "awsiotsdk/util/Core_EXPORTS.hpp"

#include <deque>
#include <queue>
Expand Down
Loading