aboutsummaryrefslogtreecommitdiff
path: root/src/server/proto
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2024-08-18 18:59:58 +0200
committerOvahlord <dreadkiller@gmx.de>2024-08-18 20:39:21 +0200
commit25ffdbc5ef0859aeaadfa132329a498e86827e68 (patch)
treed7df51da8cdc3e3df7c50e5058803f9324715ee4 /src/server/proto
parent0c98004896cb91ef2d22baa5569ff0e0d6cd15ee (diff)
Core/Realms: Realmlist refactors
* Removed global realm variable from World and use RealmList everywhere * Match auth build key with client version * Restored allowedSecurityLevel checks for realmlist packet building * Restored updating population field, mysteriously removed 15 years ago in f20b25d1c90f608deab28c9957b3b376ab2a0d50 (cherry picked from commit c4b710446d62c95eb8124175203fa5f394912594) # Conflicts: # sql/base/auth_database.sql
Diffstat (limited to 'src/server/proto')
-rw-r--r--src/server/proto/RealmList/RealmList.pb.cc228
-rw-r--r--src/server/proto/RealmList/RealmList.pb.h269
-rw-r--r--src/server/proto/RealmList/RealmList.proto14
3 files changed, 392 insertions, 119 deletions
diff --git a/src/server/proto/RealmList/RealmList.pb.cc b/src/server/proto/RealmList/RealmList.pb.cc
index c94de181531..44c27eadcd8 100644
--- a/src/server/proto/RealmList/RealmList.pb.cc
+++ b/src/server/proto/RealmList/RealmList.pb.cc
@@ -39,12 +39,15 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
const ::google::protobuf::Descriptor* RealmCharacterCountList_descriptor_ = NULL;
const ::google::protobuf::internal::GeneratedMessageReflection*
RealmCharacterCountList_reflection_ = NULL;
+const ::google::protobuf::Descriptor* RealmListRAFInfo_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+ RealmListRAFInfo_reflection_ = NULL;
const ::google::protobuf::Descriptor* RealmEntry_descriptor_ = NULL;
const ::google::protobuf::internal::GeneratedMessageReflection*
RealmEntry_reflection_ = NULL;
-const ::google::protobuf::Descriptor* RealmState_descriptor_ = NULL;
+const ::google::protobuf::Descriptor* RealmListUpdatePart_descriptor_ = NULL;
const ::google::protobuf::internal::GeneratedMessageReflection*
- RealmState_reflection_ = NULL;
+ RealmListUpdatePart_reflection_ = NULL;
const ::google::protobuf::Descriptor* RealmListUpdates_descriptor_ = NULL;
const ::google::protobuf::internal::GeneratedMessageReflection*
RealmListUpdates_reflection_ = NULL;
@@ -174,7 +177,23 @@ void protobuf_AssignDesc_RealmList_2eproto() {
::google::protobuf::DescriptorPool::generated_pool(),
::google::protobuf::MessageFactory::generated_factory(),
sizeof(RealmCharacterCountList));
- RealmEntry_descriptor_ = file->message_type(6);
+ RealmListRAFInfo_descriptor_ = file->message_type(6);
+ static const int RealmListRAFInfo_offsets_[2] = {
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmListRAFInfo, wowrealmaddress_),
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmListRAFInfo, faction_),
+ };
+ RealmListRAFInfo_reflection_ =
+ new ::google::protobuf::internal::GeneratedMessageReflection(
+ RealmListRAFInfo_descriptor_,
+ RealmListRAFInfo::default_instance_,
+ RealmListRAFInfo_offsets_,
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmListRAFInfo, _has_bits_[0]),
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmListRAFInfo, _unknown_fields_),
+ -1,
+ ::google::protobuf::DescriptorPool::generated_pool(),
+ ::google::protobuf::MessageFactory::generated_factory(),
+ sizeof(RealmListRAFInfo));
+ RealmEntry_descriptor_ = file->message_type(7);
static const int RealmEntry_offsets_[10] = {
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmEntry, wowrealmaddress_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmEntry, cfgtimezonesid_),
@@ -198,23 +217,24 @@ void protobuf_AssignDesc_RealmList_2eproto() {
::google::protobuf::DescriptorPool::generated_pool(),
::google::protobuf::MessageFactory::generated_factory(),
sizeof(RealmEntry));
- RealmState_descriptor_ = file->message_type(7);
- static const int RealmState_offsets_[2] = {
- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmState, update_),
- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmState, deleting_),
+ RealmListUpdatePart_descriptor_ = file->message_type(8);
+ static const int RealmListUpdatePart_offsets_[3] = {
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmListUpdatePart, wowrealmaddress_),
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmListUpdatePart, update_),
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmListUpdatePart, deleting_),
};
- RealmState_reflection_ =
+ RealmListUpdatePart_reflection_ =
new ::google::protobuf::internal::GeneratedMessageReflection(
- RealmState_descriptor_,
- RealmState::default_instance_,
- RealmState_offsets_,
- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmState, _has_bits_[0]),
- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmState, _unknown_fields_),
+ RealmListUpdatePart_descriptor_,
+ RealmListUpdatePart::default_instance_,
+ RealmListUpdatePart_offsets_,
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmListUpdatePart, _has_bits_[0]),
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmListUpdatePart, _unknown_fields_),
-1,
::google::protobuf::DescriptorPool::generated_pool(),
::google::protobuf::MessageFactory::generated_factory(),
- sizeof(RealmState));
- RealmListUpdates_descriptor_ = file->message_type(8);
+ sizeof(RealmListUpdatePart));
+ RealmListUpdates_descriptor_ = file->message_type(9);
static const int RealmListUpdates_offsets_[1] = {
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmListUpdates, updates_),
};
@@ -229,7 +249,7 @@ void protobuf_AssignDesc_RealmList_2eproto() {
::google::protobuf::DescriptorPool::generated_pool(),
::google::protobuf::MessageFactory::generated_factory(),
sizeof(RealmListUpdates));
- IPAddress_descriptor_ = file->message_type(9);
+ IPAddress_descriptor_ = file->message_type(10);
static const int IPAddress_offsets_[2] = {
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(IPAddress, ip_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(IPAddress, port_),
@@ -245,7 +265,7 @@ void protobuf_AssignDesc_RealmList_2eproto() {
::google::protobuf::DescriptorPool::generated_pool(),
::google::protobuf::MessageFactory::generated_factory(),
sizeof(IPAddress));
- RealmIPAddressFamily_descriptor_ = file->message_type(10);
+ RealmIPAddressFamily_descriptor_ = file->message_type(11);
static const int RealmIPAddressFamily_offsets_[2] = {
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmIPAddressFamily, family_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmIPAddressFamily, addresses_),
@@ -261,7 +281,7 @@ void protobuf_AssignDesc_RealmList_2eproto() {
::google::protobuf::DescriptorPool::generated_pool(),
::google::protobuf::MessageFactory::generated_factory(),
sizeof(RealmIPAddressFamily));
- RealmListServerIPAddresses_descriptor_ = file->message_type(11);
+ RealmListServerIPAddresses_descriptor_ = file->message_type(12);
static const int RealmListServerIPAddresses_offsets_[1] = {
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RealmListServerIPAddresses, families_),
};
@@ -301,9 +321,11 @@ void protobuf_RegisterTypes(const ::std::string&) {
::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
RealmCharacterCountList_descriptor_, &RealmCharacterCountList::default_instance());
::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+ RealmListRAFInfo_descriptor_, &RealmListRAFInfo::default_instance());
+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
RealmEntry_descriptor_, &RealmEntry::default_instance());
::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
- RealmState_descriptor_, &RealmState::default_instance());
+ RealmListUpdatePart_descriptor_, &RealmListUpdatePart::default_instance());
::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
RealmListUpdates_descriptor_, &RealmListUpdates::default_instance());
::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
@@ -329,10 +351,12 @@ void protobuf_ShutdownFile_RealmList_2eproto() {
delete RealmCharacterCountEntry_reflection_;
delete RealmCharacterCountList::default_instance_;
delete RealmCharacterCountList_reflection_;
+ delete RealmListRAFInfo::default_instance_;
+ delete RealmListRAFInfo_reflection_;
delete RealmEntry::default_instance_;
delete RealmEntry_reflection_;
- delete RealmState::default_instance_;
- delete RealmState_reflection_;
+ delete RealmListUpdatePart::default_instance_;
+ delete RealmListUpdatePart_reflection_;
delete RealmListUpdates::default_instance_;
delete RealmListUpdates_reflection_;
delete IPAddress::default_instance_;
@@ -369,23 +393,25 @@ void protobuf_AddDesc_RealmList_2eproto() {
"almCharacterCountEntry\022\027\n\017wowRealmAddres"
"s\030\001 \002(\007\022\r\n\005count\030\002 \002(\r\"S\n\027RealmCharacter"
"CountList\0228\n\006counts\030\001 \003(\0132(.JSON.RealmLi"
- "st.RealmCharacterCountEntry\"\377\001\n\nRealmEnt"
- "ry\022\027\n\017wowRealmAddress\030\001 \002(\007\022\026\n\016cfgTimezo"
- "nesID\030\002 \002(\r\022\027\n\017populationState\030\003 \002(\r\022\027\n\017"
- "cfgCategoriesID\030\004 \002(\r\022.\n\007version\030\005 \002(\0132\035"
- ".JSON.RealmList.ClientVersion\022\023\n\013cfgReal"
- "msID\030\006 \002(\r\022\r\n\005flags\030\007 \002(\r\022\014\n\004name\030\010 \002(\t\022"
- "\024\n\014cfgConfigsID\030\t \002(\r\022\026\n\016cfgLanguagesID\030"
- "\n \002(\r\"J\n\nRealmState\022*\n\006update\030\001 \001(\0132\032.JS"
- "ON.RealmList.RealmEntry\022\020\n\010deleting\030\002 \002("
- "\010\"\?\n\020RealmListUpdates\022+\n\007updates\030\001 \003(\0132\032"
- ".JSON.RealmList.RealmState\"%\n\tIPAddress\022"
- "\n\n\002ip\030\001 \002(\t\022\014\n\004port\030\002 \002(\r\"T\n\024RealmIPAddr"
- "essFamily\022\016\n\006family\030\001 \002(\r\022,\n\taddresses\030\002"
- " \003(\0132\031.JSON.RealmList.IPAddress\"T\n\032Realm"
- "ListServerIPAddresses\0226\n\010families\030\001 \003(\0132"
- "$.JSON.RealmList.RealmIPAddressFamilyB\002H"
- "\002", 1401);
+ "st.RealmCharacterCountEntry\"<\n\020RealmList"
+ "RAFInfo\022\027\n\017wowRealmAddress\030\001 \002(\007\022\017\n\007fact"
+ "ion\030\002 \002(\r\"\377\001\n\nRealmEntry\022\027\n\017wowRealmAddr"
+ "ess\030\001 \002(\007\022\026\n\016cfgTimezonesID\030\002 \002(\r\022\027\n\017pop"
+ "ulationState\030\003 \002(\r\022\027\n\017cfgCategoriesID\030\004 "
+ "\002(\r\022.\n\007version\030\005 \002(\0132\035.JSON.RealmList.Cl"
+ "ientVersion\022\023\n\013cfgRealmsID\030\006 \002(\r\022\r\n\005flag"
+ "s\030\007 \002(\r\022\014\n\004name\030\010 \002(\t\022\024\n\014cfgConfigsID\030\t "
+ "\002(\r\022\026\n\016cfgLanguagesID\030\n \002(\r\"l\n\023RealmList"
+ "UpdatePart\022\027\n\017wowRealmAddress\030\001 \002(\007\022*\n\006u"
+ "pdate\030\002 \001(\0132\032.JSON.RealmList.RealmEntry\022"
+ "\020\n\010deleting\030\003 \002(\010\"H\n\020RealmListUpdates\0224\n"
+ "\007updates\030\001 \003(\0132#.JSON.RealmList.RealmLis"
+ "tUpdatePart\"%\n\tIPAddress\022\n\n\002ip\030\001 \002(\t\022\014\n\004"
+ "port\030\002 \002(\r\"T\n\024RealmIPAddressFamily\022\016\n\006fa"
+ "mily\030\001 \002(\r\022,\n\taddresses\030\002 \003(\0132\031.JSON.Rea"
+ "lmList.IPAddress\"T\n\032RealmListServerIPAdd"
+ "resses\0226\n\010families\030\001 \003(\0132$.JSON.RealmLis"
+ "t.RealmIPAddressFamilyB\002H\002", 1506);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"RealmList.proto", &protobuf_RegisterTypes);
RealmListTicketIdentity::default_instance_ = new RealmListTicketIdentity();
@@ -394,8 +420,9 @@ void protobuf_AddDesc_RealmList_2eproto() {
RealmListTicketClientInformation::default_instance_ = new RealmListTicketClientInformation();
RealmCharacterCountEntry::default_instance_ = new RealmCharacterCountEntry();
RealmCharacterCountList::default_instance_ = new RealmCharacterCountList();
+ RealmListRAFInfo::default_instance_ = new RealmListRAFInfo();
RealmEntry::default_instance_ = new RealmEntry();
- RealmState::default_instance_ = new RealmState();
+ RealmListUpdatePart::default_instance_ = new RealmListUpdatePart();
RealmListUpdates::default_instance_ = new RealmListUpdates();
IPAddress::default_instance_ = new IPAddress();
RealmIPAddressFamily::default_instance_ = new RealmIPAddressFamily();
@@ -406,8 +433,9 @@ void protobuf_AddDesc_RealmList_2eproto() {
RealmListTicketClientInformation::default_instance_->InitAsDefaultInstance();
RealmCharacterCountEntry::default_instance_->InitAsDefaultInstance();
RealmCharacterCountList::default_instance_->InitAsDefaultInstance();
+ RealmListRAFInfo::default_instance_->InitAsDefaultInstance();
RealmEntry::default_instance_->InitAsDefaultInstance();
- RealmState::default_instance_->InitAsDefaultInstance();
+ RealmListUpdatePart::default_instance_->InitAsDefaultInstance();
RealmListUpdates::default_instance_->InitAsDefaultInstance();
IPAddress::default_instance_->InitAsDefaultInstance();
RealmIPAddressFamily::default_instance_->InitAsDefaultInstance();
@@ -908,6 +936,80 @@ void RealmCharacterCountList::Swap(RealmCharacterCountList* other) {
// ===================================================================
#ifndef _MSC_VER
+const int RealmListRAFInfo::kWowRealmAddressFieldNumber;
+const int RealmListRAFInfo::kFactionFieldNumber;
+#endif // !_MSC_VER
+
+RealmListRAFInfo::RealmListRAFInfo()
+ : ::google::protobuf::Message() {
+ SharedCtor();
+ // @@protoc_insertion_point(constructor:JSON.RealmList.RealmListRAFInfo)
+}
+
+void RealmListRAFInfo::InitAsDefaultInstance() {
+}
+
+RealmListRAFInfo::RealmListRAFInfo(const RealmListRAFInfo& from)
+ : ::google::protobuf::Message() {
+ SharedCtor();
+ MergeFrom(from);
+ // @@protoc_insertion_point(copy_constructor:JSON.RealmList.RealmListRAFInfo)
+}
+
+void RealmListRAFInfo::SharedCtor() {
+ _cached_size_ = 0;
+ wowrealmaddress_ = 0u;
+ faction_ = 0u;
+ ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+RealmListRAFInfo::~RealmListRAFInfo() {
+ // @@protoc_insertion_point(destructor:JSON.RealmList.RealmListRAFInfo)
+ SharedDtor();
+}
+
+void RealmListRAFInfo::SharedDtor() {
+ if (this != default_instance_) {
+ }
+}
+
+void RealmListRAFInfo::SetCachedSize(int size) const {
+ GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+ _cached_size_ = size;
+ GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* RealmListRAFInfo::descriptor() {
+ protobuf_AssignDescriptorsOnce();
+ return RealmListRAFInfo_descriptor_;
+}
+
+const RealmListRAFInfo& RealmListRAFInfo::default_instance() {
+ if (default_instance_ == NULL) protobuf_AddDesc_RealmList_2eproto();
+ return *default_instance_;
+}
+
+RealmListRAFInfo* RealmListRAFInfo::default_instance_ = NULL;
+
+RealmListRAFInfo* RealmListRAFInfo::New() const {
+ return new RealmListRAFInfo;
+}
+
+void RealmListRAFInfo::Swap(RealmListRAFInfo* other) {
+ if (other != this) {
+ GetReflection()->Swap(this, other);}
+}
+
+::google::protobuf::Metadata RealmListRAFInfo::GetMetadata() const {
+ protobuf_AssignDescriptorsOnce();
+ ::google::protobuf::Metadata metadata;
+ metadata.descriptor = RealmListRAFInfo_descriptor_;
+ metadata.reflection = RealmListRAFInfo_reflection_;
+ return metadata;
+}
+
+// ===================================================================
+
+#ifndef _MSC_VER
const int RealmEntry::kWowRealmAddressFieldNumber;
const int RealmEntry::kCfgTimezonesIDFieldNumber;
const int RealmEntry::kPopulationStateFieldNumber;
@@ -1004,76 +1106,78 @@ void RealmEntry::Swap(RealmEntry* other) {
// ===================================================================
#ifndef _MSC_VER
-const int RealmState::kUpdateFieldNumber;
-const int RealmState::kDeletingFieldNumber;
+const int RealmListUpdatePart::kWowRealmAddressFieldNumber;
+const int RealmListUpdatePart::kUpdateFieldNumber;
+const int RealmListUpdatePart::kDeletingFieldNumber;
#endif // !_MSC_VER
-RealmState::RealmState()
+RealmListUpdatePart::RealmListUpdatePart()
: ::google::protobuf::Message() {
SharedCtor();
- // @@protoc_insertion_point(constructor:JSON.RealmList.RealmState)
+ // @@protoc_insertion_point(constructor:JSON.RealmList.RealmListUpdatePart)
}
-void RealmState::InitAsDefaultInstance() {
+void RealmListUpdatePart::InitAsDefaultInstance() {
update_ = const_cast< ::JSON::RealmList::RealmEntry*>(&::JSON::RealmList::RealmEntry::default_instance());
}
-RealmState::RealmState(const RealmState& from)
+RealmListUpdatePart::RealmListUpdatePart(const RealmListUpdatePart& from)
: ::google::protobuf::Message() {
SharedCtor();
MergeFrom(from);
- // @@protoc_insertion_point(copy_constructor:JSON.RealmList.RealmState)
+ // @@protoc_insertion_point(copy_constructor:JSON.RealmList.RealmListUpdatePart)
}
-void RealmState::SharedCtor() {
+void RealmListUpdatePart::SharedCtor() {
_cached_size_ = 0;
+ wowrealmaddress_ = 0u;
update_ = NULL;
deleting_ = false;
::memset(_has_bits_, 0, sizeof(_has_bits_));
}
-RealmState::~RealmState() {
- // @@protoc_insertion_point(destructor:JSON.RealmList.RealmState)
+RealmListUpdatePart::~RealmListUpdatePart() {
+ // @@protoc_insertion_point(destructor:JSON.RealmList.RealmListUpdatePart)
SharedDtor();
}
-void RealmState::SharedDtor() {
+void RealmListUpdatePart::SharedDtor() {
if (this != default_instance_) {
delete update_;
}
}
-void RealmState::SetCachedSize(int size) const {
+void RealmListUpdatePart::SetCachedSize(int size) const {
GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
_cached_size_ = size;
GOOGLE_SAFE_CONCURRENT_WRITES_END();
}
-const ::google::protobuf::Descriptor* RealmState::descriptor() {
+const ::google::protobuf::Descriptor* RealmListUpdatePart::descriptor() {
protobuf_AssignDescriptorsOnce();
- return RealmState_descriptor_;
+ return RealmListUpdatePart_descriptor_;
}
-const RealmState& RealmState::default_instance() {
+const RealmListUpdatePart& RealmListUpdatePart::default_instance() {
if (default_instance_ == NULL) protobuf_AddDesc_RealmList_2eproto();
return *default_instance_;
}
-RealmState* RealmState::default_instance_ = NULL;
+RealmListUpdatePart* RealmListUpdatePart::default_instance_ = NULL;
-RealmState* RealmState::New() const {
- return new RealmState;
+RealmListUpdatePart* RealmListUpdatePart::New() const {
+ return new RealmListUpdatePart;
}
-void RealmState::Swap(RealmState* other) {
+void RealmListUpdatePart::Swap(RealmListUpdatePart* other) {
if (other != this) {
GetReflection()->Swap(this, other);}
}
-::google::protobuf::Metadata RealmState::GetMetadata() const {
+::google::protobuf::Metadata RealmListUpdatePart::GetMetadata() const {
protobuf_AssignDescriptorsOnce();
::google::protobuf::Metadata metadata;
- metadata.descriptor = RealmState_descriptor_;
- metadata.reflection = RealmState_reflection_;
+ metadata.descriptor = RealmListUpdatePart_descriptor_;
+ metadata.reflection = RealmListUpdatePart_reflection_;
return metadata;
}
diff --git a/src/server/proto/RealmList/RealmList.pb.h b/src/server/proto/RealmList/RealmList.pb.h
index a79e15cef83..56e61f22ae1 100644
--- a/src/server/proto/RealmList/RealmList.pb.h
+++ b/src/server/proto/RealmList/RealmList.pb.h
@@ -41,8 +41,9 @@ class ClientInformation;
class RealmListTicketClientInformation;
class RealmCharacterCountEntry;
class RealmCharacterCountList;
+class RealmListRAFInfo;
class RealmEntry;
-class RealmState;
+class RealmListUpdatePart;
class RealmListUpdates;
class IPAddress;
class RealmIPAddressFamily;
@@ -653,6 +654,82 @@ class TC_PROTO_API RealmCharacterCountList : public ::google::protobuf::Message
};
// -------------------------------------------------------------------
+class TC_PROTO_API RealmListRAFInfo : public ::google::protobuf::Message {
+ public:
+ RealmListRAFInfo();
+ virtual ~RealmListRAFInfo();
+
+ RealmListRAFInfo(const RealmListRAFInfo& from);
+
+ inline RealmListRAFInfo& operator=(const RealmListRAFInfo& from) {
+ CopyFrom(from);
+ return *this;
+ }
+
+ inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+ return _unknown_fields_;
+ }
+
+ inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+ return &_unknown_fields_;
+ }
+
+ static const ::google::protobuf::Descriptor* descriptor();
+ static const RealmListRAFInfo& default_instance();
+
+ void Swap(RealmListRAFInfo* other);
+
+ // implements Message ----------------------------------------------
+
+ RealmListRAFInfo* New() const;
+ int GetCachedSize() const { return _cached_size_; }
+ private:
+ void SharedCtor();
+ void SharedDtor();
+ void SetCachedSize(int size) const;
+ public:
+ ::google::protobuf::Metadata GetMetadata() const;
+
+ // nested types ----------------------------------------------------
+
+ // accessors -------------------------------------------------------
+
+ // required fixed32 wowRealmAddress = 1;
+ inline bool has_wowrealmaddress() const;
+ inline void clear_wowrealmaddress();
+ static const int kWowRealmAddressFieldNumber = 1;
+ inline ::google::protobuf::uint32 wowrealmaddress() const;
+ inline void set_wowrealmaddress(::google::protobuf::uint32 value);
+
+ // required uint32 faction = 2;
+ inline bool has_faction() const;
+ inline void clear_faction();
+ static const int kFactionFieldNumber = 2;
+ inline ::google::protobuf::uint32 faction() const;
+ inline void set_faction(::google::protobuf::uint32 value);
+
+ // @@protoc_insertion_point(class_scope:JSON.RealmList.RealmListRAFInfo)
+ private:
+ inline void set_has_wowrealmaddress();
+ inline void clear_has_wowrealmaddress();
+ inline void set_has_faction();
+ inline void clear_has_faction();
+
+ ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+ ::google::protobuf::uint32 _has_bits_[1];
+ mutable int _cached_size_;
+ ::google::protobuf::uint32 wowrealmaddress_;
+ ::google::protobuf::uint32 faction_;
+ friend void TC_PROTO_API protobuf_AddDesc_RealmList_2eproto();
+ friend void protobuf_AssignDesc_RealmList_2eproto();
+ friend void protobuf_ShutdownFile_RealmList_2eproto();
+
+ void InitAsDefaultInstance();
+ static RealmListRAFInfo* default_instance_;
+};
+// -------------------------------------------------------------------
+
class TC_PROTO_API RealmEntry : public ::google::protobuf::Message {
public:
RealmEntry();
@@ -816,14 +893,14 @@ class TC_PROTO_API RealmEntry : public ::google::protobuf::Message {
};
// -------------------------------------------------------------------
-class TC_PROTO_API RealmState : public ::google::protobuf::Message {
+class TC_PROTO_API RealmListUpdatePart : public ::google::protobuf::Message {
public:
- RealmState();
- virtual ~RealmState();
+ RealmListUpdatePart();
+ virtual ~RealmListUpdatePart();
- RealmState(const RealmState& from);
+ RealmListUpdatePart(const RealmListUpdatePart& from);
- inline RealmState& operator=(const RealmState& from) {
+ inline RealmListUpdatePart& operator=(const RealmListUpdatePart& from) {
CopyFrom(from);
return *this;
}
@@ -837,13 +914,13 @@ class TC_PROTO_API RealmState : public ::google::protobuf::Message {
}
static const ::google::protobuf::Descriptor* descriptor();
- static const RealmState& default_instance();
+ static const RealmListUpdatePart& default_instance();
- void Swap(RealmState* other);
+ void Swap(RealmListUpdatePart* other);
// implements Message ----------------------------------------------
- RealmState* New() const;
+ RealmListUpdatePart* New() const;
int GetCachedSize() const { return _cached_size_; }
private:
void SharedCtor();
@@ -856,24 +933,33 @@ class TC_PROTO_API RealmState : public ::google::protobuf::Message {
// accessors -------------------------------------------------------
- // optional .JSON.RealmList.RealmEntry update = 1;
+ // required fixed32 wowRealmAddress = 1;
+ inline bool has_wowrealmaddress() const;
+ inline void clear_wowrealmaddress();
+ static const int kWowRealmAddressFieldNumber = 1;
+ inline ::google::protobuf::uint32 wowrealmaddress() const;
+ inline void set_wowrealmaddress(::google::protobuf::uint32 value);
+
+ // optional .JSON.RealmList.RealmEntry update = 2;
inline bool has_update() const;
inline void clear_update();
- static const int kUpdateFieldNumber = 1;
+ static const int kUpdateFieldNumber = 2;
inline const ::JSON::RealmList::RealmEntry& update() const;
inline ::JSON::RealmList::RealmEntry* mutable_update();
inline ::JSON::RealmList::RealmEntry* release_update();
inline void set_allocated_update(::JSON::RealmList::RealmEntry* update);
- // required bool deleting = 2;
+ // required bool deleting = 3;
inline bool has_deleting() const;
inline void clear_deleting();
- static const int kDeletingFieldNumber = 2;
+ static const int kDeletingFieldNumber = 3;
inline bool deleting() const;
inline void set_deleting(bool value);
- // @@protoc_insertion_point(class_scope:JSON.RealmList.RealmState)
+ // @@protoc_insertion_point(class_scope:JSON.RealmList.RealmListUpdatePart)
private:
+ inline void set_has_wowrealmaddress();
+ inline void clear_has_wowrealmaddress();
inline void set_has_update();
inline void clear_has_update();
inline void set_has_deleting();
@@ -884,13 +970,14 @@ class TC_PROTO_API RealmState : public ::google::protobuf::Message {
::google::protobuf::uint32 _has_bits_[1];
mutable int _cached_size_;
::JSON::RealmList::RealmEntry* update_;
+ ::google::protobuf::uint32 wowrealmaddress_;
bool deleting_;
friend void TC_PROTO_API protobuf_AddDesc_RealmList_2eproto();
friend void protobuf_AssignDesc_RealmList_2eproto();
friend void protobuf_ShutdownFile_RealmList_2eproto();
void InitAsDefaultInstance();
- static RealmState* default_instance_;
+ static RealmListUpdatePart* default_instance_;
};
// -------------------------------------------------------------------
@@ -934,16 +1021,16 @@ class TC_PROTO_API RealmListUpdates : public ::google::protobuf::Message {
// accessors -------------------------------------------------------
- // repeated .JSON.RealmList.RealmState updates = 1;
+ // repeated .JSON.RealmList.RealmListUpdatePart updates = 1;
inline int updates_size() const;
inline void clear_updates();
static const int kUpdatesFieldNumber = 1;
- inline const ::JSON::RealmList::RealmState& updates(int index) const;
- inline ::JSON::RealmList::RealmState* mutable_updates(int index);
- inline ::JSON::RealmList::RealmState* add_updates();
- inline const ::google::protobuf::RepeatedPtrField< ::JSON::RealmList::RealmState >&
+ inline const ::JSON::RealmList::RealmListUpdatePart& updates(int index) const;
+ inline ::JSON::RealmList::RealmListUpdatePart* mutable_updates(int index);
+ inline ::JSON::RealmList::RealmListUpdatePart* add_updates();
+ inline const ::google::protobuf::RepeatedPtrField< ::JSON::RealmList::RealmListUpdatePart >&
updates() const;
- inline ::google::protobuf::RepeatedPtrField< ::JSON::RealmList::RealmState >*
+ inline ::google::protobuf::RepeatedPtrField< ::JSON::RealmList::RealmListUpdatePart >*
mutable_updates();
// @@protoc_insertion_point(class_scope:JSON.RealmList.RealmListUpdates)
@@ -953,7 +1040,7 @@ class TC_PROTO_API RealmListUpdates : public ::google::protobuf::Message {
::google::protobuf::uint32 _has_bits_[1];
mutable int _cached_size_;
- ::google::protobuf::RepeatedPtrField< ::JSON::RealmList::RealmState > updates_;
+ ::google::protobuf::RepeatedPtrField< ::JSON::RealmList::RealmListUpdatePart > updates_;
friend void TC_PROTO_API protobuf_AddDesc_RealmList_2eproto();
friend void protobuf_AssignDesc_RealmList_2eproto();
friend void protobuf_ShutdownFile_RealmList_2eproto();
@@ -2044,6 +2131,58 @@ RealmCharacterCountList::mutable_counts() {
// -------------------------------------------------------------------
+// RealmListRAFInfo
+
+// required fixed32 wowRealmAddress = 1;
+inline bool RealmListRAFInfo::has_wowrealmaddress() const {
+ return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void RealmListRAFInfo::set_has_wowrealmaddress() {
+ _has_bits_[0] |= 0x00000001u;
+}
+inline void RealmListRAFInfo::clear_has_wowrealmaddress() {
+ _has_bits_[0] &= ~0x00000001u;
+}
+inline void RealmListRAFInfo::clear_wowrealmaddress() {
+ wowrealmaddress_ = 0u;
+ clear_has_wowrealmaddress();
+}
+inline ::google::protobuf::uint32 RealmListRAFInfo::wowrealmaddress() const {
+ // @@protoc_insertion_point(field_get:JSON.RealmList.RealmListRAFInfo.wowRealmAddress)
+ return wowrealmaddress_;
+}
+inline void RealmListRAFInfo::set_wowrealmaddress(::google::protobuf::uint32 value) {
+ set_has_wowrealmaddress();
+ wowrealmaddress_ = value;
+ // @@protoc_insertion_point(field_set:JSON.RealmList.RealmListRAFInfo.wowRealmAddress)
+}
+
+// required uint32 faction = 2;
+inline bool RealmListRAFInfo::has_faction() const {
+ return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void RealmListRAFInfo::set_has_faction() {
+ _has_bits_[0] |= 0x00000002u;
+}
+inline void RealmListRAFInfo::clear_has_faction() {
+ _has_bits_[0] &= ~0x00000002u;
+}
+inline void RealmListRAFInfo::clear_faction() {
+ faction_ = 0u;
+ clear_has_faction();
+}
+inline ::google::protobuf::uint32 RealmListRAFInfo::faction() const {
+ // @@protoc_insertion_point(field_get:JSON.RealmList.RealmListRAFInfo.faction)
+ return faction_;
+}
+inline void RealmListRAFInfo::set_faction(::google::protobuf::uint32 value) {
+ set_has_faction();
+ faction_ = value;
+ // @@protoc_insertion_point(field_set:JSON.RealmList.RealmListRAFInfo.faction)
+}
+
+// -------------------------------------------------------------------
+
// RealmEntry
// required fixed32 wowRealmAddress = 1;
@@ -2357,39 +2496,63 @@ inline void RealmEntry::set_cfglanguagesid(::google::protobuf::uint32 value) {
// -------------------------------------------------------------------
-// RealmState
+// RealmListUpdatePart
-// optional .JSON.RealmList.RealmEntry update = 1;
-inline bool RealmState::has_update() const {
+// required fixed32 wowRealmAddress = 1;
+inline bool RealmListUpdatePart::has_wowrealmaddress() const {
return (_has_bits_[0] & 0x00000001u) != 0;
}
-inline void RealmState::set_has_update() {
+inline void RealmListUpdatePart::set_has_wowrealmaddress() {
_has_bits_[0] |= 0x00000001u;
}
-inline void RealmState::clear_has_update() {
+inline void RealmListUpdatePart::clear_has_wowrealmaddress() {
_has_bits_[0] &= ~0x00000001u;
}
-inline void RealmState::clear_update() {
+inline void RealmListUpdatePart::clear_wowrealmaddress() {
+ wowrealmaddress_ = 0u;
+ clear_has_wowrealmaddress();
+}
+inline ::google::protobuf::uint32 RealmListUpdatePart::wowrealmaddress() const {
+ // @@protoc_insertion_point(field_get:JSON.RealmList.RealmListUpdatePart.wowRealmAddress)
+ return wowrealmaddress_;
+}
+inline void RealmListUpdatePart::set_wowrealmaddress(::google::protobuf::uint32 value) {
+ set_has_wowrealmaddress();
+ wowrealmaddress_ = value;
+ // @@protoc_insertion_point(field_set:JSON.RealmList.RealmListUpdatePart.wowRealmAddress)
+}
+
+// optional .JSON.RealmList.RealmEntry update = 2;
+inline bool RealmListUpdatePart::has_update() const {
+ return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void RealmListUpdatePart::set_has_update() {
+ _has_bits_[0] |= 0x00000002u;
+}
+inline void RealmListUpdatePart::clear_has_update() {
+ _has_bits_[0] &= ~0x00000002u;
+}
+inline void RealmListUpdatePart::clear_update() {
if (update_ != NULL) update_->::JSON::RealmList::RealmEntry::Clear();
clear_has_update();
}
-inline const ::JSON::RealmList::RealmEntry& RealmState::update() const {
- // @@protoc_insertion_point(field_get:JSON.RealmList.RealmState.update)
+inline const ::JSON::RealmList::RealmEntry& RealmListUpdatePart::update() const {
+ // @@protoc_insertion_point(field_get:JSON.RealmList.RealmListUpdatePart.update)
return update_ != NULL ? *update_ : *default_instance_->update_;
}
-inline ::JSON::RealmList::RealmEntry* RealmState::mutable_update() {
+inline ::JSON::RealmList::RealmEntry* RealmListUpdatePart::mutable_update() {
set_has_update();
if (update_ == NULL) update_ = new ::JSON::RealmList::RealmEntry;
- // @@protoc_insertion_point(field_mutable:JSON.RealmList.RealmState.update)
+ // @@protoc_insertion_point(field_mutable:JSON.RealmList.RealmListUpdatePart.update)
return update_;
}
-inline ::JSON::RealmList::RealmEntry* RealmState::release_update() {
+inline ::JSON::RealmList::RealmEntry* RealmListUpdatePart::release_update() {
clear_has_update();
::JSON::RealmList::RealmEntry* temp = update_;
update_ = NULL;
return temp;
}
-inline void RealmState::set_allocated_update(::JSON::RealmList::RealmEntry* update) {
+inline void RealmListUpdatePart::set_allocated_update(::JSON::RealmList::RealmEntry* update) {
delete update_;
update_ = update;
if (update) {
@@ -2397,62 +2560,62 @@ inline void RealmState::set_allocated_update(::JSON::RealmList::RealmEntry* upda
} else {
clear_has_update();
}
- // @@protoc_insertion_point(field_set_allocated:JSON.RealmList.RealmState.update)
+ // @@protoc_insertion_point(field_set_allocated:JSON.RealmList.RealmListUpdatePart.update)
}
-// required bool deleting = 2;
-inline bool RealmState::has_deleting() const {
- return (_has_bits_[0] & 0x00000002u) != 0;
+// required bool deleting = 3;
+inline bool RealmListUpdatePart::has_deleting() const {
+ return (_has_bits_[0] & 0x00000004u) != 0;
}
-inline void RealmState::set_has_deleting() {
- _has_bits_[0] |= 0x00000002u;
+inline void RealmListUpdatePart::set_has_deleting() {
+ _has_bits_[0] |= 0x00000004u;
}
-inline void RealmState::clear_has_deleting() {
- _has_bits_[0] &= ~0x00000002u;
+inline void RealmListUpdatePart::clear_has_deleting() {
+ _has_bits_[0] &= ~0x00000004u;
}
-inline void RealmState::clear_deleting() {
+inline void RealmListUpdatePart::clear_deleting() {
deleting_ = false;
clear_has_deleting();
}
-inline bool RealmState::deleting() const {
- // @@protoc_insertion_point(field_get:JSON.RealmList.RealmState.deleting)
+inline bool RealmListUpdatePart::deleting() const {
+ // @@protoc_insertion_point(field_get:JSON.RealmList.RealmListUpdatePart.deleting)
return deleting_;
}
-inline void RealmState::set_deleting(bool value) {
+inline void RealmListUpdatePart::set_deleting(bool value) {
set_has_deleting();
deleting_ = value;
- // @@protoc_insertion_point(field_set:JSON.RealmList.RealmState.deleting)
+ // @@protoc_insertion_point(field_set:JSON.RealmList.RealmListUpdatePart.deleting)
}
// -------------------------------------------------------------------
// RealmListUpdates
-// repeated .JSON.RealmList.RealmState updates = 1;
+// repeated .JSON.RealmList.RealmListUpdatePart updates = 1;
inline int RealmListUpdates::updates_size() const {
return updates_.size();
}
inline void RealmListUpdates::clear_updates() {
updates_.Clear();
}
-inline const ::JSON::RealmList::RealmState& RealmListUpdates::updates(int index) const {
+inline const ::JSON::RealmList::RealmListUpdatePart& RealmListUpdates::updates(int index) const {
// @@protoc_insertion_point(field_get:JSON.RealmList.RealmListUpdates.updates)
return updates_.Get(index);
}
-inline ::JSON::RealmList::RealmState* RealmListUpdates::mutable_updates(int index) {
+inline ::JSON::RealmList::RealmListUpdatePart* RealmListUpdates::mutable_updates(int index) {
// @@protoc_insertion_point(field_mutable:JSON.RealmList.RealmListUpdates.updates)
return updates_.Mutable(index);
}
-inline ::JSON::RealmList::RealmState* RealmListUpdates::add_updates() {
+inline ::JSON::RealmList::RealmListUpdatePart* RealmListUpdates::add_updates() {
// @@protoc_insertion_point(field_add:JSON.RealmList.RealmListUpdates.updates)
return updates_.Add();
}
-inline const ::google::protobuf::RepeatedPtrField< ::JSON::RealmList::RealmState >&
+inline const ::google::protobuf::RepeatedPtrField< ::JSON::RealmList::RealmListUpdatePart >&
RealmListUpdates::updates() const {
// @@protoc_insertion_point(field_list:JSON.RealmList.RealmListUpdates.updates)
return updates_;
}
-inline ::google::protobuf::RepeatedPtrField< ::JSON::RealmList::RealmState >*
+inline ::google::protobuf::RepeatedPtrField< ::JSON::RealmList::RealmListUpdatePart >*
RealmListUpdates::mutable_updates() {
// @@protoc_insertion_point(field_mutable_list:JSON.RealmList.RealmListUpdates.updates)
return &updates_;
diff --git a/src/server/proto/RealmList/RealmList.proto b/src/server/proto/RealmList/RealmList.proto
index c6ebc5ee2a9..aa184d46f8c 100644
--- a/src/server/proto/RealmList/RealmList.proto
+++ b/src/server/proto/RealmList/RealmList.proto
@@ -46,6 +46,11 @@ message RealmCharacterCountList {
repeated RealmCharacterCountEntry counts = 1;
}
+message RealmListRAFInfo {
+ required fixed32 wowRealmAddress = 1;
+ required uint32 faction = 2;
+}
+
message RealmEntry {
required fixed32 wowRealmAddress = 1;
required uint32 cfgTimezonesID = 2;
@@ -59,13 +64,14 @@ message RealmEntry {
required uint32 cfgLanguagesID = 10;
}
-message RealmState {
- optional RealmEntry update = 1;
- required bool deleting = 2;
+message RealmListUpdatePart {
+ required fixed32 wowRealmAddress = 1;
+ optional RealmEntry update = 2;
+ required bool deleting = 3;
}
message RealmListUpdates {
- repeated RealmState updates = 1;
+ repeated RealmListUpdatePart updates = 1;
}
message IPAddress {