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
121f15db
Commit
121f15db
authored
15 years ago
by
Alexandre Savard
Browse files
Options
Downloads
Patches
Plain Diff
[#1722] Chage AudioRtpInit from answer to mod_on_rx_request
parent
238fdb78
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
sflphone-common/src/audio/audiortp/AudioRtpFactory.h
+9
-0
9 additions, 0 deletions
sflphone-common/src/audio/audiortp/AudioRtpFactory.h
sflphone-common/src/sip/sipvoiplink.cpp
+8
-0
8 additions, 0 deletions
sflphone-common/src/sip/sipvoiplink.cpp
with
17 additions
and
0 deletions
sflphone-common/src/audio/audiortp/AudioRtpFactory.h
+
9
−
0
View file @
121f15db
...
@@ -90,6 +90,15 @@ namespace sfl {
...
@@ -90,6 +90,15 @@ namespace sfl {
*/
*/
inline
void
*
getAudioRtpSession
(
void
)
{
return
_rtpSession
;
}
inline
void
*
getAudioRtpSession
(
void
)
{
return
_rtpSession
;
}
/**
* @param None
* @return The internal audio rtp session type
* Symmetric = 0
* Zrtp = 1
* Sdes = 2
*/
inline
RtpMethod
getAudioRtpType
(
void
)
{
return
_rtpSessionType
;
}
/**
/**
* Get the current AudioZrtpSession. Throws an AudioRtpFactoryException
* Get the current AudioZrtpSession. Throws an AudioRtpFactoryException
* if the current rtp thread is null, or if it's not of the correct type.
* if the current rtp thread is null, or if it's not of the correct type.
...
...
This diff is collapsed.
Click to expand it.
sflphone-common/src/sip/sipvoiplink.cpp
+
8
−
0
View file @
121f15db
...
@@ -809,11 +809,13 @@ SIPVoIPLink::answer (const CallID& id)
...
@@ -809,11 +809,13 @@ SIPVoIPLink::answer (const CallID& id)
local_sdp
=
call
->
getLocalSDP
();
local_sdp
=
call
->
getLocalSDP
();
/*
try {
try {
call->getAudioRtp()->initAudioRtpSession (call);
call->getAudioRtp()->initAudioRtpSession (call);
} catch (...) {
} catch (...) {
_debug ("Failed to create rtp thread from answer");
_debug ("Failed to create rtp thread from answer");
}
}
*/
inv_session
=
call
->
getInvSession
();
inv_session
=
call
->
getInvSession
();
...
@@ -3628,6 +3630,12 @@ mod_on_rx_request (pjsip_rx_data *rdata)
...
@@ -3628,6 +3630,12 @@ mod_on_rx_request (pjsip_rx_data *rdata)
// We retrieve the remote sdp offer in the rdata struct to begin the negociation
// We retrieve the remote sdp offer in the rdata struct to begin the negociation
call
->
getLocalSDP
()
->
set_ip_address
(
addrSdp
);
call
->
getLocalSDP
()
->
set_ip_address
(
addrSdp
);
try
{
call
->
getAudioRtp
()
->
initAudioRtpSession
(
call
);
}
catch
(...)
{
_debug
(
"Failed to create rtp thread from answer"
);
}
get_remote_sdp_from_offer
(
rdata
,
&
r_sdp
);
get_remote_sdp_from_offer
(
rdata
,
&
r_sdp
);
status
=
call
->
getLocalSDP
()
->
receiving_initial_offer
(
r_sdp
);
status
=
call
->
getLocalSDP
()
->
receiving_initial_offer
(
r_sdp
);
...
...
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