WAB-9186: Support multiple RDS (using CAL Per Device). (Remote target ip)

Author: XiaopengZHOU

src/acl/file_system_license_store.hpp

@@ -39,10 +39,10 @@ class FileSystemLicenseStore : public LicenseApi
     {}
 
     // The functions shall return empty bytes_view to indicate the error.
-    bytes_view get_license_v1(char const* client_name, char const* target_ip, uint32_t version, char const* scope, char const* company_name, char const* product_id, std::array<uint8_t, LIC::LICENSE_HWID_SIZE>& hwid, writable_bytes_view out, bool enable_log) override
+    bytes_view get_license_v1(char const* client_name, uint32_t version, char const* scope, char const* company_name, char const* product_id, std::array<uint8_t, LIC::LICENSE_HWID_SIZE>& hwid, writable_bytes_view out, bool enable_log) override
     {
         char license_index[2048] = {};
-        ::snprintf(license_index, sizeof(license_index) - 1, "%s_0x%08X_%s_%s_%s", target_ip, version, scope, company_name, product_id);
+        ::snprintf(license_index, sizeof(license_index) - 1, "0.0.0.0_0x%08X_%s_%s_%s", version, scope, company_name, product_id);
         license_index[sizeof(license_index) - 1] = '\0';
         std::replace(std::begin(license_index), std::end(license_index), ' ', '-');
         LOG_IF(enable_log, LOG_INFO, "FileSystemLicenseStore::get_license_v1(): LicenseIndex=\"%s\"", license_index);
@@ -128,10 +128,10 @@ class FileSystemLicenseStore : public LicenseApi
         return bytes_view { out.data(), 0 };
     }
 
-    bool put_license(char const* client_name, char const* target_ip, uint32_t version, char const* scope, char const* company_name, char const* product_id, std::array<uint8_t, LIC::LICENSE_HWID_SIZE> const& hwid, bytes_view in, bool enable_log) override
+    bool put_license(char const* client_name, uint32_t version, char const* scope, char const* company_name, char const* product_id, std::array<uint8_t, LIC::LICENSE_HWID_SIZE> const& hwid, bytes_view in, bool enable_log) override
     {
         char license_index[2048] = {};
-        ::snprintf(license_index, sizeof(license_index) - 1, "%s_0x%08X_%s_%s_%s", target_ip, version, scope, company_name, product_id);
+        ::snprintf(license_index, sizeof(license_index) - 1, "0.0.0.0_0x%08X_%s_%s_%s", version, scope, company_name, product_id);
         license_index[sizeof(license_index) - 1] = '\0';
         std::replace_if(std::begin(license_index), std::end(license_index),
                         [](unsigned char c) { return (' ' == c); }, '-');

src/acl/license_api.hpp

@@ -29,7 +29,7 @@ struct LicenseApi : noncopyable
     virtual ~LicenseApi() = default;
 
     // The functions shall return empty bytes_view to indicate the error.
-    virtual bytes_view get_license_v1(char const* client_name, char const* target_ip, uint32_t version, char const* scope,
+    virtual bytes_view get_license_v1(char const* client_name, uint32_t version, char const* scope,
         char const* company_name, char const* product_id, std::array<uint8_t, LIC::LICENSE_HWID_SIZE>& hwid, writable_bytes_view out,
         bool enable_log) = 0;
 
@@ -38,18 +38,17 @@ struct LicenseApi : noncopyable
         char const* company_name, char const* product_id, writable_bytes_view out,
         bool enable_log) = 0;
 
-    virtual bool put_license(char const* client_name, char const* target_ip, uint32_t version, char const* scope, char const* company_name,
+    virtual bool put_license(char const* client_name, uint32_t version, char const* scope, char const* company_name,
         char const* product_id, std::array<uint8_t, LIC::LICENSE_HWID_SIZE> const& hwid, bytes_view in, bool enable_log) = 0;
 };
 
 struct NullLicenseStore : LicenseApi
 {
-    bytes_view get_license_v1(char const* client_name, char const* target_ip, uint32_t version, char const* scope,
+    bytes_view get_license_v1(char const* client_name, uint32_t version, char const* scope,
         char const* company_name, char const* product_id, std::array<uint8_t, LIC::LICENSE_HWID_SIZE>& hwid, writable_bytes_view out,
         bool enable_log) override
     {
         (void)client_name;
-        (void)target_ip;
         (void)version;
         (void)scope;
         (void)company_name;
@@ -74,11 +73,10 @@ struct NullLicenseStore : LicenseApi
         return bytes_view(out.data(), 0);
     }
 
-    bool put_license(char const* client_name, char const* target_ip, uint32_t version, char const* scope, char const* company_name,
+    bool put_license(char const* client_name, uint32_t version, char const* scope, char const* company_name,
         char const* product_id, std::array<uint8_t, LIC::LICENSE_HWID_SIZE> const& hwid, bytes_view in, bool enable_log) override
     {
         (void)client_name;
-        (void)target_ip;
         (void)version;
         (void)scope;
         (void)company_name;

src/acl/module_manager/create_module_rdp.cpp

@@ -676,7 +676,6 @@ ModPack create_mod_rdp(
     mod_rdp_params.replace_null_pointer_by_default_pointer = ini.get<cfg::mod_rdp::replace_null_pointer_by_default_pointer>();
     mod_rdp_params.large_pointer_support               = ini.get<cfg::globals::large_pointer_support>();
     mod_rdp_params.load_balance_info                   = ini.get<cfg::mod_rdp::load_balance_info>().c_str();
-    mod_rdp_params.target_ip                           = ini.get<cfg::context::ip_target>().c_str();
 
     // ======================= File System Params ===================
     {

src/mod/rdp/rdp_negociation.cpp

@@ -270,7 +270,6 @@ RdpNegociation::RdpNegociation(
     , real_client_name(info.hostname)
     , license_store(license_store)
     , use_license_store(mod_rdp_params.use_license_store)
-    , target_ip(mod_rdp_params.target_ip)
     , build_number(info.build)
     , forward_build_number(mod_rdp_params.forward_client_build_number)
 {
@@ -1294,7 +1293,6 @@ bool RdpNegociation::get_license(InStream & stream, TpduBuffer& buf)
                     for (uint32_t i = 0; i < SvrLicReq.ScopeList.ScopeCount; ++i) {
                         bytes_view out = this->license_store.get_license_v1(
                                 logon_info.client_name_is_hidden() ? "localhost" : logon_info.hostname().c_str(),
-                                this->target_ip.c_str(),
                                 SvrLicReq.ProductInfo.dwVersion,
                                 ::char_ptr_cast(SvrLicReq.ScopeList.ScopeArray[i].blobData.data()),
                                 ::char_ptr_cast(CompanyNameU8),
@@ -1474,7 +1472,6 @@ bool RdpNegociation::get_license(InStream & stream, TpduBuffer& buf)
 
                     license_saved = this->license_store.put_license(
                             logon_info.client_name_is_hidden() ? "localhost" : logon_info.hostname().c_str(),
-                            this->target_ip.c_str(),
                             lic.licenseInfo.dwVersion,
                             ::char_ptr_cast(lic.licenseInfo.pbScope),
                             ::char_ptr_cast(CompanyNameU8),

src/mod/rdp/rdp_params.hpp

@@ -185,8 +185,6 @@ struct ModRDPParams
 
     const char * load_balance_info = "";
 
-    const char * target_ip = "";
-
     bool support_connection_redirection_during_recording = true;
 
     bool split_domain = false;
@@ -427,8 +425,6 @@ struct ModRDPParams
 
         RDP_PARAMS_LOG("%s",     s_or_none,             load_balance_info);
 
-        RDP_PARAMS_LOG("%s",     s_or_none,             target_ip);
-
         RDP_PARAMS_LOG("%u",     from_millisec,         remote_app_params.rail_disconnect_message_delay);
 
         RDP_PARAMS_LOG("%s",     yes_or_no,             file_system_params.bogus_ios_rdpdr_virtual_channel);

tests/acl/test_license_api.cpp

@@ -274,12 +274,11 @@ RED_AUTO_TEST_CASE(TestWithoutExistingLicense)
             class CaptureLicenseStore : public LicenseApi
             {
             public:
-                bytes_view get_license_v1(char const* client_name, char const* target_ip, uint32_t version, char const* scope,
+                bytes_view get_license_v1(char const* client_name, uint32_t version, char const* scope,
                     char const* company_name, char const* product_id, std::array<uint8_t, LIC::LICENSE_HWID_SIZE>& hwid, writable_bytes_view out,
                     bool enable_log) override
                 {
                     (void)client_name;
-                    (void)target_ip;
                     (void)version;
                     (void)scope;
                     (void)company_name;
@@ -304,18 +303,14 @@ RED_AUTO_TEST_CASE(TestWithoutExistingLicense)
                     return bytes_view { out.data(), 0 };
                 }
 
-                bool put_license(char const* client_name, char const* target_ip, uint32_t version, char const* scope, char const* company_name, char const* product_id, std::array<uint8_t, LIC::LICENSE_HWID_SIZE> const& hwid, bytes_view in, bool enable_log) override
+                bool put_license(char const* client_name, uint32_t version, char const* scope, char const* company_name, char const* product_id, std::array<uint8_t, LIC::LICENSE_HWID_SIZE> const& hwid, bytes_view in, bool enable_log) override
                 {
                     (void)enable_log;
 
                     LOG(LOG_INFO, "/*CaptureLicenseStore */ const char license_client_name[] =");
                     hexdump_c(client_name, ::strlen(client_name));
                     LOG(LOG_INFO, "/*CaptureLicenseStore */ ;");
 
-                    LOG(LOG_INFO, "/*CaptureLicenseStore */ const char target_ip[] =");
-                    hexdump_c(target_ip, ::strlen(target_ip));
-                    LOG(LOG_INFO, "/*CaptureLicenseStore */ ;");
-
                     LOG(LOG_INFO, "/*CaptureLicenseStore */ uint32_t license_version = %u", version);
                     LOG(LOG_INFO, "/*CaptureLicenseStore */ ;");
 
@@ -355,12 +350,11 @@ RED_AUTO_TEST_CASE(TestWithoutExistingLicense)
                     expected_hwid(hwid),
                     expected_license_data(license_data) {}
 
-                bytes_view get_license_v1(char const* client_name, char const* target_ip, uint32_t version, char const* scope,
+                bytes_view get_license_v1(char const* client_name, uint32_t version, char const* scope,
                     char const* company_name, char const* product_id, std::array<uint8_t, LIC::LICENSE_HWID_SIZE>& hwid, writable_bytes_view out,
                     bool enable_log) override
                 {
                     (void)client_name;
-                    (void)target_ip;
                     (void)version;
                     (void)scope;
                     (void)company_name;
@@ -385,10 +379,9 @@ RED_AUTO_TEST_CASE(TestWithoutExistingLicense)
                     return bytes_view { out.data(), 0 };
                 }
 
-                bool put_license(char const* client_name, char const* target_ip, uint32_t version, char const* scope, char const* company_name, char const* product_id, std::array<uint8_t, LIC::LICENSE_HWID_SIZE> const& hwid, bytes_view in, bool enable_log) override
+                bool put_license(char const* client_name, uint32_t version, char const* scope, char const* company_name, char const* product_id, std::array<uint8_t, LIC::LICENSE_HWID_SIZE> const& hwid, bytes_view in, bool enable_log) override
                 {
                     (void)enable_log;
-                    (void)target_ip;
 
                     RED_CHECK_EQ(client_name,  this->expected_client_name);
                     RED_CHECK_EQ(version,      this->expected_version);
@@ -471,10 +464,9 @@ RED_AUTO_TEST_CASE(TestWithExistingLicense)
                     expected_hwid(hwid),
                     expected_license_data(license_data) {}
 
-                bytes_view get_license_v1(char const* client_name, char const* target_ip, uint32_t version, char const* scope, char const* company_name, char const* product_id, std::array<uint8_t, LIC::LICENSE_HWID_SIZE>& hwid, writable_bytes_view out, bool enable_log) override
+                bytes_view get_license_v1(char const* client_name, uint32_t version, char const* scope, char const* company_name, char const* product_id, std::array<uint8_t, LIC::LICENSE_HWID_SIZE>& hwid, writable_bytes_view out, bool enable_log) override
                 {
                     (void)enable_log;
-                    (void)target_ip;
 
                     RED_CHECK_EQ(client_name,  this->expected_client_name);
                     RED_CHECK_EQ(version,      this->expected_version);
@@ -513,12 +505,11 @@ RED_AUTO_TEST_CASE(TestWithExistingLicense)
                     return bytes_view { out.data(), effective_license_size };
                 }
 
-                bool put_license(char const* client_name, char const* target_ip, uint32_t version, char const* scope, char const* company_name, char const* product_id, std::array<uint8_t, LIC::LICENSE_HWID_SIZE> const& hwid, bytes_view in, bool enable_log) override
+                bool put_license(char const* client_name, uint32_t version, char const* scope, char const* company_name, char const* product_id, std::array<uint8_t, LIC::LICENSE_HWID_SIZE> const& hwid, bytes_view in, bool enable_log) override
                 {
                     (void)enable_log;
                     (void)hwid;
                     (void)in;
-                    (void)target_ip;
 
                     RED_CHECK_EQ(client_name,  this->expected_client_name);
                     RED_CHECK_EQ(version,      this->expected_version);