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
10363d5b
Commit
10363d5b
authored
16 years ago
by
Emmanuel Milou
Browse files
Options
Downloads
Plain Diff
Merge branch 'yun-pjsip' of
ssh://milou@192.168.1.203/home/yun/release/sflphone
into sip_dev
parents
a5c358ef
571d8e14
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/sipvoiplink.cpp
+1
-0
1 addition, 0 deletions
src/sipvoiplink.cpp
src/useragent.cpp
+5
-0
5 additions, 0 deletions
src/useragent.cpp
src/useragent.h
+3
-0
3 additions, 0 deletions
src/useragent.h
with
9 additions
and
0 deletions
src/sipvoiplink.cpp
+
1
−
0
View file @
10363d5b
...
...
@@ -363,6 +363,7 @@ SIPVoIPLink::carryingDTMFdigits(const CallID& id, char code UNUSED)
SIPCall
*
call
=
getSIPCall
(
id
);
if
(
call
==
0
)
{
_debug
(
"Call doesn't exist
\n
"
);
return
false
;
}
Manager
::
instance
().
getUserAgent
()
->
carryingDTMFdigits
(
call
);
//int duration = Manager::instance().getConfigInt(SIGNALISATION, PULSE_LENGTH);
// TODO Add DTMF with pjsip - INFO method
...
...
This diff is collapsed.
Click to expand it.
src/useragent.cpp
+
5
−
0
View file @
10363d5b
...
...
@@ -1188,6 +1188,11 @@ bool UserAgent::refuse(SIPCall* call)
return
true
;
}
bool
UserAgent
::
carryingDTMFdigits
(
SIPCall
*
call
)
{
return
true
;
}
bool
UserAgent
::
transfer
(
SIPCall
*
call
,
const
std
::
string
&
to
)
{
pjsip_evsub
*
sub
;
...
...
This diff is collapsed.
Click to expand it.
src/useragent.h
+
3
−
0
View file @
10363d5b
...
...
@@ -134,6 +134,9 @@ public:
void
onCallTransfered
(
pjsip_inv_session
*
inv
,
pjsip_rx_data
*
rdata
);
bool
makeOutgoingCall
(
const
std
::
string
&
to
,
SIPCall
*
call
,
const
AccountID
&
id
);
bool
carryingDTMFdigits
(
SIPCall
*
call
);
pj_pool_t
*
getAppPool
()
{
return
_pool
;}
static
pj_bool_t
mod_on_rx_request
(
pjsip_rx_data
*
rdata
);
static
pj_bool_t
mod_on_rx_response
(
pjsip_rx_data
*
rdata
UNUSED
)
{
return
PJ_SUCCESS
;}
...
...
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