PERFORCE change 109128 for review

[Paolo Pisati]

http://perforce.freebsd.org/chv.cgi?CH=109128

Change 109128 by piso at piso_newluxor on 2006/11/03 15:50:32

	POLA: convert redir_* options to redirect_* as in natd.

Affected files ...

.. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#13 edit

Differences ...

==== //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#13 (text+ko) ====

@@ -377,9 +377,9 @@
  	{ "reset",	        TOK_RESET_ADDR },
  	{ "reverse",	        TOK_ALIAS_REV },	
  	{ "proxy_only",	        TOK_PROXY_ONLY },
-	{ "redir_addr",	        TOK_REDIR_ADDR },
-	{ "redir_port",	        TOK_REDIR_PORT },
-	{ "redir_proto",        TOK_REDIR_PROTO },
+	{ "redirect_addr",	TOK_REDIR_ADDR },
+	{ "redirect_port",	TOK_REDIR_PORT },
+	{ "redirect_proto",	TOK_REDIR_PROTO },
  	{ NULL, 0 }	/* terminator */
 };
 
@@ -2669,8 +2669,8 @@
 "{pipe|queue} N config PIPE-BODY\n"
 "[pipe|queue] {zero|delete|show} [N{,N}]\n"
 "nat N config {ip IPADDR|if IFNAME|log|deny_in|same_ports|unreg_only|reset|\n"
-"              reverse|proxy_only|redir_addr linkspec| redir_port linkspec|\n"
-"              redir_proto linkspec}\n"
+"		reverse|proxy_only|redirect_addr linkspec|\n"
+"		redirect_port linkspec|redirect_proto linkspec}\n"
 "set [disable N... enable N...] | move [rule] X to Y | swap X Y | show\n"
 "table N {add ip[/bits] [value] | delete ip[/bits] | flush | list}\n"
 "\n"
@@ -3520,7 +3520,7 @@
 	r->mode = REDIR_ADDR;
 	/* Extract local address. */
 	if (ac == 0) 
-		errx(EX_DATAERR, "redir_addr: missing local address");
+		errx(EX_DATAERR, "redirect_addr: missing local address");
 	sep = strchr(*av, ',');
 	if (sep) {		/* LSNAT redirection syntax. */
 		r->laddr.s_addr = INADDR_NONE;
@@ -3533,7 +3533,7 @@
 
 	/* Extract public address. */
 	if (ac == 0) 
-		errx(EX_DATAERR, "redir_addr: missing public address");
+		errx(EX_DATAERR, "redirect_addr: missing public address");
 	StrToAddr(*av, &r->paddr);
 	INC_ARGCV();
 
@@ -3559,7 +3559,7 @@
 	}
 	return(space);
 nospace:
-	errx(EX_DATAERR, "redir_addr: buf is too small\n");
+	errx(EX_DATAERR, "redirect_addr: buf is too small\n");
 }
 
 static int
@@ -3711,7 +3711,7 @@
 	}
 	return (space);
 nospace:
-	errx(EX_DATAERR, "redir_port: buf is too small\n");
+	errx(EX_DATAERR, "redirect_port: buf is too small\n");
 }
 
 static int
@@ -3781,7 +3781,7 @@
 	}
 	return (space);
 nospace:
-	errx(EX_DATAERR, "redir_proto: buf is too small\n");
+	errx(EX_DATAERR, "redirect_proto: buf is too small\n");
 }
 
 static void
@@ -3832,7 +3832,7 @@
 		off += sof_redir;
 		switch (t->mode) {
 		case REDIR_ADDR:
-			printf(" redir_addr");
+			printf(" redirect_addr");
 			if (t->spool_cnt == 0)
 				printf(" %s", inet_ntoa(t->laddr));
 			else
@@ -3849,7 +3849,7 @@
 			break;
 		case REDIR_PORT:
 			p = getprotobynumber(t->proto);
-			printf(" redir_port %s ", p->p_name);
+			printf(" redirect_port %s ", p->p_name);
 			if (!t->spool_cnt) {
 				printf("%s:%u", inet_ntoa(t->laddr), t->lport);
 				if (t->pport_cnt > 1)
@@ -3884,7 +3884,7 @@
 			break;
 		case REDIR_PROTO:
 			p = getprotobynumber(t->proto);
-			printf(" redir_proto %s %s", p->p_name, 
+			printf(" redirect_proto %s %s", p->p_name, 
 			       inet_ntoa(t->laddr));
 			if (t->paddr.s_addr != 0) {
 				printf(" %s", inet_ntoa(t->paddr));