Fix 435 #439
Fix 435 #439
Conversation
Added missing async_handler_t call on disconnect. Removed error handling on do_sync_write(). If error happens the error will be handled by async_read. If `handle_error(ec);` is called in `do_sync_write()`, error_handler would be called twice. It is consistent behavior as `do_async_write()`.
Removed redundant handler reset code from test_broker. Added minimal support for Session Expiry Interval. Timer is not set yet.
Codecov Report
@@ Coverage Diff @@
## master #439 +/- ##
==========================================
+ Coverage 84.78% 84.78% +<.01%
==========================================
Files 40 40
Lines 6361 6364 +3
==========================================
+ Hits 5393 5396 +3
Misses 968 968 |
|
@jonesmz , this PR fixes NOTE: Original design On the server side such as broker, pass the lambda expression that captures ep.start_session(
[sp] // keeping ep's lifetime as sp until session finished
(boost::system::error_code const& /*ec*/) {
}
);If ep is closed, then pointee of I will merge the PR. After I merged, please rebase #430 from the merged master. |
| BOOST_TEST(sp == true); | ||
| // The previous connection is not set Session Expiry Interval. | ||
| // That means session state is cleared on close. | ||
| BOOST_TEST(sp == false); |
There was a problem hiding this comment.
I thought that if session expiry interval was not set, that means indefinite lifetime of the session data?
There was a problem hiding this comment.
Nervermind. I looked it up.
If the Session Expiry Interval is absent the value 0 is used. If it is set to 0, or is absent, the Session ends when the Network Connection is closed.
| // set session_expiry_interval as infinity. | ||
| c->connect( | ||
| std::vector<MQTT_NS::v5::property_variant>{ | ||
| MQTT_NS::v5::property::session_expiry_interval(0xFFFFFFFFUL) |
There was a problem hiding this comment.
Is this infinity, or just maximum? It's a uint16_t, right?
There was a problem hiding this comment.
Ah, it's actually infinity.
3.1.2.11.2 Session Expiry Interval
17 (0x11) Byte, Identifier of the Session Expiry Interval.
Followed by the Four Byte Integer representing the Session Expiry Interval in seconds. It is a Protocol Error to include the Session Expiry Interval more than once.
If the Session Expiry Interval is absent the value 0 is used. If it is set to 0, or is absent, the Session ends when the Network Connection is closed.
If the Session Expiry Interval is 0xFFFFFFFF (UINT_MAX), the Session does not expire.
The Client and Server MUST store the Session State after the Network Connection is closed if the Session Expiry Interval is greater than 0 [MQTT-3.1.2-23].
test/resend.cpp
Outdated
| // TCP level disconnection detecting timing is unpredictable. | ||
| // Sometimes broker first, sometimes the client (this test) first. | ||
| // This test assume that the broker detects first, so I set timer. | ||
| // If client ditect the disconnection first, then reconnect with |
test/resend.cpp
Outdated
| // TCP level disconnection detecting timing is unpredictable. | ||
| // Sometimes broker first, sometimes the client (this test) first. | ||
| // This test assume that the broker detects first, so I set timer. | ||
| // If client ditect the disconnection first, then reconnect with |
test/resend_serialize_ptr_size.cpp
Outdated
| @@ -12,6 +12,27 @@ BOOST_AUTO_TEST_SUITE(test_resend_serialize_ptr_size) | |||
|
|
|||
| using namespace MQTT_NS::literals; | |||
|
|
|||
| template <typename Client> | |||
| inline void connect_no_clean(Client& c) { | |||
There was a problem hiding this comment.
This looks like the same code in multiple files.
Can it be put in a header file?
There was a problem hiding this comment.
Yes I will move it to header file.
I've checked existing header files but not found appropriate one. So I will create test_util.hpp.
No description provided.