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
130f92bc
Commit
130f92bc
authored
Sep 16, 2011
by
Rafaël Carré
Browse files
fix launchpad build
parent
1c205c4d
Changes
1
Hide whitespace changes
Inline
Side-by-side
daemon/src/sip/sipaccount.cpp
View file @
130f92bc
...
...
@@ -894,21 +894,21 @@ std::map<std::string, std::string> SIPAccount::getTlsSettings() const
}
namespace
{
void
set
(
const
std
::
map
<
std
::
string
,
std
::
string
>
&
details
,
const
char
*
key
,
std
::
string
&
val
)
{
void
set
_opt
(
const
std
::
map
<
std
::
string
,
std
::
string
>
&
details
,
const
char
*
key
,
std
::
string
&
val
)
{
std
::
map
<
std
::
string
,
std
::
string
>::
const_iterator
it
=
details
.
find
(
key
);
if
(
it
!=
details
.
end
())
val
=
it
->
second
;
}
void
set
(
const
std
::
map
<
std
::
string
,
std
::
string
>
&
details
,
const
char
*
key
,
bool
&
val
)
{
void
set
_opt
(
const
std
::
map
<
std
::
string
,
std
::
string
>
&
details
,
const
char
*
key
,
bool
&
val
)
{
std
::
map
<
std
::
string
,
std
::
string
>::
const_iterator
it
=
details
.
find
(
key
);
if
(
it
!=
details
.
end
())
val
=
it
->
second
==
"true"
;
}
void
set
(
const
std
::
map
<
std
::
string
,
std
::
string
>
&
details
,
const
char
*
key
,
pj_uint16_t
&
val
)
{
void
set
_opt
(
const
std
::
map
<
std
::
string
,
std
::
string
>
&
details
,
const
char
*
key
,
pj_uint16_t
&
val
)
{
std
::
map
<
std
::
string
,
std
::
string
>::
const_iterator
it
=
details
.
find
(
key
);
if
(
it
!=
details
.
end
())
...
...
@@ -919,17 +919,17 @@ void set(const std::map<std::string, std::string> &details, const char *key, pj_
void
SIPAccount
::
setTlsSettings
(
const
std
::
map
<
std
::
string
,
std
::
string
>&
details
)
{
assert
(
accountID_
==
IP2IP_PROFILE
);
set
(
details
,
TLS_LISTENER_PORT
,
tlsListenerPort_
);
set
(
details
,
TLS_ENABLE
,
tlsEnable_
);
set
(
details
,
TLS_CA_LIST_FILE
,
tlsCaListFile_
);
set
(
details
,
TLS_CERTIFICATE_FILE
,
tlsCertificateFile_
);
set
(
details
,
TLS_PRIVATE_KEY_FILE
,
tlsPrivateKeyFile_
);
set
(
details
,
TLS_PASSWORD
,
tlsPassword_
);
set
(
details
,
TLS_METHOD
,
tlsMethod_
);
set
(
details
,
TLS_CIPHERS
,
tlsCiphers_
);
set
(
details
,
TLS_SERVER_NAME
,
tlsServerName_
);
set
(
details
,
TLS_VERIFY_CLIENT
,
tlsVerifyClient_
);
set
(
details
,
TLS_REQUIRE_CLIENT_CERTIFICATE
,
tlsRequireClientCertificate_
);
set
(
details
,
TLS_NEGOTIATION_TIMEOUT_SEC
,
tlsNegotiationTimeoutSec_
);
set
(
details
,
TLS_NEGOTIATION_TIMEOUT_MSEC
,
tlsNegotiationTimeoutMsec_
);
set
_opt
(
details
,
TLS_LISTENER_PORT
,
tlsListenerPort_
);
set
_opt
(
details
,
TLS_ENABLE
,
tlsEnable_
);
set
_opt
(
details
,
TLS_CA_LIST_FILE
,
tlsCaListFile_
);
set
_opt
(
details
,
TLS_CERTIFICATE_FILE
,
tlsCertificateFile_
);
set
_opt
(
details
,
TLS_PRIVATE_KEY_FILE
,
tlsPrivateKeyFile_
);
set
_opt
(
details
,
TLS_PASSWORD
,
tlsPassword_
);
set
_opt
(
details
,
TLS_METHOD
,
tlsMethod_
);
set
_opt
(
details
,
TLS_CIPHERS
,
tlsCiphers_
);
set
_opt
(
details
,
TLS_SERVER_NAME
,
tlsServerName_
);
set
_opt
(
details
,
TLS_VERIFY_CLIENT
,
tlsVerifyClient_
);
set
_opt
(
details
,
TLS_REQUIRE_CLIENT_CERTIFICATE
,
tlsRequireClientCertificate_
);
set
_opt
(
details
,
TLS_NEGOTIATION_TIMEOUT_SEC
,
tlsNegotiationTimeoutSec_
);
set
_opt
(
details
,
TLS_NEGOTIATION_TIMEOUT_MSEC
,
tlsNegotiationTimeoutMsec_
);
}
Write
Preview
Supports
Markdown
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