X-Git-Url: https://git.distorted.org.uk/~mdw/fwd/blobdiff_plain/71b6cc0bc9dd7f041f486a90b158954b5c2d1948..1c2054c7558f523dec9d7c1f243a2ceddd81c781:/fw.c

diff --git a/fw.c b/fw.c
index b0eed70..5a5db0f 100644
--- a/fw.c
+++ b/fw.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: fw.c,v 1.14 2003/01/24 20:12:40 mdw Exp $
+ * $Id: fw.c,v 1.15 2003/11/25 14:46:50 mdw Exp $
  *
  * Port forwarding thingy
  *
@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: fw.c,v $
+ * Revision 1.15  2003/11/25 14:46:50  mdw
+ * Update docco for new options.
+ *
  * Revision 1.14  2003/01/24 20:12:40  mdw
  * Correctly cast uid and gid sentinel values.
  *
@@ -515,53 +518,53 @@ static void grammar(FILE *fp)
 Grammar summary\n\
 \n\
 Basic syntax\n\
-	file ::= empty | file stmt [`;']\n\
-	stmt ::= option-stmt | fw-stmt\n\
-	fw-stmt ::= `fw' source options [`to'|`->'] target options\n\
-	options ::= `{' option-seq `}'\n\
-	option-seq ::= empty | option-stmt [`;'] option-seq\n\
+	FILE ::= EMPTY | FILE STMT [`;']\n\
+	STMT ::= OPTION-STMT | FW-STMT\n\
+	FW-STMT ::= `fw' SOURCE OPTIONS [`to'|`->'] TARGET OPTIONS\n\
+	OPTIONS ::= `{' OPTION-SEQ `}'\n\
+	OPTION-SEQ ::= EMPTY | OPTION-STMT [`;'] OPTION-SEQ\n\
 \n\
 Option syntax\n\
-	option-stmt ::= q-option\n\
-	q-option ::= option\n\
-	     | prefix `.' q-option\n\
-	     | prefix `{' option-seq `}'\n\
-	prefix ::= word\n\
+	OPTION-STMT ::= Q-OPTION\n\
+	Q-OPTION ::= OPTION\n\
+	     | PREFIX `.' Q-OPTION\n\
+	     | PREFIX `{' OPTION-SEQ `}'\n\
+	PREFIX ::= WORD\n\
 \n\
 File source and target\n\
-	source ::= file\n\
-	target ::= file\n\
-	file ::= `file' [`.'] fspec [`,' fspec]\n\
-	fspec ::= fd-spec | name-spec | null-spec\n\
-	fd-spec ::= [[`:']`fd'[`:']] number|`stdin'|`stdout'\n\
-	name-spec ::= [[`:']`file'[`:']] file-name\n\
-	file-name ::= path-seq | [ path-seq ]\n\
-	path-seq ::= path-elt | path-seq path-elt\n\
-	path-elt ::= `/' | word\n\
-	null-spec ::= [`:']`null'[`:']\n\
+	SOURCE ::= FILE\n\
+	TARGET ::= FILE\n\
+	FILE ::= `file' [`.'] FSPEC [`,' FSPEC]\n\
+	FSPEC ::= FD-SPEC | NAME-SPEC | NULL-SPEC\n\
+	FD-SPEC ::= [[`:']`fd'[`:']] NUMBER|`stdin'|`stdout'\n\
+	NAME-SPEC ::= [[`:']`file'[`:']] FILE-NAME\n\
+	FILE-NAME ::= PATH-SEQ | [ PATH-SEQ ]\n\
+	PATH-SEQ ::= PATH-ELT | PATH-SEQ PATH-ELT\n\
+	PATH-ELT ::= `/' | WORD\n\
+	NULL-SPEC ::= [`:']`null'[`:']\n\
 \n\
 Exec source and target\n\
-	source ::= exec\n\
-	target ::= exec\n\
-	exec ::= `exec' [`.'] cmd-spec\n\
-	cmd-spec ::= shell-cmd | [prog-name] `[' argv0 arg-seq `]'\n\
-	arg-seq ::= word | arg-seq word\n\
-	shell-cmd ::= word\n\
-	argv0 ::= word\n\
+	SOURCE ::= EXEC\n\
+	TARGET ::= EXEC\n\
+	EXEC ::= `exec' [`.'] CMD-SPEC\n\
+	CMD-SPEC ::= SHELL-CMD | [PROG-NAME] `[' ARGV0 ARG-SEQ `]'\n\
+	ARG-SEQ ::= WORD | ARG-SEQ WORD\n\
+	SHELL-CMD ::= WORD\n\
+	ARGV0 ::= WORD\n\
 \n\
 Socket source and target\n\
-	source ::= socket-source\n\
-	target ::= socket-target\n\
-	socket-source ::= [`socket'[`.']] [[`:']addr-type[`:']] source-addr\n\
-	socket-target ::= [`socket'[`.']] [[`:']addr-type[`:']] target-addr\n\
+	SOURCE ::= SOCKET-SOURCE\n\
+	TARGET ::= SOCKET-TARGET\n\
+	SOCKET-SOURCE ::= [`socket'[`.']] [[`:']ADDR-TYPE[`:']] SOURCE-ADDR\n\
+	SOCKET-TARGET ::= [`socket'[`.']] [[`:']ADDR-TYPE[`:']] TARGET-ADDR\n\
 \n\
-	inet-source-addr ::= [port] port\n\
-	inet-target-addr ::= address [`:'] port\n\
-	address ::= addr-elt | address addr-elt\n\
-	addr-elt ::= `.' | word\n\
+	INET-SOURCE-ADDR ::= [`port'] PORT\n\
+	INET-TARGET-ADDR ::= ADDRESS [`:'] PORT\n\
+	ADDRESS ::= ADDR-ELT | ADDRESS ADDR-ELT\n\
+	ADDR-ELT ::= `.' | WORD\n\
 \n\
-	unix-source-addr ::= file-name\n\
-	unix-target-addr ::= file-name\n\
+	UNIX-SOURCE-ADDR ::= FILE-NAME\n\
+	UNIX-TARGET-ADDR ::= FILE-NAME\n\
 ");
 }
 
@@ -572,9 +575,9 @@ static void options(FILE *fp)
 Options summary\n\
 \n\
 File attributes (`fattr')\n\
-	prefix.fattr.mode [=] mode\n\
-	prefix.fattr.owner [=] user\n\
-	prefix.fattr.group [=] group\n\
+	prefix.FATTR.MODE [=] MODE\n\
+	prefix.FATTR.OWNER [=] USER\n\
+	prefix.FATTR.GROUP [=] GROUP\n\
 \n\
 File options\n\
 	file.create [=] yes|no\n\
@@ -583,21 +586,24 @@ File options\n\
 \n\
 Exec options\n\
 	exec.logging [=] yes|no\n\
-	exec.dir [=] file-name\n\
-	exec.root [=] file-name\n\
-	exec.user [=] user\n\
-	exec.group [=] group\n\
-	exec.rlimit.limit[.hard|.soft] [=] value\n\
+	exec.dir [=] FILE-NAME\n\
+	exec.root [=] FILE-NAME\n\
+	exec.user [=] USER\n\
+	exec.group [=] GROUP\n\
+	exec.rlimit.LIMIT[.hard|.soft] [=] VALUE\n\
 	exec.env.clear\n\
-	exec.env.unset var\n\
-	exec.env.[set] var [=] value\n\
+	exec.env.unset VAR\n\
+	exec.env.[set] VAR [=] VALUE\n\
 \n\
 Socket options\n\
-	socket.conn [=] number|unlimited|one-shot\n\
-	socket.listen [=] number\n\
+	socket.conn [=] NUMBER|unlimited|one-shot\n\
+	socket.listen [=] NUMBER\n\
 	socket.logging [=] yes|no\n\
 \n\
-	socket.inet.[allow|deny] [from] address [/ address]\n\
+	socket.inet.source.[allow|deny] [host] ADDR [/ ADDR]\n\
+	socket.inet.source.[allow|deny] priv-port\n\
+	socket.inet.source.addr [=] any|ADDR\n\
+	socket.inet.dest.addr [=] any|ADDR\n\
 \n\
 	socket.unix.fattr.*\n\
 ");