Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
043f0ed1
Commit
043f0ed1
authored
Sep 12, 2013
by
Alexandre Lision
Browse files
sip: removed android logging
parent
55509612
Changes
1
Hide whitespace changes
Inline
Side-by-side
daemon/src/sip/sipvoiplink.cpp
View file @
043f0ed1
...
@@ -124,11 +124,6 @@ void registration_cb(pjsip_regc_cbparam *param);
...
@@ -124,11 +124,6 @@ void registration_cb(pjsip_regc_cbparam *param);
pj_bool_t
transaction_request_cb
(
pjsip_rx_data
*
rdata
);
pj_bool_t
transaction_request_cb
(
pjsip_rx_data
*
rdata
);
pj_bool_t
transaction_response_cb
(
pjsip_rx_data
*
rdata
)
;
pj_bool_t
transaction_response_cb
(
pjsip_rx_data
*
rdata
)
;
#ifdef __ANDROID__
void
showLog
(
int
level
,
const
char
*
data
,
int
len
);
void
showMsg
(
const
char
*
format
,
...);
#endif
void
transfer_client_cb
(
pjsip_evsub
*
sub
,
pjsip_event
*
event
);
void
transfer_client_cb
(
pjsip_evsub
*
sub
,
pjsip_event
*
event
);
/**
/**
...
@@ -198,26 +193,6 @@ pj_bool_t transaction_response_cb(pjsip_rx_data *rdata)
...
@@ -198,26 +193,6 @@ pj_bool_t transaction_response_cb(pjsip_rx_data *rdata)
return
PJ_FALSE
;
return
PJ_FALSE
;
}
}
#ifdef __ANDROID__
void
showMsg
(
const
char
*
format
,
...)
{
va_list
arg
;
va_start
(
arg
,
format
);
__android_log_vprint
(
ANDROID_LOG_INFO
,
"apjsua"
,
format
,
arg
);
//vsnprintf(app_var.out_buf, sizeof(app_var.out_buf), format, arg);
va_end
(
arg
);
/* pj_sem_post(app_var.output_sem);
pj_sem_wait(app_var.out_print_sem); */
}
void
showLog
(
int
level
,
const
char
*
data
,
int
len
)
{
showMsg
(
"%s"
,
data
);
}
#endif
void
updateSDPFromSTUN
(
SIPCall
&
call
,
SIPAccount
&
account
,
const
SipTransport
&
transport
)
void
updateSDPFromSTUN
(
SIPCall
&
call
,
SIPAccount
&
account
,
const
SipTransport
&
transport
)
{
{
std
::
vector
<
long
>
socketDescriptors
(
call
.
getAudioRtp
().
getSocketDescriptors
());
std
::
vector
<
long
>
socketDescriptors
(
call
.
getAudioRtp
().
getSocketDescriptors
());
...
@@ -524,9 +499,6 @@ SIPVoIPLink::SIPVoIPLink() : sipTransport(endpt_, cp_, pool_), sipAccountMap_(),
...
@@ -524,9 +499,6 @@ SIPVoIPLink::SIPVoIPLink() : sipTransport(endpt_, cp_, pool_), sipAccountMap_(),
TRY
(
pjlib_util_init
());
TRY
(
pjlib_util_init
());
#ifdef __ANDROID__
setSipLogger
();
#endif
setSipLogLevel
();
setSipLogLevel
();
TRY
(
pjnath_init
());
TRY
(
pjnath_init
());
...
@@ -686,23 +658,10 @@ void SIPVoIPLink::setSipLogLevel()
...
@@ -686,23 +658,10 @@ void SIPVoIPLink::setSipLogLevel()
level
=
level
>
6
?
6
:
level
;
level
=
level
>
6
?
6
:
level
;
level
=
level
<
0
?
0
:
level
;
level
=
level
<
0
?
0
:
level
;
}
}
#ifdef __ANDROID__
level
=
6
;
#endif
// From 0 (min) to 6 (max)
// From 0 (min) to 6 (max)
pj_log_set_level
(
level
);
pj_log_set_level
(
level
);
}
}
#ifdef __ANDROID__
void
SIPVoIPLink
::
setSipLogger
()
{
static
pj_log_func
*
currentFunc
=
(
pj_log_func
*
)
pj_log_get_log_func
();
pj_log_set_log_func
(
&
showLog
);
}
#endif
// Called from EventThread::run (not main thread)
// Called from EventThread::run (not main thread)
bool
SIPVoIPLink
::
getEvent
()
bool
SIPVoIPLink
::
getEvent
()
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment