diff options
author | Shauren <shauren.trinity@gmail.com> | 2017-06-15 00:34:47 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2017-06-15 00:34:47 +0200 |
commit | f59e2ddd3112d0d3b666bd94d29b0cbb2d6e74f3 (patch) | |
tree | 924dc55d40431a68cb248eb01b3b56915829b4d2 /src | |
parent | bfbb948c73d6e6a556776a4fd0daf2c0f84a02c4 (diff) |
Core/PacketIO: Updated bnet packet structures to 7.2.5
Diffstat (limited to 'src')
-rw-r--r-- | src/server/proto/RealmList/RealmList.pb.cc | 66 | ||||
-rw-r--r-- | src/server/proto/RealmList/RealmList.pb.h | 193 | ||||
-rw-r--r-- | src/server/proto/RealmList/RealmList.proto | 4 |
3 files changed, 239 insertions, 24 deletions
diff --git a/src/server/proto/RealmList/RealmList.pb.cc b/src/server/proto/RealmList/RealmList.pb.cc index 206b21dbd4d..1d07db0c827 100644 --- a/src/server/proto/RealmList/RealmList.pb.cc +++ b/src/server/proto/RealmList/RealmList.pb.cc @@ -109,7 +109,7 @@ void protobuf_AssignDesc_RealmList_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(ClientVersion)); ClientInformation_descriptor_ = file->message_type(2); - static const int ClientInformation_offsets_[10] = { + static const int ClientInformation_offsets_[14] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClientInformation, platform_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClientInformation, buildvariant_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClientInformation, type_), @@ -120,6 +120,10 @@ void protobuf_AssignDesc_RealmList_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClientInformation, versiondatabuild_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClientInformation, version_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClientInformation, secret_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClientInformation, clientarch_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClientInformation, systemversion_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClientInformation, platformtype_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ClientInformation, systemarch_), }; ClientInformation_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -359,34 +363,37 @@ void protobuf_AddDesc_RealmList_2eproto() { "\002(\007\022\031\n\021gameAccountRegion\030\002 \002(\r\"j\n\rClient" "Version\022\024\n\014versionMajor\030\001 \002(\r\022\024\n\014version" "Minor\030\002 \002(\r\022\027\n\017versionRevision\030\003 \002(\r\022\024\n\014" - "versionBuild\030\004 \002(\007\"\363\001\n\021ClientInformation" + "versionBuild\030\004 \002(\007\"\310\002\n\021ClientInformation" "\022\020\n\010platform\030\001 \002(\007\022\024\n\014buildVariant\030\002 \002(\t" "\022\014\n\004type\030\003 \002(\007\022\020\n\010timeZone\030\004 \002(\t\022\023\n\013curr" "entTime\030\005 \002(\r\022\022\n\ntextLocale\030\006 \002(\007\022\023\n\013aud" "ioLocale\030\007 \002(\007\022\030\n\020versionDataBuild\030\010 \002(\007" "\022.\n\007version\030\t \002(\0132\035.JSON.RealmList.Clien" - "tVersion\022\016\n\006secret\030\n \002(\014\"S\n RealmListTic" - "ketClientInformation\022/\n\004info\030\001 \002(\0132!.JSO" - "N.RealmList.ClientInformation\"B\n\030RealmCh" - "aracterCountEntry\022\027\n\017wowRealmAddress\030\001 \002" - "(\007\022\r\n\005count\030\002 \002(\r\"S\n\027RealmCharacterCount" - "List\0228\n\006counts\030\001 \003(\0132(.JSON.RealmList.Re" - "almCharacterCountEntry\"\377\001\n\nRealmEntry\022\027\n" - "\017wowRealmAddress\030\001 \002(\007\022\026\n\016cfgTimezonesID" - "\030\002 \002(\r\022\027\n\017populationState\030\003 \002(\r\022\027\n\017cfgCa" - "tegoriesID\030\004 \002(\r\022.\n\007version\030\005 \002(\0132\035.JSON" - ".RealmList.ClientVersion\022\023\n\013cfgRealmsID\030" - "\006 \002(\r\022\r\n\005flags\030\007 \002(\r\022\014\n\004name\030\010 \002(\t\022\024\n\014cf" - "gConfigsID\030\t \002(\r\022\026\n\016cfgLanguagesID\030\n \002(\r" - "\"J\n\nRealmState\022*\n\006update\030\001 \001(\0132\032.JSON.Re" - "almList.RealmEntry\022\020\n\010deleting\030\002 \002(\010\"\?\n\020" - "RealmListUpdates\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\024RealmIPAddressFa" - "mily\022\016\n\006family\030\001 \002(\r\022,\n\taddresses\030\002 \003(\0132" - "\031.JSON.RealmList.IPAddress\"T\n\032RealmListS" - "erverIPAddresses\0226\n\010families\030\001 \003(\0132$.JSO" - "N.RealmList.RealmIPAddressFamilyB\002H\002", 1316); + "tVersion\022\016\n\006secret\030\n \002(\014\022\022\n\nclientArch\030\013" + " \002(\007\022\025\n\rsystemVersion\030\014 \002(\t\022\024\n\014platformT" + "ype\030\r \002(\007\022\022\n\nsystemArch\030\016 \002(\007\"S\n RealmLi" + "stTicketClientInformation\022/\n\004info\030\001 \002(\0132" + "!.JSON.RealmList.ClientInformation\"B\n\030Re" + "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); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "RealmList.proto", &protobuf_RegisterTypes); RealmListTicketIdentity::default_instance_ = new RealmListTicketIdentity(); @@ -590,6 +597,10 @@ const int ClientInformation::kAudioLocaleFieldNumber; const int ClientInformation::kVersionDataBuildFieldNumber; const int ClientInformation::kVersionFieldNumber; const int ClientInformation::kSecretFieldNumber; +const int ClientInformation::kClientArchFieldNumber; +const int ClientInformation::kSystemVersionFieldNumber; +const int ClientInformation::kPlatformTypeFieldNumber; +const int ClientInformation::kSystemArchFieldNumber; #endif // !_MSC_VER ClientInformation::ClientInformation() @@ -622,6 +633,10 @@ void ClientInformation::SharedCtor() { versiondatabuild_ = 0u; version_ = NULL; secret_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + clientarch_ = 0u; + systemversion_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + platformtype_ = 0u; + systemarch_ = 0u; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -640,6 +655,9 @@ void ClientInformation::SharedDtor() { if (secret_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { delete secret_; } + if (systemversion_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + delete systemversion_; + } if (this != default_instance_) { delete version_; } diff --git a/src/server/proto/RealmList/RealmList.pb.h b/src/server/proto/RealmList/RealmList.pb.h index 9fe36fb4cc3..496045cef57 100644 --- a/src/server/proto/RealmList/RealmList.pb.h +++ b/src/server/proto/RealmList/RealmList.pb.h @@ -349,6 +349,39 @@ class TC_PROTO_API ClientInformation : public ::google::protobuf::Message { inline ::std::string* release_secret(); inline void set_allocated_secret(::std::string* secret); + // required fixed32 clientArch = 11; + inline bool has_clientarch() const; + inline void clear_clientarch(); + static const int kClientArchFieldNumber = 11; + inline ::google::protobuf::uint32 clientarch() const; + inline void set_clientarch(::google::protobuf::uint32 value); + + // required string systemVersion = 12; + inline bool has_systemversion() const; + inline void clear_systemversion(); + static const int kSystemVersionFieldNumber = 12; + inline const ::std::string& systemversion() const; + inline void set_systemversion(const ::std::string& value); + inline void set_systemversion(const char* value); + inline void set_systemversion(const char* value, size_t size); + inline ::std::string* mutable_systemversion(); + inline ::std::string* release_systemversion(); + inline void set_allocated_systemversion(::std::string* systemversion); + + // required fixed32 platformType = 13; + inline bool has_platformtype() const; + inline void clear_platformtype(); + static const int kPlatformTypeFieldNumber = 13; + inline ::google::protobuf::uint32 platformtype() const; + inline void set_platformtype(::google::protobuf::uint32 value); + + // required fixed32 systemArch = 14; + inline bool has_systemarch() const; + inline void clear_systemarch(); + static const int kSystemArchFieldNumber = 14; + inline ::google::protobuf::uint32 systemarch() const; + inline void set_systemarch(::google::protobuf::uint32 value); + // @@protoc_insertion_point(class_scope:JSON.RealmList.ClientInformation) private: inline void set_has_platform(); @@ -371,6 +404,14 @@ class TC_PROTO_API ClientInformation : public ::google::protobuf::Message { inline void clear_has_version(); inline void set_has_secret(); inline void clear_has_secret(); + inline void set_has_clientarch(); + inline void clear_has_clientarch(); + inline void set_has_systemversion(); + inline void clear_has_systemversion(); + inline void set_has_platformtype(); + inline void clear_has_platformtype(); + inline void set_has_systemarch(); + inline void clear_has_systemarch(); ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -386,6 +427,10 @@ class TC_PROTO_API ClientInformation : public ::google::protobuf::Message { ::google::protobuf::uint32 versiondatabuild_; ::JSON::RealmList::ClientVersion* version_; ::std::string* secret_; + ::std::string* systemversion_; + ::google::protobuf::uint32 clientarch_; + ::google::protobuf::uint32 platformtype_; + ::google::protobuf::uint32 systemarch_; friend void TC_PROTO_API protobuf_AddDesc_RealmList_2eproto(); friend void protobuf_AssignDesc_RealmList_2eproto(); friend void protobuf_ShutdownFile_RealmList_2eproto(); @@ -1720,6 +1765,154 @@ inline void ClientInformation::set_allocated_secret(::std::string* secret) { // @@protoc_insertion_point(field_set_allocated:JSON.RealmList.ClientInformation.secret) } +// required fixed32 clientArch = 11; +inline bool ClientInformation::has_clientarch() const { + return (_has_bits_[0] & 0x00000400u) != 0; +} +inline void ClientInformation::set_has_clientarch() { + _has_bits_[0] |= 0x00000400u; +} +inline void ClientInformation::clear_has_clientarch() { + _has_bits_[0] &= ~0x00000400u; +} +inline void ClientInformation::clear_clientarch() { + clientarch_ = 0u; + clear_has_clientarch(); +} +inline ::google::protobuf::uint32 ClientInformation::clientarch() const { + // @@protoc_insertion_point(field_get:JSON.RealmList.ClientInformation.clientArch) + return clientarch_; +} +inline void ClientInformation::set_clientarch(::google::protobuf::uint32 value) { + set_has_clientarch(); + clientarch_ = value; + // @@protoc_insertion_point(field_set:JSON.RealmList.ClientInformation.clientArch) +} + +// required string systemVersion = 12; +inline bool ClientInformation::has_systemversion() const { + return (_has_bits_[0] & 0x00000800u) != 0; +} +inline void ClientInformation::set_has_systemversion() { + _has_bits_[0] |= 0x00000800u; +} +inline void ClientInformation::clear_has_systemversion() { + _has_bits_[0] &= ~0x00000800u; +} +inline void ClientInformation::clear_systemversion() { + if (systemversion_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + systemversion_->clear(); + } + clear_has_systemversion(); +} +inline const ::std::string& ClientInformation::systemversion() const { + // @@protoc_insertion_point(field_get:JSON.RealmList.ClientInformation.systemVersion) + return *systemversion_; +} +inline void ClientInformation::set_systemversion(const ::std::string& value) { + set_has_systemversion(); + if (systemversion_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + systemversion_ = new ::std::string; + } + systemversion_->assign(value); + // @@protoc_insertion_point(field_set:JSON.RealmList.ClientInformation.systemVersion) +} +inline void ClientInformation::set_systemversion(const char* value) { + set_has_systemversion(); + if (systemversion_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + systemversion_ = new ::std::string; + } + systemversion_->assign(value); + // @@protoc_insertion_point(field_set_char:JSON.RealmList.ClientInformation.systemVersion) +} +inline void ClientInformation::set_systemversion(const char* value, size_t size) { + set_has_systemversion(); + if (systemversion_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + systemversion_ = new ::std::string; + } + systemversion_->assign(reinterpret_cast<const char*>(value), size); + // @@protoc_insertion_point(field_set_pointer:JSON.RealmList.ClientInformation.systemVersion) +} +inline ::std::string* ClientInformation::mutable_systemversion() { + set_has_systemversion(); + if (systemversion_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + systemversion_ = new ::std::string; + } + // @@protoc_insertion_point(field_mutable:JSON.RealmList.ClientInformation.systemVersion) + return systemversion_; +} +inline ::std::string* ClientInformation::release_systemversion() { + clear_has_systemversion(); + if (systemversion_ == &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + return NULL; + } else { + ::std::string* temp = systemversion_; + systemversion_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + return temp; + } +} +inline void ClientInformation::set_allocated_systemversion(::std::string* systemversion) { + if (systemversion_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) { + delete systemversion_; + } + if (systemversion) { + set_has_systemversion(); + systemversion_ = systemversion; + } else { + clear_has_systemversion(); + systemversion_ = const_cast< ::std::string*>(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); + } + // @@protoc_insertion_point(field_set_allocated:JSON.RealmList.ClientInformation.systemVersion) +} + +// required fixed32 platformType = 13; +inline bool ClientInformation::has_platformtype() const { + return (_has_bits_[0] & 0x00001000u) != 0; +} +inline void ClientInformation::set_has_platformtype() { + _has_bits_[0] |= 0x00001000u; +} +inline void ClientInformation::clear_has_platformtype() { + _has_bits_[0] &= ~0x00001000u; +} +inline void ClientInformation::clear_platformtype() { + platformtype_ = 0u; + clear_has_platformtype(); +} +inline ::google::protobuf::uint32 ClientInformation::platformtype() const { + // @@protoc_insertion_point(field_get:JSON.RealmList.ClientInformation.platformType) + return platformtype_; +} +inline void ClientInformation::set_platformtype(::google::protobuf::uint32 value) { + set_has_platformtype(); + platformtype_ = value; + // @@protoc_insertion_point(field_set:JSON.RealmList.ClientInformation.platformType) +} + +// required fixed32 systemArch = 14; +inline bool ClientInformation::has_systemarch() const { + return (_has_bits_[0] & 0x00002000u) != 0; +} +inline void ClientInformation::set_has_systemarch() { + _has_bits_[0] |= 0x00002000u; +} +inline void ClientInformation::clear_has_systemarch() { + _has_bits_[0] &= ~0x00002000u; +} +inline void ClientInformation::clear_systemarch() { + systemarch_ = 0u; + clear_has_systemarch(); +} +inline ::google::protobuf::uint32 ClientInformation::systemarch() const { + // @@protoc_insertion_point(field_get:JSON.RealmList.ClientInformation.systemArch) + return systemarch_; +} +inline void ClientInformation::set_systemarch(::google::protobuf::uint32 value) { + set_has_systemarch(); + systemarch_ = value; + // @@protoc_insertion_point(field_set:JSON.RealmList.ClientInformation.systemArch) +} + // ------------------------------------------------------------------- // RealmListTicketClientInformation diff --git a/src/server/proto/RealmList/RealmList.proto b/src/server/proto/RealmList/RealmList.proto index 9367a592308..c6ebc5ee2a9 100644 --- a/src/server/proto/RealmList/RealmList.proto +++ b/src/server/proto/RealmList/RealmList.proto @@ -27,6 +27,10 @@ message ClientInformation { required fixed32 versionDataBuild = 8; required ClientVersion version = 9; required bytes secret = 10; + required fixed32 clientArch = 11; + required string systemVersion = 12; + required fixed32 platformType = 13; + required fixed32 systemArch = 14; } message RealmListTicketClientInformation { |