rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-17 08:10:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Corrections due to code review

Browse Source
This commit is contained in:
Philippe Duveau 2019-02-17 02:46:39 +01:00
parent 2c7e9f44d4
commit 67e9e2be22
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
runtime/nsd_ptcp.c
View File

@ -491,16 +491,16 @@ LstnInit(netstrms_t *pNS, void *pUsr, rsRetVal(*fAddLstn)(void*,netstrm_t*),
}
#ifdef IPV6_V6ONLY
if(r->ai_family == AF_INET6) {
isIPv6 = 1;
int iOn = 1;
if(setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
(char *)&iOn, sizeof (iOn)) < 0) {
close(sock);
sock = -1;
continue;
if(r->ai_family == AF_INET6) {
isIPv6 = 1;
int iOn = 1;
if(setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
(char *)&iOn, sizeof (iOn)) < 0) {
close(sock);
sock = -1;
continue;
}
}
}
#endif
if(setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *) &on, sizeof(on)) < 0 ) {
dbgprintf("error %d setting tcp socket option\n", errno);
@ -528,15 +528,15 @@ LstnInit(netstrms_t *pNS, void *pUsr, rsRetVal(*fAddLstn)(void*,netstrm_t*),
* could flood our log files by sending us tons of ICMP errors.
*/
#if !defined(_AIX) && !defined(BSD)
if(net.should_use_so_bsdcompat()) {
if (setsockopt(sock, SOL_SOCKET, SO_BSDCOMPAT,
(char *) &on, sizeof(on)) < 0) {
LogError(errno, NO_ERRCODE, "TCP setsockopt(BSDCOMPAT)");
close(sock);
sock = -1;
continue;
if(net.should_use_so_bsdcompat()) {
if (setsockopt(sock, SOL_SOCKET, SO_BSDCOMPAT,
(char *) &on, sizeof(on)) < 0) {
LogError(errno, NO_ERRCODE, "TCP setsockopt(BSDCOMPAT)");
close(sock);
sock = -1;
continue;
}
}
}
#endif
if( (bind(sock, r->ai_addr, r->ai_addrlen) < 0)

4
runtime/parser.c
View File

@ -498,11 +498,9 @@ SanitizeMsg(smsg_t *pMsg)
case '\b':
pDst[iDst++] = 'b';
break;
#ifndef __xlc__
case '\e':
case '\x1b': /* equivalent to '\e' which is not accepted by XLC */
pDst[iDst++] = 'e';
break;
#endif
case '\f':
pDst[iDst++] = 'f';
break;