Merge pull request #890 from redboltz/fix_binary

Refined binary buffer operation.

Author: redboltz

include/mqtt/property.hpp

@@ -11,6 +11,8 @@
 #include <vector>
 #include <memory>
 #include <algorithm>
+#include <iosfwd>
+#include <iomanip>
 
 #include <boost/asio/buffer.hpp>
 #include <boost/numeric/conversion/cast.hpp>
@@ -46,6 +48,7 @@ enum class ostream_format {
     int_cast,
     key_val,
     binary_string,
+    json_like
 };
 
 template <std::size_t N>
@@ -176,7 +179,7 @@ struct binary_property {
         return buf_;
     }
 
-    static constexpr ostream_format const of_ = ostream_format::direct;
+    static constexpr ostream_format const of_ = ostream_format::json_like;
     property::id id_;
     buffer buf_;
     boost::container::static_vector<char, 2> length_;
@@ -734,6 +737,52 @@ operator<<(std::ostream& o, Property const& p) {
     return o;
 }
 
+template <typename Property>
+std::enable_if_t< Property::of_ == detail::ostream_format::json_like, std::ostream& >
+operator<<(std::ostream& o, Property const& p) {
+    auto const& v = p.val();
+    for (auto const c : v) {
+        switch (c) {
+        case '\\':
+            o << "\\\\";
+            break;
+        case '"':
+            o << "\\\"";
+            break;
+        case '/':
+            o << "\\/";
+            break;
+        case '\b':
+            o << "\\b";
+            break;
+        case '\f':
+            o << "\\f";
+            break;
+        case '\n':
+            o << "\\n";
+            break;
+        case '\r':
+            o << "\\r";
+            break;
+        case '\t':
+            o << "\\t";
+            break;
+        default: {
+            unsigned int code = static_cast<unsigned int>(c);
+            if (code < 0x20 || code >= 0x7f) {
+                std::ios::fmtflags flags(o.flags());
+                o << "\\u" << std::hex << std::setw(4) << std::setfill('0') << (code & 0xff);
+                o.flags(flags);
+            }
+            else {
+                o << c;
+            }
+        } break;
+        }
+    }
+    return o;
+}
+
 
 } // namespace property
 } // namespace v5

test/system/st_pubsub_1.cpp

@@ -3083,6 +3083,7 @@ BOOST_AUTO_TEST_CASE( publish_dup_function_buffer ) {
 }
 
 BOOST_AUTO_TEST_CASE( pub_sub_prop ) {
+    using namespace std::literals::string_literals;
     auto test = [](boost::asio::io_context& ioc, auto& cs, auto finish, auto& /*b*/) {
         auto& c = cs[0];
         clear_ordered();
@@ -3109,14 +3110,13 @@ BOOST_AUTO_TEST_CASE( pub_sub_prop ) {
             // disconnect
             cont("h_close"),
         };
-        std::string correlation_data_str = "correlation \0data"; //binary including 0
         MQTT_NS::v5::properties ps {
             MQTT_NS::v5::property::payload_format_indicator(MQTT_NS::v5::property::payload_format_indicator::string),
             MQTT_NS::v5::property::message_expiry_interval(0x12345678UL),
             MQTT_NS::v5::property::content_type("content type"_mb),
             MQTT_NS::v5::property::topic_alias(0x1234U),
             MQTT_NS::v5::property::response_topic("response topic"_mb),
-            MQTT_NS::v5::property::correlation_data(MQTT_NS::buffer(MQTT_NS::string_view(correlation_data_str))),
+            MQTT_NS::v5::property::correlation_data("correlation \0data"_mb),
             MQTT_NS::v5::property::user_property("key1"_mb, "val1"_mb),
             MQTT_NS::v5::property::user_property("key2"_mb, "val2"_mb),
         };
@@ -3209,7 +3209,7 @@ BOOST_AUTO_TEST_CASE( pub_sub_prop ) {
                                 BOOST_TEST(t.val() == "response topic");
                             },
                             [&](MQTT_NS::v5::property::correlation_data const& t) {
-                                BOOST_TEST(t.val() == std::string("correlation \0data"));
+                                BOOST_TEST(t.val() == std::string("correlation \0data"s));
                             },
                             [&](MQTT_NS::v5::property::user_property const& t) {
                                 switch (user_prop_count++) {

test/unit/ut_buffer.cpp

@@ -43,6 +43,18 @@ BOOST_AUTO_TEST_CASE( allocate2 ) {
     BOOST_TEST(ss2.has_life());
 }
 
+BOOST_AUTO_TEST_CASE( literals ) {
+    using namespace MQTT_NS::literals;
+    using namespace std::literals::string_literals;
+    auto buf1 = "abcde"_mb;
+    BOOST_TEST(buf1.size() == 5);
+    BOOST_TEST(buf1 == "abcde"s);
+
+    auto buf2 = "ab\0cde"_mb;
+    BOOST_TEST(buf2.size() == 6);
+    BOOST_TEST(buf2 == "ab\0cde"s);
+}
+
 #if 0
 // CI doesn't work due to -std=c++1z.
 // I couldn't set -std=c++17 on CI

test/unit/ut_property.cpp

@@ -136,9 +136,9 @@ BOOST_AUTO_TEST_CASE( response_topic ) {
 }
 
 BOOST_AUTO_TEST_CASE( correlation_data ) {
-    std::string s = "a\0bc";
-    MQTT_NS::v5::property::correlation_data v1 { MQTT_NS::buffer(MQTT_NS::string_view(s)) };
-    BOOST_TEST(v1.val() == std::string("a\0bc"));
+    using namespace std::literals::string_literals;
+    MQTT_NS::v5::property::correlation_data v1 { "a\0bc"_mb };
+    BOOST_TEST(v1.val() == "a\0bc"s);
 }
 
 BOOST_AUTO_TEST_CASE( assigned_client_identifier ) {