Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
69ce4981
Commit
69ce4981
authored
10 years ago
by
Adrien Béraud
Committed by
Guillaume Roguez
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
sipcall: add onPeerRinging
Refs #69086 Change-Id: I5da61d5041cc2aeeb939f39356a835f5c2bb264f
parent
8eb69373
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/sip/sipcall.cpp
+7
-0
7 additions, 0 deletions
src/sip/sipcall.cpp
src/sip/sipcall.h
+6
-0
6 additions, 0 deletions
src/sip/sipcall.h
src/sip/sipvoiplink.cpp
+2
-9
2 additions, 9 deletions
src/sip/sipvoiplink.cpp
with
15 additions
and
9 deletions
src/sip/sipcall.cpp
+
7
−
0
View file @
69ce4981
...
...
@@ -701,6 +701,13 @@ SIPCall::onAnswered()
}
}
void
SIPCall
::
onPeerRinging
()
{
setConnectionState
(
Call
::
RINGING
);
Manager
::
instance
().
peerRingingCall
(
*
this
);
}
void
SIPCall
::
setupLocalSDPFromIce
()
{
...
...
This diff is collapsed.
Click to expand it.
src/sip/sipcall.h
+
6
−
0
View file @
69ce4981
...
...
@@ -171,6 +171,12 @@ class SIPCall : public Call
void
updateSDPFromSTUN
();
/**
* Tell the user that the call is ringing
* @param
*/
void
onPeerRinging
();
/**
* Tell the user that the call was answered
* @param
...
...
This diff is collapsed.
Click to expand it.
src/sip/sipvoiplink.cpp
+
2
−
9
View file @
69ce4981
...
...
@@ -784,13 +784,6 @@ SIPVoIPLink::requestKeyframe(const std::string &callID)
// Private functions
///////////////////////////////////////////////////////////////////////////////
static
void
makeCallRing
(
SIPCall
&
call
)
{
call
.
setConnectionState
(
Call
::
RINGING
);
Manager
::
instance
().
peerRingingCall
(
call
);
}
static
void
invite_session_state_changed_cb
(
pjsip_inv_session
*
inv
,
pjsip_event
*
ev
)
{
...
...
@@ -819,7 +812,7 @@ invite_session_state_changed_cb(pjsip_inv_session *inv, pjsip_event *ev)
if
(
inv
->
state
==
PJSIP_INV_STATE_EARLY
and
ev
and
ev
->
body
.
tsx_state
.
tsx
and
ev
->
body
.
tsx_state
.
tsx
->
role
==
PJSIP_ROLE_UAC
)
{
makeCallRing
(
*
call
);
call
->
onPeerRinging
(
);
}
else
if
(
inv
->
state
==
PJSIP_INV_STATE_CONFIRMED
and
ev
)
{
// After we sent or received a ACK - The connection is established
call
->
onAnswered
();
...
...
@@ -1121,7 +1114,7 @@ transaction_state_changed_cb(pjsip_inv_session * inv, pjsip_transaction *tsx,
return
;
}
else
if
(
msg
.
find
(
"Ringing"
)
!=
std
::
string
::
npos
and
call
)
{
if
(
call
)
makeCallRing
(
*
call
);
call
->
onPeerRinging
(
);
else
RING_WARN
(
"Ringing state on non existing call"
);
sendOK
(
inv
->
dlg
,
r_data
,
tsx
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment