Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR/21334: Mike M. Volokhov: NAT halts on ipfs(8) restore in case of ftp

Browse Source 
proxy used. Apply userland patch from this PR, since the kernel patch does
not match at all anymore, and seems to have been applied differently.
This commit is contained in:
christos 2004-05-10 00:36:19 +00:00
parent 01fd915146
commit 191890ee3f
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
dist/ipf/tools/ipfs.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: ipfs.c,v 1.1.1.1 2004/03/28 08:56:32 martti Exp $ */ /* $NetBSD: ipfs.c,v 1.2 2004/05/10 00:36:19 christos Exp $ */
/* /*
* Copyright (C) 1999-2001, 2003 by Darren Reed. * Copyright (C) 1999-2001, 2003 by Darren Reed.
@ -528,9 +528,11 @@ int readnat(fd, file)
int fd; int fd;
char *file; char *file;
{ {
nat_save_t ipn, *in, *ipnhead, *in1, *ipntail, *ipnp; nat_save_t ipn, *in, *ipnhead = NULL, *in1, *ipntail = NULL;
int nfd, i; int nfd, i;
nat_t *nat; nat_t *nat;
char *s;
int n;
nfd = -1; nfd = -1;
in = NULL; in = NULL;
@ -548,7 +550,6 @@ char *file;
} }
bzero((char *)&ipn, sizeof(ipn)); bzero((char *)&ipn, sizeof(ipn));
ipnp = &ipn;
/* /*
* 1. Read all state information in. * 1. Read all state information in.
@ -570,33 +571,36 @@ char *file;
} }
if (ipn.ipn_dsize > 0) { if (ipn.ipn_dsize > 0) {
char *s = ipnp->ipn_data; n = ipn.ipn_dsize;
int n = ipnp->ipn_dsize;
n -= sizeof(ipnp->ipn_data); if (n > sizeof(ipn.ipn_data))
n -= sizeof(ipn.ipn_data);
else
n = 0;
in = malloc(sizeof(*in) + n); in = malloc(sizeof(*in) + n);
if (!in) if (!in)
break; break;
if (n > 0) {
s += sizeof(ipnp->ipn_data); s = in->ipn_data + sizeof(in->ipn_data);
i = read(nfd, s, n); i = read(nfd, s, n);
if (i == 0) if (i == 0)
break; break;
if (i != n) { if (i != n) {
fprintf(stderr, "incomplete read: %d != %d\n", fprintf(stderr,
i, n); "incomplete read: %d != %d\n",
close(nfd); i, n);
free(in); close(nfd);
return 1; return 1;
}
} }
} else { } else {
ipn.ipn_dsize = 0; ipn.ipn_dsize = 0;
in = (nat_save_t *)malloc(sizeof(*in)); in = (nat_save_t *)malloc(sizeof(*in));
} }
bcopy((char *)ipnp, (char *)in, sizeof(ipn)); bcopy((char *)&ipn, (char *)in, sizeof(ipn));
/* /*
* Check to see if this is the first state entry that will * Check to see if this is the first NAT entry that will
* reference a particular rule and if so, flag it as such * reference a particular rule and if so, flag it as such
* else just adjust the rule pointer to become a pointer to * else just adjust the rule pointer to become a pointer to
* the other. We do this so we have a means later for tracking * the other. We do this so we have a means later for tracking
@ -626,6 +630,7 @@ char *file;
} while (1); } while (1);
close(nfd); close(nfd);
nfd = -1;
for (in = ipnhead; in; in = in->ipn_next) { for (in = ipnhead; in; in = in->ipn_next) {
if (opts & OPT_VERBOSE) if (opts & OPT_VERBOSE)
@ -740,6 +745,7 @@ char *dirname;
dirname = IPF_SAVEDIR; dirname = IPF_SAVEDIR;
if (chdir(dirname)) { if (chdir(dirname)) {
fprintf(stderr, "IPF_SAVEDIR=%s: ", dirname);
perror("chdir(IPF_SAVEDIR)"); perror("chdir(IPF_SAVEDIR)");
return 1; return 1;
} }