diff options
| author | darrenr <darrenr@FreeBSD.org> | 2001-02-04 14:26:56 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2001-02-04 14:26:56 +0000 |
| commit | 48b4ca8e6a57c62a30178ad743504003bfd60b92 (patch) | |
| tree | b47e8b2fc77a6ae3122c2f25213a7861e67eee2f /contrib/ipfilter/ipsend | |
| parent | 53b25e2c4c7f67b0a0f4809050fb478bd1ff2d88 (diff) | |
| download | FreeBSD-src-48b4ca8e6a57c62a30178ad743504003bfd60b92.zip FreeBSD-src-48b4ca8e6a57c62a30178ad743504003bfd60b92.tar.gz | |
fix conflicts
Diffstat (limited to 'contrib/ipfilter/ipsend')
| -rw-r--r-- | contrib/ipfilter/ipsend/ipsend.c | 6 | ||||
| -rw-r--r-- | contrib/ipfilter/ipsend/sock.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/contrib/ipfilter/ipsend/ipsend.c b/contrib/ipfilter/ipsend/ipsend.c index f0d1a3f..b047dd0 100644 --- a/contrib/ipfilter/ipsend/ipsend.c +++ b/contrib/ipfilter/ipsend/ipsend.c @@ -348,6 +348,12 @@ char **argv; printf("Options: %d\n", olen); ti = (struct tcpiphdr *)malloc(olen + ip->ip_len); + if(!ti) + { + fprintf(stderr,"malloc failed\n"); + exit(2); + } + bcopy((char *)ip, (char *)ti, sizeof(*ip)); ip = (ip_t *)ti; ip->ip_hl = (olen >> 2); diff --git a/contrib/ipfilter/ipsend/sock.c b/contrib/ipfilter/ipsend/sock.c index a641592..6907a08 100644 --- a/contrib/ipfilter/ipsend/sock.c +++ b/contrib/ipfilter/ipsend/sock.c @@ -8,7 +8,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)sock.c 1.2 1/11/96 (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: sock.c,v 2.1 1999/08/04 17:31:16 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: sock.c,v 2.1.4.1 2000/12/16 21:05:44 darrenr Exp $"; #endif #include <stdio.h> #include <unistd.h> |
