diff options
| author | Darren Reed <darrenr@FreeBSD.org> | 2005-06-23 14:19:02 +0000 |
|---|---|---|
| committer | Darren Reed <darrenr@FreeBSD.org> | 2005-06-23 14:19:02 +0000 |
| commit | 721c3c7cc6abeaca3a0ae3703411f128c5cc2740 (patch) | |
| tree | 7de701619e957509e25bed30e3a147139a297e79 /contrib/ipfilter/lib | |
| parent | 43e8ac965c0867d8e1ac1b36826c1a45b2cc9534 (diff) | |
| download | src-721c3c7cc6abeaca3a0ae3703411f128c5cc2740.tar.gz src-721c3c7cc6abeaca3a0ae3703411f128c5cc2740.zip | |
Fix some minor problems before release:
(1) "ipf -T" is broken for fetching single entries and
(2) loading rules with numbered collections does not order insertion right.
(3) stats aren't accumulated for hash table memory failures
Approved by: re (dwhite)
Notes
Notes:
svn path=/head/; revision=147547
Diffstat (limited to 'contrib/ipfilter/lib')
| -rw-r--r-- | contrib/ipfilter/lib/ipf_dotuning.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/ipfilter/lib/ipf_dotuning.c b/contrib/ipfilter/lib/ipf_dotuning.c index d9f5f75d9cbc..3f146d7bb520 100644 --- a/contrib/ipfilter/lib/ipf_dotuning.c +++ b/contrib/ipfilter/lib/ipf_dotuning.c @@ -33,6 +33,7 @@ ioctlfunc_t iocfn; printtunable(&tu); } } else if ((t = strchr(s, '=')) != NULL) { + tu.ipft_cookie = NULL; *t++ = '\0'; strncpy(tu.ipft_name, s, sizeof(tu.ipft_name)); if (sscanf(t, "%lu", &tu.ipft_vlong) == 1) { @@ -45,13 +46,16 @@ ioctlfunc_t iocfn; return; } } else { + tu.ipft_cookie = NULL; strncpy(tu.ipft_name, s, sizeof(tu.ipft_name)); if ((*iocfn)(fd, SIOCIPFGET, &obj) == -1) { perror("ioctl(SIOCIPFGET)"); return; } - if (tu.ipft_cookie == NULL) + if (tu.ipft_cookie == NULL) { + fprintf(stderr, "Null cookie for %s\n", s); return; + } tu.ipft_name[sizeof(tu.ipft_name) - 1] = '\0'; printtunable(&tu); |