Module Name: src
Committed By: christos
Date: Mon Mar 11 00:16:59 UTC 2013
Modified Files:
src/usr.sbin/npf/npfctl: npfctl.c todo
Log Message:
fix usage
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.sbin/npf/npfctl/npfctl.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/npf/npfctl/todo
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npfctl/npfctl.c
diff -u src/usr.sbin/npf/npfctl/npfctl.c:1.32 src/usr.sbin/npf/npfctl/npfctl.c:1.33
--- src/usr.sbin/npf/npfctl/npfctl.c:1.32 Sun Mar 10 19:59:00 2013
+++ src/usr.sbin/npf/npfctl/npfctl.c Sun Mar 10 20:16:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: npfctl.c,v 1.32 2013/03/10 23:59:00 christos Exp $ */
+/* $NetBSD: npfctl.c,v 1.33 2013/03/11 00:16:59 christos Exp $ */
/*-
* Copyright (c) 2009-2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: npfctl.c,v 1.32 2013/03/10 23:59:00 christos Exp $");
+__RCSID("$NetBSD: npfctl.c,v 1.33 2013/03/11 00:16:59 christos Exp $");
#include <sys/ioctl.h>
#include <sys/stat.h>
@@ -115,7 +115,11 @@ usage(void)
const char *progname = getprogname();
fprintf(stderr,
- "usage:\t%s [ start | stop | reload | flush | show | stats ]\n",
+ "Usage:\t%s start | stop | flush | show | stats | sess-load | "
+ "sess-save\n",
+ progname);
+ fprintf(stderr,
+ "\t%s validate | reload [<rule-file>]\n",
progname);
fprintf(stderr,
"\t%s rule \"rule-name\" { add | rem } <rule-syntax>\n",
Index: src/usr.sbin/npf/npfctl/todo
diff -u src/usr.sbin/npf/npfctl/todo:1.3 src/usr.sbin/npf/npfctl/todo:1.4
--- src/usr.sbin/npf/npfctl/todo:1.3 Sun Mar 10 20:09:07 2013
+++ src/usr.sbin/npf/npfctl/todo Sun Mar 10 20:16:59 2013
@@ -5,7 +5,6 @@
-- npfctl start does not load if not loaded. It is not clear you need to
reload first. Or if it loads it should print the error messages.
-- able to specify interfaces before they are created
--- npfctl validate is not listed in the usage, what else is wrong in doc
-- docs/examples out of date
-- npf starts up too late (after traffic can go through)
-- need libpcap in /
@@ -21,3 +20,4 @@ ok parse dynamic map rule properly inet4
ok create npflog interface automatically
ok need to bring interface npflog up
ok parse 'port "ftp-data"' properly
+ok fix usage
