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
0e4f3ef9
Commit
0e4f3ef9
authored
13 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
* #6751: fixed erroneous debug msgs
parent
9b97c304
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
daemon/src/audio/audiortp/AudioRtpSession.cpp
+8
-9
8 additions, 9 deletions
daemon/src/audio/audiortp/AudioRtpSession.cpp
with
8 additions
and
9 deletions
daemon/src/audio/audiortp/AudioRtpSession.cpp
+
8
−
9
View file @
0e4f3ef9
...
...
@@ -119,10 +119,9 @@ void AudioRtpSession::setSessionMedia (AudioCodec *audioCodec)
}
}
if
(
_type
!=
Zrtp
)
{
if
(
_type
!=
Zrtp
)
_ca
->
setRecordingSmplRate
(
getCodecSampleRate
());
}
}
void
AudioRtpSession
::
sendDtmfEvent
()
{
...
...
@@ -192,7 +191,7 @@ void AudioRtpSession::sendMicData()
void
AudioRtpSession
::
setSessionTimeouts
(
void
)
{
_debug
(
"Audio
Zr
tpSession: Set session scheduling timeout (%d) and expireTimeout (%d)"
,
sfl
::
schedulingTimeout
,
sfl
::
expireTimeout
);
_debug
(
"Audio
R
tpSession: Set session scheduling timeout (%d) and expireTimeout (%d)"
,
sfl
::
schedulingTimeout
,
sfl
::
expireTimeout
);
_queue
->
setSchedulingTimeout
(
sfl
::
schedulingTimeout
);
_queue
->
setExpireTimeout
(
sfl
::
expireTimeout
);
...
...
@@ -200,13 +199,13 @@ void AudioRtpSession::setSessionTimeouts (void)
void
AudioRtpSession
::
setDestinationIpAddress
(
void
)
{
_info
(
"Audio
Zr
tpSession: Setting IP address for the RTP session"
);
_info
(
"Audio
R
tpSession: Setting IP address for the RTP session"
);
// Store remote ip in case we would need to forget current destination
_remote_ip
=
ost
::
InetHostAddress
(
_ca
->
getLocalSDP
()
->
getRemoteIP
().
c_str
());
if
(
!
_remote_ip
)
{
_warn
(
"Audio
Zr
tpSession: Target IP address (%s) is not correct!"
,
_warn
(
"Audio
R
tpSession: Target IP address (%s) is not correct!"
,
_ca
->
getLocalSDP
()
->
getRemoteIP
().
data
());
return
;
}
...
...
@@ -214,24 +213,24 @@ void AudioRtpSession::setDestinationIpAddress (void)
// Store remote port in case we would need to forget current destination
_remote_port
=
(
unsigned
short
)
_ca
->
getLocalSDP
()
->
getRemoteAudioPort
();
_info
(
"Audio
Zr
tpSession: New remote address for session: %s:%d"
,
_info
(
"Audio
R
tpSession: New remote address for session: %s:%d"
,
_ca
->
getLocalSDP
()
->
getRemoteIP
().
data
(),
_remote_port
);
if
(
!
_queue
->
addDestination
(
_remote_ip
,
_remote_port
))
{
_warn
(
"Audio
Zr
tpSession: Can't add new destination to session!"
);
_warn
(
"Audio
R
tpSession: Can't add new destination to session!"
);
return
;
}
}
void
AudioRtpSession
::
updateDestinationIpAddress
(
void
)
{
_debug
(
"Audio
Zr
tpSession: Update destination ip address"
);
_debug
(
"Audio
R
tpSession: Update destination ip address"
);
// Destination address are stored in a list in ccrtp
// This method remove the current destination entry
if
(
!
_queue
->
forgetDestination
(
_remote_ip
,
_remote_port
,
_remote_port
+
1
))
_warn
(
"Audio
Zr
tpSession: Could not remove previous destination"
);
_warn
(
"Audio
R
tpSession: Could not remove previous destination"
);
// new destination is stored in call
// we just need to recall this method
...
...
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