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 filan -s displaying "(stream)" instead of "tcp"

Browse source
This commit is contained in:
Gerhard Rieger 2025-01-29 21:51:58 +01:00
parent 7a90caade5
commit 9968ca4c5b
2 changed files with 5 additions and 2 deletions

3
CHANGES
View file

@ -7,6 +7,9 @@ Security:
Corrections: Corrections:
Fixed display of option phases in help output. Fixed display of option phases in help output.
filan -s displayed "(stream)" instead of "tcp" with addresses
(regression).
Building: Building:
Disabling certain features during configure could break build process. Disabling certain features during configure could break build process.

4
fdname.c
View file

@ -226,7 +226,7 @@ int sockname(int fd, FILE *outfile, char style) {
#define FDNAME_OPTLEN 256 #define FDNAME_OPTLEN 256
#define FDNAME_NAMELEN 256 #define FDNAME_NAMELEN 256
socklen_t optlen; socklen_t optlen;
#if WITH_IP && ( HAVE_GETPROTOBYNUMBER || HAVE_GETPROTOBYNUMBER_R ) #if (WITH_IP4 || WITH_IP6) && ( HAVE_GETPROTOBYNUMBER || HAVE_GETPROTOBYNUMBER_R )
struct protoent protoent, *protoentp; struct protoent protoent, *protoentp;
#endif #endif
#define PROTONAMEMAX 1024 #define PROTONAMEMAX 1024
@ -278,7 +278,7 @@ int sockname(int fd, FILE *outfile, char style) {
Getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &optacceptconn, &optlen); Getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &optacceptconn, &optlen);
#endif #endif
#if WITH_IP && ( defined(SO_PROTOCOL) || defined(SO_PROTOTYPE) ) #if (WITH_IP4 || WITH_IP6) && ( defined(SO_PROTOCOL) || defined(SO_PROTOTYPE) )
#if HAVE_GETPROTOBYNUMBER_R==1 /* Linux */ #if HAVE_GETPROTOBYNUMBER_R==1 /* Linux */
rc = getprotobynumber_r(proto, &protoent, protoname, sizeof(protoname), &protoentp); rc = getprotobynumber_r(proto, &protoent, protoname, sizeof(protoname), &protoentp);
if (protoentp == NULL) { if (protoentp == NULL) {