constcast
/
vermont
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #83 from tumi8/fix_remaining_warnings_DTLS_ON 

fixed clang warnings for DTLS ON
master
Oliver Gasser 2017-12-11 13:24:11 +01:00 committed by GitHub
parent 3745000cae 545cdb965b
commit 7d7097568d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/openssl/OpenSSL.cpp
View File

@ -87,7 +87,7 @@ void msg_openssl_return_code(int level, const char *fn, int ret, int error) {
if (error == SSL_ERROR_SYSCALL && ret==-1)
oss << ", errno: " << strerror(errno);
}
msg(level,oss.str().c_str());
msg(level, "%s", oss.str().c_str());
msg_openssl_errors();
}

2
src/modules/ipfix/IpfixReceiverDtlsUdpIpV4.cpp
View File

@ -319,8 +319,10 @@ int IpfixReceiverDtlsUdpIpV4::DtlsConnection::accept() {
if (ret==1) {
state = CONNECTED;
DPRINTF("SSL_accept() succeeded.");
#ifdef DEBUG
const char *str=SSL_CIPHER_get_name(SSL_get_current_cipher(ssl));
DPRINTF("CIPHER is %s",(str != NULL)?str:"(NONE)");
#endif
if (parent.ssl_ctx.get_verify_peers()) {
if (verify_peer()) {
DPRINTF("Peer authentication successful.");

2
src/modules/ipfix/IpfixReceiverDtlsUdpIpV4.hpp
View File

@ -75,7 +75,6 @@ class IpfixReceiverDtlsUdpIpV4 : public IpfixReceiver, Sensor {
const std::set<string> peerFqdns;
friend int verify_peer_cb_udp(void *context, const char *dnsname);
uint32_t statReceivedPackets; /**< number of received packets */
unsigned int moduleId;
class DtlsConnection {
public:
@ -113,6 +112,7 @@ class IpfixReceiverDtlsUdpIpV4 : public IpfixReceiver, Sensor {
}
typedef std::map<IpfixRecord::SourceID,DtlsConnectionPtr,CompareSourceID> connections_map;
connections_map connections;
unsigned int moduleId;
void idle_processing();
#ifdef DEBUG