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
8a9afc7a
Commit
8a9afc7a
authored
11 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
sip/ip: remove verbose logging
parent
6fd38dfb
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
daemon/src/ip_utils.cpp
+0
-1
0 additions, 1 deletion
daemon/src/ip_utils.cpp
daemon/src/sip/sipvoiplink.cpp
+3
-6
3 additions, 6 deletions
daemon/src/sip/sipvoiplink.cpp
with
3 additions
and
7 deletions
daemon/src/ip_utils.cpp
+
0
−
1
View file @
8a9afc7a
...
@@ -143,7 +143,6 @@ ip_utils::getLocalAddr(pj_uint16_t family)
...
@@ -143,7 +143,6 @@ ip_utils::getLocalAddr(pj_uint16_t family)
pj_sockaddr
pj_sockaddr
ip_utils
::
getInterfaceAddr
(
const
std
::
string
&
interface
,
pj_uint16_t
family
)
ip_utils
::
getInterfaceAddr
(
const
std
::
string
&
interface
,
pj_uint16_t
family
)
{
{
ERROR
(
"getInterfaceAddr: %s %d"
,
interface
.
c_str
(),
family
);
if
(
interface
==
DEFAULT_INTERFACE
)
if
(
interface
==
DEFAULT_INTERFACE
)
return
getLocalAddr
(
family
);
return
getLocalAddr
(
family
);
...
...
This diff is collapsed.
Click to expand it.
daemon/src/sip/sipvoiplink.cpp
+
3
−
6
View file @
8a9afc7a
...
@@ -489,7 +489,6 @@ pj_bool_t transaction_request_cb(pjsip_rx_data *rdata)
...
@@ -489,7 +489,6 @@ pj_bool_t transaction_request_cb(pjsip_rx_data *rdata)
}
}
// contactStr must stay in scope as long as tdata
// contactStr must stay in scope as long as tdata
ERROR
(
"transaction_request_cb getContactHeader"
);
const
pj_str_t
contactStr
(
account
->
getContactHeader
());
const
pj_str_t
contactStr
(
account
->
getContactHeader
());
sip_utils
::
addContactHeader
(
&
contactStr
,
tdata
);
sip_utils
::
addContactHeader
(
&
contactStr
,
tdata
);
...
@@ -1061,7 +1060,6 @@ SIPVoIPLink::answer(Call *call)
...
@@ -1061,7 +1060,6 @@ SIPVoIPLink::answer(Call *call)
updateSDPFromSTUN
(
*
sipCall
,
*
account
,
*
SIPVoIPLink
::
instance
().
sipTransport
);
updateSDPFromSTUN
(
*
sipCall
,
*
account
,
*
SIPVoIPLink
::
instance
().
sipTransport
);
}
}
ERROR
(
"answer getContactHeader"
);
pj_str_t
contact
(
account
->
getContactHeader
());
pj_str_t
contact
(
account
->
getContactHeader
());
sipCall
->
setContactHeader
(
&
contact
);
sipCall
->
setContactHeader
(
&
contact
);
sipCall
->
answer
();
sipCall
->
answer
();
...
@@ -1125,7 +1123,6 @@ SIPVoIPLink::hangup(const std::string& id, int reason)
...
@@ -1125,7 +1123,6 @@ SIPVoIPLink::hangup(const std::string& id, int reason)
return
;
return
;
// contactStr must stay in scope as long as tdata
// contactStr must stay in scope as long as tdata
ERROR
(
"hangup getContactHeader"
);
const
pj_str_t
contactStr
(
account
->
getContactHeader
());
const
pj_str_t
contactStr
(
account
->
getContactHeader
());
sip_utils
::
addContactHeader
(
&
contactStr
,
tdata
);
sip_utils
::
addContactHeader
(
&
contactStr
,
tdata
);
...
@@ -1655,7 +1652,9 @@ SIPVoIPLink::SIPStartCall(SIPCall *call)
...
@@ -1655,7 +1652,9 @@ SIPVoIPLink::SIPStartCall(SIPCall *call)
pj_str_t
pjContact
(
account
->
getContactHeader
());
pj_str_t
pjContact
(
account
->
getContactHeader
());
ERROR
(
"SIPStartCall getContactHeader %s / %s -> %s"
,
std
::
string
(
pj_strbuf
(
&
pjContact
),
pj_strlen
(
&
pjContact
)).
c_str
(),
from
.
c_str
(),
toUri
.
c_str
());
const
std
::
string
debugContactHeader
(
pj_strbuf
(
&
pjContact
),
pj_strlen
(
&
pjContact
));
DEBUG
(
"contact header: %s / %s -> %s"
,
debugContactHeader
.
c_str
(),
from
.
c_str
(),
toUri
.
c_str
());
pjsip_dialog
*
dialog
=
NULL
;
pjsip_dialog
*
dialog
=
NULL
;
...
@@ -2474,8 +2473,6 @@ void setCallMediaLocal(SIPCall* call, const pj_sockaddr& localIP)
...
@@ -2474,8 +2473,6 @@ void setCallMediaLocal(SIPCall* call, const pj_sockaddr& localIP)
if
(
!
account
)
if
(
!
account
)
return
;
return
;
ERROR
(
"setCallMediaLocal %s"
,
ip_utils
::
addrToStr
(
localIP
).
c_str
());
// Reference: http://www.cs.columbia.edu/~hgs/rtp/faq.html#ports
// Reference: http://www.cs.columbia.edu/~hgs/rtp/faq.html#ports
// We only want to set ports to new values if they haven't been set
// We only want to set ports to new values if they haven't been set
if
(
call
->
getLocalAudioPort
()
==
0
)
{
if
(
call
->
getLocalAudioPort
()
==
0
)
{
...
...
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