Commit f03f5101 authored by Tristan Matthews's avatar Tristan Matthews

* #29736: presence: make status_data private

parent 961db4c6
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
#define MAX_N_PRES_SUB_CLIENT 20 #define MAX_N_PRES_SUB_CLIENT 20
SIPPresence::SIPPresence(SIPAccount *acc) SIPPresence::SIPPresence(SIPAccount *acc)
: pres_status_data() : publish_sess()
, publish_sess() , pres_status_data_()
, enabled_(true) , enabled_(true)
, acc_(acc) , acc_(acc)
, pres_sub_server_list_() //IP2IP context , pres_sub_server_list_() //IP2IP context
...@@ -88,7 +88,7 @@ SIPAccount * SIPPresence::getAccount() const ...@@ -88,7 +88,7 @@ SIPAccount * SIPPresence::getAccount() const
pjsip_pres_status * SIPPresence::getStatus() pjsip_pres_status * SIPPresence::getStatus()
{ {
return &pres_status_data; return &pres_status_data_;
} }
int SIPPresence::getModId() const int SIPPresence::getModId() const
...@@ -125,11 +125,11 @@ void SIPPresence::updateStatus(bool status, const std::string &note) ...@@ -125,11 +125,11 @@ void SIPPresence::updateStatus(bool status, const std::string &note)
else // TODO: is there any other possibilities else // TODO: is there any other possibilities
DEBUG("Presence : no activity"); DEBUG("Presence : no activity");
pj_bzero(&pres_status_data, sizeof(pres_status_data)); pj_bzero(&pres_status_data_, sizeof(pres_status_data_));
pres_status_data.info_cnt = 1; pres_status_data_.info_cnt = 1;
pres_status_data.info[0].basic_open = status; pres_status_data_.info[0].basic_open = status;
pres_status_data.info[0].id = pj_str("0"); /* todo: tuplie_id*/ pres_status_data_.info[0].id = pj_str("0"); /* todo: tuplie_id*/
pj_memcpy(&pres_status_data.info[0].rpid, &rpid, sizeof(pjrpid_element)); pj_memcpy(&pres_status_data_.info[0].rpid, &rpid, sizeof(pjrpid_element));
/* "contact" field is optionnal */ /* "contact" field is optionnal */
} }
......
...@@ -211,9 +211,9 @@ public: ...@@ -211,9 +211,9 @@ public:
void lock(); void lock();
void unlock(); void unlock();
pjsip_pres_status pres_status_data; /**< Presence Data.*/
pjsip_publishc *publish_sess; /**< Client publication session.*/ pjsip_publishc *publish_sess; /**< Client publication session.*/
private: private:
pjsip_pres_status pres_status_data_; /**< Presence Data.*/
pj_bool_t enabled_; /**< Allow for status publish,*/ pj_bool_t enabled_; /**< Allow for status publish,*/
NON_COPYABLE(SIPPresence); NON_COPYABLE(SIPPresence);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment