bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2024-12-22 23:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Corrected some configure --disable

Browse source
This commit is contained in:
Gerhard Rieger 2015-01-12 20:24:29 +01:00
parent 59a11f2efb
commit cf3f6403bc
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -37,6 +37,10 @@ corrections:
to a random port instead of terminating with error. to a random port instead of terminating with error.
Test: TCP4_NOPORT Test: TCP4_NOPORT
configure with some combination of disable options produced config
files that failed to compile due to missing IPPROTO_TCP.
Thanks to Thierry Fournier for report and patch.
porting: porting:
Socat included <sys/poll.h> instead of POSIX <poll.h> Socat included <sys/poll.h> instead of POSIX <poll.h>
Thanks to John Spencer for reporting this issue. Thanks to John Spencer for reporting this issue.

4
compat.h
View file

@ -76,7 +76,9 @@ typedef int sig_atomic_t;
/* SOL_TCP: AIX 4.3.3 */ /* SOL_TCP: AIX 4.3.3 */
#ifndef SOL_TCP #ifndef SOL_TCP
# define SOL_TCP IPPROTO_TCP # ifdef IPPROTO_TCP
# define SOL_TCP IPPROTO_TCP
# endif
#endif #endif
/* POSIX.1 doesn't seem to know sockets */ /* POSIX.1 doesn't seem to know sockets */

4
hostan.c
View file

@ -38,14 +38,14 @@ int hostan(FILE *outfile) {
fprintf(outfile, "((struct diag_dgram *)0)->now-((struct diag_dgram *)0) = %u\n", (unsigned int)((char *)(&((struct diag_dgram *)0)->now)-(char *)((struct diag_dgram *)0))); fprintf(outfile, "((struct diag_dgram *)0)->now-((struct diag_dgram *)0) = %u\n", (unsigned int)((char *)(&((struct diag_dgram *)0)->now)-(char *)((struct diag_dgram *)0)));
fprintf(outfile, "((struct diag_dgram *)0)->exitcode-((struct diag_dgram *)0) = %u\n", (unsigned int)((char *)(&((struct diag_dgram *)0)->exitcode)-(char *)((struct diag_dgram *)0))); fprintf(outfile, "((struct diag_dgram *)0)->exitcode-((struct diag_dgram *)0) = %u\n", (unsigned int)((char *)(&((struct diag_dgram *)0)->exitcode)-(char *)((struct diag_dgram *)0)));
fprintf(outfile, "((struct diag_dgram *)0)->text-((struct diag_dgram *)0) = %u\n", (unsigned int)((((struct diag_dgram *)0)->text)-(char *)((struct diag_dgram *)0))); fprintf(outfile, "((struct diag_dgram *)0)->text-((struct diag_dgram *)0) = %u\n", (unsigned int)((((struct diag_dgram *)0)->text)-(char *)((struct diag_dgram *)0)));
#if _WITH_SOCKET #if _WITH_SOCKET && (_WITH_IP4 || _WITH_IP6)
fprintf(outfile, "\nIP INTERFACES\n"); fprintf(outfile, "\nIP INTERFACES\n");
iffan(outfile); iffan(outfile);
#endif #endif
return 0; return 0;
} }
#if _WITH_SOCKET #if _WITH_SOCKET && (_WITH_IP4 || _WITH_IP6)
static int iffan(FILE *outfile) { static int iffan(FILE *outfile) {
/* Linux: man 7 netdevice */ /* Linux: man 7 netdevice */
/* FreeBSD, NetBSD: man 4 networking */ /* FreeBSD, NetBSD: man 4 networking */

6
xio.h
View file

@ -1,5 +1,5 @@
/* source: xio.h */ /* source: xio.h */
/* Copyright Gerhard Rieger 2001-2011 */ /* Copyright Gerhard Rieger */
/* Published under the GNU General Public License V.2, see file COPYING */ /* Published under the GNU General Public License V.2, see file COPYING */
#ifndef __xio_h_included #ifndef __xio_h_included
@ -200,11 +200,13 @@ typedef struct single {
char *hosts_deny_table; char *hosts_deny_table;
#endif #endif
} ip; } ip;
#endif /* _WITH_IP4 || _WITH_IP6 */
#if WITH_UNIX
struct { struct {
bool tight; bool tight;
} un; } un;
#endif /* _WITH_IP4 || _WITH_IP6 */
} socket; } socket;
#endif /* WITH_UNIX */
#endif /* _WITH_SOCKET */ #endif /* _WITH_SOCKET */
struct { struct {
pid_t pid; /* child PID, with EXEC: */ pid_t pid; /* child PID, with EXEC: */