bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2025-06-05 18:06:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed preprocessor directives in macro invocation

Browse source
This commit is contained in:
Gerhard 2025-02-13 14:29:15 +01:00
parent c8aec28b82
commit d9d06eb587
2 changed files with 8 additions and 5 deletions

3
CHANGES
View file

@ -84,6 +84,9 @@ Corrections:
When IP4 was completed deconfigured, UDP6-RECVFROM with range option When IP4 was completed deconfigured, UDP6-RECVFROM with range option
failed. failed.
Fixed preprocessor directives in macro invocation.
Thanks to Mario de Weerd for reporting this issue.
Features: Features:
POSIXMQ-RECV now takes option o-nonblock; this, in combination with -T, POSIXMQ-RECV now takes option o-nonblock; this, in combination with -T,
makes it possible to terminate Socat in case the queue is empty. makes it possible to terminate Socat in case the queue is empty.

10
filan.c
View file

@ -393,7 +393,7 @@ int filan_stat(
break; break;
#ifdef S_IFLNK #ifdef S_IFLNK
case (S_IFLNK): /* 10, symbolic link */ case (S_IFLNK): /* 10, symbolic link */
/* we wait for freadlink() sytem call */ /* we wait for freadlink() system call */
break; break;
#endif /* S_IFLNK */ #endif /* S_IFLNK */
break; break;
@ -804,13 +804,13 @@ int ipan(int fd, FILE *outfile) {
} }
/* want to pass the fd to the next layer protocol. */ /* want to pass the fd to the next layer protocol. */
#if defined(SO_PROTOCOL) || defined(SO_PROTOTYPE) #if defined(SO_PROTOCOL) || defined(SO_PROTOTYPE)
if (Getsockopt(fd, SOL_SOCKET, if (
#ifdef SO_PROTOCOL #ifdef SO_PROTOCOL
SO_PROTOCOL, Getsockopt(fd, SOL_SOCKET, SO_PROTOCOL, &optproto, &optlen)
#elif defined(SO_PROTOTYPE) #elif defined(SO_PROTOTYPE)
SO_PROTOTYPE, Getsockopt(fd, SOL_SOCKET, SO_PROTOTYPE, &optproto, &optlen)
#endif #endif
&optproto, &optlen) >= 0) { >= 0) {
switch (optproto) { switch (optproto) {
#if WITH_TCP #if WITH_TCP
case IPPROTO_TCP: tcpan(fd, outfile); break; case IPPROTO_TCP: tcpan(fd, outfile); break;