diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2016-04-19 07:29:54 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2016-04-19 07:29:54 +0000 |
| commit | 8ff59fb81889de7fadfa3de2445ae1c573e3ee6b (patch) | |
| tree | 18d8e6ef44f9cb747af63798f99ebde132b95475 | |
| parent | eeae4551a44f7777418cc927f150459fe81275f2 (diff) | |
Re #1882 (misc): Add implementation to call Endpoint::onSelectAccount() callback
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5278 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjsip/include/pjsua2/endpoint.hpp | 3 | ||||
| -rw-r--r-- | pjsip/src/pjsua2/endpoint.cpp | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/pjsip/include/pjsua2/endpoint.hpp b/pjsip/include/pjsua2/endpoint.hpp index 3d650bd1..09149c70 100644 --- a/pjsip/include/pjsua2/endpoint.hpp +++ b/pjsip/include/pjsua2/endpoint.hpp @@ -1310,7 +1310,8 @@ private: pjsua_acc_id acc_id); static void on_mwi_info(pjsua_acc_id acc_id, pjsua_mwi_info *mwi_info); - + static void on_acc_find_for_incoming(const pjsip_rx_data *rdata, + pjsua_acc_id* acc_id); static void on_buddy_state(pjsua_buddy_id buddy_id); // Call callbacks static void on_call_state(pjsua_call_id call_id, pjsip_event *e); diff --git a/pjsip/src/pjsua2/endpoint.cpp b/pjsip/src/pjsua2/endpoint.cpp index d4ad0fbe..96c880da 100644 --- a/pjsip/src/pjsua2/endpoint.cpp +++ b/pjsip/src/pjsua2/endpoint.cpp @@ -816,6 +816,20 @@ void Endpoint::on_mwi_info(pjsua_acc_id acc_id, acc->onMwiInfo(prm); } +void Endpoint::on_acc_find_for_incoming(const pjsip_rx_data *rdata, + pjsua_acc_id* acc_id) +{ + OnSelectAccountParam prm; + + pj_assert(rdata && acc_id); + prm.rdata.fromPj(*((pjsip_rx_data *)rdata)); + prm.accountIndex = *acc_id; + + instance_->onSelectAccount(prm); + + *acc_id = prm.accountIndex; +} + void Endpoint::on_buddy_state(pjsua_buddy_id buddy_id) { Buddy *buddy = (Buddy*)pjsua_buddy_get_user_data(buddy_id); @@ -1285,6 +1299,7 @@ void Endpoint::libInit(const EpConfig &prmEpConfig) throw(Error) ua_cfg.cb.on_typing2 = &Endpoint::on_typing2; ua_cfg.cb.on_mwi_info = &Endpoint::on_mwi_info; ua_cfg.cb.on_buddy_state = &Endpoint::on_buddy_state; + ua_cfg.cb.on_acc_find_for_incoming = &Endpoint::on_acc_find_for_incoming; /* Call callbacks */ ua_cfg.cb.on_call_state = &Endpoint::on_call_state; |