From 747b898f36c4764475e61f20847ba4bbb3a81404 Mon Sep 17 00:00:00 2001 From: Serhii Kostiuk Date: Tue, 16 Jun 2020 15:37:02 +0300 Subject: [GP-654] Add SIM card-based carrier detection Changes after a code review: - renamed "MTS Carrier Code" to the "Carrier Code"; - fixed descriptions for the new field and methods. --- include/mts/MTS_IO_CellularRadio.h | 6 +++--- include/mts/MTS_IO_ICellularRadio.h | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) (limited to 'include') diff --git a/include/mts/MTS_IO_CellularRadio.h b/include/mts/MTS_IO_CellularRadio.h index e65eb4e..ed87a24 100644 --- a/include/mts/MTS_IO_CellularRadio.h +++ b/include/mts/MTS_IO_CellularRadio.h @@ -81,7 +81,7 @@ namespace MTS { CODE convertCellModesToString(CELLULAR_MODES eCellModes, std::string& sCellModes) override; CODE unlockSimCard(const Json::Value& jArgs) override; - CODE getMtsSimCarrierCode(std::string& sCarrier) override; + CODE getSimCarrierCode(std::string& sCarrierCode) override; CODE getMipProfile(Json::Value& jMipProfile) override; CODE validateMsl(const Json::Value& jArgs) override; @@ -165,8 +165,8 @@ namespace MTS { */ virtual CODE getSimLockAttempts(int& iAttemptsPin, int& iAttemptsPuk) = 0; - //! Get MTS carrier code based on the SIM card ID (ICCID) - virtual CODE getMtsSimCarrierCode(const std::string& sIccid, std::string& sCarrier); + //! Get carrier code based on the SIM card ID (ICCID) + virtual CODE getSimCarrierCode(const std::string& sIccid, std::string& sCarrierCode); void initMipProfile(Json::Value& jData); bool splitAndAssign(const std::string& sLine, const std::string& sKey, Json::Value& jParent, const std::string& sJsonKey, Json::ValueType eType = Json::ValueType::stringValue); diff --git a/include/mts/MTS_IO_ICellularRadio.h b/include/mts/MTS_IO_ICellularRadio.h index 98c886d..f2d4dfe 100644 --- a/include/mts/MTS_IO_ICellularRadio.h +++ b/include/mts/MTS_IO_ICellularRadio.h @@ -127,7 +127,7 @@ namespace MTS { static const char *KEY_ICCID; //!< Integrated Circuit Card Identifier static const char *KEY_MSL; //!< Master Subsidy Lock static const char *KEY_SUPPORTED_CELL_MODES; //!< Comma-separated list of all supported cellular modes (2g,3g,4g) - static const char *KEY_MTS_SIM_CARRIER_CODE; //!< MTS-specific carrier code fetched from the SIM card + static const char *KEY_SIM_CARRIER_CODE; //!< Unique carrier identifier based on the SIM card information. //Network Status Data @@ -201,9 +201,9 @@ namespace MTS { static const char *VALUE_ABND_DCS_1800; static const char *VALUE_ABND_PCS_1900; - //Values - MTS carrier code - static const char *VALUE_MTS_CARRIER_CODE_VERIZON; - static const char *VALUE_MTS_CARRIER_CODE_ATT; + //Values - Carrier code; abstraction over PLMN IDs, IINs and other identifiers + static const char *VALUE_CARRIER_CODE_VERIZON; + static const char *VALUE_CARRIER_CODE_ATT; static const std::vector DEFAULT_BAIL_STRINGS; @@ -296,20 +296,21 @@ namespace MTS { virtual CODE unlockSimCard(const Json::Value& jArgs) = 0; /** - * @brief getMtsSimCarrierCode - get MTS-specific carrier code from the SIM card. + * @brief getSimCarrierCode - get unique carrier identifier based on + * the SIM card information. * * @param sCarrier - a string to be populated with one of the carrier codes: * - * - VALUE_MTS_CARRIER_CODE_VERIZON - Verizon - * - VALUE_MTS_CARRIER_CODE_ATT - AT&T + * - VALUE_CARRIER_CODE_VERIZON - Verizon + * - VALUE_CARRIER_CODE_ATT - AT&T * - VALUE_UNKNOWN - Unknown carrier * - other values may be defined in the future * - * @return CODE::SUCCESS when carrier name retrieved, + * @return CODE::SUCCESS when carrier code retrieved, * CODE::ERROR otherwise (i.e. when modem is not responding, * when SIM card is removed or on any other error). */ - virtual CODE getMtsSimCarrierCode(std::string& sCarrier) = 0; + virtual CODE getSimCarrierCode(std::string& sCarrierCode) = 0; //! Gather details of the radio's Mobile IP Profile /*! -- cgit v1.2.3