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
a63dc1d8
Commit
a63dc1d8
authored
10 years ago
by
Emmanuel Lepage Vallee
Committed by
Adrien Béraud
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
TLS: Display error information in logs
Refs #55823 Change-Id: I7566c7bdad235637e62dc4a5ba1b8f5006c63f5f
parent
69b3ed02
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
daemon/src/sip/siptransport.cpp
+13
-4
13 additions, 4 deletions
daemon/src/sip/siptransport.cpp
daemon/src/sip/siptransport.h
+1
-1
1 addition, 1 deletion
daemon/src/sip/siptransport.h
with
14 additions
and
5 deletions
daemon/src/sip/siptransport.cpp
+
13
−
4
View file @
a63dc1d8
...
@@ -85,14 +85,14 @@ transportMapKey(const std::string &interface, int port, pjsip_transport_type_e t
...
@@ -85,14 +85,14 @@ transportMapKey(const std::string &interface, int port, pjsip_transport_type_e t
/** Static tranport state change callback */
/** Static tranport state change callback */
void
void
SipTransport
::
tp_state_callback
(
pjsip_transport
*
tp
,
pjsip_transport_state
state
,
const
pjsip_transport_state_info
*
/*
info
*/
)
SipTransport
::
tp_state_callback
(
pjsip_transport
*
tp
,
pjsip_transport_state
state
,
const
pjsip_transport_state_info
*
info
)
{
{
SipTransport
&
this_
=
*
getSIPVoIPLink
()
->
sipTransport
;
SipTransport
&
this_
=
*
getSIPVoIPLink
()
->
sipTransport
;
this_
.
transportStateChanged
(
tp
,
state
);
this_
.
transportStateChanged
(
tp
,
state
,
info
);
}
}
void
void
SipTransport
::
transportStateChanged
(
pjsip_transport
*
tp
,
pjsip_transport_state
state
)
SipTransport
::
transportStateChanged
(
pjsip_transport
*
tp
,
pjsip_transport_state
state
,
const
pjsip_transport_state_info
*
info
)
{
{
std
::
lock_guard
<
std
::
mutex
>
lock
(
transportMapMutex_
);
std
::
lock_guard
<
std
::
mutex
>
lock
(
transportMapMutex_
);
auto
transport_key
=
map_utils
::
findByValue
(
transportMap_
,
tp
);
auto
transport_key
=
map_utils
::
findByValue
(
transportMap_
,
tp
);
...
@@ -103,7 +103,16 @@ SipTransport::transportStateChanged(pjsip_transport* tp, pjsip_transport_state s
...
@@ -103,7 +103,16 @@ SipTransport::transportStateChanged(pjsip_transport* tp, pjsip_transport_state s
#else
#else
if
(
tp
->
is_shutdown
||
tp
->
is_destroying
)
{
if
(
tp
->
is_shutdown
||
tp
->
is_destroying
)
{
#endif
#endif
WARN
(
"Transport was destroyed: {%s}"
,
tp
->
info
);
char
err_msg
[
128
];
err_msg
[
0
]
=
'\0'
;
pj_str_t
description
;
if
(
info
)
{
description
=
pjsip_strerror
(
info
->
status
,
err_msg
,
128
);
}
WARN
(
"Transport was destroyed: {%s} %.*s"
,
tp
->
info
,
info
&&
description
.
slen
>
0
?
description
.
slen
:
0
,
err_msg
);
transportMap_
.
erase
(
transport_key
++
);
transportMap_
.
erase
(
transport_key
++
);
transportDestroyedCv_
.
notify_all
();
transportDestroyedCv_
.
notify_all
();
}
}
...
...
This diff is collapsed.
Click to expand it.
daemon/src/sip/siptransport.h
+
1
−
1
View file @
a63dc1d8
...
@@ -152,7 +152,7 @@ class SipTransport {
...
@@ -152,7 +152,7 @@ class SipTransport {
static
void
tp_state_callback
(
pjsip_transport
*
,
pjsip_transport_state
,
const
pjsip_transport_state_info
*
);
static
void
tp_state_callback
(
pjsip_transport
*
,
pjsip_transport_state
,
const
pjsip_transport_state_info
*
);
void
transportStateChanged
(
pjsip_transport
*
tp
,
pjsip_transport_state
state
);
void
transportStateChanged
(
pjsip_transport
*
tp
,
pjsip_transport_state
state
,
const
pjsip_transport_state_info
*
info
);
/**
/**
* UDP Transports are stored in this map in order to retreive them in case
* UDP Transports are stored in this map in order to retreive them in case
...
...
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