026a8e7b65
- add message metadata "system" to msg object this permits to store metadata alongside the message - imfile: add support for "filename" metadata this is useful in cases where wildcards are used - imptcp: make stats counter names consistent with what imudp, imtcp uses - added new module "omkafka" to support writing to Apache Kafka - omfwd: add new "udp.senddelay" parameter - mmnormalize enhancements - RainerScript "foreach" iterator and array reading support - now requires liblognorm >= 1.0.2 - add support for systemd >= 209 library names - BSD "ntp" facility (value 12) is now also supported in filter - bugfix: global(localHostName="xxx") was not respected in all modules - bugfix: emit correct error message on config-file-not-found - bugfix: impstats emitted invalid JSON format (if JSON was selected) - bugfix: (small) memory leak in omfile's outchannel code - bugfix: imuxsock did not deactivate some code not supported by platform
32 lines
1.2 KiB
C
32 lines
1.2 KiB
C
$NetBSD: patch-runtime_nsd__ptcp.c,v 1.1 2015/01/16 16:58:28 fhajny Exp $
|
|
|
|
Improve portability, fix build on SunOS and BSD.
|
|
--- runtime/nsd_ptcp.c.orig 2015-01-08 14:58:14.000000000 +0000
|
|
+++ runtime/nsd_ptcp.c
|
|
@@ -656,7 +656,7 @@ EnableKeepAlive(nsd_t *pNsd)
|
|
if(pThis->iKeepAliveProbes > 0) {
|
|
optval = pThis->iKeepAliveProbes;
|
|
optlen = sizeof(optval);
|
|
- ret = setsockopt(pThis->sock, SOL_TCP, TCP_KEEPCNT, &optval, optlen);
|
|
+ ret = setsockopt(pThis->sock, IPPROTO_TCP, TCP_KEEPCNT, &optval, optlen);
|
|
} else {
|
|
ret = 0;
|
|
}
|
|
@@ -671,7 +671,7 @@ EnableKeepAlive(nsd_t *pNsd)
|
|
if(pThis->iKeepAliveTime > 0) {
|
|
optval = pThis->iKeepAliveTime;
|
|
optlen = sizeof(optval);
|
|
- ret = setsockopt(pThis->sock, SOL_TCP, TCP_KEEPIDLE, &optval, optlen);
|
|
+ ret = setsockopt(pThis->sock, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen);
|
|
} else {
|
|
ret = 0;
|
|
}
|
|
@@ -686,7 +686,7 @@ EnableKeepAlive(nsd_t *pNsd)
|
|
if(pThis->iKeepAliveIntvl > 0) {
|
|
optval = pThis->iKeepAliveIntvl;
|
|
optlen = sizeof(optval);
|
|
- ret = setsockopt(pThis->sock, SOL_TCP, TCP_KEEPINTVL, &optval, optlen);
|
|
+ ret = setsockopt(pThis->sock, IPPROTO_TCP, TCP_KEEPINTVL, &optval, optlen);
|
|
} else {
|
|
ret = 0;
|
|
}
|