mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-27 07:59:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Store the NAT policy in the media session, not in the call session.

Browse source
This commit is contained in:
Ghislain MARY 2017-09-14 09:23:09 +02:00
parent df45d5f1f0
commit 79604de277
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/conference/session/call-session-p.h
View file

@ -93,7 +93,6 @@ protected:
LinphoneProxyConfig *destProxy = nullptr;
LinphoneErrorInfo *ei = nullptr;
LinphoneCallLog *log = nullptr;
LinphoneNatPolicy *natPolicy = nullptr;
SalOp *op = nullptr;

8
src/conference/session/call-session.cpp
View file

@ -59,8 +59,6 @@ CallSessionPrivate::~CallSessionPrivate () {
linphone_error_info_unref(ei);
if (log)
linphone_call_log_unref(log);
if (natPolicy)
linphone_nat_policy_unref(natPolicy);
if (op)
sal_op_release(op);
}
@ -786,12 +784,6 @@ void CallSession::configure (LinphoneCallDir direction, LinphoneProxyConfig *cfg
}
d->log = linphone_call_log_new(direction, fromAddr, toAddr);
if (d->destProxy)
d->natPolicy = linphone_proxy_config_get_nat_policy(d->destProxy);
if (!d->natPolicy)
d->natPolicy = linphone_core_get_nat_policy(d->core);
linphone_nat_policy_ref(d->natPolicy);
if (op) {
/* We already have an op for incoming calls */
d->op = op;

1
src/conference/session/media-session-p.h
View file

@ -261,6 +261,7 @@ private:
RtpProfile *textProfile = nullptr;
int mainTextStreamIndex = LINPHONE_CALL_STATS_TEXT;
LinphoneNatPolicy *natPolicy = nullptr;
StunClient *stunClient = nullptr;
IceAgent *iceAgent = nullptr;

8
src/conference/session/media-session.cpp
View file

@ -103,6 +103,8 @@ MediaSessionPrivate::~MediaSessionPrivate () {
linphone_call_stats_unref(videoStats);
if (textStats)
linphone_call_stats_unref(textStats);
if (natPolicy)
linphone_nat_policy_unref(natPolicy);
if (stunClient)
delete stunClient;
delete iceAgent;
@ -4087,6 +4089,12 @@ void MediaSession::configure (LinphoneCallDir direction, LinphoneProxyConfig *cf
L_D(MediaSession);
CallSession::configure (direction, cfg, op, from, to);
if (d->destProxy)
d->natPolicy = linphone_proxy_config_get_nat_policy(d->destProxy);
if (!d->natPolicy)
d->natPolicy = linphone_core_get_nat_policy(d->core);
linphone_nat_policy_ref(d->natPolicy);
if (direction == LinphoneCallOutgoing) {
d->selectOutgoingIpVersion();
d->getLocalIp(to);