Skip to content
Snippets Groups Projects
Commit 1ba5bbbc authored by Alexandre Savard's avatar Alexandre Savard
Browse files

#8320: Use two different variables for status and return statement in stun's on_status_cb

parent d310968b
No related branches found
No related tags found
No related merge requests found
...@@ -377,11 +377,9 @@ void AudioPreference::serialize(Conf::YamlEmitter *emitter) ...@@ -377,11 +377,9 @@ void AudioPreference::serialize(Conf::YamlEmitter *emitter)
Conf::ScalarNode noise(noisereduce_); Conf::ScalarNode noise(noisereduce_);
Conf::ScalarNode echo(echocancel_); Conf::ScalarNode echo(echocancel_);
std::stringstream tailstr; std::stringstream tailstr;
DEBUG("************************************************** serialize echotail %d", echoCancelTailLength_);
tailstr << echoCancelTailLength_; tailstr << echoCancelTailLength_;
Conf::ScalarNode echotail(tailstr.str()); Conf::ScalarNode echotail(tailstr.str());
std::stringstream delaystr; std::stringstream delaystr;
DEBUG("************************************************** serialize echodelay %d", echoCancelTailLength_);
delaystr << echoCancelDelay_; delaystr << echoCancelDelay_;
Conf::ScalarNode echodelay(delaystr.str()); Conf::ScalarNode echodelay(delaystr.str());
......
...@@ -1233,13 +1233,13 @@ bool SIPVoIPLink::SIPNewIpToIpCall(const std::string& id, const std::string& to) ...@@ -1233,13 +1233,13 @@ bool SIPVoIPLink::SIPNewIpToIpCall(const std::string& id, const std::string& to)
pj_bool_t stun_sock_on_status_cb(pj_stun_sock *stun_sock UNUSED, pj_stun_sock_op op UNUSED, pj_status_t status) pj_bool_t stun_sock_on_status_cb(pj_stun_sock *stun_sock UNUSED, pj_stun_sock_op op UNUSED, pj_status_t status)
{ {
// What ever is the status, we want the keep-alive timer to be rescheduled // What ever is the status, we want the keep-alive timer to be rescheduled
status = PJ_TRUE; pj_bool_t reschedule = PJ_TRUE;
if(status != PJ_SUCCESS) { if(status != PJ_SUCCESS) {
ERROR("Error STUN session failed because %s failed", pj_stun_sock_op_name(op)); ERROR("Error STUN session failed because %s failed", pj_stun_sock_op_name(op));
} }
return status; return reschedule;
} }
pj_bool_t stun_sock_on_rx_data_cb(pj_stun_sock *stun_sock UNUSED, void *pkt UNUSED, unsigned pkt_len UNUSED, const pj_sockaddr_t *src_addr UNUSED, unsigned addr_len UNUSED) pj_bool_t stun_sock_on_rx_data_cb(pj_stun_sock *stun_sock UNUSED, void *pkt UNUSED, unsigned pkt_len UNUSED, const pj_sockaddr_t *src_addr UNUSED, unsigned addr_len UNUSED)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment