diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c708ebf..c2afe4bf 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,6 @@ option(GIT_BRANCH, "Repository Branch" OFF) option(IP_ENABLED "Enable IP" OFF) option(LOCAL_MIC "Local Microphone" OFF) option(LOCAL_MIC_DISABLE_VIA_PRIVACY "Use Privacy to disable microphone" OFF) -option(MAC_POLLING "MAC polling" OFF) option(MEM_DEBUG "Enable memory debugging" OFF) option(MEMORY_LOCK "Memory Lock" OFF) option(MIC_TAP "Enable MIC_TAP" OFF) @@ -67,7 +66,6 @@ option(THUNDER_SECURITY "Enable THUNDER_SECURITY" OFF) option(USE_SAFEC "Use safec" OFF) option(USE_IARM_POWER_MANAGER "Use IARM Power Manager" OFF) option(VOICE_KEYWORD_BEEP "Enable VOICE_KEYWORD_BEEP" OFF) -option(VOICE_NEXTGEN_MAC "Enable VOICE_NEXTGEN_MAC" OFF) option(XRSR_HTTP "Enable XRSR_HTTP" OFF) option(XRSR_SDT "Enable XRSR_SDT" OFF) option(ENABLE_ASYNC_SRVR_MSG "Enable Asynchronous Server Messaging Feature" OFF) @@ -218,7 +216,6 @@ if(AUTH_ENABLED) add_compile_definitions(AUTH_ACTIVATION_STATUS) endif() #By default disabled but can be enabled - #add_compile_definitions(AUTH_RECEIVER_ID) #add_compile_definitions(AUTH_EXPERIENCE) target_link_libraries(controlMgr ctrlm-hal-certificate) else() @@ -287,10 +284,6 @@ if(LOCAL_MIC) endif() endif() -if(MAC_POLLING) - add_compile_definitions(MAC_POLLING) -endif() - if(MEM_DEBUG) add_compile_definitions(MEM_DEBUG) endif() @@ -347,10 +340,6 @@ if(VOICE_KEYWORD_BEEP) install(FILES ${CMAKE_SOURCE_DIR}/../${BEEP_ON_KWD_FILE} DESTINATION share ) endif() -if(VOICE_NEXTGEN_MAC) - add_compile_definitions(VOICE_NEXTGEN_MAC) -endif() - if(USE_DEPRECATED_HDMI_INPUT_PLUGIN) add_compile_definitions(USE_DEPRECATED_HDMI_INPUT_PLUGIN) endif() diff --git a/include/ctrlm_ipc.h b/include/ctrlm_ipc.h index 6c6db664..75d4eee2 100644 --- a/include/ctrlm_ipc.h +++ b/include/ctrlm_ipc.h @@ -156,7 +156,6 @@ #define CTRLM_MAIN_MAX_BOUND_CONTROLLERS (9) ///< Maximum number of bound controllers #define CTRLM_MAIN_MAX_CHIPSET_LENGTH (16) ///< Maximum length of chipset name string (including null termination) #define CTRLM_MAIN_COMMIT_ID_MAX_LENGTH (48) ///< Maximum length of commit ID string (including null termination) -#define CTRLM_MAIN_RECEIVER_ID_MAX_LENGTH (40) ///< Maximum length of receiver ID string (including null termination) #define CTRLM_MAIN_DEVICE_ID_MAX_LENGTH (24) ///< Maximum length of device ID string (including null termination) #define CTRLM_PROPERTY_ACTIVE_PERIOD_BUTTON_VALUE_MIN (5000) ///< Minimum active period (in ms) for button binding. @@ -500,7 +499,6 @@ typedef struct { char ctrlm_version[CTRLM_MAIN_VERSION_LENGTH]; ///< OUT - Software version of Control Manager char ctrlm_commit_id[CTRLM_MAIN_COMMIT_ID_MAX_LENGTH]; ///< OUT - Last commit ID of Control Manager char stb_device_id[CTRLM_MAIN_DEVICE_ID_MAX_LENGTH]; ///< OUT - Device ID obtained from the Set-Top Box - char stb_receiver_id[CTRLM_MAIN_RECEIVER_ID_MAX_LENGTH]; ///< OUT - Receiver ID obtained from the Set-Top Box } ctrlm_main_iarm_call_status_t; /// @brief RF Channel Structure diff --git a/include/ctrlm_ipc_voice.h b/include/ctrlm_ipc_voice.h index 1a63c326..d5a58bc0 100644 --- a/include/ctrlm_ipc_voice.h +++ b/include/ctrlm_ipc_voice.h @@ -119,7 +119,7 @@ typedef enum { CTRLM_VOICE_SESSION_ABORT_REASON_FAILURE = 3, ///< Session aborted for any other reason CTRLM_VOICE_SESSION_ABORT_REASON_VOICE_DISABLED = 4, ///< Session aborted because the voice feature is disabled CTRLM_VOICE_SESSION_ABORT_REASON_DEVICE_UPDATE = 5, ///< Session aborted due to device update in progress - CTRLM_VOICE_SESSION_ABORT_REASON_NO_RECEIVER_ID = 6, ///< Session aborted because there is no receiver id + CTRLM_VOICE_SESSION_ABORT_REASON_NO_AUTH_DATA = 6, ///< Session aborted due to missing authorization data CTRLM_VOICE_SESSION_ABORT_REASON_NEW_SESSION = 7, ///< Session aborted because the remote's previous session is still active CTRLM_VOICE_SESSION_ABORT_REASON_INVALID_CONTROLLER_ID = 8, ///< Session aborted because the controller id isn't valid CTRLM_VOICE_SESSION_ABORT_REASON_APPLICATION_RESTART = 9, ///< Session aborted due to restarting controlMgr. diff --git a/src/auth/ctrlm_auth.h b/src/auth/ctrlm_auth.h index 2e6f74a3..0964335f 100644 --- a/src/auth/ctrlm_auth.h +++ b/src/auth/ctrlm_auth.h @@ -31,7 +31,6 @@ class ctrlm_auth_t { virtual ~ctrlm_auth_t(); virtual bool is_ready() = 0; - virtual bool get_receiver_id(std::string &receiver_id) = 0; virtual bool get_device_id(std::string &device_id) = 0; virtual bool get_account_id(std::string &account_id) = 0; virtual bool get_partner_id(std::string &partner_id) = 0; diff --git a/src/auth/ctrlm_auth_thunder.cpp b/src/auth/ctrlm_auth_thunder.cpp index 21295676..2f954df3 100644 --- a/src/auth/ctrlm_auth_thunder.cpp +++ b/src/auth/ctrlm_auth_thunder.cpp @@ -33,11 +33,6 @@ bool ctrlm_auth_thunder_t::is_ready() { return(ret); } -bool ctrlm_auth_thunder_t::get_receiver_id(std::string &receiver_id) { - bool ret = this->plugin->get_receiver_id(receiver_id); - return(ret); -} - bool ctrlm_auth_thunder_t::get_device_id(std::string &device_id) { bool ret = this->plugin->get_device_id(device_id); return(ret); diff --git a/src/auth/ctrlm_auth_thunder.h b/src/auth/ctrlm_auth_thunder.h index eb4c69e3..3a476e67 100644 --- a/src/auth/ctrlm_auth_thunder.h +++ b/src/auth/ctrlm_auth_thunder.h @@ -10,7 +10,6 @@ class ctrlm_auth_thunder_t : public ctrlm_auth_t { virtual ~ctrlm_auth_thunder_t(); virtual bool is_ready(); - virtual bool get_receiver_id(std::string &receiver_id); virtual bool get_device_id(std::string &device_id); virtual bool get_account_id(std::string &account_id); virtual bool get_partner_id(std::string &partner_id); diff --git a/src/auth/ctrlm_thunder_plugin_authservice.cpp b/src/auth/ctrlm_thunder_plugin_authservice.cpp index edbb14b4..aaaa4e17 100644 --- a/src/auth/ctrlm_thunder_plugin_authservice.cpp +++ b/src/auth/ctrlm_thunder_plugin_authservice.cpp @@ -73,24 +73,6 @@ bool ctrlm_thunder_plugin_authservice_t::is_device_activated() { return(ret); } -bool ctrlm_thunder_plugin_authservice_t::get_receiver_id(std::string &receiver_id) { - bool ret = false; - JsonObject params, response; - if(this->call_plugin("getDeviceId", (void *)¶ms, (void *)&response)) { - if(response["success"].Boolean()) { // If success doesn't exist, it defaults to false which is fine. - receiver_id = response["deviceId"].String(); - if(!receiver_id.empty()) { - ret = true; - } - } else { - XLOGD_WARN("Success for getDeviceId was false"); - } - } else { - XLOGD_WARN("Call for getDeviceId failed"); - } - return(ret); -} - bool ctrlm_thunder_plugin_authservice_t::get_device_id(std::string &device_id) { bool ret = false; JsonObject params, response; diff --git a/src/auth/ctrlm_thunder_plugin_authservice.h b/src/auth/ctrlm_thunder_plugin_authservice.h index e0840fb8..c39de41d 100644 --- a/src/auth/ctrlm_thunder_plugin_authservice.h +++ b/src/auth/ctrlm_thunder_plugin_authservice.h @@ -54,13 +54,6 @@ class ctrlm_thunder_plugin_authservice_t : public Thunder::Plugin::ctrlm_thunder */ bool is_device_activated(); - /** - * Function that retrieves the Receiver ID from Authservice. - * @param receiver_id The reference to a string which will contain the Receiver ID. - * @return True on success otherwise False. - */ - bool get_receiver_id(std::string &receiver_id); - /** * Function that retrieves the Device ID from Authservice. * @param device_id The reference to a string which will contain the Device ID. diff --git a/src/ble/ctrlm_ble_network.cpp b/src/ble/ctrlm_ble_network.cpp index 24f1fd4b..7fe652ab 100644 --- a/src/ble/ctrlm_ble_network.cpp +++ b/src/ble/ctrlm_ble_network.cpp @@ -2272,6 +2272,17 @@ void ctrlm_obj_network_ble_t::ind_process_voice_session_end(void *data, int size XLOGD_ERROR("Controller object doesn't exist for controller id %u!", controller_id); return; } + + unsigned long long ieee_address = controllers_[controller_id]->ieee_address_get().get_value();; + + if (ble_rcu_interface_) { + int32_t audioDuration = -1; + if (!ble_rcu_interface_->stopAudioStreaming(ieee_address, audioDuration)) { + XLOGD_ERROR("failed to end voice session for controller id <%u>", controller_id); + } else { + XLOGD_INFO("voice session ended for controller id <%u>", controller_id); + } + } } // ================================================================================================================================================================== diff --git a/src/ble/hal/configsettings/configmodelsettings.cpp b/src/ble/hal/configsettings/configmodelsettings.cpp index 0b2b1c86..de8c1dee 100644 --- a/src/ble/hal/configsettings/configmodelsettings.cpp +++ b/src/ble/hal/configsettings/configmodelsettings.cpp @@ -37,6 +37,7 @@ using namespace std; ConfigModelSettingsData::ConfigModelSettingsData() : m_valid(false) , m_disabled(false) + , m_voiceKeyCodePresent(false) , m_typeZ(false) , m_hasConnParams(false) , m_servicesType(ConfigModelSettings::GattServiceType) @@ -50,6 +51,8 @@ ConfigModelSettingsData::ConfigModelSettingsData(const ConfigModelSettingsData & , m_pairingNameFormat(other.m_pairingNameFormat) , m_otaProductName(other.m_otaProductName) , m_standbyMode(other.m_standbyMode) + , m_voiceKeyCode(other.m_voiceKeyCode) + , m_voiceKeyCodePresent(other.m_voiceKeyCodePresent) , m_typeZ(other.m_typeZ) , m_connParamUpdateBeforeOtaVersion(other.m_connParamUpdateBeforeOtaVersion) , m_upgradePauseVersion(other.m_upgradePauseVersion) @@ -105,6 +108,7 @@ ConfigModelSettingsData::ConfigModelSettingsData(json_t *json) , m_pairingNameFormat("") , m_otaProductName("") , m_standbyMode("") + , m_voiceKeyCodePresent(false) , m_typeZ(false) , m_connParamUpdateBeforeOtaVersion("") , m_upgradePauseVersion("") diff --git a/src/ctrlm.h b/src/ctrlm.h index 71179d05..86cf02b3 100644 --- a/src/ctrlm.h +++ b/src/ctrlm.h @@ -452,7 +452,6 @@ gboolean ctrlm_is_one_touch_autobind_active(void); gboolean ctrlm_is_binding_table_empty(void); gboolean ctrlm_is_binding_table_full(void); bool ctrlm_is_pii_mask_enabled(void); -gboolean ctrlm_main_has_receiver_id_get(void); gboolean ctrlm_main_has_device_id_get(void); gboolean ctrlm_main_has_device_type_get(void); gboolean ctrlm_main_has_service_account_id_get(void); @@ -507,7 +506,6 @@ void ctrlm_update_last_key_info(int controller_id, ctrlm_key_source_t sou ctrlm_irdb_interface_t* ctrlm_main_irdb_get(); ctrlm_auth_t* ctrlm_main_auth_get(); void ctrlm_main_auth_start_poll(); -std::string ctrlm_receiver_id_get(); std::string ctrlm_device_id_get(); std::string ctrlm_stb_name_get(); std::string ctrlm_device_mac_get(); diff --git a/src/ctrlm_config_default.json b/src/ctrlm_config_default.json index 8d536a08..e9550415 100755 --- a/src/ctrlm_config_default.json +++ b/src/ctrlm_config_default.json @@ -43,7 +43,7 @@ "voice_data_retry_max" : 0, "voice_csma_backoff_max" : 4, "voice_data_backoff_exp_min" : 0, - "voice_command_encryption" : 0, + "voice_command_encryption" : 1, "rib_update_check_interval" : 24, "auto_check_validation_period" : 500, "link_lost_wait_time" : 10000, @@ -245,7 +245,7 @@ "minimum_duration" : 300, "ffv_leading_samples" : 1600, "timeout_packet_initial" : 3200, - "timeout_packet_subsequent" : 250, + "timeout_packet_subsequent" : 1000, "bitrate_minimum" : 64, "time_threshold" : 1000, "timeout_stats" : 3000, diff --git a/src/ctrlm_controller.cpp b/src/ctrlm_controller.cpp index 931a75f2..0088b414 100644 --- a/src/ctrlm_controller.cpp +++ b/src/ctrlm_controller.cpp @@ -106,10 +106,6 @@ ctrlm_network_id_t ctrlm_obj_controller_t::network_id_get() const { return(obj_network_->network_id_get()); } -string ctrlm_obj_controller_t::receiver_id_get() const { - return(obj_network_->receiver_id_get()); -} - string ctrlm_obj_controller_t::device_id_get() const { return(obj_network_->device_id_get()); } diff --git a/src/ctrlm_controller.h b/src/ctrlm_controller.h index d1dcfba9..d31159fc 100644 --- a/src/ctrlm_controller.h +++ b/src/ctrlm_controller.h @@ -60,7 +60,6 @@ class ctrlm_obj_controller_t ctrlm_controller_id_t controller_id_get() const; ctrlm_network_id_t network_id_get() const; - std::string receiver_id_get() const; std::string device_id_get() const; std::string service_account_id_get() const; std::string partner_id_get() const; diff --git a/src/ctrlm_main.cpp b/src/ctrlm_main.cpp index 84291fb7..4eee576b 100644 --- a/src/ctrlm_main.cpp +++ b/src/ctrlm_main.cpp @@ -189,7 +189,6 @@ typedef struct { sem_t ctrlm_utils_sem; GAsyncQueue * queue; string stb_name; - string receiver_id; string device_id; ctrlm_device_type_t device_type; string service_account_id; @@ -206,7 +205,6 @@ typedef struct { string image_build_time; string db_path; string minidump_path; - gboolean has_receiver_id; gboolean has_device_id; gboolean has_device_type; gboolean has_service_account_id; @@ -293,10 +291,6 @@ static ctrlm_global_t g_ctrlm; #ifdef AUTH_ENABLED static gboolean ctrlm_has_authservice_data(void); static gboolean ctrlm_load_authservice_data(void); -#ifdef AUTH_RECEIVER_ID -static gboolean ctrlm_load_receiver_id(void); -static void ctrlm_main_has_receiver_id_set(gboolean has_id); -#endif #ifdef AUTH_DEVICE_ID static gboolean ctrlm_load_device_id(void); static void ctrlm_main_has_device_id_set(gboolean has_id); @@ -579,7 +573,6 @@ int main(int argc, char *argv[]) { g_ctrlm.telemetry = NULL; g_ctrlm.telemetry_report_interval = JSON_INT_VALUE_CTRLM_GLOBAL_TELEMETRY_REPORT_INTERVAL; g_ctrlm.service_access_token.clear(); - g_ctrlm.has_receiver_id = false; g_ctrlm.has_device_id = false; g_ctrlm.has_device_type = false; g_ctrlm.has_service_account_id = false; @@ -1316,7 +1309,7 @@ gboolean ctrlm_load_device_mac(void) { XLOGD_INFO("Device Mac set to <%s>", ctrlm_is_pii_mask_enabled() ? "***" : mac.c_str()); } else { XLOGD_ERROR("Failed to get MAC address for device mac"); - g_ctrlm.device_mac = "UNKNOWN"; + g_ctrlm.device_mac = ""; } return(ret); @@ -1378,31 +1371,6 @@ void ctrlm_main_auth_start_poll() { NULL); } -#ifdef AUTH_RECEIVER_ID -gboolean ctrlm_main_has_receiver_id_get(void) { - return(g_ctrlm.has_receiver_id); -} - -void ctrlm_main_has_receiver_id_set(gboolean has_id) { - g_ctrlm.has_receiver_id = has_id; -} - -gboolean ctrlm_load_receiver_id(void) { - if(!g_ctrlm.authservice->get_receiver_id(g_ctrlm.receiver_id)) { - ctrlm_main_has_receiver_id_set(false); - return(false); - } - - g_ctrlm.voice_session->voice_stb_data_receiver_id_set(g_ctrlm.receiver_id); - - for(auto const &itr : g_ctrlm.networks) { - itr.second->receiver_id_set(g_ctrlm.receiver_id); - } - ctrlm_main_has_receiver_id_set(true); - return(true); -} -#endif - #ifdef AUTH_DEVICE_ID void ctrlm_main_has_device_id_set(gboolean has_id) { g_ctrlm.has_device_id = has_id; @@ -1550,12 +1518,6 @@ gboolean ctrlm_load_service_access_token(void) { gboolean ctrlm_has_authservice_data(void) { gboolean ret = TRUE; #ifdef AUTH_ENABLED -#ifdef AUTH_RECEIVER_ID - if(!ctrlm_main_has_receiver_id_get()) { - ret = FALSE; - } -#endif - #ifdef AUTH_DEVICE_ID if(!ctrlm_main_has_device_id_get()) { ret = FALSE; @@ -1594,18 +1556,6 @@ gboolean ctrlm_load_authservice_data(void) { gboolean ret = TRUE; #ifdef AUTH_ENABLED if(g_ctrlm.authservice->is_ready()) { -#ifdef AUTH_RECEIVER_ID - if(!ctrlm_main_has_receiver_id_get()) { - XLOGD_INFO("load receiver id"); - if(!ctrlm_load_receiver_id()) { - XLOGD_TELEMETRY("failed to load receiver id"); - ret = FALSE; - } else { - XLOGD_INFO("load receiver id successfully <%s>", ctrlm_is_pii_mask_enabled() ? "***" : g_ctrlm.receiver_id.c_str()); - } - } -#endif - #ifdef AUTH_DEVICE_ID if(!ctrlm_main_has_device_id_get()) { XLOGD_INFO("load device id"); @@ -3289,10 +3239,6 @@ void ctrlm_main_iarm_call_status_get_(ctrlm_main_iarm_call_status_t *status) { safec_rc = strncpy_s(status->stb_device_id, sizeof(status->stb_device_id), g_ctrlm.device_id.c_str(), CTRLM_MAIN_DEVICE_ID_MAX_LENGTH - 1); ERR_CHK(safec_rc); status->stb_device_id[CTRLM_MAIN_DEVICE_ID_MAX_LENGTH - 1] = '\0'; - - safec_rc = strncpy_s(status->stb_receiver_id, sizeof(status->stb_receiver_id), g_ctrlm.receiver_id.c_str(), CTRLM_MAIN_RECEIVER_ID_MAX_LENGTH - 1); - ERR_CHK(safec_rc); - status->stb_receiver_id[CTRLM_MAIN_RECEIVER_ID_MAX_LENGTH - 1] = '\0'; } gboolean ctrlm_main_iarm_call_ir_remote_usage_get(ctrlm_main_iarm_call_ir_remote_usage_t *ir_remote_usage) { @@ -4817,10 +4763,6 @@ ctrlm_auth_t* ctrlm_main_auth_get() { #endif } -string ctrlm_receiver_id_get(){ - return g_ctrlm.receiver_id; -} - string ctrlm_device_id_get(){ return g_ctrlm.device_id; } @@ -6126,4 +6068,4 @@ void *ctrlm_load_hal_rf4ce(void) { gboolean ctrlm_is_rf4ce_enabled(void) { return(g_ctrlm.rf4ce_enabled); -} \ No newline at end of file +} diff --git a/src/ctrlm_network.cpp b/src/ctrlm_network.cpp index 1e211af4..955a937a 100644 --- a/src/ctrlm_network.cpp +++ b/src/ctrlm_network.cpp @@ -155,16 +155,6 @@ const char * ctrlm_obj_network_t::version_get() const { return(version_.c_str()); } -void ctrlm_obj_network_t::receiver_id_set(const string& receiver_id) { - THREAD_ID_VALIDATE(); - receiver_id_ = receiver_id; -} - -string ctrlm_obj_network_t::receiver_id_get() const { - THREAD_ID_VALIDATE(); - return(receiver_id_); -} - void ctrlm_obj_network_t::device_id_set(const string& device_id) { THREAD_ID_VALIDATE(); device_id_ = device_id; diff --git a/src/ctrlm_network.h b/src/ctrlm_network.h index fb4e4633..3fe15c99 100644 --- a/src/ctrlm_network.h +++ b/src/ctrlm_network.h @@ -167,8 +167,6 @@ class ctrlm_obj_network_t const char * name_get() const; const char * version_get() const; virtual std::string db_name_get() const; - void receiver_id_set(const std::string& receiver_id); - std::string receiver_id_get() const; virtual void device_id_set(const std::string& device_id); std::string device_id_get() const; void service_account_id_set(const std::string& service_account_id); @@ -296,7 +294,6 @@ class ctrlm_obj_network_t private: gboolean mask_key_codes_ = true; - std::string receiver_id_; std::string device_id_; std::string service_account_id_; std::string partner_id_; diff --git a/src/ctrlm_utils.cpp b/src/ctrlm_utils.cpp index 950b28c4..a9a53ded 100644 --- a/src/ctrlm_utils.cpp +++ b/src/ctrlm_utils.cpp @@ -690,7 +690,7 @@ const char *ctrlm_voice_session_abort_reason_str(ctrlm_voice_session_abort_reaso case CTRLM_VOICE_SESSION_ABORT_REASON_DEVICE_UPDATE: return("DEVICE_UPDATE"); case CTRLM_VOICE_SESSION_ABORT_REASON_FAILURE: return("FAILURE"); case CTRLM_VOICE_SESSION_ABORT_REASON_VOICE_DISABLED: return("VOICE_DISABLED"); - case CTRLM_VOICE_SESSION_ABORT_REASON_NO_RECEIVER_ID: return("NO RECEIVER_ID"); + case CTRLM_VOICE_SESSION_ABORT_REASON_NO_AUTH_DATA: return("NO_AUTH_DATA"); case CTRLM_VOICE_SESSION_ABORT_REASON_NEW_SESSION: return("NEW_SESSION"); case CTRLM_VOICE_SESSION_ABORT_REASON_INVALID_CONTROLLER_ID: return("INVALID_CONTROLLER_ID"); case CTRLM_VOICE_SESSION_ABORT_REASON_APPLICATION_RESTART: return("APPLICATION_RESTART"); diff --git a/src/rf4ce/ctrlm_rf4ce_controller.cpp b/src/rf4ce/ctrlm_rf4ce_controller.cpp index d4de9794..bd0b5539 100644 --- a/src/rf4ce/ctrlm_rf4ce_controller.cpp +++ b/src/rf4ce/ctrlm_rf4ce_controller.cpp @@ -2167,44 +2167,13 @@ void ctrlm_obj_controller_rf4ce_t::irdb_entry_id_name_set(ctrlm_irdb_dev_type_t } } -guchar ctrlm_obj_controller_rf4ce_t::property_write_receiver_id(guchar *data, guchar length) { - if(length != CTRLM_RF4CE_RIB_ATTR_LEN_TARGET_ID_DATA) { - XLOGD_ERROR("INVALID PARAMETERS"); - return(0); - } - - // We do not want to support overwriting the receiver id - XLOGD_WARN("Wrting the receiver id is NOT allowed"); - return(0); -} - -guchar ctrlm_obj_controller_rf4ce_t::property_read_receiver_id(guchar *data, guchar length) { - std::string receiver_id; - guchar len; - - if(length != CTRLM_RF4CE_RIB_ATTR_LEN_TARGET_ID_DATA) { - XLOGD_ERROR("INVALID PARAMETERS"); - return(0); - } - - receiver_id = receiver_id_get(); - len = (receiver_id.length() > length ? length : receiver_id.length()); - - // Copy receiver id to data buf - errno_t safec_rc = strncpy_s((gchar *)data, CTRLM_HAL_RF4CE_CONST_MAX_RIB_ATTRIBUTE_SIZE, receiver_id.c_str(),len); - ERR_CHK(safec_rc); - - return(len); - -} - guchar ctrlm_obj_controller_rf4ce_t::property_write_device_id(guchar *data, guchar length) { if(length != CTRLM_RF4CE_RIB_ATTR_LEN_TARGET_ID_DATA) { XLOGD_ERROR("INVALID PARAMETERS"); return(0); } - // We do not want to support overwriting the receiver id + // We do not want to support overwriting the device id XLOGD_WARN("Wrting the device id is NOT allowed"); return(0); } @@ -2221,7 +2190,7 @@ guchar ctrlm_obj_controller_rf4ce_t::property_read_device_id(guchar *data, gucha device_id = device_id_get(); len = (device_id.length() > length ? length : device_id.length()); - // Copy receiver id to data buf + // Copy device id to data buf errno_t safec_rc = strncpy_s((gchar *)data, CTRLM_HAL_RF4CE_CONST_MAX_RIB_ATTRIBUTE_SIZE, device_id.c_str(),len); ERR_CHK(safec_rc); diff --git a/src/rf4ce/ctrlm_rf4ce_controller.h b/src/rf4ce/ctrlm_rf4ce_controller.h index 5296cd1a..54fe9565 100644 --- a/src/rf4ce/ctrlm_rf4ce_controller.h +++ b/src/rf4ce/ctrlm_rf4ce_controller.h @@ -173,24 +173,23 @@ class ctrlm_obj_network_rf4ce_t; #define CTRLM_RF4CE_RIB_ATTR_LEN_CONTROLLER_IRDB_STATUS_MINUS_LOAD_STATUS_BYTES (13) -#define CTRLM_RF4CE_RIB_ATTR_INDEX_VERSIONING_SOFTWARE (0x00) -#define CTRLM_RF4CE_RIB_ATTR_INDEX_VERSIONING_HARDWARE (0x01) -#define CTRLM_RF4CE_RIB_ATTR_INDEX_VERSIONING_IRDB (0x02) -#define CTRLM_RF4CE_RIB_ATTR_INDEX_VERSIONING_BUILD_ID (0x03) -#define CTRLM_RF4CE_RIB_ATTR_INDEX_VERSIONING_DSP (0x04) -#define CTRLM_RF4CE_RIB_ATTR_INDEX_VERSIONING_KEYWORD_MODEL (0x05) -#define CTRLM_RF4CE_RIB_ATTR_INDEX_VERSIONING_ARM (0x06) -#define CTRLM_RF4CE_RIB_ATTR_INDEX_VERSIONING_DSP_BUILD_ID (0x07) -#define CTRLM_RF4CE_RIB_ATTR_INDEX_UPDATE_VERSIONING_BOOTLOADER (0x01) -#define CTRLM_RF4CE_RIB_ATTR_INDEX_UPDATE_VERSIONING_GOLDEN (0x02) -#define CTRLM_RF4CE_RIB_ATTR_INDEX_UPDATE_VERSIONING_AUDIO_DATA (0x10) -#define CTRLM_RF4CE_RIB_ATTR_INDEX_TARGET_ID_DATA_RECEIVER_ID (0x01) -#define CTRLM_RF4CE_RIB_ATTR_INDEX_TARGET_ID_DATA_DEVICE_ID (0x02) -#define CTRLM_RF4CE_RIB_ATTR_INDEX_POLLING_CONFIGURATION_MAC (0x01) +#define CTRLM_RF4CE_RIB_ATTR_INDEX_VERSIONING_SOFTWARE (0x00) +#define CTRLM_RF4CE_RIB_ATTR_INDEX_VERSIONING_HARDWARE (0x01) +#define CTRLM_RF4CE_RIB_ATTR_INDEX_VERSIONING_IRDB (0x02) +#define CTRLM_RF4CE_RIB_ATTR_INDEX_VERSIONING_BUILD_ID (0x03) +#define CTRLM_RF4CE_RIB_ATTR_INDEX_VERSIONING_DSP (0x04) +#define CTRLM_RF4CE_RIB_ATTR_INDEX_VERSIONING_KEYWORD_MODEL (0x05) +#define CTRLM_RF4CE_RIB_ATTR_INDEX_VERSIONING_ARM (0x06) +#define CTRLM_RF4CE_RIB_ATTR_INDEX_VERSIONING_DSP_BUILD_ID (0x07) +#define CTRLM_RF4CE_RIB_ATTR_INDEX_UPDATE_VERSIONING_BOOTLOADER (0x01) +#define CTRLM_RF4CE_RIB_ATTR_INDEX_UPDATE_VERSIONING_GOLDEN (0x02) +#define CTRLM_RF4CE_RIB_ATTR_INDEX_UPDATE_VERSIONING_AUDIO_DATA (0x10) +#define CTRLM_RF4CE_RIB_ATTR_INDEX_TARGET_ID_DATA_DEVICE_ID (0x02) +#define CTRLM_RF4CE_RIB_ATTR_INDEX_POLLING_CONFIGURATION_MAC (0x01) #define CTRLM_RF4CE_RIB_ATTR_INDEX_POLLING_CONFIGURATION_HEARTBEAT (0x00) -#define CTRLM_RF4CE_RIB_ATTR_INDEX_MFG_TEST (0x00) -#define CTRLM_RF4CE_RIB_ATTR_INDEX_MFG_TEST_RESULT (0x01) -#define CTRLM_RF4CE_RIB_ATTR_INDEX_GENERAL (0x00) +#define CTRLM_RF4CE_RIB_ATTR_INDEX_MFG_TEST (0x00) +#define CTRLM_RF4CE_RIB_ATTR_INDEX_MFG_TEST_RESULT (0x01) +#define CTRLM_RF4CE_RIB_ATTR_INDEX_GENERAL (0x00) #define CTRLM_RF4CE_LEN_VOICE_METRICS (44) @@ -843,7 +842,6 @@ class ctrlm_obj_controller_rf4ce_t : public ctrlm_obj_controller_t guchar property_read_reboot_diagnostics(guchar *data, guchar length); guchar property_read_memory_statistics(guchar *data, guchar length); guchar property_read_time_last_checkin_for_device_update(guchar *data, guchar length); - guchar property_read_receiver_id(guchar *data, guchar length); guchar property_read_device_id(guchar *data, guchar length); guchar property_read_mfg_test(guchar *data, guchar length); guchar property_read_mfg_test_result(guchar *data, guchar length); @@ -900,7 +898,6 @@ class ctrlm_obj_controller_rf4ce_t : public ctrlm_obj_controller_t guchar property_write_reboot_stats(guchar *data, guchar length); guchar property_write_memory_stats(guchar *data, guchar length); - guchar property_write_receiver_id(guchar *data, guchar length); guchar property_write_device_id(guchar *data, guchar length); guchar property_write_mfg_test(guchar *data, guchar length); guchar property_write_mfg_test_result(guchar *data, guchar length); diff --git a/src/rf4ce/ctrlm_rf4ce_network.cpp b/src/rf4ce/ctrlm_rf4ce_network.cpp index 3cb31478..5677a74e 100644 --- a/src/rf4ce/ctrlm_rf4ce_network.cpp +++ b/src/rf4ce/ctrlm_rf4ce_network.cpp @@ -2903,7 +2903,6 @@ void ctrlm_obj_network_rf4ce_t::polling_config_tr181_read() { bool b_has_default_mac_config = false; -#ifdef MAC_POLLING bool mac_polling_enabled = false; if(CTRLM_TR181_RESULT_SUCCESS == ctrlm_tr181_bool_get(CTRLM_RF4CE_TR181_MAC_POLLING_CONFIGURATION_ENABLE, &mac_polling_enabled)) { XLOGD_INFO("Default Mac Polling Configuration from TR181"); @@ -2917,7 +2916,6 @@ void ctrlm_obj_network_rf4ce_t::polling_config_tr181_read() { } } -#endif for(int i = 0; i < RF4CE_CONTROLLER_TYPE_INVALID; i++) { XLOGD_INFO("Polling Configuration Remote Type <%s>", ctrlm_rf4ce_controller_type_str((ctrlm_rf4ce_controller_type_t)i)); const char *controller_tr181_str = 0; @@ -3002,10 +3000,8 @@ void ctrlm_obj_network_rf4ce_t::polling_config_read(json_config *conf) { json_config target_obj; if(conf->config_object_get(JSON_OBJ_NAME_NETWORK_RF4CE_POLLING_TARGET, target_obj)) { // has target object - #ifdef MAC_POLLING target_obj.config_value_get(JSON_INT_NAME_NETWORK_RF4CE_POLLING_TARGET_METHODS, polling_methods_); target_obj.config_value_get(JSON_INT_NAME_NETWORK_RF4CE_POLLING_TARGET_FMR_CONTROLLERS_MAX, max_fmr_controllers_); - #endif } json_config generic_polling_obj; @@ -4755,19 +4751,11 @@ void ctrlm_obj_network_rf4ce_t::rfc_retrieved_handler(const ctrlm_rfc_attr_t& at // Polling if(attr.get_rfc_value(JSON_OBJ_NAME_NETWORK_RF4CE_POLLING JSON_PATH_SEPERATOR JSON_OBJ_NAME_NETWORK_RF4CE_POLLING_TARGET JSON_PATH_SEPERATOR JSON_INT_NAME_NETWORK_RF4CE_POLLING_TARGET_METHODS, polling_methods_)) { - #ifndef MAC_POLLING - if(polling_methods_ & POLLING_METHODS_FLAG_MAC) { - XLOGD_ERROR("mac polling is disabled"); - polling_methods_ &= ~POLLING_METHODS_FLAG_MAC; - } - #endif XLOGD_INFO("target polling methods <%s>", ctrlm_rf4ce_controller_polling_methods_str(polling_methods_)); } - #ifdef MAC_POLLING if(attr.get_rfc_value(JSON_OBJ_NAME_NETWORK_RF4CE_POLLING JSON_PATH_SEPERATOR JSON_OBJ_NAME_NETWORK_RF4CE_POLLING_TARGET JSON_PATH_SEPERATOR JSON_INT_NAME_NETWORK_RF4CE_POLLING_TARGET_FMR_CONTROLLERS_MAX, max_fmr_controllers_)) { XLOGD_INFO("target fmr controllers max <%u>", max_fmr_controllers_); } - #endif if(attr.get_rfc_value(JSON_OBJ_NAME_NETWORK_RF4CE_POLLING JSON_PATH_SEPERATOR JSON_OBJ_NAME_NETWORK_RF4CE_POLLING_HB_GENERIC_CONFIG JSON_PATH_SEPERATOR JSON_INT_NAME_NETWORK_RF4CE_POLLING_HB_GENERIC_CONFIG_UPTIME_MULTIPLIER, controller_generic_polling_configuration_.uptime_multiplier)) { XLOGD_INFO("polling hb generic config - uptime multiplier <%u>", controller_generic_polling_configuration_.uptime_multiplier); } diff --git a/src/rf4ce/ctrlm_rf4ce_rib.cpp b/src/rf4ce/ctrlm_rf4ce_rib.cpp index d94a34f5..4eaab800 100644 --- a/src/rf4ce/ctrlm_rf4ce_rib.cpp +++ b/src/rf4ce/ctrlm_rf4ce_rib.cpp @@ -349,8 +349,6 @@ void ctrlm_obj_controller_rf4ce_t::rf4ce_rib_get(gboolean target, ctrlm_timestam status = CTRLM_RF4CE_RIB_RSP_STATUS_INVALID_INDEX; } else if(index == CTRLM_RF4CE_RIB_ATTR_INDEX_TARGET_ID_DATA_DEVICE_ID) { value_length = property_read_device_id(data_buf, CTRLM_RF4CE_RIB_ATTR_LEN_TARGET_ID_DATA); - } else if(index == CTRLM_RF4CE_RIB_ATTR_INDEX_TARGET_ID_DATA_RECEIVER_ID) { - value_length = property_read_receiver_id(data_buf, CTRLM_RF4CE_RIB_ATTR_LEN_TARGET_ID_DATA); } else { XLOGD_WARN("Account ID not implemented yet"); value_length = 0; @@ -851,8 +849,6 @@ void ctrlm_obj_controller_rf4ce_t::rf4ce_rib_set(gboolean target, ctrlm_timestam status = CTRLM_RF4CE_RIB_RSP_STATUS_INVALID_INDEX; } else if(index == CTRLM_RF4CE_RIB_ATTR_INDEX_TARGET_ID_DATA_DEVICE_ID) { property_write_device_id(data, CTRLM_RF4CE_RIB_ATTR_LEN_TARGET_ID_DATA); - } else if(index == CTRLM_RF4CE_RIB_ATTR_INDEX_TARGET_ID_DATA_RECEIVER_ID) { - property_write_receiver_id(data, CTRLM_RF4CE_RIB_ATTR_LEN_TARGET_ID_DATA); } else { XLOGD_WARN("Account ID not implemented yet"); status = CTRLM_RF4CE_RIB_RSP_STATUS_UNSUPPORTED_ATTRIBUTE; diff --git a/src/voice/ctrlm_voice_obj.cpp b/src/voice/ctrlm_voice_obj.cpp index b88df5e4..2491ae9a 100644 --- a/src/voice/ctrlm_voice_obj.cpp +++ b/src/voice/ctrlm_voice_obj.cpp @@ -1359,7 +1359,7 @@ ctrlm_voice_session_response_status_t ctrlm_voice_t::voice_session_req(ctrlm_net #ifdef AUTH_ENABLED else if(this->voice_session_requires_stb_data(device_type) && !this->voice_session_has_stb_data()) { XLOGD_ERROR("Authentication Data missing"); - this->voice_session_notify_abort(network_id, controller_id, 0, CTRLM_VOICE_SESSION_ABORT_REASON_NO_RECEIVER_ID); + this->voice_session_notify_abort(network_id, controller_id, 0, CTRLM_VOICE_SESSION_ABORT_REASON_NO_AUTH_DATA); return(VOICE_SESSION_RESPONSE_SERVER_NOT_READY); } #endif @@ -2253,18 +2253,6 @@ std::string ctrlm_voice_t::voice_stb_data_account_number_get() const { return(this->account_number); } -void ctrlm_voice_t::voice_stb_data_receiver_id_set(std::string &receiver_id) { - XLOGD_DEBUG("Receiver ID set to %s", receiver_id.c_str()); - this->receiver_id = receiver_id; - for(const auto &itr : this->endpoints) { - itr->voice_stb_data_receiver_id_set(receiver_id); - } -} - -std::string ctrlm_voice_t::voice_stb_data_receiver_id_get() const { - return(this->receiver_id); -} - void ctrlm_voice_t::voice_stb_data_device_id_set(std::string &device_id) { XLOGD_DEBUG("Device ID set to %s", device_id.c_str()); this->device_id = device_id; @@ -2456,9 +2444,9 @@ bool ctrlm_voice_t::voice_session_requires_stb_data(ctrlm_voice_device_t device_ } bool ctrlm_voice_t::voice_session_has_stb_data() { -#if defined(AUTH_RECEIVER_ID) || defined(AUTH_DEVICE_ID) - if(this->receiver_id == "" && this->device_id == "") { - XLOGD_TELEMETRY("No receiver/device id"); +#ifdef AUTH_DEVICE_ID + if(this->device_id == "") { + XLOGD_TELEMETRY("No device id"); return(false); } #endif diff --git a/src/voice/ctrlm_voice_obj.h b/src/voice/ctrlm_voice_obj.h index ffb1d8d4..f20644f4 100644 --- a/src/voice/ctrlm_voice_obj.h +++ b/src/voice/ctrlm_voice_obj.h @@ -509,8 +509,6 @@ class ctrlm_voice_t { std::string voice_stb_data_stb_name_get() const; virtual void voice_stb_data_account_number_set(std::string &account_number); std::string voice_stb_data_account_number_get() const; - virtual void voice_stb_data_receiver_id_set(std::string &receiver_id); - std::string voice_stb_data_receiver_id_get() const; virtual void voice_stb_data_device_id_set(std::string &device_id); std::string voice_stb_data_device_id_get() const; virtual void voice_stb_data_device_type_set(ctrlm_device_type_t device_type); @@ -657,7 +655,6 @@ class ctrlm_voice_t { std::string account_number; std::string device_id; ctrlm_device_type_t device_type; - std::string receiver_id; std::string partner_id; std::string experience; char sat_token[XRSR_SAT_TOKEN_LEN_MAX]; diff --git a/src/voice/endpoints/ctrlm_voice_endpoint.cpp b/src/voice/endpoints/ctrlm_voice_endpoint.cpp index 07c3212c..7815cd27 100644 --- a/src/voice/endpoints/ctrlm_voice_endpoint.cpp +++ b/src/voice/endpoints/ctrlm_voice_endpoint.cpp @@ -60,7 +60,6 @@ bool ctrlm_voice_endpoint_t::voice_message(const char *msg) const { void ctrlm_voice_endpoint_t::voice_stb_data_stb_sw_version_set(std::string &sw_version) {} void ctrlm_voice_endpoint_t::voice_stb_data_stb_name_set(std::string &stb_name) {} void ctrlm_voice_endpoint_t::voice_stb_data_account_number_set(std::string &account_number) {} -void ctrlm_voice_endpoint_t::voice_stb_data_receiver_id_set(std::string &receiver_id) {} void ctrlm_voice_endpoint_t::voice_stb_data_device_id_set(std::string &device_id) {} void ctrlm_voice_endpoint_t::voice_stb_data_device_type_set(ctrlm_device_type_t device_type) {} void ctrlm_voice_endpoint_t::voice_stb_data_partner_id_set(std::string &partner_id) {} diff --git a/src/voice/endpoints/ctrlm_voice_endpoint.h b/src/voice/endpoints/ctrlm_voice_endpoint.h index 64f6c07c..ac881880 100644 --- a/src/voice/endpoints/ctrlm_voice_endpoint.h +++ b/src/voice/endpoints/ctrlm_voice_endpoint.h @@ -47,7 +47,6 @@ class ctrlm_voice_endpoint_t { virtual void voice_stb_data_stb_sw_version_set(std::string &sw_version); virtual void voice_stb_data_stb_name_set(std::string &stb_name); virtual void voice_stb_data_account_number_set(std::string &account_number); - virtual void voice_stb_data_receiver_id_set(std::string &receiver_id); virtual void voice_stb_data_device_id_set(std::string &device_id); virtual void voice_stb_data_device_type_set(ctrlm_device_type_t device_type); virtual void voice_stb_data_partner_id_set(std::string &partner_id); diff --git a/src/voice/endpoints/ctrlm_voice_endpoint_http.cpp b/src/voice/endpoints/ctrlm_voice_endpoint_http.cpp index 49ed1a2a..653e2260 100644 --- a/src/voice/endpoints/ctrlm_voice_endpoint_http.cpp +++ b/src/voice/endpoints/ctrlm_voice_endpoint_http.cpp @@ -71,7 +71,6 @@ bool ctrlm_voice_endpoint_http_t::open() { } std::string device_id = this->voice_obj->voice_stb_data_device_id_get(); - std::string receiver_id = this->voice_obj->voice_stb_data_receiver_id_get(); std::string partner_id = this->voice_obj->voice_stb_data_partner_id_get(); std::string experience = this->voice_obj->voice_stb_data_experience_get(); std::string app_id = this->voice_obj->voice_stb_data_app_id_http_get(); @@ -79,7 +78,6 @@ bool ctrlm_voice_endpoint_http_t::open() { xrsv_http_params_t params_http = { .device_id = device_id.c_str(), - .receiver_id = receiver_id.c_str(), .partner_id = partner_id.c_str(), .experience = experience.c_str(), .app_id = app_id.c_str(), @@ -128,12 +126,6 @@ bool ctrlm_voice_endpoint_http_t::get_handlers(xrsr_handlers_t *handlers) { return(true); } -void ctrlm_voice_endpoint_http_t::voice_stb_data_receiver_id_set(std::string &receiver_id) { - if(this->xrsv_obj_http) { - xrsv_http_update_receiver_id(this->xrsv_obj_http, receiver_id.c_str()); - } -} - void ctrlm_voice_endpoint_http_t::voice_stb_data_device_id_set(std::string &device_id) { if(this->xrsv_obj_http) { xrsv_http_update_device_id(this->xrsv_obj_http, device_id.c_str()); diff --git a/src/voice/endpoints/ctrlm_voice_endpoint_http.h b/src/voice/endpoints/ctrlm_voice_endpoint_http.h index 4b49f44c..9338e20d 100644 --- a/src/voice/endpoints/ctrlm_voice_endpoint_http.h +++ b/src/voice/endpoints/ctrlm_voice_endpoint_http.h @@ -30,7 +30,6 @@ class ctrlm_voice_endpoint_http_t : public ctrlm_voice_endpoint_t { bool get_handlers(xrsr_handlers_t *handlers); public: - void voice_stb_data_receiver_id_set(std::string &receiver_id); void voice_stb_data_device_id_set(std::string &device_id); void voice_stb_data_partner_id_set(std::string &partner_id); void voice_stb_data_experience_set(std::string &experience); diff --git a/src/voice/endpoints/ctrlm_voice_endpoint_ws_nextgen.cpp b/src/voice/endpoints/ctrlm_voice_endpoint_ws_nextgen.cpp index bc63ae2f..248832cc 100644 --- a/src/voice/endpoints/ctrlm_voice_endpoint_ws_nextgen.cpp +++ b/src/voice/endpoints/ctrlm_voice_endpoint_ws_nextgen.cpp @@ -89,11 +89,7 @@ bool ctrlm_voice_endpoint_ws_nextgen_t::open() { std::string experience = this->voice_obj->voice_stb_data_experience_get(); std::string language = this->voice_obj->voice_stb_data_guide_language_get().c_str(); std::string account_number = this->voice_obj->voice_stb_data_account_number_get(); -#ifdef VOICE_NEXTGEN_MAC std::string device_mac = ctrlm_device_mac_get(); -#else - std::string device_mac = ""; -#endif std::string rf_protocol = ""; xrsv_ws_nextgen_params_t params_ws = {