diff options
author | guido <guido@FreeBSD.org> | 2006-08-16 12:23:02 +0000 |
---|---|---|
committer | guido <guido@FreeBSD.org> | 2006-08-16 12:23:02 +0000 |
commit | e49049679f4ee5ce6bb9214122154c529a811b5e (patch) | |
tree | 435ea094ad0e55736442383de5885c9c40c9d2a2 /contrib/ipfilter/tools/ipsyncm.c | |
parent | fcfb8e57499dfda26645e92a1b5ad74c6f35ee92 (diff) | |
download | FreeBSD-src-e49049679f4ee5ce6bb9214122154c529a811b5e.zip FreeBSD-src-e49049679f4ee5ce6bb9214122154c529a811b5e.tar.gz |
Resolve conflicts
MFC after: 1 weeks
Diffstat (limited to 'contrib/ipfilter/tools/ipsyncm.c')
-rw-r--r-- | contrib/ipfilter/tools/ipsyncm.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/contrib/ipfilter/tools/ipsyncm.c b/contrib/ipfilter/tools/ipsyncm.c index 3e0c1e2..c712435 100644 --- a/contrib/ipfilter/tools/ipsyncm.c +++ b/contrib/ipfilter/tools/ipsyncm.c @@ -7,7 +7,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ipsyncm.c,v 1.4.2.2 2005/01/08 14:31:46 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: ipsyncm.c,v 1.4.2.4 2006/03/27 02:09:46 darrenr Exp $"; #endif #include <sys/types.h> #include <sys/time.h> @@ -22,7 +22,7 @@ static const char rcsid[] = "@(#)$Id: ipsyncm.c,v 1.4.2.2 2005/01/08 14:31:46 da #include <stdlib.h> #include <fcntl.h> #include <unistd.h> -#include <strings.h> +#include <string.h> #include <syslog.h> #include <signal.h> @@ -34,6 +34,7 @@ static const char rcsid[] = "@(#)$Id: ipsyncm.c,v 1.4.2.2 2005/01/08 14:31:46 da int main __P((int, char *[])); +void usage __P((const char *)); int terminate = 0; @@ -41,10 +42,12 @@ void usage(const char *progname) { fprintf(stderr, "Usage: %s <destination IP> <destination port>\n", progname); } +#if 0 static void handleterm(int sig) { terminate = sig; } +#endif /* should be large enough to hold header + any datatype */ @@ -117,7 +120,7 @@ char *argv[]; goto tryagain; } - syslog(LOG_INFO, "Established connection to %s", + syslog(LOG_INFO, "Sending data to %s", inet_ntoa(sin.sin_addr)); inbuf = 0; |