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

Allow not sending SIP RINGING message.

Browse source
This commit is contained in:
Ghislain MARY 2018-02-28 11:47:01 +01:00
parent 763b4e3a07
commit 3ec59a1239
5 changed files with 7 additions and 5 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

@ -138,6 +138,7 @@ protected:
bool deferUpdate = false;
bool needLocalIpRefresh = false;
bool nonOpError = false; /* Set when the LinphoneErrorInfo was set at higher level than sal */
bool notifyRinging = true;
bool referPending = false;
bool reinviteOnCancelResponseRequested = false;

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

@ -550,7 +550,8 @@ void CallSessionPrivate::handleIncomingReceivedStateInIncomingNotification () {
L_Q();
/* Try to be best-effort in giving real local or routable contact address for 100Rel case */
setContactOp();
op->notify_ringing(false);
if (notifyRinging)
op->notify_ringing(false);
if (op->get_replaces() && lp_config_get_int(linphone_core_get_config(q->getCore()->getCCore()), "sip", "auto_answer_replacing_calls", 1))
q->accept();
}

2
src/conference/session/call-session.h
View file

@ -69,7 +69,7 @@ public:
virtual void iterate (time_t currentRealTime, bool oneSecondElapsed);
LinphoneStatus redirect (const std::string &redirectUri);
LinphoneStatus redirect (const Address &redirectAddr);
virtual void startIncomingNotification ();
virtual void startIncomingNotification (bool notifyRinging = true);
virtual int startInvite (const Address *destination, const std::string &subject = "", const Content *content = nullptr);
LinphoneStatus terminate (const LinphoneErrorInfo *ei = nullptr);
LinphoneStatus transfer (const std::shared_ptr<CallSession> &dest);

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

@ -4202,7 +4202,7 @@ void MediaSession::sendVfuRequest () {
#endif
}
void MediaSession::startIncomingNotification () {
void MediaSession::startIncomingNotification (bool notifyRinging) {
L_D();
d->makeLocalMediaDescription();
d->op->set_local_media_description(d->localDesc);
@ -4218,7 +4218,7 @@ void MediaSession::startIncomingNotification () {
}
}
CallSession::startIncomingNotification();
CallSession::startIncomingNotification(notifyRinging);
}
int MediaSession::startInvite (const Address *destination, const string &subject, const Content *content) {

2
src/conference/session/media-session.h
View file

@ -56,7 +56,7 @@ public:
LinphoneStatus sendDtmf (char dtmf);
LinphoneStatus sendDtmfs (const std::string &dtmfs);
void sendVfuRequest ();
void startIncomingNotification () override;
void startIncomingNotification (bool notifyRinging = true) override;
int startInvite (const Address *destination, const std::string &subject = "", const Content *content = nullptr) override;
void startRecording ();
void stopRecording ();