diff --git a/broker/JFJochBrokerParser.cpp b/broker/JFJochBrokerParser.cpp index d28d12f5..76f3e376 100644 --- a/broker/JFJochBrokerParser.cpp +++ b/broker/JFJochBrokerParser.cpp @@ -199,7 +199,7 @@ std::unique_ptr ParseTCPImagePusher(const org::openapitools::server if (j.getTcp().sendBufferSizeIsSet()) send_buffer_size = j.getTcp().getSendBufferSize(); - auto tmp = std::make_unique(j.getTcp().getAddr(), j.getTcp().getNwriters(), send_buffer_size); + auto tmp = std::make_unique(j.getTcp().getImageSocket(), j.getTcp().getNwriters(), send_buffer_size); return std::move(tmp); } diff --git a/broker/gen/model/Tcp_settings.cpp b/broker/gen/model/Tcp_settings.cpp index a240894a..a811a644 100644 --- a/broker/gen/model/Tcp_settings.cpp +++ b/broker/gen/model/Tcp_settings.cpp @@ -23,7 +23,8 @@ Tcp_settings::Tcp_settings() { m_Send_buffer_size = 0L; m_Send_buffer_sizeIsSet = false; - m_Addr = ""; + m_Image_socket = ""; + m_Image_socketIsSet = false; m_Nwriters = 32L; m_NwritersIsSet = false; @@ -79,8 +80,8 @@ bool Tcp_settings::operator==(const Tcp_settings& rhs) const ((!sendBufferSizeIsSet() && !rhs.sendBufferSizeIsSet()) || (sendBufferSizeIsSet() && rhs.sendBufferSizeIsSet() && getSendBufferSize() == rhs.getSendBufferSize())) && - (getAddr() == rhs.getAddr()) - && + + ((!imageSocketIsSet() && !rhs.imageSocketIsSet()) || (imageSocketIsSet() && rhs.imageSocketIsSet() && getImageSocket() == rhs.getImageSocket())) && ((!nwritersIsSet() && !rhs.nwritersIsSet()) || (nwritersIsSet() && rhs.nwritersIsSet() && getNwriters() == rhs.getNwriters())) @@ -98,7 +99,8 @@ void to_json(nlohmann::json& j, const Tcp_settings& o) j = nlohmann::json::object(); if(o.sendBufferSizeIsSet()) j["send_buffer_size"] = o.m_Send_buffer_size; - j["addr"] = o.m_Addr; + if(o.imageSocketIsSet()) + j["image_socket"] = o.m_Image_socket; if(o.nwritersIsSet()) j["nwriters"] = o.m_Nwriters; @@ -111,7 +113,11 @@ void from_json(const nlohmann::json& j, Tcp_settings& o) j.at("send_buffer_size").get_to(o.m_Send_buffer_size); o.m_Send_buffer_sizeIsSet = true; } - j.at("addr").get_to(o.m_Addr); + if(j.find("image_socket") != j.end()) + { + j.at("image_socket").get_to(o.m_Image_socket); + o.m_Image_socketIsSet = true; + } if(j.find("nwriters") != j.end()) { j.at("nwriters").get_to(o.m_Nwriters); @@ -137,13 +143,22 @@ void Tcp_settings::unsetSend_buffer_size() { m_Send_buffer_sizeIsSet = false; } -std::string Tcp_settings::getAddr() const +std::string Tcp_settings::getImageSocket() const { - return m_Addr; + return m_Image_socket; } -void Tcp_settings::setAddr(std::string const& value) +void Tcp_settings::setImageSocket(std::string const& value) { - m_Addr = value; + m_Image_socket = value; + m_Image_socketIsSet = true; +} +bool Tcp_settings::imageSocketIsSet() const +{ + return m_Image_socketIsSet; +} +void Tcp_settings::unsetImage_socket() +{ + m_Image_socketIsSet = false; } int64_t Tcp_settings::getNwriters() const { diff --git a/broker/gen/model/Tcp_settings.h b/broker/gen/model/Tcp_settings.h index 72cec8e8..54e3d0d3 100644 --- a/broker/gen/model/Tcp_settings.h +++ b/broker/gen/model/Tcp_settings.h @@ -68,8 +68,10 @@ public: /// /// tcp://<IP address>:<port> 0.0.0.0 instead of IP address is accepted and means listening on all network interfaces /// - std::string getAddr() const; - void setAddr(std::string const& value); + std::string getImageSocket() const; + void setImageSocket(std::string const& value); + bool imageSocketIsSet() const; + void unsetImage_socket(); /// /// Number of TCP/IP writers to be used for streaming images /// @@ -83,8 +85,8 @@ public: protected: int64_t m_Send_buffer_size; bool m_Send_buffer_sizeIsSet; - std::string m_Addr; - + std::string m_Image_socket; + bool m_Image_socketIsSet; int64_t m_Nwriters; bool m_NwritersIsSet; diff --git a/broker/jfjoch_api.yaml b/broker/jfjoch_api.yaml index 77bf1af2..fff37adb 100644 --- a/broker/jfjoch_api.yaml +++ b/broker/jfjoch_api.yaml @@ -2166,7 +2166,7 @@ components: type: integer format: int64 description: Send buffer size for TCP/IP socket - addr: + image_socket: type: string example: "tcp://1.2.3.4:5000" description: | diff --git a/broker/redoc-static.html b/broker/redoc-static.html index bb1ac807..18e0d431 100644 --- a/broker/redoc-static.html +++ b/broker/redoc-static.html @@ -913,7 +913,7 @@ then image might be replaced in the buffer between calling /images and /image.cb