Skip to content

Commit a8efcc7

Browse files
added raw mqtt (without iot specific builders) sample. Updated to lat… (aws#72)
* added raw mqtt (without iot specific builders) sample. Updated to latest version of auth.
1 parent 3754d95 commit a8efcc7

File tree

12 files changed

+523
-73
lines changed

12 files changed

+523
-73
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,3 +283,4 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-config.cmake"
283283
enable_testing()
284284
add_subdirectory(tests)
285285
add_subdirectory(samples/mqtt_pub_sub)
286+
add_subdirectory(samples/raw_mqtt_pub_sub)

aws-common-runtime/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set(AWS_DEPS_DOWNLOAD_DIR "${AWS_DEPS_BUILD_DIR}/downloads" CACHE PATH "Dependen
1717

1818
message("install dir ${AWS_DEPS_INSTALL_DIR}")
1919
set(AWS_C_COMMON_URL "https://github.com/awslabs/aws-c-common.git")
20-
set(AWS_C_COMMON_SHA "v0.4.21")
20+
set(AWS_C_COMMON_SHA "v0.4.22")
2121
include(BuildAwsCCommon)
2222

2323
if (UNIX AND NOT APPLE)
@@ -35,19 +35,19 @@ set(AWS_C_COMPRESSION_SHA "v0.2.4")
3535
include(BuildAwsCCompression)
3636

3737
set(AWS_C_HTTP_URL "https://github.com/awslabs/aws-c-http.git")
38-
set(AWS_C_HTTP_SHA "v0.4.13")
38+
set(AWS_C_HTTP_SHA "v0.4.17")
3939
include(BuildAwsCHttp)
4040

4141
set(AWS_C_MQTT_URL "https://github.com/awslabs/aws-c-mqtt.git")
42-
set(AWS_C_MQTT_SHA "v0.4.16")
42+
set(AWS_C_MQTT_SHA "v0.4.17")
4343
include(BuildAwsCMqtt)
4444

4545
set(AWS_C_CAL_URL "https://github.com/awslabs/aws-c-cal.git")
4646
set(AWS_C_CAL_SHA "v0.2.0")
4747
include(BuildAwsCCal)
4848

4949
set(AWS_C_AUTH_URL "https://github.com/awslabs/aws-c-auth.git")
50-
set(AWS_C_AUTH_SHA "v0.2.9")
50+
set(AWS_C_AUTH_SHA "v0.3.2")
5151
include(BuildAwsCAuth)
5252

5353
add_dependencies(AwsCCompression AwsCCommon)

include/aws/crt/auth/Sigv4Signing.h

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -165,43 +165,27 @@ namespace Aws
165165
Crt::String m_serviceName;
166166
};
167167

168-
/**
169-
* Http request signer base class that wraps any aws-c-* signer implementation
170-
*/
171-
class AWS_CRT_CPP_API AwsHttpRequestSigner : public IHttpRequestSigner
172-
{
173-
public:
174-
AwsHttpRequestSigner(aws_signer *signer, Allocator *allocator = DefaultAllocator());
175-
virtual ~AwsHttpRequestSigner();
176-
177-
/**
178-
* Whether or not the signer is in a valid state
179-
*/
180-
virtual bool IsValid() const override { return m_signer != nullptr; }
181-
182-
protected:
183-
Allocator *m_allocator;
184-
185-
aws_signer *m_signer;
186-
};
187-
188168
/**
189169
* Http request signer that performs Aws Sigv4 signing
190170
*/
191-
class AWS_CRT_CPP_API Sigv4HttpRequestSigner : public AwsHttpRequestSigner
171+
class AWS_CRT_CPP_API Sigv4HttpRequestSigner : public IHttpRequestSigner
192172
{
193173
public:
194174
Sigv4HttpRequestSigner(Allocator *allocator = DefaultAllocator());
195175
virtual ~Sigv4HttpRequestSigner() = default;
196176

177+
bool IsValid() const override { return true; }
197178
/**
198179
* Signs an http request with AWS-auth sigv4. OnCompletionCallback will be invoked upon completion.
199180
*/
200181
virtual bool SignRequest(
201182
const std::shared_ptr<Aws::Crt::Http::HttpRequest> &request,
202183
const std::shared_ptr<ISigningConfig> &config,
203184
const OnHttpRequestSigningComplete &completionCallback) override;
185+
186+
private:
187+
Allocator *m_allocator;
204188
};
205189
} // namespace Auth
206190
} // namespace Crt
207-
} // namespace Aws
191+
} // namespace Aws

include/aws/crt/http/HttpRequestResponse.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ namespace Aws
5858

5959
size_t GetHeaderCount() const noexcept;
6060
Optional<HttpHeader> GetHeader(size_t index) const noexcept;
61-
bool SetHeader(size_t index, const HttpHeader &header) noexcept;
6261
bool AddHeader(const HttpHeader &header) noexcept;
6362
bool EraseHeader(size_t index) noexcept;
6463

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
project(aws-crt-cpp-raw-mqtt-pub-sub CXX)
2+
3+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_INSTALL_PREFIX}/lib/cmake")
4+
5+
file(GLOB MQTT_PUB_SUB_SRC
6+
"*.cpp"
7+
)
8+
9+
set(PUB_SUB_PROJECT_NAME aws-crt-cpp-raw-mqtt-pub-sub)
10+
add_executable(${PUB_SUB_PROJECT_NAME} ${MQTT_PUB_SUB_SRC})
11+
set_target_properties(${PUB_SUB_PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
12+
set_target_properties(${PUB_SUB_PROJECT_NAME} PROPERTIES CXX_STANDARD ${CMAKE_CXX_STANDARD})
13+
14+
set(CMAKE_C_FLAGS_DEBUGOPT "")
15+
16+
#set warnings
17+
if (MSVC)
18+
target_compile_options(${PUB_SUB_PROJECT_NAME} PRIVATE /W4 /WX /wd4068)
19+
else ()
20+
target_compile_options(${PUB_SUB_PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic -Werror)
21+
endif ()
22+
23+
if (CMAKE_BUILD_TYPE STREQUAL "" OR CMAKE_BUILD_TYPE MATCHES Debug)
24+
target_compile_definitions(${PUB_SUB_PROJECT_NAME} PRIVATE "-DDEBUG_BUILD")
25+
endif ()
26+
27+
target_include_directories(${PUB_SUB_PROJECT_NAME} PUBLIC
28+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
29+
$<INSTALL_INTERFACE:include>)
30+
31+
target_link_libraries(${PUB_SUB_PROJECT_NAME} aws-crt-cpp)
32+

0 commit comments

Comments
 (0)