Fix indentation

This commit is contained in:
momo5502 2018-12-27 17:28:12 +01:00
parent 071dbfa5fc
commit a120591be3
7 changed files with 367 additions and 360 deletions

View File

@ -30,8 +30,8 @@ namespace demonware
printf("DW: Handling subservice of type %d\n", this->sub_type_);
const auto callback = this->callbacks.find(this->sub_type_);
if (callback != this->callbacks.end())
const auto callback = this->callbacks_.find(this->sub_type_);
if (callback != this->callbacks_.end())
{
callback->second(server, &buffer);
}
@ -42,12 +42,12 @@ namespace demonware
}
protected:
std::map<uint8_t, callback> callbacks{};
std::map<uint8_t, callback> callbacks_{};
template <typename Class, typename T, typename... Args>
void register_service(const uint8_t type, T (Class::*callback)(Args ...) const)
{
this->callbacks[type] = [this, callback](Args... args) -> T
this->callbacks_[type] = [this, callback](Args ... args) -> T
{
return (reinterpret_cast<Class*>(this)->*callback)(args...);
};
@ -56,7 +56,7 @@ namespace demonware
template <typename Class, typename T, typename... Args>
void register_service(const uint8_t type, T (Class::*callback)(Args ...))
{
this->callbacks[type] = [this, callback](Args... args) -> T
this->callbacks_[type] = [this, callback](Args ... args) -> T
{
return (reinterpret_cast<Class*>(this)->*callback)(args...);
};

View File

@ -8,7 +8,8 @@ namespace demonware
public:
explicit service_server(std::string name);
template <typename T> void register_service()
template <typename T>
void register_service()
{
static_assert(std::is_base_of<i_service, T>::value, "Service must inherit from IService");

View File

@ -44,7 +44,8 @@ namespace demonware
const auto iv = utils::cryptography::tiger::compute(std::string(reinterpret_cast<char*>(&seed), 4));
const std::string enc_key(reinterpret_cast<char*>(&ticket[32]), 24);
auto enc_ticket = utils::cryptography::des3::encrypt(std::string(reinterpret_cast<char*>(&auth_ticket), sizeof(auth_ticket)), iv,enc_key );
auto enc_ticket = utils::cryptography::des3::encrypt(
std::string(reinterpret_cast<char*>(&auth_ticket), sizeof(auth_ticket)), iv, enc_key);
bit_buffer response;
response.set_use_data_types(false);

View File

@ -60,9 +60,14 @@ namespace demonware
switch (type)
{
case 30: this->ip_discovery(s, to, tolen); break;
case 20: this->nat_discovery(s, to, tolen); break;
default: break;
case 30:
this->ip_discovery(s, to, tolen);
break;
case 20:
this->nat_discovery(s, to, tolen);
break;
default:
break;
}
return len;