diff options
| author | Riza Sulistyo <riza@teluu.com> | 2014-10-06 04:12:42 +0000 |
|---|---|---|
| committer | Riza Sulistyo <riza@teluu.com> | 2014-10-06 04:12:42 +0000 |
| commit | 4cac0646d374cb0379fe83818161503ec0eff858 (patch) | |
| tree | 82fc66156c2f83a67d5ce07cfbde63e4029461ed /pjsip | |
| parent | 9a0501e4277ad8339c53ad9a8b03ae1c0b8dc3e1 (diff) | |
Misc (re #1782): Change field name unregWaitSec to unregWaitMsec, as it represents millisecond data. (Thanks to Chris Updegraft for the feedback).
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4939 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
| -rw-r--r-- | pjsip/include/pjsua2/account.hpp | 2 | ||||
| -rw-r--r-- | pjsip/src/pjsua2/account.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pjsip/include/pjsua2/account.hpp b/pjsip/include/pjsua2/account.hpp index 6452ad52..106ad9d7 100644 --- a/pjsip/include/pjsua2/account.hpp +++ b/pjsip/include/pjsua2/account.hpp @@ -122,7 +122,7 @@ struct AccountRegConfig : public PersistentObject * * Default: PJSUA_UNREG_TIMEOUT */ - unsigned unregWaitSec; + unsigned unregWaitMsec; /** * Specify how the registration uses the outbound and account proxy diff --git a/pjsip/src/pjsua2/account.cpp b/pjsip/src/pjsua2/account.cpp index 52178451..533b8211 100644 --- a/pjsip/src/pjsua2/account.cpp +++ b/pjsip/src/pjsua2/account.cpp @@ -40,7 +40,7 @@ void AccountRegConfig::readObject(const ContainerNode &node) throw(Error) NODE_READ_UNSIGNED (this_node, firstRetryIntervalSec); NODE_READ_UNSIGNED (this_node, delayBeforeRefreshSec); NODE_READ_BOOL (this_node, dropCallsOnFail); - NODE_READ_UNSIGNED (this_node, unregWaitSec); + NODE_READ_UNSIGNED (this_node, unregWaitMsec); NODE_READ_UNSIGNED (this_node, proxyUse); readSipHeaders(this_node, "headers", headers); @@ -57,7 +57,7 @@ void AccountRegConfig::writeObject(ContainerNode &node) const throw(Error) NODE_WRITE_UNSIGNED (this_node, firstRetryIntervalSec); NODE_WRITE_UNSIGNED (this_node, delayBeforeRefreshSec); NODE_WRITE_BOOL (this_node, dropCallsOnFail); - NODE_WRITE_UNSIGNED (this_node, unregWaitSec); + NODE_WRITE_UNSIGNED (this_node, unregWaitMsec); NODE_WRITE_UNSIGNED (this_node, proxyUse); writeSipHeaders(this_node, "headers", headers); @@ -320,7 +320,7 @@ void AccountConfig::toPj(pjsua_acc_config &ret) const ret.reg_first_retry_interval= regConfig.firstRetryIntervalSec; ret.reg_delay_before_refresh= regConfig.delayBeforeRefreshSec; ret.drop_calls_on_reg_fail = regConfig.dropCallsOnFail; - ret.unreg_timeout = regConfig.unregWaitSec; + ret.unreg_timeout = regConfig.unregWaitMsec; ret.reg_use_proxy = regConfig.proxyUse; for (i=0; i<regConfig.headers.size(); ++i) { pj_list_push_back(&ret.reg_hdr_list, ®Config.headers[i].toPj()); @@ -447,7 +447,7 @@ void AccountConfig::fromPj(const pjsua_acc_config &prm, regConfig.firstRetryIntervalSec = prm.reg_first_retry_interval; regConfig.delayBeforeRefreshSec = prm.reg_delay_before_refresh; regConfig.dropCallsOnFail = PJ2BOOL(prm.drop_calls_on_reg_fail); - regConfig.unregWaitSec = prm.unreg_timeout; + regConfig.unregWaitMsec = prm.unreg_timeout; regConfig.proxyUse = prm.reg_use_proxy; regConfig.headers.clear(); hdr = prm.reg_hdr_list.next; |