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
5dd9025e
Commit
5dd9025e
authored
15 years ago
by
Alexandre Savard
Browse files
Options
Downloads
Patches
Plain Diff
[#2926] Code cleanup
parent
11110dfd
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
+7
-7
7 additions, 7 deletions
sflphone-common/src/sip/sipvoiplink.cpp
with
7 additions
and
7 deletions
sflphone-common/src/sip/sipvoiplink.cpp
+
7
−
7
View file @
5dd9025e
...
@@ -3113,6 +3113,7 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
...
@@ -3113,6 +3113,7 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
}
}
// After 2xx is sent/received.
// After 2xx is sent/received.
else
if
(
inv
->
state
==
PJSIP_INV_STATE_CONNECTING
)
{
else
if
(
inv
->
state
==
PJSIP_INV_STATE_CONNECTING
)
{
status
=
call
->
getLocalSDP
()
->
check_sdp_answer
(
inv
,
rdata
);
status
=
call
->
getLocalSDP
()
->
check_sdp_answer
(
inv
,
rdata
);
...
@@ -3124,6 +3125,7 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
...
@@ -3124,6 +3125,7 @@ void call_on_state_changed (pjsip_inv_session *inv, pjsip_event *e)
}
}
// After we sent or received a ACK - The connection is established
// After we sent or received a ACK - The connection is established
else
if
(
inv
->
state
==
PJSIP_INV_STATE_CONFIRMED
)
{
else
if
(
inv
->
state
==
PJSIP_INV_STATE_CONFIRMED
)
{
...
@@ -3239,7 +3241,7 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
...
@@ -3239,7 +3241,7 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
bool
nego_success
=
false
;
bool
nego_success
=
false
;
if
(
!
crypto_offer
.
empty
())
{
if
(
!
crypto_offer
.
empty
())
{
_debug
(
"Crypto attribute in SDP
:
init S
rtp
session"
);
_debug
(
"
UserAgent:
Crypto attribute in SDP
,
init S
RTP
session"
);
// init local cryptografic capabilities for negotiation
// init local cryptografic capabilities for negotiation
std
::
vector
<
sfl
::
CryptoSuiteDefinition
>
localCapabilities
;
std
::
vector
<
sfl
::
CryptoSuiteDefinition
>
localCapabilities
;
...
@@ -3250,10 +3252,10 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
...
@@ -3250,10 +3252,10 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
sfl
::
SdesNegotiator
sdesnego
(
localCapabilities
,
crypto_offer
);
sfl
::
SdesNegotiator
sdesnego
(
localCapabilities
,
crypto_offer
);
if
(
sdesnego
.
negotiate
())
{
if
(
sdesnego
.
negotiate
())
{
_debug
(
"SDES negociation successfull
\n
"
);
_debug
(
"
UserAgent:
SDES negociation successfull
\n
"
);
nego_success
=
true
;
nego_success
=
true
;
_debug
(
"Set remote cryptographic context
\n
"
);
_debug
(
"
UserAgent:
Set remote cryptographic context
\n
"
);
try
{
try
{
call
->
getAudioRtp
()
->
setRemoteCryptoInfo
(
sdesnego
);
call
->
getAudioRtp
()
->
setRemoteCryptoInfo
(
sdesnego
);
}
}
...
@@ -3272,7 +3274,7 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
...
@@ -3272,7 +3274,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
// @TODO if SRTPONLY, CallFail
// @TODO if SRTPONLY, CallFail
_debug
(
"Did not found any crypto or negociation failed but Sdes enabled"
);
_debug
(
"
UserAgent:
Did not found any crypto or negociation failed but Sdes enabled"
);
call
->
getAudioRtp
()
->
stop
();
call
->
getAudioRtp
()
->
stop
();
call
->
getAudioRtp
()
->
setSrtpEnabled
(
false
);
call
->
getAudioRtp
()
->
setSrtpEnabled
(
false
);
...
@@ -3286,7 +3288,7 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
...
@@ -3286,7 +3288,7 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
// We found a crypto context for this media but Sdes is not
// We found a crypto context for this media but Sdes is not
// enabled for this call, make a try using RTP only...
// enabled for this call, make a try using RTP only...
_debug
(
"
Sdes
not initialized for this call
\n
"
);
_debug
(
"
UserAgent: SDES
not initialized for this call
\n
"
);
}
}
...
@@ -3346,8 +3348,6 @@ void call_on_tsx_changed (pjsip_inv_session *inv, pjsip_transaction *tsx, pjsip_
...
@@ -3346,8 +3348,6 @@ void call_on_tsx_changed (pjsip_inv_session *inv, pjsip_transaction *tsx, pjsip_
}
}
}
}
}
}
_debug
(
"OK: ransaction changed to state"
);
}
}
void
regc_cb
(
struct
pjsip_regc_cbparam
*
param
)
void
regc_cb
(
struct
pjsip_regc_cbparam
*
param
)
...
...
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