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

Move share name parse to sdk #759

Merged
merged 2 commits into from
Dec 11, 2020
Merged

Move share name parse to sdk #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0b631c
Moved shared_subscription parse to SDK part.
redboltz Dec 11, 2020
f140a00
Update examples.
redboltz Dec 11, 2020
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MQTT client/server for C++14 based on Boost.Asio

Version 9.0.0 [![Actions Status](https://github.com/redboltz/mqtt_cpp/workflows/CI/badge.svg)](https://github.com/redboltz/mqtt_cpp/actions)[![Build Status](https://dev.azure.com/redboltz/redboltz/_apis/build/status/redboltz.mqtt_cpp?branchName=master)](https://dev.azure.com/redboltz/redboltz/_build/latest?definitionId=6&branchName=master)[![codecov](https://codecov.io/gh/redboltz/mqtt_cpp/branch/master/graph/badge.svg)](https://codecov.io/gh/redboltz/mqtt_cpp)
Version 10.0.0 [![Actions Status](https://github.com/redboltz/mqtt_cpp/workflows/CI/badge.svg)](https://github.com/redboltz/mqtt_cpp/actions)[![Build Status](https://dev.azure.com/redboltz/redboltz/_apis/build/status/redboltz.mqtt_cpp?branchName=master)](https://dev.azure.com/redboltz/redboltz/_build/latest?definitionId=6&branchName=master)[![codecov](https://codecov.io/gh/redboltz/mqtt_cpp/branch/master/graph/badge.svg)](https://codecov.io/gh/redboltz/mqtt_cpp)

Important note https://github.com/redboltz/mqtt_cpp/wiki/News.

Expand Down
16 changes: 7 additions & 9 deletions example/logging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,18 +288,16 @@ void server_proc(Server& s, std::set<con_sp_t>& connections, mi_sub_con& subs) {
ep.set_subscribe_handler(
[&subs, wp]
(packet_id_t packet_id,
std::vector<std::tuple<MQTT_NS::buffer, MQTT_NS::subscribe_options>> entries) {
std::vector<MQTT_NS::subscribe_entry> entries) {
locked_cout() << "[server]subscribe received. packet_id: " << packet_id << std::endl;
std::vector<MQTT_NS::suback_return_code> res;
res.reserve(entries.size());
auto sp = wp.lock();
BOOST_ASSERT(sp);
for (auto const& e : entries) {
MQTT_NS::buffer topic = std::get<0>(e);
MQTT_NS::qos qos_value = std::get<1>(e).get_qos();
locked_cout() << "[server] topic: " << topic << " qos: " << qos_value << std::endl;
res.emplace_back(MQTT_NS::qos_to_suback_return_code(qos_value));
subs.emplace(std::move(topic), sp, qos_value);
locked_cout() << "[server] topic_filter: " << e.topic_filter << " qos: " << e.subopts.get_qos() << std::endl;
res.emplace_back(MQTT_NS::qos_to_suback_return_code(e.subopts.get_qos()));
subs.emplace(std::move(e.topic_filter), sp, e.subopts.get_qos());
}
sp->suback(packet_id, res);
return true;
Expand All @@ -308,10 +306,10 @@ void server_proc(Server& s, std::set<con_sp_t>& connections, mi_sub_con& subs) {
ep.set_unsubscribe_handler(
[&subs, wp]
(packet_id_t packet_id,
std::vector<MQTT_NS::buffer> topics) {
std::vector<MQTT_NS::unsubscribe_entry> entries) {
locked_cout() << "[server]unsubscribe received. packet_id: " << packet_id << std::endl;
for (auto const& topic : topics) {
subs.erase(topic);
for (auto const& e : entries) {
subs.erase(e.topic_filter);
}
auto sp = wp.lock();
BOOST_ASSERT(sp);
Expand Down
16 changes: 7 additions & 9 deletions example/no_tls_both.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,18 +287,16 @@ void server_proc(Server& s, std::set<con_sp_t>& connections, mi_sub_con& subs) {
ep.set_subscribe_handler(
[&subs, wp]
(packet_id_t packet_id,
std::vector<std::tuple<MQTT_NS::buffer, MQTT_NS::subscribe_options>> entries) {
std::vector<MQTT_NS::subscribe_entry> entries) {
locked_cout() << "[server]subscribe received. packet_id: " << packet_id << std::endl;
std::vector<MQTT_NS::suback_return_code> res;
res.reserve(entries.size());
auto sp = wp.lock();
BOOST_ASSERT(sp);
for (auto const& e : entries) {
MQTT_NS::buffer topic = std::get<0>(e);
MQTT_NS::qos qos_value = std::get<1>(e).get_qos();
locked_cout() << "[server] topic: " << topic << " qos: " << qos_value << std::endl;
res.emplace_back(MQTT_NS::qos_to_suback_return_code(qos_value));
subs.emplace(std::move(topic), sp, qos_value);
locked_cout() << "[server] topic_filter: " << e.topic_filter << " qos: " << e.subopts.get_qos() << std::endl;
res.emplace_back(MQTT_NS::qos_to_suback_return_code(e.subopts.get_qos()));
subs.emplace(std::move(e.topic_filter), sp, e.subopts.get_qos());
}
sp->suback(packet_id, res);
return true;
Expand All @@ -307,10 +305,10 @@ void server_proc(Server& s, std::set<con_sp_t>& connections, mi_sub_con& subs) {
ep.set_unsubscribe_handler(
[&subs, wp]
(packet_id_t packet_id,
std::vector<MQTT_NS::buffer> topics) {
std::vector<MQTT_NS::unsubscribe_entry> entries) {
locked_cout() << "[server]unsubscribe received. packet_id: " << packet_id << std::endl;
for (auto const& topic : topics) {
subs.erase(topic);
for (auto const& e : entries) {
subs.erase(e.topic_filter);
}
auto sp = wp.lock();
BOOST_ASSERT(sp);
Expand Down
16 changes: 7 additions & 9 deletions example/no_tls_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,18 +194,16 @@ int main(int argc, char** argv) {
ep.set_subscribe_handler(
[&subs, wp]
(packet_id_t packet_id,
std::vector<std::tuple<MQTT_NS::buffer, MQTT_NS::subscribe_options>> entries) {
std::vector<MQTT_NS::subscribe_entry> entries) {
std::cout << "[server]subscribe received. packet_id: " << packet_id << std::endl;
std::vector<MQTT_NS::suback_return_code> res;
res.reserve(entries.size());
auto sp = wp.lock();
BOOST_ASSERT(sp);
for (auto const& e : entries) {
MQTT_NS::buffer topic = std::get<0>(e);
MQTT_NS::qos qos_value = std::get<1>(e).get_qos();
std::cout << "[server] topic: " << topic << " qos: " << qos_value << std::endl;
res.emplace_back(MQTT_NS::qos_to_suback_return_code(qos_value));
subs.emplace(std::move(topic), sp, qos_value);
std::cout << "[server] topic_filter: " << e.topic_filter << " qos: " << e.subopts.get_qos() << std::endl;
res.emplace_back(MQTT_NS::qos_to_suback_return_code(e.subopts.get_qos()));
subs.emplace(std::move(e.topic_filter), sp, e.subopts.get_qos());
}
sp->suback(packet_id, res);
return true;
Expand All @@ -214,10 +212,10 @@ int main(int argc, char** argv) {
ep.set_unsubscribe_handler(
[&subs, wp]
(packet_id_t packet_id,
std::vector<MQTT_NS::buffer> topics) {
std::vector<MQTT_NS::unsubscribe_entry> entries) {
std::cout << "[server]unsubscribe received. packet_id: " << packet_id << std::endl;
for (auto const& topic : topics) {
subs.erase(topic);
for (auto const& e : entries) {
subs.erase(e.topic_filter);
}
auto sp = wp.lock();
BOOST_ASSERT(sp);
Expand Down
16 changes: 7 additions & 9 deletions example/no_tls_ws_both.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,18 +286,16 @@ void server_proc(Server& s, std::set<con_sp_t>& connections, mi_sub_con& subs) {
ep.set_subscribe_handler(
[&subs, wp]
(packet_id_t packet_id,
std::vector<std::tuple<MQTT_NS::buffer, MQTT_NS::subscribe_options>> entries) {
std::vector<MQTT_NS::subscribe_entry> entries) {
locked_cout() << "[server]subscribe received. packet_id: " << packet_id << std::endl;
std::vector<MQTT_NS::suback_return_code> res;
res.reserve(entries.size());
auto sp = wp.lock();
BOOST_ASSERT(sp);
for (auto const& e : entries) {
MQTT_NS::buffer topic = std::get<0>(e);
MQTT_NS::qos qos_value = std::get<1>(e).get_qos();
locked_cout() << "[server] topic: " << topic << " qos: " << qos_value << std::endl;
res.emplace_back(MQTT_NS::qos_to_suback_return_code(qos_value));
subs.emplace(std::move(topic), sp, qos_value);
locked_cout() << "[server] topic_filter: " << e.topic_filter << " qos: " << e.subopts.get_qos() << std::endl;
res.emplace_back(MQTT_NS::qos_to_suback_return_code(e.subopts.get_qos()));
subs.emplace(std::move(e.topic_filter), sp, e.subopts.get_qos());
}
sp->suback(packet_id, res);
return true;
Expand All @@ -306,10 +304,10 @@ void server_proc(Server& s, std::set<con_sp_t>& connections, mi_sub_con& subs) {
ep.set_unsubscribe_handler(
[&subs, wp]
(packet_id_t packet_id,
std::vector<MQTT_NS::buffer> topics) {
std::vector<MQTT_NS::unsubscribe_entry> entries) {
locked_cout() << "[server]unsubscribe received. packet_id: " << packet_id << std::endl;
for (auto const& topic : topics) {
subs.erase(topic);
for (auto const& e : entries) {
subs.erase(e.topic_filter);
}
auto sp = wp.lock();
BOOST_ASSERT(sp);
Expand Down
16 changes: 7 additions & 9 deletions example/no_tls_ws_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,18 +194,16 @@ int main(int argc, char** argv) {
ep.set_subscribe_handler(
[&subs, wp]
(packet_id_t packet_id,
std::vector<std::tuple<MQTT_NS::buffer, MQTT_NS::subscribe_options>> entries) {
std::vector<MQTT_NS::subscribe_entry> entries) {
std::cout << "[server]subscribe received. packet_id: " << packet_id << std::endl;
std::vector<MQTT_NS::suback_return_code> res;
res.reserve(entries.size());
auto sp = wp.lock();
BOOST_ASSERT(sp);
for (auto const& e : entries) {
MQTT_NS::buffer topic = std::get<0>(e);
MQTT_NS::qos qos_value = std::get<1>(e).get_qos();
std::cout << "[server] topic: " << topic << " qos: " << qos_value << std::endl;
res.emplace_back(MQTT_NS::qos_to_suback_return_code(qos_value));
subs.emplace(std::move(topic), sp, qos_value);
std::cout << "[server] topic_filter: " << e.topic_filter << " qos: " << e.subopts.get_qos() << std::endl;
res.emplace_back(MQTT_NS::qos_to_suback_return_code(e.subopts.get_qos()));
subs.emplace(std::move(e.topic_filter), sp, e.subopts.get_qos());
}
sp->suback(packet_id, res);
return true;
Expand All @@ -214,10 +212,10 @@ int main(int argc, char** argv) {
ep.set_unsubscribe_handler(
[&subs, wp]
(packet_id_t packet_id,
std::vector<MQTT_NS::buffer> topics) {
std::vector<MQTT_NS::unsubscribe_entry> entries) {
std::cout << "[server]unsubscribe received. packet_id: " << packet_id << std::endl;
for (auto const& topic : topics) {
subs.erase(topic);
for (auto const& e : entries) {
subs.erase(e.topic_filter);
}
auto sp = wp.lock();
BOOST_ASSERT(sp);
Expand Down
21 changes: 9 additions & 12 deletions example/redirect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,23 +458,20 @@ void server_proc(Server1& s1, Server2& s2, std::set<con_sp_t>& connections, mi_s
ep.set_v5_subscribe_handler( // use v5 handler
[&subs, wp]
(packet_id_t packet_id,
std::vector<std::tuple<MQTT_NS::buffer, MQTT_NS::subscribe_options>> entries,
std::vector<MQTT_NS::subscribe_entry> entries,
MQTT_NS::v5::properties /*props*/) {
locked_cout() << "[server] subscribe received. packet_id: " << packet_id << std::endl;
std::vector<MQTT_NS::v5::suback_reason_code> res;
res.reserve(entries.size());
auto sp = wp.lock();
BOOST_ASSERT(sp);
for (auto const& e : entries) {
MQTT_NS::buffer topic = std::get<0>(e);
MQTT_NS::qos qos_value = std::get<1>(e).get_qos();
MQTT_NS::rap rap_value = std::get<1>(e).get_rap();
locked_cout() << "[server] topic: " << topic
<< " qos: " << qos_value
<< " rap: " << rap_value
locked_cout() << "[server] topic_filter: " << e.topic_filter
<< " qos: " << e.subopts.get_qos()
<< " rap: " << e.subopts.get_rap()
<< std::endl;
res.emplace_back(MQTT_NS::v5::qos_to_suback_reason_code(qos_value));
subs.emplace(std::move(topic), sp, qos_value, rap_value);
res.emplace_back(MQTT_NS::v5::qos_to_suback_reason_code(e.subopts.get_qos()));
subs.emplace(std::move(e.topic_filter), sp, e.subopts.get_qos(), e.subopts.get_rap());
}
sp->suback(packet_id, res);
return true;
Expand All @@ -483,11 +480,11 @@ void server_proc(Server1& s1, Server2& s2, std::set<con_sp_t>& connections, mi_s
ep.set_v5_unsubscribe_handler( // use v5 handler
[&subs, wp]
(packet_id_t packet_id,
std::vector<MQTT_NS::buffer> topics,
std::vector<MQTT_NS::unsubscribe_entry> entries,
MQTT_NS::v5::properties /*props*/) {
locked_cout() << "[server] unsubscribe received. packet_id: " << packet_id << std::endl;
for (auto const& topic : topics) {
subs.erase(topic);
for (auto const& e : entries) {
subs.erase(e.topic_filter);
}
auto sp = wp.lock();
BOOST_ASSERT(sp);
Expand Down
16 changes: 7 additions & 9 deletions example/tls_both.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,18 +288,16 @@ void server_proc(Server& s, std::set<con_sp_t>& connections, mi_sub_con& subs) {
ep.set_subscribe_handler(
[&subs, wp]
(packet_id_t packet_id,
std::vector<std::tuple<MQTT_NS::buffer, MQTT_NS::subscribe_options>> entries) {
std::vector<MQTT_NS::subscribe_entry> entries) {
locked_cout() << "[server]subscribe received. packet_id: " << packet_id << std::endl;
std::vector<MQTT_NS::suback_return_code> res;
res.reserve(entries.size());
auto sp = wp.lock();
BOOST_ASSERT(sp);
for (auto const& e : entries) {
MQTT_NS::buffer topic = std::get<0>(e);
MQTT_NS::qos qos_value = std::get<1>(e).get_qos();
locked_cout() << "[server] topic: " << topic << " qos: " << qos_value << std::endl;
res.emplace_back(MQTT_NS::qos_to_suback_return_code(qos_value));
subs.emplace(std::move(topic), sp, qos_value);
locked_cout() << "[server] topic_filter: " << e.topic_filter << " qos: " << e.subopts.get_qos() << std::endl;
res.emplace_back(MQTT_NS::qos_to_suback_return_code(e.subopts.get_qos()));
subs.emplace(std::move(e.topic_filter), sp, e.subopts.get_qos());
}
sp->suback(packet_id, res);
return true;
Expand All @@ -308,10 +306,10 @@ void server_proc(Server& s, std::set<con_sp_t>& connections, mi_sub_con& subs) {
ep.set_unsubscribe_handler(
[&subs, wp]
(packet_id_t packet_id,
std::vector<MQTT_NS::buffer> topics) {
std::vector<MQTT_NS::unsubscribe_entry> entries) {
locked_cout() << "[server]unsubscribe received. packet_id: " << packet_id << std::endl;
for (auto const& topic : topics) {
subs.erase(topic);
for (auto const& e : entries) {
subs.erase(e.topic_filter);
}
auto sp = wp.lock();
BOOST_ASSERT(sp);
Expand Down
16 changes: 7 additions & 9 deletions example/tls_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,18 +206,16 @@ int main(int argc, char** argv) {
ep.set_subscribe_handler(
[&subs, wp]
(packet_id_t packet_id,
std::vector<std::tuple<MQTT_NS::buffer, MQTT_NS::subscribe_options>> entries) {
std::vector<MQTT_NS::subscribe_entry> entries) {
std::cout << "[server]subscribe received. packet_id: " << packet_id << std::endl;
std::vector<MQTT_NS::suback_return_code> res;
res.reserve(entries.size());
auto sp = wp.lock();
BOOST_ASSERT(sp);
for (auto const& e : entries) {
MQTT_NS::buffer topic = std::get<0>(e);
MQTT_NS::qos qos_value = std::get<1>(e).get_qos();
std::cout << "[server] topic: " << topic << " qos: " << qos_value << std::endl;
res.emplace_back(MQTT_NS::qos_to_suback_return_code(qos_value));
subs.emplace(std::move(topic), sp, qos_value);
std::cout << "[server] topic_filter: " << e.topic_filter << " qos: " << e.subopts.get_qos() << std::endl;
res.emplace_back(MQTT_NS::qos_to_suback_return_code(e.subopts.get_qos()));
subs.emplace(std::move(e.topic_filter), sp, e.subopts.get_qos());
}
sp->suback(packet_id, res);
return true;
Expand All @@ -226,10 +224,10 @@ int main(int argc, char** argv) {
ep.set_unsubscribe_handler(
[&subs, wp]
(packet_id_t packet_id,
std::vector<MQTT_NS::buffer> topics) {
std::vector<MQTT_NS::unsubscribe_entry> entries) {
std::cout << "[server]unsubscribe received. packet_id: " << packet_id << std::endl;
for (auto const& topic : topics) {
subs.erase(topic);
for (auto const& e : entries) {
subs.erase(e.topic_filter);
}
auto sp = wp.lock();
BOOST_ASSERT(sp);
Expand Down
Loading