From a086dcc214fe4ea7a983fecebb93b8e2fe3258ff Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Sun, 25 Aug 2019 23:55:55 +0200 Subject: [PATCH] Added the permission mapping file --- src/Definitions.h | 27 ++++++++++++++++++++------- src/PermissionManager.h | 2 ++ src/sql/mysql/MySQL.cpp | 1 + 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/Definitions.h b/src/Definitions.h index 353f8f2..d3559db 100644 --- a/src/Definitions.h +++ b/src/Definitions.h @@ -27,16 +27,28 @@ namespace ts { //Everything over 5 is no lt (Client >= 1.3.6) enum LicenseType: uint8_t { _LicenseType_MIN, - LICENSE_NONE = _LicenseType_MIN, - LICENSE_HOSTING, - LICENSE_OFFLINE, - LICENSE_NPL, //3 - LICENSE_UNKNOWN, - LICENSE_PLACEHOLDER, + LICENSE_NONE = _LicenseType_MIN, /* ServerLicenseType::SERVER_LICENSE_NONE */ + LICENSE_HOSTING, /* ServerLicenseType::SERVER_LICENSE_ATHP */ + LICENSE_OFFLINE, /* ServerLicenseType::SERVER_LICENSE_OFFLINE */ + LICENSE_NPL, /* ServerLicenseType::SERVER_LICENSE_NPL */ + LICENSE_UNKNOWN, /* ServerLicenseType::SERVER_LICENSE_SDK */ + LICENSE_PLACEHOLDER, /* ServerLicenseType::SERVER_LICENSE_SDKOFFLINE */ LICENSE_AUTOMATIC_SERVER, LICENSE_AUTOMATIC_INSTANCE, _LicenseType_MAX = LICENSE_AUTOMATIC_INSTANCE, }; + /* + enum ServerLicenseType : uint8_t { + SERVER_LICENSE_NONE, + SERVER_LICENSE_OFFLINE, + SERVER_LICENSE_SDK, + SERVER_LICENSE_SDKOFFLINE, + SERVER_LICENSE_NPL, + SERVER_LICENSE_ATHP, + SERVER_LICENSE_AAL, + SERVER_LICENSE_DEFAULT, + }; + */ enum PluginTargetMode : uint8_t { PLUGINCMD_CURRENT_CHANNEL = 0, //send plugincmd to all clients in current channel @@ -81,7 +93,8 @@ namespace ts { CLIENT_INTERNAL, CLIENT_WEB, CLIENT_MUSIC, - CLIENT_TEASPEAK + CLIENT_TEASPEAK, + MAX }; enum ConnectionState { diff --git a/src/PermissionManager.h b/src/PermissionManager.h index 8e27768..b84e7cd 100644 --- a/src/PermissionManager.h +++ b/src/PermissionManager.h @@ -32,6 +32,8 @@ namespace ts { }; enum PermissionType : uint16_t { undefined = (uint16_t) -1, + + permission_id_min = 0, /* we count unknown as defined permission as well */ unknown = (uint16_t) 0, type_begin = 1, diff --git a/src/sql/mysql/MySQL.cpp b/src/sql/mysql/MySQL.cpp index 83eabe2..d18d080 100644 --- a/src/sql/mysql/MySQL.cpp +++ b/src/sql/mysql/MySQL.cpp @@ -4,6 +4,7 @@ #include "mysql_connection.h" #include "src/log/LogUtils.h" #include +#include #include #include