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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
1acb999b
Commit
1acb999b
authored
14 years ago
by
Alexandre Savard
Browse files
Options
Downloads
Patches
Plain Diff
[#4242] Fix no SDES keys in IP2IP calls
parent
f571af20
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
sflphone-common/src/sip/sipvoiplink.cpp
+9
-4
9 additions, 4 deletions
sflphone-common/src/sip/sipvoiplink.cpp
with
9 additions
and
4 deletions
sflphone-common/src/sip/sipvoiplink.cpp
+
9
−
4
View file @
1acb999b
...
@@ -876,7 +876,7 @@ SIPVoIPLink::answer (const CallID& id)
...
@@ -876,7 +876,7 @@ SIPVoIPLink::answer (const CallID& id)
if
(
status
==
PJ_SUCCESS
)
{
if
(
status
==
PJ_SUCCESS
)
{
_debug
(
"SIPVoIPLink:
:answer:
UserAgent: Negociation success! : call %s "
,
call
->
getCallId
().
c_str
());
_debug
(
"SIPVoIPLink:
UserAgent:
SDP
Negociation success! : call %s "
,
call
->
getCallId
().
c_str
());
// Create and send a 200(OK) response
// Create and send a 200(OK) response
status
=
pjsip_inv_answer
(
inv_session
,
PJSIP_SC_OK
,
NULL
,
NULL
,
&
tdata
);
status
=
pjsip_inv_answer
(
inv_session
,
PJSIP_SC_OK
,
NULL
,
NULL
,
&
tdata
);
PJ_ASSERT_RETURN
(
status
==
PJ_SUCCESS
,
1
);
PJ_ASSERT_RETURN
(
status
==
PJ_SUCCESS
,
1
);
...
@@ -897,7 +897,7 @@ SIPVoIPLink::answer (const CallID& id)
...
@@ -897,7 +897,7 @@ SIPVoIPLink::answer (const CallID& id)
PJ_ASSERT_RETURN
(
status
==
PJ_SUCCESS
,
1
);
PJ_ASSERT_RETURN
(
status
==
PJ_SUCCESS
,
1
);
// Terminate the call
// Terminate the call
_debug
(
"SIPVoIPLink:
:answer:
fail terminate call %s "
,
call
->
getCallId
().
c_str
());
_debug
(
"SIPVoIPLink:
UserAgent: SDP Negociation
fail
ed,
terminate call %s "
,
call
->
getCallId
().
c_str
());
if
(
call
->
getAudioRtp
())
if
(
call
->
getAudioRtp
())
call
->
getAudioRtp
()
->
stop
();
call
->
getAudioRtp
()
->
stop
();
...
@@ -1729,8 +1729,8 @@ bool SIPVoIPLink::new_ip_to_ip_call (const CallID& id, const std::string& to)
...
@@ -1729,8 +1729,8 @@ bool SIPVoIPLink::new_ip_to_ip_call (const CallID& id, const std::string& to)
_debug
(
"UserAgent: TO uri for IP2IP call: %s"
,
toUri
.
c_str
());
_debug
(
"UserAgent: TO uri for IP2IP call: %s"
,
toUri
.
c_str
());
// Building the local SDP offer
// Building the local SDP offer
call
->
getLocalSDP
()
->
set_ip_address
(
addrSdp
);
//
call->getLocalSDP()->set_ip_address (addrSdp);
call
->
getLocalSDP
()
->
create_initial_offer
(
account
->
getActiveCodecs
());
//
call->getLocalSDP()->create_initial_offer (account->getActiveCodecs ());
// Audio Rtp Session must be initialized before creating initial offer in SDP session
// Audio Rtp Session must be initialized before creating initial offer in SDP session
// since SDES require crypto attribute.
// since SDES require crypto attribute.
...
@@ -1741,6 +1741,10 @@ bool SIPVoIPLink::new_ip_to_ip_call (const CallID& id, const std::string& to)
...
@@ -1741,6 +1741,10 @@ bool SIPVoIPLink::new_ip_to_ip_call (const CallID& id, const std::string& to)
_debug
(
"UserAgent: Unable to create RTP Session in new IP2IP call (%s:%d)"
,
__FILE__
,
__LINE__
);
_debug
(
"UserAgent: Unable to create RTP Session in new IP2IP call (%s:%d)"
,
__FILE__
,
__LINE__
);
}
}
// Building the local SDP offer
call
->
getLocalSDP
()
->
set_ip_address
(
addrSdp
);
call
->
getLocalSDP
()
->
create_initial_offer
(
account
->
getActiveCodecs
());
// Init TLS transport if enabled
// Init TLS transport if enabled
if
(
account
->
isTlsEnabled
())
{
if
(
account
->
isTlsEnabled
())
{
...
@@ -3367,6 +3371,7 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
...
@@ -3367,6 +3371,7 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
}
}
}
}
// We did not found any crypto context for this media
// We did not found any crypto context for this media
if
(
!
nego_success
&&
call
->
getAudioRtp
()
->
getAudioRtpType
()
==
sfl
::
Sdes
)
{
if
(
!
nego_success
&&
call
->
getAudioRtp
()
->
getAudioRtpType
()
==
sfl
::
Sdes
)
{
...
...
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