diff --git a/uxcontrol.pb.cc b/uxcontrol.pb.cc index 52040c3..aad662c 100644 --- a/uxcontrol.pb.cc +++ b/uxcontrol.pb.cc @@ -79,7 +79,6 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORIT PROTOBUF_CONSTEXPR RouteMessage::RouteMessage( ::_pbi::ConstantInitialized): _impl_{ /*decltype(_impl_.address_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} - , /*decltype(_impl_.gateway_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}} , /*decltype(_impl_.meta_)*/nullptr , /*decltype(_impl_.prefix_)*/uint64_t{0u} , /*decltype(_impl_._cached_size_)*/{}} {} @@ -152,7 +151,6 @@ const uint32_t TableStruct_uxcontrol_2eproto::offsets[] PROTOBUF_SECTION_VARIABL PROTOBUF_FIELD_OFFSET(::uxcontrol::RouteMessage, _impl_.meta_), PROTOBUF_FIELD_OFFSET(::uxcontrol::RouteMessage, _impl_.address_), PROTOBUF_FIELD_OFFSET(::uxcontrol::RouteMessage, _impl_.prefix_), - PROTOBUF_FIELD_OFFSET(::uxcontrol::RouteMessage, _impl_.gateway_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::uxcontrol::HelloMessage, _internal_metadata_), ~0u, // no _extensions_ @@ -168,7 +166,7 @@ static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protode { 14, -1, -1, sizeof(::uxcontrol::PacketMessage)}, { 22, -1, -1, sizeof(::uxcontrol::AddressMessage)}, { 31, -1, -1, sizeof(::uxcontrol::RouteMessage)}, - { 41, -1, -1, sizeof(::uxcontrol::HelloMessage)}, + { 40, -1, -1, sizeof(::uxcontrol::HelloMessage)}, }; static const ::_pb::Message* const file_default_instances[] = { @@ -187,16 +185,15 @@ const char descriptor_table_protodef_uxcontrol_2eproto[] PROTOBUF_SECTION_VARIAB "Message\022#\n\004meta\030\001 \001(\0132\025.uxcontrol.MetaHe" "ader\022\017\n\007payload\030\002 \001(\014\"V\n\016AddressMessage\022" "#\n\004meta\030\001 \001(\0132\025.uxcontrol.MetaHeader\022\017\n\007" - "address\030\002 \001(\t\022\016\n\006prefix\030\003 \001(\004\"e\n\014RouteMe" + "address\030\002 \001(\t\022\016\n\006prefix\030\003 \001(\004\"T\n\014RouteMe" "ssage\022#\n\004meta\030\001 \001(\0132\025.uxcontrol.MetaHead" - "er\022\017\n\007address\030\002 \001(\t\022\016\n\006prefix\030\003 \001(\004\022\017\n\007g" - "ateway\030\004 \001(\t\"D\n\014HelloMessage\022#\n\004meta\030\001 \001" - "(\0132\025.uxcontrol.MetaHeader\022\017\n\007message\030\002 \001" - "(\tb\006proto3" + "er\022\017\n\007address\030\002 \001(\t\022\016\n\006prefix\030\003 \001(\004\"D\n\014H" + "elloMessage\022#\n\004meta\030\001 \001(\0132\025.uxcontrol.Me" + "taHeader\022\017\n\007message\030\002 \001(\tb\006proto3" ; static ::_pbi::once_flag descriptor_table_uxcontrol_2eproto_once; const ::_pbi::DescriptorTable descriptor_table_uxcontrol_2eproto = { - false, false, 450, descriptor_table_protodef_uxcontrol_2eproto, + false, false, 433, descriptor_table_protodef_uxcontrol_2eproto, "uxcontrol.proto", &descriptor_table_uxcontrol_2eproto_once, nullptr, 0, 6, schemas, file_default_instances, TableStruct_uxcontrol_2eproto::offsets, @@ -1145,7 +1142,6 @@ RouteMessage::RouteMessage(const RouteMessage& from) RouteMessage* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.address_){} - , decltype(_impl_.gateway_){} , decltype(_impl_.meta_){nullptr} , decltype(_impl_.prefix_){} , /*decltype(_impl_._cached_size_)*/{}}; @@ -1159,14 +1155,6 @@ RouteMessage::RouteMessage(const RouteMessage& from) _this->_impl_.address_.Set(from._internal_address(), _this->GetArenaForAllocation()); } - _impl_.gateway_.InitDefault(); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.gateway_.Set("", GetArenaForAllocation()); - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (!from._internal_gateway().empty()) { - _this->_impl_.gateway_.Set(from._internal_gateway(), - _this->GetArenaForAllocation()); - } if (from._internal_has_meta()) { _this->_impl_.meta_ = new ::uxcontrol::MetaHeader(*from._impl_.meta_); } @@ -1180,7 +1168,6 @@ inline void RouteMessage::SharedCtor( (void)is_message_owned; new (&_impl_) Impl_{ decltype(_impl_.address_){} - , decltype(_impl_.gateway_){} , decltype(_impl_.meta_){nullptr} , decltype(_impl_.prefix_){uint64_t{0u}} , /*decltype(_impl_._cached_size_)*/{} @@ -1189,10 +1176,6 @@ inline void RouteMessage::SharedCtor( #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING _impl_.address_.Set("", GetArenaForAllocation()); #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.gateway_.InitDefault(); - #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - _impl_.gateway_.Set("", GetArenaForAllocation()); - #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING } RouteMessage::~RouteMessage() { @@ -1207,7 +1190,6 @@ RouteMessage::~RouteMessage() { inline void RouteMessage::SharedDtor() { GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); _impl_.address_.Destroy(); - _impl_.gateway_.Destroy(); if (this != internal_default_instance()) delete _impl_.meta_; } @@ -1222,7 +1204,6 @@ void RouteMessage::Clear() { (void) cached_has_bits; _impl_.address_.ClearToEmpty(); - _impl_.gateway_.ClearToEmpty(); if (GetArenaForAllocation() == nullptr && _impl_.meta_ != nullptr) { delete _impl_.meta_; } @@ -1263,16 +1244,6 @@ const char* RouteMessage::_InternalParse(const char* ptr, ::_pbi::ParseContext* } else goto handle_unusual; continue; - // string gateway = 4; - case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 34)) { - auto str = _internal_mutable_gateway(); - ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx); - CHK_(ptr); - CHK_(::_pbi::VerifyUTF8(str, "uxcontrol.RouteMessage.gateway")); - } else - goto handle_unusual; - continue; default: goto handle_unusual; } // switch @@ -1325,16 +1296,6 @@ uint8_t* RouteMessage::_InternalSerialize( target = ::_pbi::WireFormatLite::WriteUInt64ToArray(3, this->_internal_prefix(), target); } - // string gateway = 4; - if (!this->_internal_gateway().empty()) { - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String( - this->_internal_gateway().data(), static_cast(this->_internal_gateway().length()), - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE, - "uxcontrol.RouteMessage.gateway"); - target = stream->WriteStringMaybeAliased( - 4, this->_internal_gateway(), target); - } - if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); @@ -1358,13 +1319,6 @@ size_t RouteMessage::ByteSizeLong() const { this->_internal_address()); } - // string gateway = 4; - if (!this->_internal_gateway().empty()) { - total_size += 1 + - ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize( - this->_internal_gateway()); - } - // .uxcontrol.MetaHeader meta = 1; if (this->_internal_has_meta()) { total_size += 1 + @@ -1398,9 +1352,6 @@ void RouteMessage::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::P if (!from._internal_address().empty()) { _this->_internal_set_address(from._internal_address()); } - if (!from._internal_gateway().empty()) { - _this->_internal_set_gateway(from._internal_gateway()); - } if (from._internal_has_meta()) { _this->_internal_mutable_meta()->::uxcontrol::MetaHeader::MergeFrom( from._internal_meta()); @@ -1431,10 +1382,6 @@ void RouteMessage::InternalSwap(RouteMessage* other) { &_impl_.address_, lhs_arena, &other->_impl_.address_, rhs_arena ); - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap( - &_impl_.gateway_, lhs_arena, - &other->_impl_.gateway_, rhs_arena - ); ::PROTOBUF_NAMESPACE_ID::internal::memswap< PROTOBUF_FIELD_OFFSET(RouteMessage, _impl_.prefix_) + sizeof(RouteMessage::_impl_.prefix_) diff --git a/uxcontrol.pb.h b/uxcontrol.pb.h index 527d513..f047b38 100644 --- a/uxcontrol.pb.h +++ b/uxcontrol.pb.h @@ -865,7 +865,6 @@ class RouteMessage final : enum : int { kAddressFieldNumber = 2, - kGatewayFieldNumber = 4, kMetaFieldNumber = 1, kPrefixFieldNumber = 3, }; @@ -883,20 +882,6 @@ class RouteMessage final : std::string* _internal_mutable_address(); public: - // string gateway = 4; - void clear_gateway(); - const std::string& gateway() const; - template - void set_gateway(ArgT0&& arg0, ArgT... args); - std::string* mutable_gateway(); - PROTOBUF_NODISCARD std::string* release_gateway(); - void set_allocated_gateway(std::string* gateway); - private: - const std::string& _internal_gateway() const; - inline PROTOBUF_ALWAYS_INLINE void _internal_set_gateway(const std::string& value); - std::string* _internal_mutable_gateway(); - public: - // .uxcontrol.MetaHeader meta = 1; bool has_meta() const; private: @@ -933,7 +918,6 @@ class RouteMessage final : typedef void DestructorSkippable_; struct Impl_ { ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr address_; - ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr gateway_; ::uxcontrol::MetaHeader* meta_; uint64_t prefix_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; @@ -1741,56 +1725,6 @@ inline void RouteMessage::set_prefix(uint64_t value) { // @@protoc_insertion_point(field_set:uxcontrol.RouteMessage.prefix) } -// string gateway = 4; -inline void RouteMessage::clear_gateway() { - _impl_.gateway_.ClearToEmpty(); -} -inline const std::string& RouteMessage::gateway() const { - // @@protoc_insertion_point(field_get:uxcontrol.RouteMessage.gateway) - return _internal_gateway(); -} -template -inline PROTOBUF_ALWAYS_INLINE -void RouteMessage::set_gateway(ArgT0&& arg0, ArgT... args) { - - _impl_.gateway_.Set(static_cast(arg0), args..., GetArenaForAllocation()); - // @@protoc_insertion_point(field_set:uxcontrol.RouteMessage.gateway) -} -inline std::string* RouteMessage::mutable_gateway() { - std::string* _s = _internal_mutable_gateway(); - // @@protoc_insertion_point(field_mutable:uxcontrol.RouteMessage.gateway) - return _s; -} -inline const std::string& RouteMessage::_internal_gateway() const { - return _impl_.gateway_.Get(); -} -inline void RouteMessage::_internal_set_gateway(const std::string& value) { - - _impl_.gateway_.Set(value, GetArenaForAllocation()); -} -inline std::string* RouteMessage::_internal_mutable_gateway() { - - return _impl_.gateway_.Mutable(GetArenaForAllocation()); -} -inline std::string* RouteMessage::release_gateway() { - // @@protoc_insertion_point(field_release:uxcontrol.RouteMessage.gateway) - return _impl_.gateway_.Release(); -} -inline void RouteMessage::set_allocated_gateway(std::string* gateway) { - if (gateway != nullptr) { - - } else { - - } - _impl_.gateway_.SetAllocated(gateway, GetArenaForAllocation()); -#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING - if (_impl_.gateway_.IsDefault()) { - _impl_.gateway_.Set("", GetArenaForAllocation()); - } -#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING - // @@protoc_insertion_point(field_set_allocated:uxcontrol.RouteMessage.gateway) -} - // ------------------------------------------------------------------- // HelloMessage diff --git a/uxcontrol.proto b/uxcontrol.proto index 75d2c7a..2c48eb1 100644 --- a/uxcontrol.proto +++ b/uxcontrol.proto @@ -28,7 +28,6 @@ message RouteMessage { MetaHeader meta = 1; string address = 2; uint64 prefix = 3; - string gateway = 4; }