Skip to content
GitLab
Explore
Sign in
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
c5d48c27
Commit
c5d48c27
authored
Mar 1, 2010
by
Alexandre Savard
Browse files
Options
Downloads
Patches
Plain Diff
[#2926] Cleanup
parent
25369192
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
sflphone-common/src/sip/sipvoiplink.cpp
+23
-22
23 additions, 22 deletions
sflphone-common/src/sip/sipvoiplink.cpp
with
23 additions
and
22 deletions
sflphone-common/src/sip/sipvoiplink.cpp
+
23
−
22
View file @
c5d48c27
...
@@ -1020,7 +1020,7 @@ int SIPVoIPLink::inv_session_reinvite (SIPCall *call, std::string direction)
...
@@ -1020,7 +1020,7 @@ int SIPVoIPLink::inv_session_reinvite (SIPCall *call, std::string direction)
local_sdp
=
call
->
getLocalSDP
()
->
get_local_sdp_session
();
local_sdp
=
call
->
getLocalSDP
()
->
get_local_sdp_session
();
if
(
local_sdp
==
NULL
)
{
if
(
local_sdp
==
NULL
)
{
_debug
(
"
!
SIP
Failure
: unable to find local
_
sdp"
);
_debug
(
"SIP
: Error
: unable to find local
sdp"
);
return
!
PJ_SUCCESS
;
return
!
PJ_SUCCESS
;
}
}
...
@@ -3142,7 +3142,7 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
...
@@ -3142,7 +3142,7 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
// This callback is called after SDP offer/answer session has completed.
// This callback is called after SDP offer/answer session has completed.
void
call_on_media_update
(
pjsip_inv_session
*
inv
,
pj_status_t
status
)
void
call_on_media_update
(
pjsip_inv_session
*
inv
,
pj_status_t
status
)
{
{
_debug
(
"UserAgent:
c
all
_
on
_
media
_
update"
);
_debug
(
"UserAgent:
C
all
on
media
update"
);
const
pjmedia_sdp_session
*
local_sdp
;
const
pjmedia_sdp_session
*
local_sdp
;
const
pjmedia_sdp_session
*
remote_sdp
;
const
pjmedia_sdp_session
*
remote_sdp
;
...
@@ -3153,19 +3153,19 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
...
@@ -3153,19 +3153,19 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
call
=
reinterpret_cast
<
SIPCall
*>
(
inv
->
mod_data
[
getModId
()
]);
call
=
reinterpret_cast
<
SIPCall
*>
(
inv
->
mod_data
[
getModId
()
]);
if
(
!
call
)
{
if
(
!
call
)
{
_debug
(
"Call declined by peer, SDP negociation stopped"
);
_debug
(
"
UserAgent:
Call declined by peer, SDP negociation stopped"
);
return
;
return
;
}
}
link
=
dynamic_cast
<
SIPVoIPLink
*>
(
Manager
::
instance
().
getAccountLink
(
AccountNULL
));
link
=
dynamic_cast
<
SIPVoIPLink
*>
(
Manager
::
instance
().
getAccountLink
(
AccountNULL
));
if
(
link
==
NULL
)
{
if
(
link
==
NULL
)
{
_
debug
(
"
Failed to get sip link"
);
_
warn
(
"UserAgent: Error:
Failed to get sip link"
);
return
;
return
;
}
}
if
(
status
!=
PJ_SUCCESS
)
{
if
(
status
!=
PJ_SUCCESS
)
{
_
debug
(
"
Error while negotiating the offer"
);
_
warn
(
"UserAgent:
Error
:
while negotiating the offer"
);
link
->
hangup
(
call
->
getCallId
());
link
->
hangup
(
call
->
getCallId
());
Manager
::
instance
().
callFailure
(
call
->
getCallId
());
Manager
::
instance
().
callFailure
(
call
->
getCallId
());
return
;
return
;
...
@@ -3198,11 +3198,11 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
...
@@ -3198,11 +3198,11 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
}
}
// Get the crypto attribute containing srtp's cryptographic context (keys, cipher)
// Get the crypto attribute containing srtp's cryptographic context (keys, cipher)
CryptoOffer
crypto_offer
;
CryptoOffer
crypto_offer
;
call
->
getLocalSDP
()
->
get_remote_sdp_crypto_from_offer
(
remote_sdp
,
crypto_offer
);
call
->
getLocalSDP
()
->
get_remote_sdp_crypto_from_offer
(
remote_sdp
,
crypto_offer
);
bool
nego_success
=
false
;
bool
nego_success
=
false
;
if
(
!
crypto_offer
.
empty
())
{
if
(
!
crypto_offer
.
empty
())
{
...
@@ -3256,6 +3256,7 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
...
@@ -3256,6 +3256,7 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
_debug
(
"Sdes not initialized for this call
\n
"
);
_debug
(
"Sdes not initialized for this call
\n
"
);
}
}
try
{
try
{
call
->
setAudioStart
(
true
);
call
->
setAudioStart
(
true
);
call
->
getAudioRtp
()
->
start
();
call
->
getAudioRtp
()
->
start
();
...
...
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