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
702b8445
Commit
702b8445
authored
19 years ago
by
yanmorin
Browse files
Options
Downloads
Patches
Plain Diff
Call/SipCall pointer to enable jerome to compile
parent
1e1ea796
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
src/config/config.cpp
+1
-1
1 addition, 1 deletion
src/config/config.cpp
src/sipvoiplink.cpp
+7
-6
7 additions, 6 deletions
src/sipvoiplink.cpp
with
8 additions
and
7 deletions
src/config/config.cpp
+
1
−
1
View file @
702b8445
This diff is collapsed.
Click to expand it.
src/sipvoiplink.cpp
+
7
−
6
View file @
702b8445
...
@@ -550,6 +550,8 @@ SipVoIPLink::getEvent (void)
...
@@ -550,6 +550,8 @@ SipVoIPLink::getEvent (void)
eXosip_event_t
*
event
;
eXosip_event_t
*
event
;
short
id
;
short
id
;
char
*
name
;
char
*
name
;
Call
*
call
=
NULL
;
SipCall
*
sipcall
=
NULL
;
event
=
eXosip_event_wait
(
0
,
50
);
event
=
eXosip_event_wait
(
0
,
50
);
eXosip_lock
();
eXosip_lock
();
...
@@ -583,7 +585,7 @@ SipVoIPLink::getEvent (void)
...
@@ -583,7 +585,7 @@ SipVoIPLink::getEvent (void)
// Generate id
// Generate id
id
=
Manager
::
instance
().
generateNewCallId
();
id
=
Manager
::
instance
().
generateNewCallId
();
Manager
::
instance
().
pushBackNewCall
(
id
,
Incoming
);
call
=
Manager
::
instance
().
pushBackNewCall
(
id
,
Incoming
);
_debug
(
"Incoming Call with id %d [cid = %d, did = %d]
\n
"
,
_debug
(
"Incoming Call with id %d [cid = %d, did = %d]
\n
"
,
id
,
event
->
cid
,
event
->
did
);
id
,
event
->
cid
,
event
->
did
);
_debug
(
"Local audio port: %d
\n
"
,
_localPort
);
_debug
(
"Local audio port: %d
\n
"
,
_localPort
);
...
@@ -592,22 +594,22 @@ SipVoIPLink::getEvent (void)
...
@@ -592,22 +594,22 @@ SipVoIPLink::getEvent (void)
osip_from_t
*
from
;
osip_from_t
*
from
;
osip_from_init
(
&
from
);
osip_from_init
(
&
from
);
sipcall
=
getSipCall
(
id
);
if
(
event
->
request
!=
NULL
)
{
if
(
event
->
request
!=
NULL
)
{
char
*
tmp
=
NULL
;
char
*
tmp
=
NULL
;
osip_from_to_str
(
event
->
request
->
from
,
&
tmp
);
osip_from_to_str
(
event
->
request
->
from
,
&
tmp
);
if
(
tmp
!=
NULL
)
{
if
(
tmp
!=
NULL
)
{
snprintf
(
getS
ip
C
all
(
id
)
->
getRemoteUri
(),
256
,
"%s"
,
tmp
);
snprintf
(
s
ip
c
all
->
getRemoteUri
(),
256
,
"%s"
,
tmp
);
osip_free
(
tmp
);
osip_free
(
tmp
);
}
}
}
}
osip_from_parse
(
from
,
getS
ip
C
all
(
id
)
->
getRemoteUri
());
osip_from_parse
(
from
,
s
ip
c
all
->
getRemoteUri
());
name
=
osip_from_get_displayname
(
from
);
name
=
osip_from_get_displayname
(
from
);
//Don't need this display text message now that we send the name
//Don't need this display text message now that we send the name
//inside the Manager to the gui
//inside the Manager to the gui
//Manager::instance().displayTextMessage(id, name);
//Manager::instance().displayTextMessage(id, name);
Call
*
call
=
Manager
::
instance
().
getCall
(
id
);
if
(
call
!=
NULL
)
{
if
(
call
!=
NULL
)
{
call
->
setCallerIdName
(
name
);
call
->
setCallerIdName
(
name
);
osip_uri_t
*
url
=
osip_from_get_url
(
from
);
osip_uri_t
*
url
=
osip_from_get_url
(
from
);
...
@@ -622,7 +624,6 @@ SipVoIPLink::getEvent (void)
...
@@ -622,7 +624,6 @@ SipVoIPLink::getEvent (void)
_debug
(
"From: %s
\n
"
,
name
);
_debug
(
"From: %s
\n
"
,
name
);
osip_from_free
(
from
);
osip_from_free
(
from
);
SipCall
*
sipcall
=
getSipCall
(
id
);
// Associate an audio port with a call
// Associate an audio port with a call
sipcall
->
setLocalAudioPort
(
_localPort
);
sipcall
->
setLocalAudioPort
(
_localPort
);
sipcall
->
setLocalIp
(
getLocalIpAddress
());
sipcall
->
setLocalIp
(
getLocalIpAddress
());
...
@@ -648,7 +649,7 @@ SipVoIPLink::getEvent (void)
...
@@ -648,7 +649,7 @@ SipVoIPLink::getEvent (void)
if
(
id
==
0
)
{
if
(
id
==
0
)
{
id
=
findCallIdInitial
(
event
);
id
=
findCallIdInitial
(
event
);
}
}
SipCall
*
sipcall
=
getSipCall
(
id
);
sipcall
=
getSipCall
(
id
);
if
(
sipcall
)
{
if
(
sipcall
)
{
_debug
(
"Call is answered [id = %d, cid = %d, did = %d], localport=%d
\n
"
,
_debug
(
"Call is answered [id = %d, cid = %d, did = %d], localport=%d
\n
"
,
id
,
event
->
cid
,
event
->
did
,
sipcall
->
getLocalAudioPort
());
id
,
event
->
cid
,
event
->
did
,
sipcall
->
getLocalAudioPort
());
...
...
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