diff --git a/conanfile.py b/conanfile.py index 571da94..b66a60e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -23,7 +23,7 @@ class HelloWorldRecipe(ConanFile): # self.options["spdlog"].shared = self.options.shared def requirements(self): - self.requires("up-client-zenoh-cpp/0.1.0-dev") + self.requires("up-client-zenoh-cpp/0.1.1-dev") self.requires("protobuf/3.21.12" + ("@cross/cross" if self.options.build_cross_compiling else "")) diff --git a/pubsub/src/main_pub.cpp b/pubsub/src/main_pub.cpp index 90219c1..b642f85 100644 --- a/pubsub/src/main_pub.cpp +++ b/pubsub/src/main_pub.cpp @@ -31,9 +31,11 @@ #include #include #include +#include #include #include #include +#include using namespace uprotocol::utransport; using namespace uprotocol::uri; @@ -88,7 +90,7 @@ UCode sendMessage(ZenohUTransport *transport, auto uuid = Uuidv8Factory::create(); - UAttributesBuilder builder(uuid, UMessageType::PUBLISH, UPriority::STANDARD); + UAttributesBuilder builder(uuid, UMessageType::UMESSAGE_TYPE_PUBLISH, UPriority::UPRIORITY_CS1); UAttributes attributes = builder.build(); UPayload payload(buffer, size, UPayloadType::VALUE); diff --git a/rpc/src/main_rpc_client.cpp b/rpc/src/main_rpc_client.cpp index a7f7910..c00f4ba 100644 --- a/rpc/src/main_rpc_client.cpp +++ b/rpc/src/main_rpc_client.cpp @@ -29,6 +29,8 @@ #include #include #include +#include +#include using namespace uprotocol::utransport; using namespace uprotocol::uuid; @@ -47,7 +49,7 @@ UPayload sendRPC(UUri& uri) { auto uuid = Uuidv8Factory::create(); - UAttributesBuilder builder(uuid, UMessageType::REQUEST, UPriority::STANDARD); + UAttributesBuilder builder(uuid, UMessageType::UMESSAGE_TYPE_REQUEST, UPriority::UPRIORITY_CS1); UAttributes attributes = builder.build(); constexpr uint8_t BUFFER_SIZE = 1; diff --git a/rpc/src/main_rpc_server.cpp b/rpc/src/main_rpc_server.cpp index 32660fc..edf4e8d 100644 --- a/rpc/src/main_rpc_server.cpp +++ b/rpc/src/main_rpc_server.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -59,7 +60,7 @@ class RpcListener : public UListener { /* Build response attributes - the same UUID should be used to send the response * it is also possible to send the response outside of the callback context */ - UAttributesBuilder builder(attributes.id(), UMessageType::RESPONSE, UPriority::STANDARD); + UAttributesBuilder builder(attributes.id(), UMessageType::UMESSAGE_TYPE_RESPONSE, UPriority::UPRIORITY_CS1); UAttributes responseAttributes = builder.build(); /* Send the response */