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

do not send Templates multiple times to UDP collectors at startup 

git-svn-id: file:///Users/braun/svn/vermont/branches/vermont/dtls-merge@2542 aef3b71b-58ee-0310-9ba9-8811b9f0742f
master
muenz 2010-09-15 12:36:46 +00:00
parent 13b3d2c382
commit 369abce3a7
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/sctp_exporter.xml
View File

@ -121,7 +121,6 @@
<ipfixExporter id="8">
<collector>
<ipAddressType>4</ipAddressType>
<ipAddress>127.0.0.1</ipAddress>
<transportProtocol>SCTP</transportProtocol>
<port>4433</port>

2
src/common/ipfixlolib/ipfixlolib.c
View File

@ -309,7 +309,7 @@ static int dtls_connect(ipfix_receiving_collector *col, ipfix_dtls_connection *c
error = SSL_get_error(con->ssl,ret);
if (error == SSL_ERROR_NONE) {
msg_openssl_return_code(MSG_DEBUG,"SSL_connect()",ret,error);
msg(MSG_INFO, "Successfully (re)connected to SCTP-over-DTLS collector.");
msg(MSG_INFO, "Successfully (re)connected to %s-over-DTLS collector.", col->protocol == DTLS_OVER_SCTP ? "SCTP" : "UDP");
msg(MSG_INFO,"TLS Cipher: %s",SSL_get_cipher_name(con->ssl));
DPRINTF("DTLS handshake succeeded. We are now connected.");
if (col->peer_fqdn) { /* We need to verify the identity of our peer */

6
src/modules/ipfix/IpfixSender.cpp
View File

@ -406,7 +406,11 @@ void IpfixSender::onTemplate(IpfixTemplateRecord* record)
ipfixMessageLock.unlock();
// we want the templates to be sent to the collector
sendRecords(Always);
// Gerhard (09/2010):
// - commented out because this would cause multiple sendings of Templates at startup in the case of UDP
// - anyway, Templates will allways be send in front of with Data Records if necessary
// - an advantage of calling sendRecords() here would be that we can detect if the UDP collector is offline
//sendRecords(Always);
record->removeReference();
}